summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx26
1 files changed, 15 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
index 8cc7aa79910..6f9f985b8e8 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-icomp.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authoryear-icomp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
\ProvidesFile{authoryear-icomp.cbx}
-[\abx@cbxid $Id: authoryear-icomp.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@cbxid $Id: authoryear-icomp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
\ExecuteBibliographyOptions{labelyear,uniquename,ibidtracker=constrict,
pagetracker,sortcites,autocite=inline}
@@ -95,7 +95,10 @@
{\usebibmacro{cite:label}%
\setunit{%
\global\booltrue{cbx:parens}%
- \addspace\bibleftparen}%
+ \addspace\bibopenparen}%
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
{\usebibmacro{cite:ibid}}
{\usebibmacro{cite:labelyear+extrayear}}}
@@ -103,7 +106,10 @@
{\printnames{labelname}%
\setunit{%
\global\booltrue{cbx:parens}%
- \addspace\bibleftparen}%
+ \addspace\bibopenparen}%
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
\iffieldundef{shorthand}
{\iffieldundef{labelyear}
{\usebibmacro{cite:label}}
@@ -116,7 +122,7 @@
\savefield{namehash}{\cbx@lasthash}}}%
\setunit{%
\ifbool{cbx:parens}
- {\bibrightparen\global\boolfalse{cbx:parens}}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
{}%
\multicitedelim}}
@@ -154,17 +160,16 @@
\newbibmacro*{textcite:postnote}{%
\ifbool{cbx:loccit}
{}
- {\setunit{\postnotedelim}%
- \printfield{postnote}}%
+ {\usebibmacro{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}}}
@@ -217,8 +222,7 @@
{\usebibmacro{cite:postnote}}
\DeclareCiteCommand{\textcite}
- {\usebibmacro{cite:init}%
- \usebibmacro{prenote}}
+ {\usebibmacro{cite:init}}
{\usebibmacro{citeindex}%
\usebibmacro{textcite}}
{}