diff options
author | Karl Berry <karl@freefriends.org> | 2013-08-26 21:55:55 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-08-26 21:55:55 +0000 |
commit | 1bf4015ca1580b0869078401e07401a088f7d9ca (patch) | |
tree | 97e7bafaef1a697e87ed0e4e0fa40059da8c9fb4 /Master/texmf-dist/tex/latex/abntex2 | |
parent | 420247f34c57d86d8a7f78f236b9b77f752042c5 (diff) |
abntex2 (26aug13)
git-svn-id: svn://tug.org/texlive/trunk@31522 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/abntex2')
-rw-r--r-- | Master/texmf-dist/tex/latex/abntex2/abntex2.cls | 115 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/abntex2/abntex2abrev.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/abntex2/abntex2cite.sty | 2 |
3 files changed, 110 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/abntex2/abntex2.cls b/Master/texmf-dist/tex/latex/abntex2/abntex2.cls index 7e68194e71e..dc802bdd67c 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.7.1 laurocesar +%% abntex2.cls, v-1.8 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,13 @@ %% %% This work consists of the file abntex2.cls. %% +%% 2013.8.19 07h27 sggranja +%% Adiciona macros \IBGEtab e \fonte +%% +%% 2013.6.20 07h27 laurocesar / ricardoerikson +%% Adiciona condição para a criação de length \chapternamenumlength na +%% definição do chapterstyle abnt +%% %% 2013.5.24 10h29 laurocesar %% Adiciona a opção language ao ambiente citacao. %% @@ -121,7 +128,7 @@ % ------------------------------------------------------------------------ % ------------------------------------------------------------------------ \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{abntex2}[2013/06/01 v1.7 abnTeX2] +\ProvidesClass{abntex2}[2013/09/01 v1.8 abnTeX2] \RequirePackage{ifthen} % % Captura as options article e twocolumn @@ -224,6 +231,8 @@ \newcommand{\resumoname}{Resumo} \newcommand{\listadesiglasname}{Lista de abreviaturas e siglas} \newcommand{\listadesimbolosname}{Lista de s\'imbolos} +\newcommand{\fontename}{Fonte} +\newcommand{\notaname}{Nota} % \addto\captionsbrazil{% portugues-brasil %% ajusta nomes padroes do babel @@ -255,6 +264,8 @@ \renewcommand{\resumoname}{Abstract} \renewcommand{\listadesiglasname}{List of abbreviations and acronyms} \renewcommand{\listadesimbolosname}{List of symbols} + \renewcommand{\fontename}{Source} + \renewcommand{\notaname}{Note} %% adjusts names used by \autoref \renewcommand{\pageautorefname}{page} \renewcommand{\sectionautorefname}{section} @@ -400,9 +411,80 @@ % --- % Estilos de caption +\hangcaption \captiondelim{\space--\space} -\captionnamefont{\ABNTEXfontereduzida} -\captiontitlefont{\ABNTEXfontereduzida} +%\captionnamefont{\ABNTEXfontereduzida} +%\captiontitlefont{\ABNTEXfontereduzida} + +% Para uso com pacotes subfig e caption dentro do memoir se estes forem carregados ou não. +% É necessário para que os comandos \IBGEtab e \fonte funcionem +% independente do carregamento de pacotes externos ao memoir que tratam captions. +\AtBeginDocument{% + % comandos auxiliares para manipular os captions dentro do comando \IBGEtab. + \newcommand{\configurecaptions}{\captionstyle[\raggedright]{}} + \newcommand{\configureseparator}{\captiondelim{: }} + % Define o comando \IBGEtab{}{}{} com caption e legenda da largura do conteúdo tabular, tabular*, etc + % Parece funcionar com qualque pacote + \newsavebox{\myptabbox} + \newlength{\myptabboxwidth} + \newcommand{\IBGEtab}[3]{% + \savebox{\myptabbox}{{#2}}% + \settowidth{\myptabboxwidth}{\usebox{\myptabbox}}% + \centering% + \parbox{\myptabboxwidth}{% + \configurecaptions + #1% + \par% + %\usebox{\myptabbox}% + {\ABNTEXfontereduzida% + #2% + }% + \par% + #3}% + } + \let\ibgetab\IBGEtab +} + +% 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}% + \par + \begingroup + \@parboxrestore + \if@minipage + \@setminipage + \fi + \ABNTEXfontereduzida + \configureseparator + \@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 +% o pacote caption e amigos. +\AtEndPackage{caption}{ + \AtBeginDocument{% + \DeclareCaptionLabelSeparator{barr}{~--~} + \DeclareCaptionFont{ABNTEXfontereduzida}{\ABNTEXfontereduzida} + \captionsetup{format=hang, + labelseparator=barr, + %labelfont=ABNTEXfontereduzida, + %font=ABNTEXfontereduzida + } + \renewcommand{\configurecaptions}{% + \captionsetup{justification=justified,% + singlelinecheck=false}} + \renewcommand{\configureseparator}{\captionsetup{labelsep=colon}} + } +} % --- % ----- @@ -436,7 +518,9 @@ \makechapterstyle{abnt}{% \renewcommand{\chapterheadstart}{} - \newlength{\chapternamenumlength} + \ifx \chapternamenumlength \undefined + \newlength{\chapternamenumlength} + \fi % tamanhos de fontes de chapter e part \ifthenelse{\equal{\ABNTEXisarticle}{true}}{% @@ -660,12 +744,30 @@ % --- % Resumo e abstracts em diferentes idiomas - NBR 14724/2011 + +% altera as margens padrões do memoir para abstract caso nao seja article +\ifthenelse{\equal{\ABNTEXisarticle}{true}}{% + % em artigos, margens e fontes são as mesmas de memoir + }{ % else + % Ajusta as margens para serem a mesma do documento + \setlength\absleftindent{0cm} + \setlength\absrightindent{0cm} + % Garante que a fonte do texto do abstract será a mesma do documento, pois + % na classe memoir está \small + \abstracttextfont{\normalfont\normalsize} + } + +% A norma não diz nada sobre identação e separação entre parágrafos no abstract, +% porém o uso mostra que muitos abstracts são montados sem identação. +\AtBeginDocument{% + \setlength{\absparindent}{0pt} +} + \newenvironment{resumo}[1][\resumoname]{% \PRIVATEbookmarkthis{#1} \renewcommand{\abstractnamefont}{\chaptitlefont} \renewcommand{\abstractname}{\ABNTEXchapterupperifneeded{#1}} \begin{abstract} - \SingleSpacing }{\end{abstract}\PRIVATEclearpageifneeded} \newenvironment{resumoumacoluna}[1][\resumoname]{% @@ -673,7 +775,6 @@ \renewcommand{\abstractnamefont}{\chaptitlefont} \renewcommand{\abstractname}{\ABNTEXchapterupperifneeded{#1}} \begin{onecolabstract} - \SingleSpacing }{\end{onecolabstract}\PRIVATEclearpageifneeded} % --- diff --git a/Master/texmf-dist/tex/latex/abntex2/abntex2abrev.sty b/Master/texmf-dist/tex/latex/abntex2/abntex2abrev.sty index 28cfa2ad8bb..09e3c5c63c2 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.7.1 laurocesar +%% abntex2abrev.sty, v-1.8 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 ffc74bb90eb..2ff293db841 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.7.1 laurocesar +%% abntex2cite.sty, v-1.8 laurocesar %% Copyright 2012-2013 by abnTeX2 group at http://abntex2.googlecode.com/ %% %% This work may be distributed and/or modified under the |