summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/abntex2
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-12-26 23:19:02 +0000
committerKarl Berry <karl@freefriends.org>2013-12-26 23:19:02 +0000
commit67b6dbbfddb0d71cbb93790df31ca8648547df18 (patch)
treed94f52b3ab7e7658460be647ec6952f842716709 /Master/texmf-dist/tex/latex/abntex2
parent9b219d1b664067729034647a4b37626cf2bf5e26 (diff)
abntex2 (26dec13)
git-svn-id: svn://tug.org/texlive/trunk@32490 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/abntex2')
-rw-r--r--Master/texmf-dist/tex/latex/abntex2/abntex2.cls91
-rw-r--r--Master/texmf-dist/tex/latex/abntex2/abntex2abrev.sty2
-rw-r--r--Master/texmf-dist/tex/latex/abntex2/abntex2cite.sty2
3 files changed, 73 insertions, 22 deletions
diff --git a/Master/texmf-dist/tex/latex/abntex2/abntex2.cls b/Master/texmf-dist/tex/latex/abntex2/abntex2.cls
index 161a1081735..e4043d60961 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.9 laurocesar
+%% abntex2.cls, v-1.9.1 laurocesar
%% Copyright 2012-2013 by abnTeX2 group at http://abntex2.googlecode.com/
%%
%% This work may be distributed and/or modified under the
@@ -17,10 +17,18 @@
%%
%% This work consists of the file abntex2.cls.
%%
+%% 2013.12.26 06h41 laurocesar (volanski)
+%% Replaced ~--~ by ~\textendash~
+%%
%% 2013.10.26 17h45 laurocesar
%% Adiciona a marcro \phantompart
%% Revisa código do sumário 6027-2012
%%
+%% 2013.11.30 15h12 laurocesar
+%% conclusão dos ajustes no sumário abnt-6027-2012
+%% \phantompart adiciona espaço ao sumário mesmo se abnt-6027-2012
+%% não estiver ativa
+%%
%% 2013.10.24 09h53 laurocesar
%% Revisa as alterações de quinto nível
%%
@@ -142,7 +150,7 @@
% ------------------------------------------------------------------------
% ------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{abntex2}[2013/10/26 v1.9 abnTeX2]
+\ProvidesClass{abntex2}[2013/12/26 v1.9.1 abnTeX2]
\RequirePackage{ifthen}
%
% Captura as options article e twocolumn
@@ -445,7 +453,7 @@
% ---
% Estilos de caption
\hangcaption
-\captiondelim{\space--\space}
+\captiondelim{~\textendash~}
%\captionnamefont{\ABNTEXfontereduzida}
%\captiontitlefont{\ABNTEXfontereduzida}
@@ -505,7 +513,7 @@
% o pacote caption e amigos.
\AtEndPackage{caption}{
\AtBeginDocument{%
- \DeclareCaptionLabelSeparator{barr}{~--~}
+ \DeclareCaptionLabelSeparator{barr}{~\textendash~}
\DeclareCaptionFont{ABNTEXfontereduzida}{\ABNTEXfontereduzida}
\captionsetup{format=hang,
labelseparator=barr,
@@ -541,11 +549,11 @@
% lista de ilustracoes
\renewcommand{\cftfigurename}{\figurename\space}
-\renewcommand*{\cftfigureaftersnum}{\hfill--\hfill}
+\renewcommand*{\cftfigureaftersnum}{\hfill\textendash\hfill}
% lista de tabelas
\renewcommand{\cfttablename}{\tablename\space}
-\renewcommand*{\cfttableaftersnum}{\hfill--\hfill}
+\renewcommand*{\cfttableaftersnum}{\hfill\textendash\hfill}
% fonte das partes e do capitulo do TOC
\renewcommand{\tocheadstart}{\ABNTEXchapterfont}
@@ -558,7 +566,7 @@
\renewcommand*{\insertchapterspace}{}
% macros para configurar o Sumário conforme 6027-2012 ou tradicional cft
-\ifthenelse{\boolean{ABNTEXsumario-tradicional}}{\cftinsertcode{A}}{}
+\cftinsertcode{A}{}
\newlength{\cftlastnumwidth}
\setlength{\cftlastnumwidth}{\cftsubsubsectionnumwidth+1em}
@@ -569,8 +577,32 @@
\newcommand{\tocpartapendices}{}
\newcommand{\tocpartanexos}{}
+% insere o hifen no anexo/apendice do toc
+\cftinsertcode{A}{\renewcommand{\cftchapteraftersnum}{\hfill\textendash\hfill}}
+
+% No caso de Sumario (TOC) tradicional
+\ifthenelse{\boolean{ABNTEXsumario-tradicional}}{}{} % essa linha não faz nada,
+ % mas se houver necessidade de alterar o comportamento
+ % do sumário tradicional altere aqui.
+
+% No caso de Sumario (TOC) especifico da ABNT-6027-2012
+
+\makeatletter
+\ifthenelse{\boolean{ABNTEXsumario-abnt-6027-2012}}{
+ \settocpreprocessor{chapter}{%
+ \let\tempf@rtoc\f@rtoc%
+ \def\f@rtoc{%
+ \texorpdfstring{\MakeTextUppercase{\tempf@rtoc}}{\tempf@rtoc}}%
+ }
+ \settocpreprocessor{part}{%
+ \let\tempf@rtoc\f@rtoc%
+ \def\f@rtoc{%
+ \texorpdfstring{\MakeTextUppercase{\tempf@rtoc}}{\tempf@rtoc}}%
+ }
+}{}
+\makeatother
+%
\ifthenelse{\boolean{ABNTEXsumario-abnt-6027-2012}}{%
- \cftinsertcode{A}{\renewcommand{\cftchapteraftersnum}{\hfill--\hfill}}
\cftsetindents{part}{0em}{\cftlastnumwidth}
\cftsetindents{chapter}{0em}{\cftlastnumwidth}
@@ -598,7 +630,26 @@
\addtocontents{toc}{\cftsetindents{part}{\cftlastnumwidth}{2em}}
\cftinserthook{toc}{A}}
%
- \setlength{\cftbeforechapterskip}{0.5em}
+ \setlength{\cftbeforechapterskip}{1em}
+ %
+ % Fontes das entradas do sumario
+ %
+ \renewcommand{\cftpartfont}{\bfseries\larger}
+ %
+ \renewcommand{\cftchapterfont}{\bfseries}
+ \renewcommand{\cftchapterpagefont}{\normalsize\cftchapterfont}
+ %
+ \renewcommand{\cftsectionfont}{\bfseries}
+ \renewcommand{\cftsectionpagefont}{\cftsectionfont}
+ %
+ \renewcommand{\cftsubsectionfont}{\normalsize}
+ \renewcommand{\cftsubsectionpagefont}{\cftsubsectionfont}
+ %
+ \renewcommand{\cftsubsubsectionfont}{\smaller}
+ \renewcommand{\cftsubsubsectionpagefont}{\cftsubsubsectionfont}
+ %
+ \renewcommand{\cftparagraphfont}{\smaller\smaller}
+ \renewcommand{\cftparagraphpagefont}{\cftparagraphfont}
}{}
% Comando que simula a finalizacao de uma parte no bookmark e
@@ -607,7 +658,8 @@
\bookmarksetup{startatroot}%
\phantomsection%
\ifthenelse{\boolean{ABNTEXsumario-abnt-6027-2012}}{%
- \addtocontents{toc}{\vspace{\cftbeforepartskip}}}{}%
+ \addtocontents{toc}{\vspace{\cftbeforechapterskip}}}{%
+ \addtocontents{toc}{\vspace{\cftbeforepartskip}}}%
}
% -----
@@ -657,16 +709,13 @@
\def\printchaptertitle##1{%
\chaptitlefont%
\ifthenelse{\boolean{abntex@innonumchapter}}{\centering\ABNTEXchapterupperifneeded{##1}}{%
- % else
- \ifthenelse{\boolean{abntex@apendiceousecao}}{\centering%
+ \ifthenelse{\boolean{abntex@apendiceousecao}}{%
+ \centering%
\settowidth{\chapternamenumlength}{\printchaptername\printchapternum\afterchapternum}%
- %\parbox[t]{\columnwidth-\chapternamenumlength}
\ABNTEXchapterupperifneeded{##1}%
}{%
\settowidth{\chapternamenumlength}{\printchaptername\printchapternum\afterchapternum}%
\parbox[t]{\columnwidth-\chapternamenumlength}{\ABNTEXchapterupperifneeded{##1}}}%
- % \settowidth{\chapternamenumlength}{\printchaptername\printchapternum\afterchapternum}%
- % \parbox[t]{\columnwidth-\chapternamenumlength}{\ABNTEXchapterupperifneeded{##1}}%
}
}
@@ -678,7 +727,7 @@
\space\thechapter\space%
\ifthenelse{\boolean{abntex@apendiceousecao}}{%
\tocinnonumchapter
- \space--\space%
+ ~\textendash~%
}{} % else
}
\renewcommand{\afterchapternum}{}
@@ -932,9 +981,11 @@
\newcommand{\PRIVATEapendiceconfig}[2]{%
\setboolean{abntex@apendiceousecao}{true}%
\renewcommand{\appendixname}{#1}
+ \ifthenelse{\boolean{ABNTEXsumario-abnt-6027-2012}}{
+ \renewcommand{\appendixtocname}{\uppercase{#2}}
+ }{%
+ \renewcommand{\appendixtocname}{#2}}
\renewcommand{\appendixpagename}{#2}
- \renewcommand{\appendixtocname}{#2}
-
\switchchapname{#1}% Corrected from \switchapname -> \switchchapname
\renewcommand*{\cftappendixname}{#1 \space}
}
@@ -985,7 +1036,7 @@
\newcommand{\partpage}{%
\cleardoublepage
\phantomsection
- \addcontentsline{toc}{part}{\appendixpagename}
+ \addcontentsline{toc}{part}{\appendixtocname}%
\appendixpage*
}
@@ -1018,7 +1069,7 @@
}
\newenvironment*{citacao}[1][default]{%
\list{}%
- \footnotesize%
+ \ABNTEXfontereduzida%
\addtolength{\leftskip}{\ABNTEXcitacaorecuo}%
\item[]%
\begin{SingleSpace}%
diff --git a/Master/texmf-dist/tex/latex/abntex2/abntex2abrev.sty b/Master/texmf-dist/tex/latex/abntex2/abntex2abrev.sty
index d41ca3a06ab..fc3e3417c4d 100644
--- a/Master/texmf-dist/tex/latex/abntex2/abntex2abrev.sty
+++ b/Master/texmf-dist/tex/latex/abntex2/abntex2abrev.sty
@@ -1,4 +1,4 @@
-%% abntex2abrev.sty, v-1.9 laurocesar
+%% abntex2abrev.sty, v-1.9.1 laurocesar
%% Copyright 2012-2013 by abnTeX2 group at http://abntex2.googlecode.com/
%%
%% This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/tex/latex/abntex2/abntex2cite.sty b/Master/texmf-dist/tex/latex/abntex2/abntex2cite.sty
index ea89653715b..5eed4edb1d0 100644
--- a/Master/texmf-dist/tex/latex/abntex2/abntex2cite.sty
+++ b/Master/texmf-dist/tex/latex/abntex2/abntex2cite.sty
@@ -1,4 +1,4 @@
-%% abntex2cite.sty, v-1.9 laurocesar
+%% abntex2cite.sty, v-1.9.1 laurocesar
%% Copyright 2012-2013 by abnTeX2 group at http://abntex2.googlecode.com/
%%
%% This work may be distributed and/or modified under the