Skip to content

Commit 952ad86

Browse files
committed
Backwards compat defaults for delims
1 parent d0801be commit 952ad86

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ obuild/tds
44
obuild/flat
55
obuild/test
66
obuild/biblatex*.tgz
7-
doc/latex/biblatex/biblatex.pdf
8-
doc/latex/biblatex/biblatex.out
9-
doc/latex/biblatex/biblatex.synctex
7+
doc/latex/biblatex/*.pdf
8+
doc/latex/biblatex/*.out
9+
doc/latex/biblatex/*.synctex*

doc/latex/biblatex/biblatex.tex

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,11 @@ \section{Introduction}
171171
\subsection[About]{About \biblatex}
172172
\label{int:abt}
173173

174-
This package provides advanced bibliographic facilities for use with \latex. The package is a complete reimplementation of the bibliographic facilities provided by \latex. A custom backend \biber is used by default 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 information such as abbreviations of various fields. 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 localised and can interface with the \sty{babel} and \sty{polyglossia} packages. Please refer to \tabref{bib:fld:tab1} for a list of languages currently supported by this package.
174+
This package provides advanced bibliographic facilities for use with \latex. The package is a complete reimplementation of the bibliographic facilities provided by \latex. A custom backend \biber is used by default 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 information such as abbreviations of various fields. 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 full Unicode support for bibliography data, customisable sorting, multiple bibliographies with different sorting, customisable labels and dynamic data modification are available. Please refer to \secref{int:pre:bibercompat} for information on \biber/\biblatex version compatibility. The package is completely localised and can interface with the \sty{babel} and \sty{polyglossia} packages. Please refer to \tabref{bib:fld:tab1} for a list of languages currently supported by this package.
175175

176176
\subsection{License}
177177

178-
Copyright \textcopyright\ 2006--2012 Philipp Lehman, 2012--2013 Philip Kime, Audrey Boruvka, Joseph Wright. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3.\fnurl{http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt}
178+
Copyright \textcopyright\ 2006--2012 Philipp Lehman, 2012--2016 Philip Kime, Audrey Boruvka, Joseph Wright. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3.\fnurl{http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt}
179179

180180
\subsection{Feedback}
181181
\label{int:feb}
@@ -229,9 +229,6 @@ \subsubsection{Requirements}
229229
\item[etoolbox]
230230
This \latex package, which is loaded automatically, provides generic programming facilities required by \biblatex. It is available from \acr{CTAN}.\fnurl{http://ctan.org/pkg/etoolbox}
231231

232-
\item[etextools]
233-
This \latex package, which is loaded automatically, provides enhanced generic programming facilities required by \biblatex. It is available from \acr{CTAN}.\fnurl{http://ctan.org/pkg/etextools}. \biblatex will issue an a error if this package is loaded before \biblatex loaded as certain internals need to be changed before it is loaded.
234-
235232
\item[kvoptions]
236233
This \latex package, which is also loaded automatically, is used for internal option handling. It is available with the \sty{oberdiek} package bundle from \acr{CTAN}.\fnurl{http://www.ctan.org/pkg/kvoptions}
237234

@@ -250,10 +247,10 @@ \subsubsection{Recommended Packages}
250247
\begin{marglist}
251248

252249
\item[babel/polyglossia]
253-
The \sty{babel} and \sty{polyglossia} packages provides the core architecture for multilingual typesetting. If you are writing in a language other than American English, using one of these packages is strongly recommended. If loaded, \biblatex package will detect \sty{babel} or \sty{polyglossia} automatically.
250+
The \sty{babel} and \sty{polyglossia} packages provides the core architecture for multilingual typesetting. If you are writing in a language other than American English, using one of these packages is strongly recommended. You should load \sty{babel} or \sty{polyglossia} before \biblatex and then \biblatex will detect \sty{babel} or \sty{polyglossia} automatically.
254251

255252
\item[csquotes]
256-
If this package is available, \biblatex will use its language sensitive quotation facilities to enclose certain titles in quotation marks. If not, \biblatex uses quotes suitable for American English as a fallback. When writing in any other language, loading \sty{csquotes} is strongly recommended.\fnurl{http://www.ctan.org/tex-archive/macros/latex/contrib/csquotes/}
253+
If this package is available, \biblatex will use its language sensitive quotation facilities to enclose certain titles in quotation marks. If not, \biblatex uses quotes suitable for American English as a fallback. When writing in a language other than American English, loading \sty{csquotes} is strongly recommended.\fnurl{http://www.ctan.org/tex-archive/macros/latex/contrib/csquotes/}
257254

258255
\item[xpatch]
259256
The \sty{xpatch} package extends the patching commands of \sty{etoolbox} to \biblatex bibliography macros, drivers and formatting directives.\fnurl{http://www.ctan.org/tex-archive/macros/latex/contrib/xpatch/}
@@ -342,7 +339,7 @@ \subsubsection{Compatibility Matrix for \biber}
342339
\label{int:pre:bibercompat}
343340

344341
\biber\ versions are closely coupled with \biblatex\ versions. You
345-
need to have the right combination of the two. \biber\ will warn you
342+
need to have the right combination of the two. \biber\ will throw a fatal error
346343
during processing if it encounters information which comes from a
347344
\biblatex\ version which is incompatible. \tabref{tab:int:pre:bibercompat} shows a
348345
compatibility matrix for the recent versions.
@@ -389,9 +386,9 @@ \subsubsection{Compatibility Matrix for \biber}
389386
\section{Database Guide}
390387
\label{bib}
391388

392-
It is important to distinguish between \bibtex the program and \bibtex the file format. \biblatex can be used with or without \bibtex the program since its default backend \biber uses fully supports the \bibtex file format (\file{bib}) and users should be able to move to \biblatex will little or no changes to their \bibtex data files when using \biber as a backend. If using \bibtex as the data backend, note that you cannot use arbitrary \file{bst} files because the package depends on a special \bibtex interface. When using \bibtex as a backend, \biblatex uses its own special \file{bst} file only. The entry guide below is backend agnostic unless otherwise stated.
389+
It is important to distinguish between \bibtex the program and \bibtex the file format. \biblatex can be used with or without \bibtex the program since its default backend \biber uses fully supports the \bibtex file format (\file{.bib}) and users should be able to move to \biblatex will little or no changes to their \bibtex data files when using \biber as a backend. If using \bibtex as the data backend, note that \bibtex is not used in the normal way---\biblatex only uses \bibtex to sort the bibliography and not for any formatting at all. This is just because at the time when \biblatex was first developed, it needed some tool to sort bibliography data and since \bibtex comes with every \latex system, it was always available and sorting was part of what it already did. When using \bibtex as a backend, \biblatex uses its own special \file{.bst} file which outputs a special \file{.bbl} format containing a sorted list of entries using special macros which \biblatex them interprets using its own styles. With \biblatex, the \file{.bbl} is not a formatted bibliography---it is more ike a database written in \latex macros. The entry guide below is backend agnostic unless otherwise stated.
393390

394-
This section describes the default data model defined in the \file{blx-dm.def} file which is part of \path{biblatex}. The data model is defined using the macros documented in \secref{aut:ctm:dm}. It is possible to redefine the data model which both \biblatex and \biber use so that datasources can contain new entrytypes and fields (which of course will need style support). The data model specification also allows for constraints to be defined so that data sources can be validated against the data model (using \biber's \path{--validate_datamodel} option). Users who want to customise the data model need to look at the \file{blx-dm.def} file and to read \secref{aut:ctm:dm}.
391+
This section describes the default data model defined in the \file{blx-dm.def} file which is part of \path{biblatex}. The data model is defined using the macros documented in \secref{aut:ctm:dm}. It is possible to redefine the data model which both \biblatex and \biber use so that datasources can contain new entrytypes and fields (which of course will need style support). The data model specification also allows for constraints to be defined so that data sources can be validated against the data model (using \biber's \path{--validate-datamodel} option). Users who want to customise the data model need to look at the \file{blx-dm.def} file and to read \secref{aut:ctm:dm}.
395392

396393
\subsection{Entry Types}
397394
\label{bib:typ}

tex/latex/biblatex/biblatex_.def

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,13 @@
114114
\DeclareDelimFormat[biblist]{nametitledelim}{\labelnamepunct}
115115
\DeclareDelimFormat[textcite]{nametitledelim}{\addspace}
116116
\DeclareDelimFormat{nameyeardelim}{\addspace}
117+
\DeclareDelimFormat[textcite]{nameyeardelim}{\addspace}
117118
\DeclareDelimFormat[bib]{nameyeardelim}{\addspace}
118119
\DeclareDelimFormat[biblist]{nameyeardelim}{\addspace}
119120
\DeclareDelimFormat{nonameyeardelim}{\addspace}
121+
\DeclareDelimFormat[textcite]{nonameyeardelim}{\addspace}
120122
\DeclareDelimFormat[bib]{nonameyeardelim}{\addspace}
123+
\DeclareDelimFormat[biblist]{nonameyeardelim}{\addspace}
121124

122125
% This is a provisional definition for \iffinalcitedelim{<true>}{<false>}, a
123126
% test that should expand <true> if the next non-compact citation delimiter

0 commit comments

Comments
 (0)