summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/biblatex1.sty')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex1.sty47
1 files changed, 38 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty
index 6a9aeac7dd9..ef59ba0505b 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty
@@ -155,6 +155,7 @@
{}}%
\docsvlist{%
\@footnotetext,% patch twice
+ \H@@footnotetext,% patch twice
\@plainfootnotetext}}
{}%
\iftoggle{blx@tempa}
@@ -1935,12 +1936,25 @@
% {<name>}
-\newrobustcmd*{\usebibmacro}[1]{%
- \ifcsundef{abx@macro@\detokenize{#1}}
+\newrobustcmd*{\usebibmacro}{%
+ \@ifstar
+ {\blx@usebibmacro@i}
+ {\blx@usebibmacro}}
+
+\def\blx@usebibmacro#1{%
+ \blx@usebibmacro@i{\detokenize{#1}}}
+
+\def\blx@usebibmacro@i#1{%
+ \ifcsundef{abx@macro@#1}
{\blx@error
- {Bibliography macro '\detokenize{#1}' undefined}
+ {Bibliography macro '#1' undefined}
{Use '\string\newbibmacro' to define this macro}}
- {\csuse{abx@macro@\detokenize{#1}}}}
+ {\csuse{abx@macro@#1}}}
+
+% {<name>}{<true>}{<false>}
+
+\def\blx@imc@ifbibmacroundef#1{%
+ \ifcsundef{abx@macro@#1}}
% {<field>}
@@ -1952,6 +1966,14 @@
{\csname abx@field@#1\endcsname}}
{}}
+\def\blx@imc@csfield#1{\usefield{\unexpanded}{#1}}
+
+% {<command>}{<field>}
+
+\def\blx@imc@usefield#1#2{%
+ \expandafter\expandafter\expandafter#1%
+ \expandafter\expandafter\expandafter{\csname abx@field@#2\endcsname}}
+
% {<plainlist>}
\def\blx@imc@thelist#1{\csuse{abx@list@#1}}
@@ -3132,13 +3154,13 @@
\global\toggletrue{blx@block}}
\blx@regimcs{%
- \ifdriver \thefield \strfield \thelist \thename \clearfield \clearlist
- \clearname \restorefield \restorelist \restorename
+ \ifdriver \thefield \strfield \csfield \usefield \thelist \thename
+ \clearfield \clearlist \clearname \restorefield \restorelist \restorename
\ifcategory \ifentrycategory \ifkeyword \ifentrykeyword
\ifciteseen \ifentryseen \ifciteibid \ifciteidem \ifopcit \ifloccit
\ifcurrentfield \ifcurrentlist \ifcurrentname \ifentrytype
\iffieldequalcs \iffieldequals \iffieldequalstr \iffieldsequal
- \iffieldundef \iffieldxref \iflistequalcs \iflistequals
+ \ifbibmacroundef \iffieldundef \iffieldxref \iflistequalcs \iflistequals
\iflistsequal \iflistundef \iflistxref \ifmorenames \ifmoreitems
\ifnameequalcs \ifnameequals \ifnamesequal \ifnameundef \ifnamexref
\iffirstonpage \ifsamepage \savefield \savefieldcs \savelist
@@ -3558,6 +3580,12 @@
\newrobustcmd*{\restorelistformat}[2][*]{\blx@restore{abx@lfd@#1@#2}}
\newrobustcmd*{\restorenameformat}[2][*]{\blx@restore{abx@nfd@#1@#2}}
+% [<entrytype>]{<name>}{<true>}{<false>}
+
+\newrobustcmd*{\iffieldformatundef}[2][*]{\ifcsundef{abx@ffd@#1@#2}}
+\newrobustcmd*{\iflistformatundef}[2][*]{\ifcsundef{abx@lfd@#1@#2}}
+\newrobustcmd*{\ifnameformatundef}[2][*]{\ifcsundef{abx@nfd@#1@#2}}
+
% [<entrytype>]{<alias>}[<entrytype>]{<name>}
\newrobustcmd*{\DeclareNameAlias}{\blx@defalias{nfd}}
@@ -4326,6 +4354,7 @@
\do{inpreparation}%
\do{submitted}%
\do{inpress}%
+ \do{prepublished}%
\do{forthcoming}%
\do{library}%
\do{abstract}%
@@ -9554,14 +9583,14 @@
\DeclareBibliographyOption{maxcitenames}{%
\numdef\blx@maxcitenames{#1}}
\DeclareBibliographyOption{mincitenames}{%
- \numdef\blx@minbibnames{#1}}
+ \numdef\blx@mincitenames{#1}}
\DeclareTypeOption{maxcitenames}{%
\numdef\blx@maxcitenames@type{#1}%
\iftoggle{blx@bibliography}
{}
{\c@maxnames#1\relax}}
\DeclareTypeOption{mincitenames}{%
- \numdef\blx@minbibnames@type{#1}%
+ \numdef\blx@mincitenames@type{#1}%
\iftoggle{blx@bibliography}
{}
{\c@minnames#1\relax}}