summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/abntex2
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2013-05-27 01:07:42 +0000
committerNorbert Preining <preining@logic.at>2013-05-27 01:07:42 +0000
commitaeb4caf9e2f7067229a1e7550adaa622f6b073ba (patch)
tree390829b286482f9ded6b9df39c86d8f2cf859df6 /Master/texmf-dist/tex/latex/abntex2
parent05b77f5f5173540aa52f68ee3679d1aa64109001 (diff)
abntex2 5/25
git-svn-id: svn://tug.org/texlive/trunk@30692 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/abntex2')
-rw-r--r--Master/texmf-dist/tex/latex/abntex2/abntex2.cls115
-rw-r--r--Master/texmf-dist/tex/latex/abntex2/abntex2abrev.sty2
-rw-r--r--Master/texmf-dist/tex/latex/abntex2/abntex2cite.sty11
3 files changed, 97 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/latex/abntex2/abntex2.cls b/Master/texmf-dist/tex/latex/abntex2/abntex2.cls
index d71c69bf588..7ce92b4c740 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.6.1 laurocesar
+%% abntex2.cls, v-1.7 laurocesar
%% Copyright 2012-2013 by abnTeX2 group at http://abntex2.googlecode.com/
%%
%% This work may be distributed and/or modified under the
@@ -17,6 +17,26 @@
%%
%% This work consists of the file abntex2.cls.
%%
+%% 2013.5.24 10h29 laurocesar
+%% Adiciona a opção language ao ambiente citacao.
+%%
+%% 2013.5.21 22h17 ycherem
+%% Resolve o problema de diferentes espaçamentos superiores entre
+%% diferentes tipos de seções primárias (resumos, sumários, elementos
+%% pré-textuais, etc.)
+%%
+%% 2013.5.18 09h35 sggranja / laurocesar
+%% Conclui implementação das opções chapter=TITLE, section=TITLE,
+%% subsection=TITLE, subsubsection=TITLE.
+%%
+%% 2013.5.16 09h15 sggranja / laurocesar
+%% Adiciona as opções chapter=Title, chapter=TITLE, section=Title,
+%% section=TITLE, subsection=TITLE, subsection=Title,
+%% subsubsection=TITLE, subsubsection=Title
+%% que alterna os títulos de divisoes do tipo capitulo entre
+%% caixa baixa e caixa alta. Porem, apenas a implementacao de chapter esta
+%% completa.
+%%
%% 2013.3.19 09h32 laurocesar
%% Incorpora as macros de nomes a configuracao do babel e prove traducoes
%% dessas macros para ingles, de modo que a classe abntex2 ja fique
@@ -101,11 +121,10 @@
% ------------------------------------------------------------------------
% ------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{abntex2}[2013/04/01 v1.6 abnTeX2]
-
+\ProvidesClass{abntex2}[2013/06/01 v1.7 abnTeX2]
+\RequirePackage{ifthen}
%
-% Repassa todos os parametros a classe memoir,
-% mas captura as options article e twocolumn
+% Captura as options article e twocolumn
%
\providecommand{\ABNTEXisarticle}{false}
\DeclareOption{article}{
@@ -117,7 +136,26 @@
\renewcommand{\ABNTEXistwocolumn}{true}
\PassOptionsToClass{twocolumn}{memoir}%}
}
-
+%
+% Opcoes chapter=TITLE, section=TITLE, subsection=TITLE e
+% subsubsection=TITLE: titulos em letras maiusculas
+%
+\newboolean{ABNTEXupperchapter} %true=titles of chapter/appendix in uppercase
+\newboolean{ABNTEXuppersection} %true=titles of sections in uppercase
+\newboolean{ABNTEXuppersubsection} %true=titles of subsections in uppercase
+\newboolean{ABNTEXuppersubsubsection} %true=titles of subsubsections in uppercase
+\setboolean{ABNTEXupperchapter}{false}
+\setboolean{ABNTEXuppersection}{false}
+\setboolean{ABNTEXuppersubsection}{false}
+\setboolean{ABNTEXuppersubsubsection}{false}
+\DeclareOption{chapter=TITLE}{\setboolean{ABNTEXupperchapter}{true}}
+\DeclareOption{section=TITLE}{\setboolean{ABNTEXuppersection}{true}}
+\DeclareOption{subsection=TITLE}{\setboolean{ABNTEXuppersubsection}{true}}
+\DeclareOption{subsubsection=TITLE}{\setboolean{ABNTEXuppersubsubsection}{true}}
+
+%
+% Repassa demais opcoes a memoir
+%
\DeclareOption*{%
\PassOptionsToClass{\CurrentOption}{memoir}%
}
@@ -126,11 +164,35 @@
% ------------------------------------------------------------------------
% ------------------------------------------------------------------------
-% Pacotes e customizacoes gerais do memoir
+% Comandos para tratamento de opcoes proprias
% ------------------------------------------------------------------------
% ------------------------------------------------------------------------
% ---
+% Comandos para controlar as opcoes de titulos com letras maiusculas
+% ---
+
+% pacote que prove \MakeTextUppercase
+\RequirePackage{textcase}
+
+\newcommand{\ABNTEXchapterupperifneeded}[1]{\ifthenelse{\boolean{ABNTEXupperchapter}}{\MakeTextUppercase{#1}}{#1}}
+\newcommand{\ABNTEXsectionupperifneeded}{\ifthenelse{\boolean{ABNTEXuppersection}}{\MakeTextUppercase}{}}
+\newcommand{\ABNTEXsubsectionupperifneeded}{\ifthenelse{\boolean{ABNTEXuppersubsection}}{\MakeTextUppercase}{}}
+\newcommand{\ABNTEXsubsubsectionupperifneeded}{\ifthenelse{\boolean{ABNTEXuppersubsubsection}}{\MakeTextUppercase}{}}
+% ---
+
+% ------------------------------------------------------------------------
+% ------------------------------------------------------------------------
+% Pacotes adicionais e customizacoes gerais do memoir
+% ------------------------------------------------------------------------
+% ------------------------------------------------------------------------
+
+% ---
+% Do pacote de if/them/else
+\newcommand{\abntex@ifnotempty}[2]{\ifthenelse{\not\equal{#1}{}}{#2}{}}
+% ---
+
+% ---
% Controla as referencias internas do PDF
\RequirePackage{hyperref}
\pdfstringdefDisableCommands{\def\\{, }\def\and{; }}
@@ -142,6 +204,10 @@
% ---
% ---
+% Hifenizacao e caracteres especiais portugues-brasil por padrao
+% ---
+\RequirePackage[brazil]{babel}
+%
% Nomes constantes do abnTeX2 em portugues (definicoes padroes)
\newcommand{\folhaderostoname}{Folha de rosto}
\newcommand{\epigraphname}{Ep\'igrafe}
@@ -158,12 +224,7 @@
\newcommand{\resumoname}{Resumo}
\newcommand{\listadesiglasname}{Lista de abreviaturas e siglas}
\newcommand{\listadesimbolosname}{Lista de s\'imbolos}
-% ---
-
-% ---
-% Hifenizacao e caracteres especiais portugues-brasil por padrao
-% ---
-\RequirePackage[brazil]{babel}
+%
\addto\captionsbrazil{% portugues-brasil
%% ajusta nomes padroes do babel
\renewcommand{\bibname}{Refer\^encias}
@@ -209,12 +270,6 @@
% ---
% ---
-% Pacote de if/them/else
-\RequirePackage{ifthen}
-\newcommand{\abntex@ifnotempty}[2]{\ifthenelse{\not\equal{#1}{}}{#2}{}}
-% ---
-
-% ---
% Pacote que permite realizar operacoes matematicas no codigo TeX
\RequirePackage{calc}
% ---
@@ -359,7 +414,7 @@
% lista de ilustracoes
\renewcommand{\cftfigurename}{\figurename\space}
- \renewcommand*{\cftfigureaftersnum}{~~--}
+\renewcommand*{\cftfigureaftersnum}{~~--}
% lista de tabelas
\renewcommand{\cfttablename}{\tablename\space}
@@ -379,6 +434,8 @@
\provideboolean{abntex@innonumchapter}
\setboolean{abntex@innonumchapter}{true}
\makechapterstyle{abnt}{%
+ \renewcommand{\chapterheadstart}{}
+
\newlength{\chapternamenumlength}
% tamanhos de fontes de chapter e part
@@ -396,9 +453,9 @@
\renewcommand{\partnamefont}{\ABNTEXpartfont\ABNTEXpartfontsize}
% tamanhos de fontes de section, subsection e subsubsection
- \setsecheadstyle{\ABNTEXchapterfont\ABNTEXsectionfontsize}
- \setsubsecheadstyle{\ABNTEXsubsectionfont\ABNTEXsubsectionfontsize}
- \setsubsubsecheadstyle{\ABNTEXsubsubsectionfont\ABNTEXsubsubsectionfontsize}
+ \setsecheadstyle{\ABNTEXsectionfont\ABNTEXsectionfontsize\ABNTEXsectionupperifneeded}
+ \setsubsecheadstyle{\ABNTEXsubsectionfont\ABNTEXsubsectionfontsize\ABNTEXsubsectionupperifneeded}
+ \setsubsubsecheadstyle{\ABNTEXsubsubsectionfont\ABNTEXsubsubsectionfontsize\ABNTEXsubsubsectionupperifneeded}
% impressao do numero do capitulo
\renewcommand{\chapternamenum}{}
@@ -412,9 +469,10 @@
% impressao do titulo do capitulo
\def\printchaptertitle##1{%
\chaptitlefont%
- \ifthenelse{\boolean{abntex@innonumchapter}}{\centering##1}{% else
+ \ifthenelse{\boolean{abntex@innonumchapter}}{\centering\ABNTEXchapterupperifneeded{##1}}{%
+ % else
\settowidth{\chapternamenumlength}{\printchaptername\printchapternum\afterchapternum}%
- \parbox[t]{\columnwidth-\chapternamenumlength}{##1}%
+ \parbox[t]{\columnwidth-\chapternamenumlength}{\ABNTEXchapterupperifneeded{##1}}%
}
}
@@ -605,7 +663,7 @@
\newenvironment{resumo}[1][\resumoname]{%
\PRIVATEbookmarkthis{#1}
\renewcommand{\abstractnamefont}{\chaptitlefont}
- \renewcommand{\abstractname}{#1}
+ \renewcommand{\abstractname}{\ABNTEXchapterupperifneeded{#1}}
\begin{abstract}
\SingleSpacing
}{\end{abstract}\PRIVATEclearpageifneeded}
@@ -613,7 +671,7 @@
\newenvironment{resumoumacoluna}[1][\resumoname]{%
\PRIVATEbookmarkthis{#1}
\renewcommand{\abstractnamefont}{\chaptitlefont}
- \renewcommand{\abstractname}{#1}
+ \renewcommand{\abstractname}{\ABNTEXchapterupperifneeded{#1}}
\begin{onecolabstract}
\SingleSpacing
}{\end{onecolabstract}\PRIVATEclearpageifneeded}
@@ -740,12 +798,13 @@
}{% else
\setlength{\ABNTEXcitacaorecuo}{4cm}
}
-\newenvironment*{citacao}{%
+\newenvironment*{citacao}[1][default]{%
\list{}%
\footnotesize%
\addtolength{\leftskip}{\ABNTEXcitacaorecuo}%
\item[]%
\begin{SingleSpace}%
+ \ifthenelse{\not\equal{#1}{default}}{\itshape\selectlanguage{#1}}{}%
}{%
\end{SingleSpace}%
\endlist}%
diff --git a/Master/texmf-dist/tex/latex/abntex2/abntex2abrev.sty b/Master/texmf-dist/tex/latex/abntex2/abntex2abrev.sty
index 11f053aa274..b4932b416da 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.6.1 laurocesar
+%% abntex2abrev.sty, v-1.7 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 ea73cd4a108..2dffe1630b1 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.6.1 laurocesar
+%% abntex2cite.sty, v-1.7 laurocesar
%% Copyright 2012-2013 by abnTeX2 group at http://abntex2.googlecode.com/
%%
%% This work may be distributed and/or modified under the
@@ -21,6 +21,9 @@
%%
%% Revision history:
%%
+%% 2013/05/22 07h05 laurocesar
+%% Adiciona a macro \footciteref para referências em notas de rodapé.
+%%
%% 2013/03/08 07h00 laurocesar
%% Corrige criaçao das macros \su@ExpandTwoArgs, \IfSubStringInString e \su@IfSubStringInString
%% importados de substr.sty: apenas criá-las se já não existirem
@@ -1359,11 +1362,15 @@
\newcommand{\cfcitename}{Cf.}
\newcommand{\etseqname}{et seq.}
+\DeclareRobustCommand{\footciteref}[1]{%
+\footnote{\citetext{#1}}
+}
+
\newcommand{\apud}[3][]{(\citeauthor{#2}, \citeyear{#2} \apudname\ %
\citeauthor{#3}, \citeyear{#3}%
\ifthenelse{\equal{#1}{\empty}}{}{, #1})}
-\newcommand{\apudonline}[3][]{\citeauthoronline{#2} (\apudname\ %
+\newcommand{\apudonline}[3][]{\citeauthoronline{#2} (\citeyear{#2} \apudname\ %
\citeauthor{#3}, \citeyear{#3}%
\ifthenelse{\equal{#1}{\empty}}{}{, #1})}