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/cbx/authortitle-dw.cbx | 38 +++++++++++++++++++--- .../tex/latex/biblatex-dw/cbx/footnote-dw.cbx | 6 ++-- .../tex/latex/biblatex-dw/cbx/standard-dw.cbx | 20 ++++++++++-- 3 files changed, 54 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-dw/cbx') 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 -- cgit v1.2.3