diff options
author | Karl Berry <karl@freefriends.org> | 2010-11-21 23:51:08 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-11-21 23:51:08 +0000 |
commit | 0e1f49987ec2d778902462f0e37d9b47645eed74 (patch) | |
tree | 94ebfcf5380b591a3b612cc863d14ac50c9f81c5 /Master/texmf-dist/tex/latex/biblatex/biblatex.sty | |
parent | 41fc46498c18de8f5db569c57cd9e918b6b6281d (diff) |
biblatex 1.0 (20nov10)
git-svn-id: svn://tug.org/texlive/trunk@20519 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/biblatex.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/biblatex.sty | 64 |
1 files changed, 37 insertions, 27 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty index 4d9db8f3182..cb8272e6568 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 0.9e 2010/10/09 16:39:36 lehman beta $ +% $Id: biblatex.sty,v 1.0 2010/11/19 16:16:35 lehman stable $ % Copyright (c) 2006-2010 Philipp Lehman. % @@ -21,11 +21,11 @@ \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{biblatex} -[\abx@rcsid $Id: biblatex.sty,v 0.9e 2010/10/09 16:39:36 lehman beta $ +[\abx@rcsid $Id: biblatex.sty,v 1.0 2010/11/19 16:16:35 lehman stable $ programmable bibliographies] \def\blx@bblversion$#1: #2 ${#2} -\edef\blx@bblversion{\blx@bblversion$Revision: 0.9e $} +\edef\blx@bblversion{\blx@bblversion$Revision: 1.0 $} %% Compatibility and requirements @@ -970,16 +970,20 @@ \logrequest[package=biblatex,priority=5,active=#1]{% \generic{bibtex} \cmdline{% - \ifnum\blx@backend=\blx@backend@bibtex + \ifcase\blx@backend \binary{bibtex} \option{-min-crossrefs \blx@mincrossrefs} - \else + \or \binary{bibtex8} \option{--wolfgang} \option{--min\string_crossrefs \blx@mincrossrefs} \ifdef\blx@csfencoding {\option{--csfile \blx@csfencoding.csf}} {}% + \or + \binary{bibtexu} + \option{--wolfgang} + \option{--min\string_crossrefs \blx@mincrossrefs} \fi \infile{#2} } @@ -1004,7 +1008,7 @@ } \requires[type=static]{ \file{biblatex.bst} - \ifnum\blx@backend=\blx@backend@bibtexviii + \ifnum\blx@backend=\blx@backend@bibtexe \ifdef\blx@csfencoding {\file{\blx@csfencoding.csf}} {}% @@ -5863,7 +5867,7 @@ \def\blx@bibitem#1{% \blx@ifdata{#1} - {\let\blx@noitem\@empty + {\global\let\blx@noitem\@empty \begingroup \blx@getdata{#1}% \blx@ifdriver{\abx@field@entrytype} @@ -6046,7 +6050,7 @@ \def\blx@lositem#1{% \blx@ifdata{#1} - {\let\blx@noitem\@empty + {\global\let\blx@noitem\@empty \begingroup \blx@getdata{#1}% \blx@setoptions@type\abx@field@entrytype @@ -8183,13 +8187,13 @@ \docsvlist{#2}% \endgroup} -% [<entrytype>] +% [<entrytype>]{<cslist>} \newrobustcmd*{\DeclareLabelname}[1][global]{% \expandafter\blx@deflabel\csname blx@bcf@labelname@#1\endcsname} \@onlypreamble\DeclareLabelname -% [<entrytype>] +% [<entrytype>]{<cslist>} \newrobustcmd*{\DeclareLabelyear}[1][global]{% \expandafter\blx@deflabel\csname blx@bcf@labelyear@#1\endcsname} @@ -8214,7 +8218,7 @@ \space\space options = \string{% \blx@bblversion:% \noexpand\iftoggle{blx@debug}{1}{0}:% - \noexpand\ifnum\noexpand\blx@backend=\noexpand\blx@backend@bibtexviii + \noexpand\ifnum\noexpand\blx@backend>\noexpand\blx@backend@bibtex 1:% \noexpand\else 0:% @@ -8316,9 +8320,10 @@ {\letcs\blx@backend{blx@backend@#1}} {\blx@err@invopt{backend=#1}{}}} \chardef\blx@backend@bibtex=0 -\chardef\blx@backend@bibtexviii=1 -\chardef\blx@backend@biber=2 -\cslet{blx@backend@bibtex8}\blx@backend@bibtexviii +\chardef\blx@backend@bibtexe=1 +\chardef\blx@backend@bibtexu=2 +\chardef\blx@backend@biber=3 +\cslet{blx@backend@bibtex8}\blx@backend@bibtexe \DeclareBibliographyOption{loadfiles}[true]{% \settoggle{blx@loadfiles}{#1}} @@ -8334,7 +8339,10 @@ \def\blx@minxrefs{2} \DeclareBibliographyOption{bibencoding}{% - \def\blx@bibencoding{#1}} + \def\blx@bibencoding{#1} + \ifdefstring\blx@bibencoding{inputenc} + {\def\blx@bibencoding{auto}} + {}} \DeclareBibliographyOption{sorting}{% \def\blx@sorting{#1}} @@ -9007,9 +9015,9 @@ backref=false,backrefsetstyle=setonly,pagetracker=false,ibidtracker=false, idemtracker=false,opcittracker=false,loccittracker=false,citetracker=false, block=none,language=auto,clearlang=true,babel=none,date=comp,origdate=comp, - eventdate=comp,urldate=short,autopunct=true,punctfont=false, - defernumbers=false,refsection=none,refsegment=none,citereset=none, - hyperref=auto,maxline=79,parentracker,maxparens=3,bibwarn} + eventdate=comp,urldate=short,autopunct=true,punctfont=false,defernumbers=false, + refsection=none,refsegment=none,citereset=none,hyperref=auto, + parentracker,maxparens=3,maxline=79,bibencoding=auto,bibwarn} % Load compatibility code @@ -9173,11 +9181,11 @@ Data encoding '\blx@bibencoding' specified.\MessageBreak No need to reencode data}% \togglefalse{blx@reencode}} - {\ifdefstring\blx@bibencoding{inputenc} + {\ifdefstring\blx@bibencoding{auto} {\let\blx@bibencoding\blx@inputencoding \blx@info@noline{% - Data encoding '\blx@bibencoding' specified.\MessageBreak - No need to reencode data} + Automatic encoding selection.\MessageBreak + Assuming data encoding '\blx@bibencoding'} \togglefalse{blx@reencode}} {\ifdefequal\blx@bibencoding\blx@inputencoding {\blx@info@noline{% @@ -9211,16 +9219,18 @@ \ifdefstring\blx@bibencoding{ascii} {} {\ifdefstring\blx@bibencoding{utf8} - {\ifnumequal\blx@backend\blx@backend@biber - {} + {\ifnumless\blx@backend\blx@backend@bibtexu {\blx@warning@noline{% Data encoding is '\blx@bibencoding'.\MessageBreak - Use backend=biber}}} - {\ifnumless\blx@backend\blx@backend@bibtexviii + Use backend=bibtexu or backend=biber}} + {}} + {\ifnumodd\blx@backend + {\ifnumequal\blx@backend\blx@backend@bibtexe + {\let\blx@csfencoding\blx@bibencoding} + {}} {\blx@warning@noline{% Data encoding is '\blx@bibencoding'.\MessageBreak - Use backend=bibtex8 or backend=biber}}} - {\let\blx@csfencoding\blx@bibencoding}}} + Use backend=bibtex8 or backend=biber}}}}} % Deferred last minute setup |