summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex/cbx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-03-20 23:32:55 +0000
committerKarl Berry <karl@freefriends.org>2010-03-20 23:32:55 +0000
commit1080eb42d3947b4414c2bda84c4d0c0b809c4e16 (patch)
treed5e2f1893ee3a1f85c1b0d195db8ba0a8c28ff60 /Master/texmf-dist/tex/latex/biblatex/cbx
parent6861935735f4cbecd9f2772a4123b3fb07d6ffc2 (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')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx61
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx67
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx38
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx20
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx20
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx29
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx23
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx20
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx47
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx25
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx26
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx44
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx110
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx48
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx49
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx80
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx87
17 files changed, 442 insertions, 352 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
index 3913951e372..881927c0371 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
@@ -1,60 +1,65 @@
-% $Id: alphabetic-verb.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: alphabetic-verb.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
\ProvidesFile{alphabetic-verb.cbx}
-[\abx@cbxid $Id: alphabetic-verb.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@cbxid $Id: alphabetic-verb.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
\ExecuteBibliographyOptions{labelalpha,autocite=inline}
+\newbibmacro*{cite}{%
+ \printtext[bibhyperref]{%
+ \printfield{labelalpha}%
+ \printfield{extraalpha}}}
+
+\newbibmacro*{textcite}{%
+ \ifnameundef{labelname}
+ {}
+ {\printnames{labelname}\space}%
+ \bibopenbracket
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
+ \usebibmacro{cite}}
+
\DeclareCiteCommand{\cite}
- {\usebibmacro{prenote}}
+ {\bibopenbracket
+ \usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \bibleftbracket
- \printtext[bibhyperref]{%
- \printfield{labelalpha}%
- \printfield{extraalpha}}}
- {\bibrightbracket\multicitedelim}
+ \ifnumgreater{\value{citecount}}{1}
+ {\bibopenbracket}
+ {}%
+ \usebibmacro{cite}}
+ {\bibclosebracket\multicitedelim}
{\usebibmacro{postnote}%
- \bibrightbracket}
+ \bibclosebracket}
\DeclareCiteCommand{\parencite}[\mkbibbrackets]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \printtext[bibhyperref]{%
- \printfield{labelalpha}%
- \printfield{extraalpha}}}
+ \usebibmacro{cite}}
{\multicitedelim}
{\usebibmacro{postnote}}
\DeclareCiteCommand{\footcite}[\mkbibfootnote]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \printtext[bibhyperref]{%
- \printfield{labelalpha}%
- \printfield{extraalpha}}}
+ \usebibmacro{cite}}
{\multicitedelim}
{\usebibmacro{postnote}}
\DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \printtext[bibhyperref]{%
- \printfield{labelalpha}%
- \printfield{extraalpha}}}
+ \usebibmacro{cite}}
{\multicitedelim}
{\usebibmacro{postnote}}
\DeclareCiteCommand{\textcite}
- {\usebibmacro{prenote}}
+ {}
{\usebibmacro{citeindex}%
- \ifnameundef{labelname}
- {}
- {\printnames{labelname}\space}%
- \bibleftbracket
- \printtext[bibhyperref]{%
- \printfield{labelalpha}%
- \printfield{extraalpha}}}
- {\bibrightbracket\multicitedelim}
- {\usebibmacro{postnote}\bibrightbracket}
+ \usebibmacro{textcite}}
+ {\bibclosebracket\multicitedelim}
+ {\usebibmacro{postnote}%
+ \bibclosebracket}
\DeclareMultiCiteCommand{\parencites}[\mkbibbrackets]{\parencite}{\multicitedelim}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
index 859c52bf783..1d3f605eef1 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
@@ -1,67 +1,68 @@
-% $Id: alphabetic.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: alphabetic.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
\ProvidesFile{alphabetic.cbx}
-[\abx@cbxid $Id: alphabetic.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@cbxid $Id: alphabetic.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
\ExecuteBibliographyOptions{labelalpha,autocite=inline}
-\DeclareCiteCommand{\cite}
- {\usebibmacro{prenote}\bibleftbracket}
+\newbibmacro*{cite}{%
+ \printtext[bibhyperref]{%
+ \printfield{labelalpha}%
+ \printfield{extraalpha}}}
+
+\newbibmacro*{textcite}{%
+ \iffieldequals{namehash}{\cbx@lasthash}
+ {\multicitedelim}
+ {\cbx@tempa
+ \ifnameundef{labelname}
+ {}
+ {\printnames{labelname}\space}%
+ \bibopenbracket}%
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
+ \usebibmacro{cite}%
+ \savefield{namehash}{\cbx@lasthash}%
+ \gdef\cbx@tempa{\bibclosebracket\multicitedelim}}
+
+\DeclareCiteCommand{\cite}[\mkbibbrackets]
+ {\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \printtext[bibhyperref]{%
- \printfield{labelalpha}%
- \printfield{extraalpha}}}
+ \usebibmacro{cite}}
{\multicitedelim}
- {\usebibmacro{postnote}\bibrightbracket}
+ {\usebibmacro{postnote}}
\DeclareCiteCommand{\parencite}[\mkbibbrackets]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \printtext[bibhyperref]{%
- \printfield{labelalpha}%
- \printfield{extraalpha}}}
+ \usebibmacro{cite}}
{\multicitedelim}
{\usebibmacro{postnote}}
\DeclareCiteCommand{\footcite}[\mkbibfootnote]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \printtext[bibhyperref]{%
- \printfield{labelalpha}%
- \printfield{extraalpha}}}
+ \usebibmacro{cite}}
{\multicitedelim}
{\usebibmacro{postnote}}
\DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \printtext[bibhyperref]{%
- \printfield{labelalpha}%
- \printfield{extraalpha}}}
+ \usebibmacro{cite}}
{\multicitedelim}
{\usebibmacro{postnote}}
\DeclareCiteCommand{\textcite}
{\let\cbx@tempa=\empty
- \undef\cbx@lasthash
- \usebibmacro{prenote}}
+ \undef\cbx@lasthash}
{\usebibmacro{citeindex}%
- \iffieldequals{namehash}{\cbx@lasthash}
- {\multicitedelim}
- {\cbx@tempa
- \ifnameundef{labelname}
- {}
- {\printnames{labelname}\space}%
- \bibleftbracket}%
- \printtext[bibhyperref]{%
- \printfield{labelalpha}%
- \printfield{extraalpha}}%
- \savefield{namehash}{\cbx@lasthash}%
- \gdef\cbx@tempa{\bibrightbracket\multicitedelim}}
+ \usebibmacro{textcite}}
{}
- {\usebibmacro{postnote}\bibrightbracket}
+ {\usebibmacro{postnote}%
+ \bibclosebracket}
-\DeclareMultiCiteCommand{\cites}[\mkbibbrackets]{\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\cites}[\mkbibbrackets]{\cite}{\multicitedelim}
\DeclareMultiCiteCommand{\parencites}[\mkbibbrackets]{\parencite}{\multicitedelim}
\endinput
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}}
{}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
index bec2c0dfb5d..c8f5d47b719 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-ibid.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authortitle-ibid.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
\ProvidesFile{authortitle-ibid.cbx}
-[\abx@cbxid $Id: authortitle-ibid.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@cbxid $Id: authortitle-ibid.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
\ExecuteBibliographyOptions{ibidtracker=constrict,pagetracker,autocite=footnote}
\providecommand*{\mkibid}[1]{#1}
@@ -40,7 +40,10 @@
{\printnames{labelname}%
\setunit{%
\global\booltrue{cbx:parens}%
- \addspace\bibleftparen}}%
+ \addspace\bibopenparen}}%
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
\iffieldundef{shorthand}
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
{\usebibmacro{cite:ibid}}
@@ -68,12 +71,12 @@
\newbibmacro*{textcite:postnote}{%
\ifthenelse{\iffieldundef{postnote}\OR\boolean{cbx:loccit}}
{\ifbool{cbx:parens}
- {\bibrightparen}
+ {\bibcloseparen}
{}}
{\ifbool{cbx:parens}
{\postnotedelim}
- {\addspace\bibleftparen}%
- \printfield{postnote}\bibrightparen}}
+ {\addspace\bibopenparen}%
+ \printfield{postnote}\bibcloseparen}}
\DeclareCiteCommand{\cite}
{\usebibmacro{prenote}}
@@ -118,12 +121,11 @@
{\usebibmacro{cite:postnote}}
\DeclareCiteCommand{\textcite}
- {\boolfalse{cbx:parens}%
- \usebibmacro{prenote}}
+ {\boolfalse{cbx:parens}}
{\usebibmacro{citeindex}%
\usebibmacro{textcite}}
{\ifbool{cbx:parens}
- {\bibrightparen\boolfalse{cbx:parens}}
+ {\bibcloseparen\boolfalse{cbx:parens}}
{}%
\multicitedelim}
{\usebibmacro{textcite:postnote}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
index 9260c929379..3a79d7b222e 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-icomp.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authortitle-icomp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
\ProvidesFile{authortitle-icomp.cbx}
-[\abx@cbxid $Id: authortitle-icomp.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@cbxid $Id: authortitle-icomp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
\ExecuteBibliographyOptions{ibidtracker=constrict,pagetracker,sortcites,autocite=footnote}
\providecommand*{\mkibid}[1]{#1}
@@ -57,8 +57,11 @@
{\printnames{labelname}%
\setunit{%
\global\booltrue{cbx:parens}%
- \addspace\bibleftparen}}%
+ \addspace\bibopenparen}}%
\savefield{namehash}{\cbx@lasthash}}%
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
\iffieldundef{shorthand}
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
{\usebibmacro{cite:ibid}}
@@ -66,7 +69,7 @@
{\usebibmacro{cite:shorthand}}%
\setunit{%
\ifbool{cbx:parens}
- {\bibrightparen\global\boolfalse{cbx:parens}}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
{}%
\multicitedelim}}
@@ -94,18 +97,18 @@
{\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}}}
@@ -158,8 +161,7 @@
{\usebibmacro{cite:postnote}}
\DeclareCiteCommand{\textcite}
- {\usebibmacro{cite:init}%
- \usebibmacro{prenote}}
+ {\usebibmacro{cite:init}}
{\usebibmacro{citeindex}%
\usebibmacro{textcite}}
{}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
index e77a224bd4a..6350f87a79c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-tcomp.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authortitle-tcomp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
\ProvidesFile{authortitle-tcomp.cbx}
-[\abx@cbxid $Id: authortitle-tcomp.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@cbxid $Id: authortitle-tcomp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
\RequireCitationStyle{authortitle-comp}
\ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline}
@@ -40,41 +40,48 @@
{\usebibmacro{cite:title}}%
{\usebibmacro{cite:shorthand}}}
{\ifnameundef{labelname}
- {\iffieldundef{shorthand}
+ {\ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
+ \iffieldundef{shorthand}
{\usebibmacro{cite:title}}%
{\usebibmacro{cite:shorthand}}}
- {\ifsingletitle
+ {\ifthenelse{\ifsingletitle\AND
+ \(\iffieldundef{prenote}\OR\value{citecount}>1\)}
{\printtext[bibhyperref]{\printnames{labelname}}}
{\printnames{labelname}
\setunit{%
\global\booltrue{cbx:parens}%
- \addspace\bibleftparen}%
+ \addspace\bibopenparen}%
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
\iffieldundef{shorthand}
{\usebibmacro{cite:title}}%
{\usebibmacro{cite:shorthand}}}}%
\savefield{namehash}{\cbx@lasthash}}%
\setunit{%
\ifbool{cbx:parens}
- {\bibrightparen\global\boolfalse{cbx:parens}}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
{}%
\multicitedelim}}
\renewbibmacro*{textcite:postnote}{%
- \ifthenelse{\ifnameundef{labelname}\OR\ifsingletitle}
+ \ifbool{cbx:parens}
+ {\setunit{\postnotedelim}}
{\setunit{%
\global\booltrue{cbx:parens}%
- \addspace\bibleftparen}}
- {\setunit{\postnotedelim}}%
+ \addspace\bibopenparen}}%
\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}}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx
index 7c0634f1f6c..a58bf3860e0 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-terse.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authortitle-terse.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
\ProvidesFile{authortitle-terse.cbx}
-[\abx@cbxid $Id: authortitle-terse.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@cbxid $Id: authortitle-terse.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
\RequireCitationStyle{authortitle}
\ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline}
@@ -19,17 +19,24 @@
\renewbibmacro*{textcite}{%
\ifnameundef{labelname}
- {\iffieldundef{shorthand}
+ {\ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
+ \iffieldundef{shorthand}
{\usebibmacro{cite:title}}%
{\usebibmacro{cite:shorthand}}}
- {\ifsingletitle
+ {\ifthenelse{\ifsingletitle\AND
+ \(\iffieldundef{prenote}\OR\value{citecount}>1\)}
{\printtext[bibhyperref]{\printnames{labelname}}}
{\printnames{labelname}%
\setunit{%
\global\booltrue{cbx:parens}%
- \addspace\bibleftparen}%
- \iffieldundef{shorthand}
- {\usebibmacro{cite:title}}%
- {\usebibmacro{cite:shorthand}}}}}
+ \addspace\bibopenparen}%
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
+ \iffieldundef{shorthand}
+ {\usebibmacro{cite:title}}%
+ {\usebibmacro{cite:shorthand}}}}}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
index 83e0b45d9d9..96f07ad2afd 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authortitle.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
\ProvidesFile{authortitle.cbx}
-[\abx@cbxid $Id: authortitle.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@cbxid $Id: authortitle.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
\ExecuteBibliographyOptions{autocite=footnote}
\newbool{cbx:parens}
@@ -26,7 +26,10 @@
{\printnames{labelname}%
\setunit{%
\global\booltrue{cbx:parens}%
- \addspace\bibleftparen}}%
+ \addspace\bibopenparen}}%
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
\iffieldundef{shorthand}
{\usebibmacro{cite:title}}%
{\usebibmacro{cite:shorthand}}}
@@ -41,12 +44,12 @@
\newbibmacro*{textcite:postnote}{%
\iffieldundef{postnote}
{\ifbool{cbx:parens}
- {\bibrightparen}
+ {\bibcloseparen}
{}}
{\ifbool{cbx:parens}
{\postnotedelim}
- {\addspace\bibleftparen}%
- \printfield{postnote}\bibrightparen}}
+ {\addspace\bibopenparen}%
+ \printfield{postnote}\bibcloseparen}}
\DeclareCiteCommand{\cite}
{\usebibmacro{prenote}}
@@ -91,12 +94,11 @@
{\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}
{\usebibmacro{textcite:postnote}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
index 726e64d22dc..c40ea714eeb 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-comp.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authoryear-comp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
\ProvidesFile{authoryear-comp.cbx}
-[\abx@cbxid $Id: authoryear-comp.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@cbxid $Id: authoryear-comp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
\ExecuteBibliographyOptions{labelyear,uniquename,sortcites,autocite=inline}
\newbool{cbx:parens}
@@ -82,13 +82,19 @@
{\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}%
+ \addspace\bibopenparen}%
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
\iffieldundef{shorthand}
{\iffieldundef{labelyear}
{\usebibmacro{cite:label}}
@@ -99,7 +105,7 @@
\savefield{namehash}{\cbx@lasthash}}}%
\setunit{%
\ifbool{cbx:parens}
- {\bibrightparen\global\boolfalse{cbx:parens}}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
{}%
\multicitedelim}}
@@ -123,6 +129,20 @@
{}
{\printtext[bibhyperref]{\printfield{extrayear}}}}
+\newbibmacro*{textcite:postnote}{%
+ \usebibmacro{postnote}%
+ \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+ {\setunit{}%
+ \printtext{%
+ \ifbool{cbx:parens}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}}}
+ {\setunit{%
+ \ifbool{cbx:parens}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}%
+ \multicitedelim}}}
+
\DeclareCiteCommand{\cite}
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
@@ -172,24 +192,11 @@
{\usebibmacro{postnote}}
\DeclareCiteCommand{\textcite}
- {\usebibmacro{cite:init}%
- \usebibmacro{prenote}}
+ {\usebibmacro{cite:init}}
{\usebibmacro{citeindex}%
\usebibmacro{textcite}}
{}
- {\setunit{\postnotedelim}%
- \printfield{postnote}%
- \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
- {\setunit{}%
- \printtext{%
- \ifbool{cbx:parens}
- {\bibrightparen\global\boolfalse{cbx:parens}}
- {}}}
- {\setunit{%
- \ifbool{cbx:parens}
- {\bibrightparen\global\boolfalse{cbx:parens}}
- {}%
- \multicitedelim}}}
+ {\usebibmacro{textcite:postnote}}
\DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}}
\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}{\setunit{\multicitedelim}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
index 172620636b8..87f0ee9f111 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-ibid.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authoryear-ibid.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
\ProvidesFile{authoryear-ibid.cbx}
-[\abx@cbxid $Id: authoryear-ibid.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@cbxid $Id: authoryear-ibid.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
\ExecuteBibliographyOptions{labelyear,uniquename,ibidtracker=constrict,pagetracker,autocite=inline}
\providecommand*{\mkibid}[1]{#1}
@@ -43,13 +43,19 @@
{\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}%
+ \addspace\bibopenparen}%
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
\iffieldundef{shorthand}
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
{\usebibmacro{cite:ibid}}
@@ -87,12 +93,12 @@
\newbibmacro*{textcite:postnote}{%
\ifthenelse{\iffieldundef{postnote}\OR\boolean{cbx:loccit}}
{\ifbool{cbx:parens}
- {\bibrightparen}
+ {\bibcloseparen}
{}}
{\ifbool{cbx:parens}
{\postnotedelim}
- {\addspace\bibleftparen}%
- \printfield{postnote}\bibrightparen}}
+ {\addspace\bibopenparen}%
+ \printfield{postnote}\bibcloseparen}}
\DeclareCiteCommand{\cite}
{\usebibmacro{prenote}}
@@ -137,12 +143,11 @@
{\usebibmacro{cite: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}
{\usebibmacro{textcite:postnote}}
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}}
{}
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
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx
index f5c2750f0fa..a2357a4d05c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx
@@ -1,47 +1,89 @@
-% $Id: debug.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: debug.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
\ProvidesFile{debug.cbx}
-[\abx@cbxid $Id: debug.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@cbxid $Id: debug.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
\ExecuteBibliographyOptions{autocite=plain}
-\DeclareFieldFormat{citekey}{\ttfamily[\cbx@mkcitekey{#1}]}
-\DeclareUrlCommand{\cbx@mkcitekey}{\urlstyle{citekey}}
+\DeclareUrlCommand{\cbx@citekey}{\urlstyle{citekey}}
\def\url@citekeystyle{\def\UrlFont{\ttfamily}}
-\newbibmacro*{cite:entrykey}{%
- \printtext[bibhyperref]{\printfield[citekey]{entrykey}}}
+\DeclareFieldFormat{key}{\cbx@citekey{#1}}
+\DeclareFieldFormat{pre}{\texttt{pre=\detokenize{#1}}}
+\DeclareFieldFormat{post}{\texttt{post=\detokenize{#1}}}
+\DeclareFieldFormat{meta}{\texttt{#1}}
+
+\renewbibmacro*{multiprenote}{%
+ \printtext[meta]{[multi}%
+ \setunit{\addspace}%
+ \printfield[pre]{multiprenote}%
+ \setunit{\addspace}%
+ \printfield[post]{multipostnote}%
+ \setunit{\addspace}}
+
+\renewbibmacro*{multipostnote}{%
+ \printtext[meta]{]}}
+
+\newbibmacro*{begin}[1]{%
+ \printtext[meta]{[#1}%
+ \setunit{\addspace}%
+ \printfield[pre]{prenote}%
+ \setunit{\addspace}%
+ \printfield[post]{postnote}%
+ \setunit{\addspace}%
+ \printtext[meta]{key=}}
+
+\newbibmacro*{end}{%
+ \printtext[meta]{]}}
+
+\newbibmacro*{key}{%
+ \printtext[bibhyperref]{\printfield[key]{entrykey}}}
+
+\newbibmacro*{next}{%
+ \printtext[meta]{\addcomma}%
+ \setunit{\addspace}}
\DeclareCiteCommand{\cite}
- {\usebibmacro{prenote}}
- {\usebibmacro{cite:entrykey}}
- {\multicitedelim}
- {\usebibmacro{postnote}}
+ {\usebibmacro{begin}{cite}}
+ {\usebibmacro{key}}
+ {\usebibmacro{next}}
+ {\usebibmacro{end}}
+
+\DeclareCiteCommand{\parencite}
+ {\usebibmacro{begin}{parencite}}
+ {\usebibmacro{key}}
+ {\usebibmacro{next}}
+ {\usebibmacro{end}}
+
+\DeclareCiteCommand{\footcite}
+ {\usebibmacro{begin}{footcite}}
+ {\usebibmacro{key}}
+ {\usebibmacro{next}}
+ {\usebibmacro{end}}
+
+\DeclareCiteCommand{\footcitetext}
+ {\usebibmacro{begin}{footcitetext}}
+ {\usebibmacro{key}}
+ {\usebibmacro{next}}
+ {\usebibmacro{end}}
\DeclareCiteCommand{\textcite}
- {\usebibmacro{prenote}}
- {\printnames{labelname}%
- \setunit*{\addspace}%
- \usebibmacro{cite:entrykey}}
- {\multicitedelim}
- {\usebibmacro{postnote}}
-
-\DeclareCiteCommand{\parencite}[\mkbibparens]
- {\usebibmacro{prenote}}
- {\usebibmacro{cite:entrykey}}
- {\multicitedelim}
- {\usebibmacro{postnote}}
-
-\DeclareCiteCommand{\footcite}[\mkbibfootnote]
- {\usebibmacro{prenote}}
- {\usebibmacro{cite:entrykey}}
- {\multicitedelim}
- {\usebibmacro{postnote}}
-
-\DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext]
- {\usebibmacro{prenote}}
- {\usebibmacro{cite:entrykey}}
- {\multicitedelim}
- {\usebibmacro{postnote}}
+ {\usebibmacro{begin}{textcite}}
+ {\usebibmacro{key}}
+ {\usebibmacro{next}}
+ {\usebibmacro{end}}
+
+\DeclareCiteCommand{\supercite}
+ {\usebibmacro{begin}{supercite}}
+ {\usebibmacro{key}}
+ {\usebibmacro{next}}
+ {\usebibmacro{end}}
+
+\DeclareMultiCiteCommand{\cites}{\cite}{\addspace}
+\DeclareMultiCiteCommand{\parencites}{\parencite}{\addspace}
+\DeclareMultiCiteCommand{\footcites}{\footcite}{\addspace}
+\DeclareMultiCiteCommand{\footcitetexts}{\footcitetext}{\addspace}
+\DeclareMultiCiteCommand{\supercites}{\supercite}{\addspace}
+\DeclareMultiCiteCommand{\textcites}{\textcite}{\addspace}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx
index 571812d99ca..ed7122db029 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx
@@ -1,47 +1,69 @@
-% $Id: draft.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: draft.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
\ProvidesFile{draft.cbx}
-[\abx@cbxid $Id: draft.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@cbxid $Id: draft.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
\ExecuteBibliographyOptions{autocite=plain}
\DeclareFieldFormat{citekey}{\cbx@mkcitekey{#1}}
\DeclareUrlCommand{\cbx@mkcitekey}{\urlstyle{citekey}}
\def\url@citekeystyle{\def\UrlFont{\bfseries}}
+\newbool{cbx:parens}
-\newbibmacro*{cite:entrykey}{%
+\newbibmacro*{cite}{%
\printtext[bibhyperref]{\printfield[citekey]{entrykey}}}
+\newbibmacro*{textcite}{%
+ \printnames{labelname}%
+ \setunit*{%
+ \global\booltrue{cbx:parens}%
+ \addspace\bibopenparen}%
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
+ \usebibmacro{cite}}
+
+\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{cite:entrykey}}
+ {\usebibmacro{cite}}
{\multicitedelim}
{\usebibmacro{postnote}}
\DeclareCiteCommand{\parencite}[\mkbibparens]
{\usebibmacro{prenote}}
- {\usebibmacro{cite:entrykey}}
+ {\usebibmacro{cite}}
{\multicitedelim}
{\usebibmacro{postnote}}
\DeclareCiteCommand{\footcite}[\mkbibfootnote]
{\usebibmacro{prenote}}
- {\usebibmacro{cite:entrykey}}
+ {\usebibmacro{cite}}
{\multicitedelim}
{\usebibmacro{postnote}}
\DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext]
{\usebibmacro{prenote}}
- {\usebibmacro{cite:entrykey}}
+ {\usebibmacro{cite}}
{\multicitedelim}
{\usebibmacro{postnote}}
\DeclareCiteCommand{\textcite}
- {\usebibmacro{prenote}}
- {\printnames{labelname}%
- \setunit*{\addspace}%
- \printtext[parens]{\usebibmacro{cite:entrykey}}}
- {\multicitedelim}
- {\usebibmacro{postnote}}
+ {\boolfalse{cbx:parens}}
+ {\usebibmacro{textcite}}
+ {\ifbool{cbx:parens}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}%
+ \multicitedelim}
+ {\usebibmacro{textcite:postnote}}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx
index d1f9cd8e111..11b3729dd0b 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx
@@ -1,7 +1,7 @@
-% $Id: numeric-comp.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: numeric-comp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
\ProvidesFile{numeric-comp.cbx}
-[\abx@cbxid $Id: numeric-comp.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@cbxid $Id: numeric-comp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
\ExecuteBibliographyOptions{labelnumber,sortcites,autocite=inline}
\renewcommand*{\multicitedelim}{\addcomma\space}
@@ -69,16 +69,30 @@
\global\defcounter{cbx@tempcnta}{0}}
{}}
-\DeclareCiteCommand{\cite}
+\newbibmacro*{textcite}{%
+ \iffieldequals{namehash}{\cbx@lasthash}
+ {\usebibmacro{cite:comp}}
+ {\usebibmacro{cite:dump}\cbx@tempa
+ \usebibmacro{cite:init}%
+ \ifnameundef{labelname}
+ {\printfield[citetitle]{labeltitle}}
+ {\printnames{labelname}}%
+ \addspace\bibopenbracket
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
+ \usebibmacro{cite:comp}}%
+ \savefield{namehash}{\cbx@lasthash}%
+ \gdef\cbx@tempa{\bibclosebracket\multicitedelim}}
+
+\DeclareCiteCommand{\cite}[\mkbibbrackets]
{\usebibmacro{cite:init}%
- \usebibmacro{prenote}%
- \bibleftbracket}
+ \usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite:comp}}
{}
{\usebibmacro{cite:dump}%
- \usebibmacro{postnote}%
- \bibrightbracket}
+ \usebibmacro{postnote}}
\DeclareCiteCommand{\parencite}[\mkbibbrackets]
{\usebibmacro{cite:init}%
@@ -108,23 +122,12 @@
\usebibmacro{postnote}}
\DeclareCiteCommand{\textcite}
- {\usebibmacro{cite:init}%
- \usebibmacro{prenote}}
+ {\usebibmacro{cite:init}}
{\usebibmacro{citeindex}%
- \iffieldequals{namehash}{\cbx@lasthash}
- {\usebibmacro{cite:comp}}
- {\usebibmacro{cite:dump}\cbx@tempa
- \usebibmacro{cite:init}%
- \ifnameundef{labelname}
- {\printfield[citetitle]{labeltitle}}
- {\printnames{labelname}}%
- \addspace\bibleftbracket
- \usebibmacro{cite:comp}}%
- \savefield{namehash}{\cbx@lasthash}%
- \gdef\cbx@tempa{\bibrightbracket\multicitedelim}}
+ \usebibmacro{textcite}}
{}
- {\usebibmacro{cite:dump}%
- \usebibmacro{postnote}\bibrightbracket}
+ {\usebibmacro{postnote}%
+ \bibclosebracket}
\DeclareCiteCommand{\supercite}[\mkbibsuperscript]
{\usebibmacro{cite:init}%
@@ -140,7 +143,7 @@
{}
{\usebibmacro{cite:dump}}
-\DeclareMultiCiteCommand{\cites}[\mkbibbrackets]{\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\cites}[\mkbibbrackets]{\cite}{\multicitedelim}
\DeclareMultiCiteCommand{\parencites}[\mkbibbrackets]{\parencite}{\multicitedelim}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx
index 39b04f0fd7d..8490d61a40a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx
@@ -1,72 +1,70 @@
-% $Id: numeric-verb.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: numeric-verb.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
\ProvidesFile{numeric-verb.cbx}
-[\abx@cbxid $Id: numeric-verb.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@cbxid $Id: numeric-verb.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
\ExecuteBibliographyOptions{labelnumber,autocite=inline}
+\renewcommand*{\multicitedelim}{\addcomma\space}
\providebool{bbx:subentry}
\DeclareFieldFormat{entrysetcount}{\mknumalph{#1}}
+\newbibmacro*{cite}{%
+ \printtext[bibhyperref]{%
+ \printfield{labelnumber}%
+ \ifbool{bbx:subentry}
+ {\printfield{entrysetcount}}
+ {}}}
+
+\newbibmacro*{textcite}{%
+ \ifnameundef{labelname}
+ {\printfield[citetitle]{labeltitle}}
+ {\printnames{labelname}}%
+ \addspace\bibopenbracket
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
+ \usebibmacro{cite}}
+
\DeclareCiteCommand{\cite}
- {\usebibmacro{prenote}}
+ {\bibopenbracket
+ \usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \bibleftbracket
- \printtext[bibhyperref]{%
- \printfield{labelnumber}%
- \ifbool{bbx:subentry}
- {\printfield{entrysetcount}}
- {}}}
- {\bibrightbracket\multicitedelim}
+ \ifnumgreater{\value{citecount}}{1}
+ {\bibopenbracket}
+ {}%
+ \usebibmacro{cite}}
+ {\bibclosebracket\multicitedelim}
{\usebibmacro{postnote}%
- \bibrightbracket}
+ \bibclosebracket}
\DeclareCiteCommand{\parencite}[\mkbibbrackets]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \printtext[bibhyperref]{%
- \printfield{labelnumber}%
- \ifbool{bbx:subentry}
- {\printfield{entrysetcount}}
- {}}}
+ \usebibmacro{cite}}
{\multicitedelim}
{\usebibmacro{postnote}}
\DeclareCiteCommand{\footcite}[\mkbibfootnote]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \printtext[bibhyperref]{%
- \printfield{labelnumber}%
- \ifbool{bbx:subentry}
- {\printfield{entrysetcount}}
- {}}}
+ \usebibmacro{cite}}
{\multicitedelim}
{\usebibmacro{postnote}}
\DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \printtext[bibhyperref]{%
- \printfield{labelnumber}%
- \ifbool{bbx:subentry}
- {\printfield{entrysetcount}}
- {}}}
+ \usebibmacro{cite}}
{\multicitedelim}
{\usebibmacro{postnote}}
\DeclareCiteCommand{\textcite}
- {\usebibmacro{prenote}}
+ {}
{\usebibmacro{citeindex}%
- \ifnameundef{labelname}
- {\printfield[citetitle]{labeltitle}}
- {\printnames{labelname}}%
- \addspace\bibleftbracket
- \printtext[bibhyperref]{%
- \printfield{labelnumber}%
- \ifbool{bbx:subentry}
- {\printfield{entrysetcount}}
- {}}}%
- {\bibrightbracket\multicitedelim}
- {\usebibmacro{postnote}\bibrightbracket}
+ \usebibmacro{textcite}}
+ {\bibclosebracket\multicitedelim}
+ {\usebibmacro{postnote}%
+ \bibclosebracket}
\DeclareCiteCommand{\supercite}[\mkbibsuperscript]
{\iffieldundef{prenote}
@@ -76,11 +74,7 @@
{}
{\BibliographyWarning{Ignoring postnote argument}}}
{\usebibmacro{citeindex}%
- \printtext[bibhyperref]{%
- \printfield{labelnumber}%
- \ifbool{bbx:subentry}
- {\printfield{entrysetcount}}
- {}}}
+ \usebibmacro{cite}}
{\supercitedelim}
{}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
index b75441eb9fc..7665a9a587d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
@@ -1,80 +1,71 @@
-% $Id: numeric.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: numeric.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
\ProvidesFile{numeric.cbx}
-[\abx@cbxid $Id: numeric.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@cbxid $Id: numeric.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
\ExecuteBibliographyOptions{labelnumber,autocite=inline}
\renewcommand*{\multicitedelim}{\addcomma\space}
\providebool{bbx:subentry}
\DeclareFieldFormat{entrysetcount}{\mknumalph{#1}}
-\DeclareCiteCommand{\cite}
- {\usebibmacro{prenote}%
- \bibleftbracket}
+\newbibmacro*{cite}{%
+ \printtext[bibhyperref]{%
+ \printfield{labelnumber}%
+ \ifbool{bbx:subentry}
+ {\printfield{entrysetcount}}
+ {}}}
+
+\newbibmacro*{textcite}{%
+ \iffieldequals{namehash}{\cbx@lasthash}
+ {\multicitedelim}
+ {\cbx@tempa
+ \ifnameundef{labelname}
+ {\printfield[citetitle]{labeltitle}}
+ {\printnames{labelname}}%
+ \addspace\bibopenbracket}%
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
+ \usebibmacro{cite}%
+ \savefield{namehash}{\cbx@lasthash}%
+ \gdef\cbx@tempa{\bibclosebracket\multicitedelim}}
+
+\DeclareCiteCommand{\cite}[\mkbibbrackets]
+ {\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \printtext[bibhyperref]{%
- \printfield{labelnumber}%
- \ifbool{bbx:subentry}
- {\printfield{entrysetcount}}
- {}}}
+ \usebibmacro{cite}}
{\multicitedelim}
- {\usebibmacro{postnote}%
- \bibrightbracket}
+ {\usebibmacro{postnote}}
\DeclareCiteCommand{\parencite}[\mkbibbrackets]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \printtext[bibhyperref]{%
- \printfield{labelnumber}%
- \ifbool{bbx:subentry}
- {\printfield{entrysetcount}}
- {}}}
+ \usebibmacro{cite}}
{\multicitedelim}
{\usebibmacro{postnote}}
\DeclareCiteCommand{\footcite}[\mkbibfootnote]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \printtext[bibhyperref]{%
- \printfield{labelnumber}%
- \ifbool{bbx:subentry}
- {\printfield{entrysetcount}}
- {}}}
+ \usebibmacro{cite}}
{\multicitedelim}
{\usebibmacro{postnote}}
\DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \printtext[bibhyperref]{%
- \printfield{labelnumber}%
- \ifbool{bbx:subentry}
- {\printfield{entrysetcount}}
- {}}}
+ \usebibmacro{cite}}
{\multicitedelim}
{\usebibmacro{postnote}}
\DeclareCiteCommand{\textcite}
{\let\cbx@tempa=\empty
- \undef\cbx@lasthash
- \usebibmacro{prenote}}
+ \undef\cbx@lasthash}
{\usebibmacro{citeindex}%
- \iffieldequals{namehash}{\cbx@lasthash}
- {\multicitedelim}
- {\cbx@tempa
- \ifnameundef{labelname}
- {\printfield[citetitle]{labeltitle}}
- {\printnames{labelname}}%
- \addspace\bibleftbracket}%
- \printtext[bibhyperref]{%
- \printfield{labelnumber}%
- \ifbool{bbx:subentry}
- {\printfield{entrysetcount}}
- {}}%
- \savefield{namehash}{\cbx@lasthash}%
- \gdef\cbx@tempa{\bibrightbracket\multicitedelim}}
+ \usebibmacro{textcite}}
{}
- {\usebibmacro{postnote}\bibrightbracket}
+ {\usebibmacro{postnote}%
+ \bibclosebracket}
\DeclareCiteCommand{\supercite}[\mkbibsuperscript]
{\iffieldundef{prenote}
@@ -84,15 +75,11 @@
{}
{\BibliographyWarning{Ignoring postnote argument}}}
{\usebibmacro{citeindex}%
- \printtext[bibhyperref]{%
- \printfield{labelnumber}%
- \ifbool{bbx:subentry}
- {\printfield{entrysetcount}}
- {}}}
+ \usebibmacro{cite}}
{\supercitedelim}
{}
-\DeclareMultiCiteCommand{\cites}[\mkbibbrackets]{\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\cites}[\mkbibbrackets]{\cite}{\multicitedelim}
\DeclareMultiCiteCommand{\parencites}[\mkbibbrackets]{\parencite}{\multicitedelim}
\endinput