From 4f71394ce1666f87e24b0929203275f6509be4f5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 27 May 2013 23:08:58 +0000 Subject: abntex2 (27may13) git-svn-id: svn://tug.org/texlive/trunk@30737 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/bibtex/bst/abntex2/abntex2-alf.bst | 9 ++++++--- .../texmf-dist/bibtex/bst/abntex2/abntex2-num.bst | 7 +++++-- Master/texmf-dist/doc/latex/abntex2/README | 9 +++++---- .../doc/latex/abntex2/abntex2-modelo-artigo.pdf | Bin 329888 -> 329889 bytes .../doc/latex/abntex2/abntex2-modelo-artigo.tex | 4 ++-- .../latex/abntex2/abntex2-modelo-glossarios.pdf | Bin 479179 -> 479474 bytes .../latex/abntex2/abntex2-modelo-glossarios.tex | 4 ++-- .../abntex2/abntex2-modelo-include-comandos.tex | 2 +- .../abntex2/abntex2-modelo-projeto-pesquisa.pdf | Bin 484494 -> 484795 bytes .../abntex2/abntex2-modelo-projeto-pesquisa.tex | 4 ++-- .../abntex2/abntex2-modelo-relatorio-tecnico.pdf | Bin 498617 -> 498919 bytes .../abntex2/abntex2-modelo-relatorio-tecnico.tex | 4 ++-- .../abntex2/abntex2-modelo-trabalho-academico.pdf | Bin 506319 -> 506634 bytes .../abntex2/abntex2-modelo-trabalho-academico.tex | 4 ++-- Master/texmf-dist/doc/latex/abntex2/abntex2.pdf | Bin 699127 -> 699071 bytes Master/texmf-dist/doc/latex/abntex2/abntex2.tex | 4 ++-- .../doc/latex/abntex2/abntex2cite-alf.pdf | Bin 550865 -> 552147 bytes .../doc/latex/abntex2/abntex2cite-alf.tex | 4 ++-- .../texmf-dist/doc/latex/abntex2/abntex2cite.pdf | Bin 959068 -> 960937 bytes .../texmf-dist/doc/latex/abntex2/abntex2cite.tex | 4 ++-- Master/texmf-dist/tex/latex/abntex2/abntex2.cls | 2 +- .../texmf-dist/tex/latex/abntex2/abntex2abrev.sty | 2 +- .../texmf-dist/tex/latex/abntex2/abntex2cite.sty | 2 +- 23 files changed, 36 insertions(+), 29 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/bibtex/bst/abntex2/abntex2-alf.bst b/Master/texmf-dist/bibtex/bst/abntex2/abntex2-alf.bst index 30f20dffca0..0c726f2babf 100644 --- a/Master/texmf-dist/bibtex/bst/abntex2/abntex2-alf.bst +++ b/Master/texmf-dist/bibtex/bst/abntex2/abntex2-alf.bst @@ -25,6 +25,9 @@ %% %% Revision history: %% +%% 2013/05/26 laurocesar +%% Corrige problemas de duplicação de ano nas funções article e jornalpart +%% %% 2013/02/28 caduarte7@gmail.com %% Complete Fix iso-690-1987 option: year was placed for %% twicebooklet, journalpart, manual, misc, unpublished, patent and unpublished @@ -1693,9 +1696,9 @@ FUNCTION {article} iso.year.label format.title "title" output.check new.block format.journal output -% iso.date.place {format.date output} 'skip$ if$ - iso.date.place {abnt.alf 'skip$ {format.year output new.sentence} if$} -% {format.year output new.sentence} if$ + iso.date.place {format.date output} 'skip$ if$ + %iso.date.place {abnt.alf 'skip$ {format.year output new.sentence} if$} + % {format.year output new.sentence} if$ section "section" bibinfo.check output.dash publisher "publisher" bibinfo.check output address "address" bibinfo.check output diff --git a/Master/texmf-dist/bibtex/bst/abntex2/abntex2-num.bst b/Master/texmf-dist/bibtex/bst/abntex2/abntex2-num.bst index 968180899b8..49d1ba5cc8d 100644 --- a/Master/texmf-dist/bibtex/bst/abntex2/abntex2-num.bst +++ b/Master/texmf-dist/bibtex/bst/abntex2/abntex2-num.bst @@ -25,6 +25,9 @@ %% %% Revision history: %% +%% 2013/05/26 laurocesar +%% Corrige problemas de duplicação de ano nas funções article e jornalpart +%% %% 2013/02/28 caduarte7@gmail.com %% Complete Fix iso-690-1987 option: year was placed for %% twicebooklet, journalpart, manual, misc, unpublished, patent and unpublished @@ -1693,8 +1696,8 @@ FUNCTION {article} iso.year.label format.title "title" output.check new.block format.journal output - %iso.date.place {format.date output} 'skip$ if$ - iso.date.place {abnt.alf 'skip$ {format.year output new.sentence} if$} + iso.date.place {format.date output} 'skip$ if$ + %iso.date.place {abnt.alf 'skip$ {format.year output new.sentence} if$} % {format.year output} if$ section "section" bibinfo.check output.dash publisher "publisher" bibinfo.check output diff --git a/Master/texmf-dist/doc/latex/abntex2/README b/Master/texmf-dist/doc/latex/abntex2/README index f12e7316f26..dada7599743 100644 --- a/Master/texmf-dist/doc/latex/abntex2/README +++ b/Master/texmf-dist/doc/latex/abntex2/README @@ -13,7 +13,7 @@ assist the preparation of technical and scientific documents academic papers) based on ABNT (Associação Brasileira de Normas Técnicas) rules used in Brazil. -The latest version of abnTeX2 is v-1.7. +The latest version of abnTeX2 is v-1.7.1. SUMMARY ----------------------------------------------------------------- @@ -28,19 +28,20 @@ SUMMARY CHANGE HISTORY ----------------------------------------------------------------- + 2013/05/26 - v1.7.1 + . fixed bibliography format for article and journalpart + 2013/05/25 - v1.7 . added an optional argument to the citacao environment: language. Now the quoted text in foreign language is automatically written in italics and the right hyphenation system is selected. Use as: - \begin{citacao}[franch]Texte français.\end{citacao} + \begin{citacao}[french]Texte français.\end{citacao} . added new options chapter=TITLE, section=TITLE, subsection=TITLE and subsubsection=TITLE to the abntex2.cls class. These options change the sections and chapter titles to upper case; . added macro \footciteref to abntex2cite that prints a bibliography reference as a footnote in accordance to ABNT NBR 10520:2002 section 7.1. . added xindy instructions in glossary model; - . added macro \footciteref to abntex2cite that prints a bibliography reference - as a footnote in accordance to ABNT NBR 10520:2002 section 7.1. . fixed abntex2cite's table 4: there was a line written twice; . changed class options declaration in all examples; . fixed wrong \setsecheadstyle implementation that prevented font section be diff --git a/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-artigo.pdf b/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-artigo.pdf index ec24c5f7304..ac4b6c51179 100644 Binary files a/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-artigo.pdf and b/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-artigo.pdf differ diff --git a/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-artigo.tex b/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-artigo.tex index 4972c793a82..ab2d8b7cf80 100644 --- a/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-artigo.tex +++ b/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-artigo.tex @@ -1,4 +1,4 @@ -%% abtex2-modelo-artigo.tex, v-1.7 laurocesar +%% abtex2-modelo-artigo.tex, v-1.7.1 laurocesar %% Copyright 2012-2013 by abnTeX2 group at http://abntex2.googlecode.com/ %% %% This work may be distributed and/or modified under the @@ -99,7 +99,7 @@ César Araujo\thanks{laurocesar@laurocesar.com}} \local{Brasil} -\data{2013, v-1.7} +\data{2013, v-1.7.1} % --- % --- diff --git a/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-glossarios.pdf b/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-glossarios.pdf index 5d55806027a..9465641a950 100644 Binary files a/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-glossarios.pdf and b/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-glossarios.pdf differ diff --git a/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-glossarios.tex b/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-glossarios.tex index 55a5d2133a8..6e47a0c0ba9 100644 --- a/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-glossarios.tex +++ b/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-glossarios.tex @@ -1,4 +1,4 @@ -%% abtex2-modelo-glossarios.tex, v-1.7 laurocesar +%% abtex2-modelo-glossarios.tex, v-1.7.1 laurocesar %% Copyright 2012-2013 by abnTeX2 group at http://abntex2.googlecode.com/ %% %% This work may be distributed and/or modified under the @@ -79,7 +79,7 @@ \titulo{Exemplo de uso de glossário com \abnTeX} \autor{Equipe \abnTeX} \local{Brasil} -\data{2013, v-1.7} +\data{2013, v-1.7.1} \orientador{Lauro César Araujo} \coorientador{Equipe \abnTeX} \instituicao{% diff --git a/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-include-comandos.tex b/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-include-comandos.tex index 325765806b4..e613851a404 100644 --- a/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-include-comandos.tex +++ b/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-include-comandos.tex @@ -1,4 +1,4 @@ -%% abtex2-modelo-include-comandos.tex, v-1.7 laurocesar +%% abtex2-modelo-include-comandos.tex, v-1.7.1 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/doc/latex/abntex2/abntex2-modelo-projeto-pesquisa.pdf b/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-projeto-pesquisa.pdf index 8d8f83493a4..06c8d22dd11 100644 Binary files a/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-projeto-pesquisa.pdf and b/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-projeto-pesquisa.pdf differ diff --git a/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-projeto-pesquisa.tex b/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-projeto-pesquisa.tex index e2cfd22e9d0..ca7af5cdd2c 100644 --- a/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-projeto-pesquisa.tex +++ b/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-projeto-pesquisa.tex @@ -1,4 +1,4 @@ -%% abtex2-modelo-projeto-pesquisa.tex, v-1.7 laurocesar +%% abtex2-modelo-projeto-pesquisa.tex, v-1.7.1 laurocesar %% Copyright 2012-2013 by abnTeX2 group at http://abntex2.googlecode.com/ %% %% This work may be distributed and/or modified under the @@ -100,7 +100,7 @@ \titulo{Modelo Canônico de\\ Projeto de pesquisa com \abnTeX} \autor{Equipe \abnTeX} \local{Brasil} -\data{2013, v-1.7} +\data{2013, v-1.7.1} \instituicao{% Universidade do Brasil -- UBr \par diff --git a/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-relatorio-tecnico.pdf b/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-relatorio-tecnico.pdf index 8ec977a4e43..3b508917c09 100644 Binary files a/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-relatorio-tecnico.pdf and b/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-relatorio-tecnico.pdf differ diff --git a/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-relatorio-tecnico.tex b/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-relatorio-tecnico.tex index 4eeb6c63bea..96f8f68d9da 100644 --- a/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-relatorio-tecnico.tex +++ b/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-relatorio-tecnico.tex @@ -1,4 +1,4 @@ -%% abtex2-modelo-relatorio-tecnico.tex, v-1.7 laurocesar +%% abtex2-modelo-relatorio-tecnico.tex, v-1.7.1 laurocesar %% Copyright 2012-2013 by abnTeX2 group at http://abntex2.googlecode.com/ %% %% This work may be distributed and/or modified under the @@ -108,7 +108,7 @@ \titulo{Modelo Canônico de\\ Relatório Técnico e/ou Científico com \abnTeX} \autor{Equipe \abnTeX} \local{Brasil} -\data{2013, v-1.7} +\data{2013, v-1.7.1} \instituicao{% Universidade do Brasil -- UBr \par diff --git a/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-trabalho-academico.pdf b/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-trabalho-academico.pdf index ab0c6fba67d..9b89a989a38 100644 Binary files a/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-trabalho-academico.pdf and b/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-trabalho-academico.pdf differ diff --git a/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-trabalho-academico.tex b/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-trabalho-academico.tex index cb3543d0439..f62bd8f2e3d 100644 --- a/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-trabalho-academico.tex +++ b/Master/texmf-dist/doc/latex/abntex2/abntex2-modelo-trabalho-academico.tex @@ -1,4 +1,4 @@ -%% abtex2-modelo-trabalho-academico.tex, v-1.7 laurocesar +%% abtex2-modelo-trabalho-academico.tex, v-1.7.1 laurocesar %% Copyright 2012-2013 by abnTeX2 group at http://abntex2.googlecode.com/ %% %% This work may be distributed and/or modified under the @@ -104,7 +104,7 @@ \titulo{Modelo Canônico de\\ Trabalho Acadêmico com \abnTeX} \autor{Equipe \abnTeX} \local{Brasil} -\data{2013, v-1.7} +\data{2013, v-1.7.1} \orientador{Lauro César Araujo} \coorientador{Equipe \abnTeX} \instituicao{% diff --git a/Master/texmf-dist/doc/latex/abntex2/abntex2.pdf b/Master/texmf-dist/doc/latex/abntex2/abntex2.pdf index c78542d0be5..0e19f2b412e 100644 Binary files a/Master/texmf-dist/doc/latex/abntex2/abntex2.pdf and b/Master/texmf-dist/doc/latex/abntex2/abntex2.pdf differ diff --git a/Master/texmf-dist/doc/latex/abntex2/abntex2.tex b/Master/texmf-dist/doc/latex/abntex2/abntex2.tex index 0b2de0e5f51..2d5183c57d6 100644 --- a/Master/texmf-dist/doc/latex/abntex2/abntex2.tex +++ b/Master/texmf-dist/doc/latex/abntex2/abntex2.tex @@ -1,4 +1,4 @@ -%% abtex2.tex, v-1.7 laurocesar +%% abtex2.tex, v-1.7.1 laurocesar %% Copyright 2012-2013 by abnTeX2 group at http://code.google.com/p/abntex2/ %% %% This work may be distributed and/or modified under the @@ -207,7 +207,7 @@ técnicos e científicos brasileiros \\compatíveis com as normas ABNT}} \and Lauro César Araujo\\\url{laurocesar@laurocesar.com}} -\date{\today, v-1.7} +\date{\today, v-1.7.1} \hypersetup{ pdftitle={A classe abntex2}, diff --git a/Master/texmf-dist/doc/latex/abntex2/abntex2cite-alf.pdf b/Master/texmf-dist/doc/latex/abntex2/abntex2cite-alf.pdf index 99ff197a5ae..78f1651616a 100644 Binary files a/Master/texmf-dist/doc/latex/abntex2/abntex2cite-alf.pdf and b/Master/texmf-dist/doc/latex/abntex2/abntex2cite-alf.pdf differ diff --git a/Master/texmf-dist/doc/latex/abntex2/abntex2cite-alf.tex b/Master/texmf-dist/doc/latex/abntex2/abntex2cite-alf.tex index c1808c69348..45d4f772e9c 100644 --- a/Master/texmf-dist/doc/latex/abntex2/abntex2cite-alf.tex +++ b/Master/texmf-dist/doc/latex/abntex2/abntex2cite-alf.tex @@ -1,4 +1,4 @@ -%% abntex2cite-alf.tex, v-1.7 laurocesar +%% abntex2cite-alf.tex, v-1.7.1 laurocesar %% Copyright 2012-2013 by abnTeX2 group at http://code.google.com/p/abntex2/ %% %% This work may be distributed and/or modified under the @@ -210,7 +210,7 @@ específicos da ABNT NBR 10520:2002 e o \\ estilo bibliográfico alfabético \author{Equipe \abnTeX2\\\abnTeXSite \and Lauro César Araujo\\\url{laurocesar@laurocesar.com}} -\date{\today, v-1.7} +\date{\today, v-1.7.1} \maketitle diff --git a/Master/texmf-dist/doc/latex/abntex2/abntex2cite.pdf b/Master/texmf-dist/doc/latex/abntex2/abntex2cite.pdf index 376baafd2fb..37e5f0b9ca6 100644 Binary files a/Master/texmf-dist/doc/latex/abntex2/abntex2cite.pdf and b/Master/texmf-dist/doc/latex/abntex2/abntex2cite.pdf differ diff --git a/Master/texmf-dist/doc/latex/abntex2/abntex2cite.tex b/Master/texmf-dist/doc/latex/abntex2/abntex2cite.tex index 2b9d91185b4..bcbbcb74a8d 100644 --- a/Master/texmf-dist/doc/latex/abntex2/abntex2cite.tex +++ b/Master/texmf-dist/doc/latex/abntex2/abntex2cite.tex @@ -1,4 +1,4 @@ -%% abntex2cite.tex, v-1.7 laurocesar +%% abntex2cite.tex, v-1.7.1 laurocesar %% Copyright 2012-2013 by abnTeX2 group at http://code.google.com/p/abntex2/ %% %% This work may be distributed and/or modified under the @@ -293,7 +293,7 @@ parana1997,microsoft1995,mpc1993,sony1990,accioly2000} \author{Equipe \abnTeX2\\\abnTeXSite \and Lauro César Araujo\\\url{laurocesar@laurocesar.com}} -\date{\today, v-1.7} +\date{\today, v-1.7.1} %end{latexonly} diff --git a/Master/texmf-dist/tex/latex/abntex2/abntex2.cls b/Master/texmf-dist/tex/latex/abntex2/abntex2.cls index 7ce92b4c740..7e68194e71e 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 laurocesar +%% abntex2.cls, v-1.7.1 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/abntex2abrev.sty b/Master/texmf-dist/tex/latex/abntex2/abntex2abrev.sty index b4932b416da..28cfa2ad8bb 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 laurocesar +%% abntex2abrev.sty, v-1.7.1 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 2dffe1630b1..ffc74bb90eb 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 laurocesar +%% abntex2cite.sty, v-1.7.1 laurocesar %% Copyright 2012-2013 by abnTeX2 group at http://abntex2.googlecode.com/ %% %% This work may be distributed and/or modified under the -- cgit v1.2.3