From 43fd03e6bf8a4c21b35c96f6a6a9c3112b7d7ebf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 18 Jan 2013 23:24:33 +0000 Subject: abntex2 1.3 (18jan13) git-svn-id: svn://tug.org/texlive/trunk@28864 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/abntex2/abntex2.cls | 29 ++++++++++++++-------- .../texmf-dist/tex/latex/abntex2/abntex2abrev.sty | 4 +-- .../texmf-dist/tex/latex/abntex2/abntex2cite.sty | 23 ++++++++++++++--- 3 files changed, 40 insertions(+), 16 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 07df50db84e..1a427c35221 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.2 2013/01/03 laurocesar +%% abntex2.cls, v-1.3 laurocesar %% Copyright 2012-2013 by abnTeX2 group at http://code.google.com/p/abntex2/ %% %% This work may be distributed and/or modified under the @@ -17,9 +17,16 @@ %% %% This work consists of the file abntex2.cls. %% -%% 2013.1.13 09h23 +%% 2013.1.16 18h46 laurocesar +%% Altera o \ABNTEXchapterfont para usar \sffamily +%% +%% 2013.1.15 07h43 laurocesar +%% Altera \pretextualchapyer para que insira automaticamente a opção de alterar +%% o cabeçalho da página criada com \chapter* +%% +%% 2013.1.13 09h23 laurocesar %% Altera o ambiente citacao para que receba diferentes recuos no modo -%% twocolumn +%% twocolumn %% %% 2013.1.12 21h44 laurocesar %% Corrige numeração contínua de seções quando não está no modo article @@ -171,7 +178,7 @@ % --- % Fontes padrões de part, chapter, section, subsection e subsubsection -\newcommand{\ABNTEXchapterfont}{\fontfamily{cmss}\fontseries{sbc}\selectfont} +\newcommand{\ABNTEXchapterfont}{\sffamily} \newcommand{\ABNTEXchapterfontsize}{\Huge} \newcommand{\ABNTEXpartfont}{\ABNTEXchapterfont} @@ -208,7 +215,7 @@ \newcommand{\pretextualchapter}[1]{% \addtocounter{abntex@bookmarkcounter}{1} \PRIVATEbookmarkthis{#1} - \chapter*{#1} + \chapter*[#1]{#1} } \provideboolean{abntex@apendiceousecao} \setboolean{abntex@apendiceousecao}{false} @@ -615,11 +622,11 @@ % ABNT NBR 6024/2012 - 4.2 e 4.3 \newlist{alineas}{enumerate}{2} \setlist[alineas,1]{label={\alph*)},topsep=0pt,itemsep=0pt,leftmargin=\parindent+\labelwidth-\labelsep}% -\setlist[alineas,2]{label={---},topsep=0pt,itemsep=0pt,leftmargin=*} +\setlist[alineas,2]{label={--},topsep=0pt,itemsep=0pt,leftmargin=*} \newlist{subalineas}{enumerate}{1} -\setlist[subalineas,1]{label={---},topsep=0pt,itemsep=0pt,leftmargin=*}% +\setlist[subalineas,1]{label={--},topsep=0pt,itemsep=0pt,leftmargin=*}% \newlist{incisos}{enumerate}{1} -\setlist[incisos,1]{label={---},topsep=0pt,itemsep=0pt,leftmargin=*}% +\setlist[incisos,1]{label={--},topsep=0pt,itemsep=0pt,leftmargin=*}% % --- % --- @@ -666,7 +673,7 @@ {\ABNTEXchapterfont\large\imprimirautor} \vspace*{\fill} - {\ABNTEXchapterfont\LARGE\imprimirtitulo} + {\ABNTEXchapterfont\bfseries\LARGE\imprimirtitulo} \vspace*{\fill} {\large\imprimirlocal} @@ -698,7 +705,7 @@ {\ABNTEXchapterfont\large\imprimirautor} \vspace*{\fill}\vspace*{\fill} - {\ABNTEXchapterfont\Large\imprimirtitulo} + {\ABNTEXchapterfont\bfseries\Large\imprimirtitulo} \vspace*{\fill} \abntex@ifnotempty{\imprimirpreambulo}{% @@ -744,4 +751,4 @@ \imprimirfolhaderostonostar } \makeatother -% --- \ No newline at end of file +% --- diff --git a/Master/texmf-dist/tex/latex/abntex2/abntex2abrev.sty b/Master/texmf-dist/tex/latex/abntex2/abntex2abrev.sty index 063f8026a20..e39c5566216 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.0 2013/01/01 laurocesar +%% abntex2abrev.sty, v-1.3 laurocesar %% Copyright 2012-2013 by abnTeX2 group at http://code.google.com/p/abntex2/ %% %% This work may be distributed and/or modified under the @@ -148,4 +148,4 @@ %comando para desenvolvedores, só inglês com finalização, ou seja com ponto \newcommand{\ABNTEXabrevp}[1]{\let\Abrevending\abrevending -\ABNTEXabrev{#1}\Abrevending} \ No newline at end of file +\ABNTEXabrev{#1}\Abrevending} diff --git a/Master/texmf-dist/tex/latex/abntex2/abntex2cite.sty b/Master/texmf-dist/tex/latex/abntex2/abntex2cite.sty index 2e11a2c0c1c..ecbdf3d5c31 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.1 2013/01/05 laurocesar +%% abntex2cite.sty, v-1.3 laurocesar %% Copyright 2012-2013 by abnTeX2 group at http://code.google.com/p/abntex2/ %% %% This work may be distributed and/or modified under the @@ -21,6 +21,10 @@ %% %% Revision history: %% +%% 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 +%% %% 2012/12/13 22h31 laurocesar %% Fork of the version v 1.26 2003/10/13 09:40:41 gweber created by gweber %% Changed file name to from abntcite.sty to abntex2cite.sty @@ -164,6 +168,7 @@ \RequirePackage{ifthen} \RequirePackage{calc} \RequirePackage{abntex2abrev} +\RequirePackage{setspace} %***** %%%%%% Options Declaration %%%%%% @@ -402,7 +407,13 @@ % If NO % no changes to \bibliography -\def\bibliography#1{% +\def\bibliography#1{% **** + \ifx \SingleSpacing\undefined + \singlespacing + \else + \SingleSpacing + \fi + % \ifthenelse{\boolean{ABCIciteoptionwasused} \and\boolean{ABCIauto-abntoptions}} { @@ -416,7 +427,13 @@ \immediate\write\@auxout{\string\bibdata{#1}}% \fi } - \@input@{\jobname.bbl}} + \@input@{\jobname.bbl} + \ifx \OnehalfSpacing\undefined + \onehalfspacing + \else + \OnehalfSpacing + \fi + } % -- cgit v1.2.3