abntex2 (14jan13)

git-svn-id: svn://tug.org/texlive/trunk@28832 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 103 insertions, 27 deletions

diff --git a/Master/texmf-dist/tex/latex/abntex2/abntex2.cls b/Master/texmf-dist/tex/latex/abntex2/abntex2.cls
index a4e42f7fae1..07df50db84e 100644
--- a/Master/texmf-dist/tex/latex/abntex2/abntex2.cls
+++ b/Master/texmf-dist/tex/latex/abntex2/abntex2.cls
@@ -1,4 +1,4 @@
-%% abntex2.cls, v 1.1 2013/01/03 laurocesar
+%% abntex2.cls, v 1.2 2013/01/03 laurocesar
 %% Copyright 2012-2013 by abnTeX2 group at http://code.google.com/p/abntex2/ 
 %%
 %% This work may be distributed and/or modified under the
@@ -17,7 +17,25 @@
 %%
 %% This work consists of the file abntex2.cls.
 %%
+%% 2013.1.13 09h23
+%%  Altera o ambiente citacao para que receba diferentes recuos no modo
+%% twocolumn
 %%
+%% 2013.1.12 21h44	laurocesar
+%%  Corrige numeração contínua de seções quando não está no modo article
+%%
+%% 2013.1.9 14h24 laurocesar
+%%  Altera o nome \listtablename para ``Lista de tabelas'' (com t minusculo)
+%%  Altera a implementação do ambiente citacao
+%%
+%% 2013.1.7 20h35 laurocesar
+%%  Uso da fonte de \ABNTEXfontereduzida em \caption, \legend e \footnote
+%%  Redefinição da implementaçao do ambiente resumo: agora ele usa abstract. 
+%%  Criação de \resumoname e do ambiente resumoumacoluna.
+%%  Tratamento especial dos capítulos e divisões pré-textuais no caso da option
+%% article estar habilitada.
+%%  Altera a metrica usada para calcular o espaçamento dos capítulos abnt de 
+%% \textwidth para \columnwidth.
 %%
 %% 2013.1.3 09h02 laurocesar
 %%  Correção do estilo de capítulo de \renewcommand{\beforechapskip}{0cm} para
@@ -37,8 +55,20 @@
 \ProvidesClass{abntex2}[2013/02/01 v1.0 abnTeX2]
 
 %
-% Repassa todos os parâmetros à report
+% Repassa todos os parâmetros à classe memoir, 
+% mas captura as options article e twocolumn
 %
+\providecommand{\ABNTEXisarticle}{false}
+\DeclareOption{article}{
+	\renewcommand{\ABNTEXisarticle}{true}
+	\PassOptionsToClass{article}{memoir}%}
+}
+\providecommand{\ABNTEXistwocolumn}{false}
+\DeclareOption{twocolumn}{
+	\renewcommand{\ABNTEXistwocolumn}{true}
+	\PassOptionsToClass{twocolumn}{memoir}%}
+}
+	
 \DeclareOption*{%
   \PassOptionsToClass{\CurrentOption}{memoir}%
 }
@@ -60,6 +90,7 @@
   \renewcommand{\bibname}{Refer\^encias}
   \renewcommand{\indexname}{\'Indice}
   \renewcommand{\listfigurename}{Lista de ilustra\c{c}\~{o}es}
+  \renewcommand{\listtablename}{Lista de tabelas}
 }
 % ---   
 
@@ -128,7 +159,9 @@
 \newcommand{\apendicesname}{Ap\^endices}
 \newcommand{\orientadorname}{Orientador:}
 \newcommand{\coorientadorname}{Coorientador:}
-\newcommand{\folhadeaprovacaoname}{Folha de aprova\c{c}\~ao} 
+\newcommand{\folhadeaprovacaoname}{Folha de aprova\c{c}\~ao}
+\newcommand{\resumoname}{Resumo} 
+
 % ---
 
 % ---
@@ -156,7 +189,7 @@
 
 % ------------------------------------------------------------------------
 % ------------------------------------------------------------------------
-% Comandos e variaveis privadas
+% Comandos e variaveis privados
 % ------------------------------------------------------------------------
 % ------------------------------------------------------------------------
 
@@ -181,7 +214,16 @@
 \setboolean{abntex@apendiceousecao}{false}
 % ---
 
-
+% ---
+% cleardoublepage se este documento nao for article
+% ---
+\newcommand{\PRIVATEclearpageifneeded}{%
+  \ifthenelse{\equal{\ABNTEXisarticle}{true}}{%
+    %
+  }{ % else
+    \cleardoublepage
+  }
+}  
 
 % ------------------------------------------------------------------------
 % ------------------------------------------------------------------------
