diff options
author | Karl Berry <karl@freefriends.org> | 2010-03-20 23:32:55 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-03-20 23:32:55 +0000 |
commit | 1080eb42d3947b4414c2bda84c4d0c0b809c4e16 (patch) | |
tree | d5e2f1893ee3a1f85c1b0d195db8ba0a8c28ff60 /Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx | |
parent | 6861935735f4cbecd9f2772a4123b3fb07d6ffc2 (diff) |
biblatex 0.9a (19mar10)
git-svn-id: svn://tug.org/texlive/trunk@17511 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx index 3358f6fe91a..2bece812403 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx @@ -1,7 +1,7 @@ -% $Id: authoryear.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: authoryear.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{authoryear.cbx} -[\abx@cbxid $Id: authoryear.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@cbxid $Id: authoryear.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \ExecuteBibliographyOptions{labelyear,uniquename,autocite=inline} \newbool{cbx:parens} @@ -29,18 +29,20 @@ {\usebibmacro{cite:label}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibleftparen}% + \addspace\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% \usebibmacro{cite:labelyear+extrayear}} {\usebibmacro{cite:shorthand}}} {\printnames{labelname}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibleftparen}% - \iffieldundef{shorthand} - {\iffieldundef{labelyear} - {\usebibmacro{cite:label}} - {\usebibmacro{cite:labelyear+extrayear}}} - {\usebibmacro{cite:shorthand}}}} + \addspace\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \usebibmacro{citeyear}}} \newbibmacro*{cite:shorthand}{% \printtext[bibhyperref]{\printfield{shorthand}}} @@ -57,6 +59,16 @@ \printfield{labelyear}% \printfield{extrayear}}}} +\newbibmacro*{textcite:postnote}{% + \iffieldundef{postnote} + {\ifbool{cbx:parens} + {\bibcloseparen} + {}} + {\ifbool{cbx:parens} + {\setunit{\postnotedelim}} + {\setunit{\addspace\bibopenparen}}% + \printfield{postnote}\bibcloseparen}} + \DeclareCiteCommand{\cite} {\usebibmacro{prenote}} {\usebibmacro{citeindex}% @@ -100,21 +112,13 @@ {\usebibmacro{postnote}} \DeclareCiteCommand{\textcite} - {\boolfalse{cbx:parens}% - \usebibmacro{prenote}} + {\boolfalse{cbx:parens}} {\usebibmacro{citeindex}% \usebibmacro{textcite}} {\ifbool{cbx:parens} - {\bibrightparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \multicitedelim} - {\iffieldundef{postnote} - {\ifbool{cbx:parens} - {\bibrightparen} - {}} - {\ifbool{cbx:parens} - {\postnotedelim} - {\addspace\bibleftparen}% - \printfield{postnote}\bibrightparen}} + {\usebibmacro{textcite:postnote}} \endinput |