diff options
author | Karl Berry <karl@freefriends.org> | 2023-03-10 21:51:03 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-03-10 21:51:03 +0000 |
commit | efe68ef98454af89d2c80bfc87e80b549e7a7cb8 (patch) | |
tree | daa2bc894163272660410a951dec4543a4a2e819 /Master/texmf-dist/tex | |
parent | 726a798bfc52390005ad318bb8f9dded595823c1 (diff) |
biblatex-dw (10mar23)
git-svn-id: svn://tug.org/texlive/trunk@66525 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
8 files changed, 50 insertions, 39 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx index 075131d4ee8..79ed4906dd7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx @@ -1,6 +1,6 @@ -% authortitle-dw.bbx, Dominik Waßenhoven 2016 +% authortitle-dw.bbx, Dominik Waßenhoven 2023 -\ProvidesFile{authortitle-dw.bbx}[2016/12/06 v1.7 biblatex bibliography style] +\ProvidesFile{authortitle-dw.bbx}[2023/03/09 v1.7a biblatex bibliography style] \RequireBibliographyStyle{standard-dw} @@ -681,11 +681,11 @@ \renewbibmacro*{editor}{% \ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}} {\ifbool{bbx:idembib} - {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND + {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND \NOT\iffirstonpage} {\bibnamedash} {\printnames{editor}% - \savefield{namehash}{\bbx@lasthash}}}% + \savefield{fullhash}{\bbx@lasthash}}}% {\printnames{editor}% \global\undef\bbx@lasthash}% \usebibmacro{editorstringpunct}% @@ -699,11 +699,11 @@ \renewbibmacro*{editor+others}{% \ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}} {\ifbool{bbx:idembib} - {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND + {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND \NOT\iffirstonpage} {\bibnamedash} {\printnames{editor}% - \savefield{namehash}{\bbx@lasthash}}}% + \savefield{fullhash}{\bbx@lasthash}}}% {\printnames{editor}}% \usebibmacro{editorstringpunct}% \usebibmacro{editor+othersstrg}% @@ -716,11 +716,11 @@ \renewbibmacro*{translator}{% \ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{translator}} {\ifbool{bbx:idembib} - {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND + {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND \NOT\iffirstonpage} {\bibnamedash} {\printnames{translator}% - \savefield{namehash}{\bbx@lasthash}}}% + \savefield{fullhash}{\bbx@lasthash}}}% {\printnames{translator}}% \usebibmacro{editorstringpunct}% \usebibmacro{translatorstrg}% @@ -733,11 +733,11 @@ \renewbibmacro*{translator+others}{% \ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{translator}} {\ifbool{bbx:idembib} - {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND + {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND \NOT\iffirstonpage} {\bibnamedash} {\printnames{translator}% - \savefield{namehash}{\bbx@lasthash}}}% + \savefield{fullhash}{\bbx@lasthash}}}% {\printnames{translator}}% \usebibmacro{editorstringpunct}% \usebibmacro{translator+othersstrg}% @@ -777,11 +777,11 @@ \newbibmacro*{author:output}{% \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}} {\ifbool{bbx:idembib} - {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND + {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND \NOT\iffirstonpage} {\bibnamedash} {\printnames{author}% - \savefield{namehash}{\bbx@lasthash}}} + \savefield{fullhash}{\bbx@lasthash}}} {\printnames{author}% \global\undef\bbx@lasthash}% \iffieldundef{authortype} diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/footnote-dw.bbx b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/footnote-dw.bbx index a0ebd77967c..abb62b42f63 100644 --- a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/footnote-dw.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/footnote-dw.bbx @@ -1,6 +1,6 @@ -% footnote-dw.bbx, Dominik Waßenhoven 2016 +% footnote-dw.bbx, Dominik Waßenhoven 2023 -\ProvidesFile{footnote-dw.bbx}[2016/12/06 v1.7 biblatex bibliography style] +\ProvidesFile{footnote-dw.bbx}[2023/03/09 v1.7a biblatex bibliography style] \RequireBibliographyStyle{authortitle-dw} diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/standard-dw.bbx b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/standard-dw.bbx index 66d77408027..b97448eebd9 100644 --- a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/standard-dw.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/standard-dw.bbx @@ -1,6 +1,6 @@ -% standard-dw.bbx, Dominik Waßenhoven 2016 +% standard-dw.bbx, Dominik Waßenhoven 2023 -\ProvidesFile{standard-dw.bbx}[2016/12/06 v1.7 biblatex bibliography style] +\ProvidesFile{standard-dw.bbx}[2023/03/09 v1.7a biblatex bibliography style] \@ifpackagelater{biblatex}{2016/03/11} {} @@ -299,10 +299,10 @@ \addspace}% {\printnames[byeditor]{editor}% \usebibmacro{editorstringpunct}% - \savefield{namehash}{\bbx@lasthash}}}% + \savefield{fullhash}{\bbx@lasthash}}}% {\printnames[byeditor]{editor}% \usebibmacro{editorstringpunct}% - \savefield{namehash}{\bbx@lasthash}}% + \savefield{fullhash}{\bbx@lasthash}}% \usebibmacro{editorstrg}% \clearname{editor}% \setunit{\labelnamepunct}\newblock} @@ -314,10 +314,10 @@ \addspace}% {\printnames[byeditor]{translator}% \usebibmacro{editorstringpunct}% - \savefield{namehash}{\bbx@lasthash}}}% + \savefield{fullhash}{\bbx@lasthash}}}% {\printnames[byeditor]{translator}% \usebibmacro{editorstringpunct}% - \savefield{namehash}{\bbx@lasthash}}% + \savefield{fullhash}{\bbx@lasthash}}% \usebibmacro{translatorstrg}% \clearname{translator}% \setunit{\labelnamepunct}\newblock} @@ -457,6 +457,11 @@ {\printfield{volumes}} {}}} +%% 'addendum' bei xref-child ausgeben +\newbibmacro*{xrefaddendum}{% + \newunit + \printfield{addendum}}% + %% Option 'shortjournal=true|false' \renewbibmacro*{journal}{% \ifbool{bbx:shortjournal} @@ -1002,7 +1007,8 @@ \usebibmacro{noxref:inbook}}% {\printtext{\bbx@xref{\thefield{xref}}}% xref \usebibmacro{xrefvolume}% - \usebibmacro{pages}}}% + \usebibmacro{pages}% + \usebibmacro{xrefaddendum}}}% {\usebibmacro{noxref:inbook}}% bei xref=false \usebibmacro{finentry}} @@ -1032,7 +1038,8 @@ \usebibmacro{noxref:incollection}} {\printtext{\bbx@xref{\thefield{xref}}}% xref \usebibmacro{xrefvolume}% - \usebibmacro{pages}}}% + \usebibmacro{pages}% + \usebibmacro{xrefaddendum}}}% {\usebibmacro{noxref:incollection}}% bei xref=false \usebibmacro{finentry}} @@ -1070,7 +1077,8 @@ \usebibmacro{noxref:inproceedings}}% {\printtext{\bbx@xref{\thefield{xref}}}% xref \usebibmacro{xrefvolume}% - \usebibmacro{pages}}}% + \usebibmacro{pages}% + \usebibmacro{xrefaddendum}}}% {\usebibmacro{noxref:inproceedings}}% bei xref=false \usebibmacro{finentry}} @@ -1111,7 +1119,8 @@ {\booltrue{cbx:xrefparent:firstcite}}% parent wurde noch nicht zitiert \printtext{\bbx@xref{\thefield{xref}}}% xref \usebibmacro{xrefvolume:inreference}% - \usebibmacro{pages}}}% + \usebibmacro{pages}% + \usebibmacro{xrefaddendum}}}% {\usebibmacro{noxref:inreference}}% bei xref=false \usebibmacro{finentry}} diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx b/Master/texmf-dist/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx index 4362c0355c8..422b5a36bab 100644 --- a/Master/texmf-dist/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx @@ -1,6 +1,6 @@ -% authortitle-dw.cbx, Dominik Waßenhoven 2016 +% authortitle-dw.cbx, Dominik Waßenhoven 2023 -\ProvidesFile{authortitle-dw.cbx}[2016/12/06 v1.7 biblatex citation style] +\ProvidesFile{authortitle-dw.cbx}[2023/03/09 v1.7a biblatex citation style] \RequireCitationStyle{standard-dw} diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/cbx/footnote-dw.cbx b/Master/texmf-dist/tex/latex/biblatex-dw/cbx/footnote-dw.cbx index a45a55f2606..03688af6a29 100644 --- a/Master/texmf-dist/tex/latex/biblatex-dw/cbx/footnote-dw.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-dw/cbx/footnote-dw.cbx @@ -1,6 +1,6 @@ -% footnote-dw.cbx, Dominik Waßenhoven 2016 +% footnote-dw.cbx, Dominik Waßenhoven 2023 -\ProvidesFile{footnote-dw.cbx}[2016/12/06 v1.7 biblatex citation style] +\ProvidesFile{footnote-dw.cbx}[2023/03/09 v1.7a biblatex citation style] \RequireCitationStyle{standard-dw} diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/cbx/standard-dw.cbx b/Master/texmf-dist/tex/latex/biblatex-dw/cbx/standard-dw.cbx index 348daefb5d5..a5f4668f397 100644 --- a/Master/texmf-dist/tex/latex/biblatex-dw/cbx/standard-dw.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-dw/cbx/standard-dw.cbx @@ -1,6 +1,6 @@ -% standard-dw.cbx, Dominik Waßenhoven 2016 +% standard-dw.cbx, Dominik Waßenhoven 2023 -\ProvidesFile{standard-dw.cbx}[2016/12/06 v1.7 biblatex citation style] +\ProvidesFile{standard-dw.cbx}[2023/03/09 v1.7a biblatex citation style] \@ifpackagelater{biblatex}{2016/03/11} {} @@ -181,7 +181,7 @@ \global\booltrue{cbx:noidem}} \newbibmacro*{cite:save}{% - \savefield{namehash}{\cbx@lasthash}% + \savefield{fullhash}{\cbx@lasthash}% \csxdef{cbx:lastcite@\thefield{entrykey}}{\the\value{instcount}}% \global\boolfalse{cbx:noidem}} @@ -358,11 +358,13 @@ not test {\ifnameundef{author}} } {\ifbool{xrefidem} - {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND + {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND \NOT\iffirstonpage} {\usebibmacro{cite:idem}} - {\printnames[labelname]{author}}} + {\printnames[labelname]{author}% + \setunit{\nametitledelim}}} {\printnames[labelname]{author}% + \setunit{\nametitledelim}% \global\undef\bbx@lasthash}% \clearname{author}} {}} @@ -374,7 +376,7 @@ not test {\ifnameundef{editor}} } {\ifbool{bbx:edbyidem} - {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND + {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND \NOT\iffirstonpage} {\usebibmacro{cite:idem}} {\printnames[labelname]{editor}% @@ -396,7 +398,7 @@ test {\ifnameundef{editor}} ) ) } {\ifbool{bbx:edbyidem} - {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND + {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND \NOT\iffirstonpage} {\usebibmacro{cite:idem}} {\printnames[labelname]{translator}% diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/lbx/english-dw.lbx b/Master/texmf-dist/tex/latex/biblatex-dw/lbx/english-dw.lbx index 1f61a78583d..c10cdaa17ea 100644 --- a/Master/texmf-dist/tex/latex/biblatex-dw/lbx/english-dw.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-dw/lbx/english-dw.lbx @@ -1,6 +1,6 @@ -% english-dw.lbx, Dominik Waßenhoven 2016 +% english-dw.lbx, Dominik Waßenhoven 2023 -\ProvidesFile{english-dw.lbx}[2016/12/06 v1.7 biblatex localization file] +\ProvidesFile{english-dw.lbx}[2023/03/09 v1.7a biblatex localization file] \NewBibliographyString{% idemdat,% diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/lbx/german-dw.lbx b/Master/texmf-dist/tex/latex/biblatex-dw/lbx/german-dw.lbx index 99976350ff9..f37b44b3f68 100644 --- a/Master/texmf-dist/tex/latex/biblatex-dw/lbx/german-dw.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-dw/lbx/german-dw.lbx @@ -1,6 +1,6 @@ -% german-dw.lbx, Dominik Waßenhoven 2016 +% german-dw.lbx, Dominik Waßenhoven 2023 -\ProvidesFile{german-dw.lbx}[2016/12/06 v1.7 biblatex localization file] +\ProvidesFile{german-dw.lbx}[2023/03/09 v1.7a biblatex localization file] \InheritBibliographyExtras{german} |