From 3babeb32c5a00bc32e03adf0d2e01173d813d1a6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 7 Sep 2013 22:36:23 +0000 Subject: biblatex-dw (7sep13) git-svn-id: svn://tug.org/texlive/trunk@31593 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/biblatex-dw/bbx/authortitle-dw.bbx | 26 +++++++-------- .../tex/latex/biblatex-dw/bbx/footnote-dw.bbx | 4 +-- .../tex/latex/biblatex-dw/bbx/standard-dw.bbx | 4 +-- .../tex/latex/biblatex-dw/cbx/authortitle-dw.cbx | 38 +++++++++++++++++++--- .../tex/latex/biblatex-dw/cbx/footnote-dw.cbx | 6 ++-- .../tex/latex/biblatex-dw/cbx/standard-dw.cbx | 20 ++++++++++-- .../tex/latex/biblatex-dw/lbx/english-dw.lbx | 4 +-- .../tex/latex/biblatex-dw/lbx/german-dw.lbx | 4 +-- 8 files changed, 74 insertions(+), 32 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 c2bac9f4831..e39ca992ba7 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 2012 +% authortitle-dw.bbx, Dominik Waßenhoven 2013 -\ProvidesFile{authortitle-dw.bbx}[2012/06/28 v1.5 biblatex bibliography style] +\ProvidesFile{authortitle-dw.bbx}[2013/09/07 v1.6 biblatex bibliography style] \RequireBibliographyStyle{standard-dw} @@ -233,7 +233,7 @@ %% Formate in der Bibliographie \DeclareFieldFormat{annotation}{% - \annotationfont #1\addperiod\par} + \annotationfont #1}%\addperiod\par} \DeclareFieldFormat{booktitle}{#1} \DeclareFieldFormat{edition}{% \ifinteger{#1} @@ -253,7 +253,7 @@ \DeclareFieldFormat{journaltitle}{#1} \DeclareFieldFormat{issuetitle}{#1} \DeclareFieldFormat{library}{% - \libraryfont #1\addperiod\par} + \libraryfont #1}%\addperiod\par} \DeclareFieldFormat{maintitle}{#1} \DeclareFieldFormat{review}{% \bibstring{review}% @@ -298,21 +298,19 @@ test {\iffieldundef{library}} } {\finentry} - {\iffieldundef{library} - {\iffieldundef{annotation} + {\iffieldundef{annotation} + {\iffieldundef{library} {\finentry} {}}% - {\ifbool{bbx:library} + {\ifbool{bbx:annotation} {\setunit{\addperiod\par} - \printfield{library}} + \printfield{annotation}} {}}% - \iffieldundef{annotation} + \iffieldundef{library} {} - {\ifbool{bbx:annotation} - {\iffieldundef{library}% wenn library ebenfalls ausgegeben wird, keinen Punkt und Absatz machen (ist dann von library schon gesetzt) - {\setunit{\addperiod\par}} - {} - \printfield{annotation}} + {\ifbool{bbx:library} + {\setunit{\addperiod\par} + \printfield{library}} {}}% \finentry}} 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 f05a070a024..43804aed50e 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 2012 +% footnote-dw.bbx, Dominik Waßenhoven 2013 -\ProvidesFile{footnote-dw.bbx}[2012/06/28 v1.5 biblatex bibliography style] +\ProvidesFile{footnote-dw.bbx}[2013/09/07 v1.6 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 36d8e3966b4..42f059e319b 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 2012 +% standard-dw.bbx, Dominik Waßenhoven 2013 -\ProvidesFile{standard-dw.bbx}[2012/06/28 v1.5 biblatex bibliography style] +\ProvidesFile{standard-dw.bbx}[2013/09/07 v1.6 biblatex bibliography style] \@ifpackagelater{biblatex}{2011/11/13} {} 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 e93d792ed3b..6fe1d082d54 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,14 +1,21 @@ -% authortitle-dw.cbx, Dominik Waßenhoven 2012 +% authortitle-dw.cbx, Dominik Waßenhoven 2013 -\ProvidesFile{authortitle-dw.cbx}[2012/06/28 v1.5 biblatex citation style] +\ProvidesFile{authortitle-dw.cbx}[2013/09/07 v1.6 biblatex citation style] \RequireCitationStyle{standard-dw} +\newbool{cbx:addyear} \newbool{cbx:firstfull} +\DeclareBibliographyOption{addyear}[true]{% + \csuse{bool#1}{cbx:addyear}} + \DeclareBibliographyOption{firstfull}[true]{% \csuse{bool#1}{cbx:firstfull}} +%% Zeichen zwischen Titel und Jahr (bei addyear=true) +\newcommand*{\titleyeardelim}{\addspace} + \newbibmacro*{cite}{% \usebibmacro{cite:citepages}% \global\boolfalse{cbx:loccit}% @@ -163,7 +170,9 @@ \AtBeginBibliography{% \renewbibmacro*{cite:xref}{% \iffieldundef{shorthand} - {\usebibmacro{cite:editor}% + {\ifbool{xref:inbook} + {\usebibmacro{cite:author}} + {\usebibmacro{cite:editor}}% \iffieldundef{shorttitle} {\printfield{title}} {\printfield{shorttitle}}% @@ -246,11 +255,30 @@ } {\printtext[review]{\bbx@review{\thefield{xref}}}} {\printtext[bibhyperref]{% - \printfield[citetitle]{labeltitle}}}}} + \printfield[citetitle]{labeltitle}}} + \ifbool{cbx:addyear} + {\iffieldundef{year} + {} + {\titleyeardelim% + \parentext{\printfield{year}}}} + {}}} \newbibmacro*{cite:title:force}{% \printtext[bibhyperref]{% - \printfield[citetitle]{labeltitle}}} + \printfield[citetitle]{labeltitle}}% + \ifbool{cbx:addyear} + {\iffieldundef{year} + {} + {\titleyeardelim% + \parentext{\printfield{year}}}} + {}} + +\newbibmacro*{cite:labelyear+extrayear}{% + \iffieldundef{labelyear} + {} + {\printtext[bibhyperref]{% + \printfield{labelyear}% + \printfield{extrayear}}}} \DeclareCiteCommand{\cite} {\usebibmacro{prenote}} 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 eab1c03dd5f..fe4646eae91 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 2012 -\ProvidesFile{footnote-dw.cbx}[2012/06/28 v1.5 biblatex citation style] +\ProvidesFile{footnote-dw.cbx}[2013/06/03 v1.5a (beta) biblatex citation style] \RequireCitationStyle{standard-dw} @@ -142,7 +142,7 @@ {} {\ifbool{cbx:parencitefoot} {\addspace\mkbibbrackets{% - \bibstring{seenote}\addnbspace% + \midsentence\bibstring{seenote}\addnbspace% \ref{cbx@\csuse{cbx@first@\thefield{entrykey}}}% \ifbool{cbx:pageref} {\ifsamepage{\the\value{instcount}} @@ -152,7 +152,7 @@ \pageref{cbx@\csuse{cbx@first@\thefield{entrykey}}}}} {}}} {\addspace\mkbibparens{% - \bibstring{seenote}\addnbspace% + \midsentence\bibstring{seenote}\addnbspace% \ref{cbx@\csuse{cbx@first@\thefield{entrykey}}}% \ifbool{cbx:pageref} {\ifsamepage{\the\value{instcount}} 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 2e9269cec62..37d7961a709 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 2012 +% standard-dw.cbx, Dominik Waßenhoven 2013 -\ProvidesFile{standard-dw.cbx}[2012/06/28 v1.5 biblatex citation style] +\ProvidesFile{standard-dw.cbx}[2013/09/07 v1.6 biblatex citation style] \@ifpackagelater{biblatex}{2011/11/13} {} @@ -314,6 +314,22 @@ \setunit{\addspace}% \printnames[labelname]{editor}}} +\newbibmacro*{cite:author}{% + \ifboolexpr{ + test \ifuseauthor + and + not test {\ifnameundef{author}} + } + {\ifbool{xrefidem} + {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND + \NOT\iffirstonpage} + {\usebibmacro{cite:idem}} + {\printnames[labelname]{author}}} + {\printnames[labelname]{author}% + \global\undef\bbx@lasthash}% + \clearname{author}} + {}} + \newbibmacro*{cite:editor}{% \ifboolexpr{ test \ifuseeditor 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 d147e65c164..48ea16eae44 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 2012 +% english-dw.lbx, Dominik Waßenhoven 2013 -\ProvidesFile{english-dw.lbx}[2012/06/28 v1.5 biblatex localization file] +\ProvidesFile{english-dw.lbx}[2013/09/07 v1.6 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 34ff8d83625..44625002f0e 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 2012 +% german-dw.lbx, Dominik Waßenhoven 2013 -\ProvidesFile{german-dw.lbx}[2012/06/28 v1.5 biblatex localization file] +\ProvidesFile{german-dw.lbx}[2013/09/07 v1.6 biblatex localization file] \InheritBibliographyExtras{german} -- cgit v1.2.3