summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/abntex2/abntex2.cls46
-rw-r--r--Master/texmf-dist/tex/latex/abntex2/abntex2abrev.sty4
-rw-r--r--Master/texmf-dist/tex/latex/abntex2/abntex2cite.sty6
3 files changed, 28 insertions, 28 deletions
diff --git a/Master/texmf-dist/tex/latex/abntex2/abntex2.cls b/Master/texmf-dist/tex/latex/abntex2/abntex2.cls
index d6a8b0e9610..e25c3faa869 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.9.5 laurocesar
-%% Copyright 2012-2015 by abnTeX2 group at https://www.abntex.net.br/
+%% abntex2.cls, v-1.9.6 laurocesar
+%% Copyright 2012-2016 by abnTeX2 group at https://www.abntex.net.br/
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -23,7 +23,7 @@
% ------------------------------------------------------------------------
% ------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{abntex2}[2015/04/28 v1.9.5 abnTeX2]
+\ProvidesClass{abntex2}[2016/02/26 v-1.9.6 abnTeX2]
\RequirePackage{ifthen}
%
% Captura as options article e twocolumn
@@ -306,20 +306,13 @@
% ------------------------------------------------------------------------
% ---
-% Notas de rodape - NBR 14724/2011 - 5.2.1
-\makeatletter
-\renewcommand\@makefntext[1]{\hangindent=1.2em\leftskip=0.4em\hskip-0.4em\@makefnmark\hskip1.2em\relax#1}
-%\renewcommand\@makefntext[1]{\leftskip=0.7cm\hskip-0.15cm\@makefnmark#1}
-\makeatother
-\renewcommand{\foottextfont}{\ABNTEXfontereduzida}
+% Notas de rodape - footnotes - NBR 14724/2011 - 5.2.1
+\setlength{\footmarkwidth}{1.2em} % largura do footnotemark
+\setlength{\footmarksep}{0em}
+\footmarkstyle{\footnotesize{\textsuperscript{#1}}\hfill}
-% Virgula em footnote consecutiva
-\let\oldFootnote\footnote
-\newcommand\nextToken\relax
-\renewcommand\footnote[1]{%
- \oldFootnote{#1}\futurelet\nextToken\isFootnote}
-\newcommand\isFootnote{%
- \ifx\footnote\nextToken\textsuperscript{,}\fi}
+% tamanho da fonte do footnote
+\renewcommand{\foottextfont}{\ABNTEXfontereduzida}
% ---
% ---
@@ -336,8 +329,10 @@
% ---
% Estilos de caption
+% ---
\hangcaption
-\captiondelim{~\textendash~}
+\newcommand{\ABNTEXcaptiondelim}{~\textendash~}
+\newcommand{\ABNTEXcaptionfontedelim}{:~}
%\captionnamefont{\ABNTEXfontereduzida}
%\captiontitlefont{\ABNTEXfontereduzida}
@@ -348,7 +343,7 @@
\AtBeginDocument{%
% comandos auxiliares para manipular os captions dentro do comando \IBGEtab.
\newcommand{\configurecaptions}{\captionstyle[\raggedright]{}}
- \newcommand{\configureseparator}{\captiondelim{: }}
+ \newcommand{\configureseparator}{\captiondelim{\ABNTEXcaptiondelim}}
% Define o comando \IBGEtab{}{}{} com caption e legenda da largura do conteúdo tabular, tabular*, etc
% Parece funcionar com qualque pacote
\newsavebox{\myptabbox}
@@ -382,7 +377,8 @@
\@setminipage
\fi
\ABNTEXfontereduzida
- \configureseparator
+ %\configureseparator
+ \captiondelim{\ABNTEXcaptionfontedelim}
\@makecaption{\ABNTEXfontereduzida #1}{\ignorespaces\ABNTEXfontereduzida #2}\par
\endgroup}
\makeatother
@@ -397,7 +393,7 @@
% o pacote caption e amigos.
\AtEndPackage{caption}{
\AtBeginDocument{%
- \DeclareCaptionLabelSeparator{barr}{~\textendash~}
+ \DeclareCaptionLabelSeparator{barr}{\ABNTEXcaptiondelim}
\DeclareCaptionFont{ABNTEXfontereduzida}{\ABNTEXfontereduzida}
\captionsetup{format=hang,
labelseparator=barr,
@@ -410,6 +406,10 @@
\renewcommand{\configureseparator}{\captionsetup{labelsep=colon}}
}
}
+
+\AtBeginDocument{
+ \captiondelim{\ABNTEXcaptiondelim}
+}
% ---
% -----
@@ -530,10 +530,10 @@
\renewcommand{\cftsubsectionfont}{\normalsize}
\renewcommand{\cftsubsectionpagefont}{\cftsubsectionfont}
%
- \renewcommand{\cftsubsubsectionfont}{\smaller}
+ \renewcommand{\cftsubsubsectionfont}{\small}
\renewcommand{\cftsubsubsectionpagefont}{\cftsubsubsectionfont}
%
- \renewcommand{\cftparagraphfont}{\smaller\smaller}
+ \renewcommand{\cftparagraphfont}{\footnotesize}
\renewcommand{\cftparagraphpagefont}{\cftparagraphfont}
%
% Ajusta entrada Referencias
@@ -625,7 +625,7 @@
\space\thechapter\space%
\ifthenelse{\boolean{abntex@apendiceousecao}}{%
\tocinnonumchapter
- ~\textendash~%
+ \ABNTEXcaptiondelim%
}{} % else
}
\renewcommand{\afterchapternum}{}
diff --git a/Master/texmf-dist/tex/latex/abntex2/abntex2abrev.sty b/Master/texmf-dist/tex/latex/abntex2/abntex2abrev.sty
index bdf21213bb5..c7c7462a889 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.9.5 laurocesar
-%% Copyright 2012-2015 by abnTeX2 group at https://www.abntex.net.br/
+%% abntex2abrev.sty, v-1.9.6 laurocesar
+%% Copyright 2012-2016 by abnTeX2 group at https://www.abntex.net.br/
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/abntex2/abntex2cite.sty b/Master/texmf-dist/tex/latex/abntex2/abntex2cite.sty
index fa47743ea3e..6865e552d0a 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.9.5 laurocesar
-%% Copyright 2012-2015 by abnTeX2 group at https://www.abntex.net.br/
+%% abntex2cite.sty, v-1.9.6 laurocesar
+%% Copyright 2012-2016 by abnTeX2 group at https://www.abntex.net.br/
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -93,7 +93,7 @@
%\input{cvs-id.def}
%\CVSExtract$Id: abntcite.sty,v 1.26 2003/10/13 09:40:41 gweber Exp $
%\CVSPackage{abntcite}{\space Chamadas de referencias no texto (NBR10520)} %substitui \ProvidesPackage (replaces \ProvidesPackage)
-\ProvidesPackage{abntex2cite}[2015/04/28 v1.9.5 abnTeX2]
+\ProvidesPackage{abntex2cite}[2016/02/26 v-1.9.6 abnTeX2]
\RequirePackage{ifthen}
\RequirePackage{calc}
\RequirePackage{abntex2abrev}