From 221e3f5a227809dc8ecae2d464966d254aecc46f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 24 Nov 2011 22:37:11 +0000 Subject: biblatex 1.4 (21nov11) git-svn-id: svn://tug.org/texlive/trunk@24647 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/biblatex-dw/bbx/authortitle-dw.bbx | 186 +++++++++++++-------- .../tex/latex/biblatex-dw/bbx/footnote-dw.bbx | 8 +- .../tex/latex/biblatex-dw/bbx/standard-dw.bbx | 133 ++++++++++----- .../tex/latex/biblatex-dw/cbx/authortitle-dw.cbx | 56 +++---- .../tex/latex/biblatex-dw/cbx/footnote-dw.cbx | 90 ++++++---- .../tex/latex/biblatex-dw/cbx/standard-dw.cbx | 75 +++++---- .../tex/latex/biblatex-dw/lbx/english-dw.lbx | 18 +- .../tex/latex/biblatex-dw/lbx/german-dw.lbx | 18 +- 8 files changed, 369 insertions(+), 215 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-dw') 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 c00749fce5e..e5400e4e648 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,13 +1,13 @@ -% authortitle-dw.bbx, Dominik Waßenhoven 2011 +% authortitle-dw.bbx, Dominik Waßenhoven 2011 -\ProvidesFile{authortitle-dw.bbx}[2011/02/06 v1.3c biblatex bibliography style] +\ProvidesFile{authortitle-dw.bbx}[2011/11/20 v1.4 biblatex bibliography style] -\@ifpackagelater{biblatex}{2011/01/08} +\@ifpackagelater{biblatex}{2011/07/29} {} {\PackageError{biblatex} {Outdated 'biblatex' package} {The version of the 'authortitle-dw' style you are using\MessageBreak - requires biblatex v1.1a or later.\MessageBreak + requires biblatex v1.6 or later.\MessageBreak You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak This is a fatal error. I'm aborting now.}% \endinput} @@ -17,6 +17,7 @@ \newbool{bbx:annotation} \newbool{bbx:edbyidem} \newbool{bbx:editorstring}% Test, ob editorstring auf parens oder brackets gesetzt wurde +\newbool{bbx:editionstring} \newbool{bbx:edsuper} \newbool{bbx:idembib} \newbool{bbx:idemfont}% Test, ob idemfont gesetzt wurde @@ -26,9 +27,12 @@ \newbool{bbx:oldauthor} \newbool{bbx:origfields} \newbool{bbx:pseudoauthor} +\newbool{oldbookauthor} \newbool{oldauthor} \newbool{pseudoauthor} +\DeclareEntryOption{oldbookauthor}[true]{% + \csuse{bool#1}{oldbookauthor}} \DeclareEntryOption{oldauthor}[true]{% \csuse{bool#1}{oldauthor}} \DeclareEntryOption{pseudoauthor}[true]{% @@ -38,6 +42,8 @@ \csuse{bool#1}{bbx:annotation}} \DeclareBibliographyOption{edbyidem}[true]{% \csuse{bool#1}{bbx:edbyidem}} +\DeclareBibliographyOption{editionstring}[true]{% + \csuse{bool#1}{bbx:editionstring}} \DeclareBibliographyOption{edsuper}[true]{% \csuse{bool#1}{bbx:edsuper}} \DeclareBibliographyOption{idembib}[true]{% @@ -72,9 +78,9 @@ \def\bbx@opt@namefont@smallcaps{% \renewcommand{\bbx@namefont}{\textsc}} \def\bbx@opt@namefont@italic{% - \renewcommand{\bbx@namefont}{\textit}} + \renewcommand{\bbx@namefont}{\mkbibemph}} \def\bbx@opt@namefont@bold{% - \renewcommand{\bbx@namefont}{\textbf}} + \renewcommand{\bbx@namefont}{\mkbibbold}} \DeclareBibliographyOption{firstnamefont}[normal]{% \ifcsdef{bbx@opt@firstnamefont@#1} @@ -88,9 +94,9 @@ \def\bbx@opt@firstnamefont@smallcaps{% \renewcommand{\bbx@firstnamefont}{\textsc}} \def\bbx@opt@firstnamefont@italic{% - \renewcommand{\bbx@firstnamefont}{\textit}} + \renewcommand{\bbx@firstnamefont}{\mkbibemph}} \def\bbx@opt@firstnamefont@bold{% - \renewcommand{\bbx@firstnamefont}{\textbf}} + \renewcommand{\bbx@firstnamefont}{\mkbibbold}} \DeclareBibliographyOption{idemfont}[normal]{% \ifcsdef{bbx@opt@idemfont@#1} @@ -107,10 +113,10 @@ \renewcommand{\bbx@idemfont}{\textsc}} \def\bbx@opt@idemfont@italic{% \global\booltrue{bbx:idemfont}% - \renewcommand{\bbx@idemfont}{\textit}} + \renewcommand{\bbx@idemfont}{\mkbibemph}} \def\bbx@opt@idemfont@bold{% \global\booltrue{bbx:idemfont}% - \renewcommand{\bbx@idemfont}{\textbf}} + \renewcommand{\bbx@idemfont}{\mkbibbold}} \DeclareBibliographyOption{ibidemfont}[normal]{% \ifcsdef{bbx@opt@ibidemfont@#1} @@ -124,9 +130,9 @@ \def\bbx@opt@ibidemfont@smallcaps{% \renewcommand{\bbx@ibidemfont}{\textsc}} \def\bbx@opt@ibidemfont@italic{% - \renewcommand{\bbx@ibidemfont}{\textit}} + \renewcommand{\bbx@ibidemfont}{\mkbibemph}} \def\bbx@opt@ibidemfont@bold{% - \renewcommand{\bbx@ibidemfont}{\textbf}} + \renewcommand{\bbx@ibidemfont}{\mkbibbold}} \DeclareBibliographyOption{idembibformat}[idem]{% \ifcsdef{bbx@opt@idembibformat@#1} @@ -159,6 +165,18 @@ \def\bbx@opt@editorstring@brackets{% \global\booltrue{bbx:editorstring}% \renewcommand{\bbx@editorstring}{\mkbibbrackets}} + +\DeclareBibliographyOption{editorstringfont}[normal]{% + \ifcsdef{bbx@opt@edstringfont@#1} + {\csuse{bbx@opt@edstringfont@#1}} + {\blxdw@error{% + Invalid option 'editorstringfont=#1'\MessageBreak + Valid values are 'normal' and 'namefont'}}} +\newcommand{\bbx@edstringfont}{} +\def\bbx@opt@edstringfont@normal{% + \renewcommand{\bbx@edstringfont}{}} +\def\bbx@opt@edstringfont@namefont{% + \renewcommand{\bbx@edstringfont}{\bbx@namefont}} \ExecuteBibliographyOptions{% edbyidem=true, @@ -173,7 +191,7 @@ pseudoauthor=true } -%% Autoren, Herausgeber und Übersetzter in der Bibliographie +%% Autoren, Herausgeber und Ãœbersetzter in der Bibliographie \DeclareNameAlias{author}{sortname} \DeclareNameAlias{editor}{sortname} \DeclareNameAlias{translator}{sortname} @@ -202,7 +220,7 @@ %% Zeichen vor 'Nachdruck' bei Benutzung von 'origfields' \newcommand*{\origfieldspunct}{\addcomma\space} -%% Zeichen für pseudoauthor=true +%% Zeichen für pseudoauthor=true \newcommand*{\bibleftpseudo}{} \newcommand*{\bibrightpseudo}{} @@ -219,7 +237,7 @@ \let\finalnamedelim\bibfinalnamedelim% } -%% Makros für Schriften der Felder 'annotation' und 'library' +%% Makros für Schriften der Felder 'annotation' und 'library' \newcommand{\annotationfont}{\small\itshape} \newcommand{\libraryfont}{\small\sffamily} @@ -227,7 +245,13 @@ \DeclareFieldFormat{annotation}{% \annotationfont #1\addperiod} \DeclareFieldFormat{booktitle}{#1} -\DeclareFieldFormat{edition:super}{% für Option 'edsuper' +\DeclareFieldFormat{edition}{% + \ifinteger{#1} + {\mkbibordedition{#1}~\bibstring{edition}} + {\ifbool{bbx:editionstring} + {#1\addspace\bibstring{edition}\isdot} + {#1\isdot}}} +\DeclareFieldFormat{edition:super}{% für Option 'edsuper' \ifinteger{#1} {\textsuperscript{#1}} {\blxdw@warning@noline{% @@ -276,7 +300,7 @@ {#1\isdot}} {#1\isdot}} -%% Umdefinierung von finentry für 'annotation' und 'library' +%% Umdefinierung von finentry für 'annotation' und 'library' \newbibmacro*{finentry:annotation}{% \iffieldundef{annotation} {\finentry}% @@ -285,47 +309,61 @@ } \newbibmacro*{finentry:library}{% \iffieldundef{library} - {\finentry}% + {\finentry} {\setunit{\addperiod\par} - \printfield{library}}% + \printfield{library}% + \finentry} } \renewbibmacro*{finentry}{% - \ifbool{bbx:annotation} - {\ifbool{bbx:library}% BEIDE true - {\iffieldundef{annotation} - {}% kein \finentry! + \ifboolexpr{ + test {\iffieldundef{annotation}} + and + test {\iffieldundef{library}} + } + {\finentry} + {\iffieldundef{library} + {} + {\ifbool{bbx:library} + {\setunit{\addperiod\par} + \printfield{library}} + {}}% + \iffieldundef{annotation} + {} + {\ifbool{bbx:annotation} {\setunit{\addperiod\par} - \printfield{annotation}}% - \usebibmacro{finentry:library}} - {\usebibmacro{finentry:annotation}}}% nur annotation=true - {\ifbool{bbx:library}% nur library=true - {\usebibmacro{finentry:library}} - {\finentry}}}% BEIDE false - -% Ausschalten von annotation und library für die List of Shorthands + \printfield{annotation}} + {}}% + \finentry}} + +% Ausschalten von annotation und library für die List of Shorthands \AtEveryLositem{% \boolfalse{bbx:annotation}% \boolfalse{bbx:library}% } -%% Wichtig für die Herausgebernamen in der List of Shorthands +%% Wichtig für die Herausgebernamen in der List of Shorthands \InitializeBibliographyStyle{% \let\bbx@lasthash\undefined} -% Formatierung der Nachnamen entsprechend der Option 'namefont' -% Nachnamen von Einträgen mit 'options = {oldauthor=true}' oder 'options = {oldauthor}' +% Nachnamen von Einträgen mit 'options = {oldauthor=true}' +% oder 'options = {oldbookauthor=true}' % werden nicht in der Schrift von 'namefont' gesetzt +% Formatierung der Nachnamen entsprechend der Option 'namefont' \renewcommand*{\mkbibnamelast}[1]{% \ifboolexpr{ bool {bbx:oldauthor} and - bool {oldauthor} - and - ( test {\ifcurrentname{author}} + ( ( bool {oldauthor} + and + ( test {\ifcurrentname{author}} + or + ( test {\ifcurrentname{labelname}} + and + not test {\ifnameundef{author}} ) ) ) or - ( test {\ifcurrentname{labelname}} + ( bool {oldbookauthor} and - not test {\ifnameundef{author}} ) ) + test {\ifcurrentname{bookauthor}} ) ) } {#1} {\bbx@namefont{#1}}} @@ -335,13 +373,17 @@ \ifboolexpr{ bool {bbx:oldauthor} and - bool {oldauthor} - and - ( test {\ifcurrentname{author}} + ( ( bool {oldauthor} + and + ( test {\ifcurrentname{author}} + or + ( test {\ifcurrentname{labelname}} + and + not test {\ifnameundef{author}} ) ) ) or - ( test {\ifcurrentname{labelname}} + ( bool {oldbookauthor} and - not test {\ifnameundef{author}} ) ) + test {\ifcurrentname{bookauthor}} ) ) } {#1} {\bbx@firstnamefont{#1}}} @@ -352,13 +394,17 @@ \ifboolexpr{ bool {bbx:oldauthor} and - bool {oldauthor} - and - ( test {\ifcurrentname{author}} + ( ( bool {oldauthor} + and + ( test {\ifcurrentname{author}} + or + ( test {\ifcurrentname{labelname}} + and + not test {\ifnameundef{author}} ) ) ) or - ( test {\ifcurrentname{labelname}} + ( bool {oldbookauthor} and - not test {\ifnameundef{author}} ) ) + test {\ifcurrentname{bookauthor}} ) ) } {#1} {\ifuseprefix @@ -370,22 +416,26 @@ \ifboolexpr{ bool {bbx:oldauthor} and - bool {oldauthor} - and - ( test {\ifcurrentname{author}} + ( ( bool {oldauthor} + and + ( test {\ifcurrentname{author}} + or + ( test {\ifcurrentname{labelname}} + and + not test {\ifnameundef{author}} ) ) ) or - ( test {\ifcurrentname{labelname}} + ( bool {oldbookauthor} and - not test {\ifnameundef{author}} ) ) + test {\ifcurrentname{bookauthor}} ) ) } {#1} {\bbx@firstnamefont{#1}}} %% \mkidem: % wenn im Feld 'options' 'oldauthor=true' oder 'oldauthor' steht, -% werden keine Kapitälchen o.ä. bei Wiederholungszitaten ('Ders.') gesetzt +% werden keine Kapitälchen o.ä. bei Wiederholungszitaten ('Ders.') gesetzt % ansonsten Formatierung entsprechend der Option 'idemfont', -% falls diese nicht vorhanden ist, wird der Wert von 'namefont' übernommen +% falls diese nicht vorhanden ist, wird der Wert von 'namefont' übernommen \newcommand*{\mkidem}[1]{% \ifboolexpr{ bool {bbx:oldauthor} @@ -430,7 +480,7 @@ %% Ort, Verlag, Jahr: %% - mit 'origfields=true' werden origlocation, origpublisher -%% und origyear gesetzt, der Rest als 'reprint' angehängt +%% und origyear gesetzt, der Rest als 'reprint' angehängt %% - der Verlag ist optional (nopublisher=true|false) %% - die Edition kann hochgestellt werden (edsuper=true|false) \newbibmacro*{origdate}{\printorigdate} @@ -535,7 +585,7 @@ {\printfield{edition}% \newunit}} -%% Hilfsmakro für Option editorstring +%% Hilfsmakro für Option editorstring \newbibmacro*{editorstringpunct}{% \ifbool{bbx:editorstring} {\addspace} @@ -545,11 +595,11 @@ \renewbibmacro*{editorstrg}{% \iffieldundef{editortype} {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}} - {\bbx@editorstring{\bibstring{editors}}} - {\bbx@editorstring{\bibstring{editor}}}} + {\bbx@edstringfont{\bbx@editorstring{\bibstring{editors}}}} + {\bbx@edstringfont{\bbx@editorstring{\bibstring{editor}}}}} {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}} - {\bbx@editorstring{\bibstring{\thefield{editortype}s}}} - {\bbx@editorstring{\bibstring{\thefield{editortype}}}}}} + {\bbx@edstringfont{\bbx@editorstring{\bibstring{\thefield{editortype}s}}}} + {\bbx@edstringfont{\bbx@editorstring{\bibstring{\thefield{editortype}}}}}}} \renewbibmacro*{editor+othersstrg}{% \iffieldundef{editortype} @@ -582,15 +632,15 @@ \appto\abx@tempb{\clearname{afterword}}} {}}}% \ifbibxstring{\abx@tempa} - {\bbx@editorstring{\bibstring{\abx@tempa}}% + {\bbx@edstringfont{\bbx@editorstring{\bibstring{\abx@tempa}}}% \abx@tempb} {\usebibmacro{editorstrg}}} -%% Übersetzer ('Übers.') je nach Option editorstring +%% Ãœbersetzer ('Ãœbers.') je nach Option editorstring \renewbibmacro*{translatorstrg}{% \ifthenelse{\value{translator}>1\OR\ifandothers{translator}} - {\bbx@editorstring{\bibstring{translators}}} - {\bbx@editorstring{\bibstring{translator}}}} + {\bbx@edstringfont{\bbx@editorstring{\bibstring{translators}}}} + {\bbx@edstringfont{\bbx@editorstring{\bibstring{translator}}}}} \renewbibmacro*{translator+othersstrg}{% \ifthenelse{\value{translator}>1\OR\ifandothers{translator}} @@ -613,7 +663,7 @@ {\appto\abx@tempa{af}% \clearname{afterword}} {}}}% - \bbx@editorstring{\bibstring{\abx@tempa}}} + \bbx@edstringfont{\bbx@editorstring{\bibstring{\abx@tempa}}}} %% Option 'editorstring=brackets|parens|normal' %% Option 'idembib=true|false' @@ -821,7 +871,7 @@ {}} %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% -%%%%% Makros aus authortitle.bbx (unverändert) %%%%% +%%%%% Makros aus authortitle.bbx (unverändert) %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% \setlength{\bibitemsep}{0pt} 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 1bb8f04ecb5..16f962ff196 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,13 +1,13 @@ -% footnote-dw.bbx, Dominik Waßenhoven 2011 +% footnote-dw.bbx, Dominik Waßenhoven 2011 -\ProvidesFile{footnote-dw.bbx}[2011/02/06 v1.3c biblatex bibliography style] +\ProvidesFile{footnote-dw.bbx}[2011/11/20 v1.4 biblatex bibliography style] -\@ifpackagelater{biblatex}{2011/01/08} +\@ifpackagelater{biblatex}{2011/07/29} {} {\PackageError{biblatex} {Outdated 'biblatex' package} {The version of the 'footnote-dw' style you are using\MessageBreak - requires biblatex v1.1a or later.\MessageBreak + requires biblatex v1.6 or later.\MessageBreak You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak This is a fatal error. I'm aborting now.}% \endinput} 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 452941a469a..462231a704f 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 2010 +% standard-dw.bbx, Dominik Waßenhoven 2011 -\ProvidesFile{standard-dw.bbx}[2011/02/06 v1.3c biblatex bibliography style] +\ProvidesFile{standard-dw.bbx}[2011/11/20 v1.4 biblatex bibliography style] \RequireBibliographyStyle{standard} @@ -11,21 +11,28 @@ \newbool{bbx:journumafteryear} \newbool{bbx:journumdate} \newbool{bbx:seriesafteryear} +\newbool{bbx:seriesinparens} \newbool{bbx:shorthandacro} \newbool{bbx:shorthandinbib} \newbool{bbx:shorthandinbibpunct}% Kontrolle, ob shorthandinbib ausgegeben wurde \newbool{bbx:shorthandwidthbool} \newbool{bbx:shortjournal} \newbool{bbx:terselos} -\newbool{bbx:xref}% soll xref überhaupt verwendet werden? +\newbool{bbx:xref}% soll xref überhaupt verwendet werden? \newbool{xrefidem} +\newtoggle{listofshorthands}% sind wir in der List of Shorthands? + % Schalter zum ein-/ausblenden bestimmter Felder \newbool{bbx:pagetotal} +% Längen für Shorthand \newlength{\bbx@shorthandwidth} \newlength{\shorthandsep} +% Hilfsbefehl für @review +\newcommand*{\bbx@reviewparent} + \DeclareEntryOption{acronym}[true]{% \csuse{bool#1}{bbx:acronym}} @@ -67,6 +74,15 @@ {\global\booltrue{bbx:seriesafteryear}} {\global\boolfalse{bbx:seriesafteryear}}} +% Option seriesformat=standard|parens +\newcommand{\bbx@option@seriesformat}{} +\DeclareBibliographyOption{seriesformat}{% + \renewcommand{\bbx@option@seriesformat}{#1}} +\AtBeginDocument{% + \ifdefstring{\bbx@option@seriesformat}{parens} + {\global\booltrue{bbx:seriesinparens}} + {\global\boolfalse{bbx:seriesinparens}}} + \ExecuteBibliographyOptions{ doi=false, eprint=false, @@ -74,6 +90,7 @@ journalnumber=standard, pagetotal=false, series=standard, + seriesformat=parens, shorthandinbib=false, terselos=true, xref=false @@ -106,47 +123,54 @@ %% -> vor 'number' (z.B. ', Bd. ') \newcommand*{\sernumstring}{\addspace} -%% Reihe in Klammern +%% Reihe in Klammern (Option seriesformat) \renewbibmacro*{series+number}{% \iffieldundef{series}% {} - {\printtext[parens]{% + {\ifbool{bbx:seriesinparens} + {\printtext[parens]{% \seriespunct% \printfield{series}% \setunit*{\sernumstring}% - \printfield{number}% - \newunit}}} + \printfield{number}}% + \newunit} + {\setunit{\newunitpunct\seriespunct}% + \printfield{series}% + \setunit*{\sernumstring}% + \printfield{number}% + \newunit}}} -%% Kürzere Ausgabe der List of Shorthands +%% Kürzere Ausgabe der List of Shorthands \newbibmacro*{terselos}{% -\ifbool{bbx:terselos} - {\ifnameundef{labelname} - {} - {\ifnameundef{author} - {\printnames{editor}% - \usebibmacro{editorstringpunct}% - \usebibmacro{editorstrg}} - {\printnames{author}}% - \setunit{\labelnamepunct}}% - \iffieldundef{booktitle} - {\usebibmacro{maintitle+title}} - {\usebibmacro{title}% - \newunit\newblock - \usebibmacro{in:}% - \usebibmacro{maintitle+booktitle}}% - \finentry} - {\usedriver - {\DeclareNameAlias{sortname}{default}} - {\thefield{entrytype}}% - \finentry}} + \ifbool{bbx:terselos} + {\ifnameundef{labelname} + {} + {\ifnameundef{author} + {\printnames{editor}% + \usebibmacro{editorstringpunct}% + \usebibmacro{editorstrg}} + {\printnames{author}}% + \setunit{\labelnamepunct}}% + \iffieldundef{booktitle} + {\usebibmacro{maintitle+title}} + {\usebibmacro{title}% + \newunit\newblock + \usebibmacro{in:}% + \usebibmacro{maintitle+booktitle}}% + \finentry} + {\usedriver + {\DeclareNameAlias{sortname}{default}} + {\thefield{entrytype}}% + \finentry}} \DeclareBibliographyDriver{shorthands}{% + \toggletrue{listofshorthands}% \usebibmacro{terselos}} %% Zeichensetzung nach dem Shorthand-Label \newcommand{\shorthandpunct}{} -%% List of Shorthands: Länge der Labels einstellbar +%% List of Shorthands: Länge der Labels einstellbar \AtBeginDocument{% \ifbool{bbx:shorthandwidthbool} {\defbibenvironment{shorthands} @@ -175,16 +199,20 @@ {\endlist} {\item}}} -%% Option »shorthandinbib«: +%% Option »shorthandinbib«: %% Shorthands in der Bibliographie ausgeben -%% außerdem für Option »xref«: -%% Autoren in Liste schreiben für späteren Test xrefnamecheck +%% außerdem für Option »xref«: +%% Autoren in Liste schreiben für späteren Test xrefnamecheck % \newcommand*{\@xrefauthornames} \DeclareFieldFormat{shorthandinbib}{\mkbibbrackets{#1}} \newcommand*{\shorthandinbibpunct}{\addspace} \renewbibmacro*{begentry}{% - \ifcitation - {}% im Zitat sollen shorthands nicht ausgegeben werden + \ifboolexpr{ + test {\ifcitation} + or + togl {listofshorthands} + } + {}% im Zitat und der langen List of Shorthands sollen shorthands nicht ausgegeben werden {\ifbool{bbx:shorthandinbib} {\iffieldundef{shorthand} {} @@ -300,7 +328,7 @@ {}} %% Tests werden bei 'xref=true' in @book, @collection, -%% @proceedings und @reference ausgeführt +%% @proceedings und @reference ausgeführt \AtDataInput[book]{% \usebibmacro{xrefvolumecheck}% \usebibmacro{xrefcitedascheck}} @@ -380,7 +408,7 @@ {\printfield{shortjournal}}} {\usebibmacro{journal:normal}}} -\newbibmacro*{journal:normal}{% vollständige, 'normale' Ausgabe eines Zeitschriftentitels +\newbibmacro*{journal:normal}{% vollständige, 'normale' Ausgabe eines Zeitschriftentitels \iffieldundef{journaltitle} {} {\printtext[journaltitle]{% @@ -552,9 +580,17 @@ {\bibstring{backrefpages}\ppspace} {\bibstring{backrefpage}\ppspace}% \printlist[pageref][-\value{listtotal}]{pageref}}}} + +\renewbibmacro*{note+pages}{% + \printfield{note}% + \ifbool{cbx:rpcited} + {} + {\setunit{\bibpagespunct}% + \printfield{pages}}% + \newunit} %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% -%%%%% Bibmacros für Code, der im Bibliography %%%%% +%%%%% Bibmacros für Code, der im Bibliography %%%%% %%%%% Driver aufgerufen wird, wenn KEIN xref %%%%% %%%%% vorhanden ist. %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% @@ -1305,7 +1341,7 @@ \usebibmacro{begentry}% \ifbool{cbx:idemfull} {} - {\usebibmacro{author/translator+others}% + {\usebibmacro{author}% \ifnameundef{labelname} {} {\setunit{\labelnamepunct}\newblock}}% @@ -1321,7 +1357,8 @@ \newunit\newblock \printfield{version}} {% Code, wenn xref vorhanden - \printtext[review]{\bbx@xref{\thefield{xref}}}}% + \savefield{xref}{\bbx@reviewparent}% + \printtext[review]{\bbx@review{\thefield{xref}}}}% \newunit\newblock \usebibmacro{in:}% \usebibmacro{journal+issuetitle}% @@ -1407,7 +1444,7 @@ %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% Die folgenden 'xref'-BibliographyDriver sind %%%%% -%%%%% nötig, damit bei Erstzitaten mit xref die %%%%% +%%%%% nötig, damit bei Erstzitaten mit xref die %%%%% %%%%% Option useeditor=true beachtet wird. %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% @@ -1556,7 +1593,7 @@ %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% Die folgenden 'xrefidem'-BibliographyDriver %%%%% -%%%%% sind nötig damit bei Erstzitaten mit demselben %%%%% +%%%%% sind nötig damit bei Erstzitaten mit demselben %%%%% %%%%% Autor und xref ein Vollzitat erfolgen kann, %%%%% %%%%% ohne den Autor des referenzierten Werkes (der %%%%% %%%%% durch 'idem' ersetzt wird) auszugeben. %%%%% @@ -1746,6 +1783,20 @@ Thus, 'omiteditor' is ignored}} {}}% {}% + \ifdefstring{\bbx@option@series}{standard} + {} + {\ifdefstring{\bbx@option@series}{afteryear} + {} + {\blxdw@warning@noline{% + Unknown value for option 'series'.\MessageBreak + Option 'series=standard' used instead}}}% + \ifdefstring{\bbx@option@seriesformat}{standard} + {} + {\ifdefstring{\bbx@option@seriesformat}{parens} + {} + {\blxdw@warning@noline{% + Unknown value for option 'seriesformat'.\MessageBreak + Option 'seriesformat=standard' used instead}}}% } \endinput 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 8b539f59755..2147945d171 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 2011 +% authortitle-dw.cbx, Dominik Waßenhoven 2011 -\ProvidesFile{authortitle-dw.cbx}[2011/02/06 v1.3c biblatex citation style] +\ProvidesFile{authortitle-dw.cbx}[2011/11/20 v1.4 biblatex citation style] \RequireCitationStyle{standard-dw} @@ -141,21 +141,10 @@ \AtBeginBibliography{% \renewbibmacro*{cite:xref}{% - \iffieldundef{shorthand}% - {\ifuseeditor - {\ifnameundef{labelname} - {} - {\ifbool{xrefidem}% - {\ifbool{bbx:edbyidem} - {\midsentence% - \usebibmacro{cite:idem}}% - {\printnames{labelname}% - \printtext{\labelnamepunct}}}% - {\printnames{labelname}% - \printtext{\labelnamepunct}}}} - {}% - \iffieldundef{shorttitle}% - {\printfield{title}}% + \iffieldundef{shorthand} + {\usebibmacro{cite:editor}% + \iffieldundef{shorttitle} + {\printfield{title}} {\printfield{shorttitle}}% \ifuseeditor {} @@ -163,17 +152,17 @@ {} {\ifnameundef{editor} {} - {\ifbool{xrefidem}% + {\ifbool{xrefidem} {\ifbool{bbx:edbyidem} - {\newunit + {\newunit% \bibstring{byeditor}% \setunit{\addspace}% \bibstring[\mkidem]{idemdat\thefield{gender}}} - {\newunit + {\newunit% \usebibmacro{byeditor}}}% - {\newunit - \usebibmacro{byeditor}}}}}}% - {\printtext[bibhyperref]{\printfield{shorthand}}}}} + {\newunit% + \usebibmacro{byeditor}}}}}} + {\printtext[bibhyperref]{\printfield{shorthand}}}}} \newbibmacro*{cite:fullxref}{% \usebibmacro{cite:full:citepages}% @@ -199,7 +188,8 @@ \DeclareCiteCommand{\fullcite} {\usebibmacro{prenote}% - \usebibmacro{cite:full:citepages}} + \usebibmacro{cite:full:citepages}% + \booltrue{cbx:fullcite}} {\usedriver {\DeclareNameAlias{sortname}{default}} {\thefield{entrytype}}} @@ -209,7 +199,8 @@ \DeclareCiteCommand{\footfullcite}[\mkbibfootnote] {\bibsentence \usebibmacro{prenote}% - \usebibmacro{cite:full:citepages}} + \usebibmacro{cite:full:citepages}% + \booltrue{cbx:fullcite}} {\usedriver {\DeclareNameAlias{sortname}{default}} {\thefield{entrytype}}} @@ -226,13 +217,13 @@ \newbibmacro*{cite:title}{% \ifsingletitle - {\setunit{}}% Löschen des \nametitledelim, falls kein Titel ausgegeben wird + {\setunit{}}% Löschen des \nametitledelim, falls kein Titel ausgegeben wird {\ifboolexpr{ - test {\iffieldequalstr{entrytype}{review}} + test {\ifentrytype{review}} and not test {\iffieldundef{xref}} } - {\printtext[review]{\bbx@xref{\thefield{xref}}}} + {\printtext[review]{\bbx@review{\thefield{xref}}}} {\printtext[bibhyperref]{% \printfield[citetitle]{labeltitle}}}}} @@ -279,7 +270,7 @@ {\usebibmacro{textcite:postnote}} %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% -%%%%% Unverändert übernommen aus authortitle-ibid.cbx %%%%% +%%%%% Unverändert übernommen aus authortitle-ibid.cbx %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% \newbool{cbx:parens} @@ -320,4 +311,11 @@ {\multicitedelim} {\usebibmacro{cite:postnote}} +\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} + \endinput 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 4bf04a27fd0..cd6cd7c6b8d 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,17 +1,19 @@ -% footnote-dw.cbx, Dominik Waßenhoven 2010 +% footnote-dw.cbx, Dominik Waßenhoven 2011 -\ProvidesFile{footnote-dw.cbx}[2011/02/06 v1.3c biblatex citation style] +\ProvidesFile{footnote-dw.cbx}[2011/11/20 v1.4 biblatex citation style] \RequireCitationStyle{standard-dw} \newbool{cbx:pageref} +\newbool{cbx:review} +\newbool{cbx:textcitefull} \ExecuteBibliographyOptions{ - loccittracker=true,% für die Option 'ibidpage' + loccittracker=true,% für die Option 'ibidpage' uniquename=false, % damit bei idem=false Vor- und Nachname gesetzt werden! } -% Kommandos zum Verpacken der Zitate in Fußnoten +% Befehle zum Verpacken der Zitate in Fußnoten \newrobustcmd{\mkfootnotecite}[1]{% \iffootnote {#1} @@ -20,8 +22,8 @@ \bibsentence#1\addperiod}}} \newbool{cbx:parencitefoot}% wenn parencite innerhalb einer - % Fußnote aufgerufen wird - % (wichtig für seenote) + % Fußnote aufgerufen wird + % (wichtig für seenote) \newrobustcmd{\mkparencite}[1]{% \iffootnote {\booltrue{cbx:parencitefoot}% @@ -33,11 +35,21 @@ \toggletrue{blx@footnote}% \bibsentence#1\addperiod}}} +% Befehl zum Testen, ob in Fußnote (für \textcite) +\newrobustcmd{\footnotecheck}{% + \iffootnote + {\booltrue{cbx:parencitefoot}} + {\boolfalse{cbx:parencitefoot}}} + \newbibmacro*{cite}{% \usebibmacro{cite:citepages}% \global\boolfalse{cbx:loccit}% \bibhypertarget{cite\the\value{instcount}}{% - \ifciteseen + \ifboolexpr{ + test {\ifciteseen} + and not + bool {cbx:textcitefull} + } {\iffieldundef{shorthand} {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}% @@ -90,15 +102,15 @@ \newbibmacro*{cite:title}{% \ifboolexpr{ - test {\iffieldequalstr{entrytype}{review}} + test {\ifentrytype{review}} and not test {\iffieldundef{xref}} } - {\booltrue{cbx:review}% für cite:seenote (damit das rezensierte Werk keinen Verweis bekommt) - \printtext[review]{\bbx@xref{\thefield{xref}}}% - \boolfalse{cbx:review}}% \boolfalse ist nötig, damit @review selbst wieder einen Verweis bekommt + {\booltrue{cbx:review}% für cite:seenote (damit das rezensierte Werk keinen Verweis bekommt) + \printtext[review]{\bbx@review{\thefield{xref}}}% + \boolfalse{cbx:review}}% \boolfalse ist nötig, damit @review selbst wieder einen Verweis bekommt {\ifsingletitle - {\setunit{}}% Löschen des \nametitledelim, falls kein Titel ausgegeben wird + {\setunit{}}% Löschen des \nametitledelim, falls kein Titel ausgegeben wird {\printtext[bibhyperlink]{% \printfield[citetitle]{labeltitle}}}}% \ifboolexpr{ @@ -134,23 +146,23 @@ {} {\ifbool{cbx:parencitefoot} {\addspace\mkbibbrackets{% - \bibstring{seenote}\addnbspace%\ref{\thefield{entrykey}}% + \bibstring{seenote}\addnbspace% \ref{cbx@\csuse{cbx@first@\thefield{entrykey}}}% \ifbool{cbx:pageref} {\ifsamepage{\the\value{instcount}} {\csuse{cbx@first@\thefield{entrykey}}} {} - {\addcomma\space\bibstring{page}\addnbspace + {\addcomma\space\bibstring{page}\addnbspace% \pageref{cbx@\csuse{cbx@first@\thefield{entrykey}}}}} {}}} {\addspace\mkbibparens{% - \bibstring{seenote}\addnbspace%\ref{\thefield{entrykey}}% + \bibstring{seenote}\addnbspace% \ref{cbx@\csuse{cbx@first@\thefield{entrykey}}}% \ifbool{cbx:pageref} {\ifsamepage{\the\value{instcount}} {\csuse{cbx@first@\thefield{entrykey}}} {} - {\addcomma\space\bibstring{page}\addnbspace + {\addcomma\space\bibstring{page}\addnbspace% \pageref{cbx@\csuse{cbx@first@\thefield{entrykey}}}}} {}}}}} @@ -203,22 +215,7 @@ \AtBeginBibliography{% \renewbibmacro*{cite:xref}{% \iffieldundef{shorthand}% - {\ifboolexpr{ - test \ifuseeditor - or - test \ifusetranslator - } - {\ifnameundef{labelname} - {} - {\ifbool{xrefidem}% - {\ifbool{bbx:edbyidem} - {\midsentence% - \usebibmacro{cite:xref:idem}}% - {\printnames{labelname}% - \printtext{\labelnamepunct}}}% - {\printnames{labelname}% - \printtext{\labelnamepunct}}}} - {}% + {\usebibmacro{cite:editor}% \iffieldundef{shorttitle}% {\printfield{title}}% {\printfield{shorttitle}}% @@ -266,7 +263,8 @@ \DeclareCiteCommand{\fullcite}[\mkfootnotecite] {\usebibmacro{prenote}% - \usebibmacro{cite:full:citepages}} + \usebibmacro{cite:full:citepages}% + \booltrue{cbx:fullcite}} {\usedriver {\DeclareNameAlias{sortname}{default}} {\thefield{entrytype}}} @@ -276,20 +274,35 @@ \DeclareCiteCommand{\footfullcite}[\mkfootnotecite] {\bibsentence \usebibmacro{prenote}% - \usebibmacro{cite:full:citepages}} + \usebibmacro{cite:full:citepages}% + \booltrue{cbx:fullcite}} {\usedriver {\DeclareNameAlias{sortname}{default}} {\thefield{entrytype}}} {\multicitedelim} {\usebibmacro{cite:postnote}} +\DeclareCiteCommand{\textcite}[\footnotecheck\cbx@textcite\footcite] + {\gdef\cbx@savedkeys{}} + {\printnames{labelname}% + \ifciteseen + {\global\boolfalse{cbx:textcitefull}} + {\global\booltrue{cbx:textcitefull}}% + \xappto\cbx@savedkeys{\thefield{entrykey},}} + {\multinamedelim} + {\protected@xappto\cbx@savedcites{% + [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}} + +\newrobustcmd{\cbx@textcite}[2]{% + \def\cbx@savedcites{#1}\ifbool{cbx:parencitefoot}{#2\addspace{\mkbibparens{\cbx@savedcites}}}{#2\cbx@savedcites}} \DeclareMultiCiteCommand{\cites}[\mkfootnotecite]{\cite}{\multicitedelim} \DeclareMultiCiteCommand{\parencites}[\mkparencite]{\parencite}{\multicitedelim} \DeclareMultiCiteCommand{\footcites}[\mkfootnotecite]{\footcite}{\multicitedelim} +\DeclareMultiCiteCommand{\textcites}[\cbx@textcite\footcites]{\textcite}{\textcitesdelim} %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% -%%%%% Unverändert aus verbose-trad1 übernommen %%%%% +%%%%% Unverändert aus verbose-trad1 übernommen %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% \newbool{cbx:loccit} @@ -318,4 +331,11 @@ \newbibmacro*{cite:ibid:page}{} +\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} + \endinput 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 9a0652c4c3f..b0375079178 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,16 +1,17 @@ -% standard-dw.cbx, Dominik Waßenhoven 2011 +% standard-dw.cbx, Dominik Waßenhoven 2011 -\ProvidesFile{standard-dw.cbx}[2011/02/06 v1.3c biblatex citation style] +\ProvidesFile{standard-dw.cbx}[2011/11/20 v1.4 biblatex citation style] \newbool{cbx:authauthxref} \newbool{cbx:authedxref} \newbool{cbx:citedas} \newbool{cbx:edstringincitations} \newbool{cbx:firstfullname} +\newbool{cbx:fullcite}% Test, ob fullcite ausgeführt wurde (wichtig für @review) \newbool{cbx:idemfull} \newbool{cbx:noidem} \newbool{cbx:omiteditor} -\newbool{cbx:review} +\newbool{cbx:rpcited}% wurde der parent des @review schon zitiert? \newbool{cbx:xrefparent:firstcite} \newbool{cbx:shorthandibid} @@ -80,19 +81,19 @@ \global\toggletrue{cbx:fullcite}}% \renewbibmacro*{cite:postnote}{% \ifboolexpr{ - togl {cbx:fullcite} - and - test {\iffieldpages{postnote}} - and - test {\ifnumequal{\value{citecount}}{\value{citetotal}}} - and - ( not test {\iffieldundef{pages}} - or - ( not test {\iffieldundef{pagetotal}} - and - bool {bbx:pagetotal} - ) - ) + togl {cbx:fullcite} + and + test {\iffieldpages{postnote}} + and + test {\ifnumequal{\value{citecount}}{\value{citetotal}}} + and + ( not test {\iffieldundef{pages}} + or + ( not test {\iffieldundef{pagetotal}} + and + bool {bbx:pagetotal} + ) + ) } {\usebibmacro{cite:postnote:pages}} {\usebibmacro{cite:postnote:ibidpage}}} @@ -131,14 +132,14 @@ \csxdef{cbx:lastcite@\thefield{entrykey}}{\the\value{instcount}}% \global\boolfalse{cbx:noidem}} -% Ausschalten von annotation und library für Zitate im Text +% Ausschalten von annotation und library für Zitate im Text \AtEveryCite{% \boolfalse{bbx:annotation}% \boolfalse{bbx:library}% } %% Doppelpunkt nach Autoren/Editoren -%% aus Kompatibilitätsgründen zu früheren Versionen wird +%% aus Kompatibilitätsgründen zu früheren Versionen wird %% \citenamepunct verwendet \newcommand*{\citenamepunct}{\addcolon\space} \renewcommand*{\nametitledelim}{\citenamepunct} @@ -150,7 +151,7 @@ \newcommand*{\citerevsdnamedelim}{} \newcommand*{\citemultinamedelim}{\slash} \newcommand*{\citefinalnamedelim}{\slash} -\AtEveryCite{% +\AtBeginDocument{% \let\revsdnamedelim\citerevsdnamedelim \let\multinamedelim\citemultinamedelim \let\finalnamedelim\citefinalnamedelim @@ -161,6 +162,9 @@ \let\citefinalnamedelim\bibfinalnamedelim } +%% Textcite delimiter +\newcommand*{\textcitesdelim}{\addspace\bibstring{and}\space} + %% Titelformate in Zitaten \DeclareFieldFormat*{citetitle}{#1} @@ -249,13 +253,13 @@ \providecommand*{\mkibid}[1]{% \bbx@ibidemfont{#1}} -%% pages (wichtig für xref) +%% pages (wichtig für xref) \newbibmacro*{pages}{% \setunit{\bibpagespunct}% \printfield{pages}} %% in manchen Literaturverweisen (wenn nicht fullcite) -%% müssen statt der vollen Namen (Format [byeditor]) +%% müssen statt der vollen Namen (Format [byeditor]) %% nur die Nachnamen ausgegeben werden (Format [labelname]) \newbibmacro*{cite:byeditor}{% \ifnameundef{editor} @@ -314,7 +318,7 @@ {\usebibmacro{postnote}}} %% Test, ob author und editor bei xref identisch sind -%% (für xref=true, useeditor=false oder usetranslator=false, +%% (für xref=true, useeditor=false oder usetranslator=false, %% edbyidem=true) \newbibmacro*{authedxrefcheck}{% \iffieldundef{xref} @@ -333,8 +337,8 @@ {\booltrue{cbx:authedxref}} {\boolfalse{cbx:authedxref}}}} -%% Test, author des @inbook und author des @book) bei xref -%% identisch sind (für xref=true, edbyidem=true); nötig, +%% Test, ob author des @inbook und author des @book bei xref +%% identisch sind (für xref=true, edbyidem=true); nötig, %% damit der Herausgeber nicht durch idem ersetzt wird \newbibmacro*{authauthxrefcheck}{% \iffieldundef{xref} @@ -348,11 +352,26 @@ {\booltrue{cbx:authauthxref}} {\boolfalse{cbx:authauthxref}}}} +%% für @review +\DeclareCiteCommand{\bbx@review} + {} + {\usebibmacro{citeindex}% + \ifentryseen{\bbx@reviewparent} + {\global\booltrue{cbx:rpcited}} + {\global\boolfalse{cbx:rpcited}}% + \ifbool{cbx:fullcite} + {\usedriver + {\DeclareNameAlias{sortname}{default}} + {\thefield{entrytype}}} + {\usebibmacro{cite}}} + {} + {} + %% xref \DeclareCiteCommand{\bbx@xref} - {}% - {\usebibmacro{cite:xref}}% - {}% - {}% + {} + {\usebibmacro{cite:xref}} + {} + {} \endinput 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 33127f0bc76..4e26c9c1578 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,10 +1,18 @@ -% english-dw.lbx, Dominik Waßenhoven 2010 +% english-dw.lbx, Dominik Waßenhoven 2011 -\ProvidesFile{english-dw.lbx}[2011/02/06 v1.3c biblatex localization file] +\ProvidesFile{english-dw.lbx}[2011/11/20 v1.4 biblatex localization file] -\NewBibliographyString{idemdat,idemdatsf,idemdatsm,% - idemdatsn,idemdatpf,idemdatpm,idemdatpn,idemdatpp,% - inrefstring,review} +\NewBibliographyString{% + idemdat,% + idemdatsf,% + idemdatsm,% + idemdatsn,% + idemdatpf,% + idemdatpm,% + idemdatpn,% + idemdatpp,% + inrefstring,% + review} \InheritBibliographyExtras{english} 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 c57df0387f7..106eea7ac72 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,12 +1,20 @@ -% german-dw.lbx, Dominik Waßenhoven 2010 +% german-dw.lbx, Dominik Waßenhoven 2011 -\ProvidesFile{german-dw.lbx}[2011/02/06 v1.3c biblatex localization file] +\ProvidesFile{german-dw.lbx}[2011/11/20 v1.4 biblatex localization file] \InheritBibliographyExtras{german} -\NewBibliographyString{idemdat,idemdatsf,idemdatsm,% - idemdatsn,idemdatpf,idemdatpm,idemdatpn,idemdatpp,% - inrefstring,review} +\NewBibliographyString{% + idemdat,% + idemdatsf,% + idemdatsm,% + idemdatsn,% + idemdatpf,% + idemdatpm,% + idemdatpn,% + idemdatpp,% + inrefstring,% + review} \DeclareBibliographyStrings{% inherit = {german}, -- cgit v1.2.3