diff options
author | Karl Berry <karl@freefriends.org> | 2010-09-22 23:35:08 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-09-22 23:35:08 +0000 |
commit | 7d3e52c3d1f706817bb17d8ce36fc9e2fdadc578 (patch) | |
tree | 51e3ca900fe7623ae05250535638e32d59095432 /Master/texmf-dist/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx | |
parent | 4e4bb5b0b9eb71dbc88b140b9bfe43026324b79f (diff) |
biblatex-dw (22sep10)
git-svn-id: svn://tug.org/texlive/trunk@19846 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx | 245 |
1 files changed, 100 insertions, 145 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 3111bedb54c..b70030ddc5c 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 2010 -\ProvidesFile{authortitle-dw.cbx}[2010/03/11 v1.3 biblatex citation style] +\ProvidesFile{authortitle-dw.cbx}[2010/09/21 v1.3a biblatex citation style] \RequireCitationStyle{standard-dw} @@ -10,7 +10,7 @@ \csuse{bool#1}{cbx:firstfull}} \newbibmacro*{cite}{% - \global\boolfalse{cbx:herename}% + \usebibmacro{cite:citepages}% \global\boolfalse{cbx:loccit}% \global\let\cbx@tempa\empty \ifbool{cbx:firstfull} @@ -32,15 +32,13 @@ {} {\usebibmacro{cite:name}}% \usebibmacro{cite:title}}% - \ifuseeditor + \ifbool{cbx:omiteditor} {} - {\ifbool{cbx:omiteditor} - {} - {\ifnameundef{labelname} - {\newunit - \usebibmacro{cite:byeditor}} - {}}}% - \usebibmacro{cite:save}}}% + {\ifnameundef{labelname} + {\newunit + \usebibmacro{cite:byeditor}} + {}}% + \usebibmacro{cite:save}}}% {\ifbool{cbx:shorthandibid}% {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}% {\usebibmacro{cite:ibid}} @@ -53,31 +51,19 @@ {\usebibmacro{cite:idem}% \booltrue{cbx:idemfull}} {}% - \printtext[bibhyperref]{\usebibmacro{cite:full}} + \printtext[bibhyperref]{\usebibmacro{cite:full}}% \usebibmacro{cite:save}} \newbibmacro*{cite:full}{% + \usebibmacro{cite:full:citepages}% \usedriver - {\ifbool{cbx:option:omitpages} - {\global\booltrue{cbx:omitpages}} - {}% - \DeclareNameAlias{sortname}{default}} + {\DeclareNameAlias{sortname}{default}} {\thefield{entrytype}}% \iffieldundef{shorthand} {} {\ifbool{cbx:citedas} {\addspace\usebibmacro{shorthandintro}} - {}}% - \iffieldundef{postnote} - {}% - {\iffieldundef{pages} - {}% - {\ifthenelse{\boolean{cbx:option:herename}\AND\NOT - \boolean{cbx:omitpages}} - {\global\booltrue{cbx:herename}% - \herenamepunct% - \bibstring{herename}} - {}}}} + {}}} \newbibmacro*{cite:shorthand}{% \cbx@tempa @@ -87,18 +73,18 @@ \newbibmacro*{textcite}{% \global\boolfalse{cbx:loccit}% \ifnameundef{labelname} - {\gdef\cbx@tempa{% - \global\booltrue{cbx:parens}% - \addspace\bibleftparen}% - \BibliographyWarning{No author or editor given for \textcite}% - \textbf{\thefield{entrykey}}} + {\blxdw@warning@noline{No author or editor given for \textcite}% + \textbf{\thefield{entrykey}}} {\ifbool{cbx:firstfullname} {\printnames[citeauthor]{labelname}} {\printnames{labelname}}% - \gdef\cbx@tempa{% + \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibleftparen}% + \addspace\bibopenparen}% \usebibmacro{cite:save}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% \iffieldundef{shorthand} {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} @@ -113,47 +99,40 @@ \ifbool{cbx:firstfull} {\ifciteseen {\iffieldundef{shorthand} - {\ifuseeditor - {\ifnameundef{labelname} - {}% - {\ifbool{cbx:xrefnoidem} - {\usebibmacro{cite:editor} - \citenamepunct}% - {\usebibmacro{cite:idem}}}} + {\ifnameundef{labelname} {}% + {\ifbool{xrefidem} + {\usebibmacro{cite:xref:idem}}% + {\usebibmacro{cite:editor} + \citenamepunct}}% \usebibmacro{cite:title}% - \ifuseeditor - {} - {\ifbool{cbx:omiteditor} - {} - {\ifbool{cbx:xrefnoidem} - {\newunit - \usebibmacro{cite:byeditor}} - {\ifbool{bbx:edbyidem} - {\newunit - \bibstring{byeditor}% - \setunit{\addspace}% - \bibstring[\mkidem]{idemdat\thefield{gender}}} - {\newunit - \usebibmacro{cite:byeditor}}}}}}% + \ifnameundef{labelname} + {\ifboolexpr{ + bool {xrefidem} + and + bool {bbx:edbyidem} + } + {\newunit + \bibstring{byeditor}% + \setunit{\addspace}% + \bibstring[\mkidem]{idemdat\thefield{gender}}} + {\newunit + \usebibmacro{cite:byeditor}}} + {}} {\usebibmacro{cite:shorthand}}}% - {\ifbool{cbx:xrefnoidem} - {\usebibmacro{cite:fullxref}}% - {\ifbool{bbx:edbyidem} - {\usebibmacro{cite:fullxrefidem}}% - {\usebibmacro{cite:fullxref}}}}}% + {\ifbool{xrefidem} + {\ifbool{bbx:edbyidem} + {\usebibmacro{cite:fullxrefidem}}% + {\usebibmacro{cite:fullxref}}}% + {\usebibmacro{cite:fullxref}}}}% {\iffieldundef{shorthand} - {\ifuseeditor - {\ifnameundef{labelname} - {}% - {\ifbool{cbx:xrefnoidem} - {\usebibmacro{cite:editor}% - \citenamepunct}% - {\ifbool{bbx:edbyidem} - {\usebibmacro{cite:idem}}% - {\printnames{labelname}% - \citenamepunct}}}} - {}% + {\ifbool{xrefidem} + {\ifbool{bbx:edbyidem} + {\usebibmacro{cite:idem}}% + {\printnames{labelname}% + \citenamepunct}}% + {\usebibmacro{cite:editor}% + \citenamepunct}% \usebibmacro{cite:title}% \ifuseeditor {} @@ -169,14 +148,14 @@ {\ifuseeditor {\ifnameundef{labelname} {} - {\ifbool{bbx:xrefnoidem}% - {\printnames{labelname}% - \printtext{\labelnamepunct}}% + {\ifbool{xrefidem}% {\ifbool{bbx:edbyidem} {\midsentence% \usebibmacro{cite:idem}}% {\printnames{labelname}% - \printtext{\labelnamepunct}}}}} + \printtext{\labelnamepunct}}}% + {\printnames{labelname}% + \printtext{\labelnamepunct}}}} {}% \iffieldundef{shorttitle}% {\printfield{title}}% @@ -187,24 +166,22 @@ {} {\ifnameundef{editor} {} - {\ifbool{bbx:xrefnoidem}% - {\newunit - \usebibmacro{byeditor}}% - {\ifbool{bbx:edbyidem} + {\ifbool{xrefidem}% + {\ifbool{bbx:edbyidem} {\newunit \bibstring{byeditor}% \setunit{\addspace}% \bibstring[\mkidem]{idemdat\thefield{gender}}} {\newunit - \usebibmacro{byeditor}}}}}}}% + \usebibmacro{byeditor}}}% + {\newunit + \usebibmacro{byeditor}}}}}}% {\printtext[bibhyperref]{\printfield{shorthand}}}}} \newbibmacro*{cite:fullxref}{% + \usebibmacro{cite:full:citepages}% \usedriver - {\ifbool{cbx:option:omitpages} - {\global\booltrue{cbx:omitpages}} - {}% - \DeclareNameAlias{sortname}{default}} + {\DeclareNameAlias{sortname}{default}} {xref\thefield{entrytype}}% \iffieldundef{shorthand} {} @@ -213,77 +190,34 @@ {}}}% \newbibmacro*{cite:fullxrefidem}{% + \usebibmacro{cite:full:citepages}% \usedriver - {\ifbool{cbx:option:omitpages} - {\global\booltrue{cbx:omitpages}} - {}% - \DeclareNameAlias{sortname}{default}% - \clearfield{editor}} + {\DeclareNameAlias{sortname}{default}} {xrefidem\thefield{entrytype}}% \iffieldundef{shorthand} {} {\ifbool{cbx:citedas} {\addspace\usebibmacro{shorthandintro}} - {}}}% - -\DeclareCiteCommand{\textcite} - {\boolfalse{cbx:parens}% - \usebibmacro{prenote}} - {\usebibmacro{citeindex}% - \usebibmacro{textcite}} - {\ifbool{cbx:parens} - {\bibrightparen\boolfalse{cbx:parens}} - {}% - \multicitedelim} - {\iffieldundef{postnote} - {\ifbool{cbx:parens} - {\bibrightparen} - {}}% - {\ifbool{cbx:parens} - {\postnotedelim} - {\addspace\bibleftparen}% - \printfield{postnote}\bibrightparen}} + {}}} \DeclareCiteCommand{\fullcite} - {\usebibmacro{prenote}} + {\usebibmacro{prenote}% + \usebibmacro{cite:full:citepages}} {\usedriver - {\ifbool{cbx:option:omitpages} - {\global\booltrue{cbx:omitpages}} - {}% - \DeclareNameAlias{sortname}{default}} + {\DeclareNameAlias{sortname}{default}} {\thefield{entrytype}}} {\multicitedelim} - {\iffieldundef{postnote} - {} - {\ifthenelse{\boolean{cbx:option:herename}\AND\NOT - \(\iffieldundef{pages}\OR - \boolean{cbx:omitpages}\)} - {\global\booltrue{cbx:herename}% - \herenamepunct% - \bibstring{herename}} - {\global\boolfalse{cbx:herename}}% - \usebibmacro{postnote}}} + {\usebibmacro{cite:postnote}} \DeclareCiteCommand{\footfullcite}[\mkbibfootnote] {\bibsentence - \usebibmacro{prenote}} + \usebibmacro{prenote}% + \usebibmacro{cite:full:citepages}} {\usedriver - {\ifbool{cbx:option:omitpages} - {\global\booltrue{cbx:omitpages}} - {}% - \DeclareNameAlias{sortname}{default}} + {\DeclareNameAlias{sortname}{default}} {\thefield{entrytype}}} {\multicitedelim} - {\iffieldundef{postnote} - {} - {\ifthenelse{\boolean{cbx:option:herename}\AND\NOT - \(\iffieldundef{pages}\OR - \boolean{cbx:omitpages}\)} - {\global\booltrue{cbx:herename}% - \herenamepunct% - \bibstring{herename}} - {\global\boolfalse{cbx:herename}}% - \usebibmacro{postnote}}} + {\usebibmacro{cite:postnote}} \newbibmacro*{citetitle}{% \global\boolfalse{cbx:loccit}% @@ -298,12 +232,12 @@ \cbx@tempa \ifsingletitle {\setunit{}}% Löschen des \citenamepunct, falls kein Titel ausgegeben wird - {\printtext[bibhyperlink]{% + {\printtext[bibhyperref]{% \printfield[citetitle]{labeltitle}}}} \newbibmacro*{cite:title:force}{% \cbx@tempa - \printtext[bibhyperlink]{% + \printtext[bibhyperref]{% \printfield[citetitle]{labeltitle}}} %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% @@ -325,10 +259,15 @@ {\global\booltrue{cbx:loccit}} {}} -\newbibmacro*{cite:postnote}{% - \ifbool{cbx:loccit} - {}% - {\usebibmacro{postnote}}} +\newbibmacro*{textcite:postnote}{% + \ifthenelse{\iffieldundef{postnote}\OR\boolean{cbx:loccit}} + {\ifbool{cbx:parens} + {\bibcloseparen} + {}} + {\ifbool{cbx:parens} + {\postnotedelim} + {\addspace\bibopenparen}% + \printfield{postnote}\bibcloseparen}} \DeclareCiteCommand{\cite} {\usebibmacro{prenote}} @@ -359,11 +298,27 @@ {\usebibmacro{cite:postnote}} \DeclareCiteCommand{\footcite}[\mkbibfootnote] - {\bibsentence - \usebibmacro{prenote}} + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext] + {\usebibmacro{prenote}} {\usebibmacro{citeindex}% \usebibmacro{cite}} {\multicitedelim} {\usebibmacro{cite:postnote}} +\DeclareCiteCommand{\textcite} + {\boolfalse{cbx:parens}} + {\usebibmacro{citeindex}% + \usebibmacro{textcite}} + {\ifbool{cbx:parens} + {\bibcloseparen\boolfalse{cbx:parens}} + {}% + \multicitedelim} + {\usebibmacro{textcite:postnote}} + \endinput |