abntex2 (24feb13)

git-svn-id: svn://tug.org/texlive/trunk@29221 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 30 insertions, 8 deletions

diff --git a/Master/texmf-dist/bibtex/bst/abntex2/abntex2-alf.bst b/Master/texmf-dist/bibtex/bst/abntex2/abntex2-alf.bst
index 9a834b0c792..ca583cb7fea 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/02/21 21h52 caduarte7@gmail.com (revision by laurocesar)
+%%  Fix iso-690-1987 option: year was placed twice
+%%
 %% 2012/12/12 21h48 laurocesar
 %% Fork of the version v 1.45.2.1 2004/11/02 15:17:44 created by gweber
 %% Change file name to from abnt-alf.bst to abntex2-alf.bst
@@ -1686,7 +1689,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 {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
@@ -1752,7 +1757,9 @@ FUNCTION {inbook}
   format.furtherresp new.sentence
   format.edition output new.sentence
   format.publisher.address output
-  format.year output new.sentence
+  %format.year output new.sentence
+  iso.date.place {abnt.alf 'skip$ {format.year output new.sentence} if$}
+                 {format.year output new.sentence} if$
   format.bvolume.if.no.series output
   format.volume.number.series output
   format.chapter.pages output new.sentence
@@ -1770,7 +1777,9 @@ FUNCTION {incollection}
   format.in.ed.booktitle
   format.edition output new.sentence
   format.publisher.address output
-  format.year output
+  %format.year output
+  iso.date.place {abnt.alf 'skip$ {format.year output new.sentence} if$}
+                 {format.year output} if$
   format.volume.number.series output new.sentence
   format.bvolume.if.no.series output
   format.chapter.pages output new.sentence
@@ -1786,7 +1795,9 @@ FUNCTION {inproceedings}
   format.title "title" output.check  new.sentence
   format.in.ed.booktitle
   format.publisher.address output
-  format.year output new.sentence
+  %format.year output new.sentence
+  iso.date.place {abnt.alf 'skip$ {format.year output new.sentence} if$}
+                 {format.year output new.sentence} if$
   format.bvolume.if.no.series output
   format.volume.number.series output
   format.pages output
diff --git a/Master/texmf-dist/bibtex/bst/abntex2/abntex2-num.bst b/Master/texmf-dist/bibtex/bst/abntex2/abntex2-num.bst
index 741dbbcbe1a..53cbc9acbb7 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/02/21 21h52 caduarte7@gmail.com (revision by laurocesar)
+%%  Fix iso-690-1987 option: year was placed twice
+%%
 %% 2012/12/12 22h14 laurocesar
 %% Fork of the version v 1.42.2.1 2004/11/02 15:18:21 created by gweber
 %% Change file name to from abnt-num.bst to abntex2-num.bst
@@ -1686,7 +1689,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 {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
   address "address" bibinfo.check output
@@ -1752,7 +1757,9 @@ FUNCTION {inbook}
   format.furtherresp new.sentence
   format.edition output new.sentence
   format.publisher.address output
-  format.year output new.sentence
+  %format.year output new.sentence
+  iso.date.place {abnt.alf 'skip$ {format.year output new.sentence} if$}
+                 {format.year output new.sentence} if$
   format.bvolume.if.no.series output
   format.volume.number.series output
   format.chapter.pages output new.sentence
@@ -1770,7 +1777,9 @@ FUNCTION {incollection}
   format.in.ed.booktitle
   format.edition output new.sentence
   format.publisher.address output
-  format.year output
+  %format.year output
+  iso.date.place {abnt.alf 'skip$ {format.year output new.sentence} if$}
+                 {format.year output} if$
   format.volume.number.series output new.sentence
   format.bvolume.if.no.series output
   format.chapter.pages output new.sentence
@@ -1786,7 +1795,9 @@ FUNCTION {inproceedings}
   format.title "title" output.check  new.sentence
   format.in.ed.booktitle
   format.publisher.address output
-  format.year output new.sentence
+  %format.year output new.sentence
+  iso.date.place {abnt.alf 'skip$ {format.year output new.sentence} if$}
+                 {format.year output new.sentence} if$
   format.bvolume.if.no.series output
   format.volume.number.series output
   format.pages output