summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex/cbx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/cbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx10
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx98
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx73
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx5
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx5
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx100
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx112
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx95
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx102
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx97
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx89
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx85
26 files changed, 770 insertions, 167 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 881927c0371..10d0ebfb92f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
@@ -1,7 +1,7 @@
-% $Id: alphabetic-verb.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: alphabetic-verb.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{alphabetic-verb.cbx}
-[\abx@cbxid $Id: alphabetic-verb.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: alphabetic-verb.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
\ExecuteBibliographyOptions{labelalpha,autocite=inline}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
index 1d3f605eef1..14a835427d3 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
@@ -1,7 +1,7 @@
-% $Id: alphabetic.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: alphabetic.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{alphabetic.cbx}
-[\abx@cbxid $Id: alphabetic.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: alphabetic.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
\ExecuteBibliographyOptions{labelalpha,autocite=inline}
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 d1b51b8f5fa..df32026440e 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.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: authortitle-comp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{authortitle-comp.cbx}
-[\abx@cbxid $Id: authortitle-comp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: authortitle-comp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
\ExecuteBibliographyOptions{sortcites,autocite=footnote}
\newbool{cbx:parens}
@@ -24,7 +24,7 @@
{\ifnameundef{labelname}
{}
{\printnames{labelname}%
- \setunit{\addcomma\space}}%
+ \setunit{\nametitledelim}}%
\savefield{namehash}{\cbx@lasthash}}%
\usebibmacro{cite:title}}
{\usebibmacro{cite:shorthand}%
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 c8f5d47b719..6338c38899c 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.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: authortitle-ibid.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{authortitle-ibid.cbx}
-[\abx@cbxid $Id: authortitle-ibid.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: authortitle-ibid.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
\ExecuteBibliographyOptions{ibidtracker=constrict,pagetracker,autocite=footnote}
\providecommand*{\mkibid}[1]{#1}
@@ -21,7 +21,7 @@
{\ifnameundef{labelname}
{}
{\printnames{labelname}%
- \setunit{\addcomma\space}}%
+ \setunit{\nametitledelim}}%
\usebibmacro{cite:title}}}%
{\usebibmacro{cite:shorthand}}}
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 3a79d7b222e..8a1d3d1925a 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.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: authortitle-icomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{authortitle-icomp.cbx}
-[\abx@cbxid $Id: authortitle-icomp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: authortitle-icomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
\ExecuteBibliographyOptions{ibidtracker=constrict,pagetracker,sortcites,autocite=footnote}
\providecommand*{\mkibid}[1]{#1}
@@ -34,7 +34,7 @@
{\ifnameundef{labelname}
{}
{\printnames{labelname}%
- \setunit{\addcomma\space}}%
+ \setunit{\nametitledelim}}%
\savefield{namehash}{\cbx@lasthash}}%
\usebibmacro{cite:title}}}%
{\usebibmacro{cite:shorthand}%
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 6350f87a79c..bddf31eebe2 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.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: authortitle-tcomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{authortitle-tcomp.cbx}
-[\abx@cbxid $Id: authortitle-tcomp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: authortitle-tcomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
\RequireCitationStyle{authortitle-comp}
\ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline}
@@ -16,11 +16,11 @@
{\ifsingletitle
{\printtext[bibhyperref]{\printnames{labelname}}}
{\printnames{labelname}%
- \setunit{\addcomma\space}%
+ \setunit{\nametitledelim}%
\usebibmacro{cite:title}}}%
\savefield{namehash}{\cbx@lasthash}}}
{\usebibmacro{cite:shorthand}%
- \usebibmacro{cite:init}}%
+ \usebibmacro{cite:reinit}}%
\setunit{\multicitedelim}}
\renewbibmacro*{citetitle}{%
@@ -30,7 +30,7 @@
{\savefield{namehash}{\cbx@lasthash}}%
\usebibmacro{cite:title}}
{\usebibmacro{cite:shorthand}%
- \usebibmacro{cite:init}}%
+ \usebibmacro{cite:reinit}}%
\setunit{\multicitedelim}}
\renewbibmacro*{textcite}{%
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 a58bf3860e0..e79409f422e 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.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: authortitle-terse.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{authortitle-terse.cbx}
-[\abx@cbxid $Id: authortitle-terse.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: authortitle-terse.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
\RequireCitationStyle{authortitle}
\ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline}
@@ -13,7 +13,7 @@
{\ifsingletitle
{\printtext[bibhyperref]{\printnames{labelname}}}
{\printnames{labelname}%
- \setunit{\addcomma\space}%
+ \setunit{\nametitledelim}%
\usebibmacro{cite:title}}}}%
{\usebibmacro{cite:shorthand}}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
new file mode 100644
index 00000000000..47cf2274050
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
@@ -0,0 +1,98 @@
+% $Id: authortitle-ticomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+
+\ProvidesFile{authortitle-ticomp.cbx}
+[\abx@cbxid $Id: authortitle-ticomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+
+\RequireCitationStyle{authortitle-icomp}
+\ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline}
+
+\renewbibmacro*{cite}{%
+ \iffieldundef{shorthand}
+ {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+ {\usebibmacro{cite:ibid}}
+ {\iffieldequals{namehash}{\cbx@lasthash}
+ {\setunit{\compcitedelim}%
+ \usebibmacro{cite:title}}
+ {\ifnameundef{labelname}
+ {\usebibmacro{cite:title}}
+ {\ifsingletitle
+ {\printtext[bibhyperref]{\printnames{labelname}}}
+ {\printnames{labelname}%
+ \setunit{\nametitledelim}%
+ \usebibmacro{cite:title}}}%
+ \savefield{namehash}{\cbx@lasthash}}}}
+ {\usebibmacro{cite:shorthand}%
+ \usebibmacro{cite:reinit}}%
+ \setunit{\multicitedelim}}
+
+\renewbibmacro*{citetitle}{%
+ \iffieldundef{shorthand}
+ {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+ {\usebibmacro{cite:ibid}}
+ {\iffieldequals{namehash}{\cbx@lasthash}
+ {\setunit{\compcitedelim}}
+ {\savefield{namehash}{\cbx@lasthash}}%
+ \usebibmacro{cite:title}}}
+ {\usebibmacro{cite:shorthand}%
+ \usebibmacro{cite:reinit}}%
+ \setunit{\multicitedelim}}
+
+\renewbibmacro*{textcite}{%
+ \iffieldequals{namehash}{\cbx@lasthash}
+ {\setunit{\compcitedelim}%
+ \iffieldundef{shorthand}
+ {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+ {\usebibmacro{cite:ibid}}
+ {\usebibmacro{cite:title}}}%
+ {\usebibmacro{cite:shorthand}}}
+ {\ifnameundef{labelname}
+ {\ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
+ \iffieldundef{shorthand}
+ {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+ {\usebibmacro{cite:ibid}}
+ {\usebibmacro{cite:title}}}%
+ {\usebibmacro{cite:shorthand}}}
+ {\ifthenelse{\ifsingletitle\AND
+ \(\iffieldundef{prenote}\OR\value{citecount}>1\)}
+ {\printtext[bibhyperref]{\printnames{labelname}}}
+ {\printnames{labelname}
+ \setunit{%
+ \global\booltrue{cbx:parens}%
+ \addspace\bibopenparen}%
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
+ \iffieldundef{shorthand}
+ {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+ {\usebibmacro{cite:ibid}}
+ {\usebibmacro{cite:title}}}%
+ {\usebibmacro{cite:shorthand}}}}%
+ \savefield{namehash}{\cbx@lasthash}}%
+ \setunit{%
+ \ifbool{cbx:parens}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}%
+ \multicitedelim}}
+
+\renewbibmacro*{textcite:postnote}{%
+ \ifbool{cbx:parens}
+ {\setunit{\postnotedelim}}
+ {\setunit{%
+ \global\booltrue{cbx:parens}%
+ \addspace\bibopenparen}}%
+ \printfield{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}}}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
index 96f07ad2afd..c97a8d14e94 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.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: authortitle.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{authortitle.cbx}
-[\abx@cbxid $Id: authortitle.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: authortitle.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
\ExecuteBibliographyOptions{autocite=footnote}
\newbool{cbx:parens}
@@ -11,7 +11,7 @@
{\ifnameundef{labelname}
{}
{\printnames{labelname}%
- \setunit{\addcomma\space}}%
+ \setunit{\nametitledelim}}%
\usebibmacro{cite:title}}%
{\usebibmacro{cite:shorthand}}}
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 c40ea714eeb..af107a90667 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.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: authoryear-comp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{authoryear-comp.cbx}
-[\abx@cbxid $Id: authoryear-comp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: authoryear-comp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
\ExecuteBibliographyOptions{labelyear,uniquename,sortcites,autocite=inline}
\newbool{cbx:parens}
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 87f0ee9f111..c311bfdb6e3 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.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: authoryear-ibid.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{authoryear-ibid.cbx}
-[\abx@cbxid $Id: authoryear-ibid.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: authoryear-ibid.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
\ExecuteBibliographyOptions{labelyear,uniquename,ibidtracker=constrict,pagetracker,autocite=inline}
\providecommand*{\mkibid}[1]{#1}
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 6f9f985b8e8..c503c9ac161 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.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: authoryear-icomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{authoryear-icomp.cbx}
-[\abx@cbxid $Id: authoryear-icomp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: authoryear-icomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
\ExecuteBibliographyOptions{labelyear,uniquename,ibidtracker=constrict,
pagetracker,sortcites,autocite=inline}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
index 2bece812403..2a9031820ad 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.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: authoryear.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{authoryear.cbx}
-[\abx@cbxid $Id: authoryear.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: authoryear.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
\ExecuteBibliographyOptions{labelyear,uniquename,autocite=inline}
\newbool{cbx:parens}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx
index a2357a4d05c..701f956efe4 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx
@@ -1,7 +1,7 @@
-% $Id: debug.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: debug.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{debug.cbx}
-[\abx@cbxid $Id: debug.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: debug.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
\ExecuteBibliographyOptions{autocite=plain}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx
index ed7122db029..df3339bbac7 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx
@@ -1,7 +1,7 @@
-% $Id: draft.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: draft.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{draft.cbx}
-[\abx@cbxid $Id: draft.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: draft.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
\ExecuteBibliographyOptions{autocite=plain}
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 11b3729dd0b..03f185df895 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.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: numeric-comp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{numeric-comp.cbx}
-[\abx@cbxid $Id: numeric-comp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: numeric-comp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
\ExecuteBibliographyOptions{labelnumber,sortcites,autocite=inline}
\renewcommand*{\multicitedelim}{\addcomma\space}
@@ -12,13 +12,15 @@
\DeclareFieldFormat{entrysetcount}{\mknumalph{#1}}
\newbibmacro*{cite:init}{%
- \let\cbx@tempa=\empty
- \undef\cbx@lasthash
- \defcounter{cbx@tempcnta}{0}%
- \defcounter{cbx@tempcntb}{-2}}
+ \global\let\cbx@tempa=\empty
+ \global\undef\cbx@lasthash
+ \global\undef\cbx@lastnumber
+ \global\undef\cbx@lastprefix
+ \setcounter{cbx@tempcnta}{0}%
+ \setcounter{cbx@tempcntb}{-2}}
\newbibmacro*{cite:comp}{%
- \global\defcounter{cbx@tempcntb}{\value{cbx@tempcntb}+1}%
+ \addtocounter{cbx@tempcntb}{1}%
\iffieldundef{shorthand}
{\ifbool{bbx:subentry}
{\iffieldundef{entrysetcount}
@@ -28,18 +30,36 @@
{\usebibmacro{cite:comp:shand}}}
\newbibmacro*{cite:comp:comp}{%
- \ifnumequal{\thefield{labelnumber}}{\value{cbx@tempcntb}}
- {\savefield{entrykey}{\cbx@lastkey}%
- \savefield{labelnumber}{\cbx@lastnumber}%
- \global\defcounter{cbx@tempcnta}{\value{cbx@tempcnta}+1}}
- {\ifnumequal{\thefield{labelnumber}}{\value{cbx@tempcntb}-1}
- {}
- {\usebibmacro{cite:dump}%
- \ifnumgreater{\value{cbx@tempcntb}}{-1}
- {\multicitedelim}
- {}%
- \printtext[bibhyperref]{\printfield{labelnumber}}}}%
- \global\defcounter{cbx@tempcntb}{\thefield{labelnumber}}}
+ \ifboolexpr{
+ ( test {\iffieldundef{prefixnumber}} and test {\ifundef\cbx@lastprefix} )
+ or
+ test {\iffieldequals{prefixnumber}{\cbx@lastprefix}}
+ }
+ {\ifnumequal{\thefield{labelnumber}}{\value{cbx@tempcntb}}
+ {\savefield{entrykey}{\cbx@lastkey}%
+ \savefield{labelnumber}{\cbx@lastnumber}%
+ \addtocounter{cbx@tempcnta}{1}}
+ {\ifnumequal{\thefield{labelnumber}}{\value{cbx@tempcntb}-1}
+ {}
+ {\usebibmacro{cite:dump}%
+ \ifnumgreater{\value{cbx@tempcntb}}{-1}
+ {\multicitedelim}
+ {}%
+ \printtext[bibhyperref]{%
+ \printfield{prefixnumber}%
+ \printfield{labelnumber}}}}}
+ {\usebibmacro{cite:comp:end}}%
+ \setcounter{cbx@tempcntb}{\thefield{labelnumber}}%
+ \savefield{prefixnumber}{\cbx@lastprefix}}
+
+\newbibmacro*{cite:comp:end}{%
+ \usebibmacro{cite:dump}%
+ \ifnumgreater{\value{cbx@tempcntb}}{-1}
+ {\multicitedelim}
+ {}%
+ \printtext[bibhyperref]{%
+ \printfield{prefixnumber}%
+ \printfield{labelnumber}}}
\newbibmacro*{cite:comp:inset}{%
\usebibmacro{cite:dump}%
@@ -47,9 +67,10 @@
{\multicitedelim}
{}%
\printtext[bibhyperref]{%
+ \printfield{prefixnumber}%
\printfield{labelnumber}%
\printfield{entrysetcount}}%
- \global\defcounter{cbx@tempcntb}{-1}}
+ \setcounter{cbx@tempcntb}{-1}}
\newbibmacro*{cite:comp:shand}{%
\usebibmacro{cite:dump}%
@@ -57,7 +78,7 @@
{\multicitedelim}
{}%
\printtext[bibhyperref]{\printfield{shorthand}}%
- \global\defcounter{cbx@tempcntb}{-1}}
+ \setcounter{cbx@tempcntb}{-1}}
\newbibmacro*{cite:dump}{%
\ifnumgreater{\value{cbx@tempcnta}}{0}
@@ -65,9 +86,13 @@
{\bibrangedash}
{\multicitedelim}%
\bibhyperref[\cbx@lastkey]{%
- \printtext[labelnumber]{\cbx@lastnumber}}%
- \global\defcounter{cbx@tempcnta}{0}}
- {}}
+ \ifdef\cbx@lastprefix
+ {\printtext[prefixnumber]{\cbx@lastprefix}}
+ {}%
+ \printtext[labelnumber]{\cbx@lastnumber}}}
+ {}%
+ \setcounter{cbx@tempcnta}{0}%
+ \global\undef\cbx@lastprefix}
\newbibmacro*{textcite}{%
\iffieldequals{namehash}{\cbx@lasthash}
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 8490d61a40a..31921501429 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx
@@ -1,7 +1,7 @@
-% $Id: numeric-verb.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: numeric-verb.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{numeric-verb.cbx}
-[\abx@cbxid $Id: numeric-verb.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: numeric-verb.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
\ExecuteBibliographyOptions{labelnumber,autocite=inline}
\renewcommand*{\multicitedelim}{\addcomma\space}
@@ -10,6 +10,7 @@
\newbibmacro*{cite}{%
\printtext[bibhyperref]{%
+ \printfield{prefixnumber}%
\printfield{labelnumber}%
\ifbool{bbx:subentry}
{\printfield{entrysetcount}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
index 7665a9a587d..68ae4488b0d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
@@ -1,7 +1,7 @@
-% $Id: numeric.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: numeric.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{numeric.cbx}
-[\abx@cbxid $Id: numeric.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@cbxid $Id: numeric.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
\ExecuteBibliographyOptions{labelnumber,autocite=inline}
\renewcommand*{\multicitedelim}{\addcomma\space}
@@ -10,6 +10,7 @@
\newbibmacro*{cite}{%
\printtext[bibhyperref]{%
+ \printfield{prefixnumber}%
\printfield{labelnumber}%
\ifbool{bbx:subentry}
{\printfield{entrysetcount}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx
index e7e8d727277..f52a2cfc403 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx
@@ -1,7 +1,7 @@
-% $Id: reading.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: reading.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{reading.cbx}
-[\abx@cbxid $Id: reading.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@cbxid $Id: reading.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
\RequireCitationStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx
index 1a06a81f20b..ea26e14379c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx
@@ -1,36 +1,108 @@
-% $Id: verbose-ibid.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-ibid.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{verbose-ibid.cbx}
-[\abx@cbxid $Id: verbose-ibid.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
-
-\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
- pagetracker,autocite=footnote}
-\providecommand*{\mkibid}[1]{#1}
-\newbool{cbx:loccit}
-\newcommand*{\cbx@resetcount}{0}
+[\abx@cbxid $Id: verbose-ibid.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
\InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}}
\DeclareFieldFormat{bibhyperlink}{%
\bibhyperlink{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}}
\DeclareFieldFormat{bibhypertarget}{%
\bibhypertarget{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}}
+\newcommand*{\cbx@resetcount}{0}
+\providecommand*{\mkibid}[1]{#1}
+\newtoggle{cbx:loccit}
+\newbibmacro*{cite:citepages}{}
+\newbibmacro*{cite:full:citepages}{}
+\newbibmacro*{cite:postnote}{}
\DeclareBibliographyOption{ibidpage}[true]{%
\ifstrequal{#1}{true}
{\ExecuteBibliographyOptions{loccittracker=constrict}}
{\ExecuteBibliographyOptions{loccittracker=false}}}
+\DeclareBibliographyOption{citepages}[permit]{%
+ \ifcsdef{cbx@opt@citepages@#1}
+ {\csuse{cbx@opt@citepages@#1}}
+ {\PackageError{biblatex}
+ {Invalid option 'citepages=#1'}
+ {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}}
+
+\def\cbx@opt@citepages@permit{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{}%
+ \renewbibmacro*{cite:postnote}{%
+ \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@suppress{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \clearfield{pages}%
+ \clearfield{pagetotal}}%
+ \renewbibmacro*{cite:postnote}{%
+ \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@omit{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \ifboolexpr{
+ test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+ and
+ test {\iffieldpages{postnote}}
+ }
+ {\clearfield{pages}%
+ \clearfield{pagetotal}}
+ {}}%
+ \renewbibmacro*{cite:postnote}{%
+ \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@separate{%
+ \providetoggle{cbx:fullcite}%
+ \renewbibmacro*{cite:citepages}{%
+ \global\togglefalse{cbx:fullcite}}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \global\toggletrue{cbx:fullcite}}%
+ \renewbibmacro*{cite:postnote}{%
+ \ifboolexpr{
+ togl {cbx:fullcite}
+ and
+ test {\iffieldpages{postnote}}
+ and
+ test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+ and
+ (
+ not test {\iffieldundef{pages}}
+ or
+ not test {\iffieldundef{pagetotal}}
+ )
+ }
+ {\usebibmacro{cite:postnote:pages}}
+ {\usebibmacro{cite:postnote:ibidpage}}}
+ \providebibmacro*{cite:postnote:pages}{%
+ \setunit{\postnotedelim}%
+ \bibstring{thiscite}%
+ \setunit{\addspace}%
+ \printfield{postnote}}}
+
+\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
+ pagetracker,autocite=footnote,citepages=permit}
+
\newbibmacro*{cite}{%
- \global\boolfalse{cbx:loccit}%
+ \usebibmacro{cite:citepages}%
+ \global\togglefalse{cbx:loccit}%
\ifciteseen
{\iffieldundef{shorthand}
- {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+ {\ifboolexpr{
+ test {\ifciteibid}
+ and
+ not test {\iffirstonpage}
+ }
{\usebibmacro{cite:ibid}}
{\usebibmacro{cite:short}}}
{\usebibmacro{cite:shorthand}}}
{\usebibmacro{cite:full}}}
\newbibmacro*{cite:full}{%
+ \usebibmacro{cite:full:citepages}%
\printtext[bibhypertarget]{%
\usedriver
{\DeclareNameAlias{sortname}{default}}
@@ -39,22 +111,22 @@
\newbibmacro*{cite:short}{%
\printnames{labelname}%
- \setunit*{\addcomma\space}%
+ \setunit*{\nametitledelim}%
\printtext[bibhyperlink]{%
\printfield[citetitle]{labeltitle}}}
\newbibmacro*{cite:ibid}{%
\printtext[bibhyperlink]{\bibstring[\mkibid]{ibidem}}%
\ifloccit
- {\global\booltrue{cbx:loccit}}
+ {\global\toggletrue{cbx:loccit}}
{}}
\newbibmacro*{cite:shorthand}{%
\printtext[bibhyperlink]{%
\printfield{shorthand}}}
-\newbibmacro*{cite:postnote}{%
- \ifbool{cbx:loccit}
+\newbibmacro*{cite:postnote:ibidpage}{%
+ \iftoggle{cbx:loccit}
{}
{\usebibmacro{postnote}}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx
index 9dca13b35df..1401d38f024 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx
@@ -1,28 +1,95 @@
-% $Id: verbose-inote.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-inote.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{verbose-inote.cbx}
-[\abx@cbxid $Id: verbose-inote.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
-
-\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
- singletitle,pagetracker,autocite=footnote}
-\providecommand*{\mkibid}[1]{#1}
-\newbool{cbx:loccit}
-\newbool{cbx:pageref}
+[\abx@cbxid $Id: verbose-inote.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
\DeclareFieldFormat{bibhyperlink}{%
\bibhyperlink{\thefield{entrykey}:\csuse{cbx@\iffootnote{f}{t}@\thefield{entrykey}}}{#1}}
\DeclareFieldFormat{bibhypertarget}{%
\bibhypertarget{\thefield{entrykey}:\the\value{instcount}}{#1}}
+\providecommand*{\mkibid}[1]{#1}
+\newtoggle{cbx:loccit}
+\newtoggle{cbx:pageref}
+\newbibmacro*{cite:citepages}{}
+\newbibmacro*{cite:full:citepages}{}
+\newbibmacro*{cite:postnote}{}
\DeclareBibliographyOption{ibidpage}[true]{%
\ifstrequal{#1}{true}
{\ExecuteBibliographyOptions{loccittracker=constrict}}
{\ExecuteBibliographyOptions{loccittracker=false}}}
\DeclareBibliographyOption{pageref}[true]{%
- \setbool{cbx:pageref}{#1}}
+ \settoggle{cbx:pageref}{#1}}
+
+\DeclareBibliographyOption{citepages}[permit]{%
+ \ifcsdef{cbx@opt@citepages@#1}
+ {\csuse{cbx@opt@citepages@#1}}
+ {\PackageError{biblatex}
+ {Invalid option 'citepages=#1'}
+ {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}}
+
+\def\cbx@opt@citepages@permit{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{}%
+ \renewbibmacro*{cite:postnote}{%
+ \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@suppress{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \clearfield{pages}%
+ \clearfield{pagetotal}}%
+ \renewbibmacro*{cite:postnote}{%
+ \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@omit{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \ifboolexpr{
+ test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+ and
+ test {\iffieldpages{postnote}}
+ }
+ {\clearfield{pages}%
+ \clearfield{pagetotal}}
+ {}}%
+ \renewbibmacro*{cite:postnote}{%
+ \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@separate{%
+ \providetoggle{cbx:fullcite}%
+ \renewbibmacro*{cite:citepages}{%
+ \global\togglefalse{cbx:fullcite}}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \global\toggletrue{cbx:fullcite}}%
+ \renewbibmacro*{cite:postnote}{%
+ \ifboolexpr{
+ togl {cbx:fullcite}
+ and
+ test {\iffieldpages{postnote}}
+ and
+ test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+ and
+ (
+ not test {\iffieldundef{pages}}
+ or
+ not test {\iffieldundef{pagetotal}}
+ )
+ }
+ {\usebibmacro{cite:postnote:pages}}
+ {\usebibmacro{cite:postnote:ibidpage}}}
+ \providebibmacro*{cite:postnote:pages}{%
+ \setunit{\postnotedelim}%
+ \bibstring{thiscite}%
+ \setunit{\addspace}%
+ \printfield{postnote}}}
+
+\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,singletitle,
+ pagetracker,autocite=footnote,citepages=permit}
\newbibmacro*{cite}{%
- \global\boolfalse{cbx:loccit}%
+ \usebibmacro{cite:citepages}%
+ \global\togglefalse{cbx:loccit}%
\ifciteseen
{\iffieldundef{shorthand}
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
@@ -36,6 +103,7 @@
\csxdef{cbx@t@\thefield{entrykey}}{\the\value{instcount}}}
\newbibmacro*{cite:full}{%
+ \usebibmacro{cite:full:citepages}%
\printtext[bibhypertarget]{%
\usedriver
{\DeclareNameAlias{sortname}{default}}
@@ -44,7 +112,7 @@
\newbibmacro*{cite:short}{%
\printnames{labelname}%
- \setunit*{\addcomma\space}%
+ \setunit*{\nametitledelim}%
\printtext[bibhyperlink]{%
\printfield[citetitle]{labeltitle}}}
@@ -54,11 +122,17 @@
\newbibmacro*{cite:ibid}{%
\printtext[bibhyperlink]{\bibstring[\mkibid]{ibidem}}%
\ifloccit
- {\global\booltrue{cbx:loccit}}
+ {\global\toggletrue{cbx:loccit}}
{}}
+\newbibmacro*{cite:postnote:ibidpage}{%
+ \iftoggle{cbx:loccit}
+ {}
+ {\usebibmacro{postnote}}}
+
\newbibmacro*{footcite}{%
- \global\boolfalse{cbx:loccit}%
+ \usebibmacro{cite:citepages}%
+ \global\togglefalse{cbx:loccit}%
\ifciteseen
{\iffieldundef{shorthand}
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
@@ -73,30 +147,26 @@
\label{cbx@\the\value{instcount}}}
\newbibmacro*{footcite:full}{%
+ \usebibmacro{cite:full:citepages}%
\printtext[bibhypertarget]{%
\usedriver
{\DeclareNameAlias{sortname}{default}}
{\thefield{entrytype}}}%
\usebibmacro{shorthandintro}}
-\newbibmacro*{cite:postnote}{%
- \ifbool{cbx:loccit}
- {}
- {\usebibmacro{postnote}}}
-
\newbibmacro*{footcite:note}{%
\ifnameundef{labelname}
{\printfield{label}}
{\printnames{labelname}}%
\ifsingletitle
{}
- {\setunit*{\addcomma\space}%
+ {\setunit*{\nametitledelim}%
\printfield[title]{labeltitle}}%
\setunit*{\addcomma\space}%
\printtext{%
\bibstring{seenote}\addnbspace
\ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
- \ifbool{cbx:pageref}
+ \iftoggle{cbx:pageref}
{\ifsamepage{\the\value{instcount}}
{\csuse{cbx@f@\thefield{entrykey}}}
{}
@@ -110,7 +180,7 @@
\newbibmacro*{footcite:ibid}{%
\printtext[bibhyperlink]{\bibstring[\mkibid]{ibidem}}%
\ifloccit
- {\global\booltrue{cbx:loccit}}
+ {\global\toggletrue{cbx:loccit}}
{}}
\DeclareCiteCommand{\cite}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx
index 8744c605da3..55ed02cc5ea 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx
@@ -1,23 +1,87 @@
-% $Id: verbose-note.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-note.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{verbose-note.cbx}
-[\abx@cbxid $Id: verbose-note.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
-
-\ExecuteBibliographyOptions{citetracker=context,singletitle,autocite=footnote}
-\newbool{cbx:pageref}
+[\abx@cbxid $Id: verbose-note.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
\DeclareFieldFormat{bibhyperlink}{%
\bibhyperlink{\thefield{entrykey}:\csuse{cbx@\iffootnote{f}{t}@\thefield{entrykey}}}{#1}}
\DeclareFieldFormat{bibhypertarget}{%
\bibhypertarget{\thefield{entrykey}:\the\value{instcount}}{#1}}
+\newtoggle{cbx:pageref}
+\newbibmacro*{cite:citepages}{}
+\newbibmacro*{cite:full:citepages}{}
+\newbibmacro*{cite:postnote}{}
\DeclareBibliographyOption{pageref}[true]{%
- \setbool{cbx:pageref}{#1}%
- \ifbool{cbx:pageref}
+ \settoggle{cbx:pageref}{#1}%
+ \iftoggle{cbx:pageref}
{\ExecuteBibliographyOptions{pagetracker}}
{}}
+\DeclareBibliographyOption{citepages}[permit]{%
+ \ifcsdef{cbx@opt@citepages@#1}
+ {\csuse{cbx@opt@citepages@#1}}
+ {\PackageError{biblatex}
+ {Invalid option 'citepages=#1'}
+ {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}}
+
+\def\cbx@opt@citepages@permit{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{}%
+ \renewbibmacro*{cite:postnote}{\usebibmacro{postnote}}}
+
+\def\cbx@opt@citepages@suppress{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \clearfield{pages}%
+ \clearfield{pagetotal}}%
+ \renewbibmacro*{cite:postnote}{\usebibmacro{postnote}}}
+
+\def\cbx@opt@citepages@omit{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \ifboolexpr{
+ test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+ and
+ test {\iffieldpages{postnote}}
+ }
+ {\clearfield{pages}%
+ \clearfield{pagetotal}}
+ {}}%
+ \renewbibmacro*{cite:postnote}{\usebibmacro{postnote}}}
+
+\def\cbx@opt@citepages@separate{%
+ \providetoggle{cbx:fullcite}%
+ \renewbibmacro*{cite:citepages}{%
+ \global\togglefalse{cbx:fullcite}}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \global\toggletrue{cbx:fullcite}}%
+ \renewbibmacro*{cite:postnote}{%
+ \ifboolexpr{
+ togl {cbx:fullcite}
+ and
+ test {\iffieldpages{postnote}}
+ and
+ test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+ and
+ (
+ not test {\iffieldundef{pages}}
+ or
+ not test {\iffieldundef{pagetotal}}
+ )
+ }
+ {\usebibmacro{cite:postnote:pages}}
+ {\usebibmacro{postnote}}}
+ \providebibmacro*{cite:postnote:pages}{%
+ \setunit{\postnotedelim}%
+ \bibstring{thiscite}%
+ \setunit{\addspace}%
+ \printfield{postnote}}}
+
+\ExecuteBibliographyOptions{citetracker=context,singletitle,autocite=footnote,citepages=permit}
+
\newbibmacro*{cite}{%
+ \usebibmacro{cite:citepages}%
\ifciteseen
{\iffieldundef{shorthand}
{\usebibmacro{cite:short}}
@@ -29,6 +93,7 @@
\csxdef{cbx@t@\thefield{entrykey}}{\the\value{instcount}}}
\newbibmacro*{cite:full}{%
+ \usebibmacro{cite:full:citepages}%
\printtext[bibhypertarget]{%
\usedriver
{\DeclareNameAlias{sortname}{default}}
@@ -37,7 +102,7 @@
\newbibmacro*{cite:short}{%
\printnames{labelname}%
- \setunit*{\addcomma\space}%
+ \setunit*{\nametitledelim}%
\printtext[bibhyperlink]{%
\printfield[citetitle]{labeltitle}}}
@@ -45,6 +110,7 @@
\printtext[bibhyperlink]{\printfield{shorthand}}}
\newbibmacro*{footcite}{%
+ \usebibmacro{cite:citepages}%
\ifciteseen
{\iffieldundef{shorthand}
{\usebibmacro{footcite:note}}
@@ -57,6 +123,7 @@
\label{cbx@\the\value{instcount}}}
\newbibmacro*{footcite:full}{%
+ \usebibmacro{cite:full:citepages}%
\printtext[bibhypertarget]{%
\usedriver
{\DeclareNameAlias{sortname}{default}}
@@ -69,13 +136,13 @@
{\printnames{labelname}}%
\ifsingletitle
{}
- {\setunit*{\addcomma\space}%
+ {\setunit*{\nametitledelim}%
\printfield[title]{labeltitle}}%
\setunit*{\addcomma\space}%
\printtext{%
\bibstring{seenote}\addnbspace
\ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
- \ifbool{cbx:pageref}
+ \iftoggle{cbx:pageref}
{\ifsamepage{\the\value{instcount}}
{\csuse{cbx@f@\thefield{entrykey}}}
{}
@@ -93,7 +160,7 @@
{\usebibmacro{footcite}}
{\usebibmacro{cite}}}
{\multicitedelim}
- {\usebibmacro{postnote}}
+ {\usebibmacro{cite:postnote}}
\DeclareCiteCommand{\parencite}[\mkbibparens]
{\usebibmacro{prenote}}
@@ -102,20 +169,20 @@
{\usebibmacro{footcite}}
{\usebibmacro{cite}}}
{\multicitedelim}
- {\usebibmacro{postnote}}
+ {\usebibmacro{cite:postnote}}
\DeclareCiteCommand{\footcite}[\mkbibfootnote]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{footcite}}
{\multicitedelim}
- {\usebibmacro{postnote}}
+ {\usebibmacro{cite:postnote}}
\DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{footcite}}
{\multicitedelim}
- {\usebibmacro{postnote}}
+ {\usebibmacro{cite:postnote}}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx
index a6564e7b6e4..e3c644b1d7d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx
@@ -1,31 +1,96 @@
-% $Id: verbose-trad1.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-trad1.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{verbose-trad1.cbx}
-[\abx@cbxid $Id: verbose-trad1.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@cbxid $Id: verbose-trad1.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
-\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
- idemtracker=constrict,opcittracker=context,
- loccittracker=context,autocite=footnote}
\providecommand*{\mkibid}[1]{#1}
-\newbool{cbx:loccit}
+\newtoggle{cbx:ibidpage}
+\newtoggle{cbx:loccit}
\newbool{cbx:noidem}
\DeclareBibliographyOption{ibidpage}[true]{%
- \ifstrequal{#1}{true}
- {\renewbibmacro*{cite:ibid:page}{\global\booltrue{cbx:loccit}}}
- {\renewbibmacro*{cite:ibid:page}{}}}
+ \settoggle{cbx:ibidpage}{#1}}
\DeclareBibliographyOption{strict}[true]{%
\ifstrequal{#1}{true}
{\ExecuteBibliographyOptions{ibidtracker=constrict,idemtracker=constrict}}
{\ExecuteBibliographyOptions{ibidtracker=context,idemtracker=context}}}
+\DeclareBibliographyOption{citepages}[permit]{%
+ \ifcsdef{cbx@opt@citepages@#1}
+ {\csuse{cbx@opt@citepages@#1}}
+ {\PackageError{biblatex}
+ {Invalid option 'citepages=#1'}
+ {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}}
+
+\def\cbx@opt@citepages@permit{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{}%
+ \renewbibmacro*{cite:postnote}{%
+ \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@suppress{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \clearfield{pages}%
+ \clearfield{pagetotal}}%
+ \renewbibmacro*{cite:postnote}{%
+ \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@omit{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \ifboolexpr{
+ test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+ and
+ test {\iffieldpages{postnote}}
+ }
+ {\clearfield{pages}%
+ \clearfield{pagetotal}}
+ {}}%
+ \renewbibmacro*{cite:postnote}{%
+ \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@separate{%
+ \providetoggle{cbx:fullcite}%
+ \renewbibmacro*{cite:citepages}{%
+ \global\togglefalse{cbx:fullcite}}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \global\toggletrue{cbx:fullcite}}%
+ \renewbibmacro*{cite:postnote}{%
+ \ifboolexpr{
+ togl {cbx:fullcite}
+ and
+ test {\iffieldpages{postnote}}
+ and
+ test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+ and
+ (
+ not test {\iffieldundef{pages}}
+ or
+ not test {\iffieldundef{pagetotal}}
+ )
+ }
+ {\usebibmacro{cite:postnote:pages}}
+ {\usebibmacro{cite:postnote:ibidpage}}}
+ \providebibmacro*{cite:postnote:pages}{%
+ \setunit{\postnotedelim}%
+ \bibstring{thiscite}%
+ \setunit{\addspace}%
+ \printfield{postnote}}}
+
+\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
+ idemtracker=constrict,opcittracker=context,
+ loccittracker=context,autocite=footnote,
+ citepages=permit}
+
\newbibmacro*{cite:save}{%
\csxdef{cbx@lastcite@\thefield{entrykey}}{\the\value{instcount}}%
\global\boolfalse{cbx:noidem}}
\newbibmacro*{cite}{%
- \global\boolfalse{cbx:loccit}%
+ \usebibmacro{cite:citepages}%
+ \global\togglefalse{cbx:loccit}%
\bibhypertarget{cite\the\value{instcount}}{%
\ifciteseen
{\iffieldundef{shorthand}
@@ -48,6 +113,7 @@
\usebibmacro{cite:save}}}}
\newbibmacro*{cite:full}{%
+ \usebibmacro{cite:full:citepages}%
\printtext[bibhypertarget]{%
\usedriver
{\DeclareNameAlias{sortname}{default}}
@@ -56,11 +122,11 @@
\newbibmacro*{cite:name}{%
\printnames{labelname}%
- \setunit*{\addcomma\space}}
+ \setunit*{\nametitledelim}}
\newbibmacro*{cite:idem}{%
\bibstring[\mkibid]{idem\thefield{gender}}%
- \setunit{\addcomma\space}}
+ \setunit{\nametitledelim}}
\newbibmacro*{cite:title}{%
\printtext[bibhyperlink]{%
@@ -73,24 +139,22 @@
\printtext{%
\bibhyperlink{cite\csuse{cbx@lastcite@\thefield{entrykey}}}{%
\bibstring[\mkibid]{loccit}}}%
- \global\booltrue{cbx:loccit}}
+ \global\toggletrue{cbx:loccit}}
\newbibmacro*{cite:ibid}{%
\printtext{%
\bibhyperlink{cite\csuse{cbx@lastcite@\thefield{entrykey}}}{%
\bibstring[\mkibid]{ibidem}}}%
- \ifloccit
- {\usebibmacro{cite:ibid:page}}
+ \ifboolexpr{ test {\ifloccit} and togl {cbx:ibidpage} }
+ {\global\toggletrue{cbx:loccit}}
{}}
-\newbibmacro*{cite:ibid:page}{}
-
\newbibmacro*{cite:shorthand}{%
\printtext[bibhyperlink]{\printfield{shorthand}}%
\global\booltrue{cbx:noidem}}
-\newbibmacro*{cite:postnote}{%
- \ifbool{cbx:loccit}
+\newbibmacro*{cite:postnote:ibidpage}{%
+ \iftoggle{cbx:loccit}
{}
{\usebibmacro{postnote}}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx
index 761285bed3e..5abdb2bfbcb 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx
@@ -1,13 +1,15 @@
-% $Id: verbose-trad2.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-trad2.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{verbose-trad2.cbx}
-[\abx@cbxid $Id: verbose-trad2.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@cbxid $Id: verbose-trad2.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
-\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
- idemtracker=constrict,autocite=footnote}
\providecommand*{\mkibid}[1]{#1}
-\newbool{cbx:loccit}
+\newtoggle{cbx:fullcite}
+\newtoggle{cbx:loccit}
\newbool{cbx:noidem}
+\newbibmacro*{cite:citepages}{}
+\newbibmacro*{cite:full:citepages}{}
+\newbibmacro*{cite:postnote}{}
\DeclareBibliographyOption{ibidpage}[true]{%
\ifstrequal{#1}{true}
@@ -19,12 +21,81 @@
{\ExecuteBibliographyOptions{ibidtracker=constrict,idemtracker=constrict}}
{\ExecuteBibliographyOptions{ibidtracker=context,idemtracker=context}}}
+\DeclareBibliographyOption{citepages}[permit]{%
+ \ifcsdef{cbx@opt@citepages@#1}
+ {\csuse{cbx@opt@citepages@#1}}
+ {\PackageError{biblatex}
+ {Invalid option 'citepages=#1'}
+ {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}}
+
+\def\cbx@opt@citepages@permit{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{}%
+ \renewbibmacro*{cite:postnote}{%
+ \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@suppress{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \clearfield{pages}%
+ \clearfield{pagetotal}}%
+ \renewbibmacro*{cite:postnote}{%
+ \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@omit{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \ifboolexpr{
+ test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+ and
+ test {\iffieldpages{postnote}}
+ }
+ {\clearfield{pages}%
+ \clearfield{pagetotal}}
+ {}}%
+ \renewbibmacro*{cite:postnote}{%
+ \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@separate{%
+ \providetoggle{cbx:fullcite}%
+ \renewbibmacro*{cite:citepages}{%
+ \global\togglefalse{cbx:fullcite}}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \global\toggletrue{cbx:fullcite}}%
+ \renewbibmacro*{cite:postnote}{%
+ \ifboolexpr{
+ togl {cbx:fullcite}
+ and
+ test {\iffieldpages{postnote}}
+ and
+ test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+ and
+ (
+ not test {\iffieldundef{pages}}
+ or
+ not test {\iffieldundef{pagetotal}}
+ )
+ }
+ {\usebibmacro{cite:postnote:pages}}
+ {\usebibmacro{cite:postnote:ibidpage}}}
+ \providebibmacro*{cite:postnote:pages}{%
+ \setunit{\postnotedelim}%
+ \bibstring{thiscite}%
+ \setunit{\addspace}%
+ \printfield{postnote}}}
+
+\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
+ idemtracker=constrict,autocite=footnote,
+ citepages=permit}
+
\newbibmacro*{cite:save}{%
\csxdef{cbx@lastcite@\thefield{entrykey}}{\the\value{instcount}}%
\global\boolfalse{cbx:noidem}}
\newbibmacro*{cite}{%
- \global\boolfalse{cbx:loccit}%
+ \usebibmacro{cite:citepages}%
+ \global\togglefalse{cbx:fullcite}%
+ \global\togglefalse{cbx:loccit}%
\bibhypertarget{cite\the\value{instcount}}{%
\ifciteseen
{\iffieldundef{shorthand}
@@ -40,6 +111,8 @@
\usebibmacro{cite:save}}}}
\newbibmacro*{cite:full}{%
+ \usebibmacro{cite:full:citepages}%
+ \global\toggletrue{cbx:fullcite}%
\printtext[bibhypertarget]{%
\usedriver
{\DeclareNameAlias{sortname}{default}}
@@ -48,16 +121,16 @@
\newbibmacro*{cite:name}{%
\printnames{labelname}%
- \setunit*{\addcomma\space}}
+ \setunit*{\nametitledelim}}
\newbibmacro*{cite:idem}{%
\bibstring[\mkibid]{idem\thefield{gender}}%
- \setunit{\addcomma\space}}
+ \setunit{\nametitledelim}}
\newbibmacro*{cite:title}{%
\printtext[bibhyperlink]{%
\printfield[citetitle]{labeltitle}%
- \setunit{\addcomma\space}%
+ \setunit{\nametitledelim}%
\bibstring[\mkibid]{opcit}}}
\newbibmacro*{cite:ibid}{%
@@ -65,15 +138,15 @@
\bibhyperlink{cite\csuse{cbx@lastcite@\thefield{entrykey}}}{%
\bibstring[\mkibid]{ibidem}}}%
\ifloccit
- {\global\booltrue{cbx:loccit}}
+ {\global\toggletrue{cbx:loccit}}
{}}
\newbibmacro*{cite:shorthand}{%
\printtext[bibhyperlink]{\printfield{shorthand}}%
\global\booltrue{cbx:noidem}}
-\newbibmacro*{cite:postnote}{%
- \ifbool{cbx:loccit}
+\newbibmacro*{cite:postnote:ibidpage}{%
+ \iftoggle{cbx:loccit}
{}
{\usebibmacro{postnote}}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
index 05a2999b84a..bcd8d124745 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
@@ -1,20 +1,86 @@
-% $Id: verbose-trad3.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-trad3.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{verbose-trad3.cbx}
-[\abx@cbxid $Id: verbose-trad3.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@cbxid $Id: verbose-trad3.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
-\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
- loccittracker=constrict,autocite=footnote}
\providecommand*{\mkibid}[1]{#1}
-\newbool{cbx:ibid}
+\newtoggle{cbx:loccit}
\DeclareBibliographyOption{strict}[true]{%
\ifstrequal{#1}{true}
{\ExecuteBibliographyOptions{ibidtracker=constrict,loccittracker=constrict}}
{\ExecuteBibliographyOptions{ibidtracker=context,loccittracker=context}}}
+\DeclareBibliographyOption{citepages}[permit]{%
+ \ifcsdef{cbx@opt@citepages@#1}
+ {\csuse{cbx@opt@citepages@#1}}
+ {\PackageError{biblatex}
+ {Invalid option 'citepages=#1'}
+ {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}}
+
+\def\cbx@opt@citepages@permit{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{}%
+ \renewbibmacro*{cite:postnote}{%
+ \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@suppress{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \clearfield{pages}%
+ \clearfield{pagetotal}}%
+ \renewbibmacro*{cite:postnote}{%
+ \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@omit{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \ifboolexpr{
+ test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+ and
+ test {\iffieldpages{postnote}}
+ }
+ {\clearfield{pages}%
+ \clearfield{pagetotal}}
+ {}}%
+ \renewbibmacro*{cite:postnote}{%
+ \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@separate{%
+ \providetoggle{cbx:fullcite}%
+ \renewbibmacro*{cite:citepages}{%
+ \global\togglefalse{cbx:fullcite}}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \global\toggletrue{cbx:fullcite}}%
+ \renewbibmacro*{cite:postnote}{%
+ \ifboolexpr{
+ togl {cbx:fullcite}
+ and
+ test {\iffieldpages{postnote}}
+ and
+ test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+ and
+ (
+ not test {\iffieldundef{pages}}
+ or
+ not test {\iffieldundef{pagetotal}}
+ )
+ }
+ {\usebibmacro{cite:postnote:pages}}
+ {\usebibmacro{cite:postnote:ibidpage}}}
+ \providebibmacro*{cite:postnote:pages}{%
+ \setunit{\postnotedelim}%
+ \bibstring{thiscite}%
+ \setunit{\addspace}%
+ \printfield{postnote}}}
+
+\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
+ loccittracker=constrict,autocite=footnote,
+ citepages=permit}
+
\newbibmacro*{cite}{%
- \global\boolfalse{cbx:ibid}%
+ \usebibmacro{cite:citepages}%
+ \global\togglefalse{cbx:loccit}%
\ifciteseen
{\ifciteibid
{\ifloccit
@@ -28,6 +94,7 @@
{\usebibmacro{cite:full}}}
\newbibmacro*{cite:full}{%
+ \usebibmacro{cite:full:citepages}%
\printtext[bibhypertarget]{%
\usedriver
{\DeclareNameAlias{sortname}{default}}
@@ -36,25 +103,25 @@
\newbibmacro*{cite:short}{%
\printnames{labelname}%
- \setunit*{\addcomma\space}%
+ \setunit*{\nametitledelim}%
\printtext[bibhyperlink]{%
\printfield[citetitle]{labeltitle}}}
\newbibmacro*{cite:opcit}{%
\printnames{labelname}%
- \setunit*{\addcomma\space}%
+ \setunit*{\nametitledelim}%
\printtext[bibhyperlink]{%
\bibstring[\mkibid]{opcit}}}
\newbibmacro*{cite:ibid}{%
\printtext[bibhyperlink]{\bibstring[\mkibid]{ibidem}}%
- \global\booltrue{cbx:ibid}}
+ \global\toggletrue{cbx:loccit}}
\newbibmacro*{cite:shorthand}{%
\printtext[bibhyperlink]{\printfield{shorthand}}}
-\newbibmacro*{cite:postnote}{%
- \ifbool{cbx:ibid}
+\newbibmacro*{cite:postnote:ibidpage}{%
+ \iftoggle{cbx:loccit}
{}
{\usebibmacro{postnote}}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx
index ad4eb8527a9..f8c8a2e9b06 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx
@@ -1,18 +1,82 @@
-% $Id: verbose.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{verbose.cbx}
-[\abx@cbxid $Id: verbose.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
-
-\ExecuteBibliographyOptions{citetracker=context,autocite=footnote}
-\newcommand*{\cbx@resetcount}{0}
+[\abx@cbxid $Id: verbose.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
\InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}}
\DeclareFieldFormat{bibhyperlink}{%
\bibhyperlink{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}}
\DeclareFieldFormat{bibhypertarget}{%
\bibhypertarget{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}}
+\newcommand*{\cbx@resetcount}{0}
+\newbibmacro*{cite:citepages}{}
+\newbibmacro*{cite:full:citepages}{}
+\newbibmacro*{cite:postnote}{}
+
+\DeclareBibliographyOption{citepages}[permit]{%
+ \ifcsdef{cbx@opt@citepages@#1}
+ {\csuse{cbx@opt@citepages@#1}}
+ {\PackageError{biblatex}
+ {Invalid option 'citepages=#1'}
+ {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}}
+
+\def\cbx@opt@citepages@permit{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{}%
+ \renewbibmacro*{cite:postnote}{\usebibmacro{postnote}}}
+
+\def\cbx@opt@citepages@suppress{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \clearfield{pages}%
+ \clearfield{pagetotal}}%
+ \renewbibmacro*{cite:postnote}{\usebibmacro{postnote}}}
+
+\def\cbx@opt@citepages@omit{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \ifboolexpr{
+ test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+ and
+ test {\iffieldpages{postnote}}
+ }
+ {\clearfield{pages}%
+ \clearfield{pagetotal}}
+ {}}%
+ \renewbibmacro*{cite:postnote}{\usebibmacro{postnote}}}
+
+\def\cbx@opt@citepages@separate{%
+ \providetoggle{cbx:fullcite}%
+ \renewbibmacro*{cite:citepages}{%
+ \global\togglefalse{cbx:fullcite}}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \global\toggletrue{cbx:fullcite}}%
+ \renewbibmacro*{cite:postnote}{%
+ \ifboolexpr{
+ togl {cbx:fullcite}
+ and
+ test {\iffieldpages{postnote}}
+ and
+ test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+ and
+ (
+ not test {\iffieldundef{pages}}
+ or
+ not test {\iffieldundef{pagetotal}}
+ )
+ }
+ {\usebibmacro{cite:postnote:pages}}
+ {\usebibmacro{postnote}}}
+ \providebibmacro*{cite:postnote:pages}{%
+ \setunit{\postnotedelim}%
+ \bibstring{thiscite}%
+ \setunit{\addspace}%
+ \printfield{postnote}}}
+
+\ExecuteBibliographyOptions{citetracker=context,autocite=footnote,citepages=permit}
\newbibmacro*{cite}{%
+ \usebibmacro{cite:citepages}%
\ifciteseen
{\iffieldundef{shorthand}
{\usebibmacro{cite:short}}
@@ -20,6 +84,7 @@
{\usebibmacro{cite:full}}}
\newbibmacro*{cite:full}{%
+ \usebibmacro{cite:full:citepages}%
\printtext[bibhypertarget]{%
\usedriver
{\DeclareNameAlias{sortname}{default}}
@@ -28,7 +93,7 @@
\newbibmacro*{cite:short}{%
\printnames{labelname}%
- \setunit*{\addcomma\space}%
+ \setunit*{\nametitledelim}%
\printtext[bibhyperlink]{%
\printfield[citetitle]{labeltitle}}}
@@ -40,27 +105,27 @@
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
{\multicitedelim}
- {\usebibmacro{postnote}}
+ {\usebibmacro{cite:postnote}}
\DeclareCiteCommand{\parencite}[\mkbibparens]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
{\multicitedelim}
- {\usebibmacro{postnote}}
+ {\usebibmacro{cite:postnote}}
\DeclareCiteCommand{\footcite}[\mkbibfootnote]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
{\multicitedelim}
- {\usebibmacro{postnote}}
+ {\usebibmacro{cite:postnote}}
\DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext]
{\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
{\multicitedelim}
- {\usebibmacro{postnote}}
+ {\usebibmacro{cite:postnote}}
\endinput