From 238f059b35da01f36c7b8515a0fe1278d35c2381 Mon Sep 17 00:00:00 2001 From: Marcelo Tonon <46865047+MarceloRTonon@users.noreply.github.com> Date: Tue, 9 Jul 2024 11:07:38 -0300 Subject: [PATCH 1/3] =?UTF-8?q?Adiciona=20=20"and"=20na=20op=C3=A7=C3=A3o?= =?UTF-8?q?=20abnt-and-type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Para que o pacote abntex2cite possa ser usado em textos em inglês, e fique aparecendo "and" ao invés "e" ou "&" nas citações quando se usa \cite ou \citeonline. É a terceira opção nas preferências, sendo apenas um alternativa para quem quer usar o pacote em inglês --- bibtex/bst/abntex2/abntex2-alf.bst | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bibtex/bst/abntex2/abntex2-alf.bst b/bibtex/bst/abntex2/abntex2-alf.bst index 9dfc66b..5f9f3ed 100644 --- a/bibtex/bst/abntex2/abntex2-alf.bst +++ b/bibtex/bst/abntex2/abntex2-alf.bst @@ -243,7 +243,8 @@ FUNCTION {space.word} { " " swap$ * " " * } FUNCTION {bbl.and} { abnt.and.type #0 = {" e "} 'skip$ if$ - abnt.and.type #1 = {" \& "} 'skip$ if$} + abnt.and.type #1 = {" \& "} 'skip$ if$ + abnt.and.type #2 = {" and "} 'skip$ if$} FUNCTION {bbl.chapter} { "cap." } FUNCTION {bbl.colon} {": "} FUNCTION {bbl.editors} { "Ed." } @@ -1506,10 +1507,11 @@ FUNCTION { abnt-options2 } if$ - abnt-and-type empty$ +abnt-and-type empty$ 'skip$ {abnt-and-type "e" = {#0} {abnt-and-type "&" = - {#1} {#0} if$} if$ + {#1} {abnt-and-type "and" = + {#2} {#0} if$} if$} if$ 'abnt.and.type := "abnt-and-type" abnt-and-type abnt.display.options} if$ @@ -2032,7 +2034,7 @@ FUNCTION {set.default.abnt.variables} % "abnt-alf.bst,v " = 'abnt.alf := % #1 para abnt-alf #0 para abnt-num "$Revision: v $" extract.cvs.key 'abnt.bst.revision := - #0 'abnt.and.type := % #0 "e"; #1 "&" +#0 'abnt.and.type := % #0 "e"; #1 "&"; #2 "and" "\emph" 'abnt.emphasize := #0 'abnt.cite.style := %default norm version for NBR10520 %#0 \cite=(AUTHOR, YEAR) From 5518f1bf3c37baf522e74b82f8ee950f688f9dac Mon Sep 17 00:00:00 2001 From: Marcelo Tonon <46865047+MarceloRTonon@users.noreply.github.com> Date: Tue, 9 Jul 2024 11:17:59 -0300 Subject: [PATCH 2/3] update doc para abnt-and-type=and MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adiciona a opção `and' para `abnt-and-type' na documentação abntex2cite-alf. --- doc/latex/abntex2/abntex2cite-alf.tex | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/latex/abntex2/abntex2cite-alf.tex b/doc/latex/abntex2/abntex2cite-alf.tex index 71e70b4..9ca0aa0 100644 --- a/doc/latex/abntex2/abntex2cite-alf.tex +++ b/doc/latex/abntex2/abntex2cite-alf.tex @@ -819,6 +819,8 @@ \section{Alteração do estilo alfabético \texttt{citeoption}} \emph{abnt-and-type} & & determina de que maneira é formatado o \emph{and}.\\ \texttt{abnt-and-type=e} & \optiondefaultval{e}& Usa `e' como em `Fonseca e Paiva'.\\ \texttt{abnt-and-type=\&} & \texttt{\&} & Usa `\&' como em `Fonseca \& Paiva'. +\texttt{abnt-and-type=and} & \texttt{\&} & Usa `and' como em `Fonseca and Paiva' (inglês).\\ + \\ \hline \emph{abnt-etal-cite} & & controla como e quando os co-autores são substituídos por \emph{et al.}. Note que a substituição From 0be79233850c323497e47feb0a810fc8532df97b Mon Sep 17 00:00:00 2001 From: Marcelo Tonon <46865047+MarceloRTonon@users.noreply.github.com> Date: Mon, 29 Jul 2024 09:58:41 -0300 Subject: [PATCH 3/3] Update abntex2-options.bib add "and" and "Author YEAR" in the bib file --- bibtex/bib/abntex2/abntex2-options.bib | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bibtex/bib/abntex2/abntex2-options.bib b/bibtex/bib/abntex2/abntex2-options.bib index b68d051..7ca8805 100644 --- a/bibtex/bib/abntex2/abntex2-options.bib +++ b/bibtex/bib/abntex2/abntex2-options.bib @@ -122,16 +122,20 @@ @ABNT-options key="aaaa"} @ABNT-options{abnt-nbr10520=2002, abnt-cite-style="(AUTHOR, YEAR)", - abnt-and-type="e", + abnt-and-type="and", key="aaaa"} @ABNT-options{abnt-nbr10520=2001, abnt-cite-style="(AUTHOR, YEAR)", - abnt-and-type="e", + abnt-and-type="and", key="aaaa"} @ABNT-options{abnt-nbr10520=1988, abnt-cite-style="(Author, YEAR)", abnt-and-type="&", key="aaaa"} + @ABNT-options{abnt-nbr10520=2023, + abnt-cite-style="(Author, YEAR)", + abnt-and-type="and", + key="aaaa"} @ABNT-options{abnt-no-etal-label=yes, abnt-etal-text="et al.", key="aaaa"}