summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/bibtex/bib/biblatex/biblatex-examples.bib3
-rw-r--r--Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst12
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/README8
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/RELEASE113
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/biblatex.pdfbin1337306 -> 775456 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/biblatex.tex162
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/01-introduction.pdfbin86826 -> 81706 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/02-annotations.pdfbin168534 -> 146738 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section.pdfbin56952 -> 50775 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section.pdfbin63865 -> 56936 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment.pdfbin63875 -> 56948 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword.pdfbin92019 -> 84115 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category.pdfbin91580 -> 83675 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type.pdfbin70956 -> 65347 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1.pdfbin117524 -> 102551 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2.pdfbin117515 -> 102542 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid.pdfbin71908 -> 66382 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-basic.pdfbin121313 -> 114236 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-advanced.pdfbin123072 -> 115686 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric.pdfbin85564 -> 75497 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp.pdfbin89912 -> 80564 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb.pdfbin86540 -> 77913 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic.pdfbin76684 -> 69311 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb.pdfbin71113 -> 65722 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.pdfbin161248 -> 139892 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.pdfbin99266 -> 92434 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.pdfbin85520 -> 79228 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.pdfbin109531 -> 101135 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle.pdfbin167156 -> 145089 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid.pdfbin106294 -> 98881 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp.pdfbin82815 -> 77102 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp.pdfbin111696 -> 103557 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse.pdfbin108114 -> 98572 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp.pdfbin84323 -> 78016 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp.pdfbin85878 -> 79349 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose.pdfbin136713 -> 126338 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid.pdfbin141466 -> 130400 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note.pdfbin138922 -> 128409 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote.pdfbin142594 -> 130800 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1.pdfbin168350 -> 158466 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2.pdfbin140533 -> 132488 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3.pdfbin138876 -> 130842 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading.pdfbin154469 -> 142794 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft.pdfbin87895 -> 81045 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug.pdfbin82236 -> 76672 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib3
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic-verb.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx17
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx42
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/verbose-ibid.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.def70
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.sty415
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/blx-compat.def4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/blx-natbib.def4
-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.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx4
-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.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/USenglish.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/american.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/portuges.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx4
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds9
132 files changed, 763 insertions, 419 deletions
diff --git a/Master/texmf-dist/bibtex/bib/biblatex/biblatex-examples.bib b/Master/texmf-dist/bibtex/bib/biblatex/biblatex-examples.bib
index 590e74e93ae..fbf41dd3650 100644
--- a/Master/texmf-dist/bibtex/bib/biblatex/biblatex-examples.bib
+++ b/Master/texmf-dist/bibtex/bib/biblatex/biblatex-examples.bib
@@ -212,8 +212,7 @@
volume = {93},
series = {newseries},
number = {1},
- date = {1991},
- month = {3},
+ date = {1991-03},
pages = {9--27},
annotation = {An \texttt{article} entry with \texttt{series}, \texttt{volume}, and
\texttt{number} fields. Note the format of the \texttt{series} which is a
diff --git a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
index aa746eb01d3..31574d0afd6 100644
--- a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
+++ b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
@@ -1,4 +1,4 @@
-% $Id: biblatex.bst,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: biblatex.bst,v 0.9e 2010/10/09 16:39:36 lehman beta $
% Copyright (c) 2006-2010 Philipp Lehman.
%
@@ -175,7 +175,7 @@ STRINGS { ctrl.alphaothers templist tempstrga tempstrgb resvstrga
last.name last.hash last.uniq last.year last.extra }
FUNCTION {initialize} {
- "$Revision: 0.9c $"
+ "$Revision: 0.9e $"
#12 entry.max$ substring$
#-3 entry.max$ substring$
"Biblatex version: " swap$ * top$
@@ -923,13 +923,13 @@ FUNCTION {sortkey:main:date} {
{ pop$
sortyear empty$
{ "9999" dateyear sortkey:main:date:year }
- { "9999" sortyear sortkey:main:date:year }
+ { sortyear normalize }
if$
}
{ #2 =
{ sortyear empty$
{ "0" dateyear sortkey:main:date:year }
- { "0" sortyear sortkey:main:date:year }
+ { sortyear normalize }
if$
str.to.int #9999 swap$ - int.to.str$
}
@@ -1746,7 +1746,7 @@ FUNCTION {input:control:options} {
FUNCTION {input:control:version} {
input:control:parse
- "$Revision: 0.9c $"
+ "$Revision: 0.9e $"
#12 entry.max$ substring$
#-3 entry.max$ substring$
'tempstrga :=
@@ -2662,7 +2662,7 @@ SORT
FUNCTION {output:main:begin} {
"% $ biblatex auxiliary file $" write$ newline$
- "% $ biblatex version " "$Revision: 0.9c $"
+ "% $ biblatex version " "$Revision: 0.9e $"
#12 entry.max$ substring$ #-3 entry.max$ substring$ * " $" * write$ newline$
"% Do not modify the above lines!" write$ newline$
"%" write$ newline$
diff --git a/Master/texmf-dist/doc/latex/biblatex/README b/Master/texmf-dist/doc/latex/biblatex/README
index 644dece7dbb..64da47c9764 100644
--- a/Master/texmf-dist/doc/latex/biblatex/README
+++ b/Master/texmf-dist/doc/latex/biblatex/README
@@ -1,4 +1,4 @@
-$Id: README,v 0.9d 2010/09/03 20:11:58 lehman beta $
+$Id: README,v 0.9e 2010/10/09 16:39:36 lehman beta $
ABOUT
@@ -164,12 +164,6 @@ Note that you may have to create some or all of the above
directories if this is the first package you're installing locally
(as opposed to via a package manager).
-POST-INSTALLATION
-
-When using bibtex8, you may need to set/adjust the environmental
-variables BIBTEX8_BSTINPUT, BIBTEX8_BIBINPUT, and BIBTEX8_CSFINPUT
-for biblatex8 to work properly.
-
ADDITIONAL RESOURCES
latin1.csf
diff --git a/Master/texmf-dist/doc/latex/biblatex/RELEASE b/Master/texmf-dist/doc/latex/biblatex/RELEASE
index 3862ed4772a..75462ea296c 100644
--- a/Master/texmf-dist/doc/latex/biblatex/RELEASE
+++ b/Master/texmf-dist/doc/latex/biblatex/RELEASE
@@ -1,4 +1,115 @@
-$Id: RELEASE,v 0.9d 2010/09/03 20:11:58 lehman beta $
+$Id: RELEASE,v 0.9e 2010/10/09 16:39:36 lehman beta $
+
+RELEASE NOTES FOR VERSION 0.9e
+
+* Biber update, options 'sortupper', 'sortlocale'
+
+ Biber has been updated to version 0.5.7. There are ready-to-run
+ binaries for the latest version. If you're using Biber, upgrade
+ to 0.5.7 or later when upgrading to biblatex 0.9e.
+
+ Biblatex now offers two package options which correspond to
+ Biber's command line options --sortupper and --sortlocale, the
+ point being that you can set them on a per-document basis. I've
+ also added some explanations concerning encodings and locale
+ settings. See the changelog for pointers.
+
+* Improved backrefs for @set entries, 'backrefsetstyle' option
+
+ I've revised and improved the handling of back references related
+ to entry sets. Biblatex is now capable of tracking the @set head
+ entry and the set members separately, if so desired.
+
+ The new package option 'backrefsetstyle' controls the tracking
+ mode. By way of example, consider a set ("set1") with three
+ members ("memA", "memB", "memC") and the following input:
+
+ on page 1: \cite{set1}
+ on page 2: \cite{memA}
+ on page 3: \cite{memB}
+ on page 4: \cite{memC}
+
+ With backrefsetstyle=setonly, this will generate the following back
+ references:
+
+ set1: 1, 2, 3, 4
+ memA: -
+ memB: -
+ memC: -
+
+ With backrefsetstyle=memonly:
+
+ set1: -
+ memA: 1, 2
+ memB: 1, 3
+ memC: 1, 4
+
+ With backrefsetstyle=setormem:
+
+ set1: 1
+ memA: 2
+ memB: 3
+ memC: 4
+
+ With backrefsetstyle=setandmem:
+
+ set1: 1, 2, 3, 4
+ memA: 2
+ memB: 3
+ memC: 4
+
+ With backrefsetstyle=memandset:
+
+ set1: 1
+ memA: 1, 2
+ memB: 1, 3
+ memC: 1, 4
+
+ With backrefsetstyle=setplusmem:
+
+ set1: 1, 2, 3, 4
+ memA: 1, 2
+ memB: 1, 3
+ memC: 1, 4
+
+ To take advantage of that in custom styles, only a minor update
+ is required. Supporting the @set entry and the set members
+ separately is pretty intuitive. Any \printlist command in the
+ @set entry will see the 'pageref' list of the @set entry; the
+ \printlist commands in the regular drivers (which handle the set
+ members) will see the 'pageref' list of the respective member:
+
+ \DeclareBibliographyDriver{set}{%
+ \entryset{}{}%
+ \newunit\newblock % <- NEWLY ADDED
+ \printlist{pageref}% <- NEWLY ADDED
+ \finentry}
+
+ \DeclareBibliographyDriver{<entry type>}{%
+ ...
+ \printlist{pageref}%
+ ...
+ }
+
+ There are some bibmacros as well as a new \bibpagerefpunct
+ separator to help with that, hence the actual code in the
+ standard styles works like this:
+
+ \DeclareBibliographyDriver{set}{%
+ \entryset{}{}%
+ \newunit\newblock % <- NEWLY ADDED
+ \usebibmacro{setpageref}% <- NEWLY ADDED
+ \finentry}
+
+ \DeclareBibliographyDriver{<entry type>}{%
+ ...
+ \setunit{\bibpagerefpunct}\newblock % <- MODIFIED
+ \usebibmacro{pageref}%
+ ...
+ }
+
+ That's all. This will ensure that all tracking modes are
+ supported.
RELEASE NOTES FOR VERSION 0.9d
diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
index 302f632a12c..625235b5e88 100644
--- a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
index 008aa423da0..bdc2dad4fe6 100644
--- a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
@@ -1,5 +1,5 @@
-% $Id: biblatex.tex,v 0.9d 2010/09/03 20:11:58 lehman beta $
-\documentclass{ltxdockit}[2010/02/12]
+% $Id: biblatex.tex,v 0.9e 2010/10/09 16:39:36 lehman beta $
+\documentclass{ltxdockit}[2010/09/26]
\usepackage{btxdockit}
\usepackage[latin9]{inputenc}
\usepackage[american]{babel}
@@ -11,7 +11,7 @@
\MakeAutoQuote*{<}{>}
\MakeShortVerb{\|}
-\rcsid{$Id: biblatex.tex,v 0.9d 2010/09/03 20:11:58 lehman beta $}
+\rcsid{$Id: biblatex.tex,v 0.9e 2010/10/09 16:39:36 lehman beta $}
\newcommand*{\BiblatexHome}{http://sourceforge.net/projects/biblatex/}
\newcommand*{\BiblatexOnCTAN}{http://www.ctan.org/tex-archive/macros/latex/exptl/biblatex/}
@@ -229,7 +229,7 @@ The \sty{natbib} package supports numeric and author"=year citation schemes, inc
The \sty{splitbib} package provides support for bibliographies subdivided by topic. See \sty{bibtopic}.
\item[ucs]
-The \sty{ucs} package provides support for \acr{utf-8} encoded input. Either use \sty{inputenc}'s standard \file{utf8} module or a Unicode enabled engine such as \xelatex instead.
+The \sty{ucs} package provides support for \acr{UTF-8} encoded input. Either use \sty{inputenc}'s standard \file{utf8} module or a Unicode enabled engine such as \xelatex instead.
\end{marglist}
@@ -1416,9 +1416,10 @@ This section provides some additional hints concerning the \bibtex interface of
\bibtex's \bibfield{crossref} field provides a handy cross-referencing mechanism which inherits data missing in a child entry from the corresponding parent entry indicated by the value of the \bibfield{crossref} field. Unfortunately, this mechanism is static and uses a one-on-one field mapping. This reduces its usefulness significantly because it will cause problems in quite a few cases. For example, the \bibfield{subtitle} of a cross-referenced \bibtype{collection} entry may end up in the \bibfield{subtitle} field, rather than in the \bibfield{booksubtitle} field, of the corresponding \bibtype{incollection} child entry. It is possible to work around this problem by including an empty \bibfield{subtitle} in the child entry. This package also provides an alternative cross-referencing mechanism. The \bibfield{xref} field differs from \bibfield{crossref} in that the child entry will not inherit \emph{any} data from the parent entry specified in the \bibfield{xref} field. This implies that child entries must include all bibliographic data. The \bibfield{xref} field is merely a pointer which may be used by bibliography styles which format child entries in a special way (see \secref{aut:cav:mif} for an example). If the parent entry is referenced by a certain number of child entries, \sty{biblatex} will automatically execute the equivalent of a \cmd{nocite} command to request it from \bibtex. The threshold is controlled by the \opt{mincrossrefs} package option from \secref{use:opt:pre}. Style authors should note that whether or not the \bibfield{xref} fields of the child entries are defined on the \sty{biblatex} level depends on the availability of the parent entry. If the parent entry is available, the \bibfield{xref} fields of the child entries will be defined. If not, their \bibfield{xref} fields will be undefined. Whether the parent entry is added to the bibliography implicitly because of the threshold or because it has been cited explicitly in the document does not matter.
-\subsubsection{\bibtex Capacity Issues}
+\subsubsection{Capacity Issues}
\label{bib:cav:btx}
+\paragraph{\bibtex}
A venerable tool originally developed in the 1980s, \bibtex uses static memory allocation, much to the dismay of users working with large bibliographical databases. With a large \file{bib} file which contains several hundred entries, \bibtex is very likely to run out of memory. The number of entries it can cope with depends on the number of fields defined by the \bibtex style (\file{bst}). Style files which define a considerable number of fields, such as \path{biblatex.bst}, are more likely to trigger such problems. Unfortunately, traditional \bibtex does not output a clear error message when it runs out of memory but exposes a rather cryptical kind of faulty behavior. The warning messages printed in this case look like this:
\begin{lstlisting}[style=plain]{}
@@ -1428,7 +1429,10 @@ Warning--I'm ignoring Jones1995's extra "volume" field
--line 423 of file huge.bib
\end{lstlisting}
%
-These warning messages could indeed indicate that the entry \texttt{Jones1995} is faulty because it includes two \bibfield{year} and two \bibfield{volume} fields. If that is not the case and the \file{bib} file is fairly large, this is most likely a capacity issue. What makes these warnings so confusing is that they are not tied to a specific entry. If you remove the allegedly faulty entry, a different one will trigger similar warnings. This is one reason why switching to \file{bibtex8}, the 8-bit implementation of \bibtex, is advisable. Alas, \file{bibtex8} is a venerable tool as well and will also run out of memory with its default capacity. Switching from traditional \bibtex to \file{bibtex8} is still an improvement because the capacity of the latter may be increased at run"=time via command"=line switches and it also prints unambiguous error messages, for example:
+These warning messages could indeed indicate that the entry \texttt{Jones1995} is faulty because it includes two \bibfield{year} and two \bibfield{volume} fields. If that is not the case and the \file{bib} file is fairly large, this is most likely a capacity issue. What makes these warnings so confusing is that they are not tied to a specific entry. If you remove the allegedly faulty entry, a different one will trigger similar warnings. This is one reason why switching to \file{bibtex8} or Biber is advisable.
+
+\paragraph{\file{bibtex8}}
+\file{bibtex8} is a venerable tool as well and will also run out of memory with its default capacity. Switching from traditional \bibtex to \file{bibtex8} is still an improvement because the capacity of the latter may be increased at run"=time via command"=line switches and it also prints unambiguous error messages, for example:
\begin{table}
\numtablesetup
@@ -1471,11 +1475,16 @@ bibtex8 --wolfgang --mcites 30000 --mentints 30000 --mentstrs 40000
auxfile
\end{lstlisting}
%
-When taking a closer look at \tabref{bib:cav:tab1}, you will notice that there are two parameters which can not be modified directly, |hash_prime| and |hash_size|. Increasing these values is only possible with the high"=level switches. That is why the above command includes the |--wolfgang| switch in addition to the low"=level switches. This situation is very unfortunate because the hash size effectively sets a cap on some other parameters. For example, |max_strings| can not be greater than |hash_size|. If you hit this cap, all you can do is recompile \file{bibtex8} with a larger capacity. Also note that the |wiz_fn_space| parameter is not related to the \file{bib} file but to the memory requirements of the \file{bst} file. \file{biblatex.bst} needs a value of about 6000. The value 10000 implicitly used by the |--wolfgang| switch is fine. Note that Biber, the next"=generation database backend of \sty{biblatex}, eliminates all of the above limitations.
+When taking a closer look at \tabref{bib:cav:tab1}, you will notice that there are two parameters which can not be modified directly, |hash_prime| and |hash_size|. Increasing these values is only possible with the high"=level switches. That is why the above command includes the |--wolfgang| switch in addition to the low"=level switches. This situation is very unfortunate because the hash size effectively sets a cap on some other parameters. For example, |max_strings| can not be greater than |hash_size|. If you hit this cap, all you can do is recompile \file{bibtex8} with a larger capacity. Also note that the |wiz_fn_space| parameter is not related to the \file{bib} file but to the memory requirements of the \file{bst} file. \file{biblatex.bst} needs a value of about 6000. The value 10000 implicitly used by the |--wolfgang| switch is fine.
+
+\paragraph{Biber}
+Biber eliminates all of the above limitations.
-\subsubsection{\bibtex Sorting and Encoding Issues}
+\subsubsection{Sorting and Encoding Issues}
\label{bib:cav:enc}
+\paragraph{\bibtex}
+\label{bib:cav:enc:btx}
Traditional \bibtex can only alphabetize Ascii characters correctly. If the bibliographic data includes non"=Ascii characters, they have to be given in Ascii notation. For example, instead of typing a letter like <ä> directly, you need to input it as |\"a|, using an accent command and the Ascii letter. This Ascii notation needs to be wrapped in a pair of curly braces. Traditional \bibtex will then ignore the accent and use the Ascii letter for sorting. Here are a few examples:
\begin{lstlisting}[style=bibtex,upquote]{}
@@ -1485,9 +1494,11 @@ translator = {Ferdi<<{\`e}>>re, Fr<<{\c{c}}>>ois},
title = {<<{\OE}>>uvres compl<<{\`e}>>tes},
\end{lstlisting}
%
-Apart from it being inconvenient, there are two major issues with this convention. One subtle problem is that the extra set of braces suppresses the kerning on both sides of all non"=Ascii letters. But first and foremost, simply ignoring all accents may not be the correct way to handle them. For example, in Danish, the letter <å> is the very last letter of the alphabet, so it should be alphabetized after <z>. \bibtex will sort it like an <a>. The <æ> ligature and the letter <ø> are also sorted after <z> in this language. There are similar cases in Norwegian. In Swedish, the letter <ö> is the very last letter of the alphabet and the letters <å> and <ä> are also alphabetized after <z>, rather than like an <a>. What's more, even the sorting of Ascii characters is done in a rather peculiar way by traditional \bibtex because the sorting algorithm uses Ascii codepage order (\texttt{0-9,A-Z,a-z}). This implies that the lowercase letter <a> would end up after the uppercase <Z>, which is not even acceptable in the language \bibtex was originally designed for. The traditional \file{bst} files work around this problem by converting all strings used for sorting to lowercase, \ie sorting is effectively case"=insensitive.
+Apart from it being inconvenient, there are two major issues with this convention. One subtle problem is that the extra set of braces suppresses the kerning on both sides of all non"=Ascii letters. But first and foremost, simply ignoring all accents may not be the correct way to handle them. For example, in Danish, the letter <å> is the very last letter of the alphabet, so it should be alphabetized after <z>. \bibtex will sort it like an <a>. The <æ> ligature and the letter <ø> are also sorted after <z> in this language. There are similar cases in Norwegian. In Swedish, the letter <ö> is the very last letter of the alphabet and the letters <å> and <ä> are also alphabetized after <z>, rather than like an <a>. What's more, even the sorting of Ascii characters is done in a rather peculiar way by traditional \bibtex because the sorting algorithm uses Ascii codepage order (\texttt{0-9,A-Z,a-z}). This implies that the lowercase letter <a> would end up after the uppercase <Z>, which is not even acceptable in the language \bibtex was originally designed for. The traditional \file{bst} files work around this problem by converting all strings used for sorting to lowercase, \ie sorting is effectively case"=insensitive. See also \secref{bib:cav:enc:enc}.
-These are the major reasons why switching to \file{bibtex8}, the 8-bit implementation of \bibtex, is advisable. \file{bibtex8} can sort in a case"=sensitive way and it can handle (single byte) non"=Ascii characters properly, provided that you supply it with a suitable \file{csf} file and give the |--csfile| switch on the command line. This also implies that it is possible to apply language specific sorting rules to the bibliography. The \sty{biblatex} package comes with \file{csf} files for some common Western European encodings. \bin{bibtex8} also ships with a few \file{csf} files. Note that \file{biblatex.bst} can not detect if it is running under traditional \bibtex or \file{bibtex8}, hence the \opt{bibtex8} package option. By default, sorting is case-insensitive since this is required for traditional \bibtex. If the \opt{bibtex8} package option is enabled, sorting is case-sensitive.
+\paragraph{\file{bibtex8}}
+\label{bib:cav:enc:bt8}
+Switching to \file{bibtex8} will help in such cases. \file{bibtex8} can sort in a case"=sensitive way and it can handle 8-bit characters properly, provided that you supply it with a suitable \file{csf} file and give the |--csfile| switch on the command line. This also implies that it is possible to apply language specific sorting rules to the bibliography. The \sty{biblatex} package comes with \file{csf} files for some common Western European encodings. \bin{bibtex8} also ships with a few \file{csf} files. Note that \file{biblatex.bst} can not detect if it is running under traditional \bibtex or \file{bibtex8}, hence the \opt{bibtex8} package option. By default, sorting is case-insensitive since this is required for traditional \bibtex. If the \opt{bibtex8} package option is enabled, sorting is case-sensitive.
Since \file{bibtex8} is backwards compatible with traditional \bibtex, it is possible to mix 8-bit input and Ascii notation. This is useful if the encoding used in the \file{bib} file does not cover all required characters. There are also a few marginal cases in which the Ascii notation scheme would yield better sorting results. A typical example is the ligature <½>. \file{bibtex8} will handle this ligature like a single character. Depending on the sorting scheme defined in the \file{csf} file, it could be treated like an <o> or alphabetized after the letter <o> but it can not be sorted as <oe>. The Ascii notation (|\oe|) is equivalent to <oe> during sorting:
@@ -1509,55 +1520,102 @@ author = {Ba<<ß>>mann, Paul},
sortname = {Ba<<sszz>>mann, Paul},
\end{lstlisting}
%
-Not only \bibtex, \tex needs to know about the encoding as well. When using non"=Ascii characters in a \file{bib} file, load the \sty{inputenc} package and specify the encoding as usual. The \sty{biblatex} package is also capable of handling conflicting encodings in \file{tex} and \file{bib} files, provided that you specify the encoding of the \file{bib} file with the \opt{bibencoding} package option. Here are a few typical cases along with the relevant lines from the document preamble:
+Not only \bibtex, \tex needs to know about the encoding as well. When using non"=Ascii characters in a \file{bib} file, load the \sty{inputenc} package and specify the encoding as usual. The \sty{biblatex} package is also capable of handling conflicting encodings in \file{tex} and \file{bib} files, provided that you specify the encoding of the \file{bib} file with the \opt{bibencoding} package option. See \secref{bib:cav:enc:enc} for details.
+
+\paragraph{Biber}
+Biber can handle Ascii notation, 8-bit encodings such as Latin\,1, and \acr{UTF-8}. It features true Unicode support and is capable of reencoding the \file{bib} data on the fly in a robust way. For sorting, Biber uses a Perl implementation of the Unicode Collation Algorithm (\acr{UCA}), as outlined in Unicode Technical Standard \#10.\fnurl{http://unicode.org/reports/tr10/} Collation tailoring based on the Unicode Common Locale Data Repository (\acr{CLDR}) is in the process of being added.\fnurl{http://cldr.unicode.org/} The bottom line is that Biber will deliver sorting results superior to both \bibtex and \file{bibtex8} in many cases. If you are interested in the technical details, section 1.8 of Unicode Technical Standard \#10 will provide you with a very concise summary of why the inadequateness of traditional \bibtex and even \bin{bibtex8} in a contemporary text processing environment is of a very general nature and not limited to the lack of \utf support.\fnurl{http://unicode.org/reports/tr10/#Common_Misperceptions}
+
+Implementing Unicode includes much more than handling \utf input. Unicode is a very complex standard covering more than its most well known part, the Unicode character encoding and transport encodings such as \utf. It also covers aspects such as string collation which are required for language-sensitive sorting. For example, by using the Unicode Collation Algorithm, Biber can handle the character <ß> mentioned as an example in \secref{bib:cav:enc:bt8} without any manual intervention. All you need to do to get localized sorting is specify the locale:
+
+\begin{lstlisting}[style=latex]{}
+\usepackage[backend=biber,sortlocale=de_DE]{biblatex}
+\end{lstlisting}
+%
+If the language of the document corresponds to the main locale of the operating system, \opt{sortlocale} is
+omissible as Biber will detect the locale settings of the environment automatically. Note that this will also work with 8-bit encodings such as Latin\,9, \ie you can take advantage of Unicode-based sorting even though you are not using \utf input. See \secref{bib:cav:enc:enc} on how to specify input and data encodings properly.
+
+\paragraph{Specifying Encodings}
+\label{bib:cav:enc:enc}
+When using a non-Ascii encoding in the \file{bib} file, it is important to understand what \sty{biblatex} can do for you and what may require manual intervention. The package takes care of the \latex side, \ie it ensures that the data imported from the \file{bbl} file is interpreted correctly, provided that the \opt{bibencoding} package option is set properly. Depending on the backend, the \bibtex side may demand attention, too. When using \bin{bibtex8}, you need to supply \bin{bibtex8} with a matching \file{csf} file as it needs to know about the encoding of the \file{bib} file to be able to alphabetize the entries correctly. Unfortunately, there is no way for \sty{biblatex} to pass this information to \bin{bibtex8} automatically. The only way is setting the |--csfile| switch on the command line when executing \bin{bibtex8}. When using Biber, this happends automatically and no further steps, apart from setting the \opt{bibencoding} option, are required.
+
+Here are a few typical usage scenarios along with the relevant lines from the document preamble:
\begin{itemize}
\setlength{\itemsep}{0pt}
-\item Ascii notation in both the \file{tex} and the \file{bib} file:
+\item Ascii notation in both the \file{tex} and the \file{bib} file (this will work with \bibtex, \file{bibtex8}, and Biber):
\begin{lstlisting}[style=latex]{}
\usepackage{biblatex}
\end{lstlisting}
-\item Latin\,1 encoding (\acr{ISO}-8859-1) in the \file{tex} file, Ascii notation in the \file{bib} file:
+\item Latin\,1 encoding (\acr{ISO}-8859-1) in the \file{tex} file, Ascii notation in the \file{bib} file (\bibtex, \file{bibtex8}, Biber):
\begin{lstlisting}[style=latex]{}
\usepackage[latin1]{inputenc}
\usepackage{biblatex}
\end{lstlisting}
-\item Latin\,9 encoding (\acr{ISO}-8859-15) in both the \file{tex} and the \file{bib} file:
+\item Latin\,9 encoding (\acr{ISO}-8859-15) in both the \file{tex} and the \file{bib} file (\file{bibtex8}, Biber):
\begin{lstlisting}[style=latex]{}
\usepackage[latin9]{inputenc}
-\usepackage[bibencoding=inputenc,backend=bibtex8]{biblatex}
+\usepackage[bibencoding=inputenc]{biblatex}
\end{lstlisting}
-\item \acr{utf-8} encoding in the \file{tex} file, Latin\,1 (\acr{ISO}-8859-1) in the \file{bib} file:
+\item \acr{UTF-8} encoding in the \file{tex} file, Latin\,1 (\acr{ISO}-8859-1) in the \file{bib} file (\file{bibtex8}, Biber):
\begin{lstlisting}[style=latex]{}
\usepackage[utf8]{inputenc}
-\usepackage[bibencoding=latin1,backend=bibtex8]{biblatex}
+\usepackage[bibencoding=latin1]{biblatex}
\end{lstlisting}
-\item Using \acr{utf-8} encoding in both the \file{tex} and the \file{bib} file is not possible with traditional \bibtex or \bin{bibtex8} since neither of them is capable of handling multi"=byte encodings such as \acr{utf-8}. In this case, you need to use a single"=byte encoding such as Latin 1 (see above) or resort to Ascii notation in the \file{bib} file:
+\item Same scenario with Xe\tex or Lua\tex in native \acr{UTF-8} mode:
+
+\begin{lstlisting}[style=latex]{}
+\usepackage[bibencoding=latin1]{biblatex}
+\end{lstlisting}
+
+\item Using \acr{UTF-8} encoding in both the \file{tex} and the \file{bib} file is not possible with traditional \bibtex or \bin{bibtex8} since neither of them is capable of handling \acr{UTF-8}. Unless you switch to Biber, you need to use an 8-bit encoding such as Latin\,1 (see above) or resort to Ascii notation in this case:
\begin{lstlisting}[style=latex]{}
\usepackage[utf8]{inputenc}
\usepackage{biblatex}
\end{lstlisting}
-\item When using Biber as the database backend, it is possible to have a transparent \acr{utf-8} workflow, \ie to use \acr{utf-8} encoding in both the \file{tex} and the \file{bib} file:
+\item Same scenario with Xe\tex or Lua\tex in native \acr{UTF-8} mode:
\begin{lstlisting}[style=latex]{}
-\usepackage[utf8]{inputenc}
-\usepackage[backend=biber]{biblatex}
+\usepackage{biblatex}
\end{lstlisting}
\end{itemize}
-When using a non"=Ascii encoding in the \file{bib} file, it is important to understand what \sty{biblatex} can do for you and what requires manual intervention. The package takes care of the \latex side, \ie it ensures that the bibliographic data is interpreted correctly as it is imported from the \file{bbl} file, provided that the \opt{bibencoding} package option is set properly and the \sty{inputenc} package is available. However, the \bibtex side demands attention, too. As mentioned above, you have to use \bin{bibtex8} and you need to supply it with a matching \file{csf} file. \bibtex needs to know about the encoding of the \file{bib} file to be able to alphabetize the entries correctly. Unfortunately, there is no way for \sty{biblatex} to pass this information to \bin{bibtex8} automatically. The only way is setting the |--csfile| switch on the command line when executing \bin{bibtex8}. When using Biber, see the Biber manual for instructions.
+Biber can handle Ascii notation, 8-bit encodings such as Latin\,1, and \acr{UTF-8}. It is also capable of reencoding the \file{bib} data on the fly (replacing the somewhat less robust macro-level reencoding routine of \sty{biblatex}). This will happen automatically if required, provided that you specify the encoding of the \file{bib} files properly. In addition to the scenarios discussed above, Biber can also handle the following cases:
+
+\begin{itemize}
+
+\item Transparent \acr{UTF-8} workflow, \ie \acr{UTF-8} encoding in both the \file{tex} and the \file{bib} file:
+
+\begin{lstlisting}[style=latex]{}
+\usepackage[utf8]{inputenc}
+\usepackage[bibencoding=inputenc]{biblatex}
+\end{lstlisting}
+
+\item Same scenario with Xe\tex or Lua\tex in native \acr{UTF-8} mode:
+
+\begin{lstlisting}[style=latex]{}
+\usepackage[bibencoding=inputenc]{biblatex}
+\end{lstlisting}
+
+\item It is even possible to combine an 8-bit-encoded \file{tex} file with \acr{UTF-8} encoding in the \file{bib} file, provided that all characters in the \file{bib} file are also available in the selected 8-bit encoding:
+
+\begin{lstlisting}[style=latex]{}
+\usepackage[latin1]{inputenc}
+\usepackage[bibencoding=utf8]{biblatex}
+\end{lstlisting}
+
+\end{itemize}
\subsubsection{Editors and Compiler Scripts}
\label{bib:cav:ide}
@@ -1631,6 +1689,15 @@ Please refer to \secref{use:srt} for an in"=depth explanation of the above sorti
Whether to sort the bibliography and the list of shorthands in a case"=sensitive way. Note that case"=sensitive sorting is only supported by the \bin{bibtex8} and Biber backends. Sorting is always case"=insensitive with legacy \bibtex. See the \opt{backend} option for details.
+\boolitem[true]{sortupper}
+
+This option is specific to Biber and corresponds to Biber's |--sortupper| command-line option. It has no effect with any other backend. If enabled, the bibliography is sorted in <uppercase before lowercase> order. Disabling this option means <lowercase before uppercase> order.
+
+\optitem{sortlocale}{\prm{locale}}
+
+This option is specific to Biber and corresponds to Biber's |--sortlocale| command-line option.
+It has no effect with any other backend. If set, it specifies the locale to be used for sorting. Note that, while \sty{biblatex} provides no default value for this option, Biber will inherit the locale settings from the environment if no locale has been specified explicitly.
+
\optitem[los]{sortlos}{\opt{bib}, \opt{los}}
The sorting order of the list of shorthands. The following choices are available:
@@ -1791,6 +1858,25 @@ This option controls how sequences of consecutive pages in the list of back refe
All styles support both Arabic and Roman numerals. In order to avoid potentially ambiguous lists, different sets of numerals will not be mixed when generating ranges, \eg the list <iii, iv, v, 6, 7, 8> is compressed to <iii--v, 6--8>.
+\optitem[setonly]{backrefsetstyle}{\opt{setonly}, \opt{memonly}, \opt{setormem}, \opt{setandmem}, \opt{memandset}, \opt{setplusmem}}
+
+This option controls how back references to \bibtype{set} entires and their members are handled. The following options are available:
+
+\begin{valuelist}
+\item[setonly] All back references are added to the \bibtype{set} entry. The \bibfield{pageref} lists of set members remain blank.
+
+\item[memonly] References to set members are added to the respective member. References to the \bibtype{set} entry are added to all members. The \bibfield{pageref} list of the \bibtype{set} entry remains blank.
+
+\item[setormem] References to the \bibtype{set} entry are added to the \bibtype{set} entry. References to set members are added to the respective member.
+
+\item[setandmem] References to the \bibtype{set} entry are added to the \bibtype{set} entry. References to set members are added to the respective member and to the \bibtype{set} entry.
+
+\item[memandset] References to the \bibtype{set} entry are added to the \bibtype{set} entry and to all members. References to set members are added to the respective member.
+
+\item[setplusmem] References to the \bibtype{set} entry are added to the \bibtype{set} entry and to all members. References to set members are added to the respective member and to the \bibtype{set} entry.
+
+\end{valuelist}
+
\optitem[false]{indexing}{\opt{true}, \opt{false}, \opt{cite}, \opt{bib}}
This option controls indexing in citations and in the bibliography. More precisely, it affects the \cmd{ifciteindex} and \cmd{ifbibindex} commands from \secref{aut:aux:tst}. The possible choices are:
@@ -3269,6 +3355,10 @@ The separator between the word «in» and the following title in entry types such
The separator printed before the \bibfield{pages} field. The default is a comma plus an interword space.
+\csitem{bibpagerefpunct}
+
+The separator printed before the \bibfield{pageref} field. The default is an interword space.
+
\csitem{multinamedelim}
The delimiter printed between multiple items in a name list like \bibfield{author} or \bibfield{editor} if there are more than two names in the list. The default is a comma plus an interword space. See \cmd{finalnamedelim} for an example.\footnote{Note that \cmd{multinamedelim} is not used at all if there are only two names in the list. In this case, the default styles use the \cmd{finalnamedelim}.}
@@ -5536,11 +5626,15 @@ This command is similar to \cmd{PackageWarning} but prints the entry key of the
\boolitem{pagetracker}
-These commands activate or deactivate the citation tracker locally (this will affect the \cmd{iffirstonpage} and \cmd{ifsamepage} test from \secref{aut:aux:tst}). They are intended for use in the definition of citation commands. If a citation command is to be excluded from page tracking, use \cmd{pagetrackerfalse} in the \prm{precode} argument of \cmd{DeclareCiteCommand}. See \secref{aut:cbx:cbx} for details. Note that these commands have no effect if page tracking has been disabled globally.
+These commands activate or deactivate the citation tracker locally (this will affect the \cmd{iffirstonpage} and \cmd{ifsamepage} test from \secref{aut:aux:tst}). They are intended for use in the definition of citation commands or anywhere in the document body. If a citation command is to be excluded from page tracking, use \cmd{pagetrackerfalse} in the \prm{precode} argument of \cmd{DeclareCiteCommand}. See \secref{aut:cbx:cbx} for details. Note that these commands have no effect if page tracking has been disabled globally.
\boolitem{citetracker}
-These commands activate or deactivate all citation trackers locally (this will affect the \cmd{ifciteseen}, \cmd{ifentryseen}, \cmd{ifciteibid}, and \cmd{ifciteidem} tests from \secref{aut:aux:tst}). They are intended for use in the definition of citation commands. If a citation command is to be excluded from tracking, use \cmd{citetrackerfalse} in the \prm{precode} argument of \cmd{DeclareCiteCommand}. See \secref{aut:cbx:cbx} for details. Note that these commands have no effect if tracking has been disabled globally.
+These commands activate or deactivate all citation trackers locally (this will affect the \cmd{ifciteseen}, \cmd{ifentryseen}, \cmd{ifciteibid}, and \cmd{ifciteidem} tests from \secref{aut:aux:tst}). They are intended for use in the definition of citation commands or anywhere in the document body. If a citation command is to be excluded from tracking, use \cmd{citetrackerfalse} in the \prm{precode} argument of \cmd{DeclareCiteCommand}. See \secref{aut:cbx:cbx} for details. Note that these commands have no effect if tracking has been disabled globally.
+
+\boolitem{backtracker}
+
+These commands activate or deactivate the \texttt{backref} tracker locally. They are intended for use in the definition of citation commands or anywhere in the document body. If a citation command is to be excluded from backtracking, use \cmd{backtrackerfalse} in the \prm{precode} argument of \cmd{DeclareCiteCommand}. Note that these commands have no effect if the \texttt{backref} option has been not been set globally.
\end{ltxsyntax}
@@ -6501,6 +6595,10 @@ The separator to be printed between the word «in» and the following title in ent
The separator to be printed before the \bibfield{pages} field. Use this separator instead of \cmd{newunitpunct} at this location. The default is a comma plus an interword space.
+\csitem{bibpagerefpunct}
+
+The separator to be printed before the \bibfield{pageref} field. Use this separator instead of \cmd{newunitpunct} at this location. The default is an interword space.
+
\csitem{multinamedelim}
The delimiter to be printed between multiple items in a name list like \bibfield{author} or \bibfield{editor} if there are more than two names in the list. If there are only two names in the list, use the \cmd{finalnamedelim} instead. This command should be incorporated in all formatting directives for name lists.
@@ -7030,10 +7128,10 @@ The \bibfield{entrysetcount} field holds an integer indicating the position of a
%
Since this field is only defined when processing citations referring to a set member, there is no need to add any additional tests.
-\subsubsection{Citation/Page Trackers in Floats and \acr{TOC}/\acr{LOT}/\acr{LOF}}
+\subsubsection{Trackers in Floats and \acr{TOC}/\acr{LOT}/\acr{LOF}}
\label{aut:cav:flt}
-If a citation is given in a float (typically in the caption of a figure or table), scholarly back references like <ibidem> or back references based on the page tracker may get ambiguous because floats are objects which are (physically and logically) placed outside the flow of text, hence the logic of such back references applies poorly to them. To avoid any such ambiguities, the citation trackers are temporarily disabled in all floats. This is equivalent to setting \cmd{citetrackerfalse} locally and affects all of the following tests from \secref{aut:aux:tst}: \cmd{ifciteseen}, \cmd{ifentryseen}, \cmd{ifciteibid}, \cmd{ifciteidem}, \cmd{ifopcit}, and \cmd{ifloccit}. The page tracker is disabled as well. This is equivalent to setting \cmd{pagetrackerfalse} locally and affects the \cmd{ifsamepage} and \cmd{iffirstonpage} tests. The trackers are also disabled in the table of contents, the list of figures, and the list of tables for similar reasons.
+If a citation is given in a float (typically in the caption of a figure or table), scholarly back references like <ibidem> or back references based on the page tracker get ambiguous because floats are objects which are (physically and logically) placed outside the flow of text, hence the logic of such references applies poorly to them. To avoid any such ambiguities, the citation and page trackers are temporarily disabled in all floats. In addition to that, these trackers plus the back reference tracker (\opt{backref}) are temporarily disabled in the table of contents, the list of figures, and the list of tables.
\subsubsection{Using the Punctuation Tracker}
\label{aut:cav:pct}
@@ -7359,6 +7457,18 @@ This revision history is a list of changes relevant to users of this package. Ch
\begin{changelog}
+\begin{release}{0.9e}{2010-10-09}
+\item Updated and expanded manual\see{bib:cav:enc}
+\item Added option \opt{sortupper}\see{use:opt:pre}
+\item Added option \opt{sortlocale}\see{use:opt:pre}
+\item Added option \opt{backrefsetstyle}\see{use:opt:pre}
+\item Added \cmd{bibpagerefpunct}\see{use:fmt:fmt}
+\item Added \cmd{backtrackertrue} and \cmd{backtrackerfalse}\see{aut:aux:msc}
+\item Disable back reference tracking in \acr{TOC}/\acr{LOT}/\acr{LOF}\see{aut:cav:flt}
+\item Improved back reference tracking for \bibtype{set} entries
+\item Fixed some bugs
+\end{release}
+
\begin{release}{0.9d}{2010-09-03}
\item Added workaround for \sty{hyperref} space factor issue
\item Added workaround for \sty{xkeyval}'s flawed class option inheritance
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/01-introduction.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/01-introduction.pdf
index dda31027d49..58590f68fc8 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/01-introduction.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/01-introduction.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations.pdf
index f87deccb833..84058c9692f 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section.pdf
index 65f49857bd4..dca42a98ede 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section.pdf
index 8015a2d4b37..3c9328050c3 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment.pdf
index 5549b0695f6..b693a76bc91 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword.pdf
index 347ba84c508..b98b83a0046 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category.pdf
index 1e900c8b5d3..d0771718f79 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type.pdf
index 01218cff3d8..56799daed5b 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1.pdf
index b5cf08f4275..ebc6f7ffc03 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2.pdf
index c24b4a2f2a9..7072baffeee 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid.pdf
index 091be2d182c..74d3f2c4744 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-basic.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-basic.pdf
index 4d993e8a1fc..982ac799fb0 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-basic.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-basic.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-advanced.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-advanced.pdf
index bb2f41ebdf3..9b574dd0875 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-advanced.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-advanced.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric.pdf
index 88265f60bd4..69c196eef75 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp.pdf
index 8a3a22775f1..87c3c03eb62 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb.pdf
index 110eee6b75c..cf296de7d36 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic.pdf
index 3e3a4766290..7c73768afff 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb.pdf
index b99c496a202..575648c318e 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.pdf
index 1d64fc49f1e..eb518d8c128 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.pdf
index a8145fc5963..6e6f17c3cad 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.pdf
index 614868470c3..7c295fbfa4b 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.pdf
index c34ee2e831e..0d0a97a5d1c 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle.pdf
index 8e0cb7cde9c..9c4a06b9240 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid.pdf
index 5cc55ab2a06..84ae3781ebc 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp.pdf
index fc287c2e914..c1407295f22 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp.pdf
index f4a84190f9d..9fe12e23341 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse.pdf
index 97fd1f8fb12..141255db283 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp.pdf
index 570b4396ab3..702f99e000d 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp.pdf
index e74ed0c550e..369eccca2a2 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose.pdf
index 9f94d8bbcf3..d9920f0b8bb 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid.pdf
index b226f90ee5c..ece5d427da7 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note.pdf
index a20ddf438f4..2adee2d5a6b 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote.pdf
index f429bf8ed7c..d625828c4d2 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1.pdf
index 700dd4a2033..ab500a9caf4 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2.pdf
index ddd5505ed48..5e7d2fb29a0 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3.pdf
index ae4703c2460..859fcbbbedb 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading.pdf
index 7eb2685521f..11731bd418e 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft.pdf
index 485023583f4..21ce34779cb 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug.pdf
index 01709d113fa..f5529c915b5 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib b/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib
index 590e74e93ae..fbf41dd3650 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib
@@ -212,8 +212,7 @@
volume = {93},
series = {newseries},
number = {1},
- date = {1991},
- month = {3},
+ date = {1991-03},
pages = {9--27},
annotation = {An \texttt{article} entry with \texttt{series}, \texttt{volume}, and
\texttt{number} fields. Note the format of the \texttt{series} which is a
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic-verb.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic-verb.bbx
index 3b9232a2d39..828f692f8d8 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic-verb.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic-verb.bbx
@@ -1,7 +1,7 @@
-% $Id: alphabetic-verb.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: alphabetic-verb.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{alphabetic-verb.bbx}
-[\abx@bbxid $Id: alphabetic-verb.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: alphabetic-verb.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{alphabetic}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx
index 73c25c368fc..175a4db93b1 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx
@@ -1,7 +1,7 @@
-% $Id: alphabetic.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: alphabetic.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{alphabetic.bbx}
-[\abx@bbxid $Id: alphabetic.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: alphabetic.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{standard}
\ExecuteBibliographyOptions{labelalpha,sorting=anyt}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx
index 3d8bbe68dd4..0527747b3f4 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-comp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle-comp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle-comp.bbx}
-[\abx@bbxid $Id: authortitle-comp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: authortitle-comp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx
index bae7a30891d..3c3b0083ead 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-ibid.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle-ibid.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle-ibid.bbx}
-[\abx@bbxid $Id: authortitle-ibid.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: authortitle-ibid.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx
index 22d48fa135f..34b61f56aaf 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-icomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle-icomp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle-icomp.bbx}
-[\abx@bbxid $Id: authortitle-icomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: authortitle-icomp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx
index 21dca612f13..01a2532408d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-tcomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle-tcomp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle-tcomp.bbx}
-[\abx@bbxid $Id: authortitle-tcomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: authortitle-tcomp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx
index 9e84f2523d7..813b79a4b4a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-terse.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle-terse.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle-terse.bbx}
-[\abx@bbxid $Id: authortitle-terse.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: authortitle-terse.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx
index f6ae2f26897..9a7126ccdbe 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-ticomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle-ticomp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle-ticomp.bbx}
-[\abx@bbxid $Id: authortitle-ticomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: authortitle-ticomp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
index 184e5249cd1..1f4123ee54f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle.bbx}
-[\abx@bbxid $Id: authortitle.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: authortitle.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{standard}
\ExecuteBibliographyOptions{pagetracker}
@@ -53,6 +53,8 @@
\DeclareBibliographyDriver{set}{%
\booltrue{bbx@inset}%
\entryset{}{}%
+ \newunit\newblock
+ \usebibmacro{setpageref}%
\finentry}
\renewbibmacro*{author}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx
index e39175ca4b5..b89d1478cc0 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-comp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authoryear-comp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authoryear-comp.bbx}
-[\abx@bbxid $Id: authoryear-comp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: authoryear-comp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authoryear}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx
index 0b288eee160..44a67449b30 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-ibid.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authoryear-ibid.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authoryear-ibid.bbx}
-[\abx@bbxid $Id: authoryear-ibid.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: authoryear-ibid.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authoryear}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx
index b7026d43a13..17b73ff81af 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-icomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authoryear-icomp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authoryear-icomp.bbx}
-[\abx@bbxid $Id: authoryear-icomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: authoryear-icomp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authoryear}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
index c4fc460d66b..a7b45e05c92 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
@@ -1,7 +1,7 @@
-% $Id: authoryear.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authoryear.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authoryear.bbx}
-[\abx@bbxid $Id: authoryear.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: authoryear.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{standard}
\ExecuteBibliographyOptions{labelyear,sorting=nyt,pagetracker}
@@ -53,6 +53,8 @@
\DeclareBibliographyDriver{set}{%
\booltrue{bbx@inset}%
\entryset{}{}%
+ \newunit\newblock
+ \usebibmacro{setpageref}%
\finentry}
\renewbibmacro*{author}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
index 2a196206e55..0125f0986df 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
@@ -1,7 +1,7 @@
-% $Id: debug.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: debug.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{debug.bbx}
-[\abx@bbxid $Id: debug.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: debug.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\ExecuteBibliographyOptions{sorting=debug}
\DeclareFieldFormat{entrykey}{\ttfamily[#1]}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx
index 18541bf5bf1..78b82914ae5 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx
@@ -1,7 +1,7 @@
-% $Id: draft.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: draft.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{draft.bbx}
-[\abx@bbxid $Id: draft.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: draft.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{standard}
\ExecuteBibliographyOptions{sorting=debug}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx
index 7282ad5a4fe..8b26b988c9a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx
@@ -1,7 +1,7 @@
-% $Id: numeric-comp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: numeric-comp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{numeric-comp.bbx}
-[\abx@bbxid $Id: numeric-comp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: numeric-comp.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{numeric}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx
index b9bcec93050..7c982383dc6 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx
@@ -1,7 +1,7 @@
-% $Id: numeric-verb.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: numeric-verb.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{numeric-verb.bbx}
-[\abx@bbxid $Id: numeric-verb.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: numeric-verb.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{numeric}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
index 160036883b3..0d04d4cd4f8 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
@@ -1,7 +1,7 @@
-% $Id: numeric.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: numeric.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{numeric.bbx}
-[\abx@bbxid $Id: numeric.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: numeric.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{standard}
\ExecuteBibliographyOptions{labelnumber}
@@ -48,11 +48,14 @@
{\item}
\DeclareBibliographyDriver{set}{%
- \ifbool{bbx:subentry}
- {\entryset{%
- \printfield[bibentrysetcount]{entrysetcount}%
- \setunit*{\addnbspace}}{}}
- {\entryset{}{}}
+ \entryset
+ {\ifbool{bbx:subentry}
+ {\printfield[bibentrysetcount]{entrysetcount}%
+ \setunit*{\addnbspace}}
+ {}}
+ {}%
+ \newunit\newblock
+ \usebibmacro{setpageref}%
\finentry}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx
index a9111ac67ce..8ac5d491ee2 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx
@@ -1,7 +1,7 @@
-% $Id: reading.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: reading.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{reading.bbx}
-[\abx@bbxid $Id: reading.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: reading.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{standard}
@@ -165,6 +165,8 @@
\DeclareBibliographyDriver{set}{%
\renewbibmacro*{finentry}{\finentry}%
\entryset{}{}%
+ \newunit\newblock
+ \usebibmacro{setpageref}%
\ifbibliography
{\usebibmacro{entrytail}}
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
index a7ea8e96e04..f2632b06a98 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
@@ -1,7 +1,7 @@
-% $Id: standard.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: standard.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{standard.bbx}
-[\abx@bbxid $Id: standard.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: standard.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\newtoggle{bbx:isbn}
\newtoggle{bbx:url}
@@ -39,9 +39,9 @@
\newunit\newblock
\usebibmacro{in:}%
\usebibmacro{journal+issuetitle}%
- \newunit\newblock
+ \newunit
\usebibmacro{byeditor+others}%
- \newunit\newblock
+ \newunit
\usebibmacro{note+pages}%
\newunit\newblock
\iftoggle{bbx:isbn}
@@ -51,7 +51,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -94,7 +94,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -126,7 +126,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -167,7 +167,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -213,7 +213,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -257,7 +257,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -303,7 +303,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -345,7 +345,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -375,7 +375,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -407,7 +407,7 @@
\usebibmacro{url+urldate}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -440,7 +440,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -464,7 +464,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -507,7 +507,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -543,7 +543,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -571,7 +571,7 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -597,7 +597,7 @@
{}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -609,6 +609,8 @@
\DeclareBibliographyDriver{set}{%
\entryset{}{}%
+ \newunit\newblock
+ \usebibmacro{setpageref}%
\finentry}
\DeclareBibliographyAlias{bookinbook}{inbook}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-ibid.bbx
index 468bbdc26b8..e8f20fbd8a6 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-ibid.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-ibid.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-ibid.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose-ibid.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose-ibid.bbx}
-[\abx@bbxid $Id: verbose-ibid.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: verbose-ibid.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx
index 4ef0943b977..e9e4ca22a8e 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-inote.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose-inote.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose-inote.bbx}
-[\abx@bbxid $Id: verbose-inote.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: verbose-inote.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx
index 853bd821383..d5dbce6393d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-note.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose-note.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose-note.bbx}
-[\abx@bbxid $Id: verbose-note.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: verbose-note.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx
index a947435dd02..e19a1ace643 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-trad1.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose-trad1.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose-trad1.bbx}
-[\abx@bbxid $Id: verbose-trad1.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: verbose-trad1.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx
index 848a2b05e97..897e69fabd2 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-trad2.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose-trad2.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose-trad2.bbx}
-[\abx@bbxid $Id: verbose-trad2.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: verbose-trad2.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx
index 8145890b9cc..055de9173f6 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-trad3.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose-trad3.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose-trad3.bbx}
-[\abx@bbxid $Id: verbose-trad3.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: verbose-trad3.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx
index 17cec628b58..8f013d91584 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose.bbx}
-[\abx@bbxid $Id: verbose.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@bbxid $Id: verbose.bbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg b/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg
index 0f41241c1e1..f22c141c8c3 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg
@@ -1,4 +1,4 @@
-% $Id: biblatex.cfg,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: biblatex.cfg,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{biblatex.cfg}
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
index 3a8b62b2065..8622d7f3dbb 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
@@ -1,7 +1,7 @@
-% $Id: biblatex.def,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: biblatex.def,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{biblatex.def}
-[\abx@rcsid $Id: biblatex.def,v 0.9d 2010/09/03 20:11:58 lehman beta $
+[\abx@rcsid $Id: biblatex.def,v 0.9e 2010/10/09 16:39:36 lehman beta $
biblatex generic definitions]
% ------------------------------------------------------------------
@@ -53,6 +53,7 @@
\newcommand*{\subtitlepunct}{\newunitpunct}
\newcommand*{\intitlepunct}{\addcolon\space}
\newcommand*{\bibpagespunct}{\addcomma\space}
+\newcommand*{\bibpagerefpunct}{\addspace}
\newcommand*{\bibnamedash}{%
\ifdimless{\leftmargin}{0.75em}
{\mbox{\textemdash\space}}
@@ -615,33 +616,19 @@
% Formatting directives for name lists
% ------------------------------------------------------------------
-% The fallback used by \printnames
-\DeclareNameFormat{default}{%
+\DeclareNameFormat{first-last}{%
\iffirstinits
{\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}}
{\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}}%
\usebibmacro{name:andothers}}
-% The default used by \citename
-\DeclareNameAlias{citename}{default}
-
-% Used in all citations
-
-\DeclareNameFormat{labelname}{%
- \ifcase\value{uniquename}%
- \usebibmacro{name:last}{#1}{#3}{#5}{#7}%
- \or
- \ifuseprefix
- {\usebibmacro{name:first-last}{#1}{#4}{#5}{#8}}
- {\usebibmacro{name:first-last}{#1}{#4}{#6}{#8}}%
- \or
- \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
- \fi
+\DeclareNameFormat{last-first}{%
+ \iffirstinits
+ {\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}
+ {\usebibmacro{name:last-first}{#1}{#3}{#5}{#7}}%
\usebibmacro{name:andothers}}
-% Used in the bibliography
-
-\DeclareNameFormat{sortname}{%
+\DeclareNameFormat{last-first/first-last}{%
\ifnumequal{\value{listcount}}{1}
{\iffirstinits
{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}
@@ -654,12 +641,36 @@
{\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}}}%
\usebibmacro{name:andothers}}
-% Not used by default
-
\DeclareNameFormat{initsonly}{%
\usebibmacro{name:first-last}{#2}{#4}{#6}{#8}%
\usebibmacro{name:andothers}}
+% Fallback used by \printnames
+
+\DeclareNameAlias{default}{first-last}
+
+% Default used by \citename
+
+\DeclareNameAlias{citename}{default}
+
+% Used in some citations
+
+\DeclareNameFormat{labelname}{%
+ \ifcase\value{uniquename}%
+ \usebibmacro{name:last}{#1}{#3}{#5}{#7}%
+ \or
+ \ifuseprefix
+ {\usebibmacro{name:first-last}{#1}{#4}{#5}{#8}}
+ {\usebibmacro{name:first-last}{#1}{#4}{#6}{#8}}%
+ \or
+ \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
+ \fi
+ \usebibmacro{name:andothers}}
+
+% Used in the bibliography
+
+\DeclareNameAlias{sortname}{last-first/first-last}
+
\DeclareNameAlias{author}{default}
\DeclareNameAlias{bookauthor}{author}
\DeclareNameAlias{editor}{default}
@@ -1813,7 +1824,7 @@
\usebibmacro{withforeword}%
\clearname{foreword}%
\newunit
- \usebibmacro{withafterword}
+ \usebibmacro{withafterword}%
\clearname{afterword}}
\newbibmacro*{title}{%
@@ -1904,6 +1915,15 @@
{\bibstring{backrefpage}\ppspace}%
\printlist[pageref][-\value{listtotal}]{pageref}}}}
+\newbibmacro*{setpageref}{%
+ \iflistundef{pageref}
+ {}
+ {\printtext{%
+ \ifnumgreater{\value{pageref}}{1}
+ {\bibstring{backrefpages}\ppspace}
+ {\bibstring{backrefpage}\ppspace}%
+ \printlist[pageref][-\value{listtotal}]{pageref}}}}
+
\newbibmacro*{eprint}{%
\iffieldundef{eprinttype}
{\printfield{eprint}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
index 4af84cc06db..4d9db8f3182 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
@@ -1,4 +1,4 @@
-% $Id: biblatex.sty,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: biblatex.sty,v 0.9e 2010/10/09 16:39:36 lehman beta $
% Copyright (c) 2006-2010 Philipp Lehman.
%
@@ -21,11 +21,11 @@
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{biblatex}
-[\abx@rcsid $Id: biblatex.sty,v 0.9d 2010/09/03 20:11:58 lehman beta $
+[\abx@rcsid $Id: biblatex.sty,v 0.9e 2010/10/09 16:39:36 lehman beta $
programmable bibliographies]
-\def\blx@version$#1: #2 ${#2}
-\edef\blx@version{\blx@version$Revision: 0.9c $}
+\def\blx@bblversion$#1: #2 ${#2}
+\edef\blx@bblversion{\blx@bblversion$Revision: 0.9e $}
%% Compatibility and requirements
@@ -153,10 +153,10 @@
{}%
\@ifpackageloaded{showkeys}
{\ifdef\SK@
- {\ifundef\SK@cite % = 'notcite' disabled
- {\AtEveryBibitem{\SK@\SK@@label{\thefield{entrykey}}}%
- \AtEveryLositem{\SK@\SK@@label{\thefield{entrykey}}}%
- \AtEveryCitekey{\SK@\SK@@ref{\thefield{entrykey}}}}
+ {\AtEveryBibitem{\SK@\SK@@label{\thefield{entrykey}}}%
+ \AtEveryLositem{\SK@\SK@@label{\thefield{entrykey}}}%
+ \ifundef\SK@cite % = 'notcite' disabled
+ {\AtEveryCitekey{\SK@\SK@@ref{\thefield{entrykey}}}}
{}}
{}}
{}%
@@ -231,15 +231,18 @@
\addtocontents{toc}{%
\string\boolfalse{citerequest}%
\string\boolfalse{citetracker}%
- \string\boolfalse{pagetracker}}%
+ \string\boolfalse{pagetracker}%
+ \string\boolfalse{backtracker}}%
\addtocontents{lof}{%
\string\boolfalse{citerequest}%
\string\boolfalse{citetracker}%
- \string\boolfalse{pagetracker}}%
+ \string\boolfalse{pagetracker}%
+ \string\boolfalse{backtracker}}%
\addtocontents{lot}{%
\string\boolfalse{citerequest}%
\string\boolfalse{citetracker}%
- \string\boolfalse{pagetracker}}%
+ \string\boolfalse{pagetracker}%
+ \string\boolfalse{backtracker}}%
\let\do\noexpand}
\begingroup
@@ -352,6 +355,7 @@
\newbool{citetracker}
\newbool{pagetracker}
+\newbool{backtracker}
\newbool{citerequest}
\booltrue{citerequest}
@@ -364,7 +368,8 @@
\newtoggle{blx@insert}
\newtoggle{blx@lastins}
\newtoggle{blx@debug}
-\newtoggle{blx@cssort}
+\newtoggle{blx@sortcase}
+\newtoggle{blx@sortupper}
\newtoggle{blx@autolang}
\newtoggle{blx@clearlang}
\newtoggle{blx@defernumbers}
@@ -601,11 +606,7 @@
\ifx\blx@tempb\blx@tempc
\else
\blx@warning@noline{%
- File '#1.#2' created\MessageBreak
- by wrong version of
- \ifnumequal\blx@backend\blx@backend@biber
- {Biber}
- {biblatex}}%
+ File '#1.#2' created by wrong version}
\fi
\else
\blx@error
@@ -623,14 +624,14 @@
\expandafter\endgroup\blx@tempa}
\def\blx@sig@bib{@Comment{$ biblatex control file $}}
-\edef\blx@ver@bib{@Comment{$ biblatex version \blx@version\space $}}
+\edef\blx@ver@bib{@Comment{$ biblatex version \blx@bblversion\space $}}
\edef\blx@sig@aux{\@percentchar\space $ biblatex auxiliary file $}
-\edef\blx@ver@aux{\@percentchar\space$ biblatex version \blx@version\space $}
+\edef\blx@ver@aux{\@percentchar\space$ biblatex version \blx@bblversion\space $}
\let\blx@sig@bbl\blx@sig@aux
\let\blx@ver@bbl\blx@ver@aux
\edef\blx@sig@bcf{\detokenize{<?xml version="1.0" encoding="UTF-8"?>}}
\edef\blx@ver@bcf{%
- \detokenize{<bcf:controlfile version="}\blx@version
+ \detokenize{<bcf:controlfile version="}\blx@bblversion
\detokenize{" xmlns:bcf="https://sourceforge.net/projects/biblatex">}}
\edef\blx@msg@aux{%
@@ -1751,7 +1752,7 @@
\ifcsundef{abx@macro@\detokenize{#1}}
{\blx@defbibmacro\new@command{#1}}
{\blx@warning{%
- Bibliography macro '\detokenize{#1}' already defined.\MessageBreak
+ Macro '\detokenize{#1}' already defined.\MessageBreak
Using \string\renewbibmacro}
\blx@defbibmacro\renew@command{#1}}}
@@ -1761,7 +1762,7 @@
\def\blx@renewbibmacro#1{%
\ifcsundef{abx@macro@\detokenize{#1}}
{\blx@warning{%
- Bibliography macro '\detokenize{#1}' undefined.\MessageBreak
+ Macro '\detokenize{#1}' undefined.\MessageBreak
Using \string\newbibmacro}
\blx@defbibmacro\new@command{#1}}
{\blx@defbibmacro\renew@command{#1}}}
@@ -3371,11 +3372,8 @@
\def\blx@entryset#1{%
\blx@ifdata{#1}
{\begingroup
-% \begingroup
+ \blx@imc@clearlist{pageref}%
\blx@getdata{#1}%
-% \edef\blx@tempa{\endgroup
-% \def\noexpand\abx@field@entrytype{\abx@field@entrytype}}%
-% \blx@tempa
\def\abx@field@entrysetcount{1}%
\blx@set@precode
\blx@driver{\blx@imc@thefield{entrytype}}%
@@ -3539,17 +3537,17 @@
\let\blx@hook@uc\relax
\let\blx@hook@lc\relax
-\expandafter\patchcmd\csname MakeUppercase \endcsname
- {\protected@edef}
- {\blx@hook@uc\protected@edef}
- {}
- {\blx@err@patch{\string\MakeUppercase}}
-
-\expandafter\patchcmd\csname MakeLowercase \endcsname
- {\protected@edef}
- {\blx@hook@lc\protected@edef}
- {}
- {\blx@err@patch{\string\MakeLowercase}}
+\AtEndPreamble{%
+ \expandafter\patchcmd\csname MakeUppercase \endcsname
+ {\protected@edef}
+ {\blx@hook@uc\protected@edef}
+ {}
+ {\blx@err@patch{\string\MakeUppercase}}%
+ \expandafter\patchcmd\csname MakeLowercase \endcsname
+ {\protected@edef}
+ {\blx@hook@lc\protected@edef}
+ {}
+ {\blx@err@patch{\string\MakeLowercase}}}
\appto\blx@blxinit{%
\def\blx@hook@uc{%
@@ -3992,14 +3990,14 @@
{\expandafter\expandafter\expandafter\blx@lbxinput@i
\expandafter\expandafter\expandafter{%
\csname blx@lng@#1\endcsname}{#1}}
- {\blx@lbxinput@ii{#1}{#1.lbx}{language '#1'}}}
+ {\blx@lbxinput@ii{#1}{#1}{language '#1'}}}
% {<mapping>}{<language>}
\def\blx@lbxinput@i#1#2{%
\global\csundef{blx@lng@#2}%
\IfFileExists{#1.lbx}
- {\blx@lbxinput@ii{#2}{#1.lbx}{language '#2' -> '#1'}}
+ {\blx@lbxinput@ii{#2}{#1}{language '#2' -> '#1'}}
{\blx@warning@noline{%
File '#1.lbx' not found!\MessageBreak
Ignoring mapping '#2' -> '#1'}%
@@ -4011,12 +4009,13 @@
\begingroup
\setbox\@tempboxa=\hbox\bgroup
\aftergroup\endgroup
- \blx@inputonce{#2}{#3}
+ \blx@inputonce{#2.lbx}{#3}
{\global\cslet{abx@strings@#1}\@empty
\global\cslet{abx@extras@#1}\@empty
\global\cslet{abx@noextras@#1}\@empty
\blx@maplang{#1}{#1}%
- \def\InheritBibliographyStrings{\blx@letbibstrings{#1}}%
+ \def\InheritBibliographyStrings{%
+ \blx@letbibstrings{#1}}%
\def\DeclareBibliographyStrings####1{%
\begingroup
\let\blx@defstring\blx@lbx@defstring
@@ -4030,20 +4029,18 @@
\blx@saneccodes
\makeatletter}
{\endgroup
- \blx@lbxinput@iii{strings}{#1}%
- \blx@lbxinput@iii{extras}{#1}%
- \blx@lbxinput@iii{noextras}{#1}%
- \blx@lbxinput@iii{hyph}{#1}}
+ \csuse{blx@hook@strings@#1}%
+ \csuse{blx@hook@strings@#2}%
+ \csuse{blx@hook@extras@#1}%
+ \csuse{blx@hook@extras@#2}%
+ \csuse{blx@hook@noextras@#1}%
+ \csuse{blx@hook@noextras@#2}%
+ \csuse{blx@hook@hyph@#1}%
+ \csuse{blx@hook@hyph@#2}}
{\aftergroup\@firstoftwo}
{\aftergroup\@secondoftwo}%
\egroup}
-\def\blx@lbxinput@iii#1#2{%
- \ifcsdef{blx@hook@#1@#2}
- {\csuse{blx@hook@#1@#2}%
- \global\csundef{blx@hook@#1@#2}}
- {}}
-
% {<language>}
\def\blx@langsetup#1{%
@@ -4148,7 +4145,8 @@
\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
\printfield{extrayear}}}}}}
-\newrobustcmd*{\mkbibrangeiso}[1]{%
+\expandafter\newrobustcmd
+\expandafter*\csname mkbibrangeiso8601\endcsname[1]{%
\iffieldundef{#1year}
{}
{\printtext{%
@@ -4157,7 +4155,8 @@
{}
{\addslash\blx@isodate{#1endyear}{#1endmonth}{#1endday}}}}}
-\newrobustcmd*{\mkbibrangeisoextra}[1]{%
+\expandafter\newrobustcmd
+\expandafter*\csname mkbibrangeiso8601extra\endcsname[1]{%
\iffieldundef{#1year}
{}
{\printtext{%
@@ -4547,7 +4546,7 @@
% {<entrykey>}{<refsection>}{<field>}{<value>}
\long\def\blx@bbl@addentryfield#1#2#3#4{%
- \csxappto{blx@data@#2@\detokenize{#1}}{%
+ \csxappto{blx@data@#2@#1}{%
\def\expandafter\noexpand\csname abx@field@#3\endcsname{#4}}}
% {<field>}{<value>}
@@ -4860,6 +4859,9 @@
\protected\def\blx@bbl@endentry{%
\csuse\blx@bbl@data
+ \ifcsundef{blx@pref@\the\c@refsection @\abx@field@entrykey}
+ {}
+ {\blx@addpageref{\abx@field@entrykey}}%
\iftoggle{blx@setonly}
{\global\toggletrue{blx@addset}%
\toggletrue{blx@skipbib}%
@@ -4872,10 +4874,7 @@
\listcsxadd{blx@type@\the\c@refsection @\abx@field@entrytype}{\abx@field@entrykey}%
\ifdef\abx@field@entrysubtype
{\listcsxadd{blx@subt@\the\c@refsection @\abx@field@entrysubtype}{\abx@field@entrykey}}
- {}%
- \ifcsundef{blx@pref@\the\c@refsection @\abx@field@entrykey}
- {}
- {\blx@addpageref{\abx@field@entrykey}}}%
+ {}}%
\iftoggle{blx@skiplos}
{}
{\blx@bbl@shorthand}%
@@ -5109,7 +5108,7 @@
% {<instcount>}{<entrykey>}{<refsection>}{<labelnumber>}
\protected\def\blx@aux@number#1#2#3#4{%
- \blx@bbl@addentryfield{#2}{#3}{localnumber}{#4}%
+ \blx@bbl@addentryfield{\detokenize{#2}}{#3}{localnumber}{#4}%
\ifblank{#4}
{}
{\csgdef{blx@labelnumber@#3}{#4}%
@@ -5121,33 +5120,41 @@
% {<entrykey>}{<refsection>}{<numberprefix>}
\protected\def\blx@aux@numprefix#1#2#3{%
- \blx@bbl@addentryfield{#1}{#2}{prefixnumber}{#3}}
+ \blx@bbl@addentryfield{\detokenize{#1}}{#2}{prefixnumber}{#3}}
\def\blx@addlabelnumber{%
- \iftoggle{blx@skiplab}
- {}
- {\begingroup
- \edef\blx@bbl@data{blx@data@\the\c@refsection @\abx@field@entrykey}%
- \iftoggle{blx@omitnumbers}
- {\blx@auxwrite\@mainaux{}{%
- \string\abx@aux@number{\the\c@instcount}{\abx@field@entrykey}{\the\c@refsection}{}}}
+ \begingroup
+ \iftoggle{blx@labelnumber}
+ {\nottoggle{blx@skiplab}
{\ifundef\abx@field@shorthand
{\ifundef\abx@field@localnumber
- {\csnumgdef{blx@labelnumber@\the\c@refsection}{%
- \csuse{blx@labelnumber@\the\c@refsection}+1}%
- \blx@auxwrite\@mainaux{}{%
+ {\iftoggle{blx@omitnumbers}
+ {\let\abx@field@localnumber\@empty}
+ {\csnumgdef{blx@labelnumber@\the\c@refsection}{%
+ \csuse{blx@labelnumber@\the\c@refsection}+1}%
+ \edef\abx@field@localnumber{\csuse{blx@labelnumber@\the\c@refsection}}%
+ \blx@bbl@addentryfield{\abx@field@entrykey}{\the\c@refsection}%
+ {localnumber}{\abx@field@localnumber}}%
+ \blx@auxwrite\@mainaux{}{%
\string\abx@aux@number{\the\c@instcount}{\abx@field@entrykey}%
- {\the\c@refsection}{\csuse{blx@labelnumber@\the\c@refsection}}}}
- {}}
- {}}%
- \ifdef\blx@prefixnumbers
- {\ifundef\abx@field@shorthand
- {\blx@auxwrite\@mainaux{}{%
- \string\blx@aux@numprefix{\abx@field@entrykey}%
- {\the\c@refsection}{\expandonce\blx@prefixnumbers}}}
+ {\the\c@refsection}{\abx@field@localnumber}}}
+ {}}
+ {}%
+ \ifdef\blx@prefixnumbers
+ {\ifundef\abx@field@shorthand
+ {\edef\abx@field@prefixnumber{\expandonce\blx@prefixnumbers}%
+ \ifundef\abx@field@prefixnumber
+ {\blx@bbl@addentryfield{\abx@field@entrykey}{\the\c@refsection}%
+ {prefixnumber}{\expandonce\abx@field@prefixnumber}}
+ {}%
+ \blx@auxwrite\@mainaux{}{%
+ \string\blx@aux@numprefix{\abx@field@entrykey}%
+ {\the\c@refsection}{\expandonce\abx@field@prefixnumber}}}
+ {}}
{}}
- {}%
- \endgroup}}
+ {}}
+ {}%
+ \endgroup}
\def\blx@bbl@lossort{%
\begingroup
@@ -5603,7 +5610,7 @@
\define@key{blx@bib}{resetnumbers}[true]{%
\ifstrequal{#1}{true}
{\iftoggle{blx@defernumbers}
- {\csnumdef{blx@labelnumber@0}{0}}
+ {\csnumdef{blx@labelnumber@\the\c@refsection}{0}}
{\blx@warning{%
Option 'resetnumbers' requires 'defernumbers=true'.\MessageBreak
Ignoring 'resetnumbers=true'}}}
@@ -5620,7 +5627,7 @@
\define@key{blx@bib}{prefixnumbers}{%
\iftoggle{blx@defernumbers}
- {\csnumdef{blx@labelnumber@0}{0}%
+ {\csnumdef{blx@labelnumber@\the\c@refsection}{0}%
\def\blx@prefixnumbers{#1}}
{\blx@warning{%
Option 'prefixnumbers' requires 'defernumbers=true'.\MessageBreak
@@ -5690,7 +5697,7 @@
\let\blx@theprenote\@empty
\let\blx@thepostnote\@empty
\let\blx@thetitle\@empty
- \c@refsection\@ne
+ \c@refsection\z@
\blx@safe@actives
\setkeys{blx@bbs}{#1}%
\blx@rest@actives
@@ -5885,12 +5892,14 @@
{}}
\def\blx@initsep{%
- \ifnum\c@instcount>\@ne
- \blx@imc@iffieldequals{sortinit}\blx@previnit
- {}
- {\addvspace{\bibinitsep}}%
- \fi
- \global\let\blx@previnit\abx@field@sortinit}
+ \blx@imc@iffieldundef{sortinit}
+ {}
+ {\ifnum\c@instcount>\@ne
+ \blx@imc@iffieldequals{sortinit}\blx@previnit
+ {}
+ {\addvspace{\bibinitsep}}%
+ \fi
+ \global\let\blx@previnit\abx@field@sortinit}}
\def\blx@namesep{%
\ifnum\c@instcount>\@ne
@@ -6443,7 +6452,7 @@
\blx@entrysetcount
\blx@setoptions@type\abx@field@entrytype
\blx@setoptions@entry
- \blx@backref
+ \blx@backref{#1}%
\blx@pagetracker
\csuse{blx@hook@citekey}%
\csuse{blx@hook@citekey@next}%
@@ -6789,21 +6798,63 @@
\global\undef\blx@saved@trackkeys@foot
\endgroup}
-\def\blx@backref@global{%
- \blx@leavevmode
- \if@filesw
- \protected@write\@mainaux{}{\string\abx@aux@backref
- {\the\c@instcount}{\abx@field@entrykey}%
- {\the\c@refsection}{\thepage}{\noexpand\the\c@page}}%
+\def\blx@addbackref#1{%
+ \ifcsdef{blx@setp@\the\c@refsection @#1}
+ {\ifcase\blx@backrefsetstyle
+ \blx@addbackref@i{#1}%
+ \or
+ \blx@addbackref@ii{setp}{#1}%
+ \or
+ \blx@addbackref@i{#1}%
+ \or
+ \blx@addbackref@i{#1}%
+ \or
+ \blx@addbackref@i{#1}%
+ \blx@addbackref@ii{setp}{#1}%
+ \or
+ \blx@addbackref@i{#1}%
+ \blx@addbackref@ii{setp}{#1}%
+ \fi}
+ {\ifcsdef{blx@setc@\the\c@refsection @#1}
+ {\ifcase\blx@backrefsetstyle
+ \blx@addbackref@ii{setc}{#1}%
+ \or
+ \blx@addbackref@i{#1}%
+ \or
+ \blx@addbackref@i{#1}%
+ \or
+ \blx@addbackref@i{#1}%
+ \blx@addbackref@ii{setc}{#1}%
+ \or
+ \blx@addbackref@i{#1}%
+ \or
+ \blx@addbackref@i{#1}%
+ \blx@addbackref@ii{setc}{#1}%
+ \fi}
+ {\blx@addbackref@i{#1}}}}
+
+\def\blx@addbackref@i#1{%
+ \ifbacktracker
+ \blx@leavevmode
+ \if@filesw
+ \protected@write\@mainaux{}{\string\abx@aux@backref
+ {\the\c@instcount}{#1}{\the\c@refsection}%
+ {\thepage}{\noexpand\the\c@page}}%
+ \fi
\fi}
+\def\blx@addbackref@ii#1#2{%
+ \expandafter\expandafter\expandafter\forcsvlist
+ \expandafter\expandafter\expandafter\blx@addbackref@i
+ \expandafter\expandafter\expandafter{%
+ \csname blx@#1@\the\c@refsection @#2\endcsname}}
+
% {<instcount>}{<entrykey>}{<refsection>}{<page>}{<page int>}
\protected\def\blx@aux@backref#1#2#3#4#5{%
\ifcsundef{blx@pref@#3@\detokenize{#2}}
{\global\cslet{blx@pref@#3@\detokenize{#2}}\@empty
- \expandafter\blx@onlypreamble
- \expandafter{\csname blx@pref@#3@\detokenize{#2}\endcsname}}
+ \expandafter\blx@onlypreamble\csname blx@pref@#3@\detokenize{#2}\endcsname}
{}%
\ifinlistcs{#4}{blx@pref@#3@\detokenize{#2}}
{}
@@ -7843,7 +7894,9 @@
\def\blx@bcf@options@global{%
\blx@bcf@comment{global}%
\blx@bcf@options{biblatex}{global}{%
- \blx@bcf@svalue{alphaothers}{\detokenize\expandafter{\labelalphaothers}}%
+ \iftoggle{blx@labelalpha}
+ {\blx@bcf@svalue{alphaothers}{\detokenize\expandafter{\labelalphaothers}}}
+ {}%
\blx@bcf@toggle{labelalpha}%
\blx@bcf@mvalue{labelname}{\blx@bcf@labelname@global}%
\iftoggle{blx@labelyear}
@@ -7854,7 +7907,9 @@
\blx@bcf@svalue{minitems}{\the\c@minitems}%
\blx@bcf@svalue{minnames}{\the\c@minnames}%
\blx@bcf@toggle{singletitle}%
- \blx@bcf@svalue{sortalphaothers}{\detokenize\expandafter{\labelalphaothers}}%
+ \iftoggle{blx@labelalpha}
+ {\blx@bcf@svalue{sortalphaothers}{\detokenize\expandafter{\labelalphaothers}}}
+ {}%
\blx@bcf@svalue{sortlos}{\blx@sortlos}%
\blx@bcf@toggle{terseinits}%
\blx@bcf@svalue{uniquename}{\blx@uniquename}%
@@ -7889,25 +7944,27 @@
}%
}
-\AtEndPreamble{%
- \xdef\blx@biber@options{\blx@bcf@options@global}%
- \begingroup
- \def\do#1{%
- \blx@setoptions@type{#1}%
- \xappto\blx@biber@options{\blx@bcf@options@type{#1}}}%
- \ifdef\blx@opts@type
- {\dolistloop\blx@opts@type}
- {}%
- \def\do#1{%
- \ifcsdef{blx@biber@sorting@\blx@sorting @#1}%
- {\blx@bcf@comment{#1}%
- \csuse{blx@biber@sorting@\blx@sorting @#1}}
- {}}%
- \xdef\blx@biber@sorting{%
- \ifcsdef{blx@biber@sorting@\blx@sorting}
- {\dolistcsloop{blx@biber@sorting@\blx@sorting}}
- {}}%
- \endgroup}
+\AtBeginDocument{%
+ \ifnum\blx@backend=\blx@backend@biber
+ \xdef\blx@biber@options{\blx@bcf@options@global}%
+ \begingroup
+ \def\do#1{%
+ \blx@setoptions@type{#1}%
+ \xappto\blx@biber@options{\blx@bcf@options@type{#1}}}%
+ \ifdef\blx@opts@type
+ {\dolistloop\blx@opts@type}
+ {}%
+ \def\do#1{%
+ \ifcsdef{blx@biber@sorting@\blx@sorting @#1}%
+ {\blx@bcf@comment{#1}%
+ \csuse{blx@biber@sorting@\blx@sorting @#1}}
+ {}}%
+ \xdef\blx@biber@sorting{%
+ \ifcsdef{blx@biber@sorting@\blx@sorting}
+ {\dolistcsloop{blx@biber@sorting@\blx@sorting}}
+ {}}%
+ \endgroup
+ \fi}
% [<entrytype>]{<name>}{<spec>}
@@ -8155,14 +8212,14 @@
\blx@msg@bib
@Control\string{biblatex-control,\blx@nl
\space\space options = \string{%
- \blx@version:%
+ \blx@bblversion:%
\noexpand\iftoggle{blx@debug}{1}{0}:%
\noexpand\ifnum\noexpand\blx@backend=\noexpand\blx@backend@bibtexviii
1:%
\noexpand\else
0:%
\noexpand\fi
- \noexpand\iftoggle{blx@cssort}{1}{0}:%
+ \noexpand\iftoggle{blx@sortcase}{1}{0}:%
\noexpand\iftoggle{blx@terseinits}{1}{0}:%
\noexpand\iftoggle{blx@useprefix}{1}{0}:%
\noexpand\iftoggle{blx@useauthor}{1}{0}:%
@@ -8172,7 +8229,7 @@
\noexpand\iftoggle{blx@labelyear}{1}{0}:%
\noexpand\iftoggle{blx@singletitle}{1}{0}:%
\noexpand\blx@uniquename:%
- \noexpand\csuse{blx@opt@sorting@\noexpand\blx@sorting}:%
+ \noexpand\csuse{blx@bibtex@sorting@\noexpand\blx@sorting}:%
\noexpand\blx@sortlos:%
\noexpand\the\c@maxnames:%
\noexpand\the\c@minnames:%
@@ -8186,11 +8243,15 @@
\blx@bcf@file
\blx@bcf@comment{BIBER OPTIONS}%
\blx@bcf@options{biber}{global}{%
+ \blx@bcf@svalue{bblencoding}{\blx@inputencoding}%
\blx@bcf@svalue{bibencoding}{\blx@bibencoding}%
- \blx@bcf@toggle{cssort}%
\blx@bcf@toggle{debug}%
- \blx@bcf@svalue{inputenc}{\blx@inputenc}%
\blx@bcf@svalue{mincrossrefs}{\blx@mincrossrefs}%
+ \blx@bcf@toggle{sortcase}%
+ \ifdef\blx@sortlocale
+ {\blx@bcf@svalue{sortlocale}{\blx@sortlocale}}
+ {}%
+ \blx@bcf@toggle{sortupper}%
}%
\blx@bcf@comment{BIBLATEX OPTIONS}%
\csuse{blx@biber@options}%
@@ -8276,21 +8337,40 @@
\def\blx@bibencoding{#1}}
\DeclareBibliographyOption{sorting}{%
- \ifcsdef{blx@opt@sorting@#1}
- {\def\blx@sorting{#1}}
- {\blx@err@invopt{sorting=#1}{}}}
-\def\blx@opt@sorting@none{0}
-\def\blx@opt@sorting@nty{1}
-\def\blx@opt@sorting@nyt{2}
-\def\blx@opt@sorting@nyvt{3}
-\def\blx@opt@sorting@anyt{12}
-\def\blx@opt@sorting@anyvt{13}
-\def\blx@opt@sorting@ynt{21}
-\def\blx@opt@sorting@ydnt{22}
-\def\blx@opt@sorting@debug{99}
+ \def\blx@sorting{#1}}
+\def\blx@bibtex@sorting@none{0}
+\def\blx@bibtex@sorting@nty{1}
+\def\blx@bibtex@sorting@nyt{2}
+\def\blx@bibtex@sorting@nyvt{3}
+\def\blx@bibtex@sorting@anyt{12}
+\def\blx@bibtex@sorting@anyvt{13}
+\def\blx@bibtex@sorting@ynt{21}
+\def\blx@bibtex@sorting@ydnt{22}
+\def\blx@bibtex@sorting@debug{99}
+
+\AtEndPreamble{%
+ \ifnum\blx@backend=\blx@backend@biber
+ \ifcsdef{blx@biber@sorting@\blx@sorting @global}
+ {}
+ {\blx@err@invopt{sorting=\blx@sorting}{}%
+ \def\blx@sorting{nty}}%
+ \else
+ \ifcsdef{blx@bibtex@sorting@\blx@sorting}
+ {}
+ {\blx@err@invopt{sorting=\blx@sorting}{}%
+ \def\blx@sorting{nty}}%
+ \fi}
\DeclareBibliographyOption{sortcase}[true]{%
- \settoggle{blx@cssort}{#1}}
+ \settoggle{blx@sortcase}{#1}}
+
+\DeclareBibliographyOption{sortupper}[true]{%
+ \settoggle{blx@sortupper}{#1}}
+
+\DeclareBibliographyOption{sortlocale}{%
+ \ifblank{#1}
+ {\undef\blx@sortlocale}
+ {\edef\blx@sortlocale{\detokenize{#1}}}}
\DeclareBibliographyOption{sortlos}{%
\ifcsdef{blx@opt@sortlos@#1}
@@ -8451,10 +8531,23 @@
\DeclareBibliographyOption{backref}[true]{%
\ifstrequal{#1}{true}
- {\let\blx@backref\blx@backref@global
- \let\abx@aux@backref\blx@aux@backref}
- {\let\blx@backref\relax
- \let\abx@aux@backref\@gobblefive}}
+ {\let\blx@backref\blx@addbackref
+ \let\abx@aux@backref\blx@aux@backref
+ \booltrue{backtracker}}
+ {\let\blx@backref\@gobble
+ \let\abx@aux@backref\@gobblefive
+ \boolfalse{backtracker}}}
+
+\DeclareBibliographyOption{backrefsetstyle}{%
+ \ifcsdef{blx@opt@backrefsetstyle@#1}
+ {\letcs\blx@backrefsetstyle{blx@opt@backrefsetstyle@#1}}
+ {\blx@err@invopt{backrefsetstyle=#1}{}}}
+\def\blx@opt@backrefsetstyle@setonly{0}
+\def\blx@opt@backrefsetstyle@memonly{1}
+\def\blx@opt@backrefsetstyle@setormem{2}
+\def\blx@opt@backrefsetstyle@setandmem{3}
+\def\blx@opt@backrefsetstyle@memandset{4}
+\def\blx@opt@backrefsetstyle@setplusmem{5}
\appto\blx@mkhyperref{%
\ifHy@plainpages
@@ -8751,8 +8844,8 @@
\settoggle{blx@labelnumber}{#1}%
\iftoggle{blx@labelnumber}
{}
- {\KV@blx@opt@pre@defernumbers{false}}}
-\DeclareTypeOption{labelnumber}[true]{% FIXME: per-type check
+ {\setkeys{blx@opt@pre}{defernumbers=false}}}
+\DeclareTypeOption{labelnumber}[true]{%
\settoggle{blx@labelnumber}{#1}}
\DeclareBibliographyOption{labelalpha}[true]{%
@@ -8785,7 +8878,7 @@
\DeclareBibliographyOption{defernumbers}[true]{%
\settoggle{blx@defernumbers}{#1}%
\iftoggle{blx@defernumbers}
- {\KV@blx@opt@pre@labelnumber{true}%
+ {\setkeys{blx@opt@pre}{labelnumber}%
\let\blx@thelabelnumber\blx@addlabelnumber
\let\abx@aux@number\blx@aux@number}
{\let\blx@thelabelnumber\relax
@@ -8908,12 +9001,12 @@
\setkeys{blx@opt@ldt}{style=numeric}
\setkeys{blx@opt@pre}{%
- sorting=nty,sortlos=los,sortcase,sortcites=false,maxnames=3,minnames=1,
+ sorting=nty,sortlos=los,sortcase,sortupper,sortcites=false,maxnames=3,minnames=1,
maxitems=3,minitems=1,mincrossrefs=2,useauthor=true,useeditor=true,
usetranslator=false,indexing=false,abbreviate=true,dateabbrev=true,
- backref=false,pagetracker=false,ibidtracker=false,idemtracker=false,
- opcittracker=false,loccittracker=false,citetracker=false,block=none,
- language=auto,clearlang=true,babel=none,date=comp,origdate=comp,
+ backref=false,backrefsetstyle=setonly,pagetracker=false,ibidtracker=false,
+ idemtracker=false,opcittracker=false,loccittracker=false,citetracker=false,
+ block=none,language=auto,clearlang=true,babel=none,date=comp,origdate=comp,
eventdate=comp,urldate=short,autopunct=true,punctfont=false,
defernumbers=false,refsection=none,refsegment=none,citereset=none,
hyperref=auto,maxline=79,parentracker,maxparens=3,bibwarn}
@@ -9052,28 +9145,28 @@
\ifundef\inputencodingname
{\ifundef\XeTeXrevision
{\ifundef\luatexversion
- {\def\blx@inputenc{ascii}%
+ {\def\blx@inputencoding{ascii}%
\blx@info@noline{%
No input encoding detected.\MessageBreak
- Assuming '\blx@inputenc'}}
- {\def\blx@inputenc{utf8}%
+ Assuming '\blx@inputencoding'}}
+ {\def\blx@inputencoding{utf8}%
\blx@info@noline{%
LuaTeX detected.\MessageBreak
- Assuming input encoding '\blx@inputenc'}}}
- {\def\blx@inputenc{utf8}%
+ Assuming input encoding '\blx@inputencoding'}}}
+ {\def\blx@inputencoding{utf8}%
\blx@info@noline{%
XeTeX detected.\MessageBreak
- Assuming input encoding '\blx@inputenc'}}}
- {\let\blx@inputenc\inputencodingname
+ Assuming input encoding '\blx@inputencoding'}}}
+ {\let\blx@inputencoding\inputencodingname
\ifboolexpr{
- test {\ifdefstring\blx@inputenc{utf8x}}
+ test {\ifdefstring\blx@inputencoding{utf8x}}
or
- test {\ifdefstring\blx@inputenc{lutf8}}
+ test {\ifdefstring\blx@inputencoding{lutf8}}
}
- {\def\blx@inputenc{utf8}}
+ {\def\blx@inputencoding{utf8}}
{}%
\blx@info@noline{%
- Input encoding '\blx@inputenc' detected}}%
+ Input encoding '\blx@inputencoding' detected}}%
\ifdef\blx@bibencoding
{\ifdefstring\blx@bibencoding{ascii}
{\blx@info@noline{%
@@ -9081,12 +9174,12 @@
No need to reencode data}%
\togglefalse{blx@reencode}}
{\ifdefstring\blx@bibencoding{inputenc}
- {\let\blx@bibencoding\blx@inputenc
+ {\let\blx@bibencoding\blx@inputencoding
\blx@info@noline{%
Data encoding '\blx@bibencoding' specified.\MessageBreak
No need to reencode data}
\togglefalse{blx@reencode}}
- {\ifdefequal\blx@bibencoding\blx@inputenc
+ {\ifdefequal\blx@bibencoding\blx@inputencoding
{\blx@info@noline{%
Data encoding '\blx@bibencoding' specified.\MessageBreak
No need to reencode data}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-compat.def b/Master/texmf-dist/tex/latex/biblatex/blx-compat.def
index 25ed9a9fe4e..3418575b384 100644
--- a/Master/texmf-dist/tex/latex/biblatex/blx-compat.def
+++ b/Master/texmf-dist/tex/latex/biblatex/blx-compat.def
@@ -1,7 +1,7 @@
-% $Id: blx-compat.def,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: blx-compat.def,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{blx-compat.def}
-[\abx@rcsid $Id: blx-compat.def,v 0.9d 2010/09/03 20:11:58 lehman beta $
+[\abx@rcsid $Id: blx-compat.def,v 0.9e 2010/10/09 16:39:36 lehman beta $
biblatex generic compatibility]
% LaTeX
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def b/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def
index 835c87aabc4..8c8d6d4e102 100644
--- a/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def
+++ b/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def
@@ -1,7 +1,7 @@
-% $Id: blx-natbib.def,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: blx-natbib.def,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{blx-natbib.def}
-[\abx@rcsid $Id: blx-natbib.def,v 0.9d 2010/09/03 20:11:58 lehman beta $
+[\abx@rcsid $Id: blx-natbib.def,v 0.9e 2010/10/09 16:39:36 lehman beta $
biblatex natbib compatibility]
\renewcommand*{\nameyeardelim}{\addcomma\space}
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 10d0ebfb92f..b849c96c8fa 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.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: alphabetic-verb.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{alphabetic-verb.cbx}
-[\abx@cbxid $Id: alphabetic-verb.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: alphabetic-verb.cbx,v 0.9e 2010/10/09 16:39:36 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 14a835427d3..d20ecf4360c 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.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: alphabetic.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{alphabetic.cbx}
-[\abx@cbxid $Id: alphabetic.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: alphabetic.cbx,v 0.9e 2010/10/09 16:39:36 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 df32026440e..b29a11290a3 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.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle-comp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle-comp.cbx}
-[\abx@cbxid $Id: authortitle-comp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: authortitle-comp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\ExecuteBibliographyOptions{sortcites,autocite=footnote}
\newbool{cbx:parens}
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 6338c38899c..6ef18cb8863 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.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle-ibid.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle-ibid.cbx}
-[\abx@cbxid $Id: authortitle-ibid.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: authortitle-ibid.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\ExecuteBibliographyOptions{ibidtracker=constrict,pagetracker,autocite=footnote}
\providecommand*{\mkibid}[1]{#1}
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 8a1d3d1925a..49d63d9a57d 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.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle-icomp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle-icomp.cbx}
-[\abx@cbxid $Id: authortitle-icomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: authortitle-icomp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\ExecuteBibliographyOptions{ibidtracker=constrict,pagetracker,sortcites,autocite=footnote}
\providecommand*{\mkibid}[1]{#1}
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 bddf31eebe2..fba3efe4724 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.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle-tcomp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle-tcomp.cbx}
-[\abx@cbxid $Id: authortitle-tcomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: authortitle-tcomp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireCitationStyle{authortitle-comp}
\ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline}
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 e79409f422e..a0f0402d31b 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.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle-terse.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle-terse.cbx}
-[\abx@cbxid $Id: authortitle-terse.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: authortitle-terse.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireCitationStyle{authortitle}
\ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
index 47cf2274050..40a865de101 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-ticomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle-ticomp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle-ticomp.cbx}
-[\abx@cbxid $Id: authortitle-ticomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: authortitle-ticomp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\RequireCitationStyle{authortitle-icomp}
\ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
index c97a8d14e94..c6bb2ad2852 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.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authortitle.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authortitle.cbx}
-[\abx@cbxid $Id: authortitle.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: authortitle.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\ExecuteBibliographyOptions{autocite=footnote}
\newbool{cbx:parens}
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 af107a90667..9a30823fbbd 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.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authoryear-comp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authoryear-comp.cbx}
-[\abx@cbxid $Id: authoryear-comp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: authoryear-comp.cbx,v 0.9e 2010/10/09 16:39:36 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 c311bfdb6e3..5b9fcea3339 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.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authoryear-ibid.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authoryear-ibid.cbx}
-[\abx@cbxid $Id: authoryear-ibid.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: authoryear-ibid.cbx,v 0.9e 2010/10/09 16:39:36 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 c503c9ac161..4c527926fa8 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.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authoryear-icomp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authoryear-icomp.cbx}
-[\abx@cbxid $Id: authoryear-icomp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: authoryear-icomp.cbx,v 0.9e 2010/10/09 16:39:36 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 2a9031820ad..d75492eec3c 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.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: authoryear.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{authoryear.cbx}
-[\abx@cbxid $Id: authoryear.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: authoryear.cbx,v 0.9e 2010/10/09 16:39:36 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 701f956efe4..dabc6395a46 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.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: debug.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{debug.cbx}
-[\abx@cbxid $Id: debug.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: debug.cbx,v 0.9e 2010/10/09 16:39:36 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 df3339bbac7..3549b169c14 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.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: draft.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{draft.cbx}
-[\abx@cbxid $Id: draft.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: draft.cbx,v 0.9e 2010/10/09 16:39:36 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 03f185df895..e86c645e55d 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.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: numeric-comp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{numeric-comp.cbx}
-[\abx@cbxid $Id: numeric-comp.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: numeric-comp.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\ExecuteBibliographyOptions{labelnumber,sortcites,autocite=inline}
\renewcommand*{\multicitedelim}{\addcomma\space}
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 31921501429..db95ff916be 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.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: numeric-verb.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{numeric-verb.cbx}
-[\abx@cbxid $Id: numeric-verb.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: numeric-verb.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\ExecuteBibliographyOptions{labelnumber,autocite=inline}
\renewcommand*{\multicitedelim}{\addcomma\space}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
index 68ae4488b0d..5c0272837a0 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.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: numeric.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{numeric.cbx}
-[\abx@cbxid $Id: numeric.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: numeric.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\ExecuteBibliographyOptions{labelnumber,autocite=inline}
\renewcommand*{\multicitedelim}{\addcomma\space}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx
index f52a2cfc403..17ecd066f01 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.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: reading.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{reading.cbx}
-[\abx@cbxid $Id: reading.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: reading.cbx,v 0.9e 2010/10/09 16:39:36 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 ea26e14379c..ff2c2e6c77e 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx
@@ -1,7 +1,7 @@
-% $Id: verbose-ibid.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose-ibid.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose-ibid.cbx}
-[\abx@cbxid $Id: verbose-ibid.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: verbose-ibid.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}}
\DeclareFieldFormat{bibhyperlink}{%
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 1401d38f024..72bcc216242 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx
@@ -1,7 +1,7 @@
-% $Id: verbose-inote.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose-inote.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose-inote.cbx}
-[\abx@cbxid $Id: verbose-inote.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: verbose-inote.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\DeclareFieldFormat{bibhyperlink}{%
\bibhyperlink{\thefield{entrykey}:\csuse{cbx@\iffootnote{f}{t}@\thefield{entrykey}}}{#1}}
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 55ed02cc5ea..ff288bdaf69 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx
@@ -1,7 +1,7 @@
-% $Id: verbose-note.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose-note.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose-note.cbx}
-[\abx@cbxid $Id: verbose-note.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: verbose-note.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\DeclareFieldFormat{bibhyperlink}{%
\bibhyperlink{\thefield{entrykey}:\csuse{cbx@\iffootnote{f}{t}@\thefield{entrykey}}}{#1}}
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 e3c644b1d7d..7d91347cf5d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx
@@ -1,7 +1,7 @@
-% $Id: verbose-trad1.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose-trad1.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose-trad1.cbx}
-[\abx@cbxid $Id: verbose-trad1.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: verbose-trad1.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\providecommand*{\mkibid}[1]{#1}
\newtoggle{cbx:ibidpage}
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 5abdb2bfbcb..33b74d04bfe 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx
@@ -1,7 +1,7 @@
-% $Id: verbose-trad2.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose-trad2.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose-trad2.cbx}
-[\abx@cbxid $Id: verbose-trad2.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: verbose-trad2.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\providecommand*{\mkibid}[1]{#1}
\newtoggle{cbx:fullcite}
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 bcd8d124745..cb72f070da9 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
@@ -1,7 +1,7 @@
-% $Id: verbose-trad3.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose-trad3.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose-trad3.cbx}
-[\abx@cbxid $Id: verbose-trad3.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: verbose-trad3.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\providecommand*{\mkibid}[1]{#1}
\newtoggle{cbx:loccit}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx
index f8c8a2e9b06..9529aaabff4 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx
@@ -1,7 +1,7 @@
-% $Id: verbose.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: verbose.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{verbose.cbx}
-[\abx@cbxid $Id: verbose.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@cbxid $Id: verbose.cbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}}
\DeclareFieldFormat{bibhyperlink}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx
index 30be0a1206c..09acbcdf395 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx
@@ -1,7 +1,7 @@
-% $Id: UKenglish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: UKenglish.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{UKenglish.lbx}
-[\abx@lbxid $Id: UKenglish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: UKenglish.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\InheritBibliographyExtras{british}
\InheritBibliographyStrings{british}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/USenglish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/USenglish.lbx
index c7b94a9c987..ee424437c04 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/USenglish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/USenglish.lbx
@@ -1,7 +1,7 @@
-% $Id: USenglish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: USenglish.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{USenglish.lbx}
-[\abx@lbxid $Id: USenglish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: USenglish.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\InheritBibliographyExtras{american}
\InheritBibliographyStrings{american}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/american.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/american.lbx
index ba09bcdf7db..bfe75d3a09e 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/american.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/american.lbx
@@ -1,7 +1,7 @@
-% $Id: american.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: american.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{american.lbx}
-[\abx@lbxid $Id: american.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: american.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx
index 1097a54c200..115be2a00f7 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx
@@ -1,7 +1,7 @@
-% $Id: australian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: australian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{australian.lbx}
-[\abx@lbxid $Id: australian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: australian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx
index f2351c9ec70..532bc45ebea 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx
@@ -1,7 +1,7 @@
-% $Id: austrian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: austrian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{austrian.lbx}
-[\abx@lbxid $Id: austrian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: austrian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx
index a0a542bd897..8401d4ef88a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx
@@ -1,7 +1,7 @@
-% $Id: brazil.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: brazil.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{brazil.lbx}
-[\abx@lbxid $Id: brazil.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: brazil.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\InheritBibliographyExtras{brazilian}
\InheritBibliographyStrings{brazilian}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx
index 1181117f66b..d34ec3f8bf4 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx
@@ -1,7 +1,7 @@
-% $Id: brazilian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: brazilian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{brazilian.lbx}
-[\abx@lbxid $Id: brazilian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: brazilian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx
index ff956b9f92b..6fe630cb74c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx
@@ -1,7 +1,7 @@
-% $Id: british.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: british.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{british.lbx}
-[\abx@lbxid $Id: british.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: british.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx
index b82baad7991..ab42f351e96 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx
@@ -1,7 +1,7 @@
-% $Id: canadian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: canadian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{canadian.lbx}
-[\abx@lbxid $Id: canadian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: canadian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
index c240f538cef..93baf676e04 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
@@ -1,7 +1,7 @@
-% $Id: danish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: danish.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{danish.lbx}
-[\abx@lbxid $Id: danish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: danish.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
index 5926dee2d30..0d4dc4da1ed 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
@@ -1,7 +1,7 @@
-% $Id: dutch.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: dutch.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{dutch.lbx}
-[\abx@lbxid $Id: dutch.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: dutch.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
index cd373552c9c..f02d735893f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
@@ -1,7 +1,7 @@
-% $Id: english.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: english.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{english.lbx}
-[\abx@lbxid $Id: english.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: english.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
index cf973ff0577..df151c9a703 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
@@ -1,7 +1,7 @@
-% $Id: finnish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: finnish.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{finnish.lbx}
-[\abx@lbxid $Id: finnish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: finnish.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
index 9a694b6f5b2..151c76afc80 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
@@ -1,7 +1,7 @@
-% $Id: french.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: french.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{french.lbx}
-[\abx@lbxid $Id: french.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: french.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
index 430c5a2057f..0e65bb18f0a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
@@ -1,7 +1,7 @@
-% $Id: german.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: german.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{german.lbx}
-[\abx@lbxid $Id: german.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: german.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
index b0c954cf058..0766ab0b78a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
@@ -1,7 +1,7 @@
-% $Id: greek.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: greek.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{greek.lbx}
-[\abx@lbxid $Id: greek.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: greek.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
index d9f8590abb4..8366d812f9d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
@@ -1,7 +1,7 @@
-% $Id: italian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: italian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{italian.lbx}
-[\abx@lbxid $Id: italian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: italian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx
index 9885ffcaa48..c58f87dbde3 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx
@@ -1,7 +1,7 @@
-% $Id: naustrian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: naustrian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{naustrian.lbx}
-[\abx@lbxid $Id: naustrian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: naustrian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx
index 078482f57aa..64f70bc49c7 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx
@@ -1,7 +1,7 @@
-% $Id: newzealand.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: newzealand.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{newzealand.lbx}
-[\abx@lbxid $Id: newzealand.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: newzealand.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx
index 711b13d6db3..0bedcdac44c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx
@@ -1,7 +1,7 @@
-% $Id: ngerman.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: ngerman.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{ngerman.lbx}
-[\abx@lbxid $Id: ngerman.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: ngerman.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * complete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx
index 1f699a3be89..15e3091536f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx
@@ -1,7 +1,7 @@
-% $Id: norsk.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: norsk.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{norsk.lbx}
-[\abx@lbxid $Id: norsk.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: norsk.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * 'norsk' and 'nynorsk' use the same translations, correct?
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
index f54e373023e..2e9e9172c1f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
@@ -1,7 +1,7 @@
-% $Id: norwegian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: norwegian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{norwegian.lbx}
-[\abx@lbxid $Id: norwegian.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: norwegian.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
index 17b8b1e22e4..3b02ce8d1e5 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
@@ -1,7 +1,7 @@
-% $Id: nynorsk.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: nynorsk.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{nynorsk.lbx}
-[\abx@lbxid $Id: nynorsk.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: nynorsk.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * 'norsk' and 'nynorsk' use the same translations, correct?
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/portuges.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/portuges.lbx
index e3112d96e06..0fcccbbecbc 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/portuges.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/portuges.lbx
@@ -1,7 +1,7 @@
-% $Id: portuges.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: portuges.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{portuges.lbx}
-[\abx@lbxid $Id: portuges.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: portuges.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
\InheritBibliographyExtras{portuguese}
\InheritBibliographyStrings{portuguese}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
index 4881f42b6a9..f4697cfd14d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
@@ -1,7 +1,7 @@
-% $Id: portuguese.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: portuguese.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{portuguese.lbx}
-[\abx@lbxid $Id: portuguese.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: portuguese.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * initial draft based on brazilian.lbx
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
index 262276be20c..81485d92114 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
@@ -1,7 +1,7 @@
-% $Id: spanish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: spanish.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{spanish.lbx}
-[\abx@lbxid $Id: spanish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: spanish.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * incomplete
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
index bb188b66b2a..c947aaa7d98 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
@@ -1,7 +1,7 @@
-% $Id: swedish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+% $Id: swedish.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $
\ProvidesFile{swedish.lbx}
-[\abx@lbxid $Id: swedish.lbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+[\abx@lbxid $Id: swedish.lbx,v 0.9e 2010/10/09 16:39:36 lehman beta $]
% STATUS OF THIS FILE
% * incomplete
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 2ba036ada9b..5eb46aad6f4 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -529,7 +529,6 @@ $Master = "$mydir/../..";
'poltawski', "&MAKEcopy",
'popupmenu', "die 'skipping, per author (dps) request'",
'poster', "die 'skipping, requires compilation'",
- 'powerdot', '&MAKEflatten',
'prepr', "die 'skipping, circa 1989, never in TL, await request'",
'preview-latex',"die 'skipping, use preview'",
'progkeys', "die 'skipping, noinfo license, author unfindable'",
@@ -744,6 +743,7 @@ $Master = "$mydir/../..";
'cm-super' => '&PREHOOK_cm_super',
'fixme' => '&PREHOOK_fixme',
'ibygrk' => '&PREHOOK_ibygrk',
+ 'powerdot' => '&PREHOOK_powerdot',
'skb' => '&PREHOOK_flatten1',
'suftesi' => '&PREHOOK_flatten1',
'vhistory' => '&PREHOOK_vhistory',
@@ -3842,6 +3842,13 @@ sub PREHOOK_flatten1
&SYSTEM ("$MV */* .");
}
+sub PREHOOK_powerdot
+{
+ print "PREHOOK_$package - flatten1 + ignore run dir\n";
+ &SYSTEM ("$RM -rf run");
+ &SYSTEM ("$MV */* .");
+}
+
sub PREHOOK_ibygrk
{
print "PREHOOK_$package - handle ibycus4.map\n";