@@ -194,17 +236,26 @@
 \makeatletter
 \renewcommand\@makefntext[1]{\leftskip=0.7cm\hskip-0.2cm\@makefnmark#1}
 \makeatother
+\renewcommand{\foottextfont}{\ABNTEXfontereduzida}
 % ---
 
 % ---
 % Numeração contínua das figuras
-\counterwithout{figure}{chapter}
-\counterwithout{table}{chapter}
+\ifthenelse{\equal{\ABNTEXisarticle}{true}}{%
+  \counterwithout{section}{chapter}
+  \counterwithout{figure}{section}
+  \counterwithout{table}{section}
+}{%else
+  \counterwithout{figure}{chapter}
+  \counterwithout{table}{chapter}
+}
 % ---
 
 % ---
 % Estilos de caption
 \captiondelim{\space--\space}
+\captionnamefont{\ABNTEXfontereduzida}
+\captiontitlefont{\ABNTEXfontereduzida}
 % ---
 
 % -----
@@ -244,7 +295,14 @@
   \newlength{\chapternamenumlength}
 
   % tamanhos de fontes de chapter e part	
-  \renewcommand{\chaptitlefont}{\ABNTEXchapterfont\ABNTEXchapterfontsize}
+   \ifthenelse{\equal{\ABNTEXisarticle}{true}}{%
+     \setlength\beforechapskip{\baselineskip}
+     \renewcommand{\chaptitlefont}{\ABNTEXsectionfont\ABNTEXsectionfontsize}
+   }{%else
+     \setlength{\beforechapskip}{0pt}
+     \renewcommand{\chaptitlefont}{\ABNTEXchapterfont\ABNTEXchapterfontsize}
+   }
+  
   \renewcommand{\chapnumfont}{\chaptitlefont}
   \renewcommand{\parttitlefont}{\ABNTEXpartfont\ABNTEXpartfontsize}
   \renewcommand{\partnumfont}{\ABNTEXpartfont\ABNTEXpartfontsize}
@@ -269,7 +327,7 @@
     \chaptitlefont%
     \ifthenelse{\boolean{abntex@innonumchapter}}{\centering##1}{% else
 	    \settowidth{\chapternamenumlength}{\printchaptername\printchapternum\afterchapternum}%
-	    \parbox[t]{\textwidth-\chapternamenumlength}{##1}%
+	    \parbox[t]{\columnwidth-\chapternamenumlength}{##1}%
 	}    
   }
        
@@ -283,7 +341,6 @@
      }{} % else
   }
   \renewcommand{\afterchapternum}{}
-  \setlength{\beforechapskip}{0cm}
   
   % impressao do capitulo nao numerado
   \renewcommand\printchapternonum{%
@@ -294,7 +351,7 @@
 % ---
 
 % -----
-% Declarações de cabeçalhos e de rodapé
+% Declarações de cabeçalhos 
 % -----
 % Cabeçalho padrão
 \makepagestyle{abntheadings}
@@ -412,7 +469,7 @@
 % Errata
 \newenvironment{errata}[1][\errataname]{%
    \pretextualchapter{#1}
-  }{\cleardoublepage}
+  }{\PRIVATEclearpageifneeded}
 % ---
 
 % ---
@@ -421,7 +478,7 @@
    \clearpage%
    \PRIVATEbookmarkthis{#1}%
    \begin{Spacing}{1.0}
-}{\end{Spacing}\cleardoublepage}   
+}{\end{Spacing}\PRIVATEclearpageifneeded}   
 % ---
 
 % ---
@@ -430,14 +487,14 @@
    \ifthenelse{\equal{#1}{}}{%
     \PRIVATEbookmarkthis{\dedicatorianame}
     }{\pretextualchapter{#1}}
-  }{\cleardoublepage}
+  }{\PRIVATEclearpageifneeded}
 % ---
 
 % ---
 % Agradecimentos
 \newenvironment{agradecimentos}[1][\agradecimentosname]{%
    \pretextualchapter{#1}
-  }{\cleardoublepage}
+  }{\PRIVATEclearpageifneeded}
 % ---
 
 % ---
@@ -446,15 +503,27 @@
    \ifthenelse{\equal{#1}{}}{%
     \PRIVATEbookmarkthis{\epigraphname}
     }{\pretextualchapter{#1}}
-  }{\cleardoublepage}
+  }{\PRIVATEclearpageifneeded}
 % ---
 
 % ---
 % Resumo e abstracts em diferentes idiomas - NBR 14724/2011
-\newenvironment{resumo}[1][\abstractname]{%
+\newenvironment{resumo}[1][\resumoname]{%
+   \PRIVATEbookmarkthis{#1}
+   \renewcommand{\abstractnamefont}{\chaptitlefont}
+   \renewcommand{\abstractname}{#1}
+   \begin{abstract}
    \SingleSpacing
-   \pretextualchapter{#1}
-  }{\cleardoublepage}
+  }{\end{abstract}\PRIVATEclearpageifneeded}
+  
+\newenvironment{resumoumacoluna}[1][\resumoname]{%
+   \PRIVATEbookmarkthis{#1}
+   \renewcommand{\abstractnamefont}{\chaptitlefont}
+   \renewcommand{\abstractname}{#1}
+   \begin{onecolabstract}
+   \SingleSpacing
+}{\end{onecolabstract}\PRIVATEclearpageifneeded}
+  
 % ---
 
 % ------------------------------------------------------------------------
@@ -524,14 +593,21 @@
 
 % ---
 % Citacao direta com mais de 3 linhas - ABNT NBR 10520/2002 - 5.3
-\newenvironment*{citacao}[1][]{%
-  \begin{SingleSpace}%
-  \ABNTEXfontereduzida% 
-  \addtolength{\leftskip}{4cm}% % recuo de 4 cm da margem esquerda
-  \noindent%
-  }{%
-  \normalsize%
-  \end{SingleSpace}}
+\newlength{\ABNTEXcitacaorecuo}% recuo de 4 cm da margem esquerda
+\ifthenelse{\equal{\ABNTEXistwocolumn}{true}}{%
+  \setlength{\ABNTEXcitacaorecuo}{1.8cm}
+}{% else
+  \setlength{\ABNTEXcitacaorecuo}{4cm}
+}
+\newenvironment*{citacao}{%
+   \list{}%
+   \footnotesize%
+   \addtolength{\leftskip}{\ABNTEXcitacaorecuo}%
+   \item[]%
+   \begin{SingleSpace}%
+ }{%
+   \end{SingleSpace}%
+   \endlist}%
 % ---
 
 % ---