From 9189ec48fe9d56f12e7e17b0309331801125770c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 17 Nov 2018 22:23:15 +0000 Subject: biblatex-abnt (17nov18) git-svn-id: svn://tug.org/texlive/trunk@49179 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/biblatex-abnt/abnt-ibid.bbx | 2 +- .../tex/latex/biblatex-abnt/abnt-ibid.cbx | 2 +- .../tex/latex/biblatex-abnt/abnt-numeric.bbx | 2 +- .../tex/latex/biblatex-abnt/abnt-numeric.cbx | 2 +- Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx | 81 ++++++++++++++----- Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx | 93 +++++++++++++++++++++- .../tex/latex/biblatex-abnt/american-abnt.lbx | 21 +++++ .../tex/latex/biblatex-abnt/australian-abnt.lbx | 21 +++++ .../tex/latex/biblatex-abnt/brazil-abnt.lbx | 2 +- .../tex/latex/biblatex-abnt/brazilian-abnt.lbx | 4 +- .../tex/latex/biblatex-abnt/british-abnt.lbx | 21 +++++ .../tex/latex/biblatex-abnt/canadian-abnt.lbx | 21 +++++ .../tex/latex/biblatex-abnt/english-abnt.lbx | 4 +- .../tex/latex/biblatex-abnt/portuges-abnt.lbx | 2 +- .../tex/latex/biblatex-abnt/portuguese-abnt.lbx | 2 +- .../tex/latex/biblatex-abnt/spanish-abnt.lbx | 4 +- 16 files changed, 249 insertions(+), 35 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/biblatex-abnt/american-abnt.lbx create mode 100644 Master/texmf-dist/tex/latex/biblatex-abnt/australian-abnt.lbx create mode 100644 Master/texmf-dist/tex/latex/biblatex-abnt/british-abnt.lbx create mode 100644 Master/texmf-dist/tex/latex/biblatex-abnt/canadian-abnt.lbx (limited to 'Master/texmf-dist/tex/latex/biblatex-abnt') diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.bbx index 40ce2a56d5b..0fbf7ebfb54 100644 --- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.bbx @@ -13,7 +13,7 @@ %% The Current Maintainer of this work is Daniel Ballester Marques. \ProvidesFile{abnt-ibid.bbx} -[2018/04/04\space v3.3\space ABNT BibLaTeX citation style]% +[2018-11-17\space v3.4\space ABNT BibLaTeX citation style]% \RequireBibliographyStyle{abnt} diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.cbx index e940bac5e87..97e7cfa2dbc 100644 --- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-ibid.cbx @@ -13,7 +13,7 @@ %% The Current Maintainer of this work is Daniel Ballester Marques. \ProvidesFile{abnt-ibid.cbx}% -[2018/04/04\space v3.3\space ABNT BibLaTeX citation style]% +[2018-11-17\space v3.4\space ABNT BibLaTeX citation style]% % Init >>>1 diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.bbx b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.bbx index a05b7ccdb4d..9e9aba2015f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.bbx @@ -13,7 +13,7 @@ %% The Current Maintainer of this work is Daniel Ballester Marques. \ProvidesFile{abnt-numeric.bbx}% -[2018/04/04\space v3.3\space ABNT BibLaTeX citation style]% +[2018-11-17\space v3.4\space ABNT BibLaTeX citation style]% \RequireBibliographyStyle{abnt} \ExecuteBibliographyOptions{labelnumber} diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.cbx b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.cbx index 1fb33a3be65..8be391001f9 100644 --- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt-numeric.cbx @@ -13,7 +13,7 @@ %% The Current Maintainer of this work is Daniel Ballester Marques. \ProvidesFile{abnt-numeric.cbx}% -[2018/04/04\space v3.3\space ABNT BibLaTeX citation style]% +[2018-11-17\space v3.4\space ABNT BibLaTeX citation style]% % Init >>>1 diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx index ae5449800c8..ec95c836c8f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx @@ -13,7 +13,7 @@ %% The Current Maintainer of this work is Daniel Ballester Marques. \ProvidesFile{abnt.bbx}% -[2018/04/04\space v3.3\space ABNT BibLaTeX citation style]% +[2018-11-17\space v3.4\space ABNT BibLaTeX citation style]% % Init >>>1 @@ -432,31 +432,74 @@ }% }% <<<2 -\newcommand{\iffieldendswith}[4]{% >>>2 - \IfEndWith{\strfield{#1}}{#2}{#3}{#4}% -}% <<<2 -\newcommand{\iffieldendswithpunct}[3]{% >>>2 - \ifboolexpr{% - test {\iffieldendswith{#1}{.}}% - or% - test {\iffieldendswith{#1}{!}}% - or% - test {\iffieldendswith{#1}{?}}% - or% - test {\iffieldendswith{#1}{-}}% - or% - test {\iffieldendswith{#1}{:}}% - or% - test {\iffieldendswith{#1}{/}}% - }{#2}{#3}% -}% <<<2 +% auxiliary commands +\ExplSyntaxOn +% {}{} +\NewDocumentCommand { \abntblx@regex@match } { mm } { + \regex_match:nnTF { #2 } { #1 } +} +\ExplSyntaxOff + +% define \iffieldregex{}{} +\newcommand*{\blx@imc@iffieldregex}{} +\newcommand*{\iffieldregex}{} + +\protected\def\blx@imc@iffieldregex#1#2{% + \blx@imc@iffieldundef{#1} + {\@secondoftwo} + {\expandafter\expandafter + \expandafter\abntblx@regex@match + \expandafter\expandafter + \expandafter{\csname abx@field@#1\endcsname}{#2}}} + +\blx@regimcs{\iffieldregex} + +\newcommand*{\iffieldendswithpunct}[1]{% + \iffieldregex{#1}{(\.|\!|\?|\-|\:|\/)\Z}% +} % <<<1 % Formatting >>>1 +% Use \refname for headings >>>2 +\ifcase\abx@classtype\relax % article +\or % book/report + \defbibheading{bibliography}[\refname]{% + \chapter*{#1}% + \@mkboth{\abx@MakeMarkcase{#1}}{\abx@MakeMarkcase{#1}}} +\or % scrartcl +\or % scrbook/scrreprt + \defbibheading{bibliography}[\refname]{% + \ifcsundef{bibliography@heading} + {\ifkomabibtotocnumbered + {\chapter{#1}} + {\ifkomabibtotoc + {\addchap{#1}} + {\chapter*{#1} + \ifcsundef{@mkdouble} + {\@mkboth{\abx@MakeMarkcase{#1}}{\abx@MakeMarkcase{#1}}} + {\@mkdouble{\abx@MakeMarkcase{#1}}}}}} + {\bibliography@heading{#1}}} +\or % memoir (article) +\or % memoir (book) + \ifcsundef{memUChead}{}{\def\abx@MakeMarkcase{\memUChead}}% + \defbibheading{bibliography}[\refname]{% + \chapter*{#1}% + \if@twoside + \markboth{\abx@MakeMarkcase{#1}}{\abx@MakeMarkcase{#1}}% + \else + \markright{\abx@MakeMarkcase{#1}}% + \fi + \ifmemoirbibintoc + {\phantomsection + \addcontentsline{toc}{chapter}{#1}} + {}} +\fi +% <<<2 + % \IfGivenIsInitial >>>2 \ExplSyntaxOn% diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx index a7fd5e2bd3a..7deb3e81993 100644 --- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.cbx @@ -13,7 +13,7 @@ %% The Current Maintainer of this work is Daniel Ballester Marques. \ProvidesFile{abnt.cbx}% -[2018/04/04\space v3.3\space ABNT BibLaTeX citation style]% +[2018-11-17\space v3.4\space ABNT BibLaTeX citation style]% % Init >>>1 @@ -28,7 +28,7 @@ pagetracker,% block=none,% urldate=long,% - uniquename=full,% + uniquename=minfull,% sortcites=false,% }% <<<2 @@ -137,7 +137,7 @@ {\usebibmacro{name:family-given}% {\namepartfamily}% {\namepartgiveni}% - {\namepartprefixi}% + {\namepartprefix}% {\namepartsuffixi}}% \or% \usebibmacro{name:family-given}% @@ -349,6 +349,93 @@ \let\mkbibnamesuffix\origmkbibnamesuffix% }{}{}% <<<3 +\newbibmacro*{textcitestar}{% >>>3 + \iffieldequals{namehash}{\cbx@lasthash}% + {\iffieldundef{shorthand}% + {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND% + \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}% + {\setunit{\addcomma}% + \usebibmacro{cite:extradate}}% + {\setunit{\compcitedelim}% + \usebibmacro{cite:labeldate+extradate}% + \savefield{labelyear}{\cbx@lastyear}}}% + {\setunit{\compcitedelim}% + \usebibmacro{cite:shorthand}% + \global\undef\cbx@lastyear}}% + {\ifnameundef{labelname}% + {\iffieldundef{shorthand}% + {\usebibmacro{cite:label}% + \setunit{% + % \global\booltrue{cbx:parens}% + \printdelim{nonameyeardelim}}% + \ifnumequal{\value{citecount}}{1}% + {\usebibmacro{prenote}}% + {}% + \usebibmacro{cite:labeldate+extradate}}% + {\usebibmacro{cite:shorthand}}}% + {% Use `bibhyperref` so that the names are also hyperlinked + \printtext[bibhyperref]{\printnames[textlabelname]{labelname}}% + \setunit{% + % \global\booltrue{cbx:parens}% + \printdelim{nameyeardelim}}% + \ifnumequal{\value{citecount}}{1}% + {\usebibmacro{prenote}}% + {}% + \iffieldundef{shorthand}% + {\iffieldundef{labelyear}% + {\usebibmacro{cite:label}}% + {\usebibmacro{cite:labeldate+extradate}}% + \savefield{labelyear}{\cbx@lastyear}}% + {\usebibmacro{cite:shorthand}% + \global\undef\cbx@lastyear}}% + \stepcounter{textcitecount}% + \savefield{namehash}{\cbx@lasthash}}% + \setunit{% + \ifbool{cbx:parens}% + {\bibcloseparen\global\boolfalse{cbx:parens}}% + {}% + % Use `\bibstring{and}` before the last name and commas before the rest + \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}{% + \finalnamedelim% + }{% + \multinamedelim% + }}}% <<<3 + +\xpretobibmacro{textcitestar}{% >>>3 + \let\multinamedelim\multinamedelimorig% + \let\finalnamedelim\finalnamedelimorig% + \let\mkbibnamefamily\origmkbibnamefamily% + \let\mkbibnamegiven\origmkbibnamegiven% + \let\mkbibnameprefix\origmkbibnameprefix% + \let\mkbibnamesuffix\origmkbibnamesuffix% +}{}{}% <<<3 + +\DeclareCiteCommand{\cbx@textcitestar}% >>>3 + {\usebibmacro{cite:init}} + {\usebibmacro{citeindex}% + \usebibmacro{textcitestar}} + {} +{\usebibmacro{textcite:postnote}}% <<<3 + +\DeclareCiteCommand*{\textcite}[\cbx@textcite@init\cbx@textcitestar]% >>>3 + {\gdef\cbx@savedkeys{}% + \citetrackerfalse% + \pagetrackerfalse% + \DeferNextCitekeyHook% + \usebibmacro{cite:init}} + {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0} + {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}% + \global\clearfield{multipostnote}} + {}% + \xappto\cbx@savedkeys{\thefield{entrykey},}% + \iffieldequals{namehash}{\cbx@lasthash} + {} + {\stepcounter{textcitetotal}% + \savefield{namehash}{\cbx@lasthash}}} + {} + {\protected@xappto\cbx@savedcites{% +[\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}% <<<3 + % <<<2 % \footcite >>>2 diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/american-abnt.lbx b/Master/texmf-dist/tex/latex/biblatex-abnt/american-abnt.lbx new file mode 100644 index 00000000000..4ebdf8ee3f7 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/american-abnt.lbx @@ -0,0 +1,21 @@ +%% Copyright 2016 Daniel Ballester Marques +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Daniel Ballester Marques. + +\ProvidesFile{american-abnt.lbx} +[2018-11-17\space v3.4\space ABNT BibLaTeX citation style]% + +\InheritBibliographyExtras{english-abnt} +\InheritBibliographyStrings{english-abnt} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/australian-abnt.lbx b/Master/texmf-dist/tex/latex/biblatex-abnt/australian-abnt.lbx new file mode 100644 index 00000000000..5a3e9b5305d --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/australian-abnt.lbx @@ -0,0 +1,21 @@ +%% Copyright 2016 Daniel Ballester Marques +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Daniel Ballester Marques. + +\ProvidesFile{australian-abnt.lbx} +[2018-11-17\space v3.4\space ABNT BibLaTeX citation style]% + +\InheritBibliographyExtras{english-abnt} +\InheritBibliographyStrings{english-abnt} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/brazil-abnt.lbx b/Master/texmf-dist/tex/latex/biblatex-abnt/brazil-abnt.lbx index 4966fcaad44..45330478f9f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-abnt/brazil-abnt.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/brazil-abnt.lbx @@ -13,7 +13,7 @@ %% The Current Maintainer of this work is Daniel Ballester Marques. \ProvidesFile{brazil-abnt.lbx} -[2018/04/04\space v3.3\space ABNT BibLaTeX citation style]% +[2018-11-17\space v3.4\space ABNT BibLaTeX citation style]% \InheritBibliographyExtras{brazilian-abnt} \InheritBibliographyStrings{brazilian-abnt} diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/brazilian-abnt.lbx b/Master/texmf-dist/tex/latex/biblatex-abnt/brazilian-abnt.lbx index 8a16994bf8c..8b730ba0d51 100644 --- a/Master/texmf-dist/tex/latex/biblatex-abnt/brazilian-abnt.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/brazilian-abnt.lbx @@ -12,8 +12,8 @@ %% %% The Current Maintainer of this work is Daniel Ballester Marques. -\ProvidesFile{abnt-brazilian.lbx}% -[2018/04/04\space v3.3\space ABNT BibLaTeX citation style]% +\ProvidesFile{brazilian-abnt.lbx}% +[2018-11-17\space v3.4\space ABNT BibLaTeX citation style]% % Init >>> diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/british-abnt.lbx b/Master/texmf-dist/tex/latex/biblatex-abnt/british-abnt.lbx new file mode 100644 index 00000000000..dfa7d387b45 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/british-abnt.lbx @@ -0,0 +1,21 @@ +%% Copyright 2016 Daniel Ballester Marques +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Daniel Ballester Marques. + +\ProvidesFile{british-abnt.lbx} +[2018-11-17\space v3.4\space ABNT BibLaTeX citation style]% + +\InheritBibliographyExtras{english-abnt} +\InheritBibliographyStrings{english-abnt} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/canadian-abnt.lbx b/Master/texmf-dist/tex/latex/biblatex-abnt/canadian-abnt.lbx new file mode 100644 index 00000000000..94fdd028233 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/canadian-abnt.lbx @@ -0,0 +1,21 @@ +%% Copyright 2016 Daniel Ballester Marques +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Daniel Ballester Marques. + +\ProvidesFile{canadian-abnt.lbx} +[2018-11-17\space v3.4\space ABNT BibLaTeX citation style]% + +\InheritBibliographyExtras{english-abnt} +\InheritBibliographyStrings{english-abnt} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/english-abnt.lbx b/Master/texmf-dist/tex/latex/biblatex-abnt/english-abnt.lbx index fe86ec7fa24..41792e3a4e5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-abnt/english-abnt.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/english-abnt.lbx @@ -14,8 +14,8 @@ %% %% Tradução para o espanhol de Juan-Ernesto Sepúlveda. Obrigado! -\ProvidesFile{abnt-english.lbx}% -[2018/04/04\space v3.3\space ABNT BibLaTeX citation style]% +\ProvidesFile{english-abnt.lbx}% +[2018-11-17\space v3.4\space ABNT BibLaTeX citation style]% % Init >>> diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/portuges-abnt.lbx b/Master/texmf-dist/tex/latex/biblatex-abnt/portuges-abnt.lbx index 3ffaafd4527..f1ae7541c4a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-abnt/portuges-abnt.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/portuges-abnt.lbx @@ -13,7 +13,7 @@ %% The Current Maintainer of this work is Daniel Ballester Marques. \ProvidesFile{portuges-abnt.lbx} -[2018/04/04\space v3.3\space ABNT BibLaTeX citation style]% +[2018-11-17\space v3.4\space ABNT BibLaTeX citation style]% \InheritBibliographyExtras{brazilian-abnt} \InheritBibliographyStrings{brazilian-abnt} diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/portuguese-abnt.lbx b/Master/texmf-dist/tex/latex/biblatex-abnt/portuguese-abnt.lbx index 6c959948ce2..36baf6bc439 100644 --- a/Master/texmf-dist/tex/latex/biblatex-abnt/portuguese-abnt.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/portuguese-abnt.lbx @@ -13,7 +13,7 @@ %% The Current Maintainer of this work is Daniel Ballester Marques. \ProvidesFile{portuguese-abnt.lbx} -[2018/04/04\space v3.3\space ABNT BibLaTeX citation style]% +[2018-11-17\space v3.4\space ABNT BibLaTeX citation style]% \InheritBibliographyExtras{brazilian-abnt} \InheritBibliographyStrings{brazilian-abnt} diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/spanish-abnt.lbx b/Master/texmf-dist/tex/latex/biblatex-abnt/spanish-abnt.lbx index f149e21ffa0..a1ff9ed64f6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-abnt/spanish-abnt.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-abnt/spanish-abnt.lbx @@ -14,8 +14,8 @@ %% %% Tradução para o espanhol de Juan-Ernesto Sepúlveda. Obrigado! -\ProvidesFile{abnt-spanish.lbx}% -[2018/04/04\space v3.3\space ABNT BibLaTeX citation style]% +\ProvidesFile{spanish-abnt.lbx}% +[2018-11-17\space v3.4\space ABNT BibLaTeX citation style]% % Init >>> -- cgit v1.2.3