summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex/biblatex.def
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-11-12 22:32:57 +0000
committerKarl Berry <karl@freefriends.org>2017-11-12 22:32:57 +0000
commiteabfbd28a620feb1e4b7080f0701f2831b9a55ad (patch)
tree5f7092d1d72650511ec56baf9c92d7c3d5d6ee5f /Master/texmf-dist/tex/latex/biblatex/biblatex.def
parent61e01b895064c0ebd7a7e3870450f49b675d9953 (diff)
biblatex
git-svn-id: svn://tug.org/texlive/trunk@45764 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/biblatex.def')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.def428
1 files changed, 271 insertions, 157 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
index 653677f34e4..2d0d142a570 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
@@ -19,7 +19,8 @@
\def\do#1{%
\csdef{mkbibname#1}##1{##1}%
\define@key{blx@opt@namepart}{#1}{\csdef{namepart#1}{##1}}%
- \define@key{blx@opt@namepart}{#1i}{\csdef{namepart#1i}{##1}}}
+ \define@key{blx@opt@namepart}{#1i}{\csdef{namepart#1i}{##1}}%
+ \define@key{blx@opt@namepart}{#1un}{\csdef{namepart#1un}{##1}}}
\expandafter\docsvlist\expandafter{\blx@datamodel@constant@nameparts}
% legacy aliases
@@ -32,63 +33,66 @@
\ifdefempty\mkbibnamelast
{\let\@mkbibnamelastsaved\mkbibnamefamily}% not redefined by user
{\blx@warning@noline{%
- Attempt to redefine deprecated \string\mkbibnamelast\space, please
- use \string\mkbibnamefamily\space instead. Using
- \string\mkbibnamefamily}%
+ Attempt to redefine deprecated '\string\mkbibnamelast'.\MessageBreak
+ Please use '\string\mkbibnamefamily' instead.\MessageBreak
+ Using '\string\mkbibnamefamily'}%
\let\@mkbibnamelastsaved\mkbibnamelast
\let\mkbibnamefamily\@mkbibnamelastsaved}%
% Now redefine it in case it's used
\def\mkbibnamelast{%
\blx@warning@noline{%
- \string\mkbibnamelast\space is deprecated, please use
- \string\mkbibnamefamily. Using \string\mkbibnamefamily}%
+ '\string\mkbibnamelast' is deprecated.\MessageBreak
+ Please use '\string\mkbibnamefamily'.\MessageBreak
+ Using '\string\mkbibnamefamily'}%
\@mkbibnamelastsaved}
\ifdefempty\mkbibnamefirst
{\let\@mkbibnamefirstsaved\mkbibnamegiven}% not redefined by user
{\blx@warning@noline{%
- Attempt to redefine deprecated \string\mkbibnamefirst\space, please
- use \string\mkbibnamegiven\space instead. Using
- \string\mkbibnamegiven}%
+ Attempt to redefine deprecated '\string\mkbibnamefirst'.\MessageBreak
+ Please use '\string\mkbibnamegiven' instead.\MessageBreak
+ Using '\string\mkbibnamegiven'}%
\let\@mkbibnamefirstsaved\mkbibnamefirst
\let\mkbibnamegiven\@mkbibnamefirstsaved}%
% Now redefine it in case it's used
\def\mkbibnamefirst{%
\blx@warning@noline{%
- \string\mkbibnamefirst\space is deprecated, please use
- \string\mkbibnamegiven. Using \string\mkbibnamegiven}%
+ '\string\mkbibnamefirst' is deprecated.\MessageBreak
+ Please use '\string\mkbibnamegiven'.\MessageBreak
+ Using '\string\mkbibnamegiven'}%
\@mkbibnamefirstsaved}
\ifdefempty\mkbibnameaffix
{\let\@mkbibnameaffixsaved\mkbibnamesuffix}% not redefined by user
{\blx@warning@noline{%
- Attempt to redefine deprecated \string\mkbibnameaffix\space, please
- use \string\mkbibnamesuffix\space instead. Using
- \string\mkbibnamesuffix}%
+ Attempt to redefine deprecated '\string\mkbibnameaffix'.\MessageBreak
+ Please use '\string\mkbibnamesuffix' instead.\MessageBreak
+ Using '\string\mkbibnamesuffix'}%
\let\@mkbibnameaffixsaved\mkbibnameaffix
\let\mkbibnamesuffix\@mkbibnameaffixsaved}%
% Now redefine it in case it's used
\def\mkbibnameaffix{%
\blx@warning@noline{%
- \string\mkbibnameaffix\space is deprecated, please use
- \string\mkbibnamesuffix. Using \string\mkbibnamesuffix}%
+ '\string\mkbibnameaffix' is deprecated.\MessageBreak
+ Please use '\string\mkbibnamesuffix'.\MessageBreak
+ Using \string\mkbibnamesuffix}%
\@mkbibnameaffixsaved}}
\newcommand*{\bibellipsis}{[\textellipsis\unkern]\midsentence}
% Delimiters used in citations, bibliography and bibliography lists
-\newcommand*{\multinamedelim}{\addcomma\space}
-\newcommand*{\finalnamedelim}{%
+\DeclareDelimFormat{multinamedelim}{\addcomma\space}
+\DeclareDelimFormat{finalnamedelim}{%
\ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
\addspace\bibstring{and}\space}
-\newcommand*{\revsdnamedelim}{}
-\newcommand*{\andothersdelim}{\addspace}
+\DeclareDelimFormat{revsdnamedelim}{}
+\DeclareDelimFormat{andothersdelim}{\addspace}
-\newcommand*{\multilistdelim}{\addcomma\space}
-\newcommand*{\finallistdelim}{%
+\DeclareDelimFormat{multilistdelim}{\addcomma\space}
+\DeclareDelimFormat{finallistdelim}{%
\ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
\addspace\bibstring{and}\space}
-\newcommand*{\andmoredelim}{\addspace}
+\DeclareDelimFormat{andmoredelim}{\addspace}
\newcommand*{\multicitedelim}{\addsemicolon\space}
\newcommand*{\compcitedelim}{\addcomma\space}
@@ -105,21 +109,26 @@
{\iftextcitepunct{\addsemicolon}{\addcomma}}%
\space}
+
% context-sensitive delimiters
-% retain compatibility with \labelnamepunct
+% retain compatibility with \labelnamepunct et al.
+% The seemingly redundant definitions are needed because
+% hard-coded punctuation was replaced by context-sensitive
+% delimiters, changes to here need to be made explicitly
+% to avoid unwanted effects of redefining the global delimiter.
+\DeclareDelimFormat{authortypedelim}{\addcomma\space}
+\DeclareDelimFormat{editortypedelim}{\addcomma\space}
+\DeclareDelimFormat{translatortypedelim}{\addcomma\space}
\DeclareDelimFormat{namelabeldelim}{\addspace}
\DeclareDelimFormat{nametitledelim}{\addcomma\space}
-\DeclareDelimFormat[bib]{nametitledelim}{\labelnamepunct}
-\DeclareDelimFormat[biblist]{nametitledelim}{\labelnamepunct}
+\DeclareDelimFormat[bib,biblist]{nametitledelim}{\labelnamepunct}
\DeclareDelimFormat[textcite]{nametitledelim}{\addspace}
\DeclareDelimFormat{nameyeardelim}{\addspace}
\DeclareDelimFormat[textcite]{nameyeardelim}{\addspace}
-\DeclareDelimFormat[bib]{nameyeardelim}{\addspace}
-\DeclareDelimFormat[biblist]{nameyeardelim}{\addspace}
+\DeclareDelimFormat[bib,biblist]{nameyeardelim}{\addspace}
\DeclareDelimFormat{nonameyeardelim}{\addspace}
\DeclareDelimFormat[textcite]{nonameyeardelim}{\addspace}
-\DeclareDelimFormat[bib]{nonameyeardelim}{\addspace}
-\DeclareDelimFormat[biblist]{nonameyeardelim}{\addspace}
+\DeclareDelimFormat[bib,biblist]{nonameyeardelim}{\addspace}
\DeclareDelimFormat{dateeradelim}{\addspace}
\DeclareDelimFormat{datecircadelim}{\addspace}
@@ -399,17 +408,10 @@
\ifbibstring{#1}{\bibstring{#1}}{\mkyearzeros{#1}}}
\DeclareFieldFormat{labelendyear}{% = the '1995' part in 'Jones 1995a'
\ifbibstring{#1}{\bibstring{#1}}{\mkyearzeros{#1}}}
-% If labeldatesource is a defined field, they
-% Don't check labelyear directly as it is already processed into a range with markers
-% and so is never nums due to unexpandable parts of labelyear determination
-\DeclareFieldFormat{extrayear}{%
- \iffieldundef{\thefield{labeldatesource}}
- {\iffieldnums{\thefield{labeldatesource}year}
- {\mknumalph{#1}}
- {\mkbibparens{\mknumalph{#1}}}}
- {\iffieldnums{\thefield{labeldatesource}}
- {\mknumalph{#1}}
- {\mkbibparens{\mknumalph{#1}}}}}%
+\DeclareFieldFormat{extradate}{%
+ \iffieldnums{labelyear}
+ {\mknumalph{#1}}
+ {\mkbibparens{\mknumalph{#1}}}}
\DeclareFieldFormat{labelalpha}{#1}%
\DeclareFieldFormat{extraalpha}{\mknumalph{#1}}%
\DeclareFieldFormat{shorthand}{#1\isdot}
@@ -469,7 +471,7 @@
\iffieldundef{eprintclass}
{}
{\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}}
- {\nolinkurl{#1}
+ {\nolinkurl{#1}%
\iffieldundef{eprintclass}
{}
{\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}}
@@ -587,6 +589,55 @@
{#1}}%
\usebibmacro{list:andothers}}
+\DeclareListFormat{origlanguage}{%
+ \usebibmacro{list:delim}{%
+ \ifbibstring{#1}
+ {\bibxstring{#1}}
+ {\ifbibstring{lang#1}
+ {\bibxstring{lang#1}}
+ {#1}}}%
+ \ifbibstring{#1}
+ {\bibstring{#1}}
+ {\ifbibstring{lang#1}
+ {\bibstring{lang#1}}
+ {#1}}%
+ \usebibmacro{list:andothers}}
+
+
+\DeclareListFormat{lfromoriglanguage}{%
+ \begingroup
+ \blx@bibstringnormal
+ \usebibmacro{list:delim}{%
+ \ifbibstring{from#1}
+ {\bibxlstring{from#1}}
+ {\ifbibstring{lang#1}
+ {\bibxlstring{lang#1}}
+ {#1}}}%
+ \ifbibstring{from#1}
+ {\bibstring{from#1}}
+ {\ifbibstring{lang#1}
+ {\biblstring{lang#1}}
+ {#1}}%
+ \usebibmacro{list:andothers}%
+ \endgroup}
+
+\DeclareListFormat{sfromoriglanguage}{%
+ \begingroup
+ \blx@bibstringnormal
+ \usebibmacro{list:delim}{%
+ \ifbibstring{from#1}
+ {\bibxsstring{from#1}}
+ {\ifbibstring{lang#1}
+ {\bibxsstring{lang#1}}
+ {#1}}}%
+ \ifbibstring{from#1}
+ {\bibstring{from#1}}
+ {\ifbibstring{lang#1}
+ {\bibsstring{lang#1}}
+ {#1}}%
+ \usebibmacro{list:andothers}%
+ \endgroup}
+
\DeclareListFormat{location}{%
\usebibmacro{list:delim}{#1}%
#1\isdot
@@ -626,13 +677,13 @@
or
test \ifmoreitems
}
- {\multilistdelim}
+ {\printdelim{multilistdelim}}
{\lbx@finallistdelim{#1}}}
{}}
\newbibmacro*{list:plain}{%
\ifnumgreater{\value{listcount}}{\value{liststart}}
- {\multilistdelim}
+ {\printdelim{multilistdelim}}
{}}
\newbibmacro*{list:andothers}{%
@@ -644,7 +695,7 @@
{\ifnumgreater{\value{liststop}}{1}
{\finalandcomma}
{}%
- \andmoredelim\bibstring{andmore}}
+ \printdelim{andmoredelim}\bibstring{andmore}}
{}}
\newbibmacro*{pageref:init}{%
@@ -677,7 +728,7 @@
\numdef\abx@range@diff{\abx@range@diff+1}}
{\usebibmacro{pageref:dump}%
\ifnumgreater{\abx@range@last}{-1}
- {\multilistdelim}
+ {\printdelim{multilistdelim}}
{}%
\ifhyperref
{\hyperlink{page.#1}{#1}}
@@ -685,7 +736,7 @@
\edef\abx@range@prev{\abx@range@num}}
{\usebibmacro{pageref:dump}%
\ifnumgreater{\abx@range@last}{-1}
- {\multilistdelim}
+ {\printdelim{multilistdelim}}
{}%
\ifhyperref
{\hyperlink{page.#1}{#1}}
@@ -702,7 +753,7 @@
{\abx@range@hold}%
\or % three
\ifnumless{\abx@range@diff}{2}
- {\multilistdelim}
+ {\printdelim{multilistdelim}}
{\bibrangedash}%
\ifhyperref
{\hyperlink{page.\abx@range@hold}{\abx@range@hold}}
@@ -886,6 +937,7 @@
\DeclareFieldFormat{authortype}{#1}
\DeclareFieldFormat{editortype}{#1}
+\DeclareFieldFormat{translatortype}{#1}
% Auxiliary macros for name formatting directives
% ------------------------------------------------------------------
@@ -965,7 +1017,7 @@
or
test \ifmorenames
}
- {\multinamedelim}
+ {\printdelim{multinamedelim}}
{\lbx@finalnamedelim{#1}}}
{}}
@@ -979,7 +1031,7 @@
or
test {\ifnumequal{\value{liststop}}{2}}
}
- {\revsdnamedelim}
+ {\printdelim{revsdnamedelim}}
{}}
\newbibmacro*{name:andothers}{%
@@ -991,7 +1043,7 @@
{\ifnumgreater{\value{liststop}}{1}
{\finalandcomma}
{}%
- \andothersdelim\bibstring{andothers}}
+ \printdelim{andothersdelim}\bibstring{andothers}}
{}}
% ------------------------------------------------------------------
@@ -1213,6 +1265,13 @@
\literal{nodate}
}
+\DeclareExtradate{%
+ \scope{
+ \field{labelyear}
+ \field{year}
+ }
+}
+
\DeclareLabeltitle{%
\field{shorttitle}
\field{title}
@@ -1231,7 +1290,7 @@
\field[strwidth=1,strside=left]{labelname}
}
\labelelement{
- \field[strwidth=2,strside=right]{year}
+ \field[strwidth=2,strside=right]{year}
}
}
@@ -1258,7 +1317,7 @@
% SORTING
% ------------------------------------------------------------------
-\DeclareSortingNamekeyScheme{
+\DeclareSortingNamekeyTemplate{
\keypart{
\namepart[use=true]{prefix}
}
@@ -1278,7 +1337,7 @@
\DeclarePresort{mm}
-\DeclareSortingScheme{shorthand}{
+\DeclareSortingTemplate{shorthand}{
\sort[final]{
\field{sortshorthand}
}
@@ -1287,17 +1346,17 @@
}
}
-\DeclareSortingScheme{none}{
+\DeclareSortingTemplate{none}{
\sort{\citeorder}
}
-\DeclareSortingScheme{debug}{
+\DeclareSortingTemplate{debug}{
\sort{
\field{entrykey}
}
}
-\DeclareSortingScheme{nty}{
+\DeclareSortingTemplate{nty}{
\sort{
\field{presort}
}
@@ -1326,7 +1385,7 @@
}
}
-\DeclareSortingScheme{nyt}{
+\DeclareSortingTemplate{nyt}{
\sort{
\field{presort}
}
@@ -1355,7 +1414,7 @@
}
}
-\DeclareSortingScheme{nyvt}{
+\DeclareSortingTemplate{nyvt}{
\sort{
\field{presort}
}
@@ -1384,7 +1443,7 @@
}
}
-\DeclareSortingScheme{anyt}{
+\DeclareSortingTemplate{anyt}{
\sort{
\field{presort}
}
@@ -1416,7 +1475,7 @@
}
}
-\DeclareSortingScheme{anyvt}{
+\DeclareSortingTemplate{anyvt}{
\sort{
\field{presort}
}
@@ -1448,7 +1507,7 @@
}
}
-\DeclareSortingScheme{ynt}{
+\DeclareSortingTemplate{ynt}{
\sort{
\field{presort}
}
@@ -1474,7 +1533,7 @@
}
}
-\DeclareSortingScheme{ydnt}{
+\DeclareSortingTemplate{ydnt}{
\sort{
\field{presort}
}
@@ -1607,18 +1666,18 @@
\newcommand*{\lbx@initnamehook}[1]{}
\newcommand*{\lbx@inittitlehook}[1]{}
-\newcommand*{\lbx@finalnamedelim}[1]{\finalnamedelim}
-\newcommand*{\lbx@finallistdelim}[1]{\finallistdelim}
+\newcommand*{\lbx@finalnamedelim}[1]{\printdelim{finalnamedelim}}
+\newcommand*{\lbx@finallistdelim}[1]{\printdelim{finallistdelim}}
\newcommand*{\lbx@lfromlang}{%
- \iffieldundef{origlanguage}
+ \iflistundef{origlanguage}
{\unspace}
- {\biblstring{from\thefield{origlanguage}}}}
+ {\printlist[lfromoriglanguage]{origlanguage}}}
\newcommand*{\lbx@sfromlang}{%
- \iffieldundef{origlanguage}
+ \iflistundef{origlanguage}
{\unspace}
- {\bibsstring{from\thefield{origlanguage}}}}
+ {\printlist[sfromoriglanguage]{origlanguage}}}
% ------------------------------------------------------------------
% MISCELLANEOUS
@@ -1691,27 +1750,56 @@
\defbibheading{none}{}
+\def\abx@MakeMarkcase{\MakeUppercase}
+\AtEndPreamble{%
+ \ifcsundef{MakeMarkcase}{}{\def\abx@MakeMarkcase{\MakeMarkcase}}%
+ \providecommand*{\@mkdouble}[1]{\@mkboth{#1}{#1}}%
+ \providecommand*{\@mkright}{%
+ \begingroup
+ \ifx\@mkboth\markboth \aftergroup\markright
+ \else
+ \ifx\@mkboth\@gobbletwo \aftergroup\@gobble
+ \else \def\@gobbletwo##1##2{}%
+ \ifx \@mkboth\@gobbletwo \aftergroup\@gobble
+ \else
+ \PackageWarning{biblatex}{% changed for biblatex
+ package incompatibility detected!\MessageBreak
+ \string\@mkboth it neither \string\markboth nor any\MessageBreak
+ kind of two arguments gobbling,\MessageBreak
+ e.g., \string\@gobbletwo.\MessageBreak
+ So I don't known, what to do\MessageBreak
+ with \string\@mkright.\MessageBreak
+ Nevertheless, \string\markright\space will be\MessageBreak
+ used%
+ }%
+ \aftergroup\markright
+ \fi
+ \fi
+ \fi
+ \endgroup
+ }}
+
\ifcase\abx@classtype\relax % article
\defbibheading{bibliography}[\refname]{%
\section*{#1}%
- \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+ \@mkdouble{\abx@MakeMarkcase{#1}}}
\defbibheading{biblist}[\biblistname]{%
\section*{#1}%
- \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+ \@mkdouble{\abx@MakeMarkcase{#1}}}
\defbibheading{bibintoc}[\refname]{%
\section*{#1}%
\addcontentsline{toc}{section}{#1}%
- \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+ \@mkdouble{\abx@MakeMarkcase{#1}}}
\defbibheading{biblistintoc}[\biblistname]{%
\section*{#1}%
\addcontentsline{toc}{section}{#1}%
- \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+ \@mkdouble{\abx@MakeMarkcase{#1}}}
\defbibheading{bibnumbered}[\refname]{%
\section{#1}%
- \if@twoside\markright{\MakeUppercase{#1}}\fi}
+ \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi}
\defbibheading{biblistnumbered}[\biblistname]{%
\section{#1}%
- \if@twoside\markright{\MakeUppercase{#1}}\fi}
+ \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi}
\defbibheading{subbibliography}[\refname]{%
\subsection*{#1}}
\defbibheading{subbibintoc}[\refname]{%
@@ -1723,131 +1811,144 @@
\or % book/report
\defbibheading{bibliography}[\bibname]{%
\chapter*{#1}%
- \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+ \@mkdouble{\abx@MakeMarkcase{#1}}}
\defbibheading{biblist}[\biblistname]{%
\chapter*{#1}%
- \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+ \@mkdouble{\abx@MakeMarkcase{#1}}}
\defbibheading{bibintoc}[\bibname]{%
\chapter*{#1}%
\addcontentsline{toc}{chapter}{#1}%
- \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+ \@mkdouble{\abx@MakeMarkcase{#1}}}
\defbibheading{biblistintoc}[\biblistname]{%
\chapter*{#1}%
\addcontentsline{toc}{chapter}{#1}%
- \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
+ \@mkdouble{\abx@MakeMarkcase{#1}}}
\defbibheading{bibnumbered}[\bibname]{%
\chapter{#1}%
- \if@twoside\markright{\MakeUppercase{#1}}\fi}
+ \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi}
\defbibheading{biblistnumbered}[\biblistname]{%
\chapter{#1}%
- \if@twoside\markright{\MakeUppercase{#1}}\fi}
+ \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi}
\defbibheading{subbibliography}[\refname]{%
\section*{#1}%
- \if@twoside\markright{\MakeUppercase{#1}}\fi}
+ \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi}
\defbibheading{subbibintoc}[\refname]{%
\section*{#1}%
\addcontentsline{toc}{section}{#1}%
- \if@twoside\markright{\MakeUppercase{#1}}\fi}
+ \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi}
\defbibheading{subbibnumbered}[\refname]{%
\section{#1}}
\or % scrartcl
\defbibheading{bibliography}[\refname]{%
- \ifkomabibtotocnumbered
- {\section{#1}}
- {\ifkomabibtotoc
- {\addsec{#1}}
- {\section*{#1}}%
- \markboth{#1}{#1}}}
+ \ifcsundef{bibliography@heading}
+ {\ifkomabibtotocnumbered
+ {\section{#1}%
+ \@mkdouble{\abx@MakeMarkcase{\sectionmarkformat#1}}}
+ {\ifkomabibtotoc
+ {\addsec{#1}}
+ {\section*{#1}}%
+ \@mkdouble{\abx@MakeMarkcase{#1}}}}
+ {\bibliography@heading{#1}}}
\defbibheading{biblist}[\biblistname]{%
- \ifkomabibtotocnumbered
- {\section{#1}}
- {\ifkomabibtotoc
- {\addsec{#1}}
- {\section*{#1}}%
- \markboth{#1}{#1}}}
+ \ifcsundef{bibliography@heading}
+ {\ifkomabibtotocnumbered
+ {\section{#1}%
+ \@mkdouble{\abx@MakeMarkcase{\sectionmarkformat#1}}}
+ {\ifkomabibtotoc
+ {\addsec{#1}}
+ {\section*{#1}}%
+ \@mkdouble{\abx@MakeMarkcase{#1}}}}
+ {\bibliography@heading{#1}}}
\defbibheading{bibintoc}[\refname]{%
\addsec{#1}%
- \markboth{#1}{#1}}
+ \@mkdouble{\abx@MakeMarkcase{#1}}}
\defbibheading{biblistintoc}[\biblistname]{%
\addsec{#1}%
- \markboth{#1}{#1}}
+ \@mkdouble{\abx@MakeMarkcase{#1}}}
\defbibheading{bibnumbered}[\refname]{%
\section{#1}%
- \markboth{\sectionmarkformat#1}{\sectionmarkformat#1}}
+ \@mkdouble{\abx@MakeMarkcase{\sectionmarkformat#1}}}
\defbibheading{biblistnumbered}[\biblistname]{%
\section{#1}%
- \markboth{\sectionmarkformat#1}{\sectionmarkformat#1}}
+ \@mkdouble{\abx@MakeMarkcase{\sectionmarkformat#1}}}
\defbibheading{subbibliography}[\refname]{%
- \subsection*{#1}}
+ \subsection*{#1}%
+ \@mkright{\abx@MakeMarkcase{#1}}}
\defbibheading{subbibintoc}[\refname]{%
\subsection*{#1}%
- \addcontentsline{toc}{subsection}{#1}}
+ \addcontentsline{toc}{subsection}{#1}%
+ \@mkright{\abx@MakeMarkcase{#1}}}
\defbibheading{subbibnumbered}[\refname]{%
\subsection{#1}}
\or % scrbook/scrreprt
\defbibheading{bibliography}[\bibname]{%
- \ifkomabibtotocnumbered
- {\chapter{#1}}
- {\ifkomabibtotoc
- {\addchap{#1}}
- {\chapter*{#1}}%
- \markboth{#1}{#1}}}
+ \ifcsundef{bibliography@heading}
+ {\ifkomabibtotocnumbered
+ {\chapter{#1}%
+ \@mkdouble{\abx@MakeMarkcase{\chaptermarkformat#1}}}
+ {\ifkomabibtotoc
+ {\addchap{#1}}
+ {\chapter*{#1}}%
+ \@mkdouble{\abx@MakeMarkcase{#1}}}}
+ {\bibliography@heading{#1}}}
\defbibheading{biblist}[\biblistname]{%
- \ifkomabibtotocnumbered
- {\chapter{#1}}
- {\ifkomabibtotoc
- {\addchap{#1}}
- {\chapter*{#1}}%
- \markboth{#1}{#1}}}
+ \ifcsundef{bibliography@heading}
+ {\ifkomabibtotocnumbered
+ {\chapter{#1}%
+ \@mkdouble{\abx@MakeMarkcase{\chaptermarkformat#1}}}
+ {\ifkomabibtotoc
+ {\addchap{#1}}
+ {\chapter*{#1}}%
+ \@mkdouble{\abx@MakeMarkcase{#1}}}}
+ {\bibliography@heading{#1}}}
\defbibheading{bibintoc}[\bibname]{%
\addchap{#1}%
- \markboth{#1}{#1}}
+ \@mkdouble{\abx@MakeMarkcase{#1}}}
\defbibheading{biblistintoc}[\biblistname]{%
\addchap{#1}%
- \markboth{#1}{#1}}
+ \@mkdouble{\abx@MakeMarkcase{#1}}}
\defbibheading{bibnumbered}[\bibname]{%
\chapter{#1}%
- \markboth{\chaptermarkformat#1}{\chaptermarkformat#1}}
+ \@mkdouble{\abx@MakeMarkcase{\chaptermarkformat#1}}}
\defbibheading{biblistnumbered}[\biblistname]{%
\chapter{#1}%
- \markboth{\chaptermarkformat#1}{\chaptermarkformat#1}}
+ \@mkdouble{\abx@MakeMarkcase{\chaptermarkformat#1}}}
\defbibheading{subbibliography}[\refname]{%
\section*{#1}%
- \if@twoside\markright{#1}\fi}
+ \@mkright{\abx@MakeMarkcase{#1}}}
\defbibheading{subbibintoc}[\refname]{%
- \addsec{#1}%
- \markboth{#1}{#1}}
+ \addsec{#1}}
\defbibheading{subbibnumbered}[\refname]{%
\section{#1}}
\or % memoir (article)
- \ifdef\memUChead{}{\let\memUChead\MakeUppercase}
+ \ifcsundef{memUChead}{}{\def\abx@MakeMarkcase{\memUChead}}%
\defbibheading{bibliography}[\refname]{%
\chapter*{#1}%
\ifmemoirbibintoc
{\phantomsection
\addcontentsline{toc}{chapter}{#1}}
{}%
- \markboth{\memUChead{#1}}{\memUChead{#1}}}
+ \@mkdouble{\abx@MakeMarkcase{#1}}}
\defbibheading{biblist}[\biblistname]{%
\chapter*{#1}%
\ifmemoirbibintoc
{\phantomsection
\addcontentsline{toc}{chapter}{#1}}
{}%
- \markboth{\memUChead{#1}}{\memUChead{#1}}}
+ \@mkdouble{\abx@MakeMarkcase{#1}}}
\defbibheading{bibintoc}[\refname]{%
\chapter*{#1}%
\phantomsection
\addcontentsline{toc}{chapter}{#1}%
- \markboth{\memUChead{#1}}{\memUChead{#1}}}
+ \@mkdouble{\abx@MakeMarkcase{#1}}}
\defbibheading{biblistintoc}[\biblistname]{%
\chapter*{#1}%
\phantomsection
\addcontentsline{toc}{chapter}{#1}%
- \markboth{\memUChead{#1}}{\memUChead{#1}}}
+ \@mkdouble{\abx@MakeMarkcase{#1}}}
\defbibheading{bibnumbered}[\refname]{%
\chapter{#1}}
\defbibheading{biblistnumbered}[\biblistname]{%
@@ -1858,59 +1959,59 @@
{\phantomsection
\addcontentsline{toc}{section}{#1}}
{}%
- \if@twoside\markright{\memUChead{#1}}\fi}
+ \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi}
\defbibheading{subbibintoc}[\refname]{%
\section*{#1}%
\phantomsection
\addcontentsline{toc}{section}{#1}%
- \if@twoside\markright{\memUChead{#1}}\fi}
+ \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi}
\defbibheading{subbibnumbered}[\refname]{%
\section{#1}}
\or % memoir (book)
- \ifdef\memUChead{}{\let\memUChead\MakeUppercase}
+ \ifcsundef{memUChead}{}{\def\abx@MakeMarkcase{\memUChead}}%
\defbibheading{bibliography}[\bibname]{%
\chapter*{#1}%
\ifmemoirbibintoc
{\phantomsection
\addcontentsline{toc}{chapter}{#1}}
{}%
- \markboth{\memUChead{#1}}{\memUChead{#1}}}
+ \@mkdouble{\abx@MakeMarkcase{#1}}}
\defbibheading{biblist}[\biblistname]{%
\chapter*{#1}%
\ifmemoirbibintoc
{\phantomsection
\addcontentsline{toc}{chapter}{#1}}
{}%
- \markboth{\memUChead{#1}}{\memUChead{#1}}}
+ \@mkdouble{\abx@MakeMarkcase{#1}}}
\defbibheading{bibintoc}[\bibname]{%
\chapter*{#1}%
\phantomsection
\addcontentsline{toc}{chapter}{#1}%
- \markboth{\memUChead{#1}}{\memUChead{#1}}}
+ \@mkdouble{\abx@MakeMarkcase{#1}}}
\defbibheading{biblistintoc}[\biblistname]{%
\chapter*{#1}%
\phantomsection
\addcontentsline{toc}{chapter}{#1}%
- \markboth{\memUChead{#1}}{\memUChead{#1}}}
+ \@mkdouble{\abx@MakeMarkcase{#1}}}
\defbibheading{bibnumbered}[\bibname]{%
\chapter{#1}%
- \if@twoside\markright{\memUChead{#1}}\fi}
+ \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi}
\defbibheading{biblistnumbered}[\biblistname]{%
\chapter{#1}%
- \if@twoside\markright{\memUChead{#1}}\fi}
+ \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi}
\defbibheading{subbibliography}[\refname]{%
\section*{#1}%
\ifmemoirbibintoc
{\phantomsection
\addcontentsline{toc}{section}{#1}}
{}%
- \if@twoside\markright{\memUChead{#1}}\fi}
+ \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi}
\defbibheading{subbibintoc}[\refname]{%
\section*{#1}%
\phantomsection
\addcontentsline{toc}{section}{#1}%
- \if@twoside\markright{\memUChead{#1}}\fi}
+ \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi}
\defbibheading{subbibnumbered}[\refname]{%
\section{#1}}
@@ -1992,7 +2093,7 @@
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
\usebibmacro{prenote}}
- {\printfield{year}\printfield{extrayear}}
+ {\printfield{year}\printfield{extradate}}
{\multicitedelim}
{\usebibmacro{postnote}}
@@ -2248,7 +2349,7 @@
{\printnames{author}%
\iffieldundef{authortype}
{}
- {\setunit{\addcomma\space}%
+ {\setunit{\printdelim{authortypedelim}}%
\usebibmacro{authorstrg}}}
{}}
@@ -2259,7 +2360,7 @@
not test {\ifnameundef{editor}}
}
{\printnames{editor}%
- \setunit{\addcomma\space}%
+ \setunit{\printdelim{editortypedelim}}%
\usebibmacro{editorstrg}%
\clearname{editor}}
{}}
@@ -2271,7 +2372,7 @@
not test {\ifnameundef{editor}}
}
{\printnames{editor}%
- \setunit{\addcomma\space}%
+ \setunit{\printdelim{editortypedelim}}%
\usebibmacro{editor+othersstrg}%
\clearname{editor}}
{}}
@@ -2283,7 +2384,7 @@
not test {\ifnameundef{translator}}
}
{\printnames{translator}%
- \setunit{\addcomma\space}%
+ \setunit{\printdelim{translatortypedelim}}%
\usebibmacro{translatorstrg}%
\clearname{translator}}
{}}
@@ -2295,7 +2396,7 @@
not test {\ifnameundef{translator}}
}
{\printnames{translator}%
- \setunit{\addcomma\space}%
+ \setunit{\printdelim{translatortypedelim}}%
\usebibmacro{translator+othersstrg}%
\clearname{translator}}
{}}
@@ -2377,13 +2478,14 @@
{\usebibmacro{editorstrg}}}
\newbibmacro*{translatorstrg}{%
- \ifboolexpr{
- test {\ifnumgreater{\value{translator}}{1}}
- or
- test {\ifandothers{translator}}
- }
- {\bibstring{translators}}
- {\bibstring{translator}}}
+ \printtext[translatortype]{%
+ \ifboolexpr{
+ test {\ifnumgreater{\value{translator}}{1}}
+ or
+ test {\ifandothers{translator}}
+ }
+ {\bibstring{translators}}
+ {\bibstring{translator}}}}
\newbibmacro*{translator+othersstrg}{%
\ifboolexpr{
@@ -2410,7 +2512,7 @@
{\appto\abx@tempa{af}%
\clearname{afterword}}
{}}}%
- \bibstring{\abx@tempa}}
+ \printtext[translatortype]{\bibstring{\abx@tempa}}}
\newbibmacro*{byauthor}{%
\ifboolexpr{
@@ -2640,7 +2742,11 @@
\printfield{maintitleaddon}}
\newbibmacro*{journal}{%
- \iffieldundef{journaltitle}
+ \ifboolexpr{
+ test {\iffieldundef{journaltitle}}
+ and
+ test {\iffieldundef{journalsubtitle}}
+ }
{}
{\printtext[journaltitle]{%
\printfield[titlecase]{journaltitle}%
@@ -2648,7 +2754,11 @@
\printfield[titlecase]{journalsubtitle}}}}
\newbibmacro*{periodical}{%
- \iffieldundef{title}
+ \ifboolexpr{
+ test {\iffieldundef{title}}
+ and
+ test {\iffieldundef{subtitle}}
+ }
{}
{\printtext[title]{%
\printfield[titlecase]{title}%
@@ -2656,7 +2766,11 @@
\printfield[titlecase]{subtitle}}}}
\newbibmacro*{issue}{%
- \iffieldundef{issuetitle}
+ \ifboolexpr{
+ test {\iffieldundef{issuetitle}}
+ and
+ test {\iffieldundef{issuesubtitle}}
+ }
{}
{\printtext[issuetitle]{%
\printfield[titlecase]{issuetitle}%
@@ -2726,9 +2840,9 @@
{}}%
\renewbibmacro*{related:init}{}%
\DeclareNameAlias{sortname}{default}%
- \ifbibmacroundef{date+extrayear}
+ \ifbibmacroundef{date+extradate}
{}
- {\renewbibmacro*{date+extrayear}{}%
+ {\renewbibmacro*{date+extradate}{}%
\renewbibmacro*{date}{\printdate}}%
\renewbibmacro*{pageref}{}}
{\thefield{entrytype}}}}
@@ -2766,7 +2880,7 @@
test {\ifnamesequal{author}{savedauthor}}
or
test {\ifnameundef{author}}
- }
+ }
{}
{\usebibmacro{bytypestrg}{author}{author}%
\setunit{\addspace}%
@@ -2776,7 +2890,7 @@
test {\ifnamesequal{editor}{savededitor}}
or
test {\ifnameundef{editor}}
- }
+ }
{}
{\usebibmacro{byeditor+others}%
\newunit\newblock}%