summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/biblatex.sty')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.sty85
1 files changed, 47 insertions, 38 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
index ee938a6b7cf..720508a3d4f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
@@ -1,4 +1,4 @@
-% $Id: biblatex.sty,v 1.3 2011/03/14 18:25:44 lehman stable $
+% $Id: biblatex.sty,v 1.3a 2011/03/18 12:20:20 lehman stable $
% Copyright (c) 2006-2011 Philipp Lehman.
%
@@ -21,7 +21,7 @@
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{biblatex}
-[\abx@rcsid $Id: biblatex.sty,v 1.3 2011/03/14 18:25:44 lehman stable $
+[\abx@rcsid $Id: biblatex.sty,v 1.3a 2011/03/18 12:20:20 lehman stable $
programmable bibliographies]
\def\blx@bblversion$#1: #2 ${#2}
@@ -228,10 +228,10 @@
\let\@ifquotemarker\@secondoftwo
\newrobustcmd*{\initoquote}{\@quotelevel\@ne}%
\newrobustcmd*{\initiquote}{\@quotelevel\tw@}%
- \newcommand*{\textooquote}{``}%
- \newcommand*{\textcoquote}{''}%
- \newcommand*{\textoiquote}{`}%
- \newcommand*{\textciquote}{'}%
+ \newrobustcmd*{\textooquote}{``}%
+ \newrobustcmd*{\textcoquote}{''}%
+ \newrobustcmd*{\textoiquote}{`\relax}% block ligs
+ \newrobustcmd*{\textciquote}{'\relax}% block ligs
\newrobustcmd*{\enquote}{\@ifstar\blx@enquote@ii\blx@enquote}%
\def\blx@enquote{%
\ifnum\@quotelevel>\z@
@@ -1143,7 +1143,8 @@
\let\blx@checksum@old\@empty
\let\blx@checksum@new\@empty
-\let\abx@aux@checksum\relax
+\let\blx@pagesum@old\@empty
+\let\blx@pagesum@new\@empty
\def\blx@checksum#1#2#3{%
\begingroup
@@ -1156,14 +1157,21 @@
\endgroup}
\def\blx@addchecksum{\blx@checksum\blx@checksum@old}
+\def\blx@addpagesum{\blx@checksum\blx@pagesum@old}
\AtEndDocument{%
- \def\blx@addchecksum{\blx@checksum\blx@checksum@new}}
+ \def\blx@addchecksum{\blx@checksum\blx@checksum@new}%
+ \def\blx@addpagesum{\blx@checksum\blx@pagesum@new}}
\protected\def\blx@check@rerun{%
+ \begingroup
\blx@tempcnta\z@
\iftoggle{blx@runltx}
{\blx@tempcnta\@ne}
{\ifx\blx@checksum@old\blx@checksum@new
+ \ifx\blx@pagesum@old\blx@pagesum@new
+ \else
+ \blx@tempcnta\@ne
+ \fi
\else
\blx@tempcnta\@ne
\fi}%
@@ -1173,11 +1181,16 @@
\ifcase\blx@tempcnta
\or
\blx@rerun@latex
- \blx@warning@noline{Please rerun LaTeX}%
+ \blx@warning@noline{%
+ Please rerun LaTeX%
+ \ifx\blx@pagesum@old\blx@pagesum@new\else
+ .\MessageBreak Page breaks have changed%
+ \fi}%
\else
\blx@rerun@latex
\blx@warn@auxlist
- \fi}
+ \fi
+ \endgroup}
\def\blx@warn@auxlist{%
\begingroup
@@ -1202,7 +1215,7 @@
%% Punctuation and capitalization
% 1001 apostrophe (\printnames only)
-% 1002 abbreviation dot
+% 1002 abbreviation period (dot)
% 1003/1250 comma
% 1004/1500 semicolon
% 1005/2000 colon
@@ -1225,12 +1238,12 @@
\mathchardef\blx@sf@threshold@low=1002
\mathchardef\blx@sf@threshold@high=1009
-\csedef{blx@sf@1250}{\the\blx@sf@comma}
-\csedef{blx@sf@1500}{\the\blx@sf@semicolon}
-\csedef{blx@sf@2000}{\the\blx@sf@colon}
-\csedef{blx@sf@3000}{\the\blx@sf@period}
-\csedef{blx@sf@3001}{\the\blx@sf@exclam}
-\csedef{blx@sf@3002}{\the\blx@sf@question}
+\csdef{blx@sf@1250}{\the\blx@sf@comma}
+\csdef{blx@sf@1500}{\the\blx@sf@semicolon}
+\csdef{blx@sf@2000}{\the\blx@sf@colon}
+\csdef{blx@sf@3000}{\the\blx@sf@period}
+\csdef{blx@sf@3001}{\the\blx@sf@exclam}
+\csdef{blx@sf@3002}{\the\blx@sf@question}
\csdef{blx@pm@,}{comma}
\csdef{blx@pm@;}{semicolon}
@@ -6304,29 +6317,29 @@
\protected\def\blx@aux@page#1#2{%
\csgdef{blx@page@#1}{#2}%
- \blx@addchecksum{#1}{#2}}
+ \blx@addpagesum{#1}{#2}}
\protected\def\blx@aux@spread#1#2{%
\ifodd#2\relax
\csxdef{blx@page@#1}{\number\numexpr#2-1}%
\else
\csgdef{blx@page@#1}{#2}%
\fi
- \blx@addchecksum{#1}{#2}}
+ \blx@addpagesum{#1}{#2}}
\protected\def\blx@aux@fnpage#1#2{%
\csgdef{blx@fnpage@#1}{#2}%
- \blx@addchecksum{#1}{#2}}
+ \blx@addpagesum{#1}{#2}}
\protected\def\blx@aux@fnspread#1#2{%
\ifodd#2\relax
\csxdef{blx@fnpage@#1}{\number\numexpr#2-1}%
\else
\csgdef{blx@fnpage@#1}{#2}%
\fi
- \blx@addchecksum{#1}{#2}}
+ \blx@addpagesum{#1}{#2}}
\AtEndDocument{%
- \def\abx@aux@page#1#2{\blx@addchecksum{#1}{#2}}%
- \def\abx@aux@fnpage#1#2{\blx@addchecksum{#1}{#2}}}
+ \def\abx@aux@page#1#2{\blx@addpagesum{#1}{#2}}%
+ \def\abx@aux@fnpage#1#2{\blx@addpagesum{#1}{#2}}}
% hyperref interface
@@ -7448,10 +7461,10 @@
\ifinlistcs{#4}{blx@pref@#3@\detokenize{#2}}
{}
{\listcsgadd{blx@pref@#3@\detokenize{#2}}{#4}}%
- \blx@addchecksum{#1}{#5}}
+ \blx@addpagesum{#1}{#5}}
\AtEndDocument{%
- \def\abx@aux@backref#1#2#3#4#5{\blx@addchecksum{#1}{#5}}}
+ \def\abx@aux@backref#1#2#3#4#5{\blx@addpagesum{#1}{#5}}}
% {<true>}{<false>}
@@ -7875,14 +7888,14 @@
\csname blx@acitei@#1\endcsname*}}
{\blx@citepunct{\expandafter\noexpand
\csname blx@acitei@#1\endcsname{}}}}%
- \csedef{blx@acitei@#1}##1##2##3##4##5{%
+ \protected\csedef{blx@acitei@#1}##1##2##3##4##5{%
\begingroup
\blx@citeinit
\if l#2\noexpand\unspace##5\fi
- \if f#2\noexpand\iffootnote{}{\unspace##5}\fi
+ \if f#2\noexpand\iftoggle{blx@footnote}{}{\unspace##5}\fi
\blxcitecmd{#3##1}{##2}{##3}{##4}{}%
\if r#2##5\fi
- \if f#2\noexpand\iffootnote{##5}{}\fi
+ \if f#2\noexpand\iftoggle{blx@footnote}{##5}{}\fi
\endgroup}%
\protected\csedef{blx@macite@#1}{%
\blx@citecmdinit
@@ -7895,12 +7908,12 @@
\csname blx@mcite@#4\endcsname{}%
\expandafter\noexpand
\csname blx@macitei@#1\endcsname}}%
- \csedef{blx@macitei@#1}##1##2##3{%
+ \protected\csedef{blx@macitei@#1}##1##2##3{%
\if l#2\noexpand\unspace##3\fi
- \if f#2\noexpand\iffootnote{}{\unspace##3}\fi
+ \if f#2\noexpand\iftoggle{blx@footnote}{}{\unspace##3}\fi
##1{##2}%
\if r#2##3\fi
- \if f#2\noexpand\iffootnote{##3}{}\fi
+ \if f#2\noexpand\iftoggle{blx@footnote}{##3}{}\fi
\endgroup}}
% {<characters>}
@@ -8124,9 +8137,7 @@
\begingroup
\initoquote
\textooquote#1%
- \blx@imc@ifterm
- {\textcoquote\endgroup}
- {\futurelet\@let@token\blx@usoquote@i}}
+ \futurelet\@let@token\blx@usoquote@i}
\def\blx@usoquote@i{%
\blx@usqcheck
@@ -8138,9 +8149,7 @@
\begingroup
\initiquote
\textoiquote#1%
- \blx@imc@ifterm
- {\textciquote\endgroup}
- {\futurelet\@let@token\blx@usiquote@i}}
+ \futurelet\@let@token\blx@usiquote@i}
\def\blx@usiquote@i{%
\blx@usqcheck
@@ -8990,7 +8999,7 @@
{\def\blx@texencoding{#1}}}
\DeclareBibliographyOption{bibencoding}{%
- \ifcsdef{blx@inpenc@#1}
+ \ifcsdef{blx@bibenc@#1}
{\letcs\blx@bibencoding{blx@bibenc@#1}}
{\def\blx@bibencoding{#1}}}