diff options
| author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2011-08-02 18:35:15 +0000 |
|---|---|---|
| committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2011-08-02 18:35:15 +0000 |
| commit | c047122dd76be17f819bf86afd136bddf9f8c41f (patch) | |
| tree | b0068c3692a312dbad2025085e4e40bf0300d8dc | |
| parent | a9aa077338c951ba3f5d90d923b4bb548dc7b3d8 (diff) | |
biblatex 1.6 2011/07/29
git-svn-id: svn://tug.org/texlive/trunk@23324 c570f23f-e606-0410-a88d-b1316a301751
91 files changed, 867 insertions, 595 deletions
diff --git a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst index 7e982cabc32..adc09d3fad3 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: biblatex.bst,v 1.6 2011/07/29 19:21:28 lehman stable $ % Copyright (c) 2006-2011 Philipp Lehman. % @@ -175,7 +175,7 @@ STRINGS { ctrl.alphaothers templist tempstrga tempstrgb resvstrga last.name last.hash last.year last.extra } FUNCTION {initialize} { - "$Revision: 1.5 $" + "$Revision: 1.6 $" #12 entry.max$ substring$ #-3 entry.max$ substring$ "Biblatex version: " swap$ * top$ @@ -313,7 +313,7 @@ FUNCTION {truncate} { if$ } -FUNCTION {normalize} { +FUNCTION {purify} { duplicate$ empty$ { pop$ "" } { purify$ @@ -328,6 +328,20 @@ FUNCTION {normalize} { if$ } +FUNCTION {normalize} { + duplicate$ empty$ + { pop$ "" } + { ctrl.bibtex8 + ctrl.cssort + and + 'skip$ + { "l" change.case$ } + if$ + truncate + } + if$ +} + FUNCTION {enquote} { "'" swap$ * "'" * } @@ -381,7 +395,7 @@ FUNCTION {push:cite} { FUNCTION {push:presort} { presort empty$ { "mm" } - { presort normalize + { presort purify #1 #2 substring$ "l" change.case$ } if$ @@ -496,7 +510,7 @@ FUNCTION {shortname:hash} { FUNCTION {push:name:namehash} { push:shortname duplicate$ empty$ { pop$ push:sorttitle duplicate$ empty$ - { pop$ push:cite normalize } + { pop$ push:cite purify } 'skip$ if$ } @@ -507,7 +521,7 @@ FUNCTION {push:name:namehash} { FUNCTION {push:name:fullhash} { push:fullname duplicate$ empty$ { pop$ push:sorttitle duplicate$ empty$ - { pop$ push:cite normalize } + { pop$ push:cite purify } 'skip$ if$ } @@ -846,7 +860,7 @@ FUNCTION {sortkey:init:label} { { pop$ push:sorttitle } { check:sortname sortkey:name:format } if$ - normalize 'sortkey.name := + purify 'sortkey.name := sortyear empty$ { dateyear dateendyear empty$ @@ -864,8 +878,8 @@ FUNCTION {sortkey:init:label} { } { sortyear } if$ - normalize 'sortkey.year := - push:sorttitle normalize 'sortkey.title := + purify 'sortkey.year := + push:sorttitle purify 'sortkey.title := } FUNCTION {sortkey:init:main} { @@ -873,7 +887,7 @@ FUNCTION {sortkey:init:main} { { pop$ push:sorttitle } { check:sortname sortkey:name:format } if$ - normalize 'sortkey.name := + purify 'sortkey.name := } FUNCTION {sortkey:main:string} { @@ -882,19 +896,19 @@ FUNCTION {sortkey:main:string} { sortkey.name delimiter.1 * sortkey.title * delimiter.1 * sortkey.year * delimiter.1 * - volume normalize #4 pad.number * delimiter.1 * + volume purify #4 pad.number * delimiter.1 * } { duplicate$ #2 = { pop$ sortkey.name delimiter.1 * sortkey.year * delimiter.1 * sortkey.title * delimiter.1 * - volume normalize #4 pad.number * delimiter.1 * + volume purify #4 pad.number * delimiter.1 * } { #3 = { sortkey.name delimiter.1 * sortkey.year * delimiter.1 * - volume normalize #4 pad.number * delimiter.1 * + volume purify #4 pad.number * delimiter.1 * sortkey.title * } { "" } @@ -922,13 +936,13 @@ FUNCTION {sortkey:main:date} { { pop$ sortyear empty$ { "9999" dateyear sortkey:main:date:year } - { sortyear normalize } + { sortyear purify } if$ } { #2 = { sortyear empty$ { "0" dateyear sortkey:main:date:year } - { sortyear normalize } + { sortyear purify } if$ str.to.int #9999 swap$ - int.to.str$ } @@ -938,7 +952,7 @@ FUNCTION {sortkey:main:date} { if$ sortkey.name * delimiter.1 * sortkey.title * delimiter.1 * - volume normalize #4 pad.number * delimiter.1 * + volume purify #4 pad.number * delimiter.1 * } FUNCTION {sortkey:main} { @@ -955,7 +969,7 @@ FUNCTION {sortkey:main} { { ctrl.sorting #20 < { shorthand empty$ { sortkey.alpha * } - { shorthand normalize * } + { shorthand purify * } if$ delimiter.1 * ctrl.sorting #10 - sortkey:main:string @@ -966,7 +980,7 @@ FUNCTION {sortkey:main} { { sortkey } if$ } - { push:cite normalize } + { push:cite purify } if$ } if$ @@ -1227,7 +1241,7 @@ FUNCTION {output:write:list} { #1 'tempctra := #1 'tempctrb := #0 'tempctrc := - { templist normalize tempctrb global.max$ substring$ num.names$ #0 > } + { templist purify tempctrb global.max$ substring$ num.names$ #0 > } { templist tempctrb #1 substring$ "{" = { tempctrc #1 + 'tempctrc := tempctrb #1 + 'tempctrb := } @@ -1748,7 +1762,7 @@ FUNCTION {input:control:options} { FUNCTION {input:control:version} { input:control:parse - "$Revision: 1.5 $" + "$Revision: 1.6 $" #12 entry.max$ substring$ #-3 entry.max$ substring$ 'tempstrga := @@ -2068,7 +2082,7 @@ FUNCTION {makelabel:alpha:format} { } FUNCTION {makelabel:alpha:year} { - dateyear normalize + dateyear purify #1 #4 substring$ #-1 #2 substring$ } @@ -2136,7 +2150,7 @@ FUNCTION {makelabel:hash:format:full} { FUNCTION {makelabel:ctrl:alpha} { ctrl:labelalpha { label empty$ - { push:cite normalize #1 #3 substring$ + { push:cite purify #1 #3 substring$ "u" change.case$ "t" change.case$ } { label makelabel:alpha:year * } if$ @@ -2187,7 +2201,7 @@ FUNCTION {labelsort:main} { ctrl:skiplab not ctrl.singletitle ctrl.labelyear or and - { label.name normalize delimiter.1 * + { label.name purify delimiter.1 * sortkey.year * delimiter.1 * push:presort * delimiter.1 * sortkey empty$ @@ -2234,10 +2248,10 @@ FUNCTION {labelsort:hash} { namehash empty$ or { "zzzz" 'sort.key$ := } - { namehash normalize delimiter.1 * + { namehash purify delimiter.1 * push:shortname duplicate$ empty$ { pop$ "zzzz" * } - { sortkey:name:format normalize * } + { sortkey:name:format purify * } if$ truncate 'sort.key$ := } @@ -2249,10 +2263,10 @@ FUNCTION {labelsort:fullhash} { fullhash empty$ or { "zzzz" 'sort.key$ := } - { fullhash normalize delimiter.1 * + { fullhash purify delimiter.1 * push:shortname duplicate$ empty$ { pop$ "zzzz" * } - { sortkey:name:format normalize * } + { sortkey:name:format purify * } if$ truncate 'sort.key$ := } @@ -2571,7 +2585,7 @@ SORT FUNCTION {output:main:begin} { "% $ biblatex auxiliary file $" write$ newline$ - "% $ biblatex version " "$Revision: 1.5 $" + "% $ biblatex version " "$Revision: 1.6 $" #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 9328f044651..f54904fb4a6 100644 --- a/Master/texmf-dist/doc/latex/biblatex/README +++ b/Master/texmf-dist/doc/latex/biblatex/README @@ -1,4 +1,4 @@ -$Id: README,v 1.5 2011/06/08 18:45:46 lehman stable $ +$Id: README,v 1.6 2011/07/29 19:21:28 lehman stable $ ABOUT diff --git a/Master/texmf-dist/doc/latex/biblatex/RELEASE b/Master/texmf-dist/doc/latex/biblatex/RELEASE index 5db802a3067..120b203a565 100644 --- a/Master/texmf-dist/doc/latex/biblatex/RELEASE +++ b/Master/texmf-dist/doc/latex/biblatex/RELEASE @@ -1,11 +1,94 @@ -$Id: RELEASE,v 1.5 2011/06/08 18:45:46 lehman stable $ +$Id: RELEASE,v 1.6 2011/07/29 19:21:28 lehman stable $ + +RELEASE NOTES FOR VERSION 1.6 + +* Biber update, new mapping feature + + Biblatex 1.6 requires Biber 0.9.4. It will not work with any + previous release. Biber now supports user-space field mapping. + This means that you can set up mapping rules in the Biber + configuration file to deal with non-standard field names in .bib + files by mapping them to known field names. + +* Revised maxnames/minnames options + + Biber now supports max/mincitenames and max/minbibnames as + separate values. This improvement has prompted a refactoring of + the corresponding package options. In previous versions, there + were three sets of values: + + max/minnames -> backend+frontend default + max/mincitenames -> frontend only + max/minbibnames -> frontend only + + The backend would get max/minnames, the other values were only + used on the LaTeX end, defaulting to max/minnames. Depending on + the citation style, this could lead to ambiguous citations if + max/minnames was out of sync with max/mincitenames. (This wasn't + really obvious from reading the manual.) + + This can no longer happen. The new solution is simpler and + error-proof in this respect. The max/mincitenames and + max/minbibnames options do what their name indicates and are fully + supported by Biber. The max/minnames options now serve as master + options which set both max/minbibnames and max/mincitenames: + + max/minnames -> max/mincitenames + -> max/minbibnames + max/mincitenames -> frontend+backend + max/minbibnames -> frontend+backend + + We didn't bother to update the BibTeX backend as it is due to be + discontinued this fall anyway. The BibTeX backend will get the + max/mincitenames values only. + +* [CAVEAT] Removed local max/minnames and max/minitems options + + As part of the above change, I've removed the local max/minnames + and max/minitems options from \printbibliography and friends to + enforce consistency. Please use the global options instead. + +* Added maxalphanames/minalphanames [Biber only] + + With Biber, the 'labelalpha' field may now be configured + independently of max/mincitenames with the newly introduced + package options max/minalphanames. + +* MD5 hashes, per-name hashes [Biber only] + + With Biber, the hashes provided in the namehash/fullhash fields + are now standard MD5 hashes. This means that they are stable + across multiple runs, multiple refsections, and multiple + documents. + + We've also added per-name hashes. Every name in every name list + gets an MD5 hash, which is available in the 'hash' field. Note + that this field is only available locally in name formatting + directives. + +* Range compression/truncation + + This release features a new command for range compression (i.e., + format "123-128" as "123-8"). The command is configurable, can + handle lists of ranges separated by commas and/or semicolons, and + also normalizes the dashes. Note that combining this with + \mkpageprefix requires the field format to be set up in a specific + way. See \mkcomprange in the manual for details. + + I've also overhauled the command which truncates ranges by only + printing the starting page of the range. The original + \mkpagefirst has been removed because of its awkward syntax. It is + superseded by \mkfirstpage. Note that this change is not + backwards-compatible because the syntax of the new command is + slightly different. You may need to update some format + definitions. RELEASE NOTES FOR VERSION 1.5 * Biber update - Biblatex 1.5 requires Biber 0.9.3 or higher. It will not work with - any previous release. + Biblatex 1.5 requires Biber 0.9.3. It will not work with any + previous release. * More name disambiguation modes [Biber only] diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf Binary files differindex fd5bf642852..2e1f9c64133 100644 --- a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex index a2620276361..9b4df45b42c 100644 --- a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex +++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex @@ -1,4 +1,4 @@ -% $Id: biblatex.tex,v 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: biblatex.tex,v 1.6 2011/07/29 19:21:28 lehman stable $ \documentclass{ltxdockit}[2011/03/25] \usepackage{btxdockit} \usepackage[latin9]{inputenc} @@ -12,7 +12,7 @@ \MakeAutoQuote*{<}{>} \MakeShortVerb{\|} -\rcsid{$Id: biblatex.tex,v 1.5 2011/06/08 18:45:46 lehman stable $} +\rcsid{$Id: biblatex.tex,v 1.6 2011/07/29 19:21:28 lehman stable $} \newcommand*{\biber}{Biber\xspace} \newcommand*{\biblatex}{Biblatex\xspace} @@ -48,6 +48,9 @@ \def\alt{\par\makebox[1.25em][r]{\ensuremath\hookrightarrow}\,}% \def\note##1{\textrm{##1}}} +\providecommand*{\textln}[1]{#1} +\providecommand*{\lnstyle}{} + % markup and misc \setcounter{secnumdepth}{4} @@ -1083,6 +1086,10 @@ A field used to modify the sorting order of the bibliography. Think of this fiel A name or a list of names used to modify the sorting order of the bibliography. If present, this list is used instead of \bibfield{author} or \bibfield{editor} when sorting the bibliography. It is only used internally during sorting. Please refer to \secref{use:srt} for further details. +\fielditem{sortshorthand}{literal\BiberOnlyMark} + +Similar to \bibfield{sortkey} but used in the list of shorthands. If present, \sty{biblatex} uses this field instead of \bibfield{shorthand} when sorting the list of shorthands. This is useful if the \bibfield{shorthand} field holds shorthands with formatting commands such as \cmd{emph} or \cmd{textbf}. This field is only used internally during sorting. + \fielditem{sorttitle}{literal} A field used to modify the sorting order of the bibliography. If present, this field is used instead of the \bibfield{title} field when sorting the bibliography. It is only used internally during sorting. The \bibfield{sorttitle} field may come in handy if you have an entry with a title like «An Introduction to\dots» and want that alphabetized under <I> rather than <A>. In this case, you could put «Introduction to\dots» in the \bibfield{sorttitle} field. Please refer to \secref{use:srt} for further details. @@ -1559,7 +1566,7 @@ These warning messages could indeed indicate that the entry \texttt{Jones1995} i \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} -\tablesetup +\tablesetup\lnstyle \begin{tabularx}{\textwidth}{@{}>{\raggedright\ttfamily}X% @{}>{\raggedright\ttfamily}X% rR{50pt}R{50pt}R{50pt}@{}} @@ -1874,27 +1881,27 @@ Whether or not to sort citations if multiple entry keys are passed to a citation \intitem[3]{maxnames} -A threshold affecting all lists of names (\bibfield{author}, \bibfield{editor}, etc.). If a list exceeds this threshold, \ie if it contains more than \prm{integer} names, it is automatically truncated according to the setting of the \opt{minnames} option. +A threshold affecting all lists of names (\bibfield{author}, \bibfield{editor}, etc.). If a list exceeds this threshold, \ie if it holds more than \prm{integer} names, it is automatically truncated according to the setting of the \opt{minnames} option. \opt{maxnames} is the master option which sets both \opt{maxbibnames} and \opt{maxcitenames}. \intitem[1]{minnames} -A limit affecting all lists of names (\bibfield{author}, \bibfield{editor}, etc.). If a list contains more than \prm{maxnames} names, it is automatically truncated to \prm{minnames} names in citations and in the bibliography. This also affects the sorting of the bibliography and the generation of labels. The \prm{minnames} value must be smaller than or equal to \prm{maxnames}. +A limit affecting all lists of names (\bibfield{author}, \bibfield{editor}, etc.). If a list holds more than \prm{maxnames} names, it is automatically truncated to \prm{minnames} names. The \prm{minnames} value must be smaller than or equal to \prm{maxnames}. \opt{minnames} is the master option which sets both \opt{minbibnames} and \opt{mincitenames}. \intitem[\prm{maxnames}]{maxbibnames} -The \opt{maxnames} and \opt{minnames} options may also be used locally in the optional arguments of \cmd{printbibliography} and \cmd{printshorthands} (see \secref{use:bib:bib,use:bib:los}). The \opt{maxbibnames} and \opt{minbibnames} options have precisely the same effect, except that they are settable in the preamble. Note that \prm{maxbibnames} should normally not be less then \prm{maxnames} because the latter affects the generation of labels. +Similar to \opt{maxnames} but affects only the bibliography. \intitem[\prm{minnames}]{minbibnames} -Similar to \opt{maxbibnames} but defining the lower limit. This value must must be smaller than or equal to \prm{maxbibnames}. Note that \prm{minbibnames} should normally not be less then \prm{minnames} because the latter affects the generation of labels. +Similar to \opt{minnames} but affects only the bibliography. \intitem[\prm{maxnames}]{maxcitenames} -The number of names printed in citations normally corresponds to the \prm{maxnames} and \prm{minnames} values. The \opt{maxcitenames} and \opt{mincitenames} options define different values for use in all citations. Note that \prm{maxcitenames} should normally not be less then \prm{maxnames} because the latter affects the generation of labels. +Similar to \opt{maxnames} but affects only the citations in the document body. \intitem[\prm{minnames}]{mincitenames} -Similar to \opt{maxcitenames} but defining the lower limit. This value must be smaller than or equal to \prm{maxcitenames}. Note that \prm{mincitenames} should normally not be less then \prm{minnames} because the latter affects the generation of labels. +Similar to \opt{minnames} but affects only the citations in the document body. \intitem[3]{maxitems} @@ -2074,7 +2081,7 @@ This option controls whether external files requested by way of the \cmd{printfi \optitem[none]{refsection}{\opt{none}, \opt{part}, \opt{chapter}, \opt{section}, \opt{subsection}} -This option automatically starts a new reference section at a document division such as a chapter or a section. This is equivalent to a \cmd{newrefsection} command, see \secref{use:bib:sec} for details. The following choice of document divisions is available: +This option automatically starts a new reference section at a document division such as a chapter or a section. This is equivalent to the \cmd{newrefsection} command, see \secref{use:bib:sec} for details. The following choice of document divisions is available: \begin{valuelist} \item[none] Disable this feature. @@ -2083,10 +2090,12 @@ This option automatically starts a new reference section at a document division \item[section] Start a reference section at every \cmd{section} command. \item[subsection] Start a reference section at every \cmd{subsection} command. \end{valuelist} +% +The starred versions if these commands will not start a new reference section. \optitem[none]{refsegment}{\opt{none}, \opt{part}, \opt{chapter}, \opt{section}, \opt{subsection}} -Similar to the \opt{refsection} option but starts a new reference segment. This is equivalent to a \cmd{newrefsegment} command, see \secref{use:bib:seg} for details. When using both options, note that you can only apply this option to a lower"=level document division than the one \opt{refsection} is applied to and that nested reference segments will be local to the enclosing reference section. +Similar to the \opt{refsection} option but starts a new reference segment. This is equivalent to the \cmd{newrefsegment} command, see \secref{use:bib:seg} for details. When using both options, note that you can only apply this option to a lower"=level document division than the one \opt{refsection} is applied to and that nested reference segments will be local to the enclosing reference section. \optitem[none]{citereset}{\opt{none}, \opt{part}, \opt{chapter}, \opt{section}, \opt{subsection}} @@ -2099,6 +2108,8 @@ This option automatically executes the \cmd{citereset} command from \secref{use: \item[section] Perform a reset at every \cmd{section} command. \item[subsection] Perform a reset at every \cmd{subsection} command. \end{valuelist} +% +The starred versions if these commands will not trigger a reset. \boolitem[true]{abbreviate} @@ -2379,7 +2390,15 @@ This option controls the format of initials generated by \sty{biblatex}. If enab \boolitem[false]{labelalpha} Whether or not to provide the special fields \bibfield{labelalpha} and \bibfield{extraalpha}, see \secref{aut:bbx:fld} for details. -\BiberOnlyMark With Biber, this option is also settable on a per-type basis. +\BiberOnlyMark With Biber, this option is also settable on a per-type basis. See also \opt{maxalphanames} and \opt{minalphanames}. + +\intitem[3]{maxalphanames}[\BiberOnly] + +Similar to the \opt{maxnames} option but customizes the format of the \bibfield{labelalpha} field. + +\intitem[1]{minalphanames}[\BiberOnly] + +Similar to the \opt{minnames} option but customizes the format of the \bibfield{labelalpha} field. \boolitem[false]{labelnumber} @@ -2680,7 +2699,7 @@ This style prints all bibliographic data in tabular format. It is intended for d This package supports various sorting schemes for the bibliography. The sorting scheme is selected with the \opt{sorting} package option from \secref{use:opt:pre:gen}. Apart from the regular data fields there are also some special fields which may be used to optimize the sorting of the bibliography. \Apxref{apx:srt:a1, apx:srt:a2} give an outline of the alphabetic sorting schemes supported by \sty{biblatex}. Chronological sorting schemes are listed in \apxref{apx:srt:chr}. A few explanations concerning these schemes are in order. -The first item considered in the sorting process is always the \bibfield{presort} field of the entry. If this field is undefined, \sty{biblatex} will use the default value <\texttt{mm}> as a presort string. The next item considered is the \bibfield{sortkey} field. If this field is defined, it serves as the master sort key. Apart from the \bibfield{presort} field, no further data is considered in this case. If the \bibfield{sortkey} field is undefined, sorting continues with the name. The package will try using the \bibfield{sortname}, \bibfield{author}, \bibfield{editor}, and \bibfield{translator} fields, in this order. Which fields are considered also depends on the setting of the \opt{useauthor}, \opt{useeditor}, and \opt{usetranslator} options. If all three of them are disabled, the \bibfield{sortname} field is ignored as well. Note that all name fields are responsive to the setting of the global \opt{maxnames} and \opt{minnames} options. If no name field is available, either because all of them are undefined or because \opt{useauthor}, \opt{useeditor}, and \opt{usetranslator} are disabled, \sty{biblatex} will fall back to the \bibfield{sorttitle} and \bibfield{title} fields as a last resort. The remaining items are, in various order: the \bibfield{sortyear} field, if defined, or the first four digits of the \bibfield{year} field otherwise; the \bibfield{sorttitle} field, if defined, or the \bibfield{title} field otherwise; the \bibfield{volume} field, which is padded to four digits with leading zeros, or the string \texttt{0000} otherwise. Note that the sorting schemes shown in \apxref{apx:srt:a2} include an additional item: \bibfield{labelalpha} is the label used by <alphabetic> bibliography styles. Strictly speaking, the string used for sorting is \bibfield{labelalpha}~+ \bibfield{extraalpha}. The sorting schemes in \apxref{apx:srt:a2} are intended to be used in conjunction with alphabetic styles only. +The first item considered in the sorting process is always the \bibfield{presort} field of the entry. If this field is undefined, \sty{biblatex} will use the default value <\texttt{mm}> as a presort string. The next item considered is the \bibfield{sortkey} field. If this field is defined, it serves as the master sort key. Apart from the \bibfield{presort} field, no further data is considered in this case. If the \bibfield{sortkey} field is undefined, sorting continues with the name. The package will try using the \bibfield{sortname}, \bibfield{author}, \bibfield{editor}, and \bibfield{translator} fields, in this order. Which fields are considered also depends on the setting of the \opt{useauthor}, \opt{useeditor}, and \opt{usetranslator} options. If all three of them are disabled, the \bibfield{sortname} field is ignored as well. Note that all name fields are responsive to \opt{maxnames} and \opt{minnames}. If no name field is available, either because all of them are undefined or because \opt{useauthor}, \opt{useeditor}, and \opt{usetranslator} are disabled, \sty{biblatex} will fall back to the \bibfield{sorttitle} and \bibfield{title} fields as a last resort. The remaining items are, in various order: the \bibfield{sortyear} field, if defined, or the first four digits of the \bibfield{year} field otherwise; the \bibfield{sorttitle} field, if defined, or the \bibfield{title} field otherwise; the \bibfield{volume} field, which is padded to four digits with leading zeros, or the string \texttt{0000} otherwise. Note that the sorting schemes shown in \apxref{apx:srt:a2} include an additional item: \bibfield{labelalpha} is the label used by <alphabetic> bibliography styles. Strictly speaking, the string used for sorting is \bibfield{labelalpha}~+ \bibfield{extraalpha}. The sorting schemes in \apxref{apx:srt:a2} are intended to be used in conjunction with alphabetic styles only. The chronological sorting schemes presented in \apxref{apx:srt:chr} also make use of the \bibfield{presort} and \bibfield{sortkey} fields, if defined. The next item considered is the \bibfield{sortyear} or the \bibfield{year} field, depending on availability. The \opt{ynt} scheme extracts the first four Arabic figures from the field. If both fields are undefined, the string \texttt{9999} is used as a fallback value. This means that all entries without a year will be moved to the end of the list. The \opt{ydnt} scheme is similar in concept but sorts the year in descending order. As with the \opt{ynt} scheme, the string \texttt{9999} is used as a fallback value. The remaining items are similar to the alphabetic sorting schemes discussed above. Note that the \opt{ydnt} sorting scheme will only sort the date in descending order. All other items are sorted in ascending order as usual. @@ -2782,22 +2801,6 @@ The prenote is an arbitrary piece of text to be printed after the heading but be The postnote is an arbitrary piece of text to be printed after the list of references. This option selects the postnote \prm{name}, as defined with \cmd{defbibnote}. By default, no postnote is printed. The note is printed in the standard text font. It is not affected by \cmd{bibsetup} and \cmd{bibfont} but it may contain its own font declarations. See \secref{use:bib:nts} for details. -\intitem{maxnames} - -The threshold for all lists of names. This option overrides the \opt{maxnames} package option locally. The value may not be smaller than the global setting. - -\intitem{minnames} - -The name limit affecting all lists of names. This option overrides the \opt{minnames} package option locally. The value may not be smaller than the global setting. - -\intitem{maxitems} - -The threshold for all literal lists. This option overrides the \opt{maxitems} package option locally. - -\intitem{minitems} - -The item limit affecting all literal lists. This option overrides the \opt{minitems} package option locally. - \intitem[0]{section} Print only entries cited in reference section \prm{integer}. The reference sections are numbered starting at~1. All citations given outside a \env{refsection} environment are assigned to section~0. See \secref{use:bib:sec} for details and \secref{use:use:mlt} for usage examples. When giving a chain of multiple filters, the \texttt{section} filter must always be given first. @@ -2864,15 +2867,15 @@ This option applies to numerical citation\slash bibliography styles only and req \cmditem{bibbysection}[key=value, \dots] -This command automatically loops over all reference sections. This is equivalent to giving one \cmd{printbibliography} command for every section but has the additional benefit of automatically skipping sections without references. Note that \cmd{bibbysection} starts looking for references in section \texttt{1}. It will ignore references given outside of \env{refsection} environments since they are assigned to section~0. See \secref{use:use:mlt} for usage examples. The options are a subset of those supported by \cmd{printbibliography}. Valid options are \opt{env}, \opt{heading}, \opt{prenote}, \opt{postnote}, \opt{maxnames}, \opt{minnames}, \opt{maxitems}, \opt{minitems}. +This command automatically loops over all reference sections. This is equivalent to giving one \cmd{printbibliography} command for every section but has the additional benefit of automatically skipping sections without references. Note that \cmd{bibbysection} starts looking for references in section \texttt{1}. It will ignore references given outside of \env{refsection} environments since they are assigned to section~0. See \secref{use:use:mlt} for usage examples. The options are a subset of those supported by \cmd{printbibliography}. Valid options are \opt{env}, \opt{heading}, \opt{prenote}, \opt{postnote}. \cmditem{bibbysegment}[key=value, \dots] -This command automatically loops over all reference segments. This is equivalent to giving one \cmd{printbibliography} command for every segment but has the additional benefit of automatically skipping segments without references. Note that \cmd{bibbysegment} starts looking for references in segment \texttt{1}. It will ignore references given outside of \env{refsegment} environments since they are assigned to segment~0. See \secref{use:use:mlt} for usage examples. The options are a subset of those supported by \cmd{printbibliography}. Valid options are \opt{env}, \opt{heading}, \opt{prenote}, \opt{postnote}, \opt{maxnames}, \opt{minnames}, \opt{maxitems}, \opt{minitems}, and \opt{section}. +This command automatically loops over all reference segments. This is equivalent to giving one \cmd{printbibliography} command for every segment but has the additional benefit of automatically skipping segments without references. Note that \cmd{bibbysegment} starts looking for references in segment \texttt{1}. It will ignore references given outside of \env{refsegment} environments since they are assigned to segment~0. See \secref{use:use:mlt} for usage examples. The options are a subset of those supported by \cmd{printbibliography}. Valid options are \opt{env}, \opt{heading}, \opt{prenote}, \opt{postnote}. \cmditem{bibbycategory}[key=value, \dots] -This command loops over all bibliography categories. This is equivalent to giving one \cmd{printbibliography} command for every category but has the additional benefit of automatically skipping empty categories. The categories are processed in the order in which they were declared. See \secref{use:use:mlt} for usage examples. The options are a subset of those supported by \cmd{printbibliography}. Valid options are \opt{env}, \opt{prenote}, \opt{postnote}, \opt{maxnames}, \opt{minnames}, \opt{maxitems}, \opt{minitems}, and \opt{section}. Note that \opt{heading} is not available with this command. The name of the current category is automatically used as the heading name. This is equivalent to passing \texttt{heading=\prm{category}} to \cmd{printbibliography} and implies that there must be a matching heading definition for every category. +This command loops over all bibliography categories. This is equivalent to giving one \cmd{printbibliography} command for every category but has the additional benefit of automatically skipping empty categories. The categories are processed in the order in which they were declared. See \secref{use:use:mlt} for usage examples. The options are a subset of those supported by \cmd{printbibliography}. Valid options are \opt{env}, \opt{prenote}, \opt{postnote}, \opt{section}. Note that \opt{heading} is not available with this command. The name of the current category is automatically used as the heading name. This is equivalent to passing \texttt{heading=\prm{category}} to \cmd{printbibliography} and implies that there must be a matching heading definition for every category. \cmditem{printbibheading}[key=value, \dots] @@ -3350,7 +3353,7 @@ Similar to \cmd{fullcite} but puts the entire citation in a footnote and adds a \cmditem{volcite}[prenote]{volume}[page]{key} \cmditem{Volcite}[prenote]{volume}[page]{key} -These commands are similar to \cmd{cite} and \cmd{Cite} but intended for references to multi"=volume works which are cited by volume and page number. Instead of the \prm{postnote}, they take a mandatory \prm{volume} and an optional \prm{page} argument. Since they merely compose the postnote and pass it to the \cmd{cite} command provided by the citation style as a \prm{postnote} argument, these commands are style independent. +These commands are similar to \cmd{cite} and \cmd{Cite} but intended for references to multi"=volume works which are cited by volume and page number. Instead of the \prm{postnote}, they take a mandatory \prm{volume} and an optional \prm{page} argument. Since they merely compose the postnote and pass it to the \cmd{cite} command provided by the citation style as a \prm{postnote} argument, these commands are style independent. The format of the volume portion is controlled by the field formatting directive \opt{volcitevolume}, the format of the page/text portion is controlled by the field formatting directive \opt{volcitepages}. \cmditem{pvolcite}[prenote]{volume}[page]{key} \cmditem{Pvolcite}[prenote]{volume}[page]{key} @@ -3783,7 +3786,7 @@ The delimiter printed between the author\slash editor and the year by author-yea \csitem{labelalphaothers} -A string to be appended to the non"=numeric portion of the \bibfield{labelalpha} field (\ie the field holding the citation label used by alphabetic citation styles) if the number of authors\slash editors exceeds the \opt{maxnames} threshold or the \bibfield{author}\slash \bibfield{editor} list was truncated in the \file{bib} file with the keyword <\texttt{and others}>. This will typically be a single character such as a plus sign or an asterisk. The default is a plus sign. This command may also be redefined to an empty string to disable this feature. In any case, it must be redefined in the preamble. +A string to be appended to the non"=numeric portion of the \bibfield{labelalpha} field (\ie the field holding the citation label used by alphabetic citation styles) if the number of authors\slash editors exceeds the \opt{maxalphanames} threshold or the \bibfield{author}\slash \bibfield{editor} list was truncated in the \file{bib} file with the keyword <\texttt{and others}>. This will typically be a single character such as a plus sign or an asterisk. The default is a plus sign. This command may also be redefined to an empty string to disable this feature. In any case, it must be redefined in the preamble. \csitem{sortalphaothers} @@ -4998,25 +5001,17 @@ When citing a subentry of an entry set, \sty{biblatex} provides the data of the This field holds an integer indicating the position of a set member in the entry set (starting at \texttt{1}). This field is only available in the subentries of an entry set. +\fielditem{hash}{string\BiberOnlyMark} + +This field is special in that it is only available locally in name formatting directives. It holds a hash string which uniquely identifies individual names in a name list. This information is available for all names in all name lists. See also \bibfield{namehash} and \bibfield{fullhash}. + \fielditem{namehash}{string} -A unique hash string derived from the \bibfield{labelname} list. This is intended for recurrence checks. For example, a citation style wich replaces recurrent authors or editors with a string like <idem> could save the \bibfield{namehash} field with \cmd{savefield} and use it in a comparison with \cmd{iffieldequals} later (see \secref{aut:aux:dat, aut:aux:tst}). The \bibfield{namehash} is derived from the truncated \bibfield{labelname} list, \ie it is responsive to the global \opt{maxnames} and \opt{minnames} options. It is automatically sanitized such that the hash may safely be used in the formation of control sequence names. It is not intended for printing. See also \bibfield{fullhash}. +A hash string which uniquely identifies the \bibfield{labelname} list. This is useful for recurrence checks. For example, a citation style wich replaces recurrent authors or editors with a string like <idem> could save the \bibfield{namehash} field with \cmd{savefield} and use it in a comparison with \cmd{iffieldequals} later (see \secref{aut:aux:dat, aut:aux:tst}). The \bibfield{namehash} is derived from the truncated \bibfield{labelname} list, \ie it is responsive to \opt{maxnames} and \opt{minnames}. See also \bibfield{hash} and \bibfield{fullhash}. \fielditem{fullhash}{string} -Like \bibfield{namehash}, this field is a unique hash string referring to the primary name of the entry. It differs from \bibfield{namehash} in two respects: 1) The \bibfield{shortauthor} and \bibfield{shorteditor} lists are ignored when generating the hash. 2) It is always derived from the full list, ignoring the \opt{maxnames} and \opt{minnames} options. For example, with \kvopt{maxnames}{1}, the following two entries will have the same \bibfield{namehash} but different \bibfield{fullhash} values: - -\begin{lstlisting}[style=bibtex]{} -@Article{..., - author = {Doe, John and Jones, Edward}, - ... - -@Article{..., - author = {Doe, John and Williams, Joe}, - ... -\end{lstlisting} -% -The \bibfield{fullhash} field is automatically sanitized such that the hash may safely be used in the formation of control sequence names. It is not intended for printing. See also \bibfield{namehash}. +A hash string which uniquely identifies the \bibfield{labelname} list. This fields differs from \bibfield{namehash} in two details: 1) The \bibfield{shortauthor} and \bibfield{shorteditor} lists are ignored when generating the hash. 2) The hash always refers to the full list, ignoring \opt{maxnames} and \opt{minnames}. See also \bibfield{hash} and \bibfield{namehash}. \listitem{pageref}{literal} @@ -6285,7 +6280,7 @@ The problem with this convention is that the braces will suppress the kerning on \cmditem{mkpageprefix}[pagination][postpro]{text} -This command is intended for use in field formatting directives which format the page numbers in the \prm{postnote} argument of citation commands and the \bibfield{pages} field of bibliography entries. It will parse its \prm{text} argument and prefix it with <p.> or <pp.> by default. The optional \prm{pagination} argument holds the name of a field indicating the pagination type. This may be either \bibfield{pagination} or \bibfield{bookpagination}, with \bibfield{pagination} being the default. The spacing between the prefix and the \prm{text} may be modified by redefining \cmd{ppspace}. The default is an unbreakable interword space. See \secref{bib:use:pag, use:cav:pag} for further details. See also \cmd{DeclareNumChars}, \cmd{DeclareRangeChars}, \cmd{DeclareRangeCommands}, and \cmd{NumCheckSetup}. The optional \prm{postpro} argument specifies a macro to be used for post-processing the \prm{text}. This must be a macro taking one mandatory argument. If only one optional argument is given, it is taken as \prm{pagination}. Here are two typical examples: +This command is intended for use in field formatting directives which format the page numbers in the \prm{postnote} argument of citation commands and the \bibfield{pages} field of bibliography entries. It will parse its \prm{text} argument and prefix it with <p.> or <pp.> by default. The optional \prm{pagination} argument holds the name of a field indicating the pagination type. This may be either \bibfield{pagination} or \bibfield{bookpagination}, with \bibfield{pagination} being the default. The spacing between the prefix and the \prm{text} may be modified by redefining \cmd{ppspace}. The default is an unbreakable interword space. See \secref{bib:use:pag, use:cav:pag} for further details. See also \cmd{DeclareNumChars}, \cmd{DeclareRangeChars}, \cmd{DeclareRangeCommands}, and \cmd{NumCheckSetup}. The optional \prm{postpro} argument specifies a macro to be used for post-processing the \prm{text}. If only one optional argument is given, it is taken as \prm{pagination}. Here are two typical examples: \begin{lstlisting}[style=latex]{} \DeclareFieldFormat{postnote}{<<\mkpageprefix[pagination]{#1}>>} @@ -6296,7 +6291,7 @@ The optional argument \bibfield{pagination} in the first example is omissible. \cmditem{mkpagetotal}[pagination][postpro]{text} -This command is similar to \cmd{mkpageprefix} except that it is intended for the \bibfield{pagetotal} field of bibliography entries, \ie it will print «123 pages» rather than «page 123». The optional \prm{pagination} argument defaults to \bibfield{bookpagination}. The spacing inserted between the pagination suffix and the \prm{text} may be modified by redefining the macro \cmd{ppspace}. The optional \prm{postpro} argument specifies a macro to be used for post-processing the \prm{text}. This must be a macro taking one mandatory argument. If only one optional argument is given, it is taken as \prm{pagination}. Here is a typical example: +This command is similar to \cmd{mkpageprefix} except that it is intended for the \bibfield{pagetotal} field of bibliography entries, \ie it will print «123 pages» rather than «page 123». The optional \prm{pagination} argument defaults to \bibfield{bookpagination}. The spacing inserted between the pagination suffix and the \prm{text} may be modified by redefining the macro \cmd{ppspace}. The optional \prm{postpro} argument specifies a macro to be used for post-processing the \prm{text}. If only one optional argument is given, it is taken as \prm{pagination}. Here is a typical example: \begin{lstlisting}[style=latex]{} \DeclareFieldFormat{pagetotal}{<<\mkpagetotal[bookpagination]{#1}>>} @@ -6304,10 +6299,55 @@ This command is similar to \cmd{mkpageprefix} except that it is intended for the % The optional argument \bibfield{bookpagination} is omissible in this case. -\cmditem{mkpagefirst}[pagination][postpro]{text} -\cmditem*{mkpagefirst*}[postpro]{text} +\begin{table} +\tablesetup\lnstyle +\begin{tabularx}{\textwidth}{@{}>{\ttfamily}X@{}p{0.25\textwidth}@{}p{0.25\textwidth}@{}p{0.25\textwidth}@{}} +\toprule +\multicolumn{1}{@{}H}{Input} & +\multicolumn{3}{@{}H}{Output} \\ +\cmidrule(r){1-1}\cmidrule{2-4} +& \multicolumn{1}{@{}H}{\ttfamily mincomprange=10} +& \multicolumn{1}{@{}H}{\ttfamily mincomprange=100} +& \multicolumn{1}{@{}H}{\ttfamily mincomprange=1000} \\ +\cmidrule(r){2-2}\cmidrule(r){3-3}\cmidrule{4-4} +11--15 & 11--5 & 11--15 & 11--15 \\ +111--115 & 111--5 & 111--5 & 111--115 \\ +1111--1115 & 1111--5 & 1111--5 & 1111--5 \\ +\cmidrule{2-4} +& \multicolumn{1}{@{}H}{\ttfamily maxcomprange=1000} +& \multicolumn{1}{@{}H}{\ttfamily maxcomprange=100} +& \multicolumn{1}{@{}H}{\ttfamily maxcomprange=10} \\ +\cmidrule(r){2-2}\cmidrule(r){3-3}\cmidrule{4-4} +1111--1115 & 1111--5 & 1111--5 & 1111--5 \\ +1111--1155 & 1111--55 & 1111--55 & 1111--1155 \\ +1111--1555 & 1111--555 & 1111--1555 & 1111--1555 \\ +\cmidrule{2-4} +& \multicolumn{1}{@{}H}{\ttfamily mincompwidth=1} +& \multicolumn{1}{@{}H}{\ttfamily mincompwidth=10} +& \multicolumn{1}{@{}H}{\ttfamily mincompwidth=100} \\ +\cmidrule(r){2-2}\cmidrule(r){3-3}\cmidrule{4-4} +1111--1115 & 1111--5 & 1111--15 & 1111--115 \\ +1111--1155 & 1111--55 & 1111--55 & 1111--155 \\ +1111--1555 & 1111--555 & 1111--555 & 1111--555 \\ +\bottomrule +\end{tabularx} +\caption{\cmd{mkcomprange} setup} +\label{aut:aux:tab1} +\end{table} + +\cmditem{mkcomprange}[postpro]{text} + +This command, which is intended for use in field formatting directives, will parse its \prm{text} argument for page ranges and compress them. For example, «125--129» may be formatted as «125--9». You may configure the behavior of \cmd{mkcomprange} by adjusting the \latex counters \cnt{mincomprange}, \cnt{maxcomprange}, and \cnt{mincompwidth}, as illustrated in \tabref{aut:aux:tab1}. The default settings are \texttt{10}, \texttt{100000}, and \texttt{1}, respectively. This means that the command tries to compress as much as possible by default. Use \cmd{setcounter} to adjust the parameters. The scanner recognizes \cmd{bibrangedash} and hyphens as range dashes. It will normalize the dash by replacing any number of consecutive hyphens with \cmd{bibrangedash}. Lists of ranges delimited with commas and/or semicolons are also supported. If you want to hide a character from the list/range scanner for some reason, wrap the character or the entire string in curly braces. The optional \prm{postpro} argument specifies a macro to be used for post-processing the \prm{text}. This is important if you want to combine \cmd{mkcomprange} with other formatting macros which also need to parse their \prm{text} argument, such as \cmd{mkpageprefix}. Simply nesting these commands will not work as expected. Use the \prm{postpro} argument to set up the processing chain as follows: + +\begin{lstlisting}[style=latex]{} +\DeclareFieldFormat{postnote}{\mkcomprange[<<{>>\mkpageprefix[pagination]<<}>>]{#1}} +\end{lstlisting} +% +Note that \cmd{mkcomprange} is executed first, using \cmd{mkpageprefix} as post-processor. Also note that the \prm{postpro} argument is wrapped in an additional pair of braces. This is only required in this particular case to prevent \latex's optional argument scanner from getting confused by the nested brackets. + +\cmditem{mkfirstpage}[postpro]{text} -This command, which is intended for use in field formatting directives, will parse its \prm{text} argument for page ranges and print the start page of the range. The regular version uses \cmd{mkpageprefix} to format the \prm{text} after truncation, passing the \prm{pagination} and/or \prm{postpro} arguments to \cmd{mkpageprefix}. The starred version prints the truncated \prm{text} as is. The optional \prm{postpro} argument specifies a macro to be used for post-processing the \prm{text}. This must be a macro taking one mandatory argument. +This command, which is intended for use in field formatting directives, will parse its \prm{text} argument for page ranges and print the start page of the range only. The scanner recognizes \cmd{bibrangedash} and hyphens as range dashes. Lists of ranges delimited with commas and/or semicolons are also supported. If you want to hide a character from the list/range scanner for some reason, wrap the character or the entire string in curly braces. The optional \prm{postpro} argument specifies a macro to be used for post-processing the \prm{text}. See \cmd{mkcomprange} on how to use this argument. \cmditem{DeclareNumChars}{characters} \cmditem*{DeclareNumChars*}{characters} @@ -7682,6 +7722,14 @@ A special formatting directive for use with \cmd{printfield} and \cmd{printtext} A special formatting directive for use with \cmd{printfield} and \cmd{printtext}. It wraps its argument in a \cmd{bibhypertarget} command, see \secref{aut:aux:msc} for details. The \prm{name} argument passed to \cmd{bibhypertarget} is the value of the \bibfield{entrykey} field. +\optitem{volcitepages} + +A special formatting directive which controls the format of the page\slash text portion in the argument of citation commands like \cmd{volcite}. + +\optitem{volcitevolume} + +A special formatting directive which controls the format of the volume portion in the argument of citation commands like \cmd{volcite}. + \end{ltxsyntax} \subsubsection{Auxiliary Lengths, Counters, and Other Features} @@ -8714,6 +8762,35 @@ This revision history is a list of changes relevant to users of this package. Ch \begin{changelog} +\begin{release}{1.6}{2011-07-29} +\item Added special field \bibfield{sortshorthand}\see{bib:fld:spc}\BiberOnlyMark +\item Revised options \opt{maxnames}/\opt{minnames}\see{use:opt:pre:gen} +\item Options \opt{maxcitenames}/\opt{mincitenames} now supported by backend\see{use:opt:pre:gen}\BiberOnlyMark +\item Options \opt{maxbibnames}/\opt{minbibnames} now supported by backend\see{use:opt:pre:gen}\BiberOnlyMark +\item Added options \opt{maxalphanames}/\opt{minalphanames}\see{use:opt:pre:int}\BiberOnlyMark +\item Removed local options \opt{maxnames}/\opt{minnames} from \cmd{printbibliography}\see{use:bib:bib} +\item Removed local options \opt{maxitems}/\opt{minitems} from \cmd{printbibliography}\see{use:bib:bib} +\item Removed local options \opt{maxnames}/\opt{minnames} from \cmd{bibbysection}\see{use:bib:bib} +\item Removed local options \opt{maxitems}/\opt{minitems} from \cmd{bibbysection}\see{use:bib:bib} +\item Removed local options \opt{maxnames}/\opt{minnames} from \cmd{bibbysegment}\see{use:bib:bib} +\item Removed local options \opt{maxitems}/\opt{minitems} from \cmd{bibbysegment}\see{use:bib:bib} +\item Removed local options \opt{maxnames}/\opt{minnames} from \cmd{bibbycategory}\see{use:bib:bib} +\item Removed local options \opt{maxitems}/\opt{minitems} from \cmd{bibbycategory}\see{use:bib:bib} +\item Removed local options \opt{maxnames}/\opt{minnames} from \cmd{printshorthands}\see{use:bib:los} +\item Removed local options \opt{maxitems}/\opt{minitems} from \cmd{printshorthands}\see{use:bib:los} +\item Added special field format \bibfield{volcitevolume}\see{use:cit:spc} +\item Added special field format \bibfield{volcitepages}\see{use:cit:spc} +\item Added special field \bibfield{hash}\see{aut:bbx:fld:gen}\BiberOnlyMark +\item Added \cmd{mkcomprange}\see{aut:aux:msc} +\item Added \cmd{mkfirstpage}\see{aut:aux:msc} +\item Removed \cmd{mkpagefirst}\see{aut:aux:msc} +\item Fixed some bugs +\end{release} + +\begin{release}{1.5a}{2011-06-17} +\item Fixed some bugs +\end{release} + \begin{release}{1.5}{2011-06-08} \item Added option \kvopt{uniquename}{mininit/minfull}\see{use:opt:pre:int}\BiberOnlyMark \item Added option \kvopt{uniquelist}{minyear}\see{use:opt:pre:int}\BiberOnlyMark 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 6829d32aae4..b2e3c3ca877 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: alphabetic-verb.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{alphabetic-verb.bbx} -[\abx@bbxid $Id: alphabetic-verb.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: alphabetic-verb.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 7144118dde6..b2cdff90412 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: alphabetic.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{alphabetic.bbx} -[\abx@bbxid $Id: alphabetic.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: alphabetic.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 23ac02761a7..459300433c4 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: authortitle-comp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{authortitle-comp.bbx} -[\abx@bbxid $Id: authortitle-comp.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: authortitle-comp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 6b32f8415b9..381e33e4a2f 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: authortitle-ibid.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{authortitle-ibid.bbx} -[\abx@bbxid $Id: authortitle-ibid.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: authortitle-ibid.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 b130a9b09b3..2027772dee5 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: authortitle-icomp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{authortitle-icomp.bbx} -[\abx@bbxid $Id: authortitle-icomp.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: authortitle-icomp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 c9a1d42ac9e..bb8c13b61be 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: authortitle-tcomp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{authortitle-tcomp.bbx} -[\abx@bbxid $Id: authortitle-tcomp.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: authortitle-tcomp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 4228e38f329..58a203d93c3 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: authortitle-terse.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{authortitle-terse.bbx} -[\abx@bbxid $Id: authortitle-terse.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: authortitle-terse.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 357b3550506..0a4697b69a9 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: authortitle-ticomp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{authortitle-ticomp.bbx} -[\abx@bbxid $Id: authortitle-ticomp.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: authortitle-ticomp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 21223195392..689f01f39c2 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: authortitle.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{authortitle.bbx} -[\abx@bbxid $Id: authortitle.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: authortitle.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \RequireBibliographyStyle{standard} \ExecuteBibliographyOptions{pagetracker} 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 2507a5d79b0..293199c7195 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: authoryear-comp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{authoryear-comp.bbx} -[\abx@bbxid $Id: authoryear-comp.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: authoryear-comp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 6261dbd70cd..ff0931b3dd6 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: authoryear-ibid.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{authoryear-ibid.bbx} -[\abx@bbxid $Id: authoryear-ibid.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: authoryear-ibid.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 5a1917f8a32..3084afda06b 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: authoryear-icomp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{authoryear-icomp.bbx} -[\abx@bbxid $Id: authoryear-icomp.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: authoryear-icomp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 0b15bd69b83..1fef8c1dd46 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: authoryear.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{authoryear.bbx} -[\abx@bbxid $Id: authoryear.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: authoryear.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \RequireBibliographyStyle{standard} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx index 405878672bb..490becc7818 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: debug.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{debug.bbx} -[\abx@bbxid $Id: debug.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: debug.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 c87ec304bec..f5f114697a3 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: draft.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{draft.bbx} -[\abx@bbxid $Id: draft.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: draft.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 facd0d792ba..33606b57f53 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: numeric-comp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{numeric-comp.bbx} -[\abx@bbxid $Id: numeric-comp.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: numeric-comp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 20fcf878370..790f1283d77 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: numeric-verb.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{numeric-verb.bbx} -[\abx@bbxid $Id: numeric-verb.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: numeric-verb.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 bbc4cd64de7..092f6ff2cc7 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: numeric.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{numeric.bbx} -[\abx@bbxid $Id: numeric.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: numeric.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \RequireBibliographyStyle{standard} \ExecuteBibliographyOptions{labelnumber} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx index 08fd580174a..56e3e29417e 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: reading.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{reading.bbx} -[\abx@bbxid $Id: reading.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: reading.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \RequireBibliographyStyle{standard} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx index 509339e4365..4a14e42177a 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: standard.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{standard.bbx} -[\abx@bbxid $Id: standard.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: standard.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \newtoggle{bbx:isbn} \newtoggle{bbx:url} 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 268d2c05507..be6e4e1239c 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: verbose-ibid.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{verbose-ibid.bbx} -[\abx@bbxid $Id: verbose-ibid.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: verbose-ibid.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 e4325f6c587..f8b07d0abb6 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: verbose-inote.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{verbose-inote.bbx} -[\abx@bbxid $Id: verbose-inote.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: verbose-inote.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 7cde1b119bc..51f7f976f8d 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: verbose-note.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{verbose-note.bbx} -[\abx@bbxid $Id: verbose-note.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: verbose-note.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 1bf960cc3f7..d0bdc60ba4c 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: verbose-trad1.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{verbose-trad1.bbx} -[\abx@bbxid $Id: verbose-trad1.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: verbose-trad1.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 2699527a88b..83d83986611 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: verbose-trad2.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{verbose-trad2.bbx} -[\abx@bbxid $Id: verbose-trad2.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: verbose-trad2.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 e4117833bb1..029cc5ae64a 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: verbose-trad3.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{verbose-trad3.bbx} -[\abx@bbxid $Id: verbose-trad3.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: verbose-trad3.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 749c3852076..41420ee61cb 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: verbose.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{verbose.bbx} -[\abx@bbxid $Id: verbose.bbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@bbxid $Id: verbose.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \RequireBibliographyStyle{authortitle} diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg b/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg index afef32e934e..100c48ccd0e 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: biblatex.cfg,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{biblatex.cfg} diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def index 058c0a5ebf9..fe50dcacf90 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: biblatex.def,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{biblatex.def} -[\abx@rcsid $Id: biblatex.def,v 1.5 2011/06/08 18:45:46 lehman stable $ +[\abx@rcsid $Id: biblatex.def,v 1.6 2011/07/29 19:21:28 lehman stable $ biblatex generic definitions] % ------------------------------------------------------------------ @@ -145,7 +145,7 @@ \do\u\do\v\do\w\do\x\do\y\do\z \let\do\noexpand} -% The above code allows linebreaks after numbers as a last resort. +% The above code allows linebreaks before numbers and letters. % This is often the only way to break DOIs. It also allows breaks % after hyphens and adjusts \Urlmuskip to add some stretchability % to URLs. @@ -286,6 +286,8 @@ % citation commands \DeclareFieldFormat{prenote}{#1\isdot} \DeclareFieldFormat{postnote}{\mkpageprefix[pagination]{#1}} +\DeclareFieldFormat{volcitevolume}{\bibstring{volume}\ppspace#1} +\DeclareFieldFormat{volcitepages}{\mkpageprefix[pagination]{#1}} % multicite commands \DeclareFieldFormat{multiprenote}{#1\isdot} \DeclareFieldFormat{multipostnote}{\mkpageprefix[pagination]{#1}} diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty index 691a718af65..ea050248981 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: biblatex.sty,v 1.6 2011/07/29 19:21:28 lehman stable $ % Copyright (c) 2006-2011 Philipp Lehman. % @@ -21,11 +21,11 @@ \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{biblatex} -[\abx@rcsid $Id: biblatex.sty,v 1.5 2011/06/08 18:45:46 lehman stable $ +[\abx@rcsid $Id: biblatex.sty,v 1.6 2011/07/29 19:21:28 lehman stable $ programmable bibliographies] \def\blx@bblversion$#1: #2 ${#2} -\edef\blx@bblversion{\blx@bblversion$Revision: 1.5 $} +\edef\blx@bblversion{\blx@bblversion$Revision: 1.6 $} %% Dependencies @@ -235,8 +235,6 @@ \newcount\@quotereset \newcommand*{\@setquotesfcodes}{}% \let\@setquotesfcodes\relax - \newcommand*{\@ifquotemarker}{}% - \let\@ifquotemarker\@secondoftwo \newrobustcmd*{\initoquote}{\@quotelevel\@ne}% \newrobustcmd*{\initiquote}{\@quotelevel\tw@}% \newrobustcmd*{\textooquote}{``}% @@ -354,6 +352,7 @@ \newcount\blx@tempcnta \newcount\blx@tempcntb +\newcount\blx@tempcntc \newcount\blx@maxsection \newcount\blx@maxsegment \newcount\blx@notetype @@ -363,10 +362,12 @@ \def\blx@backend{0} \def\blx@uniquename{0} \def\blx@uniquelist{0} -\def\blx@maxbibnames{\c@maxnames} -\def\blx@minbibnames{\c@minnames} -\def\blx@maxcitenames{\c@maxnames} -\def\blx@mincitenames{\c@minnames} +\def\blx@maxbibnames{0} +\def\blx@minbibnames{0} +\def\blx@maxcitenames{0} +\def\blx@mincitenames{0} +\def\blx@maxalphanames{0} +\def\blx@minalphanames{0} \newlength{\labelnumberwidth} \newlength{\labelalphawidth} @@ -630,7 +631,7 @@ \@addtofilelist{#1}} {#5}} -% {<string>} +% {<write>}{<precode>}{<string>} \protected\def\blx@auxwrite#1#2#3{% \if@filesw @@ -833,11 +834,8 @@ \def\blx@err@nodocdiv#1{% \blx@error - {Failed to hook into \@backslashchar#1} - {There are two possible reasons for this error. - Either\MessageBreak the document class does not - support chapters or the\MessageBreak implementation - is not compatible with biblatex}} + {\@backslashchar#1 not provided by class} + {The document class does not seems to support #1s}} \def\blx@err@nosec#1{% \blx@error @@ -917,6 +915,9 @@ \def\blx@warn@conflopt#1{% \blx@warning{Conflicting options.\MessageBreak#1}} +\def\blx@warn@depropt#1{% + \blx@warning{Deprecated option.\MessageBreak Ignoring '#1'}} + \def\blx@warn@bibempty{% \@latex@warning{Empty bibliography}} @@ -2736,40 +2737,185 @@ \long\def\blx@mkpagetotal@i[#1]#2{#1{#2}\endgroup} -% [<pagination>][<postpro>]{<string>} -% <*>[<postpro>]{<string>} +\newcounter{mincomprange} +\newcounter{maxcomprange} +\newcounter{mincompwidth} +\setcounter{mincomprange}{10} +\setcounter{maxcomprange}{100000} +\setcounter{mincompwidth}{1} +\def\abx@rangeproclimit{100000} -\protected\def\blx@imc@mkpagefirst{% - \@ifstar - {\@ifnextchar[%] - {\blx@pagefirst@i} - {\blx@pagefirst@i[\@firstofone]}} - {\blx@pagefirst@ii}} +% [<postpro>]{<string>} -\long\def\blx@pagefirst@i[#1]#2{% +\newrobustcmd*{\mkcomprange}[2][\@firstofone]{% \begingroup + \let\blx@tempa\@empty + \protected\def\blx@range@out{\appto\blx@tempa}% + \let\blx@range@split\blx@comprange@split + \blx@imc@ifpages{#2} + {\blx@range@chunk{#2}} + {\blx@range@out{#2}}% \edef\blx@tempa{\endgroup - \unexpanded{#1}{\blx@pagefirst@iii#2\bibrangedash&}}% + \unexpanded{#1}{\expandonce\blx@tempa}}% \blx@tempa} -\newrobustcmd*{\blx@pagefirst@ii}[1][pagination]{% - \@ifnextchar[%] - {\blx@pagefirst@iiA{#1}} - {\blx@pagefirst@iiA{#1}[\@firstofone]}} +\def\blx@comprange@split#1{% + \def\blx@comprange@abort{\blx@range@out{#1}}% + \blx@comprange@range#1\bibrangedash\bibrangedash&} + +\def\blx@comprange@range#1\bibrangedash#2\bibrangedash#3&{% + \ifblank{#3} + {\blx@comprange@hyphen#1--&} + {\ifblank{#2} + {\blx@range@out{#1\bibrangedash}} + {\ifblank{#1} + {\blx@range@out{\bibrangedash#2}} + {\blx@comprange@check{#1}{#2}}}}} + +\def\blx@comprange@hyphen#1-#2-#3&{% + \ifblank{#3} + {\blx@comprange@abort} + {\ifblank{#2} + {\ifblank{#1} + {\let\blx@tempb\@empty} + {\def\blx@tempb{#1}}% + \blx@comprange@hyphen@i#3&} + {\ifblank{#1} + {\blx@range@out{\bibrangedash#2}} + {\blx@comprange@check{#1}{#2}}}}} + +\def\blx@comprange@hyphen@i#1-#2&{% + \ifblank{#1#2} + {\expandafter\blx@range@out + \expandafter{\blx@tempb\bibrangedash}} + {\notblank{#1} + {\ifdefempty\blx@tempb + {\blx@range@out{\bibrangedash#1}} + {\expandafter\blx@comprange@check + \expandafter{\blx@tempb}{#1}}} + {\blx@comprange@hyphen@i#2&}}} + +\def\blx@comprange@check#1#2{% + \blx@imc@ifinteger{#1} + {\blx@imc@ifinteger{#2} + {\blx@comprange@comp{#1}{#2}} + {\blx@range@out{#1\bibrangedash#2}}} + {\blx@range@out{#1\bibrangedash#2}}} + +\def\blx@comprange@comp#1#2{% + \def\blx@tempb{#1}% + \def\blx@tempc{#2}% + \let\blx@tempd\blx@tempc + \ifnum\c@maxcomprange<\abx@rangeproclimit\relax + \numdef\blx@tempe\abx@rangeproclimit + \else + \numdef\blx@tempe\c@maxcomprange + \fi + \blx@tempcntc=\blx@tempe\relax + \ifnum + \ifnum\c@mincompwidth<1\space1\fi + \ifnum\c@maxcomprange<10\space1\fi + \ifnum\c@mincomprange<\blx@tempb\space\else1\fi + \ifnum\blx@tempb<\numexpr\blx@tempcntc*10\relax\else1\fi + 0=\z@ + \expandafter\blx@comprange@comp@div + \else + \expandafter\blx@comprange@end + \fi} + +\def\blx@comprange@end{% + \numdef\blx@tempb\blx@tempb + \ifnum\blx@tempe>\c@maxcomprange\relax + \numdef\blx@tempc\blx@tempc + \else + \numdef\blx@tempc\blx@tempd + \fi + \edef\blx@tempb{\blx@range@out{\blx@tempb\noexpand\bibrangedash\blx@tempc}}% + \blx@tempb} + +\def\blx@comprange@comp@div{% + \unless\ifnum\blx@tempb<\blx@tempcntc + \blx@tempcnta\blx@tempb\relax + \blx@tempcntb\blx@tempc\relax + \divide\blx@tempcnta\blx@tempcntc + \divide\blx@tempcntb\blx@tempcntc + \ifnum\blx@tempcnta=\blx@tempcntb + \edef\blx@tempd{\expandafter\@gobble\blx@tempd}% + \numdef\blx@tempe\blx@tempcntc + \fi + \fi + \divide\blx@tempcntc10\relax + \ifnum + \ifnum\blx@tempcntc<10 1\fi + \ifnum\blx@tempcntc>\c@mincompwidth\else 1\fi + 0=\z@ + \expandafter\blx@comprange@comp@div + \else + \expandafter\blx@comprange@end + \fi} + +\def\blx@range@chunk#1{% + \blx@range@chunk@semcol#1;&} + +\def\blx@range@chunk@semcol#1;#2&{% + \notblank{#1} + {\blx@range@chunk@comma#1,&} + {}% + \notblank{#2} + {\notblank{#1}{\blx@range@out{;\space}}{}% + \blx@range@chunk@semcol#2&} + {}} + +\def\blx@range@chunk@comma#1,#2&{% + \notblank{#1} + {\expandafter\blx@range@split + \expandafter{\@firstofone#1}} + {}% + \notblank{#2} + {\notblank{#1}{\blx@range@out{,\space}}{}% + \blx@range@chunk@comma#2&} + {}} -\protected\long\def\blx@pagefirst@iiA#1[#2]#3{% +% [<postpro>]{<string>} + +\newrobustcmd*{\mkfirstpage}[2][\@firstofone]{% \begingroup - \def\blx@tempa{\endgroup\mkpageprefix[#1][#2]}% - \eappto\blx@tempa{{\blx@pagefirst@iii#3\bibrangedash&}}% + \let\blx@tempa\@empty + \protected\def\blx@range@out{\appto\blx@tempa}% + \let\blx@range@split\blx@firstpage@split + \blx@imc@ifpages{#2} + {\blx@range@chunk{#2}} + {\blx@range@out{#2}}% + \edef\blx@tempa{\endgroup + \unexpanded{#1}{\expandonce\blx@tempa}}% \blx@tempa} -\long\def\blx@pagefirst@iii#1\bibrangedash#2&{% - \blx@pagefirst@iv#1\textendash&} -\long\def\blx@pagefirst@iv#1\textendash#2&{% - \blx@pagefirst@v#1\textemdash&} -\long\def\blx@pagefirst@v#1\textemdash#2&{% - \blx@pagefirst@vi#1-&} -\long\def\blx@pagefirst@vi#1-#2&{#1} +\def\blx@firstpage@split#1{% + \def\blx@firstpage@abort{\blx@range@out{#1}}% + \blx@firstpage@range#1\bibrangedash\bibrangedash&} + +\def\blx@firstpage@range#1\bibrangedash#2\bibrangedash#3&{% + \ifblank{#3} + {\blx@firstpage@hyphen#1--&} + {\ifblank{#1} + {\blx@range@out{\bibrangedash#2}} + {\blx@range@out{#1}}}} + +\def\blx@firstpage@hyphen#1-#2-#3&{% + \ifblank{#3} + {\blx@firstpage@abort} + {\ifblank{#1} + {\ifblank{#2} + {\blx@firstpage@hyphen@i#3&} + {\blx@range@out{\bibrangedash#2}}} + {\blx@range@out{#1}}}} + +\def\blx@firstpage@hyphen@i#1-#2&{% + \ifblank{#1} + {\ifblank{#2} + {\blx@firstpage@abort} + {\blx@firstpage@hyphen@i#2&}} + {\blx@range@out{\bibrangedash#1}}} \newcommand*{\ppspace}{\addnbspace} \newcommand*{\sqspace}{\addnbspace} @@ -2812,11 +2958,6 @@ \global\let\blx@unitpunct\newunitpunct \blx@imc@resetpunctfont} -\def\blx@nounit{% - \global\togglefalse{blx@lastins}} - -\def\blx@unitmark{23sp} - \def\blx@begunit{% \toggletrue{blx@tempa}% \iftoggle{blx@insert} @@ -2824,6 +2965,7 @@ {\begingroup \let\blx@begunit\@empty \let\blx@endunit\@empty + \let\blx@endnounit\@empty \blx@unitpunct\blx@postpunct \endgroup \global\togglefalse{blx@unit}% @@ -2833,6 +2975,7 @@ {\begingroup \let\blx@begunit\@empty \let\blx@endunit\@empty + \let\blx@endnounit\@empty \newblockpunct \endgroup \global\togglefalse{blx@block}% @@ -2845,22 +2988,18 @@ {} {\global\togglefalse{blx@insert}}% \blx@leavevmode - \@ifquotemarker - {} - {\penalty\@M - \hskip-\blx@unitmark\relax - \hskip\blx@unitmark\relax}% \begingroup} \def\blx@endunit{% \endgroup - \ifdim\lastskip=\blx@unitmark - \unskip\unskip\unpenalty - \global\togglefalse{blx@lastins}% - \else - \global\toggletrue{blx@insert}% - \global\toggletrue{blx@lastins}% - \fi} + \global\toggletrue{blx@insert}% + \global\toggletrue{blx@lastins}} + +\def\blx@nounit{% + \global\togglefalse{blx@lastins}} + +\def\blx@endnounit{% + \endgroup\blx@nounit} \protected\def\blx@imc@newblock{% \global\toggletrue{blx@block}}% @@ -3456,6 +3595,7 @@ \define@key{blx@opt@name}{uniquelist}{\c@uniquelist#1\relax} \define@key{blx@opt@name}{uniquename}{\c@uniquename#1\relax} +\define@key{blx@opt@name}{hash}{\edef\abx@field@hash{\detokenize{#1}}} \newrobustcmd*{\bibinitperiod}{\adddot} \newrobustcmd*{\bibinitdelim}{\addnbspace} @@ -3675,11 +3815,12 @@ \let\bibsstring\blx@imc@bibxsstring \lowercase{\edef\blx@tempa{#3}}% \ifcsundef{#2@\blx@tempa} - {\blx@warn@nostring\blx@tempa} + {\blx@warn@nostring\blx@tempa + \blx@endnounit} {\blx@imc@ifcapital {#1{\MakeCapital{\csuse{#2@\blx@tempa}}}} - {#1{\csuse{#2@\blx@tempa}}}}% - \blx@endunit} + {#1{\csuse{#2@\blx@tempa}}}% + \blx@endunit}} % [<wrapper>]{<string>} @@ -3700,9 +3841,10 @@ \let\bibsstring\blx@imc@bibxsstring \lowercase{\edef\blx@tempa{#3}}% \ifcsundef{#2@\blx@tempa} - {\blx@warn@nostring\blx@tempa} - {#1{\MakeCapital{\csuse{#2@\blx@tempa}}}}% - \blx@endunit} + {\blx@warn@nostring\blx@tempa + \blx@endnounit} + {#1{\MakeCapital{\csuse{#2@\blx@tempa}}}% + \blx@endunit}} % [<wrapper>]{<string>} @@ -3723,9 +3865,10 @@ \let\bibsstring\blx@imc@bibxsstring \lowercase{\edef\blx@tempa{#3}}% \ifcsundef{#2@\blx@tempa} - {\blx@warn@nostring\blx@tempa} - {#1{\MakeLowercase{\csuse{#2@\blx@tempa}}}}% - \blx@endunit} + {\blx@warn@nostring\blx@tempa + \blx@endnounit} + {#1{\MakeLowercase{\csuse{#2@\blx@tempa}}}% + \blx@endunit}} % [<wrapper>]{<string>} @@ -3746,9 +3889,10 @@ \let\bibsstring\blx@imc@bibxsstring \lowercase{\edef\blx@tempa{#3}}% \ifcsundef{#2@\blx@tempa} - {\blx@warn@nostring\blx@tempa} - {#1{\MakeUppercase{\csuse{#2@\blx@tempa}}}}% - \blx@endunit} + {\blx@warn@nostring\blx@tempa + \blx@endnounit} + {#1{\MakeUppercase{\csuse{#2@\blx@tempa}}}% + \blx@endunit}} % {<string>} @@ -5939,54 +6083,6 @@ {The check '#1' could not be found.\MessageBreak Use \string\defbibcheck\space to define it}}} -\define@key{blx@bib}{maxnames}{\blx@key@maxnames{#1}} -\define@key{blx@los}{maxnames}{\blx@key@maxnames{#1}} -\define@key{blx@bbs}{maxnames}{\blx@key@maxnames{#1}} -\define@key{blx@bbg}{maxnames}{\blx@key@maxnames{#1}} -\define@key{blx@bbc}{maxnames}{\blx@key@maxnames{#1}} - -\def\blx@key@maxnames#1{% - \ifnum#1<\c@maxnames - \blx@err@confopt{maxnames}{% - The value may not be smaller than the - global 'maxnames' (=\the\c@maxnames)}% - \else - \blx@setmaxval{names}{#1}% - \fi} - -\def\blx@setmaxbibnames{% - \c@maxnames=\blx@premaxnames\relax - \c@maxnames=\blx@maxbibnames\relax - \c@minnames=\blx@preminnames\relax - \c@minnames=\blx@minbibnames\relax} - -\define@key{blx@bib}{minnames}{\blx@key@minnames{#1}} -\define@key{blx@los}{minnames}{\blx@key@minnames{#1}} -\define@key{blx@bbs}{minnames}{\blx@key@minnames{#1}} -\define@key{blx@bbg}{minnames}{\blx@key@minnames{#1}} -\define@key{blx@bbc}{minnames}{\blx@key@minnames{#1}} - -\def\blx@key@minnames#1{% - \ifnum#1<\c@minnames - \blx@err@confopt{minnames}{% - The value may not be smaller than the - global 'minnames' (=\the\c@minnames)}% - \else - \blx@setminval{names}{#1}% - \fi} - -\define@key{blx@bib}{maxitems}{\blx@setmaxitems{#1}} -\define@key{blx@los}{maxitems}{\blx@setmaxitems{#1}} -\define@key{blx@bbs}{maxitems}{\blx@setmaxitems{#1}} -\define@key{blx@bbg}{maxitems}{\blx@setmaxitems{#1}} -\define@key{blx@bbc}{maxitems}{\blx@setmaxitems{#1}} - -\define@key{blx@bib}{minitems}{\blx@setminitems{#1}} -\define@key{blx@los}{minitems}{\blx@setminitems{#1}} -\define@key{blx@bbs}{minitems}{\blx@setminitems{#1}} -\define@key{blx@bbg}{minitems}{\blx@setminitems{#1}} -\define@key{blx@bbc}{minitems}{\blx@setminitems{#1}} - \define@key{blx@bhd}{heading}{\blx@key@heading{#1}} \define@key{blx@bib}{heading}{\blx@key@heading{#1}} \define@key{blx@los}{heading}{\blx@key@heading{#1}} @@ -6110,7 +6206,8 @@ \let\blx@theprenote\@empty \let\blx@thepostnote\@empty \let\blx@thetitle\@empty - \blx@setmaxbibnames + \c@maxnames\blx@maxbibnames\relax + \c@minnames\blx@minbibnames\relax \blx@safe@actives \setkeys{blx@bib}{#1}% \blx@rest@actives @@ -6137,7 +6234,8 @@ \let\blx@thepostnote\@empty \let\blx@thetitle\@empty \c@refsection\z@ - \blx@setmaxbibnames + \c@maxnames\blx@maxbibnames\relax + \c@minnames\blx@minbibnames\relax \blx@safe@actives \setkeys{blx@bbs}{#1}% \blx@rest@actives @@ -6178,7 +6276,8 @@ \let\blx@thetitle\@empty \c@refsection\z@ \c@refsegment\@ne - \blx@setmaxbibnames + \c@maxnames\blx@maxbibnames\relax + \c@minnames\blx@minbibnames\relax \blx@safe@actives \setkeys{blx@bbg}{#1}% \blx@rest@actives @@ -6221,7 +6320,8 @@ \let\blx@thetitle\@empty \c@refsection\z@ \blx@safe@actives - \blx@setmaxbibnames + \c@maxnames\blx@maxbibnames\relax + \c@minnames\blx@minbibnames\relax \setkeys{blx@bbc}{#1}% \blx@rest@actives \togglefalse{blx@tempa}% @@ -6441,7 +6541,8 @@ \let\blx@thepostnote\@empty \let\blx@thetitle\@empty \let\blx@printbibchecks\relax - \blx@setmaxbibnames + \c@maxnames\blx@maxbibnames\relax + \c@minnames\blx@minbibnames\relax \blx@safe@actives \setkeys{blx@los}{#1}% \blx@rest@actives @@ -6674,6 +6775,63 @@ \def\blx@endrefsegment{% \global\c@refsegment\z@} +% Reference section/segment auto-reset + +\def\blx@refpatch@part#1{% + \ifundef\part + {\blx@err@nodocdiv{part}} + {\toggletrue{blx@tempa}% + \def\do##1{% + \patchcmd##1{\@endpart}{#1\@endpart} + {\togglefalse{blx@tempa}\listbreak} + {}}% + \docsvlist{% + \H@old@part,% hyperref + \NR@part,% nameref + \@part}% latex/koma-script/memoir + \iftoggle{blx@tempa} + {\blx@err@patch{\string\@part}} + {}% + \let\do\noexpand}} + +\def\blx@refpatch@chapter#1{% + \ifundef\chapter + {\blx@err@nodocdiv{chapter}} + {\apptocmd\@makechapterhead{#1} + {} + {\blx@err@patch{\string\@makechapterhead}}}} + +\def\blx@refpatch@sect#1{% + \ifcsundef{#1} + {\blx@err@nodocdiv{#1}\@gobbletwo} + {\blx@refpatch@sect@i}} + +\edef\blx@refpatch@sect@i#1#2{% + \def\noexpand\do##1{% + \patchcmd##1% + {\noexpand\@xsect} + {\noexpand\blx@refpatch@sect@ii{#1}{#2}{\string#2}\noexpand\@xsect} + {\togglefalse{blx@tempa}\noexpand\listbreak} + {}}% + \noexpand\blx@refpatch@sect@iii} + +\def\blx@refpatch@sect@ii#1#2#3{% + \ifnumequal{#2}{#3}{#1}{}} + +\def\blx@refpatch@sect@iii{% + \toggletrue{blx@tempa}% + \docsvlist{% order does matter: + \H@old@sectm@m,% memoir+hyperref (what a mess...) + \M@sect,% memoir + \H@old@sect,% hyperref + \NR@sect,% nameref + \scr@sect,% koma-script 3.x + \@sect}% latex + \iftoggle{blx@tempa} + {\blx@err@patch{\string\@sect}} + {}% + \let\do\noexpand} + % Bibliography categories \let\blx@categories\@empty @@ -8479,21 +8637,20 @@ \def\blx@volcitecmd@ii[#1]#2{% \appto\blx@tempa{[#1]}% + \blx@getformat\blx@tempb{ffd}{}{volcitevolume}% \@ifnextchar[%] {\blx@volcitecmd@iii{#2}} - {\blx@tempa[\blx@volcite@vol{#2}]}} + {\edef\blx@tempa{\expandonce\blx@tempa[{% + \expandonce{\blx@tempb{#2}}}]}% + \blx@tempa}} \def\blx@volcitecmd@iii#1[#2]{% - \blx@tempa[\blx@volcite@vol{#1}\blx@volcite@page{#2}]} - -\protected\def\blx@volcite@vol#1{% - \bibstring{volume}\ppspace#1} -\protected\def\blx@volcite@page#1{% - \addcomma\space\mkpageprefix{#1}} - -\appto\blx@hook@ifpages{% - \let\blx@volcite@vol\@gobble - \let\blx@volcite@page\@firstofone} + \blx@getformat\blx@tempc{ffd}{}{volcitepages}% + \edef\blx@tempa{\expandonce\blx@tempa[{% + \expandonce{\blx@tempb{#1}}% + \noexpand\addcomma\noexpand\space + \expandonce{\blx@tempc{#2}}}]} + \blx@tempa} %% Control file @@ -8542,7 +8699,7 @@ #1% ~~~~</bcf:inherit>\blx@nl} \xdef\blx@xml@inherit@type#1#2#3{% - ~~~~~~<bcf:type_pair source="#1" target="#2"#3/>\blx@nl} + ~~~~~~<bcf:type\string_pair source="#1" target="#2"#3/>\blx@nl} \xdef\blx@xml@inherit@field#1#2#3{% ~~~~~~<bcf:field source="#1" target="#2"#3/>\blx@nl} \xdef\blx@xml@inherit@block#1{% @@ -8602,10 +8759,14 @@ \blx@xml@mvalue{labelnamespec}{\blx@bcf@labelnamespec}% \blx@xml@toggle{labelyear}% \blx@xml@mvalue{labelyearspec}{\blx@bcf@labelyearspec}% + \blx@xml@svalue{maxalphanames}{\blx@maxalphanames}% + \blx@xml@svalue{maxbibnames}{\blx@maxbibnames}% \blx@xml@svalue{maxitems}{\the\c@maxitems}% - \blx@xml@svalue{maxnames}{\the\c@maxnames}% + \blx@xml@svalue{maxnames}{\blx@maxcitenames}% + \blx@xml@svalue{minalphanames}{\blx@minalphanames}% + \blx@xml@svalue{minbibnames}{\blx@minbibnames}% \blx@xml@svalue{minitems}{\the\c@minitems}% - \blx@xml@svalue{minnames}{\the\c@minnames}% + \blx@xml@svalue{minnames}{\blx@mincitenames}% \blx@xml@toggle{singletitle}% \blx@xml@svalue{sortalphaothers}{\sortalphaothers}% \blx@xml@svalue{sortlos}{\blx@sortlos}% @@ -8666,8 +8827,8 @@ \noexpand\iftoggle{blx@singletitle}{1}{0}:% \noexpand\csuse{blx@bibtex@sorting@\noexpand\blx@sorting}:% \noexpand\blx@sortlos:% - \noexpand\the\c@maxnames:% - \noexpand\the\c@minnames:% + \noexpand\blx@maxcitenames:% + \noexpand\blx@mincitenames:% \noexpand\blx@maxline:% \noexpand\detokenize\noexpand\expandafter{\noexpand\labelalphaothers}% \string},\blx@nl @@ -8834,8 +8995,8 @@ \define@key{blx@inherit@field}{override}[true]{% true|false \ifstrequal{#1}{true} - {\def\blx@tempc{ override_target="true"}} - {\def\blx@tempc{ override_target="false"}}} + {\edef\blx@tempc{ override\string_target="true"}} + {\edef\blx@tempc{ override\string_target="false"}}} \newrobustcmd*{\ResetDataInheritance}{% \global\csundef{blx@biber@inherit@data}} @@ -8873,8 +9034,8 @@ \define@key{blx@sortdef@sort}{direction}{% ascending|descending \ifstrequal{#1}{ascending} - {\appto\blx@tempc{ sort_direction="ascending"}} - {\appto\blx@tempc{ sort_direction="descending"}}} + {\eappto\blx@tempc{ sort\string_direction="ascending"}} + {\eappto\blx@tempc{ sort\string_direction="descending"}}} \define@key{blx@sortdef@sort}{final}[true]{% true|false \ifstrequal{#1}{true} {\appto\blx@tempc{ final="1"}} @@ -8905,19 +9066,19 @@ \define@key{blx@sortdef@field}{padside}{% left|right \ifstrequal{#1}{right} - {\appto\blx@tempd{ pad_side="right"}} - {\appto\blx@tempd{ pad_side="left"}}} + {\eappto\blx@tempd{ pad\string_side="right"}} + {\eappto\blx@tempd{ pad\string_side="left"}}} \define@key{blx@sortdef@field}{padwidth}{% integer - \appto\blx@tempd{ pad_width="#1"}} + \eappto\blx@tempd{ pad\string_width="#1"}} \define@key{blx@sortdef@field}{padchar}{% character \blx@xmlsanitizeafter{\def\blx@tempe}{#1}% - \eappto\blx@tempd{ pad_char="\blx@tempe"}} + \eappto\blx@tempd{ pad\string_char="\blx@tempe"}} \define@key{blx@sortdef@field}{strside}{% left|right \ifstrequal{#1}{right} - {\appto\blx@tempd{ substring_side="right"}} - {\appto\blx@tempd{ substring_side="left"}}} + {\eappto\blx@tempd{ substring\string_side="right"}} + {\eappto\blx@tempd{ substring\string_side="left"}}} \define@key{blx@sortdef@field}{strwidth}{% integer - \appto\blx@tempd{ substring_width="#1"}} + \eappto\blx@tempd{ substring\string_width="#1"}} \def\blx@sortdef@literal#1{% \advance\blx@tempcntb\@ne @@ -9123,8 +9284,29 @@ \def\blx@opt@sortlos@bib{0} \def\blx@opt@sortlos@los{1} -\DeclareBibliographyOption{maxnames}{\blx@setmaxval{names}{#1}} -\DeclareBibliographyOption{minnames}{\blx@setminval{names}{#1}} +\DeclareBibliographyOption{maxnames}{% + \blx@setmaxval{names}{#1}% + \numdef\blx@maxbibnames{#1}% + \numdef\blx@maxcitenames{#1}} +\DeclareBibliographyOption{minnames}{% + \blx@setminval{names}{#1}% + \numdef\blx@minbibnames{#1}% + \numdef\blx@mincitenames{#1}} + +\DeclareBibliographyOption{maxbibnames}{% + \blx@defmaxval{bibnames}{#1}} +\DeclareBibliographyOption{minbibnames}{% + \blx@defminval{bibnames}{#1}} + +\DeclareBibliographyOption{maxcitenames}{% + \blx@defmaxval{citenames}{#1}} +\DeclareBibliographyOption{mincitenames}{% + \blx@defminval{citenames}{#1}} + +\DeclareBibliographyOption{maxalphanames}{% + \blx@defmaxval{alphanames}{#1}} +\DeclareBibliographyOption{minalphanames}{% + \blx@defminval{alphanames}{#1}} \def\blx@setmaxval#1#2{% \ifnumless{#2}\@ne @@ -9144,12 +9326,6 @@ 'min#1' must be less than or equal to 'max#1'}} {\defcounter{min#1}{#2}}}} -\DeclareBibliographyOption{maxbibnames}{\blx@defmaxval{bibnames}{#1}} -\DeclareBibliographyOption{minbibnames}{\blx@defminval{bibnames}{#1}} - -\DeclareBibliographyOption{maxcitenames}{\blx@defmaxval{citenames}{#1}} -\DeclareBibliographyOption{mincitenames}{\blx@defminval{citenames}{#1}} - \def\blx@defmaxval#1#2{% \ifnumless{#2}\@ne {\blx@err@invopt{max#1=#2}{% @@ -9168,34 +9344,10 @@ 'min#1' must be less than or equal to 'max#1'}} {\csnumdef{blx@min#1}{#2}}}} -\DeclareBibliographyOption{maxitems}{\blx@setmaxitems{#1}} -\DeclareBibliographyOption{minitems}{\blx@setminitems{#1}} - -\def\blx@setmaxitems#1{% - \ifnum#1<\@ne - \blx@err@invopt{maxitems=#1} - {'maxitems' must be greater than zero}% - \else - \ifnum#1<\c@minitems - \blx@err@confopt{maxitems/minitems} - {'maxitems' must be greater than or equal to 'minitems'}% - \else - \c@maxitems#1\relax - \fi - \fi} - -\def\blx@setminitems#1{% - \ifnum#1<\@ne - \blx@err@invopt{minitems=#1} - {'minitems' must be greater than zero}% - \else - \ifnum#1>\c@maxitems - \blx@err@confopt{maxitems/minitems} - {'minitems' must be less than or equal to 'maxitems'}% - \else - \c@minitems#1\relax - \fi - \fi} +\DeclareBibliographyOption{maxitems}{% + \blx@setmaxval{items}{#1}} +\DeclareBibliographyOption{minitems}{% + \blx@setminval{items}{#1}} \DeclareBibliographyOption{maxline}{% \ifnum#1<49 @@ -9701,7 +9853,7 @@ \DeclareBibliographyOption{refsection}{% \ifcsdef{blx@opt@refsection@#1} - {\letcs\blx@refhook@section{blx@opt@refsection@#1}} + {\letcs\blx@refsecreset@level{blx@opt@refsection@#1}} {\blx@err@invopt{refsection=#1}{}}} \def\blx@opt@refsection@none{0} \def\blx@opt@refsection@part{1} @@ -9709,9 +9861,21 @@ \def\blx@opt@refsection@section{3} \def\blx@opt@refsection@subsection{4} +\AtEndPreamble{% + \ifcase\blx@refsecreset@level + \or % 1 + \blx@refpatch@part\newrefsection + \or % 2 + \blx@refpatch@chapter\newrefsection + \or % 3 + \blx@refpatch@sect{section}{\newrefsection}{1}% + \or % 4 + \blx@refpatch@sect{subsection}{\newrefsection}{2}% + \fi} + \DeclareBibliographyOption{refsegment}{% \ifcsdef{blx@opt@refsegment@#1} - {\letcs\blx@refhook@segment{blx@opt@refsegment@#1}} + {\letcs\blx@refsegreset@level{blx@opt@refsegment@#1}} {\blx@err@invopt{refsegment=#1}{}}} \def\blx@opt@refsegment@none{0} \def\blx@opt@refsegment@part{1} @@ -9719,9 +9883,31 @@ \def\blx@opt@refsegment@section{3} \def\blx@opt@refsegment@subsection{4} +\AtEndPreamble{% + \ifnumgreater\blx@refsegreset@level\z@ + {\ifnumgreater\blx@refsegreset@level\blx@refsecreset@level + {} + {\blx@err@confopt + {refsegment/refsection} + {The 'refsegment' option must point to a + lower-level\MessageBreak document division + than 'refsection'}% + \def\blx@refsegreset@level{0}}} + {}% + \ifcase\blx@refsegreset@level + \or % 1 + \blx@refpatch@part\newrefsegment + \or % 2 + \blx@refpatch@chapter\newrefsegment + \or % 3 + \blx@refpatch@sect{section}{\newrefsegment}{1}% + \or % 4 + \blx@refpatch@sect{subsection}{\newrefsegment}{2}% + \fi} + \DeclareBibliographyOption{citereset}{% \ifcsdef{blx@opt@citereset@#1} - {\letcs\blx@resethook{blx@opt@citereset@#1}} + {\letcs\blx@citereset@level{blx@opt@citereset@#1}} {\blx@err@invopt{citereset=#1}{}}} \def\blx@opt@citereset@none{0} \def\blx@opt@citereset@part{1} @@ -9729,6 +9915,18 @@ \def\blx@opt@citereset@section{3} \def\blx@opt@citereset@subsection{4} +\AtEndPreamble{% + \ifcase\blx@citereset@level + \or % 1 + \blx@refpatch@part{\citereset\blx@inf@creset}% + \or % 2 + \blx@refpatch@chapter{\citereset\blx@inf@creset}% + \or % 3 + \blx@refpatch@sect{section}{\citereset\blx@inf@creset}{1}% + \or % 4 + \blx@refpatch@sect{subsection}{\citereset\blx@inf@creset}{2}% + \fi} + \DeclareBibliographyOption{bibwarn}[true]{% \ifstrequal{#1}{true} {\let\blx@bbl@thewarn\blx@bbl@warn} @@ -9816,7 +10014,8 @@ \setkeys{blx@opt@ldt}{style=numeric} \setkeys{blx@opt@pre}{% - sorting=nty,sortlos=los,sortcase,sortupper,sortcites=false,maxnames=3,minnames=1, + sorting=nty,sortlos=los,sortcase,sortupper,sortcites=false, + maxnames=3,minnames=1,maxalphanames=3,minalphanames=1, maxitems=3,minitems=1,mincrossrefs=2,useauthor=true,useeditor=true, usetranslator=false,indexing=false,abbreviate=true,dateabbrev=true, backref=false,backrefsetstyle=setonly,pagetracker=false,ibidtracker=false, @@ -9862,6 +10061,18 @@ % Deferred setup at end of preamble \AtEndPreamble{% + \ifnumless\blx@maxbibnames\blx@maxcitenames + {\blx@warn@conflopt{% + 'maxbibnames' (=\the\numexpr\blx@maxbibnames\relax) + should not be smaller than\MessageBreak + 'maxcitenames' (=\the\numexpr\blx@maxcitenames\relax)}} + {}% + \ifnumless\blx@minbibnames\blx@mincitenames + {\blx@warn@conflopt{% + 'minbibnames' (=\the\numexpr\blx@minbibnames\relax) + should not be smaller than\MessageBreak + 'mincitenames' (=\the\numexpr\blx@mincitenames\relax)}} + {}% \iftoggle{blx@firstinits} {\ifnumequal\blx@uniquename\blx@opt@uniquename@full {\blx@warn@conflopt{% @@ -9889,95 +10100,7 @@ Setting 'uniquelist=true'}% \setkeys{blx@opt@pre}{uniquelist}} {}} - {}% - \ifnumgreater\blx@refhook@segment\z@ - {\ifnumgreater\blx@refhook@segment\blx@refhook@section - {} - {\blx@err@confopt - {refsegment/refsection} - {The 'refsegment' option must point to a - lower-level\MessageBreak document division - than 'refsection'}% - \def\blx@refhook@segment{0}}} - {}% - \ifcase\blx@refhook@segment - \or % 1 - \ifundef\part - {\blx@err@nodocdiv{part}} - {\pretocmd\part{\newrefsegment} - {} - {\blx@err@patch{\string\part}}}% - \or % 2 - \ifundef\chapter - {\blx@err@nodocdiv{chapter}} - {\pretocmd\chapter{\newrefsegment} - {} - {\blx@err@patch{\string\part}}}% - \or % 3 - \ifundef\section - {\blx@err@nodocdiv{section}} - {\pretocmd\section{\newrefsegment} - {} - {\blx@err@patch{\string\part}}}% - \or % 4 - \ifundef\subsection - {\blx@err@nodocdiv{subsection}} - {\pretocmd\subsection{\newrefsegment} - {} - {\blx@err@patch{\string\part}}}% - \fi - \ifcase\blx@refhook@section - \or % 1 - \ifundef\part - {\blx@err@nodocdiv{part}} - {\pretocmd\part{\newrefsection} - {} - {\blx@err@patch{\string\part}}}% - \or % 2 - \ifundef\chapter - {\blx@err@nodocdiv{chapter}} - {\pretocmd\chapter{\newrefsection} - {} - {\blx@err@patch{\string\part}}}% - \or % 3 - \ifundef\section - {\blx@err@nodocdiv{section}} - {\pretocmd\section{\newrefsection} - {} - {\blx@err@patch{\string\part}}}% - \or % 4 - \ifundef\subsection - {\blx@err@nodocdiv{subsection}} - {\pretocmd\subsection{\newrefsection} - {} - {\blx@err@patch{\string\part}}}% - \fi - \ifcase\blx@resethook - \or % 1 - \ifundef\part - {\blx@err@nodocdiv{part}} - {\pretocmd\part{\citereset\blx@inf@creset} - {} - {\blx@err@patch{\string\part}}}% - \or % 2 - \ifundef\chapter - {\blx@err@nodocdiv{chapter}} - {\pretocmd\chapter{\citereset\blx@inf@creset} - {} - {\blx@err@patch{\string\part}}}% - \or % 3 - \ifundef\section - {\blx@err@nodocdiv{section}} - {\pretocmd\section{\citereset\blx@inf@creset} - {} - {\blx@err@patch{\string\part}}}% - \or % 4 - \ifundef\subsection - {\blx@err@nodocdiv{subsection}} - {\pretocmd\subsection{\citereset\blx@inf@creset} - {} - {\blx@err@patch{\string\part}}}% - \fi} + {}} \def\blx@checkencoding{% \ifdef\blx@texencoding @@ -10067,7 +10190,7 @@ or test {\@ifpackageloaded{inputenx}} ) } - {\def\blx@texencoding{ascii} + {\def\blx@texencoding{ascii}% \blx@info@noline{% Input encoding '\blx@texencoding' forced by\MessageBreak 'safeinputenc' option}} @@ -10079,6 +10202,8 @@ \AtBeginDocument{% \blx@checkbackend{style}% \blx@checkencoding + \c@maxnames\blx@maxcitenames\relax + \c@minnames\blx@mincitenames\relax \if@filesw \ifnum\blx@backend=\blx@backend@biber \blx@ifsigned{\jobname}{bcf} @@ -10099,11 +10224,7 @@ \csuse{abx@preamble}% \blx@checkbackend{.bib file}% \blx@inf@refsec - \blx@inf@refseg - \numdef\blx@premaxnames{\c@maxnames}% - \numdef\blx@preminnames{\c@minnames}% - \c@maxnames\blx@maxcitenames\relax - \c@minnames\blx@mincitenames\relax} + \blx@inf@refseg} \AtEndOfPackage{% \AtBeginDocument{% diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-compat.def b/Master/texmf-dist/tex/latex/biblatex/blx-compat.def index 12ceafc4e87..f976a1c996a 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: blx-compat.def,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{blx-compat.def} -[\abx@rcsid $Id: blx-compat.def,v 1.5 2011/06/08 18:45:46 lehman stable $ +[\abx@rcsid $Id: blx-compat.def,v 1.6 2011/07/29 19:21:28 lehman stable $ biblatex generic compatibility] % LaTeX @@ -9,71 +9,20 @@ \AtBeginDocument{% \renewrobustcmd*{\bibliography}[1]{% \blx@error - {'\string\bibliography' invalid at this point} - {'\string\bibliography' must be given in the - preamble.\MessageBreak I'm ignoring the command}}} + {'\string\bibliography' invalid} + {Use '\string\addbibresource' instead.\MessageBreak + I'm ignoring this command}}} \renewrobustcmd*{\bibliographystyle}[1]{% \blx@error {'\string\bibliographystyle' invalid} {Use the package option 'style' instead.\MessageBreak - I'm ignoring the command}} + I'm ignoring this command}} -% Standard classes +% standard classes \DeclareOption{openbib}{\ExecuteBibliographyOptions{block=par}} -% biblatex <0.9b - -\DeclareBibliographyOption{defernums}[true]{% - \ExecuteBibliographyOptions{defernumbers=#1}} - -\newcommand*{\lbx@fromlang}{% - \iffieldundef{origlanguage} - {\unspace} - {\bibstring{from\thefield{origlanguage}}}} - -% LaTeX, biblatex <0.9a - -\providecommand*{\thebibliography}{} -\renewenvironment*{thebibliography} - {\list{}{% - \leftmargin\bibhang - \itemindent-\leftmargin - \itemsep\bibitemsep - \parsep\bibparsep}} - {\endlist} -\newcommand*{\thebibitem}{\item} - -\defbibenvironment{bibliography} - {\thebibliography} - {\endthebibliography} - {\thebibitem} - -\newenvironment*{theshorthands} - {\list{\thefield{shorthand}}{% - \labelwidth\shorthandwidth - \labelsep\biblabelsep - \leftmargin\labelwidth - \advance\leftmargin\labelsep - \itemsep\bibitemsep - \parsep\bibparsep - \def\makelabel##1{##1\hss}}} - {\endlist} -\newcommand*{\thelositem}{\item} - -\defbibenvironment{shorthands} - {\theshorthands} - {\endtheshorthands} - {\thelositem} - -% Biblatex <0.8d - -\DeclareBibliographyOption{bibtex8}[true]{% - \ifstrequal{#1}{true} - {\ExecuteBibliographyOptions{backend=bibtex8}} - {\ExecuteBibliographyOptions{backend=bibtex}}} - % memoir \ifdef\ifnobibintoc @@ -131,4 +80,30 @@ \let\ifkomabibtotocnumbered=\@firstoftwo}} {} +% biblatex <1.6 + +\define@key{blx@bib}{maxnames}{\blx@warn@depropt{maxnames}} +\define@key{blx@los}{maxnames}{\blx@warn@depropt{maxnames}} +\define@key{blx@bbs}{maxnames}{\blx@warn@depropt{maxnames}} +\define@key{blx@bbg}{maxnames}{\blx@warn@depropt{maxnames}} +\define@key{blx@bbc}{maxnames}{\blx@warn@depropt{maxnames}} + +\define@key{blx@bib}{minnames}{\blx@warn@depropt{minnames}} +\define@key{blx@los}{minnames}{\blx@warn@depropt{minnames}} +\define@key{blx@bbs}{minnames}{\blx@warn@depropt{minnames}} +\define@key{blx@bbg}{minnames}{\blx@warn@depropt{minnames}} +\define@key{blx@bbc}{minnames}{\blx@warn@depropt{minnames}} + +\define@key{blx@bib}{maxitems}{\blx@warn@depropt{maxitems}} +\define@key{blx@los}{maxitems}{\blx@warn@depropt{maxitems}} +\define@key{blx@bbs}{maxitems}{\blx@warn@depropt{maxitems}} +\define@key{blx@bbg}{maxitems}{\blx@warn@depropt{maxitems}} +\define@key{blx@bbc}{maxitems}{\blx@warn@depropt{maxitems}} + +\define@key{blx@bib}{minitems}{\blx@warn@depropt{minitems}} +\define@key{blx@los}{minitems}{\blx@warn@depropt{minitems}} +\define@key{blx@bbs}{minitems}{\blx@warn@depropt{minitems}} +\define@key{blx@bbg}{minitems}{\blx@warn@depropt{minitems}} +\define@key{blx@bbc}{minitems}{\blx@warn@depropt{minitems}} + \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def b/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def index 0f9415e5126..10bf0cada9a 100644 --- a/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def +++ b/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def @@ -1,7 +1,7 @@ -% $Id: blx-mcite.def,v 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: blx-mcite.def,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{blx-mcite.def} -[\abx@rcsid $Id: blx-mcite.def,v 1.5 2011/06/08 18:45:46 lehman stable $ +[\abx@rcsid $Id: blx-mcite.def,v 1.6 2011/07/29 19:21:28 lehman stable $ mcite-like citation commands] \newrobustcmd*{\mcite}{\mcitelike\cite} diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def b/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def index d8e5c1b65d1..811b210413e 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: blx-natbib.def,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{blx-natbib.def} -[\abx@rcsid $Id: blx-natbib.def,v 1.5 2011/06/08 18:45:46 lehman stable $ +[\abx@rcsid $Id: blx-natbib.def,v 1.6 2011/07/29 19:21:28 lehman stable $ 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 027d7de7e6d..1f862602d39 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: alphabetic-verb.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{alphabetic-verb.cbx} -[\abx@cbxid $Id: alphabetic-verb.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: alphabetic-verb.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 c5985031186..9555f5a618a 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: alphabetic.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{alphabetic.cbx} -[\abx@cbxid $Id: alphabetic.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: alphabetic.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 d974ef999b9..64f10d762e5 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: authortitle-comp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{authortitle-comp.cbx} -[\abx@cbxid $Id: authortitle-comp.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: authortitle-comp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \ExecuteBibliographyOptions{uniquename,uniquelist,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 71c5f047934..b23d510624f 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: authortitle-ibid.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{authortitle-ibid.cbx} -[\abx@cbxid $Id: authortitle-ibid.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: authortitle-ibid.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \ExecuteBibliographyOptions{uniquename,uniquelist,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 aceee6564ed..23853ec9774 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: authortitle-icomp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{authortitle-icomp.cbx} -[\abx@cbxid $Id: authortitle-icomp.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: authortitle-icomp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \ExecuteBibliographyOptions{uniquename,uniquelist,ibidtracker=constrict, pagetracker,sortcites,autocite=footnote} 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 a41d7c86a05..0f296410334 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: authortitle-tcomp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{authortitle-tcomp.cbx} -[\abx@cbxid $Id: authortitle-tcomp.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: authortitle-tcomp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \RequireCitationStyle{authortitle-comp} \ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,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 dc671d0fef9..dd4f91365fd 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: authortitle-terse.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{authortitle-terse.cbx} -[\abx@cbxid $Id: authortitle-terse.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: authortitle-terse.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \RequireCitationStyle{authortitle} \ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,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 4130a73a10a..225880f6bf2 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: authortitle-ticomp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{authortitle-ticomp.cbx} -[\abx@cbxid $Id: authortitle-ticomp.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: authortitle-ticomp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \RequireCitationStyle{authortitle-icomp} \ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,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 d6b5cdb9725..f8e68ebd271 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: authortitle.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{authortitle.cbx} -[\abx@cbxid $Id: authortitle.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: authortitle.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \ExecuteBibliographyOptions{uniquename,uniquelist,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 f51525ca6d3..6a8fce5d4d0 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: authoryear-comp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{authoryear-comp.cbx} -[\abx@cbxid $Id: authoryear-comp.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: authoryear-comp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \ExecuteBibliographyOptions{labelyear,uniquename,uniquelist,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 f52842f4ddd..51ef9333420 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: authoryear-ibid.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{authoryear-ibid.cbx} -[\abx@cbxid $Id: authoryear-ibid.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: authoryear-ibid.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \ExecuteBibliographyOptions{labelyear,uniquename,uniquelist,pagetracker, ibidtracker=constrict,autocite=inline} 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 8f78efc6fd9..8b81b50d1bb 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: authoryear-icomp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{authoryear-icomp.cbx} -[\abx@cbxid $Id: authoryear-icomp.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: authoryear-icomp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \ExecuteBibliographyOptions{labelyear,uniquename,uniquelist,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 87c25b991a8..e87ae85d47a 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: authoryear.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{authoryear.cbx} -[\abx@cbxid $Id: authoryear.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: authoryear.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \ExecuteBibliographyOptions{labelyear,uniquename,uniquelist,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 8245c2d8941..3c725be98f5 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: debug.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{debug.cbx} -[\abx@cbxid $Id: debug.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: debug.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 ea07f9d0b2d..e29517eaf00 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: draft.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{draft.cbx} -[\abx@cbxid $Id: draft.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: draft.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 845f3ee3acf..1334e6b0ac3 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: numeric-comp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{numeric-comp.cbx} -[\abx@cbxid $Id: numeric-comp.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: numeric-comp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 9e8a3d7df5a..de60d874433 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: numeric-verb.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{numeric-verb.cbx} -[\abx@cbxid $Id: numeric-verb.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: numeric-verb.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 faf5c1fb7fb..74e22224ceb 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: numeric.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{numeric.cbx} -[\abx@cbxid $Id: numeric.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: numeric.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 6e6bffc5255..df6a55f20c0 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: reading.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{reading.cbx} -[\abx@cbxid $Id: reading.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: reading.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 e04059d617e..49baa86caf5 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: verbose-ibid.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{verbose-ibid.cbx} -[\abx@cbxid $Id: verbose-ibid.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: verbose-ibid.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 fc16620149f..717b618966c 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: verbose-inote.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{verbose-inote.cbx} -[\abx@cbxid $Id: verbose-inote.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: verbose-inote.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 5f172868b1b..5d4340061fb 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: verbose-note.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{verbose-note.cbx} -[\abx@cbxid $Id: verbose-note.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: verbose-note.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 e304242c44c..06fcacf734c 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: verbose-trad1.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{verbose-trad1.cbx} -[\abx@cbxid $Id: verbose-trad1.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: verbose-trad1.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 47ef04643a4..385c0a41002 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: verbose-trad2.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{verbose-trad2.cbx} -[\abx@cbxid $Id: verbose-trad2.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: verbose-trad2.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 f52b9742792..60ea0cc218d 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: verbose-trad3.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{verbose-trad3.cbx} -[\abx@cbxid $Id: verbose-trad3.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: verbose-trad3.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 af0e66abd13..d2811badf9a 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: verbose.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{verbose.cbx} -[\abx@cbxid $Id: verbose.cbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@cbxid $Id: verbose.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 7c44b50f44e..c4d62b6f1a2 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: UKenglish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{UKenglish.lbx} -[\abx@lbxid $Id: UKenglish.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: UKenglish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 df660e9f5ee..cf1e41bec9f 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: USenglish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{USenglish.lbx} -[\abx@lbxid $Id: USenglish.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: USenglish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 c9bd75b97f7..ff3c1679fa5 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: american.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{american.lbx} -[\abx@lbxid $Id: american.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: american.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] % Status: % - complete diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx index 5044280800d..dbeabb69306 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: australian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{australian.lbx} -[\abx@lbxid $Id: australian.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: australian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] % Status: % - complete diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx index 3af817e77e5..f8917cce710 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: austrian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{austrian.lbx} -[\abx@lbxid $Id: austrian.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: austrian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] % Status: % - complete diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx index 2ed55b602ad..4e077602104 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: brazil.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{brazil.lbx} -[\abx@lbxid $Id: brazil.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: brazil.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 24166a94262..632b6a09ef9 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: brazilian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{brazilian.lbx} -[\abx@lbxid $Id: brazilian.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: brazilian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] % Status: % - Almost complete diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx index 14530f6b3e6..8d907f8deb1 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: british.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{british.lbx} -[\abx@lbxid $Id: british.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: british.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] % Status: % - complete diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx index 927ba9cad6e..b5dc25698de 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: canadian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{canadian.lbx} -[\abx@lbxid $Id: canadian.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: canadian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] % Status: % - complete diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx index 92596b850e3..c80e3f7f36e 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: danish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{danish.lbx} -[\abx@lbxid $Id: danish.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: danish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] % Status: % - Incomplete diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx index b98dd2c0b82..f03aeb791e9 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: dutch.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{dutch.lbx} -[\abx@lbxid $Id: dutch.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: dutch.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] % Status: % - Almost complete diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx index 02dd3bda204..be006230728 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: english.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{english.lbx} -[\abx@lbxid $Id: english.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: english.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] % Status: % - Complete diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx index 750f4f274f1..4ab1e83cf4b 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: finnish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{finnish.lbx} -[\abx@lbxid $Id: finnish.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: finnish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] % Status: % - Incomplete diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx index 293e4c0158d..7540b0d1b8d 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: french.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{french.lbx} -[\abx@lbxid $Id: french.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: french.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] % Status: % - Incomplete diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx index ac7461eb1c6..9875e73d1d4 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: german.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{german.lbx} -[\abx@lbxid $Id: german.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: german.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] % Status: % - Complete diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx index f8966c6d2be..5f0a47fe829 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: greek.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{greek.lbx} -[\abx@lbxid $Id: greek.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: greek.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] % Status: % - Incomplete @@ -470,7 +470,7 @@ annotation = {{σχολιασμοί}{σχολιασμοί}}, } -\protected\def\lbx@gr@mkbibmonth#1{% +\protected\gdef\lbx@gr@mkbibmonth#1{% \ifcase0#1\relax #1\BibliographyWarning{Month out of range}% \or\abx@bibmonth{datejanuary}% diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx index bc654df7d5c..593886cb03d 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: italian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{italian.lbx} -[\abx@lbxid $Id: italian.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: italian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] % Status: % - Incomplete diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx index 0e4209c4d0d..f246b2bf3e0 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: naustrian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{naustrian.lbx} -[\abx@lbxid $Id: naustrian.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: naustrian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] % Status: % - complete diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx index 5e9ba0f5b02..ce483016957 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: newzealand.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{newzealand.lbx} -[\abx@lbxid $Id: newzealand.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: newzealand.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] % Status: % - complete diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx index c6af64d1d79..3590c99ae54 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: ngerman.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{ngerman.lbx} -[\abx@lbxid $Id: ngerman.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: ngerman.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] % Status: % - complete diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx index e34a38eb864..91967cf4d43 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: norsk.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{norsk.lbx} -[\abx@lbxid $Id: norsk.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: norsk.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] % Status: % - '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 f923980f8cd..b82b96138c2 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: norwegian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{norwegian.lbx} -[\abx@lbxid $Id: norwegian.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: norwegian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] % Status: % - Incomplete diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx index e5fb1681efe..f3269df2f97 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: nynorsk.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{nynorsk.lbx} -[\abx@lbxid $Id: nynorsk.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: nynorsk.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] % Status: % - '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 ab2ea352c08..e045bb38335 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: portuges.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{portuges.lbx} -[\abx@lbxid $Id: portuges.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: portuges.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] \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 a12826eab83..d9dba9a54c2 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: portuguese.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{portuguese.lbx} -[\abx@lbxid $Id: portuguese.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: portuguese.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] % Status: % - Almost complete diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx index 950cc25a33e..32076d14fab 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: spanish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{spanish.lbx} -[\abx@lbxid $Id: spanish.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: spanish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] % Status: % - Incomplete diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx index fb463224541..918fa07b1a5 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 1.5 2011/06/08 18:45:46 lehman stable $ +% $Id: swedish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ \ProvidesFile{swedish.lbx} -[\abx@lbxid $Id: swedish.lbx,v 1.5 2011/06/08 18:45:46 lehman stable $] +[\abx@lbxid $Id: swedish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] % Status: % - Incomplete |