summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-08-17 22:46:38 +0000
committerKarl Berry <karl@freefriends.org>2012-08-17 22:46:38 +0000
commit1445c584db507222557602e4fb9790061d03abdb (patch)
tree00431414668cf2e349c60bc1eaaea28ec38e3d47 /Master/texmf-dist/tex/latex/biblatex
parent949a40dc13f864beaec0654b15a8002760168143 (diff)
biblatex 2.2 (17aug12)
git-svn-id: svn://tug.org/texlive/trunk@27438 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx33
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.def12
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.sty4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex1.sty35
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex2.sty59
5 files changed, 75 insertions, 68 deletions
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{-}}}}