Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adiciona a opção do and' em abnt-and-type` #267

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions bibtex/bib/abntex2/abntex2-options.bib
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
10 changes: 6 additions & 4 deletions bibtex/bst/abntex2/abntex2-alf.bst
Original file line number Diff line number Diff line change
Expand Up @@ -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." }
Expand Down Expand Up @@ -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$
Expand Down Expand Up @@ -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<VERSION> $" 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)
Expand Down
2 changes: 2 additions & 0 deletions doc/latex/abntex2/abntex2cite-alf.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down