summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex/bbx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/bbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx48
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx12
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx10
6 files changed, 47 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
index 557a8e44704..a3f26dd9fe2 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
@@ -4,7 +4,7 @@
\RequireBibliographyStyle{standard}
\ExecuteBibliographyOptions{pagetracker}
-\DeclareBibliographyOption{dashed}[true]{%
+\DeclareBibliographyOption[boolean]{dashed}[true]{%
\ifstrequal{#1}{true}
{\ExecuteBibliographyOptions{pagetracker}%
\renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
index f4413275e39..6b3984ebade 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
@@ -3,13 +3,13 @@
\RequireBibliographyStyle{standard}
-\DeclareBibliographyOption{dashed}[true]{%
+\DeclareBibliographyOption[boolean]{dashed}[true]{%
\ifstrequal{#1}{true}
{\ExecuteBibliographyOptions{pagetracker}%
\renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}}
{\renewbibmacro*{bbx:savehash}{}}}
-\DeclareBibliographyOption{mergedate}[true]{%
+\DeclareBibliographyOption[boolean]{mergedate}[true]{%
\ifcsdef{bbx@opt@mergedate@#1}
{\csuse{bbx@opt@mergedate@#1}}
{\PackageError{biblatex}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
index afd8b5e311e..319b26e0553 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
@@ -35,22 +35,38 @@
{\endlist}
{\item}
-\DeclareNameFormat{debug}{%
- \bbx@mklabel{\currentname}%
- \ifblank{#3}{}{\detokenize{#3}\space}%
- \ifblank{#5}{}{\detokenize{#5}\ifpunctmark{'}{}{\space}}%
- \detokenize{#1}%
- \ifblank{#7}{}{\space\detokenize{#7}}%
- \ifblank{#3}{}{\bbx@mksublabel{first}\detokenize{#3}}%
- \ifblank{#1}{}{\bbx@mksublabel{last}\detokenize{#1}}%
- \ifblank{#5}{}{\bbx@mksublabel{prefix}\detokenize{#5}}%
- \ifblank{#7}{}{\bbx@mksublabel{affix}\detokenize{#7}}%
- \bbx@mksublabel{inits}%
- \ifblank{#4}{}{\detokenize{#4}\space}%
- \ifblank{#6}{}{\detokenize{#6}\ifpunctmark{'}{}{\space}}%
- \detokenize{#2}%
- \ifblank{#8}{}{\space\detokenize{#8}}%
-}
+\@ifpackageloaded{biblatex_legacy}
+ {\DeclareNameFormat{debug}{%
+ \bbx@mklabel{\currentname}%
+ \ifblank{#3}{}{\detokenize{#3}\space}%
+ \ifblank{#5}{}{\detokenize{#5}\ifpunctmark{'}{}{\space}}%
+ \detokenize{#1}%
+ \ifblank{#7}{}{\space\detokenize{#7}}%
+ \ifblank{#3}{}{\bbx@mksublabel{given}\detokenize{#3}}%
+ \ifblank{#1}{}{\bbx@mksublabel{family}\detokenize{#1}}%
+ \ifblank{#5}{}{\bbx@mksublabel{prefix}\detokenize{#5}}%
+ \ifblank{#7}{}{\bbx@mksublabel{affix}\detokenize{#7}}%
+ \bbx@mksublabel{inits}%
+ \ifblank{#4}{}{\detokenize{#4}\space}%
+ \ifblank{#6}{}{\detokenize{#6}\ifpunctmark{'}{}{\space}}%
+ \detokenize{#2}%
+ \ifblank{#8}{}{\space\detokenize{#8}}}}
+ {\DeclareNameFormat{debug}{%
+ \nameparts{#1}%
+ \bbx@mklabel{\currentname}%
+ \ifdefvoid{\namepartgiven}{}{\expandafter\detokenize\expandafter{\namepartgiven}\space}%
+ \ifdefvoid{\namepartprefix}{}{\expandafter\detokenize\expandafter{\namepartprefix}\ifpunctmark{'}{}{\space}}%
+ \expandafter\detokenize\expandafter{\namepartfamily}%
+ \ifdefvoid{\namepartsuffix}{}{\expandafter\space\expandafter\detokenize\expandafter{\namepartsuffix}}%
+ \ifdefvoid{\namepartgiven}{}{\bbx@mksublabel{given}\expandafter\detokenize\expandafter{\namepartgiven}}%
+ \ifdefvoid{\namepartfamily}{}{\bbx@mksublabel{family}\expandafter\detokenize\expandafter{\namepartfamily}}%
+ \ifdefvoid{\namepartprefix}{}{\bbx@mksublabel{prefix}\expandafter\detokenize\expandafter{\namepartprefix}}%
+ \ifdefvoid{\namepartsuffix}{}{\bbx@mksublabel{suffix}\expandafter\detokenize\expandafter{\namepartsuffix}}%
+ \bbx@mksublabel{inits}%
+ \ifdefvoid{\namepartgiveni}{}{\expandafter\detokenize\expandafter{\namepartgiveni}\space}%
+ \ifdefvoid{\namepartprefixi}{}{\expandafter\detokenize\expandafter{\namepartprefixi}\ifpunctmark{'}{}{\space}}%
+ \expandafter\detokenize\expandafter{\namepartfamilyi}%
+ \ifdefvoid{\namepartsuffixi}{}{\expandafter\space\expandafter\detokenize\expandafter{\namepartsuffixi}}}}
\DeclareListFormat{debug}{%
\bbx@mklabel{\currentlist}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
index ddbd31b81c0..02299df2a6a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
@@ -6,7 +6,7 @@
\providebool{bbx:subentry}
-\DeclareBibliographyOption{subentry}[true]{%
+\DeclareBibliographyOption[boolean]{subentry}[true]{%
\setbool{bbx:subentry}{#1}}
\DeclareNameAlias{author}{default}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx
index f571a5a633c..6e9e25be2d1 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx
@@ -102,21 +102,21 @@
\newbool{bbx:library}
\newbool{bbx:file}
-\DeclareBibliographyOption{entryhead}[true]{%
+\DeclareBibliographyOption[boolean]{entryhead}[true]{%
\ifcsdef{bbx@item@#1}
{\letcs\bbx@item{bbx@item@#1}}
{\PackageError{biblatex}
{Invalid option 'header=#1'}
{Valid values: header=true, false, full, name.}}}
-\DeclareBibliographyOption{entrykey}[true]{%
+\DeclareBibliographyOption[boolean]{entrykey}[true]{%
\setbool{bbx:entrykey}{#1}}
-\DeclareBibliographyOption{annotation}[true]{%
+\DeclareBibliographyOption[boolean]{annotation}[true]{%
\setbool{bbx:annotation}{#1}}
-\DeclareBibliographyOption{abstract}[true]{%
+\DeclareBibliographyOption[boolean]{abstract}[true]{%
\setbool{bbx:abstract}{#1}}
-\DeclareBibliographyOption{library}[true]{%
+\DeclareBibliographyOption[boolean]{library}[true]{%
\setbool{bbx:library}{#1}}
-\DeclareBibliographyOption{file}[true]{%
+\DeclareBibliographyOption[boolean]{file}[true]{%
\setbool{bbx:file}{#1}}
\ExecuteBibliographyOptions{loadfiles,entryhead,entrykey,annotation,abstract,library,file}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
index f81dd4aaaad..c1d480d4d70 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
@@ -7,15 +7,15 @@
\newtoggle{bbx:eprint}
\newtoggle{bbx:related}
-\DeclareBibliographyOption{isbn}[true]{%
+\DeclareBibliographyOption[boolean]{isbn}[true]{%
\settoggle{bbx:isbn}{#1}}
-\DeclareBibliographyOption{url}[true]{%
+\DeclareBibliographyOption[boolean]{url}[true]{%
\settoggle{bbx:url}{#1}}
-\DeclareBibliographyOption{doi}[true]{%
+\DeclareBibliographyOption[boolean]{doi}[true]{%
\settoggle{bbx:doi}{#1}}
-\DeclareBibliographyOption{eprint}[true]{%
+\DeclareBibliographyOption[boolean]{eprint}[true]{%
\settoggle{bbx:eprint}{#1}}
-\DeclareBibliographyOption{related}[true]{%
+\DeclareBibliographyOption[boolean]{related}[true]{%
\settoggle{bbx:related}{#1}}
\ExecuteBibliographyOptions{isbn,url,doi,eprint,related}