diff options
53 files changed, 202 insertions, 205 deletions
diff --git a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst index 4cfb357ddeb..cff4f4d0493 100644 --- a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst +++ b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst @@ -173,7 +173,7 @@ STRINGS { ctrl.alphaothers templist tempstrga tempstrgb resvstrga last.name last.hash last.year last.extra } FUNCTION {initialize} { - "$Revision: 2.1 $" + "$Revision: 2.2 $" #12 entry.max$ substring$ #-3 entry.max$ substring$ "Biblatex version: " swap$ * top$ @@ -1758,6 +1758,7 @@ FUNCTION {input:control:options} { input:control:parse str.to.int } +% This version corresponds to the .bbl version, *not* the biblatex version! FUNCTION {input:control:version} { input:control:parse "$Revision: 2.1 $" @@ -2581,6 +2582,7 @@ ITERATE {mainsort} SORT +% This version corresponds to the .bbl version, *not* the biblatex version! FUNCTION {output:main:begin} { "% $ biblatex auxiliary file $" write$ newline$ "% $ biblatex version " "$Revision: 2.1 $" diff --git a/Master/texmf-dist/doc/latex/biblatex/RELEASE b/Master/texmf-dist/doc/latex/biblatex/RELEASE index a14d8242505..df60bd3b9c4 100644 --- a/Master/texmf-dist/doc/latex/biblatex/RELEASE +++ b/Master/texmf-dist/doc/latex/biblatex/RELEASE @@ -1,3 +1,9 @@ +RELEASE NOTES FOR VERSION 2.2 + +* Biber version 1.2 is required for biblatex 2.2 + +* Bugfix release + RELEASE NOTES FOR VERSION 2.1 * Biber version 1.1 is required for biblatex 2.1 @@ -5,6 +11,7 @@ RELEASE NOTES FOR VERSION 2.1 * Custom data models is now looked for in more places. See PDF documentation. Custom data model conflicts are now better processed by biber. + * Some improved localisation (Norwegian) and doc fixes. RELEASE NOTES FOR VERSION 2.0 diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf Binary files differindex 074f1392cfc..164b011ce53 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 babaded2a03..ff0e91b9fe9 100644 --- a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex +++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex @@ -42,8 +42,8 @@ url={\biblatexhome}, author={Philipp Lehman (with Audrey Boruvka, Philip Kime and Joseph Wright)}, email={}, - revision={2.1}, - date={07/2012}} + revision={2.2}, + date={08/2012}} \hypersetup{% pdftitle={The \biblatex Package}, @@ -138,7 +138,7 @@ For a quick start guide, browse \secref{int:abt, bib:typ, bib:fld, bib:use, use: \subsection[About]{About \sty{biblatex}} \label{int:abt} -This package provides advanced bibliographic facilities for use with \latex in conjunction with \bibtex. The package is a complete reimplementation of the bibliographic facilities provided by \latex. A custom backend \biber by default is used which processed the \bibtex format data files and them performs all sorting, label generation (and a great deal more). Legacy \bibtex is also supported as a backend, albeit with a reduced feature set. Biblatex does not use the backend to format the bibliography information as with traditional \bibtex: instead of being implemented in \bibtex style files, the formatting of the bibliography is entirely controlled by TeX macros. Good working knowledge in \latex should be sufficient to design new bibliography and citation styles. There is no need to learn \bibtex's postfix stack language. This package also supports subdivided bibliographies, multiple bibliographies within one document, and separate lists of bibliographic shorthands. Bibliographies may be subdivided into parts and\slash or segmented by topics. Just like the bibliography styles, all citation commands may be freely defined. With \biber as the backend, features such as customisable sorting, multiple bibliographies with different sorting, customisable labels, dynamic data modification are available. The package is completely localized and can interface with the \sty{babel} package. Please refer to \tabref{bib:fld:tab1} for a list of languages currently supported by this package. +This package provides advanced bibliographic facilities for use with \latex in conjunction with \bibtex. The package is a complete reimplementation of the bibliographic facilities provided by \latex. A custom backend \biber by default is used which processes the \bibtex format data files and them performs all sorting, label generation (and a great deal more). Legacy \bibtex is also supported as a backend, albeit with a reduced feature set. Biblatex does not use the backend to format the bibliography information as with traditional \bibtex: instead of being implemented in \bibtex style files, the formatting of the bibliography is entirely controlled by TeX macros. Good working knowledge in \latex should be sufficient to design new bibliography and citation styles. There is no need to learn \bibtex's postfix stack language. This package also supports subdivided bibliographies, multiple bibliographies within one document, and separate lists of bibliographic shorthands. Bibliographies may be subdivided into parts and\slash or segmented by topics. Just like the bibliography styles, all citation commands may be freely defined. With \biber as the backend, features such as customisable sorting, multiple bibliographies with different sorting, customisable labels, dynamic data modification are available. Please refer to \secref{int:pre:bibercompat} for information on \biber/\biblatex version compatibility. The package is completely localized and can interface with the \sty{babel} package. Please refer to \tabref{bib:fld:tab1} for a list of languages currently supported by this package. \subsection{License} @@ -299,6 +299,42 @@ The \sty{ucs} package provides support for \utf encoded input. Either use \sty{i \end{marglist} +\subsubsection{Compatibility Matrix for \biber} +\label{int:pre:bibercompat} + +\biber\ versions are closely coupled with \biblatex\ versions. You +need to have the right combination of the two. \biber\ will warn you +during processing if it encounters information which comes from a +\biblatex\ version which is incompatible. \tabref{tab:int:pre:bibercompat} shows a +compatibility matrix for the recent versions. + +\begin{table} +\begin{center} +\small +\begin{tabular}{lllll} +\toprule +Biber version & \biblatex\ version\\ +\midrule +1.2 & 2.1, 2.2\\ +1.1 & 2.1\\ +1.0 & 2.0\\ +0.9.9 & 1.7x\\ +0.9.8 & 1.7x\\ +0.9.7 & 1.7x\\ +0.9.6 & 1.7x\\ +0.9.5 & 1.6x\\ +0.9.4 & 1.5x\\ +0.9.3 & 1.5x\\ +0.9.2 & 1.4x\\ +0.9.1 & 1.4x\\ +0.9 & 1.4x\\ +\bottomrule +\end{tabular} +\end{center} +\caption{\biber/\biblatex\ compatibility matrix} +\label{tab:int:pre:bibercompat} +\end{table} + \section{Database Guide} \label{bib} @@ -2450,7 +2486,7 @@ When enabled, sorting names will only use their initials. \BiberOnlyMark This is \boolitem[false]{terseinits} -This option controls the format of initials generated by \sty{biblatex}. If enabled, initials are rendered using a terse format without dots and spaces. For example, the initials of Donald Ervin Knuth would be rendered as <D.~E.> by default, and as <DE> if this option is enabled. \BiberOnlyMark With \biber, the option works by redefining some macros which control the format of initials. See \secref{use:cav:nam} for details. +This option controls the format of initials generated by \sty{biblatex}. If enabled, initials are rendered using a terse format without dots and spaces. For example, the initials of Donald Ervin Knuth would be rendered as <D.~E.> by default, and as <DE> if this option is enabled. The option will affect the \cmd{ifterseinits} test from \secref{aut:aux:tst}. \BiberOnlyMark With \biber, the option works by redefining some macros which control the format of initials. See \secref{use:cav:nam} for details. \boolitem[false]{labelalpha} @@ -3142,7 +3178,7 @@ As seen in the above example, usage of \cmd{defbibenvironment} is roughly simila \cmditem{defbibheading}{name}[title]{code} -This command defines bibliography headings. The \prm{name} is an identifier to be passed to the \opt{heading} option of \cmd{printbibliography} or \cmd{printbibheading} and \cmd{printshorthands} when selecting the heading. The \prm{code} should be \latex code generating a fully"=fledged heading, including page headers and an entry in the table of contents, if desired. If \cmd{printbibliography} or \cmd{printshorthands} are invoked with a \opt{title} option, the title will be passed to the heading definition as |#1|. If not, the default title specified by the optional \prm{title} argument is passed as |#1| instead. The \prm{title} argument will typically be \cmd{bibname}, \cmd{refname}, or \cmd{losname} (see \secref{aut:lng:key:bhd}). Here is an example of a simple heading definition: +This command defines bibliography headings. The \prm{name} is an identifier to be passed to the \opt{heading} option of \cmd{printbibliography} or \cmd{printbibheading} and \cmd{printshorthands} when selecting the heading. The \prm{code} should be \latex code generating a fully"=fledged heading, including page headers and an entry in the table of contents, if desired. If \cmd{printbibliography} or \cmd{printshorthands} are invoked with a \opt{title} option, the title will be passed to the heading definition as |#1|. If not, the default title specified by the optional \prm{title} argument is passed as |#1| instead. The \prm{title} argument will typically be \cmd{bibname}, \cmd{refname}, or \cmd{losname} (see \secref{aut:lng:key:bhd}). This command is often needed when after changes to document headers in the preamble. Here is an example of a simple heading definition: \begin{lstlisting}[style=latex]{} \defbibheading{bibliography}[\bibname]{% @@ -3792,27 +3828,21 @@ The commands in this section may be redefined with \cmd{renewcommand} in the doc \begin{ltxsyntax} \csitem{bibsetup} - Arbitrary code to be executed at the beginning of the bibliography, intended for commands which affect the layout of the bibliography. \csitem{bibfont} - Arbitrary code setting the font used in the bibliography. This is very similar to \cmd{bibsetup} but intended for switching fonts. \csitem{citesetup} - Arbitrary code to be executed at the beginning of each citation command. \csitem{newblockpunct} - The separator inserted between <blocks> in the sense explained in \secref{aut:pct:new}. The default definition is controlled by the package option \opt{block} (see \secref{use:opt:pre:gen}). \csitem{newunitpunct} - The separator inserted between <units> in the sense explained in \secref{aut:pct:new}. This will usually be a period or a comma plus an interword space. The default definition is a period and a space. \csitem{finentrypunct} - The punctuation printed at the very end of every bibliography entry, usually a period. The default definition is a period. \csitem{bibnamedelima}\BiberOnlyMark @@ -3840,67 +3870,60 @@ The spacing inserted between multiple initials unless \cmd{bibinithyphendelim} a The punctuation inserted between the initials of hyphenated name parts, replacing \cmd{bibinitperiod} and \cmd{bibinitdelim}. The default definition is a period followed by an unbreakable hyphen. Please refer to \secref{use:cav:nam} for further details. \csitem{bibindexnamedelima} - Replaces \cmd{bibnamedelima} in the index. \csitem{bibindexnamedelimb} - Replaces \cmd{bibnamedelimb} in the index. \csitem{bibindexnamedelimc} - Replaces \cmd{bibnamedelimc} in the index. \csitem{bibindexnamedelimd} - Replaces \cmd{bibnamedelimd} in the index. \csitem{bibindexnamedelimi} - Replaces \cmd{bibnamedelimi} in the index. \csitem{bibindexinitperiod} - Replaces \cmd{bibinitperiod} in the index. \csitem{bibindexinitdelim} - Replaces \cmd{bibinitdelim} in the index. \csitem{bibindexinithyphendelim} - Replaces \cmd{bibinithyphendelim} in the index. -\csitem{bibnamedash} +\csitem{revsdnamepunct} +The punctuation to be printed between the first and last name parts when a name is reversed. Here is an example showing a name with the default comma as \cmd{revsdnamedelim}: + +\begin{lstlisting}[style=latex]{} +Jones<<,>> Edward +\end{lstlisting} + +This command should be used with \cmd{bibnamedelimd} as a reversed-name separator in formatting directives for name lists. Please refer to \secref{use:cav:nam} for further details. +\csitem{bibnamedash} The dash to be used as a replacement for recurrent authors or editors in the bibliography. The default is an <em> or an <en> dash, depending on the indentation of the list of references. \csitem{labelnamepunct} - The separator printed after the name used for alphabetizing in the bibliography (\bibfield{author} or \bibfield{editor}, if the \bibfield{author} field is undefined). With the default styles, this separator replaces \cmd{newunitpunct} at this location. The default definition is \cmd{newunitpunct}, \ie it is not handled differently from regular unit punctuation. \csitem{subtitlepunct} - The separator printed between the fields \bibfield{title} and \bibfield{subtitle}, \bibfield{booktitle} and \bibfield{booksubtitle}, as well as \bibfield{maintitle} and \bibfield{mainsubtitle}. With the default styles, this separator replaces \cmd{newunitpunct} at this location. The default definition is \cmd{newunitpunct}, \ie it is not handled differently from regular unit punctuation. \csitem{intitlepunct} - The separator between the word «in» and the following title in entry types such as \bibtype{article}, \bibtype{inbook}, \bibtype{incollection}, etc. The default definition is a colon plus an interword space (\eg «Article, in: \emph{Journal}» or «Title, in: \emph{Book}»). Note that this is the separator string, not only the punctuation mark. If you don't want a colon after «in», \cmd{intitlepunct} should still insert a space. \csitem{bibpagespunct} - The separator printed before the \bibfield{pages} field. The default is a comma plus an interword space. \csitem{bibpagerefpunct} - The separator printed before the \bibfield{pageref} field. The default is an interword space. \csitem{multinamedelim} - The delimiter printed between multiple items in a name list like \bibfield{author} or \bibfield{editor} if there are more than two names in the list. The default is a comma plus an interword space. See \cmd{finalnamedelim} for an example.\footnote{Note that \cmd{multinamedelim} is not used at all if there are only two names in the list. In this case, the default styles use the \cmd{finalnamedelim}.} \csitem{finalnamedelim} - The delimiter printed instead of \cmd{multinamedelim} before the final name in a name list. The default is the localized term <and>, separated by interword spaces. Here is an example: \begin{lstlisting}[style=latex]{} @@ -3911,7 +3934,6 @@ Edward Jones <<and>> Joe Williams The comma in the first example is the \cmd{multinamedelim} whereas the string <and> in both examples is the \cmd{finalnamedelim}. See also \cmd{finalandcomma} in \secref{use:fmt:lng}. \csitem{revsdnamedelim} - An extra delimiter printed after the first name in a name list if the first name is reversed. The default is an empty string, \ie no extra delimiter will be printed. Here is an example showing a name list with a comma as \cmd{revsdnamedelim}: \begin{lstlisting}[style=latex]{} @@ -3921,48 +3943,37 @@ Jones, Edward<<, and>> Joe Williams In this example, the comma after <Edward> is the \cmd{revsdnamedelim} whereas the string <and> is the \cmd{finalnamedelim}, printed in addition to the former. \csitem{andothersdelim} - The delimiter printed before the localization string <\texttt{andothers}> if a name list like \bibfield{author} or \bibfield{editor} is truncated. The default is an interword space. \csitem{multilistdelim} - The delimiter printed between multiple items in a literal list like \bibfield{publisher} or \bibfield{location} if there are more than two items in the list. The default is a comma plus an interword space. See \cmd{multinamedelim} for further explanation. \csitem{finallistdelim} - The delimiter printed instead of \cmd{multilistdelim} before the final item in a literal list. The default is the localized term <and>, separated by interword spaces. See \cmd{finalnamedelim} for further explanation. \csitem{andmoredelim} - The delimiter printed before the localization string <\texttt{andmore}> if a literal list like \bibfield{publisher} or \bibfield{location} is truncated. The default is an interword space. \csitem{multicitedelim} - The delimiter printed between citations if multiple entry keys are passed to a single citation command. The default is a semicolon plus an interword space. \csitem{supercitedelim} - Similar to \cmd{multicitedelim}, but used by the \cmd{supercite} command only. The default is a comma. \csitem{compcitedelim} - Similar to \cmd{multicitedelim}, but used by certain citation styles when <compressing> multiple citations. The default definition is a comma plus an interword space. \csitem{nametitledelim} - The delimiter printed between the author\slash editor and the title by author-title and some verbose citation styles. The default definition is a comma plus an interword space. \csitem{nameyeardelim} - The delimiter printed between the author\slash editor and the year by author-year citation styles. The default definition is an interword space. \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{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} - -\BiberOnlyMark Similar to \cmd{labelalphaothers} but used in the sorting process. Setting it to a different value is advisable if the latter contains formatting commands, for example: +\csitem{sortalphaothers}\BiberOnlyMark +Similar to \cmd{labelalphaothers} but used in the sorting process. Setting it to a different value is advisable if the latter contains formatting commands, for example: \begin{lstlisting}[style=latex]{} \renewcommand*{\labelalphaothers}{\textbf{+}} @@ -3972,31 +3983,24 @@ A string to be appended to the non"=numeric portion of the \bibfield{labelalpha} If \cmd{sortalphaothers} is not redefined, it defaults to \cmd{labelalphaothers}. \csitem{prenotedelim} - The delimiter printed after the \prm{prenote} argument of a citation command. See \secref{use:cit} for details. The default is an interword space. \csitem{postnotedelim} - The delimiter printed before the \prm{postnote} argument of a citation command. See \secref{use:cit} for details. The default is a comma plus an interword space. \cmditem{mkbibnamelast}{text} - This command, which takes one argument, is used to format the last name of all authors, editors, translators, etc. \cmditem{mkbibnamefirst}{text} - Similar to \cmd{mkbibnamelast}, but intended for the first name. \cmditem{mkbibnameprefix}{text} - Similar to \cmd{mkbibnamelast}, but intended for the name prefix. \cmditem{mkbibnameaffix}{text} - Similar to \cmd{mkbibnamelast}, but intended for the name affix. \csitem{relatedpunct} - The separator between the \bibfield{relatedtype} bibliography localization string and the data from the first related entry. Here is an example with \cmd{relatedpunct} set to a dash: \begin{lstlisting}[style=latex]{} @@ -4004,7 +4008,6 @@ A. Smith. Title. 2000, (Orig. pub. as<<->>Origtitle) \end{lstlisting} \csitem{relateddelim} - The separator between the data of multiple related entries. The default definition is an optional dot plus linebreak. Here is an example where volumes A-E are related entries of the 5 volume main work: \begin{lstlisting}[style=latex]{} @@ -4399,7 +4402,7 @@ When using a format with one cumulative bibliography subdivided by chapter (or a \documentclass{...} \usepackage{biblatex} <<\defbibheading>>{<<subbibliography>>}{% - \section*{References for Chapter \ref{<<refsegment:\therefsegment>>}}} + \section*{References for Chapter \ref{<<refsegment:\therefsection\therefsegment>>}}} \addbibresource{...} \begin{document} \chapter{...} @@ -4849,7 +4852,7 @@ Last & Doe \\ Suffix & --- \\ \end{nameparts} % -The spacing and the line"=breaking behavior of names is controlled by four macros: +The spacing, punctuation and line"=breaking behavior of names is controlled by six macros: \begin{namedelims} a & \cmd{bibnamedelima} & Inserted by the backend after the first element of every name part if that element is less than three characters long and before the last element of every name part. \\ @@ -4857,12 +4860,14 @@ b & \cmd{bibnamedelimb} & Inserted by the backend between all elements of a name c & \cmd{bibnamedelimc} & Inserted by a formatting directive between the name prefix and the last name if \kvopt{useprefix}{true}. If \kvopt{useprefix}{false}, \cmd{bibnamedelimd} is used instead. \\ d & \cmd{bibnamedelimd} & Inserted by a formatting directive between name parts where \cmd{bibnamedelimc} does not apply. \\ i & \cmd{bibnamedelimi} & Replaces \cmd{bibnamedelima/b} after initials \\ +p & \cmd{revsdnamepunct} & Inserted by a formatting directive after the last name when the name parts are reversed. \end{namedelims} % This is how the delimiters are employed: \begin{namesample} \item John\delim{~}{a}Edward\delim{ }{d}Doe +\item Doe\delim{,}{p}\delim{ }{d}John\delim{~}{a}Edward \end{namesample} % Initials in the \file{bib} file get a special delimiter: @@ -7172,6 +7177,10 @@ This command is similar to \cmd{ifmorenames} but checks the current literal list Expands to \prm{true} or \prm{false}, depending on the state of the \opt{firstinits} package option (see \secref{use:opt:pre:int}). This command is intended for use in formatting directives for name lists. +\cmditem{ifterseinits}{true}{false} + +Expands to \prm{true} or \prm{false}, depending on the state of the \opt{terseinits} package option (see \secref{use:opt:pre:int}). This command is intended for use in formatting directives for name lists. + \cmditem{ifentrytype}{type}{true}{false} Executes \prm{true} if the entry type of the entry currently being processed is \prm{type}, and \prm{false} otherwise. @@ -8646,143 +8655,111 @@ The spacing inserted automatically by the backend between multiple initials unle The punctuation inserted automatically by the backend between the initials of hyphenated name parts, replacing \cmd{bibinitperiod} and \cmd{bibinitdelim}. The default definition is a period followed by an unbreakable hyphen. Please refer to \secref{use:cav:nam} for further details. \csitem{bibindexnamedelima} - Replaces \cmd{bibnamedelima} in the index. \csitem{bibindexnamedelimb} - Replaces \cmd{bibnamedelimb} in the index. \csitem{bibindexnamedelimc} - Replaces \cmd{bibnamedelimc} in the index. \csitem{bibindexnamedelimd} - Replaces \cmd{bibnamedelimd} in the index. \csitem{bibindexnamedelimi} - Replaces \cmd{bibnamedelimi} in the index. \csitem{bibindexinitperiod} - Replaces \cmd{bibinitperiod} in the index. \csitem{bibindexinitdelim} - Replaces \cmd{bibinitdelim} in the index. \csitem{bibindexinithyphendelim} - Replaces \cmd{bibinithyphendelim} in the index. -\csitem{bibnamedash} +\csitem{revsdnamepunct} +The punctuation to be printed between the first and last name parts when a name is reversed. The default is a comma. This command should be incorporated in formatting directives for name lists. Please refer to \secref{use:cav:nam} for further details. +\csitem{bibnamedash} The dash to be used as a replacement for recurrent authors or editors in the bibliography. The default is an <em> or an <en> dash, depending on the indentation of the list of references. \csitem{labelnamepunct} - The separator to be printed after the name used for alphabetizing in the bibliography (\bibfield{author} or \bibfield{editor}, if the \bibfield{author} field is undefined). Use this separator instead of \cmd{newunitpunct} at this location. The default is \cmd{newunitpunct}, \ie it is not handled differently from regular unit punctuation but permits convenient reconfiguration. \csitem{subtitlepunct} - The separator to be printed between the fields \bibfield{title} and \bibfield{subtitle}, \bibfield{booktitle} and \bibfield{booksubtitle}, as well as \bibfield{maintitle} and \bibfield{mainsubtitle}. Use this separator instead of \cmd{newunitpunct} at this location. The default is \cmd{newunitpunct}, \ie it is not handled differently from regular unit punctuation but permits convenient reconfiguration. \csitem{intitlepunct} - The separator to be printed between the word «in» and the following title in entry types such as \bibtype{article}, \bibtype{inbook}, \bibtype{incollection}, etc. Use this separator instead of \cmd{newunitpunct} at this location. The default definition is a colon plus an interword space. \csitem{bibpagespunct} - The separator to be printed before the \bibfield{pages} field. Use this separator instead of \cmd{newunitpunct} at this location. The default is a comma plus an interword space. \csitem{bibpagerefpunct} - The separator to be printed before the \bibfield{pageref} field. Use this separator instead of \cmd{newunitpunct} at this location. The default is an interword space. \csitem{multinamedelim} - The delimiter to be printed between multiple items in a name list like \bibfield{author} or \bibfield{editor} if there are more than two names in the list. If there are only two names in the list, use the \cmd{finalnamedelim} instead. This command should be incorporated in all formatting directives for name lists. \csitem{finalnamedelim} - Use this command instead of \cmd{multinamedelim} before the final name in a name list. \csitem{revsdnamedelim} - The extra delimiter to be printed after the first name in a name list (in addition to \cmd{finalnamedelim}) if the first name is reversed. This command should be incorporated in all formatting directives for name lists. \csitem{andothersdelim} - The delimiter to be printed before the localization string <\texttt{andothers}> if a name list like \bibfield{author} or \bibfield{editor} is truncated. This command should be incorporated in all formatting directives for name lists. \csitem{multilistdelim} - The delimiter to be printed between multiple items in a literal list like \bibfield{publisher} or \bibfield{location} if there are more than two names in the list. If there are only two items in the list, use the \cmd{finallistdelim} instead. This command should be incorporated in all formatting directives for literal lists. \csitem{finallistdelim} - Use this command instead of \cmd{multilistdelim} before the final item in a literal list. \csitem{andmoredelim} - The delimiter to be printed before the localization string <\texttt{andmore}> if a literal list like \bibfield{publisher} or \bibfield{location} is truncated. This command should be incorporated in all formatting directives for literal lists. \csitem{multicitedelim} - The delimiter printed between citations if multiple entry keys are passed to a single citation command. This command should be incorporated in the definition of all citation commands, for example in the \prm{sepcode} argument passed to \cmd{DeclareCiteCommand}. See \secref{aut:cbx:cbx} for details. \csitem{supercitedelim} - Similar to \cmd{multinamedelim}, but intended for the \cmd{supercite} command only. \csitem{compcitedelim} - Similar to \cmd{multicitedelim}, but intended for citation styles which <compress> multiple citations, \ie print the author only once if subsequent citations share the same author etc. \csitem{nametitledelim} - The delimiter to be printed between the author\slash editor and the title. This command should be incorporated in the definition of all citation commands of author-title and some verbose citation styles. \csitem{nameyeardelim} - The delimiter to be printed between the author\slash editor and the year. This command should be incorporated in the definition of all citation commands of author-year citation styles. \csitem{volcitedelim} - The delimiter to be printed between the volume portion and the page/text portion of \cmd{volcite} and related commands (\secref{use:cit:spc}). \csitem{prenotedelim} - The delimiter to be printed after the \prm{prenote} argument of a citation command. \csitem{postnotedelim} - The delimiter to be printed after the \prm{postnote} argument of a citation command. \cmditem{mkbibnamelast}{text} - Formatting hook for the last name, to be used in all formatting directives for name lists. \cmditem{mkbibnamefirst}{text} - Similar to \cmd{mkbibnamelast}, but intended for the first name. \cmditem{mkbibnameprefix}{text} - Similar to \cmd{mkbibnamelast}, but intended for the name prefix. \cmditem{mkbibnameaffix}{text} - Similar to \cmd{mkbibnamelast}, but intended for the name affix. \csitem{relatedpunct} - The separator between the relatedtype bibliography localization string and the data from the first related entry. \csitem{relateddelim} - The separator between the data of multiple related entries. The default definition is a linebreak. \end{ltxsyntax} @@ -10520,6 +10497,12 @@ This revision history is a list of changes relevant to users of this package. Ch \begin{changelog} +\begin{release}{2.2}{2012} +\item Misc bug fixes +\item Added \cmd{revsdnamepunct}\see{use:fmt:fmt} +\item Added \cmd{ifterseinits}\see{aut:aux:tst} +\end{release} + \begin{release}{2.1}{2012-08-01} \item Misc bug fixes \item Added better Norwegian localization diff --git a/Master/texmf-dist/doc/latex/biblatex/bibtex/bib/biblatex-examples.bib b/Master/texmf-dist/doc/latex/biblatex/bibtex/bib/biblatex/biblatex-examples.bib index 2b1cc3178a5..b86e9bf01f6 100644 --- a/Master/texmf-dist/doc/latex/biblatex/bibtex/bib/biblatex-examples.bib +++ b/Master/texmf-dist/doc/latex/biblatex/bibtex/bib/biblatex/biblatex-examples.bib @@ -1,4 +1,3 @@ -@PREAMBLE{ "\RequireBiber[2]" } @string{anch-ie = {Angew.~Chem. Int.~Ed.} } @string{cup = {Cambridge University Press} } @string{dtv = {Deutscher Taschenbuch-Verlag} } diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/01-introduction.tex b/Master/texmf-dist/doc/latex/biblatex/examples/01-introduction.tex index ac99a7b3704..21713630997 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/01-introduction.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/01-introduction.tex @@ -17,7 +17,7 @@ % % We are using the 'authoryear' style in this example. % The default is the 'numerical' style. -\usepackage[style=authoryear]{biblatex} +\usepackage[style=authoryear,backend=biber]{biblatex} % % We use the database biblatex-examples.bib. \addbibresource{biblatex-examples.bib} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations.tex b/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations.tex index 4dcea33ce3b..809dc32b6de 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations.tex @@ -8,7 +8,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=reading,abstract=false]{biblatex} +\usepackage[style=reading,abstract=false,backend=biber]{biblatex} \addbibresource{biblatex-examples.bib} \usepackage{hyperref} \begin{document} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section.tex b/Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section.tex index ce3736b2442..70a7f686156 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section.tex @@ -28,7 +28,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=numeric]{biblatex} +\usepackage[style=numeric,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} \begin{document} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section.tex b/Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section.tex index 30a0629c99e..75fec27d144 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section.tex @@ -26,7 +26,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=authoryear]{biblatex} +\usepackage[style=authoryear,backend=biber]{biblatex} \usepackage{hyperref} \usepackage{nameref} \addbibresource{biblatex-examples.bib} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment.tex b/Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment.tex index 04235c3e6ba..a3c537eb797 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment.tex @@ -7,14 +7,14 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=authoryear]{biblatex} +\usepackage[style=authoryear,backend=biber]{biblatex} \usepackage{hyperref} \usepackage{nameref} \addbibresource{biblatex-examples.bib} \defbibheading{subbibliography}{% \section*{% Chapter \therefsegment: - \nameref{refsegment:\therefsegment}}} + \nameref{refsegment:\therefsection\therefsegment}}} \begin{document} \chapter{Title of first chapter} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword.tex b/Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword.tex index 1c3217633ad..7c4c9ea0f0f 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword.tex @@ -21,7 +21,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=authortitle]{biblatex} +\usepackage[style=authortitle,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} \begin{document} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category.tex b/Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category.tex index ad5301b2d52..3099f8bd9f9 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category.tex @@ -9,7 +9,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=authortitle]{biblatex} +\usepackage[style=authortitle,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} \DeclareBibliographyCategory{primary} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type.tex b/Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type.tex index 7df1f1b6f4e..483bdb386a1 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type.tex @@ -6,7 +6,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=authoryear]{biblatex} +\usepackage[style=authoryear,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} \begin{document} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1.tex b/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1.tex index da32d19ae69..d88471fc40d 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1.tex @@ -15,7 +15,7 @@ % When using prefixed numerical labels, the labels must be assigned % as the bibliography is generated. That's why we set % defernumbers=true here: -\usepackage[style=numeric,defernumbers]{biblatex} +\usepackage[style=numeric,defernumbers,backend=biber]{biblatex} \usepackage{hyperref} \usepackage{nameref} \addbibresource{biblatex-examples.bib} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2.tex b/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2.tex index 0179dcc66f7..1b0320982cd 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2.tex @@ -1,12 +1,12 @@ % % This example is almost the same as the previous one except that -% the catch-all sub-bibliography does not assing any prefix. +% the catch-all sub-bibliography does not assign any prefix. % \documentclass[a4paper,oneside]{article} \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=numeric,defernumbers]{biblatex} +\usepackage[style=numeric,defernumbers,backend=biber]{biblatex} \usepackage{hyperref} \usepackage{nameref} \addbibresource{biblatex-examples.bib} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid.tex b/Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid.tex index ff2edf08909..eff34127d7f 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid.tex @@ -14,7 +14,7 @@ % labels by setting 'labelnumber=true'. We also set % 'defernumbers=true'. This will be required by the 'omitnumbers' % option used below. -\usepackage[style=authoryear,labelnumber,defernumbers]{biblatex} +\usepackage[style=authoryear,labelnumber,defernumbers,backend=biber]{biblatex} \usepackage{hyperref} \usepackage{nameref} \addbibresource{biblatex-examples.bib} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/19-alphabetic-prefixed.tex b/Master/texmf-dist/doc/latex/biblatex/examples/19-alphabetic-prefixed.tex index f6d081ef695..dbf40cc0bb6 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/19-alphabetic-prefixed.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/19-alphabetic-prefixed.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=alphabetic]{biblatex} +\usepackage[style=alphabetic,backend=biber]{biblatex} \usepackage{hyperref} \usepackage{nameref} \addbibresource{biblatex-examples.bib} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-basic.tex b/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-basic.tex index 5b8a3d2df1c..d905168b33e 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-basic.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-basic.tex @@ -23,7 +23,7 @@ % only reason we're indexing the bibliography in this example is to % get a larger index. For a change, let's also use the 'authortitle' % style in this example. -\usepackage[indexing,style=authortitle]{biblatex} +\usepackage[indexing,style=authortitle,backend=biber]{biblatex} \addbibresource{biblatex-examples.bib} % % The 'makeidx' package provides indexing facilities on a fairly diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-advanced.tex b/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-advanced.tex index 3f7ceedbaa5..fef863a4516 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-advanced.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-advanced.tex @@ -15,18 +15,18 @@ % \documentclass[a4paper]{article} \usepackage[T1]{fontenc} +% +% The 'index' package provides advanced indexing facilities with +% support for multiple indexes. +\usepackage{index} \usepackage[american]{babel} \usepackage{csquotes} % % We set the 'indexing' package option and use the 'authortitle' % style in this example. -\usepackage[indexing,style=authortitle,babel=hyphen]{biblatex} +\usepackage[indexing,style=authortitle,babel=hyphen,backend=biber]{biblatex} \addbibresource{biblatex-examples.bib} % -% The 'index' package provides advanced indexing facilities with -% support for multiple indexes. -\usepackage{index} -% % We want three indexes: a general index, an index of names, and an % index of titles. They are defined by way of \newindex, see the % documentation of the 'index' package for details. diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric.tex b/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric.tex index cc42afd58c4..335e5bfe4a5 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=numeric,subentry]{biblatex} +\usepackage[style=numeric,subentry,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} % Some generic settings. diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp.tex b/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp.tex index 8ed6e23e62a..4cb1a8e6805 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=numeric-comp,subentry]{biblatex} +\usepackage[style=numeric-comp,subentry,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} % Some generic settings. diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb.tex b/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb.tex index de8aed7a498..a4d0bacce0c 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=numeric-verb,subentry]{biblatex} +\usepackage[style=numeric-verb,subentry,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} % Some generic settings. diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic.tex b/Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic.tex index fc026019e0f..1561614b507 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=alphabetic]{biblatex} +\usepackage[style=alphabetic,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} % Some generic settings. diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb.tex b/Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb.tex index 17044b73928..0644a782fe7 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=alphabetic-verb]{biblatex} +\usepackage[style=alphabetic-verb,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} % Some generic settings. diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/42-style-alphabetic-template.tex b/Master/texmf-dist/doc/latex/biblatex/examples/42-style-alphabetic-template.tex index 1c8bf652dad..43f84e66b2f 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/42-style-alphabetic-template.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/42-style-alphabetic-template.tex @@ -6,7 +6,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[backend=biber,style=alphabetic]{biblatex} +\usepackage[backend=biber,style=alphabetic,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.tex b/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.tex index 10aef58a099..9389f5b702f 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=authoryear]{biblatex} +\usepackage[style=authoryear,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} \setlength{\parindent}{0pt} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.tex b/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.tex index 8df70e64ec0..ed76e03b0c9 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=authoryear-ibid]{biblatex} +\usepackage[style=authoryear-ibid,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} % Some generic settings: diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.tex b/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.tex index 839e73cbcd9..3133f7c8686 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=authoryear-comp]{biblatex} +\usepackage[style=authoryear-comp,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} % Some generic settings. diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.tex b/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.tex index 28b5ce7d105..a6ffe4a5abc 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=authoryear-icomp]{biblatex} +\usepackage[style=authoryear-icomp,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} % Some generic settings. diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle.tex b/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle.tex index 528629e457d..b4911028d54 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=authortitle]{biblatex} +\usepackage[style=authortitle,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} % Some generic settings: diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid.tex b/Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid.tex index f6c1320081d..60c0eb8913c 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=authortitle-ibid]{biblatex} +\usepackage[style=authortitle-ibid,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} % Some generic settings: diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp.tex b/Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp.tex index ddf81fe41f3..8ed5859b0f5 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=authortitle-comp]{biblatex} +\usepackage[style=authortitle-comp,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} % Some generic settings: diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp.tex b/Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp.tex index cb84726e142..5cb8b32b2e6 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=authortitle-icomp]{biblatex} +\usepackage[style=authortitle-icomp,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} % Some generic settings: diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse.tex b/Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse.tex index 78baf541655..0d34bbe6ca9 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=authortitle-terse]{biblatex} +\usepackage[style=authortitle-terse,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} % Some generic settings. diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp.tex b/Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp.tex index 0d8eaefde10..6156825c927 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=authortitle-tcomp]{biblatex} +\usepackage[style=authortitle-tcomp,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} % Some generic settings. diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp.tex b/Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp.tex index 278242cfbfe..f0b6bc16db7 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=authortitle-ticomp]{biblatex} +\usepackage[style=authortitle-ticomp,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} % Some generic settings. diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose.tex b/Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose.tex index 11809c3b190..5a84c979873 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=verbose]{biblatex} +\usepackage[style=verbose,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} \newcommand{\cmd}[1]{\texttt{\textbackslash #1}} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid.tex b/Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid.tex index 4b22edc535f..453b13f919a 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=verbose-ibid]{biblatex} +\usepackage[style=verbose-ibid,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} \newcommand{\cmd}[1]{\texttt{\textbackslash #1}} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note.tex b/Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note.tex index 22014277e3f..171bdbab1bd 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=verbose-note]{biblatex} +\usepackage[style=verbose-note,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} \newcommand{\cmd}[1]{\texttt{\textbackslash #1}} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote.tex b/Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote.tex index 8689e3048ce..bba21bf5ed4 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=verbose-inote]{biblatex} +\usepackage[style=verbose-inote,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} \newcommand{\cmd}[1]{\texttt{\textbackslash #1}} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1.tex b/Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1.tex index 40d3db7e8bb..ac79202f416 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[german,american]{babel} \usepackage{csquotes} -\usepackage[style=verbose-trad1]{biblatex} +\usepackage[style=verbose-trad1,backend=biber]{biblatex} \usepackage{tabularx} \usepackage{booktabs} \addbibresource{biblatex-examples.bib} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2.tex b/Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2.tex index f5fe794b06d..1059726d852 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=verbose-trad2]{biblatex} +\usepackage[style=verbose-trad2,backend=biber]{biblatex} \addbibresource{biblatex-examples.bib} % Some generic settings: \newcommand{\cmd}[1]{\texttt{\textbackslash #1}} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3.tex b/Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3.tex index 9d3dc5d9b70..493c32db920 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=verbose-trad3]{biblatex} +\usepackage[style=verbose-trad3,backend=biber]{biblatex} \addbibresource{biblatex-examples.bib} % Some generic settings: \newcommand{\cmd}[1]{\texttt{\textbackslash #1}} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading.tex b/Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading.tex index e5aeb24248d..7a1f3da6636 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=reading]{biblatex} +\usepackage[style=reading,backend=biber]{biblatex} \usepackage{tabularx} \usepackage{hyperref} \usepackage{booktabs} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft.tex b/Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft.tex index 2def7708794..3c3ea29c189 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=draft]{biblatex} +\usepackage[style=draft,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} % Some generic settings: diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug.tex b/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug.tex index 8ea47d6e9a7..12c922f0e95 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug.tex @@ -5,7 +5,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=debug]{biblatex} +\usepackage[style=debug,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} % Some generic settings: diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/91-sorting-schemes.tex b/Master/texmf-dist/doc/latex/biblatex/examples/91-sorting-schemes.tex index 387be91216a..81d1bdecc0e 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/91-sorting-schemes.tex +++ b/Master/texmf-dist/doc/latex/biblatex/examples/91-sorting-schemes.tex @@ -6,7 +6,7 @@ \usepackage[T1]{fontenc} \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[backend=biber,style=authoryear,sortcites,sorting=ynt]{biblatex} +\usepackage[style=authoryear,sortcites,sorting=ynt,backend=biber]{biblatex} \usepackage{hyperref} \addbibresource{biblatex-examples.bib} \begin{document} diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib b/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib index 2b1cc3178a5..b86e9bf01f6 100644 --- a/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib +++ b/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib @@ -1,4 +1,3 @@ -@PREAMBLE{ "\RequireBiber[2]" } @string{anch-ie = {Angew.~Chem. Int.~Ed.} } @string{cup = {Cambridge University Press} } @string{dtv = {Deutscher Taschenbuch-Verlag} } diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx index fc90ed62f29..60585d04d8f 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx @@ -85,36 +85,9 @@ \endgroup \clearpage} -\DeclareBibliographyAlias{article}{debug} -\DeclareBibliographyAlias{book}{debug} -\DeclareBibliographyAlias{bookinbook}{debug} -\DeclareBibliographyAlias{booklet}{debug} -\DeclareBibliographyAlias{collection}{debug} -\DeclareBibliographyAlias{inbook}{debug} -\DeclareBibliographyAlias{incollection}{debug} -\DeclareBibliographyAlias{inproceedings}{debug} -\DeclareBibliographyAlias{inreference}{debug} -\DeclareBibliographyAlias{manual}{debug} -\DeclareBibliographyAlias{misc}{debug} -\DeclareBibliographyAlias{mvbook}{debug} -\DeclareBibliographyAlias{mvcollection}{debug} -\DeclareBibliographyAlias{mvproceedings}{debug} -\DeclareBibliographyAlias{mvreference}{debug} -\DeclareBibliographyAlias{online}{debug} -\DeclareBibliographyAlias{patent}{debug} -\DeclareBibliographyAlias{periodical}{debug} -\DeclareBibliographyAlias{proceedings}{debug} -\DeclareBibliographyAlias{reference}{debug} -\DeclareBibliographyAlias{report}{debug} -\DeclareBibliographyAlias{review}{debug} -\DeclareBibliographyAlias{set}{debug} -\DeclareBibliographyAlias{shorthands}{debug} -\DeclareBibliographyAlias{suppbook}{debug} -\DeclareBibliographyAlias{suppcollection}{debug} -\DeclareBibliographyAlias{suppperiodical}{debug} -\DeclareBibliographyAlias{thesis}{debug} -\DeclareBibliographyAlias{unpublished}{debug} -\DeclareBibliographyAlias{*}{debug} +\def\do#1{\DeclareBibliographyAlias{#1}{debug}} +\abx@dotypes +\do{*} \DeclareBibliographyDriver{shorthands}{% \texttt{\printfield{entrykey}}} diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def index 649fc0b37de..840af8ea3c5 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def @@ -52,6 +52,7 @@ \newcommand*{\intitlepunct}{\addcolon\space} \newcommand*{\bibpagespunct}{\addcomma\space} \newcommand*{\bibpagerefpunct}{\addspace} +\newcommand*{\revsdnamepunct}{\addcomma} \newcommand*{\bibnamedash}{% \ifdimless{\leftmargin}{0.75em} {\mbox{\textemdash\space}} @@ -117,7 +118,6 @@ % \citesetup is a generic hook for citations. \newcommand*{\citesetup}{% - \frenchspacing \biburlsetup} % Local setup for \url; see comments in url.sty for details. @@ -752,12 +752,12 @@ \ifpunctmark{'}{}{\bibnamedelimc}}% \mkbibnamelast{#1}\isdot \ifblank{#4}{}{\bibnamedelimd\mkbibnameaffix{#4}\isdot}% - \ifblank{#2}{}{\addcomma\bibnamedelimd\mkbibnamefirst{#2}\isdot}} + \ifblank{#2}{}{\revsdnamepunct\bibnamedelimd\mkbibnamefirst{#2}\isdot}} {\usebibmacro{name:delim}{#1}% \usebibmacro{name:hook}{#1}% \mkbibnamelast{#1}\isdot \ifblank{#4}{}{\bibnamedelimd\mkbibnameaffix{#4}\isdot}% - \ifblank{#2#3}{}{\addcomma}% + \ifblank{#2#3}{}{\revsdnamepunct}% \ifblank{#2}{}{\bibnamedelimd\mkbibnamefirst{#2}\isdot}% \ifblank{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}}} @@ -2615,7 +2615,7 @@ {\printtext[journaltitle]{% \printfield[titlecase]{journaltitle}% \setunit{\subtitlepunct}% - \printfield{journalsubtitle}}}} + \printfield[titlecase]{journalsubtitle}}}} \newbibmacro*{periodical}{% \iffieldundef{title} @@ -2623,7 +2623,7 @@ {\printtext[title]{% \printfield[titlecase]{title}% \setunit{\subtitlepunct}% - \printfield{subtitle}}}} + \printfield[titlecase]{subtitle}}}} \newbibmacro*{issue}{% \iffieldundef{issuetitle} @@ -2631,7 +2631,7 @@ {\printtext[issuetitle]{% \printfield[titlecase]{issuetitle}% \setunit{\subtitlepunct}% - \printfield{issuesubtitle}}}} + \printfield[titlecase]{issuesubtitle}}}} \newbibmacro*{in:}{% \printtext{% diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty index 5badbf80bfc..450f3621f32 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty @@ -3,8 +3,8 @@ %% % Set up the version strings here, so they are the same for both branches -\def\abx@date{2012/08/02} -\def\abx@version{2.1} +\def\abx@date{2012/08/17} +\def\abx@version{2.2} \def\abx@bbxid{\abx@date\space v\abx@version\space biblatex bibliography style (PK/JW/AB)} \def\abx@cbxid{\abx@date\space v\abx@version\space biblatex citation style (PK/JW/AB)} \def\abx@lbxid{\abx@date\space v\abx@version\space biblatex localization (PK/JW/AB)} diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty index e672b64d927..6a9aeac7dd9 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty @@ -426,7 +426,7 @@ \newtoggle{blx@mcite} \newtoggle{blx@loadfiles} \newtoggle{blx@singletitle} -\newtoggle{blx@terseinits}% BibTeX only +\newtoggle{blx@terseinits} \newtoggle{blx@firstinits} \newtoggle{blx@useauthor} \newtoggle{blx@useeditor} @@ -3159,6 +3159,7 @@ \def\ifuseauthor{\iftoggle{blx@useauthor}}% \def\ifuseeditor{\iftoggle{blx@useeditor}}% \def\ifusetranslator{\iftoggle{blx@usetranslator}}% + \def\ifterseinits{\iftoggle{blx@terseinits}}% \def\iffirstinits{\iftoggle{blx@firstinits}}% \def\ifsingletitle{\iftoggle{abx@bool@singletitle}}% \def\ifandothers#1{\iftoggle{abx@bool@more#1}}% @@ -4835,16 +4836,18 @@ {\ifdef\blx@thelangenv {\def\blx@beglang{% \blx@clearlang - \begingroup + \begingroup \blx@imc@iffieldundef{hyphenation} {} - {\blx@hook@initlang - \def\blx@endlang{% - \blx@hook@endlang - \csname end\blx@thelangenv\endcsname - \endgroup}% - \csname\blx@thelangenv\expandafter\endcsname - \expandafter{\abx@field@hyphenation}}}} + {\ifcsundef{l@\abx@field@hyphenation} + {\blx@warn@nohyph{\abx@field@hyphenation}} + {\blx@hook@initlang + \def\blx@endlang{% + \blx@hook@endlang + \csname end\blx@thelangenv\endcsname + \endgroup}% + \csname\blx@thelangenv\expandafter\endcsname + \expandafter{\abx@field@hyphenation}}}}} {}% \blx@langsetup\bbl@main@language} {\blx@err@patch{'babel' package}% @@ -5835,7 +5838,10 @@ \blx@addchecksum{#1}{#4}}} \AtEndDocument{% - \def\abx@aux@number#1#2#3#4{\blx@addchecksum{#1}{#4}}} + \def\abx@aux@number#1#2#3#4{% + \ifblank{#4} + {} + {\blx@addchecksum{#1}{#4}}}} \def\blx@addlabelnumber{% \begingroup @@ -6928,8 +6934,8 @@ \global\advance\blx@maxsegment\@ne \global\c@refsegment\blx@maxsegment \blx@inf@refseg - \blx@info{Setting label 'refsegment:\the\c@refsegment'}% - \label{refsegment:\the\c@refsegment}% + \blx@info{Setting label 'refsegment:\the\c@refsection\the\c@refsegment'}% + \label{refsegment:\the\c@refsection\the\c@refsegment}% \ifcsundef{blx@segm@\the\c@refsection @\the\c@refsegment} {\global\cslet{blx@segm@\the\c@refsection @\the\c@refsegment}\@empty} {}} @@ -8486,6 +8492,7 @@ \def\ifuseauthor{\blx@TE{\iftoggle{blx@useauthor}}}% \def\ifuseeditor{\blx@TE{\iftoggle{blx@useeditor}}}% \def\ifusetranslator{\blx@TE{\iftoggle{blx@usetranslator}}}% + \def\ifterseinits{\blx@TE{\iftoggle{blx@terseinits}}}% \def\iffirstinits{\blx@TE{\iftoggle{blx@firstinits}}}% \def\ifsingletitle{\blx@TE{\iftoggle{abx@bool@singletitle}}}% \def\ifandothers#1{\blx@TE{\iftoggle{abx@bool@more#1}}}}} @@ -9653,11 +9660,11 @@ \DeclareBibliographyOption{terseinits}[true]{% \ifstrequal{#1}{true} - {\toggletrue{blx@terseinits}% BibTeX only + {\toggletrue{blx@terseinits} \renewrobustcmd*{\bibinitperiod}{} \renewrobustcmd*{\bibinitdelim}{} \renewrobustcmd*{\bibinithyphendelim}{}} - {\togglefalse{blx@terseinits}% BibTeX only + {\togglefalse{blx@terseinits} \renewrobustcmd*{\bibinitperiod}{\adddot} \renewrobustcmd*{\bibinitdelim}{\addnbspace} \renewrobustcmd*{\bibinithyphendelim}{\adddot\mbox{-}}}} diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty index c55458a475d..cb3b9ccd304 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty @@ -430,6 +430,7 @@ \newtoggle{blx@mcite} \newtoggle{blx@loadfiles} \newtoggle{blx@singletitle} +\newtoggle{blx@terseinits} \newtoggle{blx@firstinits} \newtoggle{blx@sortfirstinits} \newtoggle{blx@useauthor} @@ -2968,6 +2969,7 @@ \def\ifuseauthor{\iftoggle{blx@useauthor}}% \def\ifuseeditor{\iftoggle{blx@useeditor}}% \def\ifusetranslator{\iftoggle{blx@usetranslator}}% + \def\ifterseinits{\iftoggle{blx@terseinits}}% \def\iffirstinits{\iftoggle{blx@firstinits}}% \def\ifsingletitle{\iftoggle{abx@bool@singletitle}}% \def\ifandothers#1{\iftoggle{abx@bool@more#1}}% @@ -4645,13 +4647,15 @@ \begingroup \blx@imc@iffieldundef{hyphenation} {} - {\blx@hook@initlang - \def\blx@endlang{% - \blx@hook@endlang - \csname end\blx@thelangenv\endcsname - \endgroup}% - \csname\blx@thelangenv\expandafter\endcsname - \expandafter{\abx@field@hyphenation}}}} + {\ifcsundef{l@\abx@field@hyphenation} + {\blx@warn@nohyph{\abx@field@hyphenation}} + {\blx@hook@initlang + \def\blx@endlang{% + \blx@hook@endlang + \csname end\blx@thelangenv\endcsname + \endgroup}% + \csname\blx@thelangenv\expandafter\endcsname + \expandafter{\abx@field@hyphenation}}}}} {}% \blx@langsetup\bbl@main@language} {\blx@err@patch{'babel' package}% @@ -4697,6 +4701,22 @@ {\clearlist{language}} {}} +%% Biber equivalents to bibtex data interface + +\def\abx@dotypes{\dolistcsloop{blx@biber@datamodel@entrytypes}} + +\def\abx@donames{% + \dolistcsloop{blx@biber@datamodel@names}% + \do{labelname}% +} + +\def\abx@dolists{% + \dolistcsloop{blx@biber@datamodel@lists}% + \do{pageref}% +} + +\def\abx@dofields{\dolistcsloop{blx@biber@datamodel@fields}} + % Used to pass regexps to .bcf \def\regexp#1{\expandafter\zap@space\detokenize{#1} \@empty} @@ -5171,6 +5191,10 @@ \c@refsection#1\relax} \def\blx@bbl@endrefsection{% + \iftoggle{blx@addset} + {\blx@addset + \global\togglefalse{blx@addset}} + {}% \endgroup \csnumgdef{blx@labelnumber@\the\c@refsection}{0}% \iftoggle{blx@reencode}{\blx@reencode}{}} @@ -5410,10 +5434,7 @@ \let\endverb\blx@bbl@verbend} \def\blx@bblend{% - \iftoggle{blx@addset} - {\blx@addset - \global\togglefalse{blx@addset}} - {}} +} % {<instcount>}{<entrykey>}{<refsection>}{<labelnumber>} @@ -5425,7 +5446,10 @@ \blx@addchecksum{#1}{#4}}} \AtEndDocument{% - \def\abx@aux@number#1#2#3#4{\blx@addchecksum{#1}{#4}}} + \def\abx@aux@number#1#2#3#4{% + \ifblank{#4} + {} + {\blx@addchecksum{#1}{#4}}}} \def\blx@addlabelnumber{% \begingroup @@ -5684,8 +5708,8 @@ \define@key{blx@bib1}{title}{} \define@key{blx@bib1}{prenote}{} \define@key{blx@bib1}{postnote}{} -\define@key{blx@bib1}{resetnumbers}{} -\define@key{blx@bib1}{omitnumbers}{} +\define@key{blx@bib1}{resetnumbers}[]{} +\define@key{blx@bib1}{omitnumbers}[]{} \define@key{blx@bib1}{prefixnumbers}{} \define@key{blx@bib2}{section}{} @@ -8093,6 +8117,7 @@ \def\ifuseauthor{\blx@TE{\iftoggle{blx@useauthor}}}% \def\ifuseeditor{\blx@TE{\iftoggle{blx@useeditor}}}% \def\ifusetranslator{\blx@TE{\iftoggle{blx@usetranslator}}}% + \def\ifterseinits{\blx@TE{\iftoggle{blx@terseinits}}}% \def\iffirstinits{\blx@TE{\iftoggle{blx@firstinits}}}% \def\ifsingletitle{\blx@TE{\iftoggle{abx@bool@singletitle}}}% \def\ifandothers#1{\blx@TE{\iftoggle{abx@bool@more#1}}}}} @@ -9551,10 +9576,12 @@ \DeclareBibliographyOption{terseinits}[true]{% \ifstrequal{#1}{true} - {\renewrobustcmd*{\bibinitperiod}{} + {\toggletrue{blx@terseinits} + \renewrobustcmd*{\bibinitperiod}{} \renewrobustcmd*{\bibinitdelim}{} \renewrobustcmd*{\bibinithyphendelim}{}} - {\renewrobustcmd*{\bibinitperiod}{\adddot} + {\togglefalse{blx@terseinits} + \renewrobustcmd*{\bibinitperiod}{\adddot} \renewrobustcmd*{\bibinitdelim}{\addnbspace} \renewrobustcmd*{\bibinithyphendelim}{\adddot\mbox{-}}}} |