From 43e8013efcfdb70cd65e67fe1efb27fc1307e106 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 5 Feb 2013 23:41:29 +0000 Subject: abntex2 (5feb13) git-svn-id: svn://tug.org/texlive/trunk@29038 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/abntex2/abntex2.cls | 34 +++++++++++-- .../texmf-dist/tex/latex/abntex2/abntex2abrev.sty | 6 +-- .../texmf-dist/tex/latex/abntex2/abntex2cite.sty | 56 +++++++++++----------- 3 files changed, 62 insertions(+), 34 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/abntex2/abntex2.cls b/Master/texmf-dist/tex/latex/abntex2/abntex2.cls index 1a427c35221..a1ddf85748b 100644 --- a/Master/texmf-dist/tex/latex/abntex2/abntex2.cls +++ b/Master/texmf-dist/tex/latex/abntex2/abntex2.cls @@ -1,5 +1,5 @@ -%% abntex2.cls, v-1.3 laurocesar -%% Copyright 2012-2013 by abnTeX2 group at http://code.google.com/p/abntex2/ +%% abntex2.cls, v-1.4 laurocesar +%% Copyright 2012-2013 by abnTeX2 group at http://abntex2.googlecode.com/ %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -13,10 +13,14 @@ %% %% The Current Maintainer of this work is the abnTeX2 team, led %% by Lauro César Araujo. Further information are available on -%% http://code.google.com/p/abntex2/ +%% http://abntex2.googlecode.com/ %% %% This work consists of the file abntex2.cls. %% +%% 2013.2.3 22h10 laurocesar +%% Adiciona \partpage, \partanexos e \partapendices +%% Modifica comandos de anexos para incluir automaticamente \cftinserthook{toc}{AAA} +%% %% 2013.1.16 18h46 laurocesar %% Altera o \ABNTEXchapterfont para usar \sffamily %% @@ -571,27 +575,51 @@ }{ \end{appendix} \setboolean{abntex@apendiceousecao}{false} + \bookmarksetup{startatroot} } % --- % --- % Anexos - comando \newcommand{\anexos}{% + \cftinserthook{toc}{AAA} + \PRIVATEapendiceconfig{\anexoname}{\anexosname} \appendix \renewcommand\theHchapter{anexochapback.\arabic{chapter}} } % Anexos - ambiente \newenvironment{anexosenv}{% + \cftinserthook{toc}{AAA} + \PRIVATEapendiceconfig{\anexoname}{\anexosname} \begin{appendix} \renewcommand\theHchapter{anexochapback.\arabic{chapter}} }{ \end{appendix} \setboolean{abntex@apendiceousecao}{false} + \bookmarksetup{startatroot} +} +% --- + +% --- +% Imprime uma página de divisão no estilo parte +\newcommand{\partpage}{% + \cleardoublepage + \phantomsection + \addcontentsline{toc}{part}{\appendixpagename} + \appendixpage* } + +% atalhos para \partpage ou \appendixpage* +\makeatletter +\newcommand{\partapendices}{\@ifstar{\appendixpage*}{\partpage}} + +\newcommand{\partanexos}{\@ifstar{\appendixpage*}{\partpage}} +\makeatother % --- + % ------------------------------------------------------------------------ % ------------------------------------------------------------------------ % Comandos e ambientes de editoração CITACAO, ALINEA, INCISO, ASSINATURA diff --git a/Master/texmf-dist/tex/latex/abntex2/abntex2abrev.sty b/Master/texmf-dist/tex/latex/abntex2/abntex2abrev.sty index e39c5566216..7721c69dca7 100644 --- a/Master/texmf-dist/tex/latex/abntex2/abntex2abrev.sty +++ b/Master/texmf-dist/tex/latex/abntex2/abntex2abrev.sty @@ -1,5 +1,5 @@ -%% abntex2abrev.sty, v-1.3 laurocesar -%% Copyright 2012-2013 by abnTeX2 group at http://code.google.com/p/abntex2/ +%% abntex2abrev.sty, v-1.4 laurocesar +%% Copyright 2012-2013 by abnTeX2 group at http://abntex2.googlecode.com/ %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -13,7 +13,7 @@ %% %% The Current Maintainer of this work is the abnTeX2 team, led %% by Lauro César Araujo. Further information are available on -%% http://code.google.com/p/abntex2/ +%% http://abntex2.googlecode.com/ %% %% Creator and original mantainer: Gerald Weber %% Copyright 2003 by the abnTeX group at http://abntex.codigolivre.org.br diff --git a/Master/texmf-dist/tex/latex/abntex2/abntex2cite.sty b/Master/texmf-dist/tex/latex/abntex2/abntex2cite.sty index ecbdf3d5c31..6886e51b0cd 100644 --- a/Master/texmf-dist/tex/latex/abntex2/abntex2cite.sty +++ b/Master/texmf-dist/tex/latex/abntex2/abntex2cite.sty @@ -1,5 +1,5 @@ -%% abntex2cite.sty, v-1.3 laurocesar -%% Copyright 2012-2013 by abnTeX2 group at http://code.google.com/p/abntex2/ +%% abntex2cite.sty, v-1.4 laurocesar +%% Copyright 2012-2013 by abnTeX2 group at http://abntex2.googlecode.com/ %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -13,7 +13,7 @@ %% %% The Current Maintainer of this work is the abnTeX2 team, led %% by Lauro César Araujo. Further information are available on -%% http://code.google.com/p/abntex2/ +%% http://abntex2.googlecode.com/ %% %% Creator and original mantainer: Gerald Weber %% Copyright 2001-2002 by the abnTeX group at http://abntex.codigolivre.org.br @@ -21,6 +21,9 @@ %% %% Revision history: %% +%% 2013/01/31 08h20 laurocesar +%% Corrige uso de \singlespacing para evitar incompatibilidade com beamer. +%% %% 2013/01/14 22h46 laurocesar %% Add \SingleSpacing before and \OnehalfSpacing after \bibliography command or %% \singlespacing and \onehalfspacing from setspace.sty if memoir is not loaded @@ -408,31 +411,28 @@ % no changes to \bibliography \def\bibliography#1{% **** - \ifx \SingleSpacing\undefined - \singlespacing - \else - \SingleSpacing - \fi - % - \ifthenelse{\boolean{ABCIciteoptionwasused} - \and\boolean{ABCIauto-abntoptions}} - { - % this system of checking is not good... - \IfSubStringInString{abntex2-options}{#1} - {\if@filesw\immediate\write\@auxout{\string\bibdata{#1}}\fi} - {\if@filesw\immediate\write\@auxout{\string\bibdata{abntex2-options,#1}}\fi} - } - { - \if@filesw - \immediate\write\@auxout{\string\bibdata{#1}}% - \fi - } - \@input@{\jobname.bbl} - \ifx \OnehalfSpacing\undefined - \onehalfspacing - \else - \OnehalfSpacing - \fi + { + \ifx \SingleSpacing\undefined + \singlespacing + \else + \SingleSpacing + \fi + % + \ifthenelse{\boolean{ABCIciteoptionwasused} + \and\boolean{ABCIauto-abntoptions}} + { + % this system of checking is not good... + \IfSubStringInString{abntex2-options}{#1} + {\if@filesw\immediate\write\@auxout{\string\bibdata{#1}}\fi} + {\if@filesw\immediate\write\@auxout{\string\bibdata{abntex2-options,#1}}\fi} + } + { + \if@filesw + \immediate\write\@auxout{\string\bibdata{#1}}% + \fi + } + \@input@{\jobname.bbl} + } } -- cgit v1.2.3