diff options
author | Karl Berry <karl@freefriends.org> | 2012-07-13 23:20:54 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-07-13 23:20:54 +0000 |
commit | 31d497f535f0278c65cb8538ee8fa428c7b4ff8d (patch) | |
tree | 7ed87e8c38e352fe6cca66b89772c94b5aa0e392 /Master/texmf-dist/tex/latex/biblatex-dw/cbx | |
parent | 51d9d5fd2716b73ae6ab6ce10d90e756ffe4c632 (diff) |
biblatex-dw 1.5 (28jun12)
git-svn-id: svn://tug.org/texlive/trunk@27035 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-dw/cbx')
3 files changed, 119 insertions, 78 deletions
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 2147945d171..e93d792ed3b 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 2012 -\ProvidesFile{authortitle-dw.cbx}[2011/11/20 v1.4 biblatex citation style] +\ProvidesFile{authortitle-dw.cbx}[2012/06/28 v1.5 biblatex citation style] \RequireCitationStyle{standard-dw} @@ -83,6 +83,27 @@ \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% + \ifbool{cbx:firstfull} + {\ifciteseen + {\usebibmacro{textcite:normal}} + {\usebibmacro{textcite:firstfull}}} + {\usebibmacro{textcite:normal}}} + +\newbibmacro*{textcite:firstfull}{% + \ifnameundef{labelname} + {} + {\ifnamesequal{labelname}{author} + {\clearname{author}} + {}% + \ifnamesequal{labelname}{editor} + {\clearname{editor}} + {}% + \ifnamesequal{labelname}{translator} + {\clearname{translator}} + {}}% + \printtext[bibhyperref]{\usebibmacro{cite:full}}} + +\newbibmacro*{textcite:normal}{% \iffieldundef{shorthand} {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} @@ -268,18 +289,12 @@ {}% \multicitedelim} {\usebibmacro{textcite:postnote}} - + %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% Unverändert übernommen aus authortitle-ibid.cbx %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% \newbool{cbx:parens} -\newbool{cbx:loccit} - -\DeclareBibliographyOption{ibidpage}[true]{% - \ifstrequal{#1}{true} - {\ExecuteBibliographyOptions{loccittracker=constrict}} - {\ExecuteBibliographyOptions{loccittracker=false}}} \newbibmacro*{cite:ibid}{% \printtext[bibhyperref]{\bibstring[\mkibid]{ibidem}}% 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 cd6cd7c6b8d..eab1c03dd5f 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 2011 +% footnote-dw.cbx, Dominik Waßenhoven 2012 -\ProvidesFile{footnote-dw.cbx}[2011/11/20 v1.4 biblatex citation style] +\ProvidesFile{footnote-dw.cbx}[2012/06/28 v1.5 biblatex citation style] \RequireCitationStyle{standard-dw} @@ -9,7 +9,6 @@ \newbool{cbx:textcitefull} \ExecuteBibliographyOptions{ - loccittracker=true,% für die Option 'ibidpage' uniquename=false, % damit bei idem=false Vor- und Nachname gesetzt werden! } @@ -60,13 +59,9 @@ {\usebibmacro{cite:idem}% \usebibmacro{cite:title}} {\ifnameundef{labelname} - {\usebibmacro{cite:title}} - {\usebibmacro{cite:name}% - \ifopcit - {\ifloccit - {\usebibmacro{cite:loccit}} - {\usebibmacro{cite:opcit}}} - {\usebibmacro{cite:title}}}}% + {} + {\usebibmacro{cite:name}}% + \usebibmacro{cite:title}}% \usebibmacro{cite:save}}} {\ifbool{cbx:shorthandibid}% {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}% @@ -123,14 +118,15 @@ {} {\ifnameundef{editor} {} - {\ifbool{xrefidem}% - {\ifbool{bbx:edbyidem} - {\newunit - \bibstring{byeditor}% - \setunit{\addspace}% - \bibstring[\mkidem]{idemdat\thefield{gender}}} - {\newunit - \usebibmacro{cite:byeditor}}}% + {\ifboolexpr{ + bool {xrefidem} + and + bool {bbx:edbyidem} + } + {\newunit + \bibstring{byeditor}% + \setunit{\addspace}% + \bibstring[\mkidem]{idemdat\thefield{gender}}} {\newunit \usebibmacro{cite:byeditor}}}}}% \usebibmacro{cite:seenote}} @@ -172,20 +168,24 @@ {\iffieldundef{shorthand} {\ifnameundef{labelname} {} - {\ifbool{xrefidem} + {\ifboolexpr{ + bool {xrefidem} + and + bool {bbx:edbyidem} + } {\usebibmacro{cite:xref:idem}} - {\usebibmacro{cite:editor}% + {\ifbool{xref:inbook} + {\usebibmacro{author}} + {\usebibmacro{cite:editor}}% \nametitledelim}}% \usebibmacro{cite:title}} {\usebibmacro{cite:shorthand}}} {\ifboolexpr{ bool {xrefidem} - or - bool {cbx:authauthxref} + and + bool {bbx:edbyidem} } - {\ifbool{bbx:edbyidem} - {\usebibmacro{cite:fullxrefidem}}% - {\usebibmacro{cite:fullxref}}}% + {\usebibmacro{cite:fullxrefidem}} {\usebibmacro{cite:fullxref}}}} \newbibmacro*{cite:fullxref}{% @@ -254,8 +254,7 @@ {\usebibmacro{cite:postnote}} \DeclareCiteCommand{\footcite}[\mkfootnotecite] - {\bibsentence - \usebibmacro{prenote}} + {\usebibmacro{prenote}} {\usebibmacro{citeindex}% \usebibmacro{cite}} {\multicitedelim} @@ -272,8 +271,7 @@ {\usebibmacro{cite:postnote}} \DeclareCiteCommand{\footfullcite}[\mkfootnotecite] - {\bibsentence - \usebibmacro{prenote}% + {\usebibmacro{prenote}% \usebibmacro{cite:full:citepages}% \booltrue{cbx:fullcite}} {\usedriver @@ -282,6 +280,13 @@ {\multicitedelim} {\usebibmacro{cite:postnote}} +\DeclareCiteCommand{\smartcite}[\iffootnote\mkparencite\mkfootnotecite] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} + \DeclareCiteCommand{\textcite}[\footnotecheck\cbx@textcite\footcite] {\gdef\cbx@savedkeys{}} {\printnames{labelname}% @@ -294,7 +299,12 @@ [\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}} + \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} @@ -302,40 +312,13 @@ \DeclareMultiCiteCommand{\textcites}[\cbx@textcite\footcites]{\textcite}{\textcitesdelim} %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% -%%%%% Unverändert aus verbose-trad1 übernommen %%%%% +%%%%% Unverändert aus verbose-inote übernommen %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% -\newbool{cbx:loccit} - -\DeclareBibliographyOption{ibidpage}[true]{% - \ifstrequal{#1}{true} - {\renewbibmacro*{cite:ibid:page}{\global\booltrue{cbx:loccit}}} - {\renewbibmacro*{cite:ibid:page}{}}} - -\newbibmacro*{cite:opcit}{% - \printtext[bibhyperlink]{\bibstring[\mkibid]{opcit}}} - -\newbibmacro*{cite:loccit}{% - \printtext{% - \bibhyperlink{cite\@nameuse{cbx:lastcite@\thefield{entrykey}}}{% - \bibstring[\mkibid]{loccit}}}% - \global\booltrue{cbx:loccit}} - \newbibmacro*{cite:ibid}{% - \printtext{% - \bibhyperlink{cite\@nameuse{cbx:lastcite@\thefield{entrykey}}}{% - \bibstring[\mkibid]{ibidem}}}% + \printtext[bibhyperlink]{\bibstring[\mkibid]{ibidem}}% \ifloccit - {\usebibmacro{cite:ibid:page}} + {\global\booltrue{cbx:loccit}} {}} -\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 b0375079178..2e9269cec62 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,9 +1,21 @@ -% standard-dw.cbx, Dominik Waßenhoven 2011 +% standard-dw.cbx, Dominik Waßenhoven 2012 -\ProvidesFile{standard-dw.cbx}[2011/11/20 v1.4 biblatex citation style] +\ProvidesFile{standard-dw.cbx}[2012/06/28 v1.5 biblatex citation style] + +\@ifpackagelater{biblatex}{2011/11/13} + {} + {\PackageError{biblatex-dw} + {Outdated 'biblatex' package\MessageBreak + Upgrade to biblatex v1.7 (2011/11/13) or later.\MessageBreak + I found: '\csuse{ver@biblatex.sty}'.\MessageBreak + This is a fatal error. I'm aborting now}% + \endinput} \newbool{cbx:authauthxref} \newbool{cbx:authedxref} +\newbool{cbx:citeauthor} +\newbool{cbx:citeauthorfoot} +\newbool{cbx:citeauthornormalfont} \newbool{cbx:citedas} \newbool{cbx:edstringincitations} \newbool{cbx:firstfullname} @@ -14,6 +26,7 @@ \newbool{cbx:rpcited}% wurde der parent des @review schon zitiert? \newbool{cbx:xrefparent:firstcite} \newbool{cbx:shorthandibid} +\newbool{cbx:loccit} \newbibmacro*{cite:citepages}{} \newbibmacro*{cite:full:citepages}{} @@ -35,15 +48,36 @@ \DeclareEntryOption{shorthandibid}[true]{% \csuse{bool#1}{cbx:shorthandibid}} +\DeclareBibliographyOption{citeauthor}[namefont]{% + \ifcsdef{cbx@opt@citeauthor@#1} + {\csuse{cbx@opt@citeauthor@#1}} + {\blxdw@error{% + Invalid option 'citeauthor=#1'\MessageBreak + Valid values are 'namefont', 'namefontfoot', 'normalfont'}}} +\def\cbx@opt@citeauthor@namefont{% + \boolfalse{cbx:citeauthornormalfont}% + \boolfalse{cbx:citeauthorfoot}} +\def\cbx@opt@citeauthor@namefontfoot{% + \boolfalse{cbx:citeauthornormalfont}% + \booltrue{cbx:citeauthorfoot}} +\def\cbx@opt@citeauthor@normalfont{% + \booltrue{cbx:citeauthornormalfont}% + \boolfalse{cbx:citeauthorfoot}} + +\DeclareBibliographyOption{ibidpage}[true]{% + \ifstrequal{#1}{true} + {\ExecuteBibliographyOptions{loccittracker=context}}% Standard: constrict + {\ExecuteBibliographyOptions{loccittracker=false}}} + \DeclareBibliographyOption{pageref}[true]{% \setbool{cbx:pageref}{#1}} \DeclareBibliographyOption{citepages}[permit]{% \ifcsdef{cbx@opt@citepages@#1} {\csuse{cbx@opt@citepages@#1}} - {\PackageError{biblatex} - {Invalid option 'citepages=#1'} - {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}} + {\blxdw@error + {Invalid option 'citepages=#1'\MessageBreak + Valid values are 'permit', 'suppress', 'omit', 'separate'}}} \def\cbx@opt@citepages@permit{% \renewbibmacro*{cite:citepages}{}% @@ -111,7 +145,6 @@ edstringincitations=true, ibidtracker=constrict, idemtracker=constrict, - loccittracker=false, opcittracker=false, pagetracker=true, shorthandibid=true @@ -240,14 +273,23 @@ \cbx@nameseen{#1#3#5#7}}% \usebibmacro{name:andothers}} \DeclareCiteCommand{\citeauthor} - {\boolfalse{citetracker}% + {\booltrue{cbx:citeauthor}% + \boolfalse{citetracker}% \boolfalse{pagetracker}% \usebibmacro{prenote}} {\indexnames{labelname}% \printnames[citeauthor]{labelname}} {\multicitedelim} {\usebibmacro{postnote}}} - {}} + {\DeclareCiteCommand{\citeauthor} + {\booltrue{cbx:citeauthor}% + \boolfalse{citetracker}% + \boolfalse{pagetracker}% + \usebibmacro{prenote}} + {\indexnames{labelname}% + \printnames{labelname}} + {\multicitedelim} + {\usebibmacro{postnote}}}} %% Formatierung von 'ibidem' entsprechend der Option 'ibidemfont' \providecommand*{\mkibid}[1]{% @@ -340,6 +382,7 @@ %% 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 +%\newbool{cbx:autheddiff}% auther of @inbook and editor of @book differ \newbibmacro*{authauthxrefcheck}{% \iffieldundef{xref} {} @@ -351,7 +394,7 @@ } {\booltrue{cbx:authauthxref}} {\boolfalse{cbx:authauthxref}}}} - + %% für @review \DeclareCiteCommand{\bbx@review} {} |