From 36c552d0c50c8963c1b2bc835b68e66c398a0b4b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 25 Nov 2018 22:08:00 +0000 Subject: abntex2 (25nov18) git-svn-id: svn://tug.org/texlive/trunk@49248 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/abntex2/abntex2.cls | 28 ++++++++++++++-------- .../texmf-dist/tex/latex/abntex2/abntex2abrev.sty | 4 ++-- .../texmf-dist/tex/latex/abntex2/abntex2cite.sty | 10 ++++---- 3 files changed, 25 insertions(+), 17 deletions(-) (limited to 'Master/texmf-dist/tex/latex/abntex2') diff --git a/Master/texmf-dist/tex/latex/abntex2/abntex2.cls b/Master/texmf-dist/tex/latex/abntex2/abntex2.cls index e25c3faa869..6be8cd79477 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.6 laurocesar -%% Copyright 2012-2016 by abnTeX2 group at https://www.abntex.net.br/ +%% abntex2.cls, v-1.9.7 laurocesar +%% Copyright 2012-2018 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}[2016/02/26 v-1.9.6 abnTeX2] +\ProvidesClass{abntex2}[2018/11/24 v-1.9.7 abnTeX2] \RequirePackage{ifthen} % % Captura as options article e twocolumn @@ -366,7 +366,6 @@ } % Define o comando \fonte que respeita as configurações de caption do memoir ou do caption -\makeatletter \newcommand{\fonte}[2][\fontename]{% \M@gettitle{#2}% \memlegendinfo{#2}% @@ -381,12 +380,9 @@ \captiondelim{\ABNTEXcaptionfontedelim} \@makecaption{\ABNTEXfontereduzida #1}{\ignorespaces\ABNTEXfontereduzida #2}\par \endgroup} -\makeatother % Define o comando \notas que respeita as configurações de caption do memoir ou do caption -\makeatletter \newcommand{\nota}[2][\notaname]{\fonte[#1]{#2}} -\makeatother % Altera os comandos \configurecaptions e \configureseparator para trabalhar com @@ -519,7 +515,7 @@ % % Fontes das entradas do sumario % - \renewcommand{\cftpartfont}{\bfseries\larger} + \renewcommand{\cftpartfont}{\bfseries\large} % \renewcommand{\cftchapterfont}{\bfseries} \renewcommand{\cftchapterpagefont}{\normalsize\cftchapterfont} @@ -543,7 +539,7 @@ \bibmark \ifnobibintoc\else \phantomsection - \addcontentsline{toc}{chapter}{\uppercase{\bibname}} + \addcontentsline{toc}{chapter}{\texorpdfstring{\MakeTextUppercase{\bibname}}{\bibname}} \fi \prebibhook } @@ -698,6 +694,11 @@ \newcommand{\titulo}[1]{\title{#1}} \newcommand{\imprimirtitulo}{\thetitle} +% Comandos de dados - titulo do documento +\newcommand{\tituloestrangeiro}[1]{\providecommand{\theforeigntitle}{#1}} +\newcommand{\imprimirtituloestrangeiro}{\theforeigntitle} + + % Comandos de dados - autor (use \and para multiplos autores) \newcommand{\autor}[1]{\author{#1}} \newcommand{\imprimirautor}{\theauthor} @@ -749,6 +750,13 @@ \newenvironment{capa}{\begin{titlingpage}}{\end{titlingpage}\cleardoublepage} % --- +% --- +% Titulos em lingua estrangeira para artigos: ABNT NBR 6022:2018 +\ifthenelse{\equal{\ABNTEXisarticle}{true}}{% +\renewcommand{\maketitlehookb}{\LARGE\center\textit{\theforeigntitle}} +}{} +% --- + % --- % Ficha catalografica (Dados internacionais de % catalogação-na-publicacao) @@ -850,7 +858,7 @@ % --- % --- -% Lista de sembolos +% Lista de simbolos \newenvironment{simbolos}{% \pretextualchapter{\listadesimbolosname} \begin{symbols} diff --git a/Master/texmf-dist/tex/latex/abntex2/abntex2abrev.sty b/Master/texmf-dist/tex/latex/abntex2/abntex2abrev.sty index c7c7462a889..d19404d9930 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.6 laurocesar -%% Copyright 2012-2016 by abnTeX2 group at https://www.abntex.net.br/ +%% abntex2abrev.sty, v-1.9.7 laurocesar +%% Copyright 2012-2018 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 6865e552d0a..931d312083e 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.6 laurocesar -%% Copyright 2012-2016 by abnTeX2 group at https://www.abntex.net.br/ +%% abntex2cite.sty, v-1.9.7 laurocesar +%% Copyright 2012-2018 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}[2016/02/26 v-1.9.6 abnTeX2] +\ProvidesPackage{abntex2cite}[2018/11/24 v-1.9.7 abnTeX2] \RequirePackage{ifthen} \RequirePackage{calc} \RequirePackage{abntex2abrev} @@ -544,8 +544,8 @@ %we are repeating \bibcite command as defined in hyperref.sty %so that we have it all together at one place. \ifthenelse{\boolean{ABNThyperref}}{% -\renewcommand{\bibcite}[2]{% - \@newl@bel{b}{#1}{\hyper@@link[cite]{}{cite.#1}{#2}}}% +%\renewcommand{\bibcite}[2]{% +% \@newl@bel{b}{#1}{\hyper@@link[cite]{}{cite.#1}{#2}}}% \newcommand{\bibciteEXPL}[2]{% \@newl@bel{b}{#1++EXPL}{\hyper@@link[cite]{}{cite.#1}{#2}}}% \newcommand{\bibciteIMPL}[2]{% -- cgit v1.2.3