diff options
author | Karl Berry <karl@freefriends.org> | 2012-08-17 22:46:38 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-08-17 22:46:38 +0000 |
commit | 1445c584db507222557602e4fb9790061d03abdb (patch) | |
tree | 00431414668cf2e349c60bc1eaaea28ec38e3d47 /Master/texmf-dist/tex/latex/biblatex/biblatex2.sty | |
parent | 949a40dc13f864beaec0654b15a8002760168143 (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/biblatex2.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/biblatex2.sty | 59 |
1 files changed, 43 insertions, 16 deletions
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{-}}}} |