diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx index ca1b376ae11..d1b51b8f5fa 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx @@ -1,7 +1,7 @@ -% $Id: authortitle-comp.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: authortitle-comp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{authortitle-comp.cbx} -[\abx@cbxid $Id: authortitle-comp.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@cbxid $Id: authortitle-comp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \ExecuteBibliographyOptions{sortcites,autocite=footnote} \newbool{cbx:parens} @@ -45,14 +45,17 @@ {\printnames{labelname}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibleftparen}}% + \addspace\bibopenparen}}% \savefield{namehash}{\cbx@lasthash}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% \iffieldundef{shorthand} {\usebibmacro{cite:title}}% {\usebibmacro{cite:shorthand}}% \setunit{% \ifbool{cbx:parens} - {\bibrightparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \multicitedelim}} @@ -62,28 +65,22 @@ \newbibmacro*{cite:shorthand}{% \printtext[bibhyperref]{\printfield{shorthand}}} -\newbibmacro*{cite:postnote}{% - \iffieldundef{postnote} - {} - {\setunit{\postnotedelim} - \printfield{postnote}}} - \newbibmacro*{textcite:postnote}{% \ifnameundef{labelname} {\setunit{% \global\booltrue{cbx:parens}% - \addspace\bibleftparen}} + \addspace\bibopenparen}} {\setunit{\postnotedelim}}% \printfield{postnote}% \ifthenelse{\value{multicitecount}=\value{multicitetotal}} {\setunit{}% \printtext{% \ifbool{cbx:parens} - {\bibrightparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}}} {\setunit{% \ifbool{cbx:parens} - {\bibrightparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \multicitedelim}}} @@ -93,7 +90,7 @@ {\usebibmacro{citeindex}% \usebibmacro{cite}} {} - {\usebibmacro{cite:postnote}} + {\usebibmacro{postnote}} \DeclareCiteCommand*{\cite} {\usebibmacro{cite:init}% @@ -101,7 +98,7 @@ {\usebibmacro{citeindex}% \usebibmacro{citetitle}} {} - {\usebibmacro{cite:postnote}} + {\usebibmacro{postnote}} \DeclareCiteCommand{\parencite}[\mkbibparens] {\usebibmacro{cite:init}% @@ -109,7 +106,7 @@ {\usebibmacro{citeindex}% \usebibmacro{cite}} {} - {\usebibmacro{cite:postnote}} + {\usebibmacro{postnote}} \DeclareCiteCommand*{\parencite}[\mkbibparens] {\usebibmacro{cite:init}% @@ -117,7 +114,7 @@ {\usebibmacro{citeindex}% \usebibmacro{citetitle}} {} - {\usebibmacro{cite:postnote}} + {\usebibmacro{postnote}} \DeclareCiteCommand{\footcite}[\mkbibfootnote] {\usebibmacro{cite:init}% @@ -125,7 +122,7 @@ {\usebibmacro{citeindex}% \usebibmacro{cite}} {} - {\usebibmacro{cite:postnote}} + {\usebibmacro{postnote}} \DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext] {\usebibmacro{cite:init}% @@ -133,11 +130,10 @@ {\usebibmacro{citeindex}% \usebibmacro{cite}} {} - {\usebibmacro{cite:postnote}} + {\usebibmacro{postnote}} \DeclareCiteCommand{\textcite} - {\usebibmacro{cite:init}% - \usebibmacro{prenote}} + {\usebibmacro{cite:init}} {\usebibmacro{citeindex}% \usebibmacro{textcite}} {} |