diff options
Diffstat (limited to 'macros')
32 files changed, 163 insertions, 71 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-dw/CHANGES b/macros/latex/contrib/biblatex-contrib/biblatex-dw/CHANGES index 73a77cc950..a3c27bc956 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/CHANGES +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/CHANGES @@ -1,11 +1,22 @@ -biblatex-dw 2016/12/06 v1.7 -Copyright (c) 2008-2016 Dominik Waßenhoven <domwass(at)web.de> +biblatex-dw 2023/03/09 v1.7a +Copyright (c) 2008-2023 Dominik Waßenhoven <domwass(at)web.de> Version history --------------- +v1.7a [2023/03/09] +This version of biblatex-dw was tested with biblatex 3.17 and biber 2.17. +- BUGFIX: With xref=true, the addendum of the child entry was not printed. This + is now fixed (ticket 31 at biblatex-dw.sf.net). +- BUGFIX: In certain circumstances, the idembib option yielded a wrong output + (idem, where different names in name lists were given). This should be fixed + now (ticket 22 at biblatex-dw.sf.net). +- BUGFIX: With xref=true, @inbook entries could have incorrect punctuation in the + bibliography (missing delimiter after the referenced book author). This should + be fixed now (cf. ticket 24 at biblatex-dw.sf.net). + v1.7 [2016/12/06] -This version of biblatex-dw needs at least biblatex 3.3 and was testet with +This version of biblatex-dw needs at least biblatex 3.3 and was tested with biblatex 3.6 and biber 2.6. - New option "citeauthorname" (instead of "firstfullname") which can take the values "normal" (\citeauthor and \textcite print the surname only, as in diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-dw/LIESMICH b/macros/latex/contrib/biblatex-contrib/biblatex-dw/LIESMICH index efe17b60f4..941808ced0 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/LIESMICH +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/LIESMICH @@ -1,5 +1,5 @@ -biblatex-dw 2016/12/06 v1.7 -Copyright (c) 2008-2016 Dominik Waßenhoven <domwass(at)web.de> +biblatex-dw 2023/03/09 v1.7a +Copyright (c) 2008-2023 Dominik Waßenhoven <domwass(at)web.de> ************************************************************ @@ -18,11 +18,11 @@ Inhalt der Datei LIESMICH ------------------- biblatex-dw ist eine kleine Sammlung von styles für das - Paket biblatex von Philipp Lehman. Sie ist gedacht zum - Zitieren im geisteswissenschaftlichen Bereich und bietet - dafür einige Funktionen, die über die Standardfunktionen - von biblatex hinausgehen. biblatex-dw baut vollständig auf - biblatex auf und kann nicht ohne biblatex benutzt werden! + Paket biblatex. Sie ist gedacht zum Zitieren im geistes- + wissenschaftlichen Bereich und bietet dafür einige + Funktionen, die über die Standardfunktionen von biblatex + hinausgehen. biblatex-dw baut vollständig auf biblatex + auf und kann nicht ohne biblatex benutzt werden! Anregungen und Verbesserungsvorschläge sind jederzeit willkommen. Wenn Sie einen Fehler finden, erstellen Sie diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-dw/README b/macros/latex/contrib/biblatex-contrib/biblatex-dw/README index e0535eadd2..666d46c1cf 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/README +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/README @@ -1,5 +1,5 @@ -biblatex-dw 2016/12/06 v1.7 -Copyright (c) 2008-2016 Dominik Waßenhoven <domwass(at)web.de> +biblatex-dw 2023/03/09 v1.7a +Copyright (c) 2008-2023 Dominik Waßenhoven <domwass(at)web.de> ************************************************************ diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/biblatex-dw-preamble.tex b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/biblatex-dw-preamble.tex index 19bee12119..72c6f60c20 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/biblatex-dw-preamble.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/biblatex-dw-preamble.tex @@ -1,17 +1,17 @@ %!TEX encoding = UTF-8 Unicode % biblatex-dw -% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2016 +% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2023 % % This file is the preamble for the documentation of % biblatex-dw (both the English and the German version) %%%%% biblatex-dw Version %%%%% version of biblatex-dw %%%%% -\newcommand{\biblatexdwversion}{1.7} -\newcommand{\biblatexdwdate}{\printdate{2016-12-06}} +\newcommand{\biblatexdwversion}{1.7a} +\newcommand{\biblatexdwdate}{\printdate{2023-03-09}} \newcommand{\mindestanforderung}{3.3}% minimum biblatex version -\newcommand{\testversion}{3.6}% tested biblatex version -\newcommand{\biberversion}{2.6}% tested biber version +\newcommand{\testversion}{3.17}% tested biblatex version +\newcommand{\biberversion}{2.17}% tested biber version \newcommand{\screenversion}{} \newcommand{\TOC}{} \newcommand{\lizenz}{} @@ -44,7 +44,7 @@ \renewcommand{\footnoterule}{}% keine Zeile zw. Text und Fußnoten %%%%% Kopf- und Fußzeilen %%%%% page header and footer %%%%% -\usepackage{scrpage2} +\usepackage{scrlayer-scrpage} \pagestyle{scrheadings} \clearscrheadfoot @@ -75,7 +75,7 @@ %%%%% Verschiedene Pakete %%%%% Miscellaneous packages \usepackage{microtype}% optischer Randausgleich -\usepackage{dtk-logos}% Logos wie \BibTeX etc. +\usepackage{hvlogos}% Logos wie \BibTeX etc. \usepackage{xspace} \usepackage{textcomp}% Text-Companion-Symbole \usepackage{manfnt}% für das Achtung-Symbol diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/biblatex-dw-print.tex b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/biblatex-dw-print.tex index 2c54dddd09..6acd04eb65 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/biblatex-dw-print.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/biblatex-dw-print.tex @@ -1,6 +1,6 @@ %!TEX encoding = UTF-8 Unicode % biblatex-dw -% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2016 +% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2023 % % This file configures the documentation % of biblatex-dw to be printed diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/biblatex-dw-screen.tex b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/biblatex-dw-screen.tex index d7002df124..8ef25d54cf 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/biblatex-dw-screen.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/biblatex-dw-screen.tex @@ -1,6 +1,6 @@ %!TEX encoding = UTF-8 Unicode % biblatex-dw -% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2016 +% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2023 % % This file configures the documentation % of biblatex-dw to be viewed on a screen diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/biblatex-dw.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/biblatex-dw.pdf Binary files differindex bc9bf9f977..2f9955978c 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/biblatex-dw.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/biblatex-dw.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/biblatex-dw.tex b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/biblatex-dw.tex index ddb76a24d8..01b6026a27 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/biblatex-dw.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/biblatex-dw.tex @@ -20,7 +20,7 @@ \bl{} package. It was designed for citations in the Humanities and offers some features that are not provided by the standard \bl{} styles. \bldw{} is dependent - on \bl{}~-- version~\biblatexdwversion{} \Mindestanforderung{}\Testversion. + on \bl{}. Version~\biblatexdwversion{} of \bldw{} \Mindestanforderung{}\Testversion. Please note also the requirements of the \bl{} package itself.} \lizenz diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/de-biblatex-dw.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/de-biblatex-dw.pdf Binary files differindex 0121beb0eb..5b5e11818a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/de-biblatex-dw.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/de-biblatex-dw.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/de-biblatex-dw.tex b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/de-biblatex-dw.tex index 02af0f9b2c..19db0eb3d5 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/de-biblatex-dw.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/de-biblatex-dw.tex @@ -2,7 +2,7 @@ %!TEX encoding = UTF-8 Unicode % biblatex-dw -% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2016 +% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2023 % % Diese Datei enthält die deutschsprachige Dokumentation von biblatex-dw @@ -19,7 +19,7 @@ \thispagestyle{empty} \abstract{\noindent \bldw{} ist eine kleine Sammlung von Zitierstilen - für das Paket \bl{} von Philipp Lehman. Sie ist gedacht zum + für das Paket \bl{}. Sie ist gedacht zum Zitieren und Bibliographieren im geisteswissenschaftlichen Bereich und bietet dafür einige Funktionen, die über die Standardfunktionen von \bl{} hinausgehen. \bldw{} baut vollständig auf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/de-authortitle-dw.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/de-authortitle-dw.pdf Binary files differindex d479778800..da3d4564f8 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/de-authortitle-dw.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/de-authortitle-dw.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/de-authortitle-dw.tex b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/de-authortitle-dw.tex index 7c7ede7678..ffe0be6c4b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/de-authortitle-dw.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/de-authortitle-dw.tex @@ -1,4 +1,4 @@ -% v 1.7 +% v 1.7a % This file presents the `authortitle-dw' style % \listfiles diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/de-footnote-dw.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/de-footnote-dw.pdf Binary files differindex d9281cbc54..27ec22f106 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/de-footnote-dw.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/de-footnote-dw.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/de-footnote-dw.tex b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/de-footnote-dw.tex index 4ffce5a338..263c4f60fe 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/de-footnote-dw.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/de-footnote-dw.tex @@ -1,4 +1,4 @@ -% v 1.7 +% v 1.7a % This file presents the `footnote-dw' style % \documentclass[a4paper]{article} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/en-authortitle-dw.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/en-authortitle-dw.pdf Binary files differindex 6cee32c20f..f00b8319a0 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/en-authortitle-dw.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/en-authortitle-dw.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/en-authortitle-dw.tex b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/en-authortitle-dw.tex index 0817614375..30004eff24 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/en-authortitle-dw.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/en-authortitle-dw.tex @@ -1,4 +1,4 @@ -% v 1.7 +% v 1.7a % This file presents the `authortitle-dw' style % \documentclass[a4paper]{article} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/en-footnote-dw.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/en-footnote-dw.pdf Binary files differindex 4b4b7c95f1..8834bfe11a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/en-footnote-dw.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/en-footnote-dw.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/en-footnote-dw.tex b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/en-footnote-dw.tex index e2b6604313..7f8385015b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/en-footnote-dw.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/doc/examples/en-footnote-dw.tex @@ -1,4 +1,4 @@ -% v 1.7 +% v 1.7a % This file presents the `footnote-dw' style % \documentclass[a4paper]{article} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/bbx/authortitle-dw.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/bbx/authortitle-dw.bbx index 075131d4ee..79ed4906dd 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/bbx/authortitle-dw.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/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/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/bbx/footnote-dw.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/bbx/footnote-dw.bbx index a0ebd77967..abb62b42f6 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/bbx/footnote-dw.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/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/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/bbx/standard-dw.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/bbx/standard-dw.bbx index 66d7740802..b97448eebd 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/bbx/standard-dw.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/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/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/cbx/authortitle-dw.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/cbx/authortitle-dw.cbx index 4362c0355c..422b5a36ba 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/cbx/authortitle-dw.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/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/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/cbx/footnote-dw.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/cbx/footnote-dw.cbx index a45a55f260..03688af6a2 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/cbx/footnote-dw.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/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/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/cbx/standard-dw.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/cbx/standard-dw.cbx index 348daefb5d..a5f4668f39 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/cbx/standard-dw.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/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/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/lbx/english-dw.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/lbx/english-dw.lbx index 1f61a78583..c10cdaa17e 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/lbx/english-dw.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/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/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/lbx/german-dw.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/lbx/german-dw.lbx index 99976350ff..f37b44b3f6 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/lbx/german-dw.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/latex/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} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-dw/todo.txt b/macros/latex/contrib/biblatex-contrib/biblatex-dw/todo.txt new file mode 100644 index 0000000000..7e28d95eb8 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-dw/todo.txt @@ -0,0 +1,70 @@ +todo.txt für biblatex-dw [2017-06-21] +------------------------------------- + +-----[ Stile ]---------- + +- idembib auch als Eintragsoption anbieten (damit man mit idembib=false die + Ausgabe von »Ders.« im Literaturverzeichnis unterdrücken kann, z.B. bei anonymen + Autoren) + \DeclareEntryOption{idembib}[true]{% + \csuse{bool#1}{bbx:idembib}} + –> https://sourceforge.net/p/biblatex-dw/tickets/14/ + +- BUG: Hgg.-Angaben bei Benutzung von xref und @proceedings/@inproceedings + fehlerhaft; Anpassung analog zu @collection/@incollection nötig. + –> https://sourceforge.net/p/biblatex-dw/tickets/25/ + +- BUG: seriesbeforeedition: manchmal steht ein Komma vor der öffnenden Klammer – + kriegt man das weg? + –> konnte das Verhalten nicht reproduzieren [2016-12-06] + +- addyear auch als Eintragsoption anbieten (damit man mit addyear=false die + Ausgabe des Jahres bei globaler Option addyear=true unterdrücken kann) + +- Feature-Request: https://sourceforge.net/p/biblatex-dw/tickets/6/ + editor bei @inreference komplett unterdrücken (?) + +- Feature-Request: https://sourceforge.net/p/biblatex-dw/tickets/7/ + Unterstützung für "nameaddon" + +- Feature-Request: https://sourceforge.net/p/biblatex-dw/tickets/9/ + - neue Option firstedition=afteryear|false + - Bei afteryear: Ort 2012 [2000] + - Neue entry option, damit man auch origfields nutzen kann: bei Einträgen mit + origfields (also Nachdrucken) reprint=true setzen, damit origdate nicht + ungewollt ausgegeben wird + -> Oder lässt sich das eleganter automatisch lösen? [mal ausprobieren, ob bei + der Verwendung von origdate ohne origlocation etc. ein Nachdruck erzeugt + wird] + +- shortseries nutzen (optional auch mit acronym) + -> evtl. auch für historische-zeitschrift + +- Neue Option: idemcase=upper|lower + -> damit kann man wählen, ob "ders." groß oder klein geschrieben werden soll + (z.B. bei "in: Ders.", nicht aber bei "hg. v. dems.") + --> dazu \newbibmacro*{useeditor} in standard-dw.bbx ändern (\midsentence!) + +- Neue Option idembib=single oder =strict o.ä., die auch bei mehreren Autoren idem + ausgibt, wenn es sich nur auf einzelne Autoren bezieht, z.B.: + Mustermann, Felix: … + Ders. / Musterfrau, Felicitas: … + -> siehe http://tex.stackexchange.com/q/11138/1376 + +-----[ Optionales ]---------- + +- neue Option 'los=withjournals': die Abkürzungen von + Zeitschriften (shortjournal) werden in die List of + Shorthands aufgenommen, wobei nur das Feld journaltitle + als Auflösung genommen wird + --> wird vermutlich in biblatex 2.0/biber 1.0 eingebaut + +- BUG: bei omiteditor=false (Standard) wird kein idem ausgegeben, wenn + Autor und Hrsg. gleich, aber das xref-child vor dem xref-parent zitiert wird + (weil dann kein authedxref bzw. authauthxref ausgeführt wurde) + --> kann ich nicht mehr reproduzieren (2012/06/14) + + +-----[ Webseite ]---------- + +- Einleitung überarbeiten (?) diff --git a/macros/latex/contrib/widows-and-orphans/README.md b/macros/latex/contrib/widows-and-orphans/README.md index edfe6a76d5..ccce3334f9 100644 --- a/macros/latex/contrib/widows-and-orphans/README.md +++ b/macros/latex/contrib/widows-and-orphans/README.md @@ -22,7 +22,7 @@ https://www.latex-project.org/publications/indexbytopic/2e-packages/ ----- -Copyright (C) 2018-2022 Frank Mittelbach<br /> +Copyright (C) 2017-2023 Frank Mittelbach<br /> <https://latex-project.org/> <br /> All rights reserved. diff --git a/macros/latex/contrib/widows-and-orphans/widows-and-orphans-code.pdf b/macros/latex/contrib/widows-and-orphans/widows-and-orphans-code.pdf Binary files differindex f1f596d9a1..8fa7f691a5 100644 --- a/macros/latex/contrib/widows-and-orphans/widows-and-orphans-code.pdf +++ b/macros/latex/contrib/widows-and-orphans/widows-and-orphans-code.pdf diff --git a/macros/latex/contrib/widows-and-orphans/widows-and-orphans-doc.pdf b/macros/latex/contrib/widows-and-orphans/widows-and-orphans-doc.pdf Binary files differindex 924fa59ee5..ba1d01e320 100644 --- a/macros/latex/contrib/widows-and-orphans/widows-and-orphans-doc.pdf +++ b/macros/latex/contrib/widows-and-orphans/widows-and-orphans-doc.pdf diff --git a/macros/latex/contrib/widows-and-orphans/widows-and-orphans.dtx b/macros/latex/contrib/widows-and-orphans/widows-and-orphans.dtx index fc92f91483..7170fae2c6 100644 --- a/macros/latex/contrib/widows-and-orphans/widows-and-orphans.dtx +++ b/macros/latex/contrib/widows-and-orphans/widows-and-orphans.dtx @@ -335,7 +335,7 @@ % \end{figure} % % \begin{macrocode} -\ProvidesExplPackage{widows-and-orphans}{2022/08/27}{v1.0e} +\ProvidesExplPackage{widows-and-orphans}{2023/03/10}{v1.0e} {Detecting widows and orphans (FMi)} % \end{macrocode} % diff --git a/macros/latex/contrib/widows-and-orphans/widows-and-orphans.ins b/macros/latex/contrib/widows-and-orphans/widows-and-orphans.ins index 683ccb53cc..fa4520334f 100644 --- a/macros/latex/contrib/widows-and-orphans/widows-and-orphans.ins +++ b/macros/latex/contrib/widows-and-orphans/widows-and-orphans.ins @@ -3,7 +3,7 @@ %% driver files from the dtx file(s) in this package when run through %% LaTeX or TeX. %% -%% Copyright 2017-2021 Frank Mittelbach +%% Copyright 2018-2023 Frank Mittelbach %% %% %% This file is part of the LaTeX windows-and-orphans Bundle. @@ -38,7 +38,7 @@ This is a generated file. -Copyright 2017-2021 Frank Mittelbach +Copyright 2018-2023 Frank Mittelbach This file was generated from file(s) of the LaTeX windows-and-orphans Bundle. |