summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex/biblatex.def
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-07-11 23:36:27 +0000
committerKarl Berry <karl@freefriends.org>2013-07-11 23:36:27 +0000
commit275a02abde664ff395868e975c7c06d89276ac0b (patch)
treec315179a8d6f30c65f89152a70176afa828cc7e7 /Master/texmf-dist/tex/latex/biblatex/biblatex.def
parent40e239851e66f62ec8d3092c746e61151b445b6f (diff)
biblatex (10jul13)
git-svn-id: svn://tug.org/texlive/trunk@31176 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.def240
1 files changed, 151 insertions, 89 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
index 49a025842ee..304d1b58b6f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
@@ -41,6 +41,39 @@
\newcommand*{\nametitledelim}{\addcomma\space}
\newcommand*{\nameyeardelim}{\addspace}
\newcommand*{\volcitedelim}{\addcomma\space}
+\newcommand*{\textcitedelim}{%
+ \iffinalcitedelim
+ {\iftextcitepunct
+ {\finalandsemicolon}
+ {\ifnumgreater{\value{textcitetotal}}{2}{\finalandcomma}{}}%
+ \addspace\bibstring{and}}
+ {\iftextcitepunct{\addsemicolon}{\addcomma}}%
+ \space}
+
+% This is a provisional definition for \iffinalcitedelim{<true>}{<false>}, a
+% test that should expand <true> if the next non-compact citation delimiter
+% is the last one in the citation list printed by \textcite or \textcites.
+\newcommand*{\iffinalcitedelim}{\@secondoftwo}
+
+% Expand <true> if the citation labels in the citation list printed by \textcite
+% or \textcites contains the serial comma \finalandcomma
+\newcommand*{\iftextcitepunct}{%
+ \ifboolexpr{ not test {\ifdefempty{\finalandsemicolon}}
+ and test {\ifnumgreater{\value{textcitemaxnames}}{2}} }}
+
+% Counters for the number of citation labels separated by non-compact delimiters
+% in the citation list printed by \textcite or \textcites. Counter values should
+% be managed by the citation style.
+\newcounter{textcitecount}
+\newcounter{textcitetotal}
+\setcounter{textcitecount}{0}
+\setcounter{textcitetotal}{0}
+
+% Counters for the maximum number of names among citation labels in the citation
+% list printed by \textcite or \textcites. Counter value should be managed by
+% the citation style.
+\newcounter{textcitemaxnames}
+\setcounter{textcitemaxnames}{0}
% Used in the bibliography and the list of shorthands
@@ -59,7 +92,7 @@
{\makebox[\leftmargin][l]{%
\ifdimless{\leftmargin}{1.25em}
{\textendash}
- {\textemdash}}}}
+ {\textemdash}}}}
\newcommand*{\relatedpunct}{\addspace}
\newcommand*{\relateddelim}{\adddot\par\nobreak}
\newcommand{\mkrelatedstring}{\mainlang}
@@ -242,7 +275,7 @@
{Option 'backrefstyle=#1' invalid}
{The option you have supplied is invalid.\MessageBreak
See the biblatex manual for valid option keys
- and possible values}}}
+ and possible values}}}
\newcommand*{\abx@pagerefstyle}{1}
\csdef{abx@opt@pagerefstyle@none}{-1}
\csdef{abx@opt@pagerefstyle@two}{0}
@@ -299,6 +332,11 @@
\DeclareFieldFormat{postnote}{\mkpageprefix[pagination]{#1}}
\DeclareFieldFormat{volcitevolume}{\bibstring{volume}\ppspace#1}
\DeclareFieldFormat{volcitepages}{\mkpageprefix[pagination]{#1}}
+\DeclareFieldFormat{volcitenote}{\mkvolcitenote#1}
+\newrobustcmd*{\mkvolcitenote}[2]{%
+ \printtext[volcitevolume]{#1}%
+ \ifblank{#2}{}{\volcitedelim\printtext[volcitepages]{#2}}}
+
% multicite commands
\DeclareFieldFormat{multiprenote}{#1\isdot}
\DeclareFieldFormat{multipostnote}{\mkpageprefix[pagination]{#1}}
@@ -341,8 +379,8 @@
{\href{http://arxiv.org/\abx@arxivpath/#1}{%
\nolinkurl{#1}%
\iffieldundef{eprintclass}
- {}
- {\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}}
+ {}
+ {\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}}
{\nolinkurl{#1}
\iffieldundef{eprintclass}
{}
@@ -538,23 +576,23 @@
{\ifrmnum{#1}
{\numdef\abx@range@num{\rmntonum{#1}}%
\def\abx@range@this{2}%
- \ifnumequal{\abx@range@this}{\abx@range@last}
- {}
- {\def\abx@range@prev{-1}}}
+ \ifnumequal{\abx@range@this}{\abx@range@last}
+ {}
+ {\def\abx@range@prev{-1}}}
{\undef\abx@range@num
\def\abx@range@this{0}%
- \def\abx@range@prev{-1}}}%
+ \def\abx@range@prev{-1}}}%
\ifdef\abx@range@num
{\ifnumequal{\abx@range@num}{\abx@range@prev}
{\def\abx@range@hold{#1}%
\numdef\abx@range@diff{\abx@range@diff+1}}
{\usebibmacro{pageref:dump}%
- \ifnumgreater{\abx@range@last}{-1}
- {\multilistdelim}
- {}%
- \ifhyperref
- {\hyperlink{page.#1}{#1}}
- {#1}}%
+ \ifnumgreater{\abx@range@last}{-1}
+ {\multilistdelim}
+ {}%
+ \ifhyperref
+ {\hyperlink{page.#1}{#1}}
+ {#1}}%
\edef\abx@range@prev{\abx@range@num}}
{\usebibmacro{pageref:dump}%
\ifnumgreater{\abx@range@last}{-1}
@@ -571,50 +609,50 @@
{\ifcase\abx@pagerefstyle\relax % two
\bibrangedash
\ifhyperref
- {\hyperlink{page.\abx@range@hold}{\abx@range@hold}}
- {\abx@range@hold}%
+ {\hyperlink{page.\abx@range@hold}{\abx@range@hold}}
+ {\abx@range@hold}%
\or % three
\ifnumless{\abx@range@diff}{2}
- {\multilistdelim}
- {\bibrangedash}%
+ {\multilistdelim}
+ {\bibrangedash}%
\ifhyperref
- {\hyperlink{page.\abx@range@hold}{\abx@range@hold}}
- {\abx@range@hold}%
+ {\hyperlink{page.\abx@range@hold}{\abx@range@hold}}
+ {\abx@range@hold}%
\or % two+
\ifnumless{\abx@range@diff}{2}
- {\sqspace
- \ifhyperref
- {\hyperlink{page.\abx@range@hold}{\bibstring{sequens}}}
- {\bibstring{sequens}}}
- {\bibrangedash
- \ifhyperref
- {\hyperlink{page.\abx@range@hold}{\abx@range@hold}}
- {\abx@range@hold}}%
+ {\sqspace
+ \ifhyperref
+ {\hyperlink{page.\abx@range@hold}{\bibstring{sequens}}}
+ {\bibstring{sequens}}}
+ {\bibrangedash
+ \ifhyperref
+ {\hyperlink{page.\abx@range@hold}{\abx@range@hold}}
+ {\abx@range@hold}}%
\or % three+
\ifnumless{\abx@range@diff}{2}
- {\sqspace
- \ifhyperref
- {\hyperlink{page.\abx@range@hold}{\bibstring{sequens}}}
- {\bibstring{sequens}}}
- {\ifnumless{\abx@range@diff}{3}
- {\sqspace
- \ifhyperref
- {\hyperlink{page.\abx@range@hold}{\bibstring{sequentes}}}
- {\bibstring{sequentes}}}
- {\bibrangedash
- \ifhyperref
- {\hyperlink{page.\abx@range@hold}{\abx@range@hold}}
- {\abx@range@hold}}}%
+ {\sqspace
+ \ifhyperref
+ {\hyperlink{page.\abx@range@hold}{\bibstring{sequens}}}
+ {\bibstring{sequens}}}
+ {\ifnumless{\abx@range@diff}{3}
+ {\sqspace
+ \ifhyperref
+ {\hyperlink{page.\abx@range@hold}{\bibstring{sequentes}}}
+ {\bibstring{sequentes}}}
+ {\bibrangedash
+ \ifhyperref
+ {\hyperlink{page.\abx@range@hold}{\abx@range@hold}}
+ {\abx@range@hold}}}%
\else % all+
\ifnumless{\abx@range@diff}{2}
- {\sqspace
- \ifhyperref
- {\hyperlink{page.\abx@range@hold}{\bibstring{sequens}}}
- {\bibstring{sequens}}}
- {\sqspace
- \ifhyperref
- {\hyperlink{page.\abx@range@hold}{\bibstring{sequentes}}}
- {\bibstring{sequentes}}}%
+ {\sqspace
+ \ifhyperref
+ {\hyperlink{page.\abx@range@hold}{\bibstring{sequens}}}
+ {\bibstring{sequens}}}
+ {\sqspace
+ \ifhyperref
+ {\hyperlink{page.\abx@range@hold}{\bibstring{sequentes}}}
+ {\bibstring{sequentes}}}%
\fi
\def\abx@range@diff{0}}
{}}
@@ -753,7 +791,7 @@
\ifblank{#3}{}{%
\ifcapital
{\mkbibnameprefix{\MakeCapital{#3}}\isdot}
- {\mkbibnameprefix{#3}\isdot}%
+ {\mkbibnameprefix{#3}\isdot}%
\ifpunctmark{'}{}{\bibnamedelimc}}%
\mkbibnamelast{#1}\isdot
\ifblank{#4}{}{\bibnamedelimd\mkbibnameaffix{#4}\isdot}%
@@ -1264,9 +1302,12 @@
\step[fieldsource=dc:publisher, fieldtarget=BIBERCUSTOMpublisher]
\step[fieldsource=dc:presentedAt, fieldtarget=BIBERCUSTOMpresentedat]
\step[fieldsource=dc:subject, fieldtarget=BIBERCUSTOMsubject]
- \step[fieldsource={dcterms:BIBERCUSTOMpartof/bib:Journal}, fieldtarget={dcterms:BIBERCUSTOMpartof/periodical}]
- \step[fieldsource={dcterms:BIBERCUSTOMpartof/bib:Book}, fieldtarget={dcterms:BIBERCUSTOMpartof/book}]
- \step[fieldsource={dcterms:BIBERCUSTOMpartof/bib:ConferenceProceedings}, fieldtarget={dcterms:BIBERCUSTOMpartof/proceedings}]
+ \step[fieldsource={dcterms:BIBERCUSTOMpartof/bib:Journal},
+ fieldtarget={dcterms:BIBERCUSTOMpartof/periodical}]
+ \step[fieldsource={dcterms:BIBERCUSTOMpartof/bib:Book},
+ fieldtarget={dcterms:BIBERCUSTOMpartof/book}]
+ \step[fieldsource={dcterms:BIBERCUSTOMpartof/bib:ConferenceProceedings},
+ fieldtarget={dcterms:BIBERCUSTOMpartof/proceedings}]
}
}
@@ -1622,6 +1663,7 @@
}
\DeclareDataInheritance{*}{*}{%
+ \noinherit{ids}
\noinherit{crossref}
\noinherit{xref}
\noinherit{entryset}
@@ -1721,8 +1763,8 @@
{\def\abx@classtype{3}}
{\@ifclassloaded{memoir}
{\ifbool{artopt}
- {\def\abx@classtype{4}}
- {\def\abx@classtype{5}}}
+ {\def\abx@classtype{4}}
+ {\def\abx@classtype{5}}}
{\ifundef\chapter
{}
{\def\abx@classtype{1}}}}}}}}}
@@ -2087,13 +2129,22 @@
\newrobustcmd*{\tvolcite}{\volcitecmd\textcite}
\newrobustcmd*{\avolcite}{\volcitecmd\autocite}
+\newrobustcmd*{\volcites}{\multivolcitecmd\cites}
+\newrobustcmd*{\pvolcites}{\multivolcitecmd\parencites}
+\newrobustcmd*{\fvolcites}{\multivolcitecmd\footcites}
+\newrobustcmd*{\ftvolcites}{\multivolcitecmd\footcitetexts}
+\newrobustcmd*{\svolcites}{\multivolcitecmd\smartcites}
+\newrobustcmd*{\tvolcites}{\multivolcitecmd\textcites}
+\newrobustcmd*{\avolcites}{\multivolcitecmd\autocites}
+
\newrobustcmd*{\Cite}{\bibsentence\cite}
\newrobustcmd*{\Parencite}{\bibsentence\parencite}
\newrobustcmd*{\Footcite}{\footcite}
\newrobustcmd*{\Footcitetext}{\footcitetext}
\newrobustcmd*{\Smartcite}{\bibsentence\smartcite}
\newrobustcmd*{\Textcite}{\bibsentence\textcite}
-\newrobustcmd*{\Citeauthor}{\@ifstar{\bibsentence\citeauthor*}{\bibsentence\citeauthor}}
+\newrobustcmd*{\Citeauthor}{%
+ \@ifstar{\bibsentence\citeauthor*}{\bibsentence\citeauthor}}
\newrobustcmd*{\Citetitle}{\bibsentence\citetitle}
\newrobustcmd*{\Volcite}{\volcitecmd\Cite}
@@ -2104,6 +2155,14 @@
\newrobustcmd*{\Tvolcite}{\volcitecmd\Textcite}
\newrobustcmd*{\Avolcite}{\volcitecmd\Autocite}
+\newrobustcmd*{\Volcites}{\multivolcitecmd\Cites}
+\newrobustcmd*{\Pvolcites}{\multivolcitecmd\Parencites}
+\newrobustcmd*{\Fvolcites}{\multivolcitecmd\Footcites}
+\newrobustcmd*{\Ftvolcites}{\multivolcitecmd\Footcitetext}
+\newrobustcmd*{\Svolcites}{\multivolcitecmd\Smartcites}
+\newrobustcmd*{\Tvolcites}{\multivolcitecmd\Textcites}
+\newrobustcmd*{\Avolcites}{\multivolcitecmd\Autocites}
+
\newrobustcmd*{\Notecite}{\bibsentence\notecite}
\newrobustcmd*{\Pnotecite}{\bibsentence\pnotecite}
\newrobustcmd*{\Fnotecite}{\fnotecite}
@@ -2111,9 +2170,12 @@
\DeclareMultiCiteCommand{\cites}{\cite}{\multicitedelim}
\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}{\multicitedelim}
\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite}{\multicitedelim}
-\DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]{\footcitetext}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote]{\smartcite}{\multicitedelim}
-\DeclareMultiCiteCommand{\supercites}[\mkbibsuperscript]{\supercite}{\supercitedelim}
+\DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]
+ {\footcitetext}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\smartcite}{\multicitedelim}
+\DeclareMultiCiteCommand{\supercites}[\mkbibsuperscript]
+ {\supercite}{\supercitedelim}
\DeclareMultiCiteCommand{\textcites}{\textcite}{\multicitedelim}
\newrobustcmd*{\Cites}{\bibsentence\cites}
@@ -2267,7 +2329,7 @@
\iffieldundef{authortype}
{}
{\setunit{\addcomma\space}%
- \usebibmacro{authorstrg}}}
+ \usebibmacro{authorstrg}}}
{}}
\newbibmacro*{editor}{%
@@ -2323,34 +2385,34 @@
{}
{\printtext[authortype]{%
\ifbibxstring{\thefield{authortype}}
- {\ifboolexpr{
- test {\ifnumgreater{\value{author}}{1}}
- or
- test {\ifandothers{author}}
- }
- {\bibstring{\thefield{authortype}s}}
- {\bibstring{\thefield{authortype}}}}
- {\thefield{authortype}}}}}
+ {\ifboolexpr{
+ test {\ifnumgreater{\value{author}}{1}}
+ or
+ test {\ifandothers{author}}
+ }
+ {\bibstring{\thefield{authortype}s}}
+ {\bibstring{\thefield{authortype}}}}
+ {\thefield{authortype}}}}}
\newbibmacro*{editorstrg}{%
\printtext[editortype]{%
\iffieldundef{editortype}
{\ifboolexpr{
- test {\ifnumgreater{\value{editor}}{1}}
- or
- test {\ifandothers{editor}}
+ test {\ifnumgreater{\value{editor}}{1}}
+ or
+ test {\ifandothers{editor}}
}
- {\bibstring{editors}}
- {\bibstring{editor}}}
+ {\bibstring{editors}}
+ {\bibstring{editor}}}
{\ifbibxstring{\thefield{editortype}}
- {\ifboolexpr{
- test {\ifnumgreater{\value{editor}}{1}}
- or
- test {\ifandothers{editor}}
- }
- {\bibstring{\thefield{editortype}s}}
- {\bibstring{\thefield{editortype}}}}
- {\thefield{editortype}}}}}
+ {\ifboolexpr{
+ test {\ifnumgreater{\value{editor}}{1}}
+ or
+ test {\ifandothers{editor}}
+ }
+ {\bibstring{\thefield{editortype}s}}
+ {\bibstring{\thefield{editortype}}}}
+ {\thefield{editortype}}}}}
\newbibmacro*{editor+othersstrg}{%
\iffieldundef{editortype}
@@ -2378,14 +2440,14 @@
\appto\abx@tempb{\clearname{commentator}}}
{\ifnamesequal{editor}{annotator}
{\appto\abx@tempa{an}%
- \appto\abx@tempb{\clearname{annotator}}}
+ \appto\abx@tempb{\clearname{annotator}}}
{}}%
\ifnamesequal{editor}{introduction}
{\appto\abx@tempa{in}%
\appto\abx@tempb{\clearname{introduction}}}
{\ifnamesequal{editor}{foreword}
{\appto\abx@tempa{fo}%
- \appto\abx@tempb{\clearname{foreword}}}
+ \appto\abx@tempb{\clearname{foreword}}}
{\ifnamesequal{editor}{afterword}
{\appto\abx@tempa{af}%
\appto\abx@tempb{\clearname{afterword}}}
@@ -2416,14 +2478,14 @@
\clearname{commentator}}
{\ifnamesequal{translator}{annotator}
{\appto\abx@tempa{an}%
- \clearname{annotator}}
+ \clearname{annotator}}
{}}%
\ifnamesequal{translator}{introduction}
{\appto\abx@tempa{in}%
\clearname{introduction}}
{\ifnamesequal{translator}{foreword}
{\appto\abx@tempa{fo}%
- \clearname{foreword}}
+ \clearname{foreword}}
{\ifnamesequal{translator}{afterword}
{\appto\abx@tempa{af}%
\clearname{afterword}}
@@ -2550,14 +2612,14 @@
\clearname{commentator}}
{\ifnamesequal{translator}{annotator}
{\appto\abx@tempa{an}%
- \clearname{annotator}}
+ \clearname{annotator}}
{}}%
\ifnamesequal{translator}{introduction}
{\appto\abx@tempa{in}%
\clearname{introduction}}
{\ifnamesequal{translator}{foreword}
{\appto\abx@tempa{fo}%
- \clearname{foreword}}
+ \clearname{foreword}}
{\ifnamesequal{translator}{afterword}
{\appto\abx@tempa{af}%
\clearname{afterword}}
@@ -2700,7 +2762,7 @@
{\printtext[parens]{%
\ifnumgreater{\value{pageref}}{1}
{\bibstring{backrefpages}\ppspace}
- {\bibstring{backrefpage}\ppspace}%
+ {\bibstring{backrefpage}\ppspace}%
\printlist[pageref][-\value{listtotal}]{pageref}}}}
\newbibmacro*{setpageref}{%
@@ -2709,7 +2771,7 @@
{\printtext{%
\ifnumgreater{\value{pageref}}{1}
{\bibstring{backrefpages}\ppspace}
- {\bibstring{backrefpage}\ppspace}%
+ {\bibstring{backrefpage}\ppspace}%
\printlist[pageref][-\value{listtotal}]{pageref}}}}
\newbibmacro*{eprint}{%