summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex
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
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')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.def240
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.sty6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex1.sty581
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex2.sty235
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/blx-dm.def33
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx18
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx88
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx57
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx21
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx57
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx12
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx60
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx38
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx67
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx26
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx101
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx93
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx89
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx93
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx92
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx91
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx91
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx93
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx96
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx5
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx5
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx3
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx3
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx3
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx3
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx3
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx5
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx17
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx3
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx3
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx3
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx3
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx3
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx1
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx997
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx3
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx492
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx3
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx3
48 files changed, 2555 insertions, 1416 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
index 7af574d54c9..2751b61e6c1 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
@@ -793,6 +793,8 @@
\newbibmacro*{event+venue+date}{%
\printfield{eventtitle}%
+ \newunit
+ \printfield{eventtitleaddon}%
\ifboolexpr{
test {\iffieldundef{venue}}
and
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}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
index a08ff30bc76..8ff6e0ffc9d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
@@ -3,8 +3,8 @@
%%
% Set up the version strings here, so they are the same for both branches
-\def\abx@date{2013/05/01}
-\def\abx@version{2.6}
+\def\abx@date{2013/07/08}
+\def\abx@version{2.7}
\def\abx@bbxid{\abx@date\space v\abx@version\space biblatex bibliography style (PK/JW/AB)}
\def\abx@cbxid{\abx@date\space v\abx@version\space biblatex citation style (PK/JW/AB)}
\def\abx@lbxid{\abx@date\space v\abx@version\space biblatex localization (PK/JW/AB)}
@@ -12,7 +12,7 @@
% This is not updated by build script as the controlfile version
% does not necessarily change with the package version.
% This is used when writing the .bcf
-\def\blx@bcfversion{2.4}
+\def\blx@bcfversion{2.5}
% This is not updated by build script as the bbl version
% does not necessarily change with the package version.
% This is used when checking the .bbl
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty
index 8cdc5134eff..1a33fa547ed 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty
@@ -69,7 +69,11 @@
amsrefs,apacite,babelbib,backref,bibtopic,bibunits,chapterbib,
cite,citeref,drftcite,footbib,inlinebib,jurabib,mcite,mciteplus,
mlbib,multibbl,multibib,natbib,opcit,overcite,splitbib,ucs}%
- \@ifpackageloaded{babel}
+ \ifboolexpr{
+ test {\@ifpackageloaded{babel}}
+ and
+ not test {\@ifpackageloaded{polyglossia}}
+ }
{\iftoggle{blx@autolang}
{\blx@mkbabel}
{\blx@mknobabel}}
@@ -137,10 +141,10 @@
\@ifclassloaded{memoir}
{\def\do#1{%
\patchcmd#1%
- {\color@begingroup}
- {\color@begingroup\toggletrue{blx@footnote}}
- {}
- {}}%
+ {\color@begingroup}
+ {\color@begingroup\toggletrue{blx@footnote}}
+ {}
+ {}}%
\docsvlist{%
\m@mold@footnotetext,%
\@plainfootnotetext,%
@@ -149,10 +153,10 @@
\@parafootnotetext}%
\def\do#1{%
\patchcmd#1%
- {\color@begingroup\@makefntext}
- {\color@begingroup\toggletrue{blx@footnote}\@makefntext}
- {}
- {}}%
+ {\color@begingroup\@makefntext}
+ {\color@begingroup\toggletrue{blx@footnote}\@makefntext}
+ {}
+ {}}%
\docsvlist{%
\@footnotetext,% patch twice
\H@@footnotetext,% patch twice
@@ -847,7 +851,7 @@
{Argument '#1' invalid}
{\ifblank{#2}
{The argument you have supplied is invalid.\MessageBreak
- See the biblatex manual for details}
+ See the biblatex manual for details}
{#2}}}
\def\blx@err@invopt#1#2{%
@@ -855,8 +859,8 @@
{Option '#1' invalid}
{\ifblank{#2}
{The option you have supplied is invalid.\MessageBreak
- See the biblatex manual for valid option keys and
- possible values}
+ See the biblatex manual for valid option keys and
+ possible values}
{#2}}}
\def\blx@err@confopt#1#2{%
@@ -864,7 +868,7 @@
{Conflicting options\ifblank{#1}{}{ (#1)}}
{\ifblank{#2}
{The option you have supplied conflicts with another one.\MessageBreak
- See the biblatex manual for valid option keys and possible values}
+ See the biblatex manual for valid option keys and possible values}
{#2}}}
\def\blx@err@optdef#1{%
@@ -1001,20 +1005,20 @@
\or
\blx@warning@noline{%
backend=biber required by #1.\MessageBreak
- Some features may not work properly}%
+ Some features may not work properly}%
\else
\blx@error
{backend=biber required by #1}
- {The selected style or one of the .bib files
- requires backend=biber.\MessageBreak It will
- not work at all with any other backend}%
+ {The selected style or one of the .bib files
+ requires backend=biber.\MessageBreak It will
+ not work at all with any other backend}%
\fi}}
-% \blx@list@active active aux files (basename)
+% \blx@list@active active aux files (basename)
% [internal list]
-% \blx@list@inactive inactive aux files (basename)
+% \blx@list@inactive inactive aux files (basename)
% [internal list]
-% \blx@list@bibfiles@<auxfile> aux file -> bib file mapping (refsections)
+% \blx@list@bibfiles@<auxfile> aux file -> bib file mapping (refsections)
% aux file (basename) -> bib files (full)
% [internal list]
@@ -1042,7 +1046,7 @@
\ifnum\blx@backend=\blx@backend@biber
\ltxrequest{biblatex}{{\iftoggle{blx@runltx}{1}{0}}}{%
\provides[type=dynamic]{
- \file{\jobname.bcf}
+ \file{\jobname.bcf}
}
\requires[type=dynamic]{
\file{\jobname.bbl}
@@ -1050,65 +1054,65 @@
\ifdef\blx@list@req@edit
{\requires[type=editable]{
\forlistloop\file\blx@list@req@edit
- }}
- {}
+ }}
+ {}
\ifdef\blx@list@req@stat
{\requires[type=static]{
\forlistloop\file\blx@list@req@stat
- }}
- {}
+ }}
+ {}
}%
\logrequest[package=biblatex,priority=5,active={{\iftoggle{blx@runbtx}{1}{0}}}]{%
\generic{biber}
\cmdline{
- \binary{biber}
- \infile{\jobname}
+ \binary{biber}
+ \infile{\jobname}
}
\input{
- \file{\jobname.bcf}
+ \file{\jobname.bcf}
}
\output{
- \file{\jobname.bbl}
+ \file{\jobname.bbl}
}
\provides[type=dynamic]{
- \file{\jobname.bbl}
+ \file{\jobname.bbl}
}
\requires[type=dynamic]{
- \file{\jobname.bcf}
+ \file{\jobname.bcf}
}
\ifcsdef{blx@list@bibfiles@\jobname}
- {\requires[type=editable]{
- \def\do{\file}
- \dolistcsloop{blx@list@bibfiles@\jobname}
- }}
- {}
+ {\requires[type=editable]{
+ \def\do{\file}
+ \dolistcsloop{blx@list@bibfiles@\jobname}
+ }}
+ {}
}%
\else
\ltxrequest{biblatex}{{\iftoggle{blx@runltx}{1}{0}}}{%
\provides[type=dynamic]{
- \def\do##1{\file{##1.aux}}
- \dolistloop\blx@list@inactive
- \file{\blx@ctrlfile@bibtex\blxauxsuffix.bib}
+ \def\do##1{\file{##1.aux}}
+ \dolistloop\blx@list@inactive
+ \file{\blx@ctrlfile@bibtex\blxauxsuffix.bib}
}
\requires[type=dynamic]{
- \def\do##1{\file{##1.bbl}}
- \dolistloop\blx@list@inactive
+ \def\do##1{\file{##1.bbl}}
+ \dolistloop\blx@list@inactive
}
\ifdef\blx@list@req@edit
{\requires[type=editable]{
\forlistloop\file\blx@list@req@edit
- }}
- {}
+ }}
+ {}
\ifdef\blx@list@req@stat
{\requires[type=static]{
\forlistloop\file\blx@list@req@stat
- }}
- {}
+ }}
+ {}
}%
\def\do##1{%
\ifinlist{##1}{\blx@list@active}
{\blx@logreq@bibtex{1}{##1}}
- {\blx@logreq@bibtex{0}{##1}}}%
+ {\blx@logreq@bibtex{0}{##1}}}%
\dolistloop\blx@list@inactive
\fi
\endgroup}
@@ -1119,14 +1123,14 @@
\cmdline{%
\ifcase\blx@backend
\binary{bibtex}
- \option{-min-crossrefs \blx@mincrossrefs}
+ \option{-min-crossrefs \blx@mincrossrefs}
\or
\binary{bibtex8}
\option{--wolfgang}
\option{--min\string_crossrefs \blx@mincrossrefs}
- \ifdef\blx@csfencoding
- {\option{--csfile \blx@csfencoding.csf}}
- {}%
+ \ifdef\blx@csfencoding
+ {\option{--csfile \blx@csfencoding.csf}}
+ {}%
\or
\binary{bibtexu}
\option{--wolfgang}
@@ -1145,21 +1149,21 @@
}
\requires[type=dynamic]{
\file{#2.aux}
- \file{\blx@ctrlfile@bibtex\blxauxsuffix.bib}
+ \file{\blx@ctrlfile@bibtex\blxauxsuffix.bib}
}
\requires[type=editable]{
- \ifcsdef{blx@list@bibfiles@#2}
- {\def\do{\file}
- \dolistcsloop{blx@list@bibfiles@#2}}
- {}
+ \ifcsdef{blx@list@bibfiles@#2}
+ {\def\do{\file}
+ \dolistcsloop{blx@list@bibfiles@#2}}
+ {}
}
\requires[type=static]{
\file{biblatex.bst}
- \ifnum\blx@backend=\blx@backend@bibtexe
- \ifdef\blx@csfencoding
- {\file{\blx@csfencoding.csf}}
- {}%
- \fi
+ \ifnum\blx@backend=\blx@backend@bibtexe
+ \ifdef\blx@csfencoding
+ {\file{\blx@csfencoding.csf}}
+ {}%
+ \fi
}
}%
}
@@ -1223,7 +1227,7 @@
{\ifx\blx@checksum@old\blx@checksum@new
\ifx\blx@pagesum@old\blx@pagesum@new
\else
- \blx@tempcnta\@ne
+ \blx@tempcnta\@ne
\fi
\else
\blx@tempcnta\@ne
@@ -1666,8 +1670,8 @@
{\ifdimgreater\lastskip\z@
{\unskip\unspace}
{\ifnumgreater\lastpenalty\z@
- {\unpenalty\unspace}
- {}}}
+ {\unpenalty\unspace}
+ {}}}
{}}
\newrobustcmd*{\bibsentence}{%
@@ -1800,13 +1804,13 @@
{\ifcsdef{blx@bbx@*}
{\blx@warning{%
No driver for entry type '#1'.\MessageBreak
- Using fallback driver}%
+ Using fallback driver}%
\csuse{blx@bbx@*}}
{\blx@error
{No driver found}
- {I can't find a driver for the entry type
- '\abx@field@entrytype'\MessageBreak
- and there is no fallback driver either}}}}
+ {I can't find a driver for the entry type
+ '\abx@field@entrytype'\MessageBreak
+ and there is no fallback driver either}}}}
% {<type>}{<true>}{<false>}
@@ -2324,6 +2328,19 @@
\expandafter\@secondoftwo
\fi}}}
+% {<true>}{<false>}
+
+\def\blx@imc@iffirstcitekey{%
+ \ifboolexpr{ ( test {\ifnumequal\c@multicitetotal\z@}
+ and test {\ifnumequal\c@citecount\@ne} )
+ or ( test {\ifnumgreater\c@multicitetotal\z@}
+ and test {\ifnumequal\c@multicitecount\@ne}
+ and test {\ifnumequal\c@citecount\@ne} ) }}
+
+\def\blx@imc@iflastcitekey{%
+ \ifboolexpr{ test {\ifnumequal\c@citecount\c@citetotal}
+ and test {\ifnumequal\c@multicitecount\c@multicitetotal} }}
+
% {<category>}{<true>}{<false>}
\protected\def\blx@imc@ifcategory{%
@@ -2455,10 +2472,10 @@
{\blx@imc@iffieldundef{namehash}
{\@secondoftwo}
{\iftoggle{blx@footnote}
- {\blx@ifmpfncheck
+ {\blx@ifmpfncheck
{\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@foot@\abx@field@namehash}}
{\@secondoftwo}}
- {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@text@\abx@field@namehash}}}}
+ {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@text@\abx@field@namehash}}}}
{\@secondoftwo}}%
% {<true>}{<false>}
@@ -2780,8 +2797,8 @@
{\iffieldequalstr{#1}{none}
{\def\blx@tempa{\blx@mkpageprefix@i}}
{\iffieldbibstring{#1}
- {\edef\blx@tempa{\blx@mkpageprefix{\thefield{#1}}}}
- {\blx@warning@entry{%
+ {\edef\blx@tempa{\blx@mkpageprefix{\thefield{#1}}}}
+ {\blx@warning@entry{%
Unknown pagination type '\strfield{#1}'}}}}%
\@ifnextchar[%]
{\blx@tempa}
@@ -2808,8 +2825,8 @@
{\iffieldequalstr{#1}{none}
{\def\blx@tempa{\blx@mkpagetotal@i}}
{\iffieldbibstring{#1}
- {\edef\blx@tempa{\blx@mkpagetotal{\thefield{#1}}}}
- {\blx@warning@entry{%
+ {\edef\blx@tempa{\blx@mkpagetotal{\thefield{#1}}}}
+ {\blx@warning@entry{%
Unknown pagination type '\strfield{#1}'}}}}%
\@ifnextchar[%]
{\blx@tempa}
@@ -2925,8 +2942,8 @@
{\ifblank{#2}
{\blx@range@out@value{#1\bibrangedash}}
{\ifblank{#1}
- {\blx@range@out@value{\bibrangedash#2}}
- {\blx@comprange@check{#1}{#2}}}}}
+ {\blx@range@out@value{\bibrangedash#2}}
+ {\blx@comprange@check{#1}{#2}}}}}
\def\blx@comprange@hyphen#1-#2-#3&{%
\ifblank{#3}
@@ -2934,11 +2951,11 @@
{\ifblank{#2}
{\ifblank{#1}
{\let\blx@tempb\@empty}
- {\def\blx@tempb{#1}}%
+ {\def\blx@tempb{#1}}%
\blx@comprange@hyphen@i#3&}
{\ifblank{#1}
{\blx@range@out@value{\bibrangedash#2}}
- {\blx@comprange@check{#1}{#2}}}}}
+ {\blx@comprange@check{#1}{#2}}}}}
\def\blx@comprange@hyphen@i#1-#2&{%
\ifblank{#1#2}
@@ -2947,7 +2964,7 @@
{\notblank{#1}
{\ifdefempty\blx@tempb
{\blx@range@out@value{\bibrangedash#1}}
- {\expandafter\blx@comprange@check
+ {\expandafter\blx@comprange@check
\expandafter{\blx@tempb}{#1}}}
{\blx@comprange@hyphen@i#2&}}}
@@ -3077,7 +3094,7 @@
{\ifblank{#1}
{\ifblank{#2}
{\blx@firstpage@hyphen@i#3&}
- {\blx@range@out@value{\bibrangedash#2}}}
+ {\blx@range@out@value{\bibrangedash#2}}}
{\blx@range@out@value{#1}}}}
\def\blx@firstpage@hyphen@i#1-#2&{%
@@ -3224,11 +3241,12 @@
\ifdriver \thefield \strfield \csfield \usefield \thelist \thename
\clearfield \clearlist \clearname \restorefield \restorelist \restorename
\ifcategory \ifentrycategory \ifkeyword \ifentrykeyword
- \ifciteseen \ifentryseen \ifciteibid \ifciteidem \ifopcit \ifloccit
+ \ifciteseen \ifentryseen \ifentryinbib \ifciteibid \ifciteidem \ifopcit \ifloccit
\ifcurrentfield \ifcurrentlist \ifcurrentname \ifentrytype
\iffieldequalcs \iffieldequals \iffieldequalstr \iffieldsequal
\ifbibmacroundef \iffieldundef \iffieldxref \iflistequalcs \iflistequals
- \iflistsequal \iflistundef \iflistxref \ifmorenames \ifmoreitems
+ \iflistsequal \iflistundef \iflistxref
+ \ifmorenames \ifmoreitems \iffirstcitekey \iflastcitekey
\ifnameequalcs \ifnameequals \ifnamesequal \ifnameundef \ifnamexref
\iffirstonpage \ifsamepage \savefield \savefieldcs \savelist
\savelistcs \savename \savenamecs \usedriver
@@ -3772,7 +3790,7 @@
\ifnum\c@liststop>\c@maxnames
\c@liststop\c@minnames
\ifnum\c@uniquelist>\c@liststop
- \c@liststop\c@uniquelist
+ \c@liststop\c@uniquelist
\fi
\fi}
{\ifnum#2>\c@listtotal
@@ -3828,7 +3846,7 @@
{}
{\begingroup
\blx@namesetup{#2}{#3}{#4}%
- \blx@indexnamesetup
+ \blx@indexnamesetup
\expandafter\blx@nameparser\blx@thedata{}&%
\endgroup}}}
@@ -4151,7 +4169,7 @@
{\@secondoftwo}
{\ifcsundef{\abx@str @\detokenize\expandafter
\expandafter\expandafter{%
- \csname abx@field@#1\endcsname}}
+ \csname abx@field@#1\endcsname}}
{\@secondoftwo}
{\@firstoftwo}}}
@@ -4491,6 +4509,7 @@
\do{langitalian}%
\do{langlatin}%
\do{langnorwegian}%
+ \do{langpolish}%
\do{langportuguese}%
\do{langrussian}%
\do{langspanish}%
@@ -4510,6 +4529,7 @@
\do{fromitalian}%
\do{fromlatin}%
\do{fromnorwegian}%
+ \do{frompolish}%
\do{fromportuguese}%
\do{fromrussian}%
\do{fromspanish}%
@@ -4777,63 +4797,63 @@
{\printtext[#2date]{%
\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
\iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
+ {}
+ {\iffieldequalstr{#2endyear}{}
{\mbox{\bibdatedash}}
- {\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
\newrobustcmd*{\mkbibrangetrunc}[2]{%
\iffieldundef{#2year}
{}
{\printtext[#2date]{%
\iffieldsequal{#2year}{#2endyear}
- {\iffieldsequal{#2month}{#2endmonth}
+ {\iffieldsequal{#2month}{#2endmonth}
{\csuse{mkbibdate#1}{}{}{#2day}}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
\iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
+ {}
+ {\iffieldequalstr{#2endyear}{}
{\mbox{\bibdatedash}}
- {\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
\newrobustcmd*{\mkbibrangefullextra}[2]{%
\iffieldundef{#2year}
{}
{\printtext[#2date]{%
\printtext{%
- \csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
\iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \printtext{\mbox{\bibdatedash}}}
- {\printtext{%
- \bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
- \printfield{extrayear}}}}}}}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \printtext{\mbox{\bibdatedash}}}
+ {\printtext{%
+ \bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+ \printfield{extrayear}}}}}}}
\newrobustcmd*{\mkbibrangetruncextra}[2]{%
\iffieldundef{#2year}
{}
{\printtext[#2date]{%
\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\iffieldsequal{#2month}{#2endmonth}
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
{\csuse{mkbibdate#1}{}{}{#2day}}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}}%
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}}%
\iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \printtext{\mbox{\bibdatedash}}}
- {\printtext{%
- \bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
- \printfield{extrayear}}}}}}}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \printtext{\mbox{\bibdatedash}}}
+ {\printtext{%
+ \bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+ \printfield{extrayear}}}}}}}
\expandafter\newrobustcmd
\expandafter*\csname mkbibrangeiso8601\endcsname[1]{%
@@ -4842,8 +4862,8 @@
{\printtext[#1date]{%
\blx@isodate{#1year}{#1month}{#1day}%
\iffieldundef{#1endyear}
- {}
- {\addslash\blx@isodate{#1endyear}{#1endmonth}{#1endday}}}}}
+ {}
+ {\addslash\blx@isodate{#1endyear}{#1endmonth}{#1endday}}}}}
\expandafter\newrobustcmd
\expandafter*\csname mkbibrangeiso8601extra\endcsname[1]{%
@@ -4852,8 +4872,8 @@
{\printtext[#1date]{%
\blx@isodate[extrayear]{#1year}{#1month}{#1day}%
\iffieldundef{#1endyear}
- {}
- {\addslash\blx@isodate{#1endyear}{#1endmonth}{#1endday}}}}}
+ {}
+ {\addslash\blx@isodate{#1endyear}{#1endmonth}{#1endday}}}}}
\newrobustcmd*{\blx@isodate}[4][]{%
\thefield{#2}\ifblank{#1}{}{\printfield{#1}}%
@@ -4865,6 +4885,7 @@
\newrobustcmd*{\bibrangedash}{\textendash}
\newrobustcmd*{\bibdatedash}{\bibrangedash}
\newrobustcmd*{\finalandcomma}{}
+\newrobustcmd*{\finalandsemicolon}{}
\newrobustcmd*{\mkbibordinal}[1]{#1}
\newrobustcmd*{\mkbibmascord}{\mkbibordinal}
\newrobustcmd*{\mkbibfemord}{\mkbibordinal}
@@ -4963,7 +4984,7 @@
\csname end\blx@thelangenv\endcsname
\endgroup}%
\csname\blx@thelangenv\expandafter\endcsname
- \expandafter{\abx@field@hyphenation}}}}}%
+ \expandafter{\abx@field@hyphenation}}}}}
{}%
\def\blx@imc@mainlang{\select@language{\bbl@main@language}}%
\blx@langsetup\bbl@main@language}
@@ -5421,7 +5442,7 @@
% {<counter>}{<value>}
-\protected\long\def\blx@bbl@countdef#1#2{%
+\protected\long\def\blx@bbl@cntdef#1#2{%
\csxappto\blx@bbl@data{%
\csname c@#1\endcsname#2\relax}}
@@ -5446,9 +5467,9 @@
{\@secondoftwo}
{}
{\csxappto\blx@bbl@data{%
- \csname c@#1\endcsname\NewCount\relax
- \def\expandafter\noexpand\csname abx@list@#1\endcsname
- {\expandonce\NewValue}}}}
+ \csname c@#1\endcsname\NewCount\relax
+ \def\expandafter\noexpand\csname abx@list@#1\endcsname
+ {\expandonce\NewValue}}}}
% {<name>}{<itemcount>}{<value>}
@@ -5463,9 +5484,9 @@
{\@secondoftwo}
{}
{\csxappto\blx@bbl@data{%
- \csname c@#1\endcsname\NewCount\relax
- \def\expandafter\noexpand\csname abx@name@#1\endcsname
- {{\expandonce\NewOption}{\expandonce\NewValue}}}}}
+ \csname c@#1\endcsname\NewCount\relax
+ \def\expandafter\noexpand\csname abx@name@#1\endcsname
+ {{\expandonce\NewOption}{\expandonce\NewValue}}}}}
% {<entrykey>,...}
@@ -5582,16 +5603,17 @@
% key -> pages [internal list]
% \blx@refs@<section> xref hash, temporary
% section -> parents [internal list]
-% (BibTeX only)
+% (BibTeX only)
% \blx@refp@<section>@<entrykey> parent -> child mapping (xrefs), temporary
% key -> keys [internal list]
-% (BibTeX only)
+% (BibTeX only)
% \blx@refc@<section>@<entrykey> child -> parent mapping (xrefs)
% key -> key [internal list]
-% (BibTeX only)
+% (BibTeX only)
\def\blx@ifdata#1{%
\ifcsdef{blx@data@\the\c@refsection @#1}}
+\let\blx@imc@ifentryinbib\blx@ifdata
\def\blx@getdata#1{%
\csuse{blx@data@\the\c@refsection @#1}%
@@ -5605,10 +5627,10 @@
\blx@ifdata{#1}
{\def\abx@field@childentrykey{#1}%
\begingroup
- \blx@getdata{#1}%
- \edef\blx@tempa{\endgroup
- \def\noexpand\abx@field@childentrytype{\abx@field@entrytype}}%
- \blx@tempa}
+ \blx@getdata{#1}%
+ \edef\blx@tempa{\endgroup
+ \def\noexpand\abx@field@childentrytype{\abx@field@entrytype}}%
+ \blx@tempa}
{}}
{\blx@getdata{#1}}%
\ifcsdef{blx@seti@\the\c@refsection @#1}
@@ -5759,25 +5781,25 @@
{}
{\ifundef\abx@field@shorthand
{\ifdef\abx@field@localnumber
- {}
- {\csnumgdef{blx@labelnumber@\the\c@refsection}{%
+ {}
+ {\csnumgdef{blx@labelnumber@\the\c@refsection}{%
\csuse{blx@labelnumber@\the\c@refsection}+1}%
\edef\abx@field@localnumber{%
\csuse{blx@labelnumber@\the\c@refsection}}}%
- \blx@bbl@fieldedef{labelnumber}{\abx@field@localnumber}%
- \iftoggle{blx@skipbib}
- {}
- {\blx@setlabwidth{\labelnumberwidth}{%
+ \blx@bbl@fieldedef{labelnumber}{\abx@field@localnumber}%
+ \iftoggle{blx@skipbib}
+ {}
+ {\blx@setlabwidth{\labelnumberwidth}{%
\csuse{abx@ffd@*@labelnumberwidth}{%
- \ifdef\abx@field@prefixnumber
- {\csuse{abx@ffd@*@prefixnumber}{\abx@field@prefixnumber}}
- {}%
- \abx@field@localnumber}}}}
+ \ifdef\abx@field@prefixnumber
+ {\csuse{abx@ffd@*@prefixnumber}{\abx@field@prefixnumber}}
+ {}%
+ \abx@field@localnumber}}}}
{\csgappto\blx@bbl@data{%
- \let\abx@field@labelnumber\abx@field@shorthand}%
- \iftoggle{blx@skipbib}
- {}
- {\blx@setlabwidth{\labelnumberwidth}{%
+ \let\abx@field@labelnumber\abx@field@shorthand}%
+ \iftoggle{blx@skipbib}
+ {}
+ {\blx@setlabwidth{\labelnumberwidth}{%
\csuse{abx@ffd@*@labelnumberwidth}{\abx@field@shorthand}}}}}}
\def\blx@bbl@prefixnumber{%
@@ -5798,9 +5820,9 @@
{}
{\blx@setlabwidth{\labelalphawidth}{%
\csuse{abx@ffd@*@labelalphawidth}{%
- \ifdef\abx@field@prefixnumber
- {\csuse{abx@ffd@*@prefixnumber}{\abx@field@prefixnumber}}
- {}%
+ \ifdef\abx@field@prefixnumber
+ {\csuse{abx@ffd@*@prefixnumber}{\abx@field@prefixnumber}}
+ {}%
\csuse{abx@ffd@*@labelalpha}{\abx@field@labelalpha}%
\ifundef\abx@field@extraalpha
{}
@@ -5928,7 +5950,7 @@
\let\list\blx@bbl@listdef
\let\field\blx@bbl@fielddef
\let\strng\blx@bbl@stringdef
- \let\count\blx@bbl@countdef
+ \let\cnt\blx@bbl@cntdef
\let\true\blx@bbl@booltrue
\let\false\blx@bbl@boolfalse
\let\verb\blx@bbl@verbdef
@@ -5967,19 +5989,19 @@
\nottoggle{blx@skiplab}
{\iftoggle{blx@labelnumber}
{\ifundef\abx@field@shorthand
- {\ifundef\abx@field@localnumber
- {\iftoggle{blx@omitnumbers}
- {\let\abx@field@localnumber\@empty}
- {\csnumgdef{blx@labelnumber@\the\c@refsection}{%
- \csuse{blx@labelnumber@\the\c@refsection}+1}%
- \edef\abx@field@localnumber{\csuse{blx@labelnumber@\the\c@refsection}}%
- \blx@bbl@addentryfield{\abx@field@entrykey}{\the\c@refsection}%
- {localnumber}{\abx@field@localnumber}}%
- \blx@auxwrite\@mainaux{}{%
- \string\abx@aux@number{\the\c@instcount}{\abx@field@entrykey}%
- {\the\c@refsection}{\abx@field@localnumber}}}
- {}}
- {}}%
+ {\ifundef\abx@field@localnumber
+ {\iftoggle{blx@omitnumbers}
+ {\let\abx@field@localnumber\@empty}
+ {\csnumgdef{blx@labelnumber@\the\c@refsection}{%
+ \csuse{blx@labelnumber@\the\c@refsection}+1}%
+ \edef\abx@field@localnumber{\csuse{blx@labelnumber@\the\c@refsection}}%
+ \blx@bbl@addentryfield{\abx@field@entrykey}{\the\c@refsection}%
+ {localnumber}{\abx@field@localnumber}}%
+ \blx@auxwrite\@mainaux{}{%
+ \string\abx@aux@number{\the\c@instcount}{\abx@field@entrykey}%
+ {\the\c@refsection}{\abx@field@localnumber}}}
+ {}}
+ {}}%
{}}
{}%
\endgroup}
@@ -5988,15 +6010,15 @@
\nottoggle{blx@skiplab}
{\ifdef\blx@prefixnumbers
{\ifundef\abx@field@shorthand
- {\edef\abx@field@prefixnumber{\expandonce\blx@prefixnumbers}%
- \ifundef\abx@field@prefixnumber
+ {\edef\abx@field@prefixnumber{\expandonce\blx@prefixnumbers}%
+ \ifundef\abx@field@prefixnumber
{\blx@bbl@addentryfield{\abx@field@entrykey}{\the\c@refsection}%
- {prefixnumber}{\expandonce\abx@field@prefixnumber}}
- {}%
- \blx@auxwrite\@mainaux{}{%
- \string\blx@aux@numprefix{\abx@field@entrykey}%
- {\the\c@refsection}{\expandonce\abx@field@prefixnumber}}}
- {}}
+ {prefixnumber}{\expandonce\abx@field@prefixnumber}}
+ {}%
+ \blx@auxwrite\@mainaux{}{%
+ \string\blx@aux@numprefix{\abx@field@entrykey}%
+ {\the\c@refsection}{\expandonce\abx@field@prefixnumber}}}
+ {}}
{}}
{}}
@@ -6196,7 +6218,7 @@
{}
{\ifcsdef{blx@flt@#1}
{\csname blx@flt@#1\endcsname}
- {\blx@flt@error}}}
+ {\blx@flt@error}}}
{\ifcsdef{blx@flt@#1}
{\csname blx@flt@#1\endcsname{\detokenize{#2}}}
{\blx@flt@error}}}
@@ -6280,9 +6302,9 @@
\blx@error
{'type' used multiple times}
{When passing multiple filter options, each entry\MessageBreak
- must satisfy all conditions (AND conjunction),\MessageBreak
- hence some options may not be used twice.\MessageBreak
- Use 'filter' and '\string\defbibfilter' with OR conjunctions}}}}
+ must satisfy all conditions (AND conjunction),\MessageBreak
+ hence some options may not be used twice.\MessageBreak
+ Use 'filter' and '\string\defbibfilter' with OR conjunctions}}}}
\define@key{blx@bib}{nottype}{\blx@key@nottype{#1}}
\define@key{blx@los}{nottype}{\blx@key@nottype{#1}}
@@ -6308,9 +6330,9 @@
\blx@error
{'subtype' used multiple times}
{When passing multiple filter options, each entry\MessageBreak
- must satisfy all conditions (AND conjunction),\MessageBreak
- hence some options may not be used twice.\MessageBreak
- Use 'filter' and '\string\defbibfilter' with OR conjunctions}}}}
+ must satisfy all conditions (AND conjunction),\MessageBreak
+ hence some options may not be used twice.\MessageBreak
+ Use 'filter' and '\string\defbibfilter' with OR conjunctions}}}}
\define@key{blx@bib}{notsubtype}{\blx@key@notsubtype{#1}}
\define@key{blx@los}{notsubtype}{\blx@key@notsubtype{#1}}
@@ -6395,7 +6417,7 @@
{\blx@error
{Heading '#1' not found}
{The heading '#1' could not be found.\MessageBreak
- Use \string\defbibheading\space to define it}}
+ Use \string\defbibheading\space to define it}}
{\def\blx@theheading{#1}}}
\define@key{blx@bib}{env}{\blx@key@env{#1}}
@@ -6409,7 +6431,7 @@
{\blx@error
{Environment '#1' not found}
{The environment '#1' could not be found.\MessageBreak
- Use \string\defbibenvironment\space to define it}}
+ Use \string\defbibenvironment\space to define it}}
{\def\blx@theenv{#1}}}
\define@key{blx@bhd}{title}{\def\blx@thetitle{#1}}
@@ -6426,7 +6448,7 @@
{\blx@error
{Note '#1' not found}
{The note '#1' could not be found.\MessageBreak
- Use \string\defbibnote\space to define it}}
+ Use \string\defbibnote\space to define it}}
{\def\blx@theprenote{#1}}}
\define@key{blx@bib}{postnote}{\blx@key@postnote{#1}}
@@ -6440,7 +6462,7 @@
{\blx@error
{Note '#1' not found}
{The note '#1' could not be found.\MessageBreak
- Use \string\defbibnote\space to define it}}
+ Use \string\defbibnote\space to define it}}
{\def\blx@thepostnote{#1}}}
\define@key{blx@bib}{resetnumbers}[true]{%
@@ -6737,8 +6759,8 @@
{}
{\ifnum\c@instcount>\@ne
\blx@imc@iffieldequals{sortinit}\blx@previnit
- {}
- {\addvspace{\bibinitsep}}%
+ {}
+ {\addvspace{\bibinitsep}}%
\fi
\global\let\blx@previnit\abx@field@sortinit}}
@@ -6755,6 +6777,10 @@
\@onlypreamble\AtBeginBibliography
\@onlypreamble\AtEveryBibitem
+\def\blx@imc@UseBibitemHook{\csuse{blx@hook@bibitem}}
+
+\blx@regimcs{\UseBibitemHook}
+
\newrobustcmd*{\AtNextBibliography}{%
\ifundef\blx@hook@bibinit@next
{\gdef\blx@hook@bibinit@next{\global\undef\blx@hook@bibinit@next}}
@@ -7083,15 +7109,15 @@
{\toggletrue{blx@tempa}%
\def\do##1{%
\pretocmd##1{#1}
- {\togglefalse{blx@tempa}\listbreak}
- {}}%
+ {\togglefalse{blx@tempa}\listbreak}
+ {}}%
\docsvlist{%
- \H@old@part,% hyperref
- \NR@part,% nameref
- \@part}% latex/koma-script/memoir
+ \H@old@part,% hyperref
+ \NR@part,% nameref
+ \@part}% latex/koma-script/memoir
\iftoggle{blx@tempa}
- {\blx@err@patch{\string\@part}}
- {}%
+ {\blx@err@patch{\string\@part}}
+ {}%
\let\do\noexpand}}
\def\blx@refpatch@chapter#1{%
@@ -7242,10 +7268,10 @@
\define@key{blx@addbib}{location}{\def\blx@tempc{#1}}
\define@key{blx@addbib}{label}{\edef\blx@tempd{\detokenize{#1}}}
-% \blx@res@type@<resource> resource -> type
-% \blx@res@data@<resource> resource -> datatype
-% \blx@res@loca@<resource> resource -> datatype
-% \blx@res@labl@<resource> label -> resource
+% \blx@res@type@<resource> resource -> type
+% \blx@res@data@<resource> resource -> datatype
+% \blx@res@loca@<resource> resource -> datatype
+% \blx@res@labl@<resource> label -> resource
\def\blx@addbib@register#1{%
\csxdef{blx@res@type@#1}{\blx@tempa}%
@@ -7275,19 +7301,25 @@
\eappto#1{%
\blx@xml@datasource
{\ifcsdef{blx@res@type@#2}
- {\csuse{blx@res@type@#2}}
- {file}}
+ {\csuse{blx@res@type@#2}}
+ {file}}
{\ifcsdef{blx@res@data@#2}
- {\csuse{blx@res@data@#2}}
- {bibtex}}
+ {\csuse{blx@res@data@#2}}
+ {bibtex}}
{#3}}}
%% Citations
\newrobustcmd*{\AtEveryCite}{\gappto\blx@hook@cite}
\newrobustcmd*{\AtEveryCitekey}{\gappto\blx@hook@citekey}
+\newrobustcmd*{\AtEveryMultiCite}{\gappto\blx@hook@mcite}
\@onlypreamble\AtEveryCite
\@onlypreamble\AtEveryCitekey
+\@onlypreamble\AtEveryMultiCite
+
+\def\blx@imc@UseEveryCiteHook{\csuse{blx@hook@cite}}
+\def\blx@imc@UseEveryCitekeyHook{\csuse{blx@hook@citekey}}
+\def\blx@imc@UseEveryMultiCiteHook{\csuse{blx@hook@mcite}}
\newrobustcmd*{\AtNextCite}{%
\ifundef\blx@hook@cite@next
@@ -7301,7 +7333,24 @@
{}%
\gappto\blx@hook@citekey@next}
-% {<style>]
+\newrobustcmd*{\AtNextMultiCite}{%
+ \ifundef\blx@hook@mcite@next
+ {\gdef\blx@hook@mcite@next{\global\undef\blx@hook@mcite@next}}
+ {}%
+ \gappto\blx@hook@mcite@next}
+
+\def\blx@imc@UseNextCiteHook{\csuse{blx@hook@cite@next}}
+\def\blx@imc@UseNextCitekeyHook{\csuse{blx@hook@citekey@next}}
+\def\blx@imc@UseNextMultiCiteHook{\csuse{blx@hook@mcite@next}}
+
+\def\blx@imc@DeferNextCitekeyHook{\undef\blx@hook@citekey@next}
+
+\blx@regimcs{%
+ \UseEveryCiteHook \UseEveryCitekeyHook \UseEveryMultiCiteHook
+ \UseNextCiteHook \UseNextCitekeyHook \UseNextMultiCiteHook
+ \DeferNextCitekeyHook}
+
+% {<style>}
\newrobustcmd*{\RequireCitationStyle}[1]{%
\blx@inputonce{#1.cbx}{citation style '#1'}{}{}{}
@@ -7333,8 +7382,8 @@
\ifbool{citerequest}
{\ifnumless\blx@backend\blx@backend@biber % BibTeX only
{\ifcsdef{blx@setp@\the\c@refsection @#1}
- {\blx@citation@set{#1}{#2}}
- {\ifcsdef{blx@setc@\the\c@refsection @#1}
+ {\blx@citation@set{#1}{#2}}
+ {\ifcsdef{blx@setc@\the\c@refsection @#1}
{\blx@citation@inset{#1}{#2}}
{\blx@citation@entry{#1}{#2}}}}
{\blx@citation@entry{#1}{#2}}%
@@ -7352,8 +7401,8 @@
{}
{\ifcsdef{blx@miss@\the\c@refsection}
{\ifinlistcs{#1}{blx@miss@\the\c@refsection}
- {}
- {\blx@logreq@active{#2{#1}}}}
+ {}
+ {\blx@logreq@active{#2{#1}}}}
{\blx@logreq@active{#2{#1}}}}}
\def\blx@citation@set#1#2{%
@@ -7432,12 +7481,12 @@
\blx@tempb
{}
{\blx@error
- {Conflicting definitions of '\blx@tempa'}
- {The entry set '\blx@tempa' been defined before.\MessageBreak
- old: \blx@tempa\space = %
- \csuse{blx@set@\the\c@refsection @\blx@tempa}\MessageBreak
- new: \blx@tempa\space = \blx@tempb\MessageBreak
- I'm ignoring the new definition}}}
+ {Conflicting definitions of '\blx@tempa'}
+ {The entry set '\blx@tempa' been defined before.\MessageBreak
+ old: \blx@tempa\space = %
+ \csuse{blx@set@\the\c@refsection @\blx@tempa}\MessageBreak
+ new: \blx@tempa\space = \blx@tempb\MessageBreak
+ I'm ignoring the new definition}}}
{\global\cslet{blx@set@\the\c@refsection @\blx@tempa}\blx@tempb
\edef\blx@tempa{%
\AfterPreamble{\blx@setreq{\blx@tempa}{\blx@tempb}}}%
@@ -7553,8 +7602,8 @@
\ifbool{@filesw}
{\ifbool{citetracker}
{\immediate\write\@mainaux{%
- \string\abx@aux@count
- {\the\c@refsection}{\abx@field@entrykey}}}
+ \string\abx@aux@count
+ {\the\c@refsection}{\abx@field@entrykey}}}
{}}
{}}
@@ -7562,10 +7611,10 @@
\ifbool{@filesw}
{\ifbool{citetracker}
{\immediate\write\@mainaux{%
- \iftoggle{blx@footnote}
- {\string\abx@aux@fncount}
- {\string\abx@aux@count}%
- {\the\c@refsection}{\abx@field@entrykey}}}
+ \iftoggle{blx@footnote}
+ {\string\abx@aux@fncount}
+ {\string\abx@aux@count}%
+ {\the\c@refsection}{\abx@field@entrykey}}}
{}}
{}}
@@ -7939,19 +7988,19 @@
{\ifcsdef{blx@setc@\the\c@refsection @#1}
{\ifcase\blx@backrefsetstyle
\blx@addbackref@ii{setc}{#1}%
- \or
- \blx@addbackref@i{#1}%
- \or
- \blx@addbackref@i{#1}%
- \or
- \blx@addbackref@i{#1}%
+ \or
+ \blx@addbackref@i{#1}%
+ \or
+ \blx@addbackref@i{#1}%
+ \or
+ \blx@addbackref@i{#1}%
\blx@addbackref@ii{setc}{#1}%
- \or
- \blx@addbackref@i{#1}%
- \or
- \blx@addbackref@i{#1}%
+ \or
+ \blx@addbackref@i{#1}%
+ \or
+ \blx@addbackref@i{#1}%
\blx@addbackref@ii{setc}{#1}%
- \fi}
+ \fi}
{\blx@addbackref@i{#1}}}}
\def\blx@addbackref@i#1{%
@@ -7959,8 +8008,8 @@
\blx@leavevmode
\if@filesw
\protected@write\@mainaux{}{\string\abx@aux@backref
- {\the\c@instcount}{#1}{\the\c@refsection}%
- {\thepage}{\noexpand\the\c@page}}%
+ {\the\c@instcount}{#1}{\the\c@refsection}%
+ {\thepage}{\noexpand\the\c@page}}%
\fi
\fi}
@@ -8008,7 +8057,7 @@
\blx@sfsave}\blx@sfrest}%
\protected\long\def\blx@imc@bibhyperlink#1#2{%
\blx@sfsave\hyperlink{cite.\the\c@refsection:#1}{\blx@sfrest
- #2%
+ #2%
\blx@sfsave}\blx@sfrest}%
\protected\long\def\blx@imc@bibhypertarget#1#2{%
\blx@sfsave\hypertarget{cite.\the\c@refsection:#1}{\blx@sfrest
@@ -8055,8 +8104,8 @@
\iftoggle{blx@bibliography}
{}
{\ifstrequal{*}{#1}
- {\blx@citation@all}
- {\blx@xsanitizeafter{\forcsvlist\blx@nocite@do}{#1}}}}%
+ {\blx@citation@all}
+ {\blx@xsanitizeafter{\forcsvlist\blx@nocite@do}{#1}}}}%
\@esphack}
\def\blx@nocite@do#1{\blx@citation{#1}\blx@msg@cundef}
@@ -8127,8 +8176,10 @@
\fi
\blx@checkpunct@ii}
\def\blx@checkpunct@iii#1\blx@checkpunct@ii{%
+ \global\undef\abx@field@postpunct
\blx@tempa{\blx@postpunct}}
\def\blx@checkpunct@iv#1\blx@checkpunct@ii#2&#3{%
+ \gdef\abx@field@postpunct{#3}%
\edef\blx@tempa{%
\expandonce\blx@tempa{%
\ifcsdef{blx@pm@\detokenize{#3}}
@@ -8259,6 +8310,8 @@
\ifnum\c@multicitetotal>\@ne
\let\blx@ifcitesingle\@secondoftwo
\fi
+ \csuse{blx@hook@mcite}%
+ \csuse{blx@hook@mcite@next}%
\ifblank{#2}%
{}
{\def\abx@field@multiprenote{#2}}%
@@ -8312,6 +8365,7 @@
\def\blx@multicite#1#2#3#4{%
\begingroup
+ \csuse{blx@hook@mcite@before}%
\def\blx@tempa{#1}%
\def\blx@tempb{#2}%
\def\blx@tempc{#3}%
@@ -8572,8 +8626,11 @@
\def\ifhyperref{\blx@TE\blx@imc@ifhyperref}%
\def\ifmorenames{\blx@TE\blx@imc@ifmorenames}%
\def\ifmoreitems{\blx@TE\blx@imc@ifmoreitems}%
+ \def\iffirstcitekey{\blx@TE\blx@imc@iffirstcitekey}%
+ \def\iflastcitekey{\blx@TE\blx@imc@iflastcitekey}%
\def\ifciteseen{\blx@TE\blx@imc@ifciteseen}%
\def\ifentryseen{\blx@TE\blx@imc@ifentryseen}%
+ \def\ifentryinbib{\blx@TE\blx@imc@ifentryinbib}%
\def\ifciteibid{\blx@TE\blx@imc@ifciteibid}%
\def\ifciteidem{\blx@TE\blx@imc@ifciteidem}%
\def\ifopcit{\blx@TE\blx@imc@ifopcit}%
@@ -8588,6 +8645,7 @@
\def\iffieldequals#1#2{\blx@TE{\blx@imc@iffieldequals{#1}{#2}}}%
\def\iffieldequalstr#1#2{\blx@TE{\blx@imc@iffieldequalstr{#1}{#2}}}%
\def\iffieldsequal#1#2{\blx@TE{\blx@imc@iffieldsequal{#1}{#2}}}%
+ \def\ifbibmacroundef#1{\blx@TE{\blx@imc@ifbibmacroundef{#1}}}%
\def\iffieldundef#1{\blx@TE{\blx@imc@iffieldundef{#1}}}%
\def\ifnameequalcs#1#2{\blx@TE{\blx@imc@ifnameequalcs{#1}{#2}}}%
\def\ifnameequals#1#2{\blx@TE{\blx@imc@ifnameequals{#1}{#2}}}%
@@ -8897,8 +8955,8 @@
{\ifdef\pagenote
{\def\blx@theendnote{\pagenote}%
\ifdef\pagenotetext
- {\def\blx@theendnotetext{\pagenotetext}}
- {}}
+ {\def\blx@theendnotetext{\pagenotetext}}
+ {}}
{}}}
\newrobustcmd*{\mknumalph}[1]{%
@@ -8922,35 +8980,36 @@
n\or o\or p\or q\or r\or s\or t\or u\or v\or w\or x\or y\or z\else
\blx@warning@entry{Value out of range}\number#1\fi}
-\newrobustcmd*{\volcitecmd}[1]{%
- \begingroup
- \def\blx@tempa{\endgroup#1}%
- \@ifstar
- {\appto\blx@tempa{*}%
- \blx@volcitecmd@i}
- {\blx@volcitecmd@i}}
+% {<macro>}[<pre>]{<vol>}[<post>] => <macro>{<pre>}{{<vol>}{<post>}}
-\def\blx@volcitecmd@i{%
+\newrobustcmd*{\volcitecmd}{%
+ \AtNextCite{\DeclareFieldAlias{postnote}{volcitenote}}%
+ \begingroup\let\blx@citeargs\blx@volciteargs}
+
+\protected\def\blx@volciteargs#1{%
+ \endgroup
\@ifnextchar[%]
- {\blx@volcitecmd@ii}
- {\blx@volcitecmd@ii[]}}
+ {\blx@volciteargs@i{#1}}
+ {\blx@volciteargs@i{#1}[]}}
-\def\blx@volcitecmd@ii[#1]#2{%
- \appto\blx@tempa{[#1]}%
- \blx@getformat\blx@tempb{ffd}{}{volcitevolume}%
+\long\def\blx@volciteargs@i#1[#2]#3{%
\@ifnextchar[%]
- {\blx@volcitecmd@iii{#2}}
- {\edef\blx@tempa{\expandonce\blx@tempa[{%
- \expandonce{\blx@tempb{#2}}}]}%
- \blx@tempa}}
+ {\blx@volciteargs@ii{#1}{#2}{#3}}
+ {\blx@citeargs@iii{#1{#2}{{#3}{}}}}}
-\def\blx@volcitecmd@iii#1[#2]{%
- \blx@getformat\blx@tempc{ffd}{}{volcitepages}%
- \edef\blx@tempa{\expandonce\blx@tempa[{%
- \expandonce{\blx@tempb{#1}}%
- \noexpand\volcitedelim
- \expandonce{\blx@tempc{#2}}}]}%
- \blx@tempa}
+\long\def\blx@volciteargs@ii#1#2#3[#4]{%
+ \blx@citeargs@iii{#1{#2}{{#3}{#4}}}}
+
+\newrobustcmd*{\multivolcitecmd}{%
+ \AtNextCite{\DeclareFieldAlias{postnote}{volcitenote}}%
+ \def\blx@hook@mcite@before{%
+ \global\undef\blx@hook@mcite@before
+ \let\blx@citeargs\blx@volmciteargs}}
+
+\protected\def\blx@volmciteargs#1{%
+ \@ifnextchar[%]
+ {\blx@volciteargs@i{#1}}
+ {\blx@volciteargs@i{#1}[]}}
%% Control file
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty
index 1a9542da6c6..fd4576f2653 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty
@@ -65,7 +65,11 @@
amsrefs,apacite,babelbib,backref,bibtopic,bibunits,chapterbib,
cite,citeref,drftcite,footbib,inlinebib,jurabib,mcite,mciteplus,
mlbib,multibbl,multibib,natbib,opcit,overcite,splitbib,ucs}%
- \@ifpackageloaded{babel}
+ \ifboolexpr{
+ test {\@ifpackageloaded{babel}}
+ and
+ not test {\@ifpackageloaded{polyglossia}}
+ }
{\iftoggle{blx@autolang}
{\blx@mkbabel}
{\blx@mknobabel}}
@@ -368,8 +372,6 @@
\newcount\blx@parenlevel@foot
\expandafter\newcount\csname blx@sectionciteorder@0\endcsname
-
-
\def\blx@uniquename{0}
\def\blx@uniquelist{0}
\def\blx@maxbibnames{0}
@@ -2155,6 +2157,19 @@
\expandafter\@secondoftwo
\fi}}}
+% {<true>}{<false>}
+
+\def\blx@imc@iffirstcitekey{%
+ \ifboolexpr{ ( test {\ifnumequal\c@multicitetotal\z@}
+ and test {\ifnumequal\c@citecount\@ne} )
+ or ( test {\ifnumgreater\c@multicitetotal\z@}
+ and test {\ifnumequal\c@multicitecount\@ne}
+ and test {\ifnumequal\c@citecount\@ne} ) }}
+
+\def\blx@imc@iflastcitekey{%
+ \ifboolexpr{ test {\ifnumequal\c@citecount\c@citetotal}
+ and test {\ifnumequal\c@multicitecount\c@multicitetotal} }}
+
% {<category>}{<true>}{<false>}
\protected\def\blx@imc@ifcategory{%
@@ -2203,6 +2218,12 @@
\expandafter{\abx@field@entrykey}}
{\@secondoftwo}}
+\protected\def\blx@ifciteseen@context{%
+ \ifdef\abx@field@entrykey
+ {\expandafter\blx@ifseen@context
+ \expandafter{\abx@field@entrykey}}
+ {\@secondoftwo}}
+
% {<entrykey>}{<true>}{<false>}
\protected\def\blx@ifentryseen@global{%
@@ -2817,7 +2838,8 @@
\else
\numdef\blx@tempc\blx@tempd
\fi
- \edef\blx@tempb{\blx@range@out@value{\blx@tempb\noexpand\bibrangedash\blx@tempc}}%
+ \edef\blx@tempb{%
+ \blx@range@out@value{\blx@tempb\noexpand\bibrangedash\blx@tempc}}%
\blx@tempb}
\def\blx@comprange@comp@div{%
@@ -3046,11 +3068,12 @@
\ifdriver \thefield \strfield \csfield \usefield \thelist \thename
\clearfield \clearlist \clearname \restorefield \restorelist \restorename
\ifcategory \ifentrycategory \ifkeyword \ifentrykeyword
- \ifciteseen \ifentryseen \ifciteibid \ifciteidem \ifopcit \ifloccit
+ \ifciteseen \ifentryseen \ifentryinbib \ifciteibid \ifciteidem \ifopcit \ifloccit
\ifcurrentfield \ifcurrentlist \ifcurrentname \ifentrytype
\iffieldequalcs \iffieldequals \iffieldequalstr \iffieldsequal
\ifbibmacroundef \iffieldundef \iffieldxref \iflistequalcs \iflistequals
- \iflistsequal \iflistundef \iflistxref \ifmorenames \ifmoreitems
+ \iflistsequal \iflistundef \iflistxref
+ \ifmorenames \ifmoreitems \iffirstcitekey \iflastcitekey
\ifnameequalcs \ifnameequals \ifnamesequal \ifnameundef \ifnamexref
\iffirstonpage \ifsamepage \savefield \savefieldcs \savelist
\savelistcs \savename \savenamecs \usedriver
@@ -4310,6 +4333,7 @@
\do{langitalian}%
\do{langlatin}%
\do{langnorwegian}%
+ \do{langpolish}%
\do{langportuguese}%
\do{langrussian}%
\do{langspanish}%
@@ -4329,6 +4353,7 @@
\do{fromitalian}%
\do{fromlatin}%
\do{fromnorwegian}%
+ \do{frompolish}%
\do{fromportuguese}%
\do{fromrussian}%
\do{fromspanish}%
@@ -4685,6 +4710,7 @@
\newrobustcmd*{\bibrangessep}{,\space}
\newrobustcmd*{\bibdatedash}{\bibrangedash}
\newrobustcmd*{\finalandcomma}{}
+\newrobustcmd*{\finalandsemicolon}{}
\newrobustcmd*{\mkbibordinal}[1]{#1}
\newrobustcmd*{\mkbibmascord}{\mkbibordinal}
\newrobustcmd*{\mkbibfemord}{\mkbibordinal}
@@ -5109,7 +5135,7 @@
% {<counter>}{<value>}
-\protected\long\def\blx@bbl@countdef#1#2{%
+\protected\long\def\blx@bbl@cntdef#1#2{%
\csxappto\blx@bbl@data{%
\csname c@#1\endcsname#2\relax}}
@@ -5262,6 +5288,7 @@
\def\blx@ifdata#1{%
\ifcsdef{blx@data@\the\c@refsection @#1}}
+\let\blx@imc@ifentryinbib\blx@ifdata
\def\blx@getdata#1{%
\csuse{blx@data@\the\c@refsection @#1}%
@@ -5564,7 +5591,7 @@
\let\list\blx@bbl@listdef
\let\field\blx@bbl@fielddef
\let\strng\blx@bbl@stringdef
- \let\count\blx@bbl@countdef
+ \let\cnt\blx@bbl@cntdef
\let\true\blx@bbl@booltrue
\let\false\blx@bbl@boolfalse
\let\verb\blx@bbl@verbdef
@@ -5637,19 +5664,19 @@
{}
{\blx@logreq@active{}}}
{}%
- % Test to see if we removed any mention of a sorting scheme since last run.
+ % Test if we removed any mention of a sorting scheme since last run.
% If we did, we need to re-run biber
\def\do#1{\ifinlist{#1}{\blx@sortschemes}{}{\blx@logreq@active{}}\relax}%
\dolistloop\blx@lastsortschemes
- % Test to see if we added any mention of a sorting scheme since last run
+ % Test if we added any mention of a sorting scheme since last run
% If we did, we need to re-run biber
\def\do#1{\ifinlist{#1}{\blx@lastsortschemes}{}{\blx@logreq@active{}}\relax}%
\dolistloop\blx@sortschemes
- % Test to see if we removed any mention of a shorthand sorting scheme since last run.
+ % Test if we removed any mention of a shorthand sorting scheme since last run.
% If we did, we need to re-run biber
\def\do#1{\ifinlist{#1}{\blx@sortschemeslos}{}{\blx@logreq@active{}}\relax}%
\dolistloop\blx@lastsortschemeslos
- % Test to see if we added any mention of a shorthand sorting scheme since last run
+ % Test to see if we added any mention of a shorthand sorting scheme since last run.
% If we did, we need to re-run biber
\def\do#1{\ifinlist{#1}{\blx@lastsortschemeslos}{}{\blx@logreq@active{}}\relax}%
\dolistloop\blx@sortschemeslos
@@ -5679,17 +5706,28 @@
{\let\abx@field@localnumber\@empty}
{\csnumgdef{blx@labelnumber@\the\c@refsection}{%
\csuse{blx@labelnumber@\the\c@refsection}+1}%
- \edef\abx@field@localnumber{\csuse{blx@labelnumber@\the\c@refsection}}%
+ \edef\abx@field@localnumber{%
+ \csuse{blx@labelnumber@\the\c@refsection}}%
\blx@bbl@addentryfield{\abx@field@entrykey}{\the\c@refsection}%
{localnumber}{\abx@field@localnumber}}%
- \listxadd\blx@localnumaux{\string\abx@aux@number{\the\c@instcount}{\abx@field@entrykey}{\the\c@refsection}{\abx@field@localnumber}}}
+ \listxadd\blx@localnumaux{%
+ \string\abx@aux@number
+ {\the\c@instcount}
+ {\abx@field@entrykey}
+ {\the\c@refsection}
+ {\abx@field@localnumber}}}
% If localnumbers were already in the .aux, add them
% again from the .aux. This prevents some cycling
% problems where pagebreaks change after localnumber
% settles down and then we need another run which then
% regenerates localnumber requiring another run but then
% the pagebreaks change back again ... etc.
- {\listxadd\blx@localnumaux{\string\abx@aux@number{\the\c@instcount}{\abx@field@entrykey}{\the\c@refsection}{\abx@field@localnumber}}}}
+ {\listxadd\blx@localnumaux{%
+ \string\abx@aux@number
+ {\the\c@instcount}
+ {\abx@field@entrykey}
+ {\the\c@refsection}
+ {\abx@field@localnumber}}}}
{}}%
{}}
{}%
@@ -6284,7 +6322,8 @@
\togglefalse{blx@omitnumbers}%
\setkeys{blx@bib2}{#1}% ... now we have correct \blx@tempa, set rest of options
\blx@rest@actives
- \csxappto{blx@xml@slistsbib}{\blx@xml@slist{entry}{\blx@tempe}{\blx@tempc}{\blx@tempd}}%
+ \csxappto{blx@xml@slistsbib}{%
+ \blx@xml@slist{entry}{\blx@tempe}{\blx@tempc}{\blx@tempd}}%
\ifdefvoid\blx@tempa
{\blx@warn@bibempty\endgroup}
{\blx@bibliography\blx@tempa}}
@@ -6536,6 +6575,10 @@
\@onlypreamble\AtBeginBibliography
\@onlypreamble\AtEveryBibitem
+\def\blx@imc@UseBibitemHook{\csuse{blx@hook@bibitem}}
+
+\blx@regimcs{\UseBibitemHook}
+
\newrobustcmd*{\AtNextBibliography}{%
\ifundef\blx@hook@bibinit@next
{\gdef\blx@hook@bibinit@next{\global\undef\blx@hook@bibinit@next}}
@@ -6637,7 +6680,8 @@
\blx@safe@actives
\setkeys{blx@los2}{#1}% ... now we have correct \blx@tempa, set rest of options
\blx@rest@actives
- \csxappto{blx@xml@slistsbib}{\blx@xml@slistlos{shorthand}{\blx@tempe}{\blx@tempc}{\blx@tempd}}%
+ \csxappto{blx@xml@slistsbib}{%
+ \blx@xml@slistlos{shorthand}{\blx@tempe}{\blx@tempc}{\blx@tempd}}%
\ifdefvoid\blx@tempa
{\blx@warn@losempty\endgroup}
{\blx@shorthands\blx@tempa}}
@@ -6756,8 +6800,9 @@
\ifblank{#1}
{}
{\let\blx@bibfiles\@empty
- \blx@xsanitizeafter{\forcsvlist\blx@refsection@addfile}{#1}%
+ % globals should be first as it might contain macros needed for others
\forlistloop{\listadd\blx@bibfiles}\blx@bibfiles@global}%
+ \blx@xsanitizeafter{\forcsvlist\blx@refsection@addfile}{#1}%
\blx@refsection@biber
\fi
\blx@info{Setting label 'refsection:\the\c@refsection'}%
@@ -7057,8 +7102,14 @@
\newrobustcmd*{\AtEveryCite}{\gappto\blx@hook@cite}
\newrobustcmd*{\AtEveryCitekey}{\gappto\blx@hook@citekey}
+\newrobustcmd*{\AtEveryMultiCite}{\gappto\blx@hook@mcite}
\@onlypreamble\AtEveryCite
\@onlypreamble\AtEveryCitekey
+\@onlypreamble\AtEveryMultiCite
+
+\def\blx@imc@UseEveryCiteHook{\csuse{blx@hook@cite}}
+\def\blx@imc@UseEveryCitekeyHook{\csuse{blx@hook@citekey}}
+\def\blx@imc@UseEveryMultiCiteHook{\csuse{blx@hook@mcite}}
\newrobustcmd*{\AtNextCite}{%
\ifundef\blx@hook@cite@next
@@ -7072,7 +7123,24 @@
{}%
\gappto\blx@hook@citekey@next}
-% {<style>]
+\newrobustcmd*{\AtNextMultiCite}{%
+ \ifundef\blx@hook@mcite@next
+ {\gdef\blx@hook@mcite@next{\global\undef\blx@hook@mcite@next}}
+ {}%
+ \gappto\blx@hook@mcite@next}
+
+\def\blx@imc@UseNextCiteHook{\csuse{blx@hook@cite@next}}
+\def\blx@imc@UseNextCitekeyHook{\csuse{blx@hook@citekey@next}}
+\def\blx@imc@UseNextMultiCiteHook{\csuse{blx@hook@mcite@next}}
+
+\def\blx@imc@DeferNextCitekeyHook{\undef\blx@hook@citekey@next}
+
+\blx@regimcs{%
+ \UseEveryCiteHook \UseEveryCitekeyHook \UseEveryMultiCiteHook
+ \UseNextCiteHook \UseNextCitekeyHook \UseNextMultiCiteHook
+ \DeferNextCitekeyHook}
+
+% {<style>}
\newrobustcmd*{\RequireCitationStyle}[1]{%
\blx@inputonce{#1.cbx}{citation style '#1'}{}{}{}
@@ -7877,8 +7945,10 @@
\fi
\blx@checkpunct@ii}
\def\blx@checkpunct@iii#1\blx@checkpunct@ii{%
+ \global\undef\abx@field@postpunct
\blx@tempa{\blx@postpunct}}
\def\blx@checkpunct@iv#1\blx@checkpunct@ii#2&#3{%
+ \gdef\abx@field@postpunct{#3}%
\edef\blx@tempa{%
\expandonce\blx@tempa{%
\ifcsdef{blx@pm@\detokenize{#3}}
@@ -8009,6 +8079,8 @@
\ifnum\c@multicitetotal>\@ne
\let\blx@ifcitesingle\@secondoftwo
\fi
+ \csuse{blx@hook@mcite}%
+ \csuse{blx@hook@mcite@next}%
\ifblank{#2}%
{}
{\def\abx@field@multiprenote{#2}}%
@@ -8062,6 +8134,7 @@
\def\blx@multicite#1#2#3#4{%
\begingroup
+ \csuse{blx@hook@mcite@before}%
\def\blx@tempa{#1}%
\def\blx@tempb{#2}%
\def\blx@tempc{#3}%
@@ -8322,8 +8395,11 @@
\def\ifhyperref{\blx@TE\blx@imc@ifhyperref}%
\def\ifmorenames{\blx@TE\blx@imc@ifmorenames}%
\def\ifmoreitems{\blx@TE\blx@imc@ifmoreitems}%
+ \def\iffirstcitekey{\blx@TE\blx@imc@iffirstcitekey}%
+ \def\iflastcitekey{\blx@TE\blx@imc@iflastcitekey}%
\def\ifciteseen{\blx@TE\blx@imc@ifciteseen}%
\def\ifentryseen{\blx@TE\blx@imc@ifentryseen}%
+ \def\ifentryinbib{\blx@TE\blx@imc@ifentryinbib}%
\def\ifciteibid{\blx@TE\blx@imc@ifciteibid}%
\def\ifciteidem{\blx@TE\blx@imc@ifciteidem}%
\def\ifopcit{\blx@TE\blx@imc@ifopcit}%
@@ -8338,6 +8414,7 @@
\def\iffieldequals#1#2{\blx@TE{\blx@imc@iffieldequals{#1}{#2}}}%
\def\iffieldequalstr#1#2{\blx@TE{\blx@imc@iffieldequalstr{#1}{#2}}}%
\def\iffieldsequal#1#2{\blx@TE{\blx@imc@iffieldsequal{#1}{#2}}}%
+ \def\ifbibmacroundef#1{\blx@TE{\blx@imc@ifbibmacroundef{#1}}}%
\def\iffieldundef#1{\blx@TE{\blx@imc@iffieldundef{#1}}}%
\def\ifnameequalcs#1#2{\blx@TE{\blx@imc@ifnameequalcs{#1}{#2}}}%
\def\ifnameequals#1#2{\blx@TE{\blx@imc@ifnameequals{#1}{#2}}}%
@@ -8672,35 +8749,36 @@
n\or o\or p\or q\or r\or s\or t\or u\or v\or w\or x\or y\or z\else
\blx@warning@entry{Value out of range}\number#1\fi}
-\newrobustcmd*{\volcitecmd}[1]{%
- \begingroup
- \def\blx@tempa{\endgroup#1}%
- \@ifstar
- {\appto\blx@tempa{*}%
- \blx@volcitecmd@i}
- {\blx@volcitecmd@i}}
+% {<macro>}[<pre>]{<vol>}[<post>] => <macro>{<pre>}{{<vol>}{<post>}}
+
+\newrobustcmd*{\volcitecmd}{%
+ \AtNextCite{\DeclareFieldAlias{postnote}{volcitenote}}%
+ \begingroup\let\blx@citeargs\blx@volciteargs}
-\def\blx@volcitecmd@i{%
+\protected\def\blx@volciteargs#1{%
+ \endgroup
\@ifnextchar[%]
- {\blx@volcitecmd@ii}
- {\blx@volcitecmd@ii[]}}
+ {\blx@volciteargs@i{#1}}
+ {\blx@volciteargs@i{#1}[]}}
-\def\blx@volcitecmd@ii[#1]#2{%
- \appto\blx@tempa{[#1]}%
- \blx@getformat\blx@tempb{ffd}{}{volcitevolume}%
+\long\def\blx@volciteargs@i#1[#2]#3{%
\@ifnextchar[%]
- {\blx@volcitecmd@iii{#2}}
- {\edef\blx@tempa{\expandonce\blx@tempa[{%
- \expandonce{\blx@tempb{#2}}}]}%
- \blx@tempa}}
+ {\blx@volciteargs@ii{#1}{#2}{#3}}
+ {\blx@citeargs@iii{#1{#2}{{#3}{}}}}}
-\def\blx@volcitecmd@iii#1[#2]{%
- \blx@getformat\blx@tempc{ffd}{}{volcitepages}%
- \edef\blx@tempa{\expandonce\blx@tempa[{%
- \expandonce{\blx@tempb{#1}}%
- \noexpand\volcitedelim
- \expandonce{\blx@tempc{#2}}}]}%
- \blx@tempa}
+\long\def\blx@volciteargs@ii#1#2#3[#4]{%
+ \blx@citeargs@iii{#1{#2}{{#3}{#4}}}}
+
+\newrobustcmd*{\multivolcitecmd}{%
+ \AtNextCite{\DeclareFieldAlias{postnote}{volcitenote}}%
+ \def\blx@hook@mcite@before{%
+ \global\undef\blx@hook@mcite@before
+ \let\blx@citeargs\blx@volmciteargs}}
+
+\protected\def\blx@volmciteargs#1{%
+ \@ifnextchar[%]
+ {\blx@volciteargs@i{#1}}
+ {\blx@volciteargs@i{#1}[]}}
%% Control file
@@ -8750,11 +8828,11 @@
#2%
~~~~~~</bcf:map>\blx@nl}
\xdef\blx@xml@sourcemap@perdatasource#1{%
- ~~~~~~~~<bcf:per_datasource>#1</bcf:per_datasource>\blx@nl}
+ ~~~~~~~~<bcf:per\string_datasource>#1</bcf:per\string_datasource>\blx@nl}
\xdef\blx@xml@sourcemap@pertype#1{%
- ~~~~~~~~<bcf:per_type>#1</bcf:per_type>\blx@nl}
+ ~~~~~~~~<bcf:per\string_type>#1</bcf:per\string_type>\blx@nl}
\xdef\blx@xml@sourcemap@step#1{%
- ~~~~~~~~<bcf:map_step#1/>\blx@nl}
+ ~~~~~~~~<bcf:map\string_step#1/>\blx@nl}
\xdef\blx@xml@labelalphatemplate#1#2{%
~~<bcf:labelalphatemplate type="#1">\blx@nl
@@ -8972,15 +9050,27 @@
{\eappto\blx@tempa{%
\blx@xml@comment{SOURCEMAP}%
\blx@xml@sourcemap{%
- \ifcsdef{blx@biber@sourcemap@user}{\csuse{blx@biber@sourcemap@user}}{}%
- \ifcsdef{blx@biber@sourcemap@style}{\csuse{blx@biber@sourcemap@style}}{}%
- \ifcsdef{blx@biber@sourcemap@defaults@bibtex}{\csuse{blx@biber@sourcemap@defaults@bibtex}}{}%
- \ifcsdef{blx@biber@sourcemap@defaults@biblatexml}{\csuse{blx@biber@sourcemap@defaults@biblatexml}}{}%
- \ifcsdef{blx@biber@sourcemap@defaults@endnotexml}{\csuse{blx@biber@sourcemap@defaults@endnotexml}}{}%
- \ifcsdef{blx@biber@sourcemap@defaults@ris}{\csuse{blx@biber@sourcemap@defaults@ris}}{}%
- \ifcsdef{blx@biber@sourcemap@defaults@zoterordfxml}{\csuse{blx@biber@sourcemap@defaults@zoterordfxml}}{}%
- }%
- }}
+ \ifcsdef{blx@biber@sourcemap@user}
+ {\csuse{blx@biber@sourcemap@user}}
+ {}%
+ \ifcsdef{blx@biber@sourcemap@style}
+ {\csuse{blx@biber@sourcemap@style}}
+ {}%
+ \ifcsdef{blx@biber@sourcemap@defaults@bibtex}
+ {\csuse{blx@biber@sourcemap@defaults@bibtex}}
+ {}%
+ \ifcsdef{blx@biber@sourcemap@defaults@biblatexml}
+ {\csuse{blx@biber@sourcemap@defaults@biblatexml}}
+ {}%
+ \ifcsdef{blx@biber@sourcemap@defaults@endnotexml}
+ {\csuse{blx@biber@sourcemap@defaults@endnotexml}}
+ {}%
+ \ifcsdef{blx@biber@sourcemap@defaults@ris}
+ {\csuse{blx@biber@sourcemap@defaults@ris}}
+ {}%
+ \ifcsdef{blx@biber@sourcemap@defaults@zoterordfxml}
+ {\csuse{blx@biber@sourcemap@defaults@zoterordfxml}}
+ {}}}}
{}%
% labelalpha template
\eappto\blx@tempa{%
@@ -9168,7 +9258,7 @@
\appto\blx@tempb{ level="#1"}}
\newcommand*{\blx@sourcemap@map}[2][]{%
- \let\blx@tempd\@empty
+ \let\blx@tempm\@empty
\let\blx@tempe\@empty
\let\perdatasource\blx@sourcemap@perdatasource
\let\pertype\blx@sourcemap@pertype
@@ -9178,11 +9268,11 @@
{\setkeys{blx@sourcemap@map}{#1}}%
#2%
\eappto\blx@tempc{%
- \blx@xml@sourcemap@map{\blx@tempd}{\blx@tempe}}}
+ \blx@xml@sourcemap@map{\blx@tempm}{\blx@tempe}}}
\define@key{blx@sourcemap@map}{overwrite}[true]{% true|false
\ifstrequal{#1}{true}
- {\appto\blx@tempd{ map\string_overwrite="1"}}
+ {\appto\blx@tempm{ map\string_overwrite="1"}}
{}}
\newcommand*{\blx@sourcemap@perdatasource}[1]{%
@@ -9244,6 +9334,8 @@
{}}
\define@key{blx@sourcemap@step}{match}{% characters
\appto\blx@tempf{ map\string_match="#1"}}
+\define@key{blx@sourcemap@step}{notmatch}{% characters
+ \appto\blx@tempf{ map\string_notmatch="#1"}}
\define@key{blx@sourcemap@step}{replace}{% characters
\eappto\blx@tempf{ map\string_replace="#1"}}
@@ -9606,9 +9698,12 @@
{\setkeys{blx@ordered@field}{#1}}%
\advance\blx@tempcnta\@ne
\ifdefempty{\blx@tempa}
- {\csxappto{blx@bcf@\blx@tempb}{\noexpand\blx@xml@ordered{\the\blx@tempcnta}{\blx@tempc}{#2}}}
- {\def\do##1{\blx@addtypeopt{##1}%
- \csxappto{blx@bcf@\blx@tempb @##1}{\noexpand\blx@xml@ordered{\the\blx@tempcnta}{\blx@tempc}{#2}}}%
+ {\csxappto{blx@bcf@\blx@tempb}{%
+ \noexpand\blx@xml@ordered{\the\blx@tempcnta}{\blx@tempc}{#2}}}
+ {\def\do##1{%
+ \blx@addtypeopt{##1}%
+ \csxappto{blx@bcf@\blx@tempb @##1}{%
+ \noexpand\blx@xml@ordered{\the\blx@tempcnta}{\blx@tempc}{#2}}}%
\expandafter\docsvlist\expandafter{\blx@tempa}}}
\newcommand*{\blx@orderedld@field}[2][]{%
@@ -9618,17 +9713,23 @@
{\setkeys{blx@ordered@field}{#1}}%
\advance\blx@tempcnta\@ne
\ifdefempty{\blx@tempa}
- {\csxappto{blx@bcf@\blx@tempb}{\noexpand\blx@xml@ordered{\the\blx@tempcnta}{ type="field"\blx@tempc}{#2}}}
- {\def\do##1{\blx@addtypeopt{##1}%
- \csxappto{blx@bcf@\blx@tempb @##1}{\noexpand\blx@xml@ordered{\the\blx@tempcnta}{\blx@tempc}{#2}}}%
+ {\csxappto{blx@bcf@\blx@tempb}{%
+ \noexpand\blx@xml@ordered{\the\blx@tempcnta}{ type="field"\blx@tempc}{#2}}}
+ {\def\do##1{%
+ \blx@addtypeopt{##1}%
+ \csxappto{blx@bcf@\blx@tempb @##1}{%
+ \noexpand\blx@xml@ordered{\the\blx@tempcnta}{\blx@tempc}{#2}}}%
\expandafter\docsvlist\expandafter{\blx@tempa}}}
\newcommand*{\blx@orderedld@literal}[1]{%
\advance\blx@tempcnta\@ne
\ifdefempty{\blx@tempa}
- {\csxappto{blx@bcf@\blx@tempb}{\noexpand\blx@xml@ordered{\the\blx@tempcnta}{ type="string"}{#1}}}
- {\def\do##1{\blx@addtypeopt{##1}%
- \csxappto{blx@bcf@\blx@tempb @##1}{\noexpand\blx@xml@ordered{\the\blx@tempcnta}{ type="string"}{#1}}}%
+ {\csxappto{blx@bcf@\blx@tempb}{%
+ \noexpand\blx@xml@ordered{\the\blx@tempcnta}{ type="string"}{#1}}}
+ {\def\do##1{%
+ \blx@addtypeopt{##1}%
+ \csxappto{blx@bcf@\blx@tempb @##1}{%
+ \noexpand\blx@xml@ordered{\the\blx@tempcnta}{ type="string"}{#1}}}%
\expandafter\docsvlist\expandafter{\blx@tempa}}}
\define@key{blx@ordered@field}{form}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def
index fb217873dc0..b9c5258a532 100644
--- a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def
+++ b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def
@@ -99,6 +99,7 @@
\begingroup
\let\blx@dm@type\@empty
\let\blx@dm@datatype\@empty
+ \let\blx@dm@format\@empty
\boolfalse{dmskipout}%
\let\blx@tempa\@empty
\setkeys{blx@datamodel@field}{#1}%
@@ -157,6 +158,9 @@
\define@key{blx@datamodel@field}{datatype}{% characters
\eappto\blx@tempa{ datatype="#1"}%
\def\blx@dm@datatype{#1}}
+\define@key{blx@datamodel@field}{format}{% characters
+ \eappto\blx@tempa{ format="#1"}%
+ \def\blx@dm@format{#1}}
\define@key{blx@datamodel@field}{nullok}[true]{% true|false
\ifstrequal{#1}{true}
{\appto\blx@tempa{ nullok="true"}}
@@ -316,7 +320,9 @@
\DeclareDatamodelEntrytypes[skipout]{xdata}
-\DeclareDatamodelFields[type=field, datatype=integer]{
+\DeclareDatamodelFields[type=field, datatype=datepart]{
+ month,
+ year,
day,
endday,
endmonth,
@@ -350,6 +356,7 @@
eprintclass,
eprinttype,
eventtitle,
+ eventtitleaddon,
gender,
howpublished,
hyphenation,
@@ -371,14 +378,12 @@
mainsubtitle,
maintitle,
maintitleaddon,
- month,
nameaddon,
note,
number,
origtitle,
pagetotal,
part,
- related,
relatedstring,
relatedtype,
reprinttitle,
@@ -400,10 +405,9 @@
venue,
version,
volume,
- volumes,
- year}
+ volumes}
-\DeclareDatamodelFields[type=field, datatype=integer, nullok]{
+\DeclareDatamodelFields[type=field, datatype=datepart, nullok]{
urlendyear,
endyear,
eventendyear,
@@ -414,8 +418,7 @@
sortshorthand,
sortyear,
sortkey,
- presort,
- entryset}
+ presort}
\DeclareDatamodelFields[type=list, datatype=literal]{
institution,
@@ -474,8 +477,6 @@
crossref,
xref}
-\DeclareDatamodelFields[type=list, datatype=entrykey, skipout]{xdata, ids}
-
\DeclareDatamodelFields[type=field, datatype=date, skipout]{
date,
eventdate,
@@ -492,9 +493,14 @@
\DeclareDatamodelFields[type=field, datatype=uri]{url}
-\DeclareDatamodelFields[type=field, datatype=csv]{keywords}
-\DeclareDatamodelFields[type=field, datatype=csv, skipout]{options, relatedoptions}
+\DeclareDatamodelFields[type=field, format=csv, datatype=entrykey, skipout]{xdata, ids, entryset}
+\DeclareDatamodelFields[type=field, format=csv, datatype=entrykey]{related}
+
+\DeclareDatamodelFields[type=field, format=csv, datatype=keyword]{keywords}
+
+\DeclareDatamodelFields[type=field, format=csv, datatype=option, skipout]{options, relatedoptions}
\DeclareDatamodelFields[type=field, datatype=range]{pages}
+
\DeclareDatamodelFields[type=field, datatype=code]{execute}
\DeclareDatamodelEntryfields{
@@ -1169,6 +1175,7 @@
eventmonth,
eventyear,
eventtitle,
+ eventtitleaddon,
isbn,
language,
location,
@@ -1213,6 +1220,7 @@
eventmonth,
eventyear,
eventtitle,
+ eventtitleaddon,
isbn,
language,
location,
@@ -1267,6 +1275,7 @@
eventmonth,
eventyear,
eventtitle,
+ eventtitleaddon,
isbn,
language,
location,
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
index 1a590085e28..be019d10e5f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
@@ -3,6 +3,8 @@
\ExecuteBibliographyOptions{labelalpha,autocite=inline}
+\renewcommand*{\iffinalcitedelim}{\iflastcitekey}
+
\newbibmacro*{cite}{%
\printtext[bibhyperref]{%
\printfield{prefixnumber}%
@@ -11,9 +13,9 @@
\newbibmacro*{textcite}{%
\ifnameundef{labelname}
- {}
- {\printnames{labelname}\space}%
- \bibopenbracket
+ {\printfield[citetitle]{labeltitle}}
+ {\printnames{labelname}}%
+ \addspace\bibopenbracket
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
@@ -62,12 +64,18 @@
\DeclareCiteCommand{\textcite}
{}
{\usebibmacro{citeindex}%
+ \iffirstcitekey
+ {\setcounter{textcitetotal}{1}}
+ {\stepcounter{textcitetotal}%
+ \textcitedelim}%
\usebibmacro{textcite}}
- {\bibclosebracket\multicitedelim}
+ {\bibclosebracket}
{\usebibmacro{postnote}%
\bibclosebracket}
\DeclareMultiCiteCommand{\parencites}[\mkbibbrackets]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibbrackets\mkbibfootnote]{\smartcite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibbrackets\mkbibfootnote]
+ {\smartcite}{\multicitedelim}
+\DeclareMultiCiteCommand{\textcites}{\textcite}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
index 590d77eee9b..d232ebfebc8 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
@@ -3,6 +3,11 @@
\ExecuteBibliographyOptions{labelalpha,autocite=inline}
+\renewcommand*{\iffinalcitedelim}{%
+ \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
+
+\newbool{cbx:parens}
+
\newbibmacro*{cite}{%
\printtext[bibhyperref]{%
\printfield{prefixnumber}%
@@ -11,18 +16,44 @@
\newbibmacro*{textcite}{%
\iffieldequals{namehash}{\cbx@lasthash}
- {\multicitedelim}
- {\cbx@tempa
- \ifnameundef{labelname}
- {}
- {\printnames{labelname}\space}%
- \bibopenbracket}%
+ {\setunit{\multicitedelim}}
+ {\ifnameundef{labelname}
+ {\printfield[citetitle]{labeltitle}}
+ {\printnames{labelname}}%
+ \setunit{%
+ \global\booltrue{cbx:parens}%
+ \addspace\bibopenbracket}%
+ \stepcounter{textcitecount}%
+ \savefield{namehash}{\cbx@lasthash}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
\usebibmacro{cite}%
- \savefield{namehash}{\cbx@lasthash}%
- \gdef\cbx@tempa{\bibclosebracket\multicitedelim}}
+ \setunit{%
+ \ifbool{cbx:parens}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}%
+ \textcitedelim}}
+
+\newbibmacro*{textcite:init}{%
+ \ifnumless{\value{multicitecount}}{2}
+ {\global\boolfalse{cbx:parens}%
+ \global\undef\cbx@lasthash}
+ {\global\undef\cbx@lasthash}}
+
+\newbibmacro*{textcite:postnote}{%
+ \usebibmacro{postnote}%
+ \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+ {\setunit{}%
+ \printtext{%
+ \ifbool{cbx:parens}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}}}
+ {\setunit{%
+ \ifbool{cbx:parens}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}%
+ \textcitedelim}}}
\DeclareCiteCommand{\cite}[\mkbibbrackets]
{\usebibmacro{prenote}}
@@ -59,17 +90,46 @@
{\multicitedelim}
{\usebibmacro{postnote}}
-\DeclareCiteCommand{\textcite}
- {\let\cbx@tempa=\empty
- \undef\cbx@lasthash}
+\DeclareCiteCommand{\cbx@textcite}
+ {\usebibmacro{textcite:init}}
{\usebibmacro{citeindex}%
\usebibmacro{textcite}}
{}
- {\usebibmacro{postnote}%
- \bibclosebracket}
+ {\usebibmacro{textcite:postnote}}
+
+\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite]
+ {\gdef\cbx@savedkeys{}%
+ \citetrackerfalse%
+ \pagetrackerfalse%
+ \DeferNextCitekeyHook%
+ \usebibmacro{textcite:init}}
+ {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+ {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
+ \global\clearfield{multipostnote}}
+ {}%
+ \xappto\cbx@savedkeys{\thefield{entrykey},}%
+ \iffieldequals{namehash}{\cbx@lasthash}
+ {}
+ {\stepcounter{textcitetotal}%
+ \savefield{namehash}{\cbx@lasthash}}}
+ {}
+ {\protected@xappto\cbx@savedcites{%
+ [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
+
+\newrobustcmd{\cbx@textcite@init}[2]{%
+ \setcounter{textcitetotal}{0}%
+ \setcounter{textcitecount}{0}%
+ \def\cbx@savedcites{#1}#2\cbx@savedcites\empty}
+
+\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{}
+
+\let\cbx@textcites@init\cbx@textcite@init
+\pretocmd{\cbx@textcites@init}{\UseNextMultiCiteHook}{}{}
\DeclareMultiCiteCommand{\cites}[\mkbibbrackets]{\cite}{\multicitedelim}
\DeclareMultiCiteCommand{\parencites}[\mkbibbrackets]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibbrackets\mkbibfootnote]{\smartcite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibbrackets\mkbibfootnote]
+ {\smartcite}{\multicitedelim}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
index d831050b97a..3e6b1c73e90 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
@@ -2,6 +2,12 @@
[\abx@cbxid]
\ExecuteBibliographyOptions{uniquename,uniquelist,sortcites,autocite=footnote}
+
+\renewcommand*{\iffinalcitedelim}{%
+ \ifnameundef{labelname}
+ {\ifnumequal{\value{textcitecount}}{\value{textcitetotal}}}
+ {\ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}}
+
\newbool{cbx:parens}
\newbibmacro*{cite:init}{%
@@ -44,6 +50,7 @@
\setunit{%
\global\booltrue{cbx:parens}%
\addspace\bibopenparen}}%
+ \stepcounter{textcitecount}%
\savefield{namehash}{\cbx@lasthash}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
@@ -55,7 +62,7 @@
\ifbool{cbx:parens}
{\bibcloseparen\global\boolfalse{cbx:parens}}
{}%
- \multicitedelim}}
+ \textcitedelim}}
\newbibmacro*{cite:title}{%
\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
@@ -80,7 +87,7 @@
\ifbool{cbx:parens}
{\bibcloseparen\global\boolfalse{cbx:parens}}
{}%
- \multicitedelim}}}
+ \textcitedelim}}}
\DeclareCiteCommand{\cite}
{\usebibmacro{cite:init}%
@@ -138,19 +145,51 @@
{}
{\usebibmacro{postnote}}
-\DeclareCiteCommand{\textcite}
+\DeclareCiteCommand{\cbx@textcite}
{\usebibmacro{cite:init}}
{\usebibmacro{citeindex}%
\usebibmacro{textcite}}
{}
{\usebibmacro{textcite:postnote}}
+\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite]
+ {\gdef\cbx@savedkeys{}%
+ \citetrackerfalse%
+ \pagetrackerfalse%
+ \DeferNextCitekeyHook%
+ \usebibmacro{cite:init}}
+ {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+ {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
+ \global\clearfield{multipostnote}}
+ {}%
+ \xappto\cbx@savedkeys{\thefield{entrykey},}%
+ \iffieldequals{namehash}{\cbx@lasthash}
+ {}
+ {\stepcounter{textcitetotal}%
+ \savefield{namehash}{\cbx@lasthash}}}
+ {}
+ {\protected@xappto\cbx@savedcites{%
+ [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
+
+\newrobustcmd{\cbx@textcite@init}[2]{%
+ \setcounter{textcitetotal}{0}%
+ \setcounter{textcitecount}{0}%
+ \def\cbx@savedcites{#1}#2\cbx@savedcites\empty}
+
+\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{}
+
+\let\cbx@textcites@init\cbx@textcite@init
+\pretocmd{\cbx@textcites@init}{\UseNextMultiCiteHook}{}{}
+
\DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]{\footcitetext}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote]{\smartcite}
- {\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\textcites}{\textcite}{}
+\DeclareMultiCiteCommand{\parencites}[\mkbibparens]
+ {\parencite}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]
+ {\footcite}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]
+ {\footcitetext}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\smartcite}{\setunit{\multicitedelim}}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
index 8068079eafd..fcf370d48d3 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
@@ -1,8 +1,12 @@
\ProvidesFile{authortitle-ibid.cbx}
[\abx@cbxid]
-\ExecuteBibliographyOptions{uniquename,uniquelist,ibidtracker=constrict,pagetracker,autocite=footnote}
+\ExecuteBibliographyOptions{uniquename,uniquelist,ibidtracker=constrict,
+ pagetracker,autocite=footnote}
+
\providecommand*{\mkibid}[1]{#1}
+\renewcommand*{\iffinalcitedelim}{\iflastcitekey}
+
\newbool{cbx:parens}
\newbool{cbx:loccit}
@@ -17,10 +21,10 @@
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
{\usebibmacro{cite:ibid}}
{\ifnameundef{labelname}
- {}
- {\printnames{labelname}%
+ {}
+ {\printnames{labelname}%
\setunit{\nametitledelim}}%
- \usebibmacro{cite:title}}}%
+ \usebibmacro{cite:title}}}%
{\usebibmacro{cite:shorthand}}}
\newbibmacro*{citetitle}{%
@@ -128,11 +132,16 @@
\DeclareCiteCommand{\textcite}
{\boolfalse{cbx:parens}}
{\usebibmacro{citeindex}%
+ \iffirstcitekey
+ {\setcounter{textcitetotal}{1}}
+ {\stepcounter{textcitetotal}%
+ \textcitedelim}%
\usebibmacro{textcite}}
{\ifbool{cbx:parens}
{\bibcloseparen\boolfalse{cbx:parens}}
- {}%
- \multicitedelim}
+ {}}
{\usebibmacro{textcite:postnote}}
+\DeclareMultiCiteCommand{\textcites}{\textcite}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
index faec6bea6af..828d44bf526 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
@@ -3,7 +3,13 @@
\ExecuteBibliographyOptions{uniquename,uniquelist,ibidtracker=constrict,
pagetracker,sortcites,autocite=footnote}
+
\providecommand*{\mkibid}[1]{#1}
+\renewcommand*{\iffinalcitedelim}{%
+ \ifnameundef{labelname}
+ {\ifnumequal{\value{textcitecount}}{\value{textcitetotal}}}
+ {\ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}}
+
\newbool{cbx:parens}
\newbool{cbx:loccit}
@@ -57,6 +63,7 @@
\setunit{%
\global\booltrue{cbx:parens}%
\addspace\bibopenparen}}%
+ \stepcounter{textcitecount}%
\savefield{namehash}{\cbx@lasthash}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
@@ -70,7 +77,7 @@
\ifbool{cbx:parens}
{\bibcloseparen\global\boolfalse{cbx:parens}}
{}%
- \multicitedelim}}
+ \textcitedelim}}
\newbibmacro*{cite:title}{%
\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
@@ -109,7 +116,7 @@
\ifbool{cbx:parens}
{\bibcloseparen\global\boolfalse{cbx:parens}}
{}%
- \multicitedelim}}}
+ \textcitedelim}}}
\DeclareCiteCommand{\cite}
{\usebibmacro{cite:init}%
@@ -167,19 +174,51 @@
{}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\textcite}
+\DeclareCiteCommand{\cbx@textcite}
{\usebibmacro{cite:init}}
{\usebibmacro{citeindex}%
\usebibmacro{textcite}}
{}
{\usebibmacro{textcite:postnote}}
+\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite]
+ {\gdef\cbx@savedkeys{}%
+ \citetrackerfalse%
+ \pagetrackerfalse%
+ \DeferNextCitekeyHook%
+ \usebibmacro{cite:init}}
+ {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+ {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
+ \global\clearfield{multipostnote}}
+ {}%
+ \xappto\cbx@savedkeys{\thefield{entrykey},}%
+ \iffieldequals{namehash}{\cbx@lasthash}
+ {}
+ {\stepcounter{textcitetotal}%
+ \savefield{namehash}{\cbx@lasthash}}}
+ {}
+ {\protected@xappto\cbx@savedcites{%
+ [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
+
+\newrobustcmd{\cbx@textcite@init}[2]{%
+ \setcounter{textcitetotal}{0}%
+ \setcounter{textcitecount}{0}%
+ \def\cbx@savedcites{#1}#2\cbx@savedcites\empty}
+
+\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{}
+
+\let\cbx@textcites@init\cbx@textcite@init
+\pretocmd{\cbx@textcites@init}{\UseNextMultiCiteHook}{}{}
+
\DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]{\footcitetext}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote]{\smartcite}
- {\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\textcites}{\textcite}{}
+\DeclareMultiCiteCommand{\parencites}[\mkbibparens]
+ {\parencite}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]
+ {\footcite}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]
+ {\footcitetext}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\smartcite}{\setunit{\multicitedelim}}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
index 2764d3031cf..7157e5d67ef 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
@@ -4,6 +4,9 @@
\RequireCitationStyle{authortitle-comp}
\ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,autocite=inline}
+\renewcommand*{\iffinalcitedelim}{%
+ \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
+
\renewbibmacro*{cite}{%
\iffieldundef{shorthand}
{\iffieldequals{namehash}{\cbx@lasthash}
@@ -57,12 +60,13 @@
\iffieldundef{shorthand}
{\usebibmacro{cite:title}}%
{\usebibmacro{cite:shorthand}}}}%
+ \stepcounter{textcitecount}%
\savefield{namehash}{\cbx@lasthash}}%
\setunit{%
\ifbool{cbx:parens}
{\bibcloseparen\global\boolfalse{cbx:parens}}
{}%
- \multicitedelim}}
+ \textcitedelim}}
\renewbibmacro*{textcite:postnote}{%
\ifbool{cbx:parens}
@@ -81,6 +85,6 @@
\ifbool{cbx:parens}
{\bibcloseparen\global\boolfalse{cbx:parens}}
{}%
- \multicitedelim}}}
+ \textcitedelim}}}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
index 28bfa4e699d..eb19b9de0ae 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
@@ -4,6 +4,9 @@
\RequireCitationStyle{authortitle-icomp}
\ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,autocite=inline}
+\renewcommand*{\iffinalcitedelim}{%
+ \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
+
\renewbibmacro*{cite}{%
\iffieldundef{shorthand}
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
@@ -67,12 +70,13 @@
{\usebibmacro{cite:ibid}}
{\usebibmacro{cite:title}}}%
{\usebibmacro{cite:shorthand}}}}%
+ \stepcounter{textcitecount}%
\savefield{namehash}{\cbx@lasthash}}%
\setunit{%
\ifbool{cbx:parens}
{\bibcloseparen\global\boolfalse{cbx:parens}}
{}%
- \multicitedelim}}
+ \textcitedelim}}
\renewbibmacro*{textcite:postnote}{%
\ifbool{cbx:parens}
@@ -91,6 +95,6 @@
\ifbool{cbx:parens}
{\bibcloseparen\global\boolfalse{cbx:parens}}
{}%
- \multicitedelim}}}
+ \textcitedelim}}}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
index 4bdb2a94230..0ba18e87837 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
@@ -2,6 +2,9 @@
[\abx@cbxid]
\ExecuteBibliographyOptions{uniquename,uniquelist,autocite=footnote}
+
+\renewcommand*{\iffinalcitedelim}{\iflastcitekey}
+
\newbool{cbx:parens}
\newbibmacro*{cite}{%
@@ -101,11 +104,16 @@
\DeclareCiteCommand{\textcite}
{\boolfalse{cbx:parens}}
{\usebibmacro{citeindex}%
+ \iffirstcitekey
+ {\setcounter{textcitetotal}{1}}
+ {\stepcounter{textcitetotal}%
+ \textcitedelim}%
\usebibmacro{textcite}}
{\ifbool{cbx:parens}
{\bibcloseparen\global\boolfalse{cbx:parens}}
- {}%
- \multicitedelim}
+ {}}
{\usebibmacro{textcite:postnote}}
+\DeclareMultiCiteCommand{\textcites}{\textcite}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
index 5936fe16d88..a290293d0ae 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
@@ -1,7 +1,12 @@
\ProvidesFile{authoryear-comp.cbx}
[\abx@cbxid]
-\ExecuteBibliographyOptions{labeldate,uniquename,uniquelist,sortcites,autocite=inline}
+\ExecuteBibliographyOptions{labeldate,uniquename,uniquelist,sortcites,
+ autocite=inline}
+
+\renewcommand*{\iffinalcitedelim}{%
+ \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
+
\newbool{cbx:parens}
\newbibmacro*{cite:init}{%
@@ -100,12 +105,13 @@
\savefield{labelyear}{\cbx@lastyear}}
{\usebibmacro{cite:shorthand}%
\global\undef\cbx@lastyear}}%
- \savefield{namehash}{\cbx@lasthash}}%
+ \stepcounter{textcitecount}%
+ \savefield{namehash}{\cbx@lasthash}}%
\setunit{%
\ifbool{cbx:parens}
{\bibcloseparen\global\boolfalse{cbx:parens}}
{}%
- \multicitedelim}}
+ \textcitedelim}}
\newbibmacro*{cite:shorthand}{%
\printtext[bibhyperref]{\printfield{shorthand}}}
@@ -139,7 +145,7 @@
\ifbool{cbx:parens}
{\bibcloseparen\global\boolfalse{cbx:parens}}
{}%
- \multicitedelim}}}
+ \textcitedelim}}}
\DeclareCiteCommand{\cite}
{\usebibmacro{cite:init}%
@@ -197,19 +203,51 @@
{}
{\usebibmacro{postnote}}
-\DeclareCiteCommand{\textcite}
+\DeclareCiteCommand{\cbx@textcite}
{\usebibmacro{cite:init}}
{\usebibmacro{citeindex}%
\usebibmacro{textcite}}
{}
{\usebibmacro{textcite:postnote}}
+\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite]
+ {\gdef\cbx@savedkeys{}%
+ \citetrackerfalse%
+ \pagetrackerfalse%
+ \DeferNextCitekeyHook%
+ \usebibmacro{cite:init}}
+ {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+ {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
+ \global\clearfield{multipostnote}}
+ {}%
+ \xappto\cbx@savedkeys{\thefield{entrykey},}%
+ \iffieldequals{namehash}{\cbx@lasthash}
+ {}
+ {\stepcounter{textcitetotal}%
+ \savefield{namehash}{\cbx@lasthash}}}
+ {}
+ {\protected@xappto\cbx@savedcites{%
+ [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
+
+\newrobustcmd{\cbx@textcite@init}[2]{%
+ \setcounter{textcitetotal}{0}%
+ \setcounter{textcitecount}{0}%
+ \def\cbx@savedcites{#1}#2\cbx@savedcites\empty}
+
+\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{}
+
+\let\cbx@textcites@init\cbx@textcite@init
+\pretocmd{\cbx@textcites@init}{\UseNextMultiCiteHook}{}{}
+
\DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]{\footcitetext}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote]{\smartcite}
- {\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\textcites}{\textcite}{}
+\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}
+ {\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite}
+ {\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]
+ {\footcitetext}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\smartcite}{\setunit{\multicitedelim}}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
index 77c4b1e0033..b0e6eee71b3 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
@@ -3,7 +3,10 @@
\ExecuteBibliographyOptions{labeldate,uniquename,uniquelist,pagetracker,
ibidtracker=constrict,autocite=inline}
+
\providecommand*{\mkibid}[1]{#1}
+\renewcommand*{\iffinalcitedelim}{\iflastcitekey}
+
\newbool{cbx:parens}
\newbool{cbx:loccit}
@@ -18,11 +21,11 @@
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
{\usebibmacro{cite:ibid}}
{\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
- {\usebibmacro{cite:label}%
+ {\usebibmacro{cite:label}%
\setunit{\addspace}}
- {\printnames{labelname}%
+ {\printnames{labelname}%
\setunit{\nameyeardelim}}%
- \usebibmacro{cite:labelyear+extrayear}}}
+ \usebibmacro{cite:labelyear+extrayear}}}
{\usebibmacro{cite:shorthand}}}
\newbibmacro*{citeyear}{%
@@ -31,8 +34,8 @@
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
{\usebibmacro{cite:ibid}}
{\iffieldundef{labelyear}
- {\usebibmacro{cite:label}}
- {\usebibmacro{cite:labelyear+extrayear}}}}
+ {\usebibmacro{cite:label}}
+ {\usebibmacro{cite:labelyear+extrayear}}}}
{\usebibmacro{cite:shorthand}}}
\newbibmacro*{textcite}{%
@@ -40,13 +43,13 @@
\ifnameundef{labelname}
{\iffieldundef{shorthand}
{\usebibmacro{cite:label}%
- \setunit{%
- \global\booltrue{cbx:parens}%
- \addspace\bibopenparen}%
- \ifnumequal{\value{citecount}}{1}
- {\usebibmacro{prenote}}
- {}%
- \usebibmacro{cite:labelyear+extrayear}}
+ \setunit{%
+ \global\booltrue{cbx:parens}%
+ \addspace\bibopenparen}%
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
+ \usebibmacro{cite:labelyear+extrayear}}
{\usebibmacro{cite:shorthand}}}
{\printnames{labelname}%
\setunit{%
@@ -58,7 +61,7 @@
\iffieldundef{shorthand}
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
{\usebibmacro{cite:ibid}}
- {\iffieldundef{labelyear}
+ {\iffieldundef{labelyear}
{\usebibmacro{cite:label}}
{\usebibmacro{cite:labelyear+extrayear}}}}
{\usebibmacro{cite:shorthand}}}}
@@ -151,11 +154,16 @@
\DeclareCiteCommand{\textcite}
{\boolfalse{cbx:parens}}
{\usebibmacro{citeindex}%
+ \iffirstcitekey
+ {\setcounter{textcitetotal}{1}}
+ {\stepcounter{textcitetotal}%
+ \textcitedelim}%
\usebibmacro{textcite}}
{\ifbool{cbx:parens}
{\bibcloseparen\global\boolfalse{cbx:parens}}
- {}%
- \multicitedelim}
+ {}}
{\usebibmacro{textcite:postnote}}
+\DeclareMultiCiteCommand{\textcites}{\textcite}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
index 0fdb7f60eda..e5841f52d09 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
@@ -3,7 +3,11 @@
\ExecuteBibliographyOptions{labeldate,uniquename,uniquelist,ibidtracker=constrict,
pagetracker,sortcites,autocite=inline}
+
\providecommand*{\mkibid}[1]{#1}
+\renewcommand*{\iffinalcitedelim}{%
+ \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
+
\newbool{cbx:parens}
\newbool{cbx:loccit}
@@ -21,7 +25,7 @@
{\iffieldundef{prenote}
{}
{\global\undef\cbx@lasthash
- \global\undef\cbx@lastyear}}}
+ \global\undef\cbx@lastyear}}}
\newbibmacro*{cite:reinit}{%
\global\undef\cbx@lasthash
@@ -117,12 +121,13 @@
\savefield{labelyear}{\cbx@lastyear}}
{\usebibmacro{cite:shorthand}%
\global\undef\cbx@lastyear}}%
- \savefield{namehash}{\cbx@lasthash}}%
+ \stepcounter{textcitecount}%
+ \savefield{namehash}{\cbx@lasthash}}%
\setunit{%
\ifbool{cbx:parens}
{\bibcloseparen\global\boolfalse{cbx:parens}}
{}%
- \multicitedelim}}
+ \textcitedelim}}
\newbibmacro*{cite:shorthand}{%
\printtext[bibhyperref]{\printfield{shorthand}}}
@@ -163,13 +168,13 @@
{\setunit{}%
\printtext{%
\ifbool{cbx:parens}
- {\bibcloseparen\global\boolfalse{cbx:parens}}
- {}}}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}}}
{\setunit{%
\ifbool{cbx:parens}
- {\bibcloseparen\global\boolfalse{cbx:parens}}
- {}%
- \multicitedelim}}}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}%
+ \textcitedelim}}}
\DeclareCiteCommand{\cite}
{\usebibmacro{cite:init}%
@@ -227,19 +232,51 @@
{}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\textcite}
+\DeclareCiteCommand{\cbx@textcite}
{\usebibmacro{cite:init}}
{\usebibmacro{citeindex}%
\usebibmacro{textcite}}
{}
{\usebibmacro{textcite:postnote}}
+\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite]
+ {\gdef\cbx@savedkeys{}%
+ \citetrackerfalse%
+ \pagetrackerfalse%
+ \DeferNextCitekeyHook%
+ \usebibmacro{cite:init}}
+ {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+ {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
+ \global\clearfield{multipostnote}}
+ {}%
+ \xappto\cbx@savedkeys{\thefield{entrykey},}%
+ \iffieldequals{namehash}{\cbx@lasthash}
+ {}
+ {\stepcounter{textcitetotal}%
+ \savefield{namehash}{\cbx@lasthash}}}
+ {}
+ {\protected@xappto\cbx@savedcites{%
+ [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
+
+\newrobustcmd{\cbx@textcite@init}[2]{%
+ \setcounter{textcitetotal}{0}%
+ \setcounter{textcitecount}{0}%
+ \def\cbx@savedcites{#1}#2\cbx@savedcites\empty}
+
+\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{}
+
+\let\cbx@textcites@init\cbx@textcite@init
+\pretocmd{\cbx@textcites@init}{\UseNextMultiCiteHook}{}{}
+
\DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]{\footcitetext}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote]{\smartcite}
- {\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\textcites}{\textcite}{}
+\DeclareMultiCiteCommand{\parencites}[\mkbibparens]
+ {\parencite}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]
+ {\footcite}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]
+ {\footcitetext}{\setunit{\multicitedelim}}
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\smartcite}{\setunit{\multicitedelim}}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
index 97a4aa9bf21..c0ac1e0eb07 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
@@ -2,6 +2,9 @@
[\abx@cbxid]
\ExecuteBibliographyOptions{labeldate,uniquename,uniquelist,autocite=inline}
+
+\renewcommand*{\iffinalcitedelim}{\iflastcitekey}
+
\newbool{cbx:parens}
\newbibmacro*{cite}{%
@@ -25,13 +28,13 @@
\ifnameundef{labelname}
{\iffieldundef{shorthand}
{\usebibmacro{cite:label}%
- \setunit{%
- \global\booltrue{cbx:parens}%
- \addspace\bibopenparen}%
- \ifnumequal{\value{citecount}}{1}
- {\usebibmacro{prenote}}
- {}%
- \usebibmacro{cite:labelyear+extrayear}}
+ \setunit{%
+ \global\booltrue{cbx:parens}%
+ \addspace\bibopenparen}%
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
+ \usebibmacro{cite:labelyear+extrayear}}
{\usebibmacro{cite:shorthand}}}
{\printnames{labelname}%
\setunit{%
@@ -119,11 +122,16 @@
\DeclareCiteCommand{\textcite}
{\boolfalse{cbx:parens}}
{\usebibmacro{citeindex}%
+ \iffirstcitekey
+ {\setcounter{textcitetotal}{1}}
+ {\stepcounter{textcitetotal}%
+ \textcitedelim}%
\usebibmacro{textcite}}
{\ifbool{cbx:parens}
{\bibcloseparen\global\boolfalse{cbx:parens}}
- {}%
- \multicitedelim}
+ {}}
{\usebibmacro{textcite:postnote}}
+\DeclareMultiCiteCommand{\textcites}{\textcite}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx
index 9f5a434b38b..d1ecbd63e9c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx
@@ -2,15 +2,21 @@
[\abx@cbxid]
\ExecuteBibliographyOptions{labelnumber,sortcites,autocite=inline}
+
\renewcommand*{\multicitedelim}{\addcomma\space}
+\renewcommand*{\iffinalcitedelim}{%
+ \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
+
\providebool{bbx:subentry}
+\newbool{cbx:parens}
+
\newcounter{cbx@tempcnta}
\newcounter{cbx@tempcntb}
\DeclareFieldFormat{entrysetcount}{\mknumalph{#1}}
\newbibmacro*{cite:init}{%
- \global\let\cbx@tempa=\empty
+ \global\boolfalse{cbx:parens}%
\global\undef\cbx@lasthash
\global\undef\cbx@lastnumber
\global\undef\cbx@lastprefix
@@ -22,7 +28,7 @@
\iffieldundef{shorthand}
{\ifbool{bbx:subentry}
{\iffieldundef{entrysetcount}
- {\usebibmacro{cite:comp:comp}}
+ {\usebibmacro{cite:comp:comp}}
{\usebibmacro{cite:comp:inset}}}
{\usebibmacro{cite:comp:comp}}}
{\usebibmacro{cite:comp:shand}}}
@@ -35,17 +41,17 @@
}
{\ifnumequal{\thefield{labelnumber}}{\value{cbx@tempcntb}}
{\savefield{entrykey}{\cbx@lastkey}%
- \savefield{labelnumber}{\cbx@lastnumber}%
- \addtocounter{cbx@tempcnta}{1}}
+ \savefield{labelnumber}{\cbx@lastnumber}%
+ \addtocounter{cbx@tempcnta}{1}}
{\ifnumequal{\thefield{labelnumber}}{\value{cbx@tempcntb}-1}
- {}
- {\usebibmacro{cite:dump}%
- \ifnumgreater{\value{cbx@tempcntb}}{-1}
- {\multicitedelim}
- {}%
- \printtext[bibhyperref]{%
- \printfield{prefixnumber}%
- \printfield{labelnumber}}}}}
+ {}
+ {\usebibmacro{cite:dump}%
+ \ifnumgreater{\value{cbx@tempcntb}}{-1}
+ {\multicitedelim}
+ {}%
+ \printtext[bibhyperref]{%
+ \printfield{prefixnumber}%
+ \printfield{labelnumber}}}}}
{\usebibmacro{cite:comp:end}}%
\setcounter{cbx@tempcntb}{\thefield{labelnumber}}%
\savefield{prefixnumber}{\cbx@lastprefix}}
@@ -86,7 +92,7 @@
\bibhyperref[\cbx@lastkey]{%
\ifdef\cbx@lastprefix
{\printtext[prefixnumber]{\cbx@lastprefix}}
- {}%
+ {}%
\printtext[labelnumber]{\cbx@lastnumber}}}
{}%
\setcounter{cbx@tempcnta}{0}%
@@ -95,18 +101,25 @@
\newbibmacro*{textcite}{%
\iffieldequals{namehash}{\cbx@lasthash}
{\usebibmacro{cite:comp}}
- {\usebibmacro{cite:dump}\cbx@tempa
+ {\usebibmacro{cite:dump}%
+ \ifbool{cbx:parens}
+ {\bibclosebracket\global\boolfalse{cbx:parens}}
+ {}%
+ \iffirstcitekey
+ {}
+ {\textcitedelim}%
\usebibmacro{cite:init}%
\ifnameundef{labelname}
{\printfield[citetitle]{labeltitle}}
{\printnames{labelname}}%
- \addspace\bibopenbracket
+ \global\booltrue{cbx:parens}%
+ \addspace\bibopenbracket%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
- \usebibmacro{cite:comp}}%
- \savefield{namehash}{\cbx@lasthash}%
- \gdef\cbx@tempa{\bibclosebracket\multicitedelim}}
+ \usebibmacro{cite:comp}%
+ \stepcounter{textcitecount}%
+ \savefield{namehash}{\cbx@lasthash}}}
\DeclareCiteCommand{\cite}[\mkbibbrackets]
{\usebibmacro{cite:init}%
@@ -153,14 +166,6 @@
{\usebibmacro{cite:dump}%
\usebibmacro{postnote}}
-\DeclareCiteCommand{\textcite}
- {\usebibmacro{cite:init}}
- {\usebibmacro{citeindex}%
- \usebibmacro{textcite}}
- {}
- {\usebibmacro{postnote}%
- \bibclosebracket}
-
\DeclareCiteCommand{\supercite}[\mkbibsuperscript]
{\usebibmacro{cite:init}%
\let\multicitedelim=\supercitedelim
@@ -175,8 +180,50 @@
{}
{\usebibmacro{cite:dump}}
+\DeclareCiteCommand{\cbx@textcite}
+ {\usebibmacro{cite:init}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{textcite}}
+ {}
+ {\usebibmacro{cite:dump}%
+ \usebibmacro{postnote}%
+ \ifbool{cbx:parens}
+ {\bibclosebracket\global\boolfalse{cbx:parens}}
+ {}}
+
+\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite]
+ {\gdef\cbx@savedkeys{}%
+ \citetrackerfalse%
+ \pagetrackerfalse%
+ \DeferNextCitekeyHook%
+ \usebibmacro{cite:init}}
+ {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+ {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
+ \global\clearfield{multipostnote}}
+ {}%
+ \xappto\cbx@savedkeys{\thefield{entrykey},}%
+ \iffieldequals{namehash}{\cbx@lasthash}
+ {}
+ {\stepcounter{textcitetotal}%
+ \savefield{namehash}{\cbx@lasthash}}}
+ {}
+ {\protected@xappto\cbx@savedcites{%
+ [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
+
+\newrobustcmd{\cbx@textcite@init}[2]{%
+ \setcounter{textcitetotal}{0}%
+ \setcounter{textcitecount}{0}%
+ \def\cbx@savedcites{#1}#2\cbx@savedcites\empty}
+
+\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{}
+
+\let\cbx@textcites@init\cbx@textcite@init
+\pretocmd{\cbx@textcites@init}{\UseNextMultiCiteHook}{}{}
+
\DeclareMultiCiteCommand{\cites}[\mkbibbrackets]{\cite}{\multicitedelim}
\DeclareMultiCiteCommand{\parencites}[\mkbibbrackets]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibbrackets\mkbibfootnote]{\smartcite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibbrackets\mkbibfootnote]
+ {\smartcite}{\multicitedelim}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx
index 8242120b64d..065f2ad2c7c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx
@@ -2,8 +2,12 @@
[\abx@cbxid]
\ExecuteBibliographyOptions{labelnumber,autocite=inline}
+
\renewcommand*{\multicitedelim}{\addcomma\space}
+\renewcommand*{\iffinalcitedelim}{\iflastcitekey}
+
\providebool{bbx:subentry}
+
\DeclareFieldFormat{entrysetcount}{\mknumalph{#1}}
\newbibmacro*{cite}{%
@@ -67,8 +71,12 @@
\DeclareCiteCommand{\textcite}
{}
{\usebibmacro{citeindex}%
+ \iffirstcitekey
+ {\setcounter{textcitetotal}{1}}
+ {\stepcounter{textcitetotal}%
+ \textcitedelim}%
\usebibmacro{textcite}}
- {\bibclosebracket\multicitedelim}
+ {\bibclosebracket}
{\usebibmacro{postnote}%
\bibclosebracket}
@@ -85,6 +93,8 @@
{}
\DeclareMultiCiteCommand{\parencites}[\mkbibbrackets]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibbrackets\mkbibfootnote]{\smartcite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibbrackets\mkbibfootnote]
+ {\smartcite}{\multicitedelim}
+\DeclareMultiCiteCommand{\textcites}{\textcite}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
index 4f431473601..67af09ca407 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
@@ -2,8 +2,14 @@
[\abx@cbxid]
\ExecuteBibliographyOptions{labelnumber,autocite=inline}
+
\renewcommand*{\multicitedelim}{\addcomma\space}
+\renewcommand*{\iffinalcitedelim}{%
+ \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
+
\providebool{bbx:subentry}
+\newbool{cbx:parens}
+
\DeclareFieldFormat{entrysetcount}{\mknumalph{#1}}
\newbibmacro*{cite}{%
@@ -16,18 +22,44 @@
\newbibmacro*{textcite}{%
\iffieldequals{namehash}{\cbx@lasthash}
- {\multicitedelim}
- {\cbx@tempa
- \ifnameundef{labelname}
+ {\setunit{\multicitedelim}}
+ {\ifnameundef{labelname}
{\printfield[citetitle]{labeltitle}}
{\printnames{labelname}}%
- \addspace\bibopenbracket}%
+ \setunit{%
+ \global\booltrue{cbx:parens}%
+ \addspace\bibopenbracket}%
+ \stepcounter{textcitecount}%
+ \savefield{namehash}{\cbx@lasthash}}%
\ifnumequal{\value{citecount}}{1}
{\usebibmacro{prenote}}
{}%
\usebibmacro{cite}%
- \savefield{namehash}{\cbx@lasthash}%
- \gdef\cbx@tempa{\bibclosebracket\multicitedelim}}
+ \setunit{%
+ \ifbool{cbx:parens}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}%
+ \textcitedelim}}
+
+\newbibmacro*{textcite:init}{%
+ \ifnumless{\value{multicitecount}}{2}
+ {\global\boolfalse{cbx:parens}%
+ \global\undef\cbx@lasthash}
+ {\global\undef\cbx@lasthash}}
+
+\newbibmacro*{textcite:postnote}{%
+ \usebibmacro{postnote}%
+ \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+ {\setunit{}%
+ \printtext{%
+ \ifbool{cbx:parens}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}}}
+ {\setunit{%
+ \ifbool{cbx:parens}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}%
+ \textcitedelim}}}
\DeclareCiteCommand{\cite}[\mkbibbrackets]
{\usebibmacro{prenote}}
@@ -64,15 +96,6 @@
{\multicitedelim}
{\usebibmacro{postnote}}
-\DeclareCiteCommand{\textcite}
- {\let\cbx@tempa=\empty
- \undef\cbx@lasthash}
- {\usebibmacro{citeindex}%
- \usebibmacro{textcite}}
- {}
- {\usebibmacro{postnote}%
- \bibclosebracket}
-
\DeclareCiteCommand{\supercite}[\mkbibsuperscript]
{\iffieldundef{prenote}
{}
@@ -85,8 +108,46 @@
{\supercitedelim}
{}
+\DeclareCiteCommand{\cbx@textcite}
+ {\usebibmacro{textcite:init}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{textcite}}
+ {}
+ {\usebibmacro{textcite:postnote}}
+
+\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite]
+ {\gdef\cbx@savedkeys{}%
+ \citetrackerfalse%
+ \pagetrackerfalse%
+ \DeferNextCitekeyHook%
+ \usebibmacro{textcite:init}}
+ {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+ {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
+ \global\clearfield{multipostnote}}
+ {}%
+ \xappto\cbx@savedkeys{\thefield{entrykey},}%
+ \iffieldequals{namehash}{\cbx@lasthash}
+ {}
+ {\stepcounter{textcitetotal}%
+ \savefield{namehash}{\cbx@lasthash}}}
+ {}
+ {\protected@xappto\cbx@savedcites{%
+ [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
+
+\newrobustcmd{\cbx@textcite@init}[2]{%
+ \setcounter{textcitetotal}{0}%
+ \setcounter{textcitecount}{0}%
+ \def\cbx@savedcites{#1}#2\cbx@savedcites\empty}
+
+\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{}
+
+\let\cbx@textcites@init\cbx@textcite@init
+\pretocmd{\cbx@textcites@init}{\UseNextMultiCiteHook}{}{}
+
\DeclareMultiCiteCommand{\cites}[\mkbibbrackets]{\cite}{\multicitedelim}
\DeclareMultiCiteCommand{\parencites}[\mkbibbrackets]{\parencite}{\multicitedelim}
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibbrackets\mkbibfootnote]{\smartcite}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibbrackets\mkbibfootnote]
+ {\smartcite}{\multicitedelim}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx
index dff768ed174..c21cc843edd 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx
@@ -2,13 +2,19 @@
[\abx@cbxid]
\InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}}
+
\DeclareFieldFormat{bibhyperlink}{%
\bibhyperlink{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}}
\DeclareFieldFormat{bibhypertarget}{%
\bibhypertarget{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}}
+
\newcommand*{\cbx@resetcount}{0}
\providecommand*{\mkibid}[1]{#1}
+\renewcommand*{\iffinalcitedelim}{%
+ \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
+
\newtoggle{cbx:loccit}
+
\newbibmacro*{cite:citepages}{}
\newbibmacro*{cite:full:citepages}{}
\newbibmacro*{cite:postnote}{}
@@ -86,7 +92,7 @@
\printfield{postnote}}}
\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
- pagetracker,autocite=footnote,citepages=permit}
+ pagetracker,autocite=footnote,citepages=permit}
\newbibmacro*{cite}{%
\usebibmacro{cite:citepages}%
@@ -167,17 +173,78 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\textcite}[\cbx@textcite\footcite]
- {\gdef\cbx@savedkeys{}}
- {\printnames{labelname}%
- \xappto\cbx@savedkeys{\thefield{entrykey},}}
- {\multinamedelim}
- {\protected@xappto\cbx@savedcites{%
- [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
+\newbibmacro*{textcite}{%
+ \ifnameundef{labelname}
+ {\printfield[citetitle]{labeltitle}}
+ {\printnames{labelname}}}
-\newrobustcmd{\cbx@textcite}[2]{%
- \def\cbx@savedcites{#1}#2\cbx@savedcites}
+\newbibmacro*{textcite:init}{%
+ \citetrackerfalse%
+ \pagetrackerfalse%
+ \iffirstcitekey
+ {\global\undef\cbx@lasthash}
+ {}}
+
+\newbibmacro*{textcite:count}{%
+ \stepcounter{textcitetotal}%
+ \ifnumgreater{\value{labelname}}{\value{textcitemaxnames}}
+ {\setcounter{textcitemaxnames}{\value{labelname}}}
+ {}}
-\DeclareMultiCiteCommand{\textcites}[\cbx@textcite\footcites]{\textcite}{\multinamedelim}
+\DeclareCiteCommand{\cbx@textcite}
+ {\usebibmacro{textcite:init}}
+ {\iffieldequals{namehash}{\cbx@lasthash}
+ {}
+ {\iffirstcitekey
+ {}
+ {\textcitedelim}%
+ \stepcounter{textcitecount}%
+ \usebibmacro{textcite}%
+ \savefield{namehash}{\cbx@lasthash}}}
+ {}
+ {}
+
+\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite\footcite]
+ {\usebibmacro{textcite:init}%
+ \gdef\cbx@savedkeys{}%
+ \DeferNextCitekeyHook}
+ {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+ {\protected@xappto\cbx@footcite@args{%
+ (\thefield{multiprenote})(\thefield{multipostnote})}}
+ {}%
+ \xappto\cbx@savedkeys{\thefield{entrykey},}%
+ \iffieldequals{namehash}{\cbx@lasthash}
+ {}
+ {\usebibmacro{textcite:count}%
+ \savefield{namehash}{\cbx@lasthash}}%
+ \ifnumequal{\value{citecount}}{\value{citetotal}}
+ {\protected@xappto\cbx@textcite@args{{\cbx@savedkeys}}%
+ \protected@xappto\cbx@footcite@args{%
+ [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}%
+ \iflastcitekey
+ {\protected@xappto\cbx@textcite@args{\thefield{postpunct}}%
+ \protected@xappto\cbx@footcite@args{\nopunct}}
+ {}}
+ {}}
+ {}
+ {}
+
+\newrobustcmd{\cbx@textcite@init}[3]{%
+ \setcounter{textcitetotal}{0}%
+ \setcounter{textcitecount}{0}%
+ \setcounter{textcitemaxnames}{0}%
+ \def\cbx@textcite@args{#1}\def\cbx@footcite@args{#2}#3%
+ \cbx@textcite@args\@empty\cbx@footcite@args\@empty}
+
+\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\textcites}
+ [\cbx@textcites@init\cbx@textcites\footcites]{\textcite}{}
+
+\let\cbx@textcites@init\cbx@textcite@init
+\pretocmd{\cbx@textcites@init}{%
+ \UseNextMultiCiteHook%
+ \AtNextMultiCite{%
+ \renewbibmacro{multiprenote}{}%
+ \renewbibmacro{multipostnote}{}}}{}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx
index fc416ef3ba6..ab58e623dea 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx
@@ -2,12 +2,18 @@
[\abx@cbxid]
\DeclareFieldFormat{bibhyperlink}{%
- \bibhyperlink{\thefield{entrykey}:\csuse{cbx@\iffootnote{f}{t}@\thefield{entrykey}}}{#1}}
+ \bibhyperlink{%
+ \thefield{entrykey}:\csuse{cbx@\iffootnote{f}{t}@\thefield{entrykey}}}{#1}}
\DeclareFieldFormat{bibhypertarget}{%
\bibhypertarget{\thefield{entrykey}:\the\value{instcount}}{#1}}
+
\providecommand*{\mkibid}[1]{#1}
+\renewcommand*{\iffinalcitedelim}{%
+ \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
+
\newtoggle{cbx:loccit}
\newtoggle{cbx:pageref}
+
\newbibmacro*{cite:citepages}{}
\newbibmacro*{cite:full:citepages}{}
\newbibmacro*{cite:postnote}{}
@@ -86,8 +92,8 @@
\setunit{\addspace}%
\printfield{postnote}}}
-\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,singletitle,
- pagetracker,autocite=footnote,citepages=permit}
+\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
+ singletitle,pagetracker,autocite=footnote,citepages=permit}
\newbibmacro*{cite}{%
\usebibmacro{cite:citepages}%
@@ -226,17 +232,78 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\textcite}[\cbx@textcite\footcite]
- {\gdef\cbx@savedkeys{}}
- {\printnames{labelname}%
- \xappto\cbx@savedkeys{\thefield{entrykey},}}
- {\multinamedelim}
- {\protected@xappto\cbx@savedcites{%
- [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
+\newbibmacro*{textcite}{%
+ \ifnameundef{labelname}
+ {\printfield[citetitle]{labeltitle}}
+ {\printnames{labelname}}}
+
+\newbibmacro*{textcite:init}{%
+ \citetrackerfalse%
+ \pagetrackerfalse%
+ \iffirstcitekey
+ {\global\undef\cbx@lasthash}
+ {}}
+
+\newbibmacro*{textcite:count}{%
+ \stepcounter{textcitetotal}%
+ \ifnumgreater{\value{labelname}}{\value{textcitemaxnames}}
+ {\setcounter{textcitemaxnames}{\value{labelname}}}
+ {}}
+
+\DeclareCiteCommand{\cbx@textcite}
+ {\usebibmacro{textcite:init}}
+ {\iffieldequals{namehash}{\cbx@lasthash}
+ {}
+ {\iffirstcitekey
+ {}
+ {\textcitedelim}%
+ \stepcounter{textcitecount}%
+ \usebibmacro{textcite}%
+ \savefield{namehash}{\cbx@lasthash}}}
+ {}
+ {}
+
+\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite\footcite]
+ {\usebibmacro{textcite:init}%
+ \gdef\cbx@savedkeys{}%
+ \DeferNextCitekeyHook}
+ {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+ {\protected@xappto\cbx@footcite@args{%
+ (\thefield{multiprenote})(\thefield{multipostnote})}}
+ {}%
+ \xappto\cbx@savedkeys{\thefield{entrykey},}%
+ \iffieldequals{namehash}{\cbx@lasthash}
+ {}
+ {\usebibmacro{textcite:count}%
+ \savefield{namehash}{\cbx@lasthash}}%
+ \ifnumequal{\value{citecount}}{\value{citetotal}}
+ {\protected@xappto\cbx@textcite@args{{\cbx@savedkeys}}%
+ \protected@xappto\cbx@footcite@args{%
+ [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}%
+ \iflastcitekey
+ {\protected@xappto\cbx@textcite@args{\thefield{postpunct}}%
+ \protected@xappto\cbx@footcite@args{\nopunct}}
+ {}}
+ {}}
+ {}
+ {}
+
+\newrobustcmd{\cbx@textcite@init}[3]{%
+ \setcounter{textcitetotal}{0}%
+ \setcounter{textcitecount}{0}%
+ \setcounter{textcitemaxnames}{0}%
+ \def\cbx@textcite@args{#1}\def\cbx@footcite@args{#2}#3%
+ \cbx@textcite@args\empty\cbx@footcite@args\empty}
-\newrobustcmd{\cbx@textcite}[2]{%
- \def\cbx@savedcites{#1}#2\cbx@savedcites}
+\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\textcites}
+ [\cbx@textcites@init\cbx@textcites\footcites]{\textcite}{}
-\DeclareMultiCiteCommand{\textcites}[\cbx@textcite\footcites]{\textcite}{\multinamedelim}
+\let\cbx@textcites@init\cbx@textcite@init
+\pretocmd{\cbx@textcites@init}{%
+ \UseNextMultiCiteHook%
+ \AtNextMultiCite{%
+ \renewbibmacro{multiprenote}{}%
+ \renewbibmacro{multipostnote}{}}}{}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx
index 70d697cfeb2..cf73b4c72e9 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx
@@ -2,10 +2,16 @@
[\abx@cbxid]
\DeclareFieldFormat{bibhyperlink}{%
- \bibhyperlink{\thefield{entrykey}:\csuse{cbx@\iffootnote{f}{t}@\thefield{entrykey}}}{#1}}
+ \bibhyperlink{%
+ \thefield{entrykey}:\csuse{cbx@\iffootnote{f}{t}@\thefield{entrykey}}}{#1}}
\DeclareFieldFormat{bibhypertarget}{%
\bibhypertarget{\thefield{entrykey}:\the\value{instcount}}{#1}}
+
\newtoggle{cbx:pageref}
+
+\renewcommand*{\iffinalcitedelim}{%
+ \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
+
\newbibmacro*{cite:citepages}{}
\newbibmacro*{cite:full:citepages}{}
\newbibmacro*{cite:postnote}{}
@@ -80,7 +86,8 @@
\setunit{\addspace}%
\printfield{postnote}}}
-\ExecuteBibliographyOptions{citetracker=context,singletitle,autocite=footnote,citepages=permit}
+\ExecuteBibliographyOptions{citetracker=context,singletitle,autocite=footnote,
+ citepages=permit}
\newbibmacro*{cite}{%
\usebibmacro{cite:citepages}%
@@ -196,17 +203,78 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\textcite}[\cbx@textcite\footcite]
- {\gdef\cbx@savedkeys{}}
- {\printnames{labelname}%
- \xappto\cbx@savedkeys{\thefield{entrykey},}}
- {\multinamedelim}
- {\protected@xappto\cbx@savedcites{%
- [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
+\newbibmacro*{textcite}{%
+ \ifnameundef{labelname}
+ {\printfield[citetitle]{labeltitle}}
+ {\printnames{labelname}}}
+
+\newbibmacro*{textcite:init}{%
+ \citetrackerfalse%
+ \pagetrackerfalse%
+ \iffirstcitekey
+ {\global\undef\cbx@lasthash}
+ {}}
+
+\newbibmacro*{textcite:count}{%
+ \stepcounter{textcitetotal}%
+ \ifnumgreater{\value{labelname}}{\value{textcitemaxnames}}
+ {\setcounter{textcitemaxnames}{\value{labelname}}}
+ {}}
+
+\DeclareCiteCommand{\cbx@textcite}
+ {\usebibmacro{textcite:init}}
+ {\iffieldequals{namehash}{\cbx@lasthash}
+ {}
+ {\iffirstcitekey
+ {}
+ {\textcitedelim}%
+ \stepcounter{textcitecount}%
+ \usebibmacro{textcite}%
+ \savefield{namehash}{\cbx@lasthash}}}
+ {}
+ {}
+
+\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite\footcite]
+ {\usebibmacro{textcite:init}%
+ \gdef\cbx@savedkeys{}%
+ \DeferNextCitekeyHook}
+ {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+ {\protected@xappto\cbx@footcite@args{%
+ (\thefield{multiprenote})(\thefield{multipostnote})}}
+ {}%
+ \xappto\cbx@savedkeys{\thefield{entrykey},}%
+ \iffieldequals{namehash}{\cbx@lasthash}
+ {}
+ {\usebibmacro{textcite:count}%
+ \savefield{namehash}{\cbx@lasthash}}%
+ \ifnumequal{\value{citecount}}{\value{citetotal}}
+ {\protected@xappto\cbx@textcite@args{{\cbx@savedkeys}}%
+ \protected@xappto\cbx@footcite@args{%
+ [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}%
+ \iflastcitekey
+ {\protected@xappto\cbx@textcite@args{\thefield{postpunct}}%
+ \protected@xappto\cbx@footcite@args{\nopunct}}
+ {}}
+ {}}
+ {}
+ {}
+
+\newrobustcmd{\cbx@textcite@init}[3]{%
+ \setcounter{textcitetotal}{0}%
+ \setcounter{textcitecount}{0}%
+ \setcounter{textcitemaxnames}{0}%
+ \def\cbx@textcite@args{#1}\def\cbx@footcite@args{#2}#3%
+ \cbx@textcite@args\empty\cbx@footcite@args\empty}
-\newrobustcmd{\cbx@textcite}[2]{%
- \def\cbx@savedcites{#1}#2\cbx@savedcites}
+\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\textcites}
+ [\cbx@textcites@init\cbx@textcites\footcites]{\textcite}{}
-\DeclareMultiCiteCommand{\textcites}[\cbx@textcite\footcites]{\textcite}{\multinamedelim}
+\let\cbx@textcites@init\cbx@textcite@init
+\pretocmd{\cbx@textcites@init}{%
+ \UseNextMultiCiteHook%
+ \AtNextMultiCite{%
+ \renewbibmacro{multiprenote}{}%
+ \renewbibmacro{multipostnote}{}}}{}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx
index 14d863c0b51..eca6a17053e 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx
@@ -2,12 +2,17 @@
[\abx@cbxid]
\InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}}
+
\DeclareFieldFormat{bibhyperlink}{%
\bibhyperlink{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}}
\DeclareFieldFormat{bibhypertarget}{%
\bibhypertarget{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}}
+
\newcommand*{\cbx@resetcount}{0}
\providecommand*{\mkibid}[1]{#1}
+\renewcommand*{\iffinalcitedelim}{%
+ \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
+
\newtoggle{cbx:ibidpage}
\newtoggle{cbx:loccit}
\newbool{cbx:noidem}
@@ -88,9 +93,8 @@
\printfield{postnote}}}
\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
- idemtracker=constrict,opcittracker=context,
- loccittracker=context,autocite=footnote,
- citepages=permit}
+ idemtracker=constrict,opcittracker=context,loccittracker=context,
+ autocite=footnote,citepages=permit}
\newbibmacro*{cite:save}{%
\csxdef{cbx@lastcite@\thefield{entrykey}}{\the\value{instcount}}%
@@ -201,17 +205,78 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\textcite}[\cbx@textcite\footcite]
- {\gdef\cbx@savedkeys{}}
- {\printnames{labelname}%
- \xappto\cbx@savedkeys{\thefield{entrykey},}}
- {\multinamedelim}
- {\protected@xappto\cbx@savedcites{%
- [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
+\newbibmacro*{textcite}{%
+ \ifnameundef{labelname}
+ {\printfield[citetitle]{labeltitle}}
+ {\printnames{labelname}}}
+
+\newbibmacro*{textcite:init}{%
+ \citetrackerfalse%
+ \pagetrackerfalse%
+ \iffirstcitekey
+ {\global\undef\cbx@lasthash}
+ {}}
+
+\newbibmacro*{textcite:count}{%
+ \stepcounter{textcitetotal}%
+ \ifnumgreater{\value{labelname}}{\value{textcitemaxnames}}
+ {\setcounter{textcitemaxnames}{\value{labelname}}}
+ {}}
+
+\DeclareCiteCommand{\cbx@textcite}
+ {\usebibmacro{textcite:init}}
+ {\iffieldequals{namehash}{\cbx@lasthash}
+ {}
+ {\iffirstcitekey
+ {}
+ {\textcitedelim}%
+ \stepcounter{textcitecount}%
+ \usebibmacro{textcite}%
+ \savefield{namehash}{\cbx@lasthash}}}
+ {}
+ {}
+
+\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite\footcite]
+ {\usebibmacro{textcite:init}%
+ \gdef\cbx@savedkeys{}%
+ \DeferNextCitekeyHook}
+ {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+ {\protected@xappto\cbx@footcite@args{%
+ (\thefield{multiprenote})(\thefield{multipostnote})}}
+ {}%
+ \xappto\cbx@savedkeys{\thefield{entrykey},}%
+ \iffieldequals{namehash}{\cbx@lasthash}
+ {}
+ {\usebibmacro{textcite:count}%
+ \savefield{namehash}{\cbx@lasthash}}%
+ \ifnumequal{\value{citecount}}{\value{citetotal}}
+ {\protected@xappto\cbx@textcite@args{{\cbx@savedkeys}}%
+ \protected@xappto\cbx@footcite@args{%
+ [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}%
+ \iflastcitekey
+ {\protected@xappto\cbx@textcite@args{\thefield{postpunct}}%
+ \protected@xappto\cbx@footcite@args{\nopunct}}
+ {}}
+ {}}
+ {}
+ {}
+
+\newrobustcmd{\cbx@textcite@init}[3]{%
+ \setcounter{textcitetotal}{0}%
+ \setcounter{textcitecount}{0}%
+ \setcounter{textcitemaxnames}{0}%
+ \def\cbx@textcite@args{#1}\def\cbx@footcite@args{#2}#3%
+ \cbx@textcite@args\empty\cbx@footcite@args\empty}
-\newrobustcmd{\cbx@textcite}[2]{%
- \def\cbx@savedcites{#1}#2\cbx@savedcites}
+\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\textcites}
+ [\cbx@textcites@init\cbx@textcites\footcites]{\textcite}{}
-\DeclareMultiCiteCommand{\textcites}[\cbx@textcite\footcites]{\textcite}{\multinamedelim}
+\let\cbx@textcites@init\cbx@textcite@init
+\pretocmd{\cbx@textcites@init}{%
+ \UseNextMultiCiteHook%
+ \AtNextMultiCite{%
+ \renewbibmacro{multiprenote}{}%
+ \renewbibmacro{multipostnote}{}}}{}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx
index c87aa5f6623..088d37dfa13 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx
@@ -2,15 +2,22 @@
[\abx@cbxid]
\InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}}
+
\DeclareFieldFormat{bibhyperlink}{%
\bibhyperlink{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}}
+
\DeclareFieldFormat{bibhypertarget}{%
\bibhypertarget{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}}
+
\newcommand*{\cbx@resetcount}{0}
\providecommand*{\mkibid}[1]{#1}
+\renewcommand*{\iffinalcitedelim}{%
+ \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
+
\newtoggle{cbx:fullcite}
\newtoggle{cbx:loccit}
\newbool{cbx:noidem}
+
\newbibmacro*{cite:citepages}{}
\newbibmacro*{cite:full:citepages}{}
\newbibmacro*{cite:postnote}{}
@@ -93,8 +100,7 @@
\printfield{postnote}}}
\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
- idemtracker=constrict,autocite=footnote,
- citepages=permit}
+ idemtracker=constrict,autocite=footnote,citepages=permit}
\newbibmacro*{cite:save}{%
\csxdef{cbx@lastcite@\thefield{entrykey}}{\the\value{instcount}}%
@@ -193,17 +199,78 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\textcite}[\cbx@textcite\footcite]
- {\gdef\cbx@savedkeys{}}
- {\printnames{labelname}%
- \xappto\cbx@savedkeys{\thefield{entrykey},}}
- {\multinamedelim}
- {\protected@xappto\cbx@savedcites{%
- [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
+\newbibmacro*{textcite}{%
+ \ifnameundef{labelname}
+ {\printfield[citetitle]{labeltitle}}
+ {\printnames{labelname}}}
+
+\newbibmacro*{textcite:init}{%
+ \citetrackerfalse%
+ \pagetrackerfalse%
+ \iffirstcitekey
+ {\global\undef\cbx@lasthash}
+ {}}
+
+\newbibmacro*{textcite:count}{%
+ \stepcounter{textcitetotal}%
+ \ifnumgreater{\value{labelname}}{\value{textcitemaxnames}}
+ {\setcounter{textcitemaxnames}{\value{labelname}}}
+ {}}
+
+\DeclareCiteCommand{\cbx@textcite}
+ {\usebibmacro{textcite:init}}
+ {\iffieldequals{namehash}{\cbx@lasthash}
+ {}
+ {\iffirstcitekey
+ {}
+ {\textcitedelim}%
+ \stepcounter{textcitecount}%
+ \usebibmacro{textcite}%
+ \savefield{namehash}{\cbx@lasthash}}}
+ {}
+ {}
+
+\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite\footcite]
+ {\usebibmacro{textcite:init}%
+ \gdef\cbx@savedkeys{}%
+ \DeferNextCitekeyHook}
+ {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+ {\protected@xappto\cbx@footcite@args{%
+ (\thefield{multiprenote})(\thefield{multipostnote})}}
+ {}%
+ \xappto\cbx@savedkeys{\thefield{entrykey},}%
+ \iffieldequals{namehash}{\cbx@lasthash}
+ {}
+ {\usebibmacro{textcite:count}%
+ \savefield{namehash}{\cbx@lasthash}}%
+ \ifnumequal{\value{citecount}}{\value{citetotal}}
+ {\protected@xappto\cbx@textcite@args{{\cbx@savedkeys}}%
+ \protected@xappto\cbx@footcite@args{%
+ [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}%
+ \iflastcitekey
+ {\protected@xappto\cbx@textcite@args{\thefield{postpunct}}%
+ \protected@xappto\cbx@footcite@args{\nopunct}}
+ {}}
+ {}}
+ {}
+ {}
+
+\newrobustcmd{\cbx@textcite@init}[3]{%
+ \setcounter{textcitetotal}{0}%
+ \setcounter{textcitecount}{0}%
+ \setcounter{textcitemaxnames}{0}%
+ \def\cbx@textcite@args{#1}\def\cbx@footcite@args{#2}#3%
+ \cbx@textcite@args\empty\cbx@footcite@args\empty}
-\newrobustcmd{\cbx@textcite}[2]{%
- \def\cbx@savedcites{#1}#2\cbx@savedcites}
+\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\textcites}
+ [\cbx@textcites@init\cbx@textcites\footcites]{\textcite}{}
-\DeclareMultiCiteCommand{\textcites}[\cbx@textcite\footcites]{\textcite}{\multinamedelim}
+\let\cbx@textcites@init\cbx@textcite@init
+\pretocmd{\cbx@textcites@init}{%
+ \UseNextMultiCiteHook%
+ \AtNextMultiCite{%
+ \renewbibmacro{multiprenote}{}%
+ \renewbibmacro{multipostnote}{}}}{}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
index 0f7cdb4a949..db9f3714719 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
@@ -2,12 +2,17 @@
[\abx@cbxid]
\InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}}
+
\DeclareFieldFormat{bibhyperlink}{%
\bibhyperlink{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}}
\DeclareFieldFormat{bibhypertarget}{%
\bibhypertarget{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}}
+
\newcommand*{\cbx@resetcount}{0}
\providecommand*{\mkibid}[1]{#1}
+\renewcommand*{\iffinalcitedelim}{%
+ \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
+
\newtoggle{cbx:loccit}
\DeclareBibliographyOption{strict}[true]{%
@@ -83,8 +88,7 @@
\printfield{postnote}}}
\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
- loccittracker=constrict,autocite=footnote,
- citepages=permit}
+ loccittracker=constrict,autocite=footnote,citepages=permit}
\newbibmacro*{cite}{%
\usebibmacro{cite:citepages}%
@@ -168,17 +172,78 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\textcite}[\cbx@textcite\footcite]
- {\gdef\cbx@savedkeys{}}
- {\printnames{labelname}%
- \xappto\cbx@savedkeys{\thefield{entrykey},}}
- {\multinamedelim}
- {\protected@xappto\cbx@savedcites{%
- [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
-
-\newrobustcmd{\cbx@textcite}[2]{%
- \def\cbx@savedcites{#1}#2\cbx@savedcites}
-
-\DeclareMultiCiteCommand{\textcites}[\cbx@textcite\footcites]{\textcite}{\multinamedelim}
+\newbibmacro*{textcite}{%
+ \ifnameundef{labelname}
+ {\printfield[citetitle]{labeltitle}}
+ {\printnames{labelname}}}
+
+\newbibmacro*{textcite:init}{%
+ \citetrackerfalse%
+ \pagetrackerfalse%
+ \iffirstcitekey
+ {\global\undef\cbx@lasthash}
+ {}}
+
+\newbibmacro*{textcite:count}{%
+ \stepcounter{textcitetotal}%
+ \ifnumgreater{\value{labelname}}{\value{textcitemaxnames}}
+ {\setcounter{textcitemaxnames}{\value{labelname}}}
+ {}}
+
+\DeclareCiteCommand{\cbx@textcite}
+ {\usebibmacro{textcite:init}}
+ {\iffieldequals{namehash}{\cbx@lasthash}
+ {}
+ {\iffirstcitekey
+ {}
+ {\textcitedelim}%
+ \stepcounter{textcitecount}%
+ \usebibmacro{textcite}%
+ \savefield{namehash}{\cbx@lasthash}}}
+ {}
+ {}
+
+\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite\footcite]
+ {\usebibmacro{textcite:init}%
+ \gdef\cbx@savedkeys{}%
+ \DeferNextCitekeyHook}
+ {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+ {\protected@xappto\cbx@footcite@args{%
+ (\thefield{multiprenote})(\thefield{multipostnote})}}
+ {}%
+ \xappto\cbx@savedkeys{\thefield{entrykey},}%
+ \iffieldequals{namehash}{\cbx@lasthash}
+ {}
+ {\usebibmacro{textcite:count}%
+ \savefield{namehash}{\cbx@lasthash}}%
+ \ifnumequal{\value{citecount}}{\value{citetotal}}
+ {\protected@xappto\cbx@textcite@args{{\cbx@savedkeys}}%
+ \protected@xappto\cbx@footcite@args{%
+ [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}%
+ \iflastcitekey
+ {\protected@xappto\cbx@textcite@args{\thefield{postpunct}}%
+ \protected@xappto\cbx@footcite@args{\nopunct}}
+ {}}
+ {}}
+ {}
+ {}
+
+\newrobustcmd{\cbx@textcite@init}[3]{%
+ \setcounter{textcitetotal}{0}%
+ \setcounter{textcitecount}{0}%
+ \setcounter{textcitemaxnames}{0}%
+ \def\cbx@textcite@args{#1}\def\cbx@footcite@args{#2}#3%
+ \cbx@textcite@args\empty\cbx@footcite@args\empty}
+
+\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\textcites}
+ [\cbx@textcites@init\cbx@textcites\footcites]{\textcite}{}
+
+\let\cbx@textcites@init\cbx@textcite@init
+\pretocmd{\cbx@textcites@init}{%
+ \UseNextMultiCiteHook%
+ \AtNextMultiCite{%
+ \renewbibmacro{multiprenote}{}%
+ \renewbibmacro{multipostnote}{}}}{}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx
index f219fb6d4d8..bced4a2337f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx
@@ -2,11 +2,16 @@
[\abx@cbxid]
\InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}}
+
\DeclareFieldFormat{bibhyperlink}{%
\bibhyperlink{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}}
\DeclareFieldFormat{bibhypertarget}{%
\bibhypertarget{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}}
+
\newcommand*{\cbx@resetcount}{0}
+\renewcommand*{\iffinalcitedelim}{%
+ \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
+
\newbibmacro*{cite:citepages}{}
\newbibmacro*{cite:full:citepages}{}
\newbibmacro*{cite:postnote}{}
@@ -62,9 +67,9 @@
test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
and
(
- not test {\iffieldundef{pages}}
- or
- not test {\iffieldundef{pagetotal}}
+ not test {\iffieldundef{pages}}
+ or
+ not test {\iffieldundef{pagetotal}}
)
}
{\usebibmacro{cite:postnote:pages}}
@@ -137,17 +142,78 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\textcite}[\cbx@textcite\footcite]
- {\gdef\cbx@savedkeys{}}
- {\printnames{labelname}%
- \xappto\cbx@savedkeys{\thefield{entrykey},}}
- {\multinamedelim}
- {\protected@xappto\cbx@savedcites{%
- [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
-
-\newrobustcmd{\cbx@textcite}[2]{%
- \def\cbx@savedcites{#1}#2\cbx@savedcites}
-
-\DeclareMultiCiteCommand{\textcites}[\cbx@textcite\footcites]{\textcite}{\multinamedelim}
+\newbibmacro*{textcite}{%
+ \ifnameundef{labelname}
+ {\printfield[citetitle]{labeltitle}}
+ {\printnames{labelname}}}
+
+\newbibmacro*{textcite:init}{%
+ \citetrackerfalse%
+ \pagetrackerfalse%
+ \iffirstcitekey
+ {\global\undef\cbx@lasthash}
+ {}}
+
+\newbibmacro*{textcite:count}{%
+ \stepcounter{textcitetotal}%
+ \ifnumgreater{\value{labelname}}{\value{textcitemaxnames}}
+ {\setcounter{textcitemaxnames}{\value{labelname}}}
+ {}}
+
+\DeclareCiteCommand{\cbx@textcite}
+ {\usebibmacro{textcite:init}}
+ {\iffieldequals{namehash}{\cbx@lasthash}
+ {}
+ {\iffirstcitekey
+ {}
+ {\textcitedelim}%
+ \stepcounter{textcitecount}%
+ \usebibmacro{textcite}%
+ \savefield{namehash}{\cbx@lasthash}}}
+ {}
+ {}
+
+\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite\footcite]
+ {\usebibmacro{textcite:init}%
+ \gdef\cbx@savedkeys{}%
+ \DeferNextCitekeyHook}
+ {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+ {\protected@xappto\cbx@footcite@args{%
+ (\thefield{multiprenote})(\thefield{multipostnote})}}
+ {}%
+ \xappto\cbx@savedkeys{\thefield{entrykey},}%
+ \iffieldequals{namehash}{\cbx@lasthash}
+ {}
+ {\usebibmacro{textcite:count}%
+ \savefield{namehash}{\cbx@lasthash}}%
+ \ifnumequal{\value{citecount}}{\value{citetotal}}
+ {\protected@xappto\cbx@textcite@args{{\cbx@savedkeys}}%
+ \protected@xappto\cbx@footcite@args{%
+ [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}%
+ \iflastcitekey
+ {\protected@xappto\cbx@textcite@args{\thefield{postpunct}}%
+ \protected@xappto\cbx@footcite@args{\nopunct}}
+ {}}
+ {}}
+ {}
+ {}
+
+\newrobustcmd{\cbx@textcite@init}[3]{%
+ \setcounter{textcitetotal}{0}%
+ \setcounter{textcitecount}{0}%
+ \setcounter{textcitemaxnames}{0}%
+ \def\cbx@textcite@args{#1}\def\cbx@footcite@args{#2}#3%
+ \cbx@textcite@args\empty\cbx@footcite@args\empty}
+
+\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\textcites}
+ [\cbx@textcites@init\cbx@textcites\footcites]{\textcite}{}
+
+\let\cbx@textcites@init\cbx@textcite@init
+\pretocmd{\cbx@textcites@init}{%
+ \UseNextMultiCiteHook%
+ \AtNextMultiCite{%
+ \renewbibmacro{multiprenote}{}%
+ \renewbibmacro{multipostnote}{}}}{}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx
index fdfce137a95..72cd517b6f4 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx
@@ -8,6 +8,7 @@
\textendash\penalty\hyphenpenalty}% breakable dash
\protected\def\bibdatedash{\bibrangedash}%
\let\finalandcomma=\empty
+ \let\finalandsemicolon=\empty
\def\mkbibordinal{\mkbibmascord}%
\protected\def\mkbibmascord#1{%
\stripzeros{#1}\textordmasculine}% \textordmasculine -> textcomp.sty
@@ -327,7 +328,7 @@
columns = {{colunas}{cols\adddot}},
line = {{linha}{l\adddot}},
lines = {{linhas}{ll\adddot}},
- nodate = {{sem\space data}{{s\adddot d\adddot}},
+ nodate = {{sem\space data}{s\adddot d\adddot}},
verse = {{verso}{v\adddot}},
verses = {{versos}{vv\adddot}},
section = {{se\c{c}\~ao}{\S}},
@@ -405,6 +406,7 @@
langitalian = {{italiano}{italiano}},
langlatin = {{latim}{latim}},
langnorwegian = {{noruegu\^es}{noruegu\^es}},
+% langpolish = {{}{}},% FIXME: missing
langportuguese = {{portugu{\^e}s}{portugu{\^e}s}},
langrussian = {{russo}{russo}},
langspanish = {{espanhol}{espanhol}},
@@ -424,6 +426,7 @@
fromitalian = {{do italiano}{do italiano}},
fromlatin = {{do latim}{do latim}},
fromnorwegian = {{do noruegu\^es}{do noruegu\^es}},
+% frompolish = {{}{}},% FIXME: missing
fromportuguese = {{do portugu{\^e}s}{do portugu{\^e}s}},
fromrussian = {{do russo}{do russo}},
fromspanish = {{do espanhol}{do espanhol}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx
index adae37126cd..085b2ea85f5 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx
@@ -7,6 +7,7 @@
\protected\def\bibrangedash{\addnbthinspace -\addnbthinspace}%
\protected\def\bibdatedash{\addnbthinspace\textendash\addhpthinspace}%
\let\finalandcomma=\empty
+ \let\finalandsemicolon=\empty
\def\mkbibordinal{\mkbibmascord}%
\protected\def\mkbibmascord#1{%
\begingroup
@@ -278,7 +279,7 @@
byeditoranin = {{edici\'o, notes i introducci\'o a cura \smartof}%
{ed.,\addabbrvspace not\adddotspace i introd\adddotspace\smartof}},
byeditoranfo = {{edici\'o, notes i pr\`oleg a cura \smartof}%
- {ed.,\addabbrvspace not\adddotspace ì pr\'ol\adddotspace\smartof}},
+ {ed.,\addabbrvspace not\adddotspace {\'\i} pr\'ol\adddotspace\smartof}},
byeditoranaf = {{edici\'o, notes i ep{\'\i}leg a cura \smartof}%
{ed.,\addabbrvspace not\adddotspace i ep\adddotspace\smartof}},
byeditortrcoin = {{edici\'o, traducci\'o \lbx@fromlang, comentaris i introducci\'o a cura \smartof}%
@@ -426,6 +427,7 @@
langitalian = {{itali\`a}{ital\adddot}},
langlatin = {{llat{\'\i}}{llat{\'\i}}},
langnorwegian = {{noruec}{noruec}},
+% langpolish = {{}{}},% FIXME: missing
langportuguese = {{portugu\`es}{port\adddot}},
langrussian = {{rus}{rus}},
langspanish = {{castell\`a}{cast\adddot}},
@@ -445,6 +447,7 @@
fromitalian = {{de l'itali\`a}{de l'ital\adddot}},
fromlatin = {{del llat{\'\i}}{del llat{\'\i}}},
fromnorwegian = {{del noruec}{del noruec}},
+% frompolish = {{}{}},% FIXME: missing
fromportuguese = {{del portugu\`es}{del port\adddot}},
fromrussian = {{del rus}{del rus}},
fromspanish = {{del castell\`a}{del cast\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx
index 9edca35358c..d009faf02b7 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx
@@ -11,6 +11,7 @@
\protected\def\bibrangedash{\textendash\penalty\hyphenpenalty}%
\protected\def\bibdatedash{\addnbthinspace\textendash\addhpthinspace}%
\let\finalandcomma=\empty
+ \let\finalandsemicolon=\empty
\protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}%
\protected\def\mkbibmascord{\mkbibordinal}%
\protected\def\mkbibfemord{\mkbibordinal}%
@@ -437,6 +438,7 @@
langitalian = {{talijanski}{talijanski}},
langlatin = {{latinski}{latinski}},
langnorwegian = {{norve\v{s}ki}{norve\v{s}ki}},
+% langpolish = {{}{}},% FIXME: missing
langportuguese = {{portugalski}{portugalski}},
% langrussian = {{}{}},% FIXME: missing
langspanish = {{\v{s}panjolski}{\v{s}panjolski}},
@@ -456,6 +458,7 @@
fromitalian = {{s talijanskog}{s talijanskog}},
fromlatin = {{s latinskog}{s latinskog}},
fromnorwegian = {{s norve\v{s}kog}{s norve\v{s}kog}},
+% frompolish = {{}{}},% FIXME: missing
fromportuguese = {{s portugalskog}{s portugalskog}},
% fromrussian = {{}{}},% FIXME: missing
fromspanish = {{sa \v{s}panjolskog}{sa \v{s}panjolskog}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx
index f84f020fc3e..0e0af3f90a3 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx
@@ -8,6 +8,7 @@
\protected\def\bibdatedash{%
\textemdash\penalty\hyphenpenalty}% breakable dash
\let\finalandcomma=\empty
+ \let\finalandsemicolon=\empty
\protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}%
\protected\def\mkbibmascord{\mkbibordinal}%
\protected\def\mkbibfemord{\mkbibordinal}%
@@ -348,6 +349,7 @@
langitalian = {{ital\v{s}tina}{ital\adddot}},
langlatin = {{latina}{lat\adddot}},
langnorwegian = {{nor\v{s}tina}{nor\v{s}\adddot}},
+% langpolish = {{}{}},% FIXME: missing
langportuguese = {{portugal\v{s}tina}{port\adddot}},
langspanish = {{\v{s}pan\v{e}l\v{s}tina}{\v{s}pa\v{n}\adddot}},
langswedish = {{\v{s}v\'{e}d\v{s}tina}{\v{s}v\'{e}d\adddot}},
@@ -366,6 +368,7 @@
fromitalian = {{z ital\v{s}tiny}{z ital\adddot}},
fromlatin = {{z latiny}{z lat\adddot}},
fromnorwegian = {{z nor\v{s}tiny}{z nor\adddot}},
+% frompolish = {{}{}},% FIXME: missing
fromportuguese = {{z portugal\v{s}tiny}{z portugal\v{s}tiny}},
fromspanish = {{ze \v{s}pan\v{e}l\v{s}tiny}{ze \v{s}pa\v{n}\adddot}},
fromswedish = {{ze \v{s}v\'{e}d\v{s}tiny}{ze \v{s}v\'{e}d\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
index 583b70f34a6..ca68c709adc 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
@@ -8,6 +8,7 @@
\textendash\penalty\hyphenpenalty}% breakable dash
\protected\def\bibdatedash{\bibrangedash}%
\let\finalandcomma=\empty
+ \let\finalandsemicolon=\empty
\protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}%
\protected\def\mkbibmascord{\mkbibordinal}%
\protected\def\mkbibfemord{\mkbibordinal}%
@@ -346,6 +347,7 @@
langitalian = {{italiensk}{italiensk}},
langlatin = {{latin}{latin}},
langnorwegian = {{norsk}{norsk}},
+% langpolish = {{}{}},% FIXME: missing
% langportuguese = {{}{}},% FIXME: missing
% langrussian = {{}{}},% FIXME: missing
langspanish = {{spansk}{spansk}},
@@ -365,6 +367,7 @@
fromitalian = {{fra italiensk}{fra italiensk}},
fromlatin = {{fra latin}{fra latin}},
fromnorwegian = {{fra norsk}{fra norsk}},
+% frompolish = {{}{}},% FIXME: missing
% fromportuguese = {{}{}},% FIXME: missing
% fromrussian = {{}{}},% FIXME: missing
fromspanish = {{fra spansk}{fra spansk}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
index 4a2afbf0687..46594e2374a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
@@ -12,6 +12,7 @@
\textendash\penalty\hyphenpenalty}% breakable dash
\protected\def\bibdatedash{\bibrangedash}%
\let\finalandcomma=\empty
+ \let\finalandsemicolon=\empty
% both ordinal numbers are valid, the first is the most basic: 1e, 2e, 19e
% whereas the second is capable of typesetting 1ste, 2de, 21ste, 102de
% \protected\def\mkbibordinal#1{\stripzeros{#1}e}%
@@ -417,6 +418,7 @@
langitalian = {{Italiaans}{Italiaans}},
langlatin = {{Latijn}{Latijn}},
langnorwegian = {{Noors}{Noors}},
+% langpolish = {{}{}},% FIXME: missing
langportuguese = {{Portugees}{Portugees}},
% langrussian = {{}{}},% FIXME: missing
langspanish = {{Spaans}{Spaans}},
@@ -436,6 +438,7 @@
fromitalian = {{uit het Italiaans}{uit het Italiaans}},
fromlatin = {{uit het Latijn}{uit het Latijn}},
fromnorwegian = {{uit het Noors}{uit het Noors}},
+% frompolish = {{}{}},% FIXME: missing
fromportuguese = {{uit het Portugees}{uit het Portugees}},
% fromrussian = {{}{}},% FIXME: missing
fromspanish = {{uit het Spaans}{uit het Spaans}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
index 8e3fef482c5..a3183327a1f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
@@ -9,6 +9,7 @@ canadian,australian,newzealand,USenglish,UKenglish}
\textendash\penalty\hyphenpenalty}% breakable dash
\protected\def\bibdatedash{\bibrangedash}%
\def\finalandcomma{\addcomma}%
+ \def\finalandsemicolon{\addsemicolon}%
\protected\def\mkbibordinal#1{%
\begingroup
\@tempcnta0#1\relax\number\@tempcnta
@@ -431,6 +432,7 @@ canadian,australian,newzealand,USenglish,UKenglish}
langitalian = {{Italian}{Italian}},
langlatin = {{Latin}{Latin}},
langnorwegian = {{Norwegian}{Norwegian}},
+ langpolish = {{Polish}{Polish}},
langportuguese = {{Portuguese}{Portuguese}},
langrussian = {{Russian}{Russian}},
langspanish = {{Spanish}{Spanish}},
@@ -450,6 +452,7 @@ canadian,australian,newzealand,USenglish,UKenglish}
fromitalian = {{from the Italian}{from the Italian}},
fromlatin = {{from the Latin}{from the Latin}},
fromnorwegian = {{from the Norwegian}{from the Norwegian}},
+ frompolish = {{from the Polish}{from the Polish}},
fromportuguese = {{from the Portuguese}{from the Portuguese}},
fromrussian = {{from the Russian}{from the Russian}},
fromspanish = {{from the Spanish}{from the Spanish}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
index bb8000bf566..41eb5ad9ed3 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
@@ -15,6 +15,7 @@
\textendash\penalty\hyphenpenalty}% breakable dash
\protected\def\bibdatedash{\bibrangedash}%
\let\finalandcomma=\empty
+ \let\finalandsemicolon=\empty
\protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}%
\protected\def\mkbibmascord{\mkbibordinal}%
\protected\def\mkbibfemord{\mkbibordinal}%
@@ -103,7 +104,7 @@
{toimittaneet ja kommentaarin kirjoittaneet}},
editoran = {{toimittanut ja selityksin varustanut}% FIXME: unsure
{toimittanut ja selityksin varustanut}},
- editorsan = {{toimittaneet ja selityksin varustaneet,% FIXME: unsure
+ editorsan = {{toimittaneet ja selityksin varustaneet}% FIXME: unsure
{toimittaneet ja selityksin varustaneet}},
editorin = {{toimittanut ja johdannon kirjoittanut}%
{toimittanut ja johdannon kirjoittanut}},
@@ -425,6 +426,7 @@
langitalian = {{italia}{italia}},
langlatin = {{latina}{latina}},
langnorwegian = {{norja}{norja}},
+% langpolish = {{}{}},% FIXME: missing
langportuguese = {{portugali}{portugali}},
% langrussian = {{}{}},% FIXME: missing
langspanish = {{espanja}{espanja}},
@@ -444,6 +446,7 @@
fromitalian = {{italian kielest\"a}{italian kielest\"a}},
fromlatin = {{latinan kielest\"a}{latinan kielest\"a}},
fromnorwegian = {{norjan kielest\"a}{norjan kielest\"a}},
+% frompolish = {{}{}},% FIXME: missing
fromportuguese = {{portugalin kielest\"a}{portugalin kielest\"a}},
% fromrussian = {{}{}},% FIXME: missing
fromspanish = {{espanjan kielest\"a}{espanjan kielest\"a}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
index ce546a6db5a..9a4e048c644 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
@@ -10,6 +10,7 @@
\textendash\penalty\hyphenpenalty}% breakable dash
\protected\def\bibdatedash{\bibrangedash}%
\let\finalandcomma=\empty
+ \let\finalandsemicolon=\empty
\def\mkbibordinal{\mkbibmascord}%
\protected\def\mkbibmascord{\lbx@fr@ordinal{er}}%
\protected\def\mkbibfemord{\lbx@fr@ordinal{re}}%
@@ -19,8 +20,8 @@
{}
{\stripzeros{\thefield{#3}}%
\ifnumequal{\thefield{#3}}{1}
- {\textsuperscript{er}}
- {}%
+ {\textsuperscript{er}}
+ {}%
\iffieldundef{#2}{}{\nobreakspace}}%
\iffieldundef{#2}
{}
@@ -381,7 +382,7 @@
submitted = {{soumis}{soumis}},
forthcoming = {{\`a para\^{\i}tre}{\`a para\adddot}},
inpress = {{sous presse}{sous presse}},
- prepublished = {{pr\'epublié}{pr\'epubl\adddot}},
+ prepublished = {{pr\'epubli\'e}{pr\'epubl\adddot}},
citedas = {{d\'esign\'e ci-apr\`es par}{ci-apr\`es}},
thiscite = {{sp\'ecialement}{sp\'ec\adddot}},
seenote = {{voir note}{cf\adddotspace note}},
@@ -419,9 +420,9 @@
december = {{d\'ecembre}{d\'ec\adddot}},
langamerican = {{am\'ericain}{am\'ericain}},
langbrazilian = {{br\'esilien}{br\'esilien}},
-% langcatalan = {{}{}},% FIXME: missing
+ langcatalan = {{catalan}{catalan}},
langcroatian = {{croate}{croate}},
-% langczech = {{}{}},% FIXME: missing
+ langczech = {{tch\`eque}{tch\`eque}},
langdanish = {{danois}{danois}},
langdutch = {{n\'eerlandais}{n\'eerlandais}},
langenglish = {{anglais}{anglais}},
@@ -432,15 +433,16 @@
langitalian = {{italien}{italien}},
langlatin = {{latin}{latin}},
langnorwegian = {{norv\'egien}{norv\'egien}},
+% langpolish = {{}{}},% FIXME: missing
langportuguese = {{portugais}{portugais}},
langrussian = {{russe}{russe}},
langspanish = {{espagnol}{espagnol}},
langswedish = {{su\'edois}{su\'edois}},
fromamerican = {{de l'am\'ericain}{de l'am\'ericain}},
frombrazilian = {{du br\'esilien}{du br\'esilien}},
-% fromcatalan = {{}{}},% FIXME: missing
+ fromcatalan = {{du catalan}{du catalan}},
fromcroatian = {{du croate}{du croate}},
-% fromczech = {{}{}},% FIXME: missing
+ fromczech = {{du tch\`eque}{du tch\`eque}},
fromdanish = {{du danois}{du danois}},
fromdutch = {{du n\'eerlandais}{du n\'eerlandais}},
fromenglish = {{de l'anglais}{de l'anglais}},
@@ -451,6 +453,7 @@
fromitalian = {{de l'italien}{de l'italien}},
fromlatin = {{du latin}{du latin}},
fromnorwegian = {{du norv\'egien}{du norv\'egien}},
+% frompolish = {{}{}},% FIXME: missing
fromportuguese = {{du portugais}{du portugais}},
fromrussian = {{du russe}{du russe}},
fromspanish = {{de l'espagnol}{de l'espagnol}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
index 6e159da04ec..3f96968dd86 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
@@ -9,6 +9,7 @@
\textendash\penalty\hyphenpenalty}% breakable dash
\protected\def\bibdatedash{\bibrangedash}%
\let\finalandcomma=\empty
+ \let\finalandsemicolon=\empty
\protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}%
\protected\def\mkbibmascord{\mkbibordinal}%
\protected\def\mkbibfemord{\mkbibordinal}%
@@ -413,6 +414,7 @@
langitalian = {{Italienisch}{Italienisch}},
langlatin = {{Lateinisch}{Lateinisch}},
langnorwegian = {{Norwegisch}{Norwegisch}},
+% langpolish = {{}{}},% FIXME: missing
langportuguese = {{Portugiesisch}{Portugiesisch}},
langrussian = {{Russisch}{Russisch}},
langspanish = {{Spanisch}{Spanisch}},
@@ -432,6 +434,7 @@
fromitalian = {{aus dem Italienischen}{aus dem Italienischen}},
fromlatin = {{aus dem Lateinischen}{aus dem Lateinischen}},
fromnorwegian = {{aus dem Norwegischen}{aus dem Norwegischen}},
+% frompolish = {{}{}},% FIXME: missing
fromportuguese = {{aus dem Portugiesischen}{aus dem Portugiesischen}},
fromrussian = {{aus dem Russischen}{aus dem Russischen}},
fromspanish = {{aus dem Spanischen}{aus dem Spanischen}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
index 0e0f91f8bbc..733bdf60c68 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
@@ -45,6 +45,7 @@
\textendash\penalty\hyphenpenalty}% breakable dash
\protected\def\bibdatedash{\bibrangedash}%
\let\finalandcomma=\empty
+ \let\finalandsemicolon=\empty
\protected\def\mkbibordinal{\mkbibmascord}%
\protected\def\mkbibmascord#1{\stripzeros{#1}ος}%
\protected\def\mkbibfemord#1{\stripzeros{#1}η}%
@@ -439,6 +440,7 @@
langitalian = {{Ιταλικά}{Ιταλικά}},
langlatin = {{Λατινικά}{Λατινικά}},
langnorwegian = {{Νορβηγικά}{Νορβηγικά}},
+% langpolish = {{}{}},% FIXME: missing
langportuguese = {{Πορτογαλικά}{Πορτογαλικά}},
% langrussian = {{}{}},% FIXME: missing
langspanish = {{Ισπανικά}{Ισπανικά}},
@@ -458,6 +460,7 @@
fromitalian = {{από τα Ιταλικά}{από τα Ιταλικά}},
fromlatin = {{από τα Λατινικά}{από τα Λατινικά}},
fromnorwegian = {{από τα Νορβηγικά}{από τα Νορβηγικά}},
+% frompolish = {{}{}},% FIXME: missing
fromportuguese = {{από τα Πορτογαλικά}{από τα Πορτογαλικά}},
% fromrussian = {{}{}},% FIXME: missing
fromspanish = {{από τα Ισπανικά}{από τα Ισπανικά}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx
index 671347cba54..958bea1bd86 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx
@@ -15,6 +15,7 @@
\textendash\penalty\hyphenpenalty}% breakable dash
\protected\def\bibdatedash{\bibrangedash}%
\let\finalandcomma=\empty
+ \let\finalandsemicolon=\empty
\protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}%
\protected\def\mkbibmascord{\mkbibordinal}%
\protected\def\mkbibfemord{\mkbibordinal}%
@@ -355,6 +356,7 @@
langitalian = {{\'{\i}talska}{\'{\i}talska}},
langlatin = {{lat\'{\i}na}{lat\'{\i}na}},
langnorwegian = {{norska}{norska}},
+% langpolish = {{}{}},% FIXME: missing
% langportuguese = {{}{}},% FIXME: missing
% langrussian = {{}{}},% FIXME: missing
langspanish = {{sp\ae{}nska}{sp\ae{}nska}},
@@ -374,6 +376,7 @@
fromitalian = {{\'ur \'{\i}t\"olsku}{\'ur \'{\i}t\"olsku}},
fromlatin = {{\'ur lat\'{\i}nu}{\'ur lat\'{\i}nu}},
fromnorwegian = {{\'ur norsku}{\'ur norsku}},
+% frompolish = {{}{}},% FIXME: missing
% fromportuguese = {{}{}},% FIXME: missing
% fromrussian = {{}{}},% FIXME: missing
fromspanish = {{\'ur sp\ae{}nsku}{\'ur sp\ae{}nsku}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
index 95e74f1b3b2..9aec79f97f9 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
@@ -8,6 +8,7 @@
\textendash\penalty\hyphenpenalty}% breakable dash
\protected\def\bibdatedash{\bibrangedash}%
\let\finalandcomma=\empty
+ \let\finalandsemicolon=\empty
\def\mkbibordinal{\mkbibmascord}%
\protected\def\mkbibmascord#1{\stripzeros{#1}\textsuperscript{o}}%
\protected\def\mkbibfemord#1{\stripzeros{#1}\textsuperscript{a}}%
@@ -338,6 +339,7 @@
langitalian = {{italiano}{italiano}},
langlatin = {{latino}{latino}},
langnorwegian = {{norvegese}{norvegese}},
+% langpolish = {{}{}},% FIXME: missing
langportuguese = {{portoghese}{portoghese}},
% langrussian = {{}{}},% FIXME: missing
langspanish = {{spagnolo}{spagnolo}},
@@ -357,6 +359,7 @@
fromitalian = {{dall'italiano}{dall'italiano}},
fromlatin = {{dal latino}{dal latino}},
fromnorwegian = {{dal norvegese}{dal norvegese}},
+% frompolish = {{}{}},% FIXME: missing
fromportuguese = {{dall portoghese}{dall portoghese}},
% fromrussian = {{}{}},% FIXME: missing
fromspanish = {{dallo spagnolo}{dallo spagnolo}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
index 438c9603afe..c0dcebbc578 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
@@ -8,6 +8,7 @@
\textendash\penalty\hyphenpenalty}% breakable dash
\protected\def\bibdatedash{\bibrangedash}%
\let\finalandcomma=\empty
+ \let\finalandsemicolon=\empty
\protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}%
\protected\def\mkbibmascord{\mkbibordinal}%
\protected\def\mkbibfemord{\mkbibordinal}%
@@ -394,6 +395,7 @@
langitalian = {{italiensk}{italiensk}},
langlatin = {{latin}{latin}},
langnorwegian = {{norsk}{norsk}},
+% langpolish = {{}{}},% FIXME: missing
langportuguese = {{portugisisk}{portugisisk}},
langrussian = {{russisk}{russisk}},
langspanish = {{spansk}{spansk}},
@@ -413,6 +415,7 @@
fromitalian = {{fra italiensk}{fra italiensk}},
fromlatin = {{fra latin}{fra latin}},
fromnorwegian = {{fra norsk}{fra norsk}},
+% frompolish = {{}{}},% FIXME: missing
fromportuguese = {{fra portugisisk}{fra portugisisk}},
fromrussian = {{fra russisk}{fra russisk}},
fromspanish = {{fra spansk}{fra spansk}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
index a47628ac04e..d642d0caa38 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
@@ -278,6 +278,7 @@
fromitalian = {{fr{\aa} italiensk}{fr{\aa} italiensk}},
fromlatin = {{fr{\aa} latin}{fr{\aa} latin}},
fromnorwegian = {{fr{\aa} norsk}{fr{\aa} norsk}},
+% frompolish = {{}{}},% FIXME: missing
fromportuguese = {{fr{\aa} portugisisk}{fr{\aa} portugisisk}},
fromrussian = {{fr{\aa} russisk}{fr{\aa} russisk}},
fromspanish = {{fr{\aa} spansk}{fr{\aa} spansk}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx
index d60051ab629..483f4a87739 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx
@@ -1,497 +1,500 @@
-\ProvidesFile{polish.lbx}
-[\abx@lbxid]
-
-\DeclareRedundantLanguages{polish}{polish}
-
-\DeclareBibliographyExtras{%
- \protected\def\bibrangedash{\textendash\penalty\hyphenpenalty}%
- \protected\def\bibdatedash{\addnbthinspace\textendash\addhpthinspace}%
- \let\finalandcomma=\empty
- \protected\def\mkbibordinal#1{\stripzeros{#1}}%
- \protected\def\mkbibmascord{\mkbibordinal}%
- \protected\def\mkbibfemord{\mkbibordinal}%
- \protected\def\mkbibneutord{\mkbibordinal}%
- \protected\def\mkbibdatelong#1#2#3{%
- \iffieldundef{#3}
- {}
- {\mkbibordinal{\thefield{#3}}%
- \iffieldundef{#2}{}{\nobreakspace}}%
- \iffieldundef{#2}
- {}
- {\iffieldundef{#3}
- {\mkbibmonth{\thefield{#2}}}
- {\lbx@pl@mkbibmonth{\thefield{#2}}}%
- \iffieldundef{#1}{}{\space}}%
- \iffieldbibstring{#1}
- {\bibstring{\thefield{#1}}}
- {\stripzeros{\thefield{#1}}}}%
- \protected\def\mkbibdateshort#1#2#3{%
- \iffieldundef{#3}
- {}
- {\mkdatezeros{\thefield{#3}}\adddot
- \iffieldundef{#2}{}{\thinspace}}%
- \iffieldundef{#2}
- {}
- {\mkdatezeros{\thefield{#2}}%
- \iffieldundef{#1}
- {}
- {\iffieldundef{#3}{/}{\adddot\thinspace}}}%
- \iffieldbibstring{#1}
- {\bibstring{\thefield{#1}}}
- {\mkdatezeros{\thefield{#1}}}}%
- \savecommand\mkbibordedition
- \savecommand\mkbibordseries
- \def\mkbibordedition{\mkbibneutord}%
- \def\mkbibordseries{\mkbibfemord}%
-}
-
-\UndeclareBibliographyExtras{%
- \restorecommand\mkbibordedition
- \restorecommand\mkbibordseries
-}
-
-\NewBibliographyString{% Month name variants used after day
- datejanuary,
- datefebruary,
- datemarch,
- dateapril,
- datemay,
- datejune,
- datejuly,
- dateaugust,
- dateseptember,
- dateoctober,
- datenovember,
- datedecember%
-}
-
-\DeclareBibliographyStrings{%
- bibliography = {{Bibliografia}{Bibliografia}},
- references = {{Bibliografia}{Bibliografia}},
- shorthands = {{lista skr\'{o}t\'{o}w}{skr\'{o}ty}},
- editor = {{edytor}{red\adddot}},% FIXME: unsure
- editors = {{edytory}{red\adddot}},% FIXME: unsure
- compiler = {{wykonawca}{ed\adddot}},% FIXME: unsure
- compilers = {{wykonawcy}{ed\adddot}},% FIXME: unsure
- redactor = {{redaktor}{red\adddot}},
- redactors = {{redaktorzy}{red\adddot}},
- reviser = {{korektor}{kor\adddot}},
- revisers = {{korektorzy}{kor\adddot}},
- founder = {{za\l o\.{z}yciel}{za\l \adddot}},
- founders = {{za\l o\.{z}yciele}{za\l \adddot}},
- continuator = {{nast\c{e}pca}{nast\adddot}},
- continuators = {{nast\c{e}pcy}{nast\adddot}},
- collaborator = {{uczestnik}{ucz\adddot}},
- collaborators = {{uczestnicy}{ucz\adddot}},
- translator = {{t\l umacz}{t\l um\adddot}},
- translators = {{t\l umacze}{t\l um\adddot}},
- commentator = {{komentator}{kom\adddot}},
- commentators = {{komentatory}{kom\adddot}},
- annotator = {{uwaga}{uw\adddot}},
- annotators = {{uwagi}{uw\adddot}},
- commentary = {{komentarz}{kom\adddot}},
- annotations = {{komentarze}{kom\adddot}},
- introduction = {{wst\c{e}p}{wst\adddot}},
- foreword = {{przedmowa}{przedm\adddot}},
- afterword = {{pos\l owie}{pos\l \adddot}},
- editortr = {{redaktor i t\l umacz}{red\adddotspace i per\adddot}},
- editorstr = {{redaktory i t\l umacze}{red\adddotspace i per\adddot}},
- editorco = {{redaktor i komentator}{red\adddotspace i kom\adddot}},
- editorsco = {{redaktory i komentatorowie}%
- {red\adddotspace i kom\adddot}},% FIXME: check
- editoran = {{redaktor i autor uwag}%
- {red\adddotspace i aut\adddotspace uw\adddot}},
- editorsan = {{redaktorzy i autorzy uwag}%
- {red\adddotspace i aut\adddotspace uw\adddot}},
- editorin = {{redaktor i autor wst\c{e}pu}%
- {red\adddotspace i aut\adddotspace wst\adddot}},
- editorsin = {{redaktorzy i autorzy wst\c{e}pu}%
- {red\adddotspace i aut\adddotspace wst\adddot}},
- editorfo = {{redaktor i autor przedmowy}%
- {red\adddotspace i aut\adddotspace przedm\adddot}},
- editorsfo = {{redaktorzy i autorzy przedmowy}%
- {red\adddotspace i aut\adddotspace przedm\adddot}},
- editoraf = {{redaktor i autor pos\l owia}%
- {red\adddotspace i aut\adddotspace pos\l \adddot}},
- editorsaf = {{redaktorzy i autorzy pos\l owia}%
- {red\adddotspace i aut\adddotspace pos\l \adddot}},
- editortrco = {{redaktor, t\l umacz i komentator}%
- {red., t\l um\adddotspace i kom\adddot}},
- editorstrco = {{redaktorzy, t\l umacze i komentatory}%
- {red., t\l um\adddotspace i kom\adddot}},
- editortran = {{redaktor, t\l umacz i autor uwag}%
- {red., t\l um\adddotspace i aut\adddotspace uw\adddot}},
- editorstran = {{redaktorzy, t\l umacze i autorzy uwag}%
- {red., t\l um\adddotspace i aut\adddotspace uw\adddot}},
- editortrin = {{redaktor, t\l umacz i autor wst\c{e}pu}%
- {red., t\l um\adddotspace i aut\adddotspace wst\adddot}},
- editorstrin = {{redaktorzy, t\l umacze i autorzy wst\c{e}pu}%
- {red., t\l um\adddotspace i aut\adddotspace wst\adddot}},
- editortrfo = {{redaktor, t\l umacz i autor przedmowy}%
- {red., t\l um\adddotspace i aut\adddotspace przedm\adddot}},
- editorstrfo = {{redaktorzy, t\l umacze i autorzy przedmowy}%
- {red., t\l um\adddotspace i aut\adddotspace przedm\adddot}},
- editortraf = {{redaktor, t\l umacz i autor pos\l owia}%
- {red., t\l um\adddotspace i aut\adddotspace pos\l \adddot}},
- editorstraf = {{redaktorzy, t\l umacze i autorzy pos\l owia}%
- {red., t\l um\adddotspace i aut\adddotspace pos\l \adddot}},
- editorcoin = {{redaktor, komentator i autor wst\c{e}pu}%
- {red., kom\adddotspace i aut\adddotspace wst\adddot}},
- editorscoin = {{redaktorzy, komentatorzy i autorzy wst\c{e}pu}%
- {red., kom\adddotspace i aut\adddotspace wst\adddot}},
- editorcofo = {{redaktor, komentator i autor przedmowy}%
- {red., kom\adddotspace i aut\adddotspace przedm\adddot}},
- editorscofo = {{redaktorzy, komentatorzy i autorzy przedmowy}%
- {red., kom\adddotspace i aut\adddotspace przedm\adddot}},
- editorcoaf = {{redaktor, komentator i autor pos\l owia}%
- {red., kom\adddotspace i aut\adddotspace pos\l \adddot}},
- editorscoaf = {{redaktorzy, komentatorzy i autorzy pos\l owia}%
- {red., kom\adddotspace i aut\adddotspace pos\l \adddot}},
- editoranin = {{redaktor, autor uwag i autor wst\c{e}pu}%
- {red., aut\adddotspace uw\adddotspace i aut\adddotspace wst\adddot}},
- editorsanin = {{redaktorzy, autorzy uwag i autorzy wst\c{e}pu}%
- {red., aut\adddotspace uw\adddotspace i aut\adddotspace wst\adddot}},
- editoranfo = {{redaktor, autor uwag i autor przedmowy}%
- {red., aut\adddotspace uw\adddotspace i aut\adddotspace przedm\adddot}},
- editorsanfo = {{redaktorzy, autorzy uwag i autorzy przedmowy}%
- {red., aut\adddotspace uw\adddotspace i aut\adddotspace przedm\adddot}},
- editoranaf = {{redaktor, autor uwag i autor pos\l owia}%
- {red., aut\adddotspace uw\adddotspace i aut\adddotspace pos\l \adddot}},
- editorsanaf = {{redaktorzy, autorzy uwag i autorzy pos\l owia}%
- {red., aut\adddotspace uw\adddotspace i aut\adddotspace pos\l \adddot}},
- editortrcoin = {{redaktor, t\l umacz, komentator i autor wst\c{e}pu}%
- {red., t\l um., kom\adddotspace i aut\adddotspace wst\adddot}},
- editorstrcoin = {{redaktorzy, t\l umacze, komentatorzy i autorzy wst\c{e}pu}%
- {red., t\l um., kom\adddotspace i aut\adddotspace wst\adddot}},
- editortrcofo = {{redaktor, t\l umacz, komentator i autor przedmowy}%
- {red., t\l um., kom\adddotspace i aut\adddotspace przedm\adddot}},
- editorstrcofo = {{redaktorzy, t\l umacze, komentatorzy i autorzy przedmowy}%
- {red., t\l um., kom\adddotspace i aut\adddotspace przedm\adddot}},
- editortrcoaf = {{redaktor, t\l umacz, komentator i autor pos\l owia}%
- {red., t\l um., kom\adddotspace i aut\adddotspace pos\l \adddot}},
- editorstrcoaf = {{redaktorzy, t\l umacze, komentatorzy i autorzy pos\l owia}%
- {red., t\l um., kom\adddotspace i aut\adddotspace pos\l \adddot}},
- editortranin = {{redaktor, t\l umacz, autor uwag i autor wst\c{e}pu}%
- {red., t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace wst\adddot}},
- editorstranin = {{redaktorzy, t\l umacze, autorzy uwag i autorzy wst\c{e}pu}%
- {red., t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace wst\adddot}},
- editortranfo = {{redaktor, t\l umacz, autor uwag i autor przedmowy}%
- {red., t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace przedm\adddot}},
- editorstranfo = {{redaktorzy, t\l umacze, autorzy uwag i autorzy przedmowy}%
- {red., t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace przedm\adddot}},
- editortranaf = {{redaktor, t\l umacz, autor uwag i autor pos\l owia}%
- {red., t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace pos\l \adddot}},
- editorstranaf = {{redaktorzy, t\l umacze, autorzy uwag i autorzy pos\l owia}%
- {red., t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace pos\l \adddot}},
- translatorco = {{t\l umacz i komentator}{t\l um\adddotspace i kom\adddot}},
- translatorsco = {{t\l umacze i komentatorzy}{t\l um\adddotspace i kom\adddot}},
- translatoran = {{t\l umacz i autor uwag}%
- {t\l um\adddotspace i aut\adddotspace uw\adddot}},
- translatorsan = {{t\l umacze i autorzy uwag}%
- {t\l um\adddotspace i aut\adddotspace uw\adddot}},
- translatorin = {{t\l umacz i autor wst\c{e}pu}%
- {t\l um\adddotspace i aut\adddotspace wst\adddot}},
- translatorsin = {{t\l umacze i autorzy wst\c{e}pu}%
- {t\l um\adddotspace i aut\adddotspace wst\adddot}},
- translatorfo = {{t\l umacz i autor przedmowy}%
- {t\l um\adddotspace i aut\adddotspace przedm\adddot}},
- translatorsfo = {{t\l umacze i autorzy przedmowy}%
- {t\l um\adddotspace i aut\adddotspace przedm\adddot}},
- translatoraf = {{t\l umacz i autor pos\l owia}%
- {t\l um\adddotspace i aut\adddotspace pos\l \adddot}},
- translatorsaf = {{t\l umacze i autorzy pos\l owia}%
- {t\l um\adddotspace i aut\adddotspace pos\l \adddot}},
- translatorcoin = {{t\l umacz, autor uwag i autor wst\c{e}pu}%
- {t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace wst\adddot}},
- translatorscoin = {{t\l umacze, autorzy uwag i autorzy wst\c{e}pu}%
- {t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace wst\adddot}},
- translatorcofo = {{t\l umacz, autor uwag i autor przedmowy}%
- {t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace przedm\adddot}},
- translatorscofo = {{t\l umacze, autorzy uwag i autorzy przedmowy}%
- {t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace przedm\adddot}},
- translatorcoaf = {{t\l umacz, autor uwag i autor pos\l owia}%
- {t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace pos\l \adddot}},
- translatorscoaf = {{t\l umacze, autorzy uwag i autorzy posowia}%
- {t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace pos\l \adddot}},
- translatoranin = {{t\l umacz, autor uwag i autor wst\c{e}pu}%
- {t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace wst\adddot}},
- translatorsanin = {{t\l umacze, autorzy uwag i autorzy wst\c{e}pu}%
- {t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace wst\adddot}},
- translatoranfo = {{t\l umacz, autor komentarzy i autor wst\c{e}pu}%
- {t\l um., aut\adddotspace kom\adddotspace i aut\adddotspace wst\adddot}},
- translatorsanfo = {{t\l umacze, autorzy komentarzy i autorzy przedmowy}%
- {t\l um., aut\adddotspace kom\adddotspace i aut\adddotspace przedm\adddot}},
- translatoranaf = {{t\l umacz, autor komentarzy i autor pos\l owia}%
- {t\l um., aut\adddotspace kom\adddotspace i aut\adddotspace pos\l \adddot}},
- translatorsanaf = {{t\l umacze, autorzy komentarzy i autorzy pos\l owia}%
- {t\l um., aut\adddotspace kom\adddotspace i aut\adddotspace pos\l \adddot}},
- byauthor = {{autorstwo}{aut\adddot}},% FIXME: unsure
- byeditor = {{wyedytowano}{wyed\adddot}},% FIXME: unsure
- bycompiler = {{wykonano}{wyk\adddot}},% FIXME: unsure
- byredactor = {{zredagowano}{zred\adddot}},
- byreviser = {{poprawione}{popr\adddot}},
- byreviewer = {{recenzja}{rec\adddot}},
- byfounder = {{za\l o\.{z}one}{za\l \adddot}},
- bycontinuator = {{przej\c{e}te}{przej\adddot}},
- bycollaborator = {{przy wsp\'{o}\l pracy}{przy wsp\adddot}},
- bytranslator = {{t\l umaczenie \lbx@lfromlang}{t\l um\adddotspace \lbx@sfromlang}},
- bycommentator = {{skomentowane przez}{skom\adddot}},
- byannotator = {{uwagi od}{uw\adddot}},
- withcommentator = {{komentarze}{kom\adddot}},
- withannotator = {{uwagi}{uw\adddot}},
- withintroduction = {{wst\c{e}p}{wst\adddot}},
- withforeword = {{przedmowa}{przedm\adddot}},
- withafterword = {{pos\l owie}{pos\l \adddot}},
- byeditortr = {{t\l umaczenie \lbx@lfromlang, zredagowany przez}%
- {t\l um\adddotspace \lbx@sfromlang, zred\adddotspace przez}},
- byeditorco = {{zredagowany i skomentowany przez}%
- {zred\adddotspace i skom\adddotspace przez}},
- byeditoran = {{zredagowany i z uwagami}{zredag\adddotspace i z uw\adddot}},
- byeditorin = {{zredagowany, z wst\c{e}pem}{zred., z wst\adddot}},
- byeditorfo = {{zredagowany, z przedmow\c{a}}{zred., z przedm\adddot}},
- byeditoraf = {{zredagowany, z pos\l owiem}{zred., z pos\l \adddot}},
- byeditortrco = {{zredagowany, t\l umaczenie \lbx@lfromlang i komentarze }%
- {zred., t\l um\adddotspace \lbx@sfromlang i kom\adddot}},
- byeditortran = {{zredagowany, t\l umaczenie \lbx@lfromlang i uwagi}%
- {zred., t\l um\adddotspace \lbx@sfromlang i uw\adddot}},% FIXME: check
- byeditortrin = {{zredagowany, t\l umaczenie \lbx@lfromlang, wst\c{e}p}%
- {zred., t\l um\adddotspace \lbx@sfromlang, wst\adddot}},
- byeditortrfo = {{zredagowany, t\l umaczenie \lbx@lfromlang, przedmowa}%
- {zred., t\l um\adddotspace \lbx@sfromlang, przedm\adddot}},
- byeditortraf = {{zredagowany, t\l umaczenie \lbx@lfromlang, pos\l owie}%
- {zred\adddotspace t\l um\adddotspace \lbx@sfromlang, pos\l \adddot}},
- byeditorcoin = {{zredagowany, komentarze i wst\c{e}p}{zred., kom\adddotspace i wst\adddot}},
- byeditorcofo = {{zredagowany, komentarze i przedmowa}{zred., kom\adddotspace i przedm\adddot}},
- byeditorcoaf = {{zredagowany, komentarze i pos\l owie}{zred., kom\adddotspace i pos\l \adddot}},
- byeditoranin = {{zredagowany, uwagi i wst\c{e}p}{zred., uw\adddotspace i wst\adddot}},
- byeditoranfo = {{zredagowany, uwagi i przedmowa}{zred., uw\adddotspace i przedm\adddot}},
- byeditoranaf = {{zredagowany, uwagi i pos\l owie}{zred., uw\adddotspace i pos\l \adddot}},
- byeditortrcoin = {{zredagowany, t\l umaczenie \lbx@lfromlang, komentarze i wst\c{e}p}%
- {zred., t\l um\adddotspace \lbx@sfromlang, kom\adddotspace i wst\c{e}p\adddot}},
- byeditortrcofo = {{zredagowany, t\l umaczenie \lbx@lfromlang, komentarze i przedmowa}%
- {zred., t\l um\adddotspace \lbx@sfromlang, kom\adddotspace i przedm\adddot}},
- byeditortrcoaf = {{zredagowany, t\l umaczenie \lbx@lfromlang, komentarze i pos\l owie}%
- {zred., t\l um\adddotspace \lbx@sfromlang, kom\adddotspace i pos\l \adddot}},
- byeditortranin = {{zredagowany, t\l umaczenie \lbx@lfromlang, uwagi i wst\c{e}p}%
- {zred., t\l um\adddotspace \lbx@sfromlang, uw\adddotspace i wst\adddot}},
- byeditortranfo = {{zredagowany, t\l umaczenie \lbx@lfromlang, uwagi i przedmowa}%
- {zred., t\l um\adddotspace \lbx@sfromlang, uw\adddotspace i przedm\adddot}},
- byeditortranaf = {{zredagowany, t\l umaczenie \lbx@lfromlang, uwagi i pos\l owie}%
- {zred., t\l um\adddotspace \lbx@sfromlang, uw\adddotspace i pos\l \adddot}},
- bytranslatorco = {{t\l umaczenie \lbx@lfromlang i komentarze}%
- {t\l um\adddotspace \lbx@sfromlang i kom\adddot}},
- bytranslatoran = {{t\l umaczenie \lbx@lfromlang i uwagi}%
- {t\l um\adddotspace \lbx@sfromlang i uw\adddot}},
- bytranslatorin = {{t\l umaczenie \lbx@lfromlang i wst\c{e}p}%
- {t\l um\adddotspace \lbx@sfromlang i wst\adddot}},
- bytranslatorfo = {{t\l umaczenie \lbx@lfromlang i przedmowa}%
- {t\l um\adddotspace \lbx@sfromlang i przedm\adddot}},
- bytranslatoraf = {{t\l umaczenie \lbx@lfromlang i pos\l owie}%
- {t\l um\adddotspace \lbx@sfromlang i pos\l \adddot}},
- bytranslatorcoin = {{t\l umaczenie \lbx@lfromlang, komentarze i wst\c{e}p}%
- {t\l um\adddotspace \lbx@sfromlang, kom\adddotspace i wst\adddot}},
- bytranslatorcofo = {{t\l umaczenie \lbx@lfromlang, komentarze i przedmowa}%
- {t\l um\adddotspace \lbx@sfromlang, kom\adddotspace i przedm\adddot}},
- bytranslatorcoaf = {{t\l umaczenie \lbx@lfromlang, komentarze i pos\l owie}%
- {t\l um\adddotspace \lbx@sfromlang, kom\adddotspace i pos\l \adddot}},
- bytranslatoranin = {{t\l umaczenie \lbx@lfromlang, uwagi i wst\c{e}p}%
- {t\l um\adddotspace \lbx@sfromlang, uw\adddotspace i wst\adddot}},
- bytranslatoranfo = {{t\l umaczenie \lbx@lfromlang, uwagi i przedmowa}%
- {t\l um\adddotspace \lbx@sfromlang, uw\adddotspace i przedm\adddot}},
- bytranslatoranaf = {{t\l umaczenie \lbx@lfromlang, uwagi i pos\l owie}%
- {t\l um\adddotspace \lbx@sfromlang, uw\adddotspace i pos\l \adddot}},
- and = {{i}{i}},
- andothers = {{i inni}{i in\adddot}},
- andmore = {{i dalej}{i dal\adddot}}, %FIXME: unsure
- volume = {{tom}{t\adddot}},
- volumes = {{tomy}{t\adddot}},
- involumes = {{w}{w}},
- jourvol = {{tom}{t\adddot}},
- jourser = {{serja}{ser\adddot}},
- book = {{ksi\c{a}\.{z}ka}{ks\adddot}},
- part = {{cz\c{e}\'{s}\'{c}}{cz\adddot}},
- issue = {{wydanie}{wyd\adddot}},% FIXME: unsure,
- newseries = {{nowa serja}{now\adddotspace ser\adddot}},
- oldseries = {{stara serja}{star\adddotspace ser\adddot}},
- edition = {{wydruk}{wydr\adddot}},% FIXME: unsure
- reprint = {{przedruk}{przedr\adddot}},
- reprintof = {{przedruk}{przedr\adddot}},
- reprintas = {{przedrukowano jako}{przedr\adddotspace jako}},
- reprintfrom = {{przedrukowano z}{przedr\adddotspace z}},
- translationof = {{t\l umaczenie}{t\l um\adddot}},
- translationas = {{t\l umaczenie jako}{t\l um\adddotspace jako}},
- translationfrom = {{t\l umaczenie z}{t\l um\adddotspace z}},
- reviewof = {{recenzja na\addcolon}{rec\adddotspace na\addcolon}},
- origpubas = {{orginalnie wydano jako}%
- {org\adddotspace wyd\adddotspace jako}},
- origpubin = {{orginalnie wydano w}{org\adddotspace wyd\adddotspace w}},
- astitle = {{pod tytu\l em}{pod tyt\adddot}},
- bypublisher = {{przez wydawc\c{e}}{prz\adddotspace wyd\adddot}},
- page = {{strona}{s\adddot}},
- pages = {{strony}{s\adddot}},
- column = {{kolumna}{kol\adddot}},
- columns = {{kolumny}{kol\adddot}},
- line = {{linijka}{l\adddot}},
- lines = {{linijki}{l\adddot}},
- nodate = {{no date}{n\adddot d\adddot}},% FIXME
- verse = {{werset}{wer\adddot}},
- verses = {{wersety}{wer\adddot}},
- section = {{paragraf}{par\adddot}},% FIXME: check
- sections = {{paragrafy}{par\adddot}},% FIXME: check
- paragraph = {{akapit}{aka\adddot}},
- paragraphs = {{akapity}{aka\adddot}},
- in = {{w}{w}},
- inseries = {{w}{w}},
- ofseries = {{z}{z}},
- number = {{numer}{nr\adddot}},% FIXME: check
- chapter = {{rozdzia\l }{rozd\adddot}},
- mathesis = {{praca magisterska}{prac\adddotspace mag\adddot}},
- phdthesis = {{praca doktorska}{prac\adddotspace dokt\adddot}},
- candthesis = {{praca kandydacka}%
- {prac\adddotspace kand\adddot}},% FIXME: unsure
- resreport = {{sprawozdanie naukowe}{spraw\adddotspace nau\adddot}},
- techreport = {{sprawozdanie techniczne}{spraw\adddotspace tech\adddot}},
- software = {{oprogramowanie}{opr\adddot}},
- datacd = {{CD-ROM}{CD-ROM}},
- audiocd = {{audio CD}{audio CD}},
- version = {{wersja}{wer\adddot}},
- url = {{adres}{adr\adddot}},
-% urlfrom = {{}{}},% FIXME: missing
- urlseen = {{termin wizyty}{term\adddotspace wiz\adddot}},
- inpreparation = {{przygotowanie}{przyg\adddot}},
- submitted = {{prezentacja}{prez\adddot}},
- forthcoming = {{przygotowanie}{przyg\adddot}},% FIXME: unsure
- inpress = {{wydrukowane}{wydruk\adddot}},
- prepublished = {{przedwydanie}{przedw\adddot}},
- citedas = {{cytowane dalej jako}{cyt\adddotspace dal\adddotspace jako}},
- thiscite = {{tutaj}{tut\adddot}},
- seenote = {{patrz uwag\c{e}}{patrz uw\adddot}},
- quotedin = {{cytat wed\l ug}{cyt\adddotspace wg\adddot}},
- idem = {{ten\.{z}e}{ten\.{z}e}},
- idemsm = {{ten\.{z}e}{ten\.{z}e}},
- idemsf = {{ta\.{z} sama}{ta\.{z} sama}},
- idemsn = {{ten sam}{ten sam}},
- idempm = {{ci sami}{ci sami}},
- idempf = {{ci sami}{ci sami}},
- idempn = {{ci sami}{ci sami}},
- idempp = {{ci sami}{ci sami}},
- ibidem = {{tam\.{z}e}{tam\.{z}e}},
- opcit = {{praca cytowana}{prac\adddotspace cyt\adddot}},
- loccit = {{miejsce cytowane}{miej\adddotspace cyt\adddot}},
- confer = {{por\'{o}wnaj}{por\adddot}},
- sequens = {{i nast\c{e}pna}{i nast\adddot}},
- sequentes = {{i nast\c{e}pni}{i nast\adddot}},
- passim = {{wsz\c{e}dzie}{wsz\c{e}dzie}},
- see = {{patrz}{p\adddot}},
- seealso = {{ratrz r\'{o}wnie\.{z}}{p\adddotspace r\'{o}wn\adddot}},
- backrefpage = {{cytowane na stronie}{cyt\adddotspace na s\adddot}},
- backrefpages = {{cytowane na stronach}{cyt\adddotspace na s\adddot}},
- january = {{stycze\'{n}}{sty\adddot}},
- february = {{luty}{lut\adddot}},
- march = {{marzec}{mar\adddot}},
- april = {{kwiecie\'{n}}{kw\adddot}},
- may = {{maj}{maj}},
- june = {{czerwiec}{czer\adddot}},
- july = {{lipiec}{lip\adddot}},
- august = {{sierpie\'{n}}{sierp\adddot}},
- september = {{wrzesie\'{n}}{wrz\adddot}},
- october = {{pa\'{z}dziernik}{pa\'{z}\adddot}},
- november = {{listopad}{list\adddot}},
- december = {{grudzie\'{n}}{grud\adddot}},
- datejanuary = {{stycznia}{sty\adddot}},
- datefebruary = {{lutego}{lut\adddot}},
- datemarch = {{marca}{mar\adddot}},
- dateapril = {{kwietnia}{kw\adddot}},
- datemay = {{maja}{maj\adddot}},
- datejune = {{czerwca}{czer\adddot}},
- datejuly = {{lipca}{lip\adddot}},
- dateaugust = {{sierpnia}{sierp\adddot}},
- dateseptember = {{wrze\'{s}nia}{wrz\adddot}},
- dateoctober = {{pa\'{z}dziernika}{pa\'{z}\adddot}},
- datenovember = {{listopada}{list\adddot}},
- datedecember = {{grudnia}{grud\adddot}},
- langamerican = {{ameryka\'{n}ski}{ameryka\'{n}ski}},
- langbrazilian = {{brazylijski}{brazylijski}},
-% langcatalan = {{}{}},% FIXME: missing
- langcroatian = {{chorwacki}{chorwacki}},
-% langczech = {{}{}},% FIXME: missing
- langdanish = {{du\'{n}ski}{du\'{n}ski}},
- langdutch = {{holenderski}{holenderski}},
- langenglish = {{angielski}{angielski}},
- langfinnish = {{fi\'{n}ski}{fi\'{n}ski}},
- langfrench = {{francuski}{francuski}},
- langgerman = {{niemiecki}{niemiecki}},
- langgreek = {{grecki}{grecki}},
- langitalian = {{w\l oski}{w\l oski}},
- langlatin = {{\l acina}{\l acina}},
- langnorwegian = {{norweski}{norweski}},
- langportuguese = {{portugalski}{portugalski}},
- langrussian = {{rosyjski}{rosyjski}},
- langspanish = {{hiszpa\'{n}ski}{hiszpa\'{n}ski}},
- langswedish = {{szwedzki}{szwedzki}},
- fromamerican = {{z ameryka\'{n}skiego}{z amer\adddot}},
- frombrazilian = {{z brazylijskiego}{z braz\adddot}},
-% fromcatalan = {{}{}},% FIXME: missing
- fromcroatian = {{z chorwackiego}{z chorw\adddot}},
-% fromczech = {{}{}},% FIXME: missing
- fromdanish = {{z du\'{n}skiego}{z du\'{n}\adddot}},
- fromdutch = {{z niderla\'{n}skiego}{z nid\adddot}},
- fromenglish = {{z angielskiego}{z ang\adddot}},
- fromfinnish = {{z fi\'{n}skiego}{z fi\'{n}\adddot}},
- fromfrench = {{z francuzkiego}{z fran\adddot}},
- fromgerman = {{z niemieckiego}{z niem\adddot}},
- fromgreek = {{z greckiego}{z grec\adddot}},
- fromitalian = {{z w\l oskiego}{z w\l os\adddot}},
- fromlatin = {{z \l aciny}{z \l at\adddot}},
- fromnorwegian = {{z norweskiego}{z norw\adddot}},
- fromportuguese = {{z portugalskiego}{z port\adddot}},
- fromrussian = {{z rosyjskiego}{z ros\adddot}},
- fromspanish = {{z hiszpa\'{n}skiego}{z hiszp\adddot}},
- fromswedish = {{ze szwedskiego}{ze szw\adddot}},
- countryde = {{Niemcy}{DE}},
- countryeu = {{Unia Europejska}{EU}},
- countryep = {{Unia Europejska}{EP}},
- countryfr = {{Francja}{FR}},
- countryuk = {{Wielka Brytania}{GB}},
- countryus = {{Stany Zjednoczone Ameryki}{US}},
- patent = {{patent}{pat\adddot}},
- patentde = {{patent Niemiec}{pat\adddotspace Niemiec}},
- patenteu = {{patent Europy}{pat\adddotspace Europy}},
- patentfr = {{patent Francji}{pat\adddotspace Francji}},
- patentuk = {{patent Wielkiej Brytanji}{pat\adddotspace Wielkiej Brytanji}},
- patentus = {{patent USA}{pat\adddotspace USA}},
- patreq = {{podanie na patent}{podanie na pat\adddot}},
- patreqde = {{podanie na patent Niemiec}%
- {podanie na pat\adddotspace Niemiec}},
- patreqeu = {{podanie na patent Europy}{podanie na pat\adddotspace Europy}},
- patreqfr = {{podanie na patent Francji}%
- {podanie na pat\adddotspace Francji}},
- patrequk = {{podanie na patent Wielkiej Brytanji}%
- {podanie na pat\adddotspace Wielkiej Brytanji}},
- patrequs = {{podanie na patent USA}{podanie na pat\adddotspace USA}},
- file = {{plik}{plik}},
- library = {{bibloteka}{bibl\adddot}},
- abstract = {{podsumowanie}{pod\adddot}},
- annotation = {{adnotacja}{adn\adddot}},
-}
-
-\protected\gdef\lbx@pl@mkbibmonth#1{%
- \ifcase0#1\relax
- #1\BibliographyWarning{Month out of range}%
- \or\abx@bibmonth{datejanuary}%
- \or\abx@bibmonth{datefebruary}%
- \or\abx@bibmonth{datemarch}%
- \or\abx@bibmonth{dateapril}%
- \or\abx@bibmonth{datemay}%
- \or\abx@bibmonth{datejune}%
- \or\abx@bibmonth{datejuly}%
- \or\abx@bibmonth{dateaugust}%
- \or\abx@bibmonth{dateseptember}%
- \or\abx@bibmonth{dateoctober}%
- \or\abx@bibmonth{datenovember}%
- \or\abx@bibmonth{datedecember}%
- \else
- #1\BibliographyWarning{Month out of range}%
- \fi}%
-
-\endinput
+\ProvidesFile{polish.lbx}
+[\abx@lbxid]
+
+\DeclareRedundantLanguages{polish}{polish}
+
+\DeclareBibliographyExtras{%
+ \protected\def\bibrangedash{\textendash\penalty\hyphenpenalty}%
+ \protected\def\bibdatedash{\addnbthinspace\textendash\addhpthinspace}%
+ \let\finalandcomma=\empty
+ \let\finalandsemicolon=\empty
+ \protected\def\mkbibordinal#1{\stripzeros{#1}}%
+ \protected\def\mkbibmascord{\mkbibordinal}%
+ \protected\def\mkbibfemord{\mkbibordinal}%
+ \protected\def\mkbibneutord{\mkbibordinal}%
+ \protected\def\mkbibdatelong#1#2#3{%
+ \iffieldundef{#3}
+ {}
+ {\mkbibordinal{\thefield{#3}}%
+ \iffieldundef{#2}{}{\nobreakspace}}%
+ \iffieldundef{#2}
+ {}
+ {\iffieldundef{#3}
+ {\mkbibmonth{\thefield{#2}}}
+ {\lbx@pl@mkbibmonth{\thefield{#2}}}%
+ \iffieldundef{#1}{}{\space}}%
+ \iffieldbibstring{#1}
+ {\bibstring{\thefield{#1}}}
+ {\stripzeros{\thefield{#1}}}}%
+ \protected\def\mkbibdateshort#1#2#3{%
+ \iffieldundef{#3}
+ {}
+ {\mkdatezeros{\thefield{#3}}\adddot
+ \iffieldundef{#2}{}{\thinspace}}%
+ \iffieldundef{#2}
+ {}
+ {\mkdatezeros{\thefield{#2}}%
+ \iffieldundef{#1}
+ {}
+ {\iffieldundef{#3}{/}{\adddot\thinspace}}}%
+ \iffieldbibstring{#1}
+ {\bibstring{\thefield{#1}}}
+ {\mkdatezeros{\thefield{#1}}}}%
+ \savecommand\mkbibordedition
+ \savecommand\mkbibordseries
+ \def\mkbibordedition{\mkbibneutord}%
+ \def\mkbibordseries{\mkbibfemord}%
+}
+
+\UndeclareBibliographyExtras{%
+ \restorecommand\mkbibordedition
+ \restorecommand\mkbibordseries
+}
+
+\NewBibliographyString{% Month name variants used after day
+ datejanuary,
+ datefebruary,
+ datemarch,
+ dateapril,
+ datemay,
+ datejune,
+ datejuly,
+ dateaugust,
+ dateseptember,
+ dateoctober,
+ datenovember,
+ datedecember%
+}
+
+\DeclareBibliographyStrings{%
+ bibliography = {{Bibliografia}{Bibliografia}},
+ references = {{Bibliografia}{Bibliografia}},
+ shorthands = {{lista skr\'{o}t\'{o}w}{skr\'{o}ty}},
+ editor = {{edytor}{red\adddot}},% FIXME: unsure
+ editors = {{edytory}{red\adddot}},% FIXME: unsure
+ compiler = {{wykonawca}{ed\adddot}},% FIXME: unsure
+ compilers = {{wykonawcy}{ed\adddot}},% FIXME: unsure
+ redactor = {{redaktor}{red\adddot}},
+ redactors = {{redaktorzy}{red\adddot}},
+ reviser = {{korektor}{kor\adddot}},
+ revisers = {{korektorzy}{kor\adddot}},
+ founder = {{za\l o\.{z}yciel}{za\l \adddot}},
+ founders = {{za\l o\.{z}yciele}{za\l \adddot}},
+ continuator = {{nast\c{e}pca}{nast\adddot}},
+ continuators = {{nast\c{e}pcy}{nast\adddot}},
+ collaborator = {{uczestnik}{ucz\adddot}},
+ collaborators = {{uczestnicy}{ucz\adddot}},
+ translator = {{t\l umacz}{t\l um\adddot}},
+ translators = {{t\l umacze}{t\l um\adddot}},
+ commentator = {{komentator}{kom\adddot}},
+ commentators = {{komentatory}{kom\adddot}},
+ annotator = {{uwaga}{uw\adddot}},
+ annotators = {{uwagi}{uw\adddot}},
+ commentary = {{komentarz}{kom\adddot}},
+ annotations = {{komentarze}{kom\adddot}},
+ introduction = {{wst\c{e}p}{wst\adddot}},
+ foreword = {{przedmowa}{przedm\adddot}},
+ afterword = {{pos\l owie}{pos\l \adddot}},
+ editortr = {{redaktor i t\l umacz}{red\adddotspace i per\adddot}},
+ editorstr = {{redaktory i t\l umacze}{red\adddotspace i per\adddot}},
+ editorco = {{redaktor i komentator}{red\adddotspace i kom\adddot}},
+ editorsco = {{redaktory i komentatorowie}%
+ {red\adddotspace i kom\adddot}},% FIXME: check
+ editoran = {{redaktor i autor uwag}%
+ {red\adddotspace i aut\adddotspace uw\adddot}},
+ editorsan = {{redaktorzy i autorzy uwag}%
+ {red\adddotspace i aut\adddotspace uw\adddot}},
+ editorin = {{redaktor i autor wst\c{e}pu}%
+ {red\adddotspace i aut\adddotspace wst\adddot}},
+ editorsin = {{redaktorzy i autorzy wst\c{e}pu}%
+ {red\adddotspace i aut\adddotspace wst\adddot}},
+ editorfo = {{redaktor i autor przedmowy}%
+ {red\adddotspace i aut\adddotspace przedm\adddot}},
+ editorsfo = {{redaktorzy i autorzy przedmowy}%
+ {red\adddotspace i aut\adddotspace przedm\adddot}},
+ editoraf = {{redaktor i autor pos\l owia}%
+ {red\adddotspace i aut\adddotspace pos\l \adddot}},
+ editorsaf = {{redaktorzy i autorzy pos\l owia}%
+ {red\adddotspace i aut\adddotspace pos\l \adddot}},
+ editortrco = {{redaktor, t\l umacz i komentator}%
+ {red., t\l um\adddotspace i kom\adddot}},
+ editorstrco = {{redaktorzy, t\l umacze i komentatory}%
+ {red., t\l um\adddotspace i kom\adddot}},
+ editortran = {{redaktor, t\l umacz i autor uwag}%
+ {red., t\l um\adddotspace i aut\adddotspace uw\adddot}},
+ editorstran = {{redaktorzy, t\l umacze i autorzy uwag}%
+ {red., t\l um\adddotspace i aut\adddotspace uw\adddot}},
+ editortrin = {{redaktor, t\l umacz i autor wst\c{e}pu}%
+ {red., t\l um\adddotspace i aut\adddotspace wst\adddot}},
+ editorstrin = {{redaktorzy, t\l umacze i autorzy wst\c{e}pu}%
+ {red., t\l um\adddotspace i aut\adddotspace wst\adddot}},
+ editortrfo = {{redaktor, t\l umacz i autor przedmowy}%
+ {red., t\l um\adddotspace i aut\adddotspace przedm\adddot}},
+ editorstrfo = {{redaktorzy, t\l umacze i autorzy przedmowy}%
+ {red., t\l um\adddotspace i aut\adddotspace przedm\adddot}},
+ editortraf = {{redaktor, t\l umacz i autor pos\l owia}%
+ {red., t\l um\adddotspace i aut\adddotspace pos\l \adddot}},
+ editorstraf = {{redaktorzy, t\l umacze i autorzy pos\l owia}%
+ {red., t\l um\adddotspace i aut\adddotspace pos\l \adddot}},
+ editorcoin = {{redaktor, komentator i autor wst\c{e}pu}%
+ {red., kom\adddotspace i aut\adddotspace wst\adddot}},
+ editorscoin = {{redaktorzy, komentatorzy i autorzy wst\c{e}pu}%
+ {red., kom\adddotspace i aut\adddotspace wst\adddot}},
+ editorcofo = {{redaktor, komentator i autor przedmowy}%
+ {red., kom\adddotspace i aut\adddotspace przedm\adddot}},
+ editorscofo = {{redaktorzy, komentatorzy i autorzy przedmowy}%
+ {red., kom\adddotspace i aut\adddotspace przedm\adddot}},
+ editorcoaf = {{redaktor, komentator i autor pos\l owia}%
+ {red., kom\adddotspace i aut\adddotspace pos\l \adddot}},
+ editorscoaf = {{redaktorzy, komentatorzy i autorzy pos\l owia}%
+ {red., kom\adddotspace i aut\adddotspace pos\l \adddot}},
+ editoranin = {{redaktor, autor uwag i autor wst\c{e}pu}%
+ {red., aut\adddotspace uw\adddotspace i aut\adddotspace wst\adddot}},
+ editorsanin = {{redaktorzy, autorzy uwag i autorzy wst\c{e}pu}%
+ {red., aut\adddotspace uw\adddotspace i aut\adddotspace wst\adddot}},
+ editoranfo = {{redaktor, autor uwag i autor przedmowy}%
+ {red., aut\adddotspace uw\adddotspace i aut\adddotspace przedm\adddot}},
+ editorsanfo = {{redaktorzy, autorzy uwag i autorzy przedmowy}%
+ {red., aut\adddotspace uw\adddotspace i aut\adddotspace przedm\adddot}},
+ editoranaf = {{redaktor, autor uwag i autor pos\l owia}%
+ {red., aut\adddotspace uw\adddotspace i aut\adddotspace pos\l \adddot}},
+ editorsanaf = {{redaktorzy, autorzy uwag i autorzy pos\l owia}%
+ {red., aut\adddotspace uw\adddotspace i aut\adddotspace pos\l \adddot}},
+ editortrcoin = {{redaktor, t\l umacz, komentator i autor wst\c{e}pu}%
+ {red., t\l um., kom\adddotspace i aut\adddotspace wst\adddot}},
+ editorstrcoin = {{redaktorzy, t\l umacze, komentatorzy i autorzy wst\c{e}pu}%
+ {red., t\l um., kom\adddotspace i aut\adddotspace wst\adddot}},
+ editortrcofo = {{redaktor, t\l umacz, komentator i autor przedmowy}%
+ {red., t\l um., kom\adddotspace i aut\adddotspace przedm\adddot}},
+ editorstrcofo = {{redaktorzy, t\l umacze, komentatorzy i autorzy przedmowy}%
+ {red., t\l um., kom\adddotspace i aut\adddotspace przedm\adddot}},
+ editortrcoaf = {{redaktor, t\l umacz, komentator i autor pos\l owia}%
+ {red., t\l um., kom\adddotspace i aut\adddotspace pos\l \adddot}},
+ editorstrcoaf = {{redaktorzy, t\l umacze, komentatorzy i autorzy pos\l owia}%
+ {red., t\l um., kom\adddotspace i aut\adddotspace pos\l \adddot}},
+ editortranin = {{redaktor, t\l umacz, autor uwag i autor wst\c{e}pu}%
+ {red., t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace wst\adddot}},
+ editorstranin = {{redaktorzy, t\l umacze, autorzy uwag i autorzy wst\c{e}pu}%
+ {red., t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace wst\adddot}},
+ editortranfo = {{redaktor, t\l umacz, autor uwag i autor przedmowy}%
+ {red., t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace przedm\adddot}},
+ editorstranfo = {{redaktorzy, t\l umacze, autorzy uwag i autorzy przedmowy}%
+ {red., t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace przedm\adddot}},
+ editortranaf = {{redaktor, t\l umacz, autor uwag i autor pos\l owia}%
+ {red., t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace pos\l \adddot}},
+ editorstranaf = {{redaktorzy, t\l umacze, autorzy uwag i autorzy pos\l owia}%
+ {red., t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace pos\l \adddot}},
+ translatorco = {{t\l umacz i komentator}{t\l um\adddotspace i kom\adddot}},
+ translatorsco = {{t\l umacze i komentatorzy}{t\l um\adddotspace i kom\adddot}},
+ translatoran = {{t\l umacz i autor uwag}%
+ {t\l um\adddotspace i aut\adddotspace uw\adddot}},
+ translatorsan = {{t\l umacze i autorzy uwag}%
+ {t\l um\adddotspace i aut\adddotspace uw\adddot}},
+ translatorin = {{t\l umacz i autor wst\c{e}pu}%
+ {t\l um\adddotspace i aut\adddotspace wst\adddot}},
+ translatorsin = {{t\l umacze i autorzy wst\c{e}pu}%
+ {t\l um\adddotspace i aut\adddotspace wst\adddot}},
+ translatorfo = {{t\l umacz i autor przedmowy}%
+ {t\l um\adddotspace i aut\adddotspace przedm\adddot}},
+ translatorsfo = {{t\l umacze i autorzy przedmowy}%
+ {t\l um\adddotspace i aut\adddotspace przedm\adddot}},
+ translatoraf = {{t\l umacz i autor pos\l owia}%
+ {t\l um\adddotspace i aut\adddotspace pos\l \adddot}},
+ translatorsaf = {{t\l umacze i autorzy pos\l owia}%
+ {t\l um\adddotspace i aut\adddotspace pos\l \adddot}},
+ translatorcoin = {{t\l umacz, autor uwag i autor wst\c{e}pu}%
+ {t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace wst\adddot}},
+ translatorscoin = {{t\l umacze, autorzy uwag i autorzy wst\c{e}pu}%
+ {t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace wst\adddot}},
+ translatorcofo = {{t\l umacz, autor uwag i autor przedmowy}%
+ {t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace przedm\adddot}},
+ translatorscofo = {{t\l umacze, autorzy uwag i autorzy przedmowy}%
+ {t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace przedm\adddot}},
+ translatorcoaf = {{t\l umacz, autor uwag i autor pos\l owia}%
+ {t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace pos\l \adddot}},
+ translatorscoaf = {{t\l umacze, autorzy uwag i autorzy posowia}%
+ {t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace pos\l \adddot}},
+ translatoranin = {{t\l umacz, autor uwag i autor wst\c{e}pu}%
+ {t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace wst\adddot}},
+ translatorsanin = {{t\l umacze, autorzy uwag i autorzy wst\c{e}pu}%
+ {t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace wst\adddot}},
+ translatoranfo = {{t\l umacz, autor komentarzy i autor wst\c{e}pu}%
+ {t\l um., aut\adddotspace kom\adddotspace i aut\adddotspace wst\adddot}},
+ translatorsanfo = {{t\l umacze, autorzy komentarzy i autorzy przedmowy}%
+ {t\l um., aut\adddotspace kom\adddotspace i aut\adddotspace przedm\adddot}},
+ translatoranaf = {{t\l umacz, autor komentarzy i autor pos\l owia}%
+ {t\l um., aut\adddotspace kom\adddotspace i aut\adddotspace pos\l \adddot}},
+ translatorsanaf = {{t\l umacze, autorzy komentarzy i autorzy pos\l owia}%
+ {t\l um., aut\adddotspace kom\adddotspace i aut\adddotspace pos\l \adddot}},
+ byauthor = {{autorstwo}{aut\adddot}},% FIXME: unsure
+ byeditor = {{wyedytowano}{wyed\adddot}},% FIXME: unsure
+ bycompiler = {{wykonano}{wyk\adddot}},% FIXME: unsure
+ byredactor = {{zredagowano}{zred\adddot}},
+ byreviser = {{poprawione}{popr\adddot}},
+ byreviewer = {{recenzja}{rec\adddot}},
+ byfounder = {{za\l o\.{z}one}{za\l \adddot}},
+ bycontinuator = {{przej\c{e}te}{przej\adddot}},
+ bycollaborator = {{przy wsp\'{o}\l pracy}{przy wsp\adddot}},
+ bytranslator = {{t\l umaczenie \lbx@lfromlang}{t\l um\adddotspace \lbx@sfromlang}},
+ bycommentator = {{skomentowane przez}{skom\adddot}},
+ byannotator = {{uwagi od}{uw\adddot}},
+ withcommentator = {{komentarze}{kom\adddot}},
+ withannotator = {{uwagi}{uw\adddot}},
+ withintroduction = {{wst\c{e}p}{wst\adddot}},
+ withforeword = {{przedmowa}{przedm\adddot}},
+ withafterword = {{pos\l owie}{pos\l \adddot}},
+ byeditortr = {{t\l umaczenie \lbx@lfromlang, zredagowany przez}%
+ {t\l um\adddotspace \lbx@sfromlang, zred\adddotspace przez}},
+ byeditorco = {{zredagowany i skomentowany przez}%
+ {zred\adddotspace i skom\adddotspace przez}},
+ byeditoran = {{zredagowany i z uwagami}{zredag\adddotspace i z uw\adddot}},
+ byeditorin = {{zredagowany, z wst\c{e}pem}{zred., z wst\adddot}},
+ byeditorfo = {{zredagowany, z przedmow\c{a}}{zred., z przedm\adddot}},
+ byeditoraf = {{zredagowany, z pos\l owiem}{zred., z pos\l \adddot}},
+ byeditortrco = {{zredagowany, t\l umaczenie \lbx@lfromlang i komentarze }%
+ {zred., t\l um\adddotspace \lbx@sfromlang i kom\adddot}},
+ byeditortran = {{zredagowany, t\l umaczenie \lbx@lfromlang i uwagi}%
+ {zred., t\l um\adddotspace \lbx@sfromlang i uw\adddot}},% FIXME: check
+ byeditortrin = {{zredagowany, t\l umaczenie \lbx@lfromlang, wst\c{e}p}%
+ {zred., t\l um\adddotspace \lbx@sfromlang, wst\adddot}},
+ byeditortrfo = {{zredagowany, t\l umaczenie \lbx@lfromlang, przedmowa}%
+ {zred., t\l um\adddotspace \lbx@sfromlang, przedm\adddot}},
+ byeditortraf = {{zredagowany, t\l umaczenie \lbx@lfromlang, pos\l owie}%
+ {zred\adddotspace t\l um\adddotspace \lbx@sfromlang, pos\l \adddot}},
+ byeditorcoin = {{zredagowany, komentarze i wst\c{e}p}{zred., kom\adddotspace i wst\adddot}},
+ byeditorcofo = {{zredagowany, komentarze i przedmowa}{zred., kom\adddotspace i przedm\adddot}},
+ byeditorcoaf = {{zredagowany, komentarze i pos\l owie}{zred., kom\adddotspace i pos\l \adddot}},
+ byeditoranin = {{zredagowany, uwagi i wst\c{e}p}{zred., uw\adddotspace i wst\adddot}},
+ byeditoranfo = {{zredagowany, uwagi i przedmowa}{zred., uw\adddotspace i przedm\adddot}},
+ byeditoranaf = {{zredagowany, uwagi i pos\l owie}{zred., uw\adddotspace i pos\l \adddot}},
+ byeditortrcoin = {{zredagowany, t\l umaczenie \lbx@lfromlang, komentarze i wst\c{e}p}%
+ {zred., t\l um\adddotspace \lbx@sfromlang, kom\adddotspace i wst\c{e}p\adddot}},
+ byeditortrcofo = {{zredagowany, t\l umaczenie \lbx@lfromlang, komentarze i przedmowa}%
+ {zred., t\l um\adddotspace \lbx@sfromlang, kom\adddotspace i przedm\adddot}},
+ byeditortrcoaf = {{zredagowany, t\l umaczenie \lbx@lfromlang, komentarze i pos\l owie}%
+ {zred., t\l um\adddotspace \lbx@sfromlang, kom\adddotspace i pos\l \adddot}},
+ byeditortranin = {{zredagowany, t\l umaczenie \lbx@lfromlang, uwagi i wst\c{e}p}%
+ {zred., t\l um\adddotspace \lbx@sfromlang, uw\adddotspace i wst\adddot}},
+ byeditortranfo = {{zredagowany, t\l umaczenie \lbx@lfromlang, uwagi i przedmowa}%
+ {zred., t\l um\adddotspace \lbx@sfromlang, uw\adddotspace i przedm\adddot}},
+ byeditortranaf = {{zredagowany, t\l umaczenie \lbx@lfromlang, uwagi i pos\l owie}%
+ {zred., t\l um\adddotspace \lbx@sfromlang, uw\adddotspace i pos\l \adddot}},
+ bytranslatorco = {{t\l umaczenie \lbx@lfromlang i komentarze}%
+ {t\l um\adddotspace \lbx@sfromlang i kom\adddot}},
+ bytranslatoran = {{t\l umaczenie \lbx@lfromlang i uwagi}%
+ {t\l um\adddotspace \lbx@sfromlang i uw\adddot}},
+ bytranslatorin = {{t\l umaczenie \lbx@lfromlang i wst\c{e}p}%
+ {t\l um\adddotspace \lbx@sfromlang i wst\adddot}},
+ bytranslatorfo = {{t\l umaczenie \lbx@lfromlang i przedmowa}%
+ {t\l um\adddotspace \lbx@sfromlang i przedm\adddot}},
+ bytranslatoraf = {{t\l umaczenie \lbx@lfromlang i pos\l owie}%
+ {t\l um\adddotspace \lbx@sfromlang i pos\l \adddot}},
+ bytranslatorcoin = {{t\l umaczenie \lbx@lfromlang, komentarze i wst\c{e}p}%
+ {t\l um\adddotspace \lbx@sfromlang, kom\adddotspace i wst\adddot}},
+ bytranslatorcofo = {{t\l umaczenie \lbx@lfromlang, komentarze i przedmowa}%
+ {t\l um\adddotspace \lbx@sfromlang, kom\adddotspace i przedm\adddot}},
+ bytranslatorcoaf = {{t\l umaczenie \lbx@lfromlang, komentarze i pos\l owie}%
+ {t\l um\adddotspace \lbx@sfromlang, kom\adddotspace i pos\l \adddot}},
+ bytranslatoranin = {{t\l umaczenie \lbx@lfromlang, uwagi i wst\c{e}p}%
+ {t\l um\adddotspace \lbx@sfromlang, uw\adddotspace i wst\adddot}},
+ bytranslatoranfo = {{t\l umaczenie \lbx@lfromlang, uwagi i przedmowa}%
+ {t\l um\adddotspace \lbx@sfromlang, uw\adddotspace i przedm\adddot}},
+ bytranslatoranaf = {{t\l umaczenie \lbx@lfromlang, uwagi i pos\l owie}%
+ {t\l um\adddotspace \lbx@sfromlang, uw\adddotspace i pos\l \adddot}},
+ and = {{i}{i}},
+ andothers = {{i inni}{i in\adddot}},
+ andmore = {{i dalej}{i dal\adddot}}, %FIXME: unsure
+ volume = {{tom}{t\adddot}},
+ volumes = {{tomy}{t\adddot}},
+ involumes = {{w}{w}},
+ jourvol = {{tom}{t\adddot}},
+ jourser = {{serja}{ser\adddot}},
+ book = {{ksi\c{a}\.{z}ka}{ks\adddot}},
+ part = {{cz\c{e}\'{s}\'{c}}{cz\adddot}},
+ issue = {{wydanie}{wyd\adddot}},% FIXME: unsure,
+ newseries = {{nowa serja}{now\adddotspace ser\adddot}},
+ oldseries = {{stara serja}{star\adddotspace ser\adddot}},
+ edition = {{wydruk}{wydr\adddot}},% FIXME: unsure
+ reprint = {{przedruk}{przedr\adddot}},
+ reprintof = {{przedruk}{przedr\adddot}},
+ reprintas = {{przedrukowano jako}{przedr\adddotspace jako}},
+ reprintfrom = {{przedrukowano z}{przedr\adddotspace z}},
+ translationof = {{t\l umaczenie}{t\l um\adddot}},
+ translationas = {{t\l umaczenie jako}{t\l um\adddotspace jako}},
+ translationfrom = {{t\l umaczenie z}{t\l um\adddotspace z}},
+ reviewof = {{recenzja na\addcolon}{rec\adddotspace na\addcolon}},
+ origpubas = {{orginalnie wydano jako}%
+ {org\adddotspace wyd\adddotspace jako}},
+ origpubin = {{orginalnie wydano w}{org\adddotspace wyd\adddotspace w}},
+ astitle = {{pod tytu\l em}{pod tyt\adddot}},
+ bypublisher = {{przez wydawc\c{e}}{prz\adddotspace wyd\adddot}},
+ page = {{strona}{s\adddot}},
+ pages = {{strony}{s\adddot}},
+ column = {{kolumna}{kol\adddot}},
+ columns = {{kolumny}{kol\adddot}},
+ line = {{linijka}{l\adddot}},
+ lines = {{linijki}{l\adddot}},
+ nodate = {{no date}{n\adddot d\adddot}},% FIXME
+ verse = {{werset}{wer\adddot}},
+ verses = {{wersety}{wer\adddot}},
+ section = {{paragraf}{par\adddot}},% FIXME: check
+ sections = {{paragrafy}{par\adddot}},% FIXME: check
+ paragraph = {{akapit}{aka\adddot}},
+ paragraphs = {{akapity}{aka\adddot}},
+ in = {{w}{w}},
+ inseries = {{w}{w}},
+ ofseries = {{z}{z}},
+ number = {{numer}{nr\adddot}},% FIXME: check
+ chapter = {{rozdzia\l }{rozd\adddot}},
+ mathesis = {{praca magisterska}{prac\adddotspace mag\adddot}},
+ phdthesis = {{praca doktorska}{prac\adddotspace dokt\adddot}},
+ candthesis = {{praca kandydacka}%
+ {prac\adddotspace kand\adddot}},% FIXME: unsure
+ resreport = {{sprawozdanie naukowe}{spraw\adddotspace nau\adddot}},
+ techreport = {{sprawozdanie techniczne}{spraw\adddotspace tech\adddot}},
+ software = {{oprogramowanie}{opr\adddot}},
+ datacd = {{CD-ROM}{CD-ROM}},
+ audiocd = {{audio CD}{audio CD}},
+ version = {{wersja}{wer\adddot}},
+ url = {{adres}{adr\adddot}},
+% urlfrom = {{}{}},% FIXME: missing
+ urlseen = {{termin wizyty}{term\adddotspace wiz\adddot}},
+ inpreparation = {{przygotowanie}{przyg\adddot}},
+ submitted = {{prezentacja}{prez\adddot}},
+ forthcoming = {{przygotowanie}{przyg\adddot}},% FIXME: unsure
+ inpress = {{wydrukowane}{wydruk\adddot}},
+ prepublished = {{przedwydanie}{przedw\adddot}},
+ citedas = {{cytowane dalej jako}{cyt\adddotspace dal\adddotspace jako}},
+ thiscite = {{tutaj}{tut\adddot}},
+ seenote = {{patrz uwag\c{e}}{patrz uw\adddot}},
+ quotedin = {{cytat wed\l ug}{cyt\adddotspace wg\adddot}},
+ idem = {{ten\.{z}e}{ten\.{z}e}},
+ idemsm = {{ten\.{z}e}{ten\.{z}e}},
+ idemsf = {{ta\.{z} sama}{ta\.{z} sama}},
+ idemsn = {{ten sam}{ten sam}},
+ idempm = {{ci sami}{ci sami}},
+ idempf = {{ci sami}{ci sami}},
+ idempn = {{ci sami}{ci sami}},
+ idempp = {{ci sami}{ci sami}},
+ ibidem = {{tam\.{z}e}{tam\.{z}e}},
+ opcit = {{praca cytowana}{prac\adddotspace cyt\adddot}},
+ loccit = {{miejsce cytowane}{miej\adddotspace cyt\adddot}},
+ confer = {{por\'{o}wnaj}{por\adddot}},
+ sequens = {{i nast\c{e}pna}{i nast\adddot}},
+ sequentes = {{i nast\c{e}pni}{i nast\adddot}},
+ passim = {{wsz\c{e}dzie}{wsz\c{e}dzie}},
+ see = {{patrz}{p\adddot}},
+ seealso = {{ratrz r\'{o}wnie\.{z}}{p\adddotspace r\'{o}wn\adddot}},
+ backrefpage = {{cytowane na stronie}{cyt\adddotspace na s\adddot}},
+ backrefpages = {{cytowane na stronach}{cyt\adddotspace na s\adddot}},
+ january = {{stycze\'{n}}{sty\adddot}},
+ february = {{luty}{lut\adddot}},
+ march = {{marzec}{mar\adddot}},
+ april = {{kwiecie\'{n}}{kw\adddot}},
+ may = {{maj}{maj}},
+ june = {{czerwiec}{czer\adddot}},
+ july = {{lipiec}{lip\adddot}},
+ august = {{sierpie\'{n}}{sierp\adddot}},
+ september = {{wrzesie\'{n}}{wrz\adddot}},
+ october = {{pa\'{z}dziernik}{pa\'{z}\adddot}},
+ november = {{listopad}{list\adddot}},
+ december = {{grudzie\'{n}}{grud\adddot}},
+ datejanuary = {{stycznia}{sty\adddot}},
+ datefebruary = {{lutego}{lut\adddot}},
+ datemarch = {{marca}{mar\adddot}},
+ dateapril = {{kwietnia}{kw\adddot}},
+ datemay = {{maja}{maj\adddot}},
+ datejune = {{czerwca}{czer\adddot}},
+ datejuly = {{lipca}{lip\adddot}},
+ dateaugust = {{sierpnia}{sierp\adddot}},
+ dateseptember = {{wrze\'{s}nia}{wrz\adddot}},
+ dateoctober = {{pa\'{z}dziernika}{pa\'{z}\adddot}},
+ datenovember = {{listopada}{list\adddot}},
+ datedecember = {{grudnia}{grud\adddot}},
+ langamerican = {{ameryka\'{n}ski}{ameryka\'{n}ski}},
+ langbrazilian = {{brazylijski}{brazylijski}},
+% langcatalan = {{}{}},% FIXME: missing
+ langcroatian = {{chorwacki}{chorwacki}},
+% langczech = {{}{}},% FIXME: missing
+ langdanish = {{du\'{n}ski}{du\'{n}ski}},
+ langdutch = {{holenderski}{holenderski}},
+ langenglish = {{angielski}{angielski}},
+ langfinnish = {{fi\'{n}ski}{fi\'{n}ski}},
+ langfrench = {{francuski}{francuski}},
+ langgerman = {{niemiecki}{niemiecki}},
+ langgreek = {{grecki}{grecki}},
+ langitalian = {{w\l oski}{w\l oski}},
+ langlatin = {{\l acina}{\l acina}},
+ langnorwegian = {{norweski}{norweski}},
+% langpolish = {{}{}},% FIXME: missing
+ langportuguese = {{portugalski}{portugalski}},
+ langrussian = {{rosyjski}{rosyjski}},
+ langspanish = {{hiszpa\'{n}ski}{hiszpa\'{n}ski}},
+ langswedish = {{szwedzki}{szwedzki}},
+ fromamerican = {{z ameryka\'{n}skiego}{z amer\adddot}},
+ frombrazilian = {{z brazylijskiego}{z braz\adddot}},
+% fromcatalan = {{}{}},% FIXME: missing
+ fromcroatian = {{z chorwackiego}{z chorw\adddot}},
+% fromczech = {{}{}},% FIXME: missing
+ fromdanish = {{z du\'{n}skiego}{z du\'{n}\adddot}},
+ fromdutch = {{z niderla\'{n}skiego}{z nid\adddot}},
+ fromenglish = {{z angielskiego}{z ang\adddot}},
+ fromfinnish = {{z fi\'{n}skiego}{z fi\'{n}\adddot}},
+ fromfrench = {{z francuzkiego}{z fran\adddot}},
+ fromgerman = {{z niemieckiego}{z niem\adddot}},
+ fromgreek = {{z greckiego}{z grec\adddot}},
+ fromitalian = {{z w\l oskiego}{z w\l os\adddot}},
+ fromlatin = {{z \l aciny}{z \l at\adddot}},
+ fromnorwegian = {{z norweskiego}{z norw\adddot}},
+% frompolish = {{}{}},% FIXME: missing
+ fromportuguese = {{z portugalskiego}{z port\adddot}},
+ fromrussian = {{z rosyjskiego}{z ros\adddot}},
+ fromspanish = {{z hiszpa\'{n}skiego}{z hiszp\adddot}},
+ fromswedish = {{ze szwedskiego}{ze szw\adddot}},
+ countryde = {{Niemcy}{DE}},
+ countryeu = {{Unia Europejska}{EU}},
+ countryep = {{Unia Europejska}{EP}},
+ countryfr = {{Francja}{FR}},
+ countryuk = {{Wielka Brytania}{GB}},
+ countryus = {{Stany Zjednoczone Ameryki}{US}},
+ patent = {{patent}{pat\adddot}},
+ patentde = {{patent Niemiec}{pat\adddotspace Niemiec}},
+ patenteu = {{patent Europy}{pat\adddotspace Europy}},
+ patentfr = {{patent Francji}{pat\adddotspace Francji}},
+ patentuk = {{patent Wielkiej Brytanji}{pat\adddotspace Wielkiej Brytanji}},
+ patentus = {{patent USA}{pat\adddotspace USA}},
+ patreq = {{podanie na patent}{podanie na pat\adddot}},
+ patreqde = {{podanie na patent Niemiec}%
+ {podanie na pat\adddotspace Niemiec}},
+ patreqeu = {{podanie na patent Europy}{podanie na pat\adddotspace Europy}},
+ patreqfr = {{podanie na patent Francji}%
+ {podanie na pat\adddotspace Francji}},
+ patrequk = {{podanie na patent Wielkiej Brytanji}%
+ {podanie na pat\adddotspace Wielkiej Brytanji}},
+ patrequs = {{podanie na patent USA}{podanie na pat\adddotspace USA}},
+ file = {{plik}{plik}},
+ library = {{bibloteka}{bibl\adddot}},
+ abstract = {{podsumowanie}{pod\adddot}},
+ annotation = {{adnotacja}{adn\adddot}},
+}
+
+\protected\gdef\lbx@pl@mkbibmonth#1{%
+ \ifcase0#1\relax
+ #1\BibliographyWarning{Month out of range}%
+ \or\abx@bibmonth{datejanuary}%
+ \or\abx@bibmonth{datefebruary}%
+ \or\abx@bibmonth{datemarch}%
+ \or\abx@bibmonth{dateapril}%
+ \or\abx@bibmonth{datemay}%
+ \or\abx@bibmonth{datejune}%
+ \or\abx@bibmonth{datejuly}%
+ \or\abx@bibmonth{dateaugust}%
+ \or\abx@bibmonth{dateseptember}%
+ \or\abx@bibmonth{dateoctober}%
+ \or\abx@bibmonth{datenovember}%
+ \or\abx@bibmonth{datedecember}%
+ \else
+ #1\BibliographyWarning{Month out of range}%
+ \fi}%
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
index c80ba821c1c..f93c143b7d4 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
@@ -14,6 +14,7 @@
\textendash\penalty\hyphenpenalty}% breakable dash
\protected\def\bibdatedash{\bibrangedash}%
\let\finalandcomma=\empty
+ \let\finalandsemicolon=\empty
\def\mkbibordinal{\mkbibmascord}%
\protected\def\mkbibmascord#1{%
\stripzeros{#1}\textordmasculine}% \textordmasculine -> textcomp.sty
@@ -411,6 +412,7 @@
langitalian = {{italiano}{italiano}},
langlatin = {{latim}{latim}},
langnorwegian = {{noruegu\^es}{noruegu\^es}},
+% langpolish = {{}{}},% FIXME: missing
langportuguese = {{portugu{\^e}s}{portugu{\^e}s}},
% langrussian = {{}{}},% FIXME: missing
langspanish = {{espanhol}{espanhol}},
@@ -430,6 +432,7 @@
fromitalian = {{do italiano}{do italiano}},
fromlatin = {{do latim}{do latim}},
fromnorwegian = {{do noruegu\^es}{do noruegu\^es}},
+% frompolish = {{}{}},% FIXME: missing
fromportuguese = {{do portugu{\^e}s}{do portugu{\^e}s}},
% fromrussian = {{}{}},% FIXME: missing
fromspanish = {{do espanhol}{do espanhol}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx
index 5d603f267f5..179393cee57 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx
@@ -36,6 +36,7 @@
\protected\def\bibdatedash{%
\textemdash\penalty\hyphenpenalty}% breakable dash
\let\finalandcomma=\empty
+ \let\finalandsemicolon=\empty
\protected\def\mkbibordinal#1{\mkbibmascord}%
\protected\def\mkbibmascord#1{#1-й}%
\protected\def\mkbibfemord#1{#1-я}%
@@ -83,246 +84,246 @@
compilers = {{составители}{сост\adddot}},
redactor = {{редактор}{ред\adddot}},% FIXME: unsure
redactors = {{редакторы}{ред\adddot}},% FIXME: unsure
- reviser = {{ревизионный корректор}{рев. корр\adddot}},
- revisers = {{ревизионные корректоры}{рев. корр\adddot}},
- founder = {{учредитель}{учр\adddot}},
- founders = {{учредители}{учр\adddot}},
- continuator = {{продолжатель}{прод\adddot}},
- continuators = {{продолжатели}{прод\adddot}},
+ reviser = {{ревизионный корректор}{ревиз\adddotspace кор\adddot}},
+ revisers = {{ревизионные корректоры}{ревиз\adddotspace кор\adddot}},
+ founder = {{основатель}{осн\adddot}},
+ founders = {{основатели}{осн\adddot}},
+ continuator = {{продолжатель}{прод\adddot}},% FIXME: unsure
+ continuators = {{продолжатели}{прод\adddot}},% FIXME: unsure
collaborator = {{участник}{участ\adddot}},% FIXME: unsure
collaborators = {{участники}{участ\adddot}},% FIXME: unsure
translator = {{переводчик}{пер\adddot}},
translators = {{переводчики}{пер\adddot}},
- commentator = {{комментатор}{комм\adddot}},
- commentators = {{комментаторы}{комм\adddot}},
- annotator = {{примечания}{прим\adddot}},
- annotators = {{примечания}{прим\adddot}},
- commentary = {{комментарий}{комм\adddot}},
- annotations = {{примечания}{прим\adddot}},
- introduction = {{введение}{введ\adddot}},
+ commentator = {{комментатор}{коммент\adddot}},
+ commentators = {{комментаторы}{коммент\adddot}},
+ annotator = {{примечания}{примеч\adddot}},
+ annotators = {{примечания}{примеч\adddot}},
+ commentary = {{комментарий}{коммент\adddot}},
+ annotations = {{примечания}{примеч\adddot}},
+ introduction = {{вступительная статья}{вступ\adddotspace ст\adddot}},
foreword = {{предисловие}{предисл\adddot}},
afterword = {{послесловие}{послесл\adddot}},
editortr = {{редактор и переводчик}%
- {ред. и пер\adddot}},
+ {ред\adddotspace и пер\adddot}},
editorstr = {{редакторы и переводчики}%
- {ред. и пер\adddot}},
+ {ред\adddotspace и пер\adddot}},
editorco = {{редактор и комментатор}%
- {ред. и комм\adddot}},
+ {ред\adddotspace и коммент\adddot}},
editorsco = {{редакторы и комментаторы}%
- {ред. и комм\adddot}},
+ {ред\adddotspace и коммент\adddot}},
editoran = {{редактор и составитель примечаний}%
- {ред. и сост. прим\adddot}},
+ {ред\adddotspace и сост\adddotspace примеч\adddot}},
editorsan = {{редакторы и составители примечаний}%
- {ред. и сост. прим\adddot}},
- editorin = {{редактор и автор введения}%
- {ред. и авт. введ\adddot}},
- editorsin = {{редакторы и авторы введение}%
- {ред. и авт. введ\adddot}},
+ {ред\adddotspace и сост\adddotspace примеч\adddot}},
+ editorin = {{редактор и автор вступительной статьи}%
+ {ред\adddotspace и авт\adddotspace вступ\adddotspace ст\adddot}},
+ editorsin = {{редакторы и авторы вступительной статьи}%
+ {ред\adddotspace и авт\adddotspace вступ\adddotspace ст\adddot}},
editorfo = {{редактор и автор предисловия}%
- {ред. и авт. предисл\adddot}},
+ {ред\adddotspace и авт\adddotspace предисл\adddot}},
editorsfo = {{редакторы и авторы предисловия}%
- {ред. и авт. предисл\adddot}},
+ {ред\adddotspace и авт\adddotspace предисл\adddot}},
editoraf = {{редактор и автор послесловия}%
- {ред. и авт. послесл\adddot}},
+ {ред\adddotspace и авт\adddotspace послесл\adddot}},
editorsaf = {{редакторы и авторы послесловия}%
- {ред. и авт. послесл\adddot}},
- editortrco = {{редактор, переводчик и комментатор}%
- {ред., пер. и комм\adddot}},
- editorstrco = {{редакторы, переводчики и комментаторы}%
- {ред., пер. и комм\adddot}},
+ {ред\adddotspace и авт\adddotspace послесл\adddot}},
+ editortrco = {{редактор, переводчик и автор комментариев}%
+ {ред.,\addabbrvspace пер\adddotspace и авт\adddotspace коммент\adddot}},
+ editorstrco = {{редакторы, переводчики и авторы комментариев}%
+ {ред.,\addabbrvspace пер\adddotspace и авт\adddotspace коммент\adddot}},
editortran = {{редактор, переводчик и составитель примечаний}%
- {ред., пер. и сост. прим\adddot}},
+ {ред.,\addabbrvspace пер\adddotspace и сост\adddotspace примеч\adddot}},
editorstran = {{редакторы, переводчики и составители примечаний}%
- {ред., пер. и сост. прим\adddot}},
- editortrin = {{редактор, переводчик и автор введения}%
- {ред., пер. и авт. введ\adddot}},
- editorstrin = {{редакторы, переводчики и авторы введения}%
- {ред., пер. и авт. введ\adddot}},
+ {ред.,\addabbrvspace пер\adddotspace и сост\adddotspace примеч\adddot}},
+ editortrin = {{редактор, переводчик и автор вступительной статьи}%
+ {ред.,\addabbrvspace пер\adddotspace и авт\adddotspace вступ\adddotspace ст\adddot}},
+ editorstrin = {{редакторы, переводчики и авторы вступительной статьи}%
+ {ред.,\addabbrvspace пер\adddotspace и авт\adddotspace вступ\adddotspace ст\adddot}},
editortrfo = {{редактор, переводчик и автор предисловия}%
- {ред., пер. и авт. предисл\adddot}},
+ {ред.,\addabbrvspace пер\adddotspace и авт\adddotspace предисл\adddot}},
editorstrfo = {{редакторы, переводчики и авторы предисловия}%
- {ред., пер. и авт. предисл\adddot}},
+ {ред.,\addabbrvspace пер\adddotspace и авт\adddotspace предисл\adddot}},
editortraf = {{редактор, переводчик и автор послесловия}%
- {ред., пер. и авт. послесловия\adddot}},
+ {ред.,\addabbrvspace пер\adddotspace и авт\adddotspace послесловия\adddot}},
editorstraf = {{редакторы, переводчики и авторы послесловия}%
- {ред., пер. и авт. послесл\adddot}},
- editorcoin = {{редактор, комментатор и автор введения}%
- {ред., комм. и авт. введ\adddot}},
- editorscoin = {{редакторы, комментаторы и автор введения}%
- {ред., комм. и авт. введ\adddot}},
- editorcofo = {{редактор, комментатор и автор предисловия}%
- {ред., комм. и авт. предисл\adddot}},
- editorscofo = {{редакторы, комментаторы и авторы предисловия}%
- {ред., комм. и авт. предисл\adddot}},
- editorcoaf = {{редактор, комментатор и автор послесловия}%
- {ред., комм. и авт. послесл\adddot}},
- editorscoaf = {{редакторы, комментаторы и авторы послесловия}%
- {ред., комм. и авт. послесл\adddot}},
- editoranin = {{редактор, составитель примечаний и автор введения}%
- {ред., сост. прим. и авт. введ\adddot}},
- editorsanin = {{редакторы, составители примечаний и авторы введения}%
- {ред., сост. прим. и авт. введ\adddot}},
+ {ред.,\addabbrvspace пер\adddotspace и авт\adddotspace послесл\adddot}},
+ editorcoin = {{редактор, автор комментариев и вступительной статьи}%
+ {ред.,\addabbrvspace авт\adddotspace коммент\adddotspace и вступ\adddotspace ст\adddot}},
+ editorscoin = {{редакторы, авторы комментариев и вступительной статьи}%
+ {ред.,\addabbrvspace авт\adddotspace коммент\adddotspace и вступ\adddotspace ст\adddot}},
+ editorcofo = {{редактор, автор комментариев и предисловия}%
+ {ред.,\addabbrvspace авт\adddotspace коммент\adddotspace и предисл\adddot}},
+ editorscofo = {{редакторы, авторы комментариев и предисловия}%
+ {ред.,\addabbrvspace авт\adddotspace коммент\adddotspace и предисл\adddot}},
+ editorcoaf = {{редактор, автор комментариев и послесловия}%
+ {ред.,\addabbrvspace авт\adddotspace коммент\adddotspace и послесл\adddot}},
+ editorscoaf = {{редакторы, авторы комментариев и послесловия}%
+ {ред.,\addabbrvspace авт\adddotspace коммент\adddotspace и послесл\adddot}},
+ editoranin = {{редактор, составитель примечаний и автор вступительной статьи}%
+ {ред.,\addabbrvspace сост\adddotspace примеч\adddotspace и авт\adddotspace вступ\adddotspace ст\adddot}},
+ editorsanin = {{редакторы, составители примечаний и авторы вступительной статьи}%
+ {ред.,\addabbrvspace сост\adddotspace примеч\adddotspace и авт\adddotspace вступ\adddotspace ст\adddot}},
editoranfo = {{редактор, составитель примечаний и автор предисловия}%
- {ред., сост. прим. и авт. предисл\adddot}},
+ {ред.,\addabbrvspace сост\adddotspace примеч\adddotspace и авт\adddotspace предисл\adddot}},
editorsanfo = {{редакторы, составители примечаний и авторы предисловия}%
- {ред., сост. прим. и авт. предисл\adddot}},
+ {ред.,\addabbrvspace сост\adddotspace примеч\adddotspace и авт\adddotspace предисл\adddot}},
editoranaf = {{редактор, составитель примечаний и автор послесловия}%
- {ред., сост. прим. и авт. послесл\adddot}},
+ {ред.,\addabbrvspace сост\adddotspace примеч\adddotspace и авт\adddotspace послесл\adddot}},
editorsanaf = {{редакторы, составители примечаний и авторы послесловия}%
- {ред., сост. прим. и авт. послесл\adddot}},
- editortrcoin = {{редактор, переводчик, комментатор и автор введения}%
- {ред., пер., комм. и авт. введ\adddot}},
- editorstrcoin = {{редакторы, переводчики, комментаторы и авторы введение}%
- {ред., пер., комм. и авт. введ\adddot}},
- editortrcofo = {{редактор, переводчик, комментатор и автор предисловия}%
- {ред., пер., комм. и авт. предисл\adddot}},
- editorstrcofo = {{редакторы, переводчики, комментаторы и авторы предисловия}%
- {ред., пер., комм. и авт. предисл\adddot}},
- editortrcoaf = {{редактор, переводчик, комментатор и автор послесловия}%
- {ред., пер., комм. и авт. послесл\adddot}},
- editorstrcoaf = {{редакторы, переводчики, комментаторы и авторы послесловия}%
- {ред., пер., комм. и авт. послесл\adddot}},
- editortranin = {{редактор, переводчик, составитель примечаний и автор введения}%
- {ред., пер., сост. прим. и авт. введ\adddot}},
- editorstranin = {{редакторы, переводчики, составители примечаний и авторы введение}%
- {ред., пер., сост. прим. и авт. введ\adddot}},
+ {ред.,\addabbrvspace сост\adddotspace примеч\adddotspace и авт\adddotspace послесл\adddot}},
+ editortrcoin = {{редактор, переводчик, автор комментариев и вступительной статьи}%
+ {ред.,\addabbrvspace пер.,\addabbrvspace авт\adddotspace коммент\adddotspace и вступ\adddotspace ст\adddot}},
+ editorstrcoin = {{редакторы, переводчики, авторы комментариев и вступительной статьи}%
+ {ред.,\addabbrvspace пер.,\addabbrvspace авт\adddotspace коммент\adddotspace и вступ\adddotspace ст\adddot}},
+ editortrcofo = {{редактор, переводчик, автор комментариев и предисловия}%
+ {ред.,\addabbrvspace пер.,\addabbrvspace авт\adddotspace коммент\adddotspace и предисл\adddot}},
+ editorstrcofo = {{редакторы, переводчики, авторы комментариев и предисловия}%
+ {ред.,\addabbrvspace пер.,\addabbrvspace авт\adddotspace коммент\adddotspace и предисл\adddot}},
+ editortrcoaf = {{редактор, переводчик, автор комментариев и послесловия}%
+ {ред.,\addabbrvspace пер.,\addabbrvspace авт\adddotspace коммент\adddotspace и послесл\adddot}},
+ editorstrcoaf = {{редакторы, переводчики, авторы комментариев и послесловия}%
+ {ред.,\addabbrvspace пер.,\addabbrvspace авт\adddotspace коммент\adddotspace и послесл\adddot}},
+ editortranin = {{редактор, переводчик, составитель примечаний и автор вступительной статьи}%
+ {ред.,\addabbrvspace пер.,\addabbrvspace сост\adddotspace примеч\adddotspace и авт\adddotspace вступ\adddotspace ст\adddot}},
+ editorstranin = {{редакторы, переводчики, составители примечаний и авторы вступительной статьи}%
+ {ред.,\addabbrvspace пер.,\addabbrvspace сост\adddotspace примеч\adddotspace и авт\adddotspace вступ\adddotspace ст\adddot}},
editortranfo = {{редактор, переводчик, составитель примечаний и автор предисловия}%
- {ред., пер., сост. прим. и авт. предисл\adddot}},
+ {ред.,\addabbrvspace пер.,\addabbrvspace сост\adddotspace примеч\adddotspace и авт\adddotspace предисл\adddot}},
editorstranfo = {{редакторы, переводчики, составители примечаний и авторы предисловия}%
- {ред., пер., сост. прим. и авт. предисл\adddot}},
+ {ред.,\addabbrvspace пер.,\addabbrvspace сост\adddotspace примеч\adddotspace и авт\adddotspace предисл\adddot}},
editortranaf = {{редактор, переводчик, составитель примечаний и автор послесловия}%
- {ред., пер., сост. прим. и авт. послесл\adddot}},
+ {ред.,\addabbrvspace пер.,\addabbrvspace сост\adddotspace примеч\adddotspace и авт\adddotspace послесл\adddot}},
editorstranaf = {{редакторы, переводчики, составители примечаний и авторы послесловия}%
- {ред., пер., сост. прим. и авт. послесл\adddot}},
- translatorco = {{переводчик и комментатор}%
- {пер. и комм\adddot}},
- translatorsco = {{переводчики и комментаторы}%
- {пер. и комм\adddot}},
+ {ред.,\addabbrvspace пер.,\addabbrvspace сост\adddotspace примеч\adddotspace и авт\adddotspace послесл\adddot}},
+ translatorco = {{переводчик и автор комментариев}%
+ {пер\adddotspace и авт\adddotspace коммент\adddot}},
+ translatorsco = {{переводчики и авторы комментариев}%
+ {пер\adddotspace и авт\adddotspace коммент\adddot}},
translatoran = {{переводчик и автор примечаний}%
- {пер. и сост. прим\adddot}},
+ {пер\adddotspace и сост\adddotspace примеч\adddot}},
translatorsan = {{переводчики и составители примечаний}%
- {пер. и сост. прим\adddot}},
- translatorin = {{переводчик и автор введения}%
- {пер. и авт. введ\adddot}},
- translatorsin = {{переводчики и авторы введения}%
- {пер. и авт. введ\adddot}},
+ {пер\adddotspace и сост\adddotspace примеч\adddot}},
+ translatorin = {{переводчик и автор вступительной статьи}%
+ {пер\adddotspace и авт\adddotspace вступ\adddotspace ст\adddot}},
+ translatorsin = {{переводчики и авторы вступительной статьи}%
+ {пер\adddotspace и авт\adddotspace вступ\adddotspace ст\adddot}},
translatorfo = {{переводчик и автор предисловия}%
- {пер. и авт. предисл\adddot}},
+ {пер\adddotspace и авт\adddotspace предисл\adddot}},
translatorsfo = {{переводчики и авторы предисловия}%
- {пер. и авт. предисл\adddot}},
+ {пер\adddotspace и авт\adddotspace предисл\adddot}},
translatoraf = {{переводчик и автор послесловия}%
- {пер. и авт. послесл\adddot}},
+ {пер\adddotspace и авт\adddotspace послесл\adddot}},
translatorsaf = {{переводчики и авторы послесловия}%
- {пер. и авт. послесл\adddot}},
- translatorcoin = {{переводчик, составитель комментариев и автор введения}%
- {пер., сост. комм. и авт. введ\adddot}},
- translatorscoin = {{переводчики, составители комментариев и авторы введение}%
- {пер., сост. комм. и авт. введ\adddot}},
- translatorcofo = {{переводчик, составитель комментариев и автор предисловия}%
- {пер., сост. комм. и авт. предисл\adddot}},
- translatorscofo = {{переводчики, составители комментариев и авторы предисловия}%
- {пер., сост. комм. и авт. предисл\adddot}},
- translatorcoaf = {{переводчик, составитель комментариев и автор послесловия}%
- {пер., сост. комм. и авт. послесл\adddot}},
- translatorscoaf = {{переводчики, составители комментариев и авторы послесловия}%
- {пер., сост. комм. и авт. послесл\adddot}},
- translatoranin = {{переводчик, составитель комментариев и автор введения}%
- {пер., сост. комм. и авт. введ\adddot}},
- translatorsanin = {{переводчики, составители комментариев и авторы введения}%
- {пер., сост. комм. и авт. введ\adddot}},
- translatoranfo = {{переводчик, составитель комментариев и автор предисловия}%
- {пер., сост. комм. и авт. предисл\adddot}},
- translatorsanfo = {{переводчики, составители комментариев и авторы предисловия}%
- {пер., сост. комм. и авт. предисл\adddot}},
- translatoranaf = {{переводчик, составитель комментариев и автор послесловия}%
- {пер., сост. комм. и авт. послесл\adddot}},
- translatorsanaf = {{переводчики, составители комментариев и авторы послесловия}%
- {пер., сост. комм. и авт. послесл\adddot}},
+ {пер\adddotspace и авт\adddotspace послесл\adddot}},
+ translatorcoin = {{переводчик, автор комментариев и вступительной статьи}%
+ {пер.,\addabbrvspace авт\adddotspace коммент\adddotspace и вступ\adddotspace ст\adddot}},
+ translatorscoin = {{переводчики, авторы комментариев и вступительной статьи}%
+ {пер.,\addabbrvspace авт\adddotspace коммент\adddotspace и вступ\adddotspace ст\adddot}},
+ translatorcofo = {{переводчик, автор комментариев и предисловия}%
+ {пер.,\addabbrvspace авт\adddotspace коммент\adddotspace и предисл\adddot}},
+ translatorscofo = {{переводчики, авторы комментариев и предисловия}%
+ {пер.,\addabbrvspace авт\adddotspace коммент\adddotspace и предисл\adddot}},
+ translatorcoaf = {{переводчик, автор комментариев и послесловия}%
+ {пер.,\addabbrvspace авт\adddotspace коммент\adddotspace и послесл\adddot}},
+ translatorscoaf = {{переводчики, авторы комментариев и послесловия}%
+ {пер.,\addabbrvspace авт\adddotspace коммент\adddotspace и послесл\adddot}},
+ translatoranin = {{переводчик, автор комментариев и вступительной статьим}%
+ {пер.,\addabbrvspace авт\adddotspace коммент\adddotspace и вступ\adddotspace ст\adddot}},
+ translatorsanin = {{переводчики, авторы комментариев и вступительной статьи}%
+ {пер.,\addabbrvspace авт\adddotspace коммент\adddotspace и вступ\adddotspace ст\adddot}},
+ translatoranfo = {{переводчик, автор комментариев и предисловия}%
+ {пер.,\addabbrvspace авт\adddotspace коммент\adddotspace и предисл\adddot}},
+ translatorsanfo = {{переводчики, авторы комментариев и предисловия}%
+ {пер.,\addabbrvspace авт\adddotspace коммент\adddotspace и предисл\adddot}},
+ translatoranaf = {{переводчик, автор комментариев и послесловия}%
+ {пер.,\addabbrvspace авт\adddotspace коммент\adddotspace и послесл\adddot}},
+ translatorsanaf = {{переводчики, авторы комментариев и послесловия}%
+ {пер.,\addabbrvspace авт\adddotspace коммент\adddotspace и послесл\adddot}},
byauthor = {{}{}},
byeditor = {{под редакцией}{под\addabbrvspace ред\adddot}},
- bycompiler = {{составлено}{сост\adddot}},
+ bycompiler = {{составитель}{сост\adddot}},
byredactor = {{под редакцией}{под\addabbrvspace ред\adddot}},
byreviser = {{исправлено}{испр\adddot}},
byreviewer = {{рецензия}{рец\adddot}},
- byfounder = {{учреждено}{учр\adddot}},% FIXME: unsure
+ byfounder = {{учредитель}{учр\adddot}},% FIXME: unsure
bycontinuator = {{продолжение}{продолж\adddot}},% FIXME: unsure
bycollaborator = {{при участии}{при\addabbrvspace уч\adddot}},
- bytranslator = {{перевод \lbx@lfromlang}{пер. \lbx@sfromlang}},
- bycommentator = {{комментарии}{комм\adddot}},
- byannotator = {{примечания}{прим\adddot}},
- withcommentator = {{комментарии}{комм\adddot}},
- withannotator = {{примечания}{прим\adddot}},
- withintroduction = {{введение}{введ\adddot}},
+ bytranslator = {{перевод \lbx@lfromlang}{пер\adddot\ \lbx@sfromlang}},
+ bycommentator = {{комментарии}{коммент\adddot}},
+ byannotator = {{примечания}{примеч\adddot}},
+ withcommentator = {{комментарии}{коммент\adddot}},
+ withannotator = {{примечания}{примеч\adddot}},
+ withintroduction = {{вступительная статья}{вступ\adddotspace ст\adddot}},
withforeword = {{предисловие}{предисл\adddot}},
withafterword = {{послесловие}{послесл\adddot}},
byeditortr = {{перевод \lbx@lfromlang, под редакцией}%
- {пер. \lbx@sfromlang, под\addabbrvspace ред\adddotspace}},
- byeditorco = {{под редакцией и с комментариями}%
- {под ред. и с\addabbrvspace комм\adddot}},
- byeditoran = {{под редакцией и с примечаниями}%
- {под ред. и с\addabbrvspace прим\adddot}},
- byeditorin = {{под редакцией, с введением}%
- {под ред., с\addabbrvspace введ\adddot}},
- byeditorfo = {{под редакцией, с предисловием}%
- {под ред., с\addabbrvspace предисл\adddot}},
- byeditoraf = {{под редакцией, с послесловием}%
- {под ред., с\addabbrvspace послесл\adddot}},
- byeditortrco = {{под редакцией, перевод \lbx@lfromlang и комментарии}%
- {под ред., пер. \lbx@sfromlang и комм\adddot}},
- byeditortran = {{под редакцией, перевод \lbx@lfromlang и примечания}%
- {под ред., пер. \lbx@sfromlang и прим\adddot}},
- byeditortrin = {{под редакцией, перевод \lbx@lfromlang, введение}%
- {под ред., пер. \lbx@sfromlang, введ\adddot}},
+ {пер\adddot\ \lbx@sfromlang, под\addabbrvspace ред\adddot}},
+ byeditorco = {{под редакцией, комментарии}%
+ {под ред.,\addabbrvspace коммент\adddot}},
+ byeditoran = {{под редакцией, примечания}%
+ {под ред.,\addabbrvspace примеч\adddot}},
+ byeditorin = {{под редакцией, вступительная статья}%
+ {под ред.,\addabbrvspace вступ\adddotspace ст\adddot}},
+ byeditorfo = {{под редакцией, предисловие}%
+ {под ред.,\addabbrvspace предисл\adddot}},
+ byeditoraf = {{под редакцией, послесловие}%
+ {под ред.,\addabbrvspace послесл\adddot}},
+ byeditortrco = {{под редакцией, перевод \lbx@lfromlang\ и комментарии}%
+ {под ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang\ и коммент\adddot}},
+ byeditortran = {{под редакцией, перевод \lbx@lfromlang\ и примечания}%
+ {под ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang\ и примеч\adddot}},
+ byeditortrin = {{под редакцией, перевод \lbx@lfromlang, вступительная статья}%
+ {под ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang, вступ\adddotspace ст\adddot}},
byeditortrfo = {{под редакцией, перевод \lbx@lfromlang, предисловие}%
- {под ред., пер. \lbx@sfromlang, предисл\adddot}},
+ {под ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang, предисл\adddot}},
byeditortraf = {{под редакцией, перевод \lbx@lfromlang, послесловие}%
- {под ред. и пер. \lbx@sfromlang, послесл\adddot}},
- byeditorcoin = {{под редакцией, комментарии и введение}%
- {под ред., комм. и введ\adddot}},
+ {под ред\adddotspace и пер\adddot\ \lbx@sfromlang, послесл\adddot}},
+ byeditorcoin = {{под редакцией, комментарии и вступительная статья}%
+ {под ред.,\addabbrvspace коммент\adddotspace и вступ\adddotspace ст\adddot}},
byeditorcofo = {{под редакцией, комментарии и предисловие}%
- {под ред., комм. и предисл\adddot}},
+ {под ред.,\addabbrvspace коммент\adddotspace и предисл\adddot}},
byeditorcoaf = {{под редакцией, комментарии и послесловие}%
- {под ред., комм. и послесл\adddot}},
- byeditoranin = {{под редакцией, примечания и введение}%
- {под ред., прим. и введ\adddot}},
+ {под ред.,\addabbrvspace коммент\adddotspace и послесл\adddot}},
+ byeditoranin = {{под редакцией, примечания и вступительная статья}%
+ {под ред.,\addabbrvspace примеч\adddotspace и вступ\adddotspace ст\adddot}},
byeditoranfo = {{под редакцией, примечания и предисловие}%
- {под ред., прим. и предисл\adddot}},
+ {под ред.,\addabbrvspace примеч\adddotspace и предисл\adddot}},
byeditoranaf = {{под редакцией, примечания и послесловие}%
- {под ред., прим. и послесл\adddot}},
- byeditortrcoin = {{под редакцией, перевод \lbx@lfromlang, комментарии и введение}%
- {под ред., пер. \lbx@sfromlang, комм. и введ\adddot}},
+ {под ред.,\addabbrvspace примеч\adddotspace и послесл\adddot}},
+ byeditortrcoin = {{под редакцией, перевод \lbx@lfromlang, комментарии и вступительная статья}%
+ {под ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang, коммент\adddotspace и вступ\adddotspace ст\adddot}},
byeditortrcofo = {{под редакцией, перевод \lbx@lfromlang, комментарии и предисловие}%
- {под ред., пер. \lbx@sfromlang, комм. и предисл\adddot}},
+ {под ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang, коммент\adddotspace и предисл\adddot}},
byeditortrcoaf = {{под редакцией, перевод \lbx@lfromlang, комментарии и послесловие}%
- {под ред., пер. \lbx@sfromlang, комм. и послесл\adddot}},
- byeditortranin = {{под редакцией, перевод \lbx@lfromlang, примечания и введение}%
- {под ред., пер. \lbx@sfromlang, примеч. и введ\adddot}},
+ {под ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang, коммент\adddotspace и послесл\adddot}},
+ byeditortranin = {{под редакцией, перевод \lbx@lfromlang, примечания и вступительная статья}%
+ {под ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang, примеч\adddotspace и вступ\adddotspace ст\adddot}},
byeditortranfo = {{под редакцией, перевод \lbx@lfromlang, примечания и предисловие}%
- {под ред., пер. \lbx@sfromlang, примеч. и предисл\adddot}},
+ {под ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang, примеч\adddotspace и предисл\adddot}},
byeditortranaf = {{под редакцией, перевод \lbx@lfromlang, примечания и послесловие}%
- {под ред., пер. \lbx@sfromlang, примеч. и послесл\adddot}},
+ {под ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang, примеч\adddotspace и послесл\adddot}},
bytranslatorco = {{перевод \lbx@lfromlang\ и комментарии}%
- {пер. \lbx@sfromlang\ и комм\adddot}},
+ {пер\adddot\ \lbx@sfromlang\ и коммент\adddot}},
bytranslatoran = {{перевод \lbx@lfromlang\ и примечания}%
- {пер. \lbx@sfromlang\ и примеч\adddot}},
- bytranslatorin = {{перевод \lbx@lfromlang\ и введение}%
- {пер. \lbx@sfromlang\ и введ\adddot}},
+ {пер\adddot\ \lbx@sfromlang\ и примеч\adddot}},
+ bytranslatorin = {{перевод \lbx@lfromlang\ и вступительная статья}%
+ {пер\adddot\ \lbx@sfromlang\ и вступ\adddotspace ст\adddot}},
bytranslatorfo = {{перевод \lbx@lfromlang\ и предисловие}%
- {пер. \lbx@sfromlang\ и предисл\adddot}},
+ {пер\adddot\ \lbx@sfromlang\ и предисл\adddot}},
bytranslatoraf = {{перевод \lbx@lfromlang\ и послесловие}%
- {пер. \lbx@sfromlang\ и и послесл\adddot}},
- bytranslatorcoin = {{перевод \lbx@lfromlang, комментарии и введение}%
- {пер. \lbx@sfromlang, комм. и введ\adddot}},
+ {пер\adddot\ \lbx@sfromlang\ и и послесл\adddot}},
+ bytranslatorcoin = {{перевод \lbx@lfromlang, комментарии и вступительная статья}%
+ {пер\adddot\ \lbx@sfromlang, коммент\adddotspace и вступ\adddotspace ст\adddot}},
bytranslatorcofo = {{перевод \lbx@lfromlang, комментарии и предисловие}%
- {пер. \lbx@sfromlang, комм. и предисл\adddot}},
+ {пер\adddot\ \lbx@sfromlang, коммент\adddotspace и предисл\adddot}},
bytranslatorcoaf = {{перевод \lbx@lfromlang, комментарии и послесловие}%
- {пер. \lbx@sfromlang, комм. и послесл\adddot}},
- bytranslatoranin = {{перевод \lbx@lfromlang, примечания и введение}%
- {пер. \lbx@sfromlang, примеч. и введ\adddot}},
+ {пер\adddot\ \lbx@sfromlang, коммент\adddotspace и послесл\adddot}},
+ bytranslatoranin = {{перевод \lbx@lfromlang, примечания и вступительная статья}%
+ {пер\adddot\ \lbx@sfromlang, примеч\adddotspace и вступ\adddotspace ст\adddot}},
bytranslatoranfo = {{перевод \lbx@lfromlang, примечания и предисловие}%
- {пер. \lbx@sfromlang, примеч. и предисл\adddot}},
+ {пер\adddot\ \lbx@sfromlang, примеч\adddotspace и предисл\adddot}},
bytranslatoranaf = {{перевод \lbx@lfromlang, примечания и послесловие}%
- {пер. \lbx@sfromlang, примеч. и послесл\adddot}},
+ {пер\adddot\ \lbx@sfromlang, примеч\adddotspace и послесл\adddot}},
and = {{и}{и}},
andothers = {{и\addabbrvspace др\adddot}{и\addabbrvspace др\adddot}},
andmore = {{и\addabbrvspace др\adddot}{и\addabbrvspace др\adddot}},
@@ -334,32 +335,32 @@
book = {{книга}{кн\adddot}},
part = {{часть}{ч\adddot}},
issue = {{выпуск}{вып\adddot}},
- newseries = {{новая серия}{нов\addabbrvspace сер\adddot}},
- oldseries = {{старая серия}{стар\addabbrvspace сер\adddot}},
+ newseries = {{новая серия}{нов\adddotspace сер\adddot}},
+ oldseries = {{старая серия}{стар\adddotspace сер\adddot}},
edition = {{издание}{изд\adddot}},
reprint = {{переиздание}{переизд\adddot}},
reprintof = {{переиздание}{переизд\adddot}},
- reprintas = {{переиздано как}{переизд. как}},
- reprintfrom = {{переиздано с}{переизд\addabbrvspace с}},
- translationof = {{перевод}{пер\addabbrvspace}},
- translationas = {{перевод как}{пер\addabbrvspace как}},
- translationfrom = {{перевод с}{пер\addabbrvspace с}},
- reviewof = {{рецензия на:}{рец\addabbrvspace на:}},% FIXME: unsure
- origpubas = {{первоначально опубликовано как}%
- {перв\addabbrvspace опубл\addabbrvspace как}},
- origpubin = {{первоначально опубликовано в}%
- {перв\addabbrvspace опубл\addabbrvspace в}},
- astitle = {{под названием}{под назв\adddot}},% FIXME: unsure
- bypublisher = {{опубликовано}{опубл\adddot}},% FIXME: unsure
+ reprintas = {{переиздано как}{переизд\adddotspace как}},
+ reprintfrom = {{переиздано с}{переизд\adddotspace с}},
+ translationof = {{перевод по изданию\addcolon}{пер\adddotspace по изд\adddot\addcolon}},
+ translationas = {{перевод\addcolon}{пер\adddot\addcolon}},
+ translationfrom = {{перевод с}{пер\adddotspace с}},
+ reviewof = {{рецензия на\addcolon}{рец\adddotspace на\addcolon}},% FIXME: unsure
+ origpubas = {{первая публикация\addcolon}%
+ {перв\adddotspace публ\adddot\addcolon}},
+ origpubin = {{первая публикация в}%
+ {перв\adddotspace публ\adddotspace в}},
+ astitle = {{\addcolon}{\addcolon}},% FIXME: unsure
+ bypublisher = {{\addcomma}{\addcomma}},% FIXME: unsure
page = {{страница}{с\adddot}},
pages = {{страницы}{с\adddot}},
column = {{колонка}{кол\adddot}},
columns = {{колонки}{кол\adddot}},
- line = {{строка}{с\adddot}},
- lines = {{строки}{с\adddot}},
- nodate = {{n\adddot d\adddot}{n\adddot d\adddot}},%FIXME
- verse = {{стих}{ст\adddot}},
- verses = {{стихи}{ст\adddot}},
+ line = {{строка}{строка}},
+ lines = {{строки}{строка}},
+ nodate = {{б\adddot г\adddot}{б\adddot г\adddot}},
+ verse = {{стих}{стих}},
+ verses = {{стихи}{стихи}},
section = {{параграф}{\S}},
sections = {{параграфы}{\S\S}},
paragraph = {{абзац}{абз\adddot}},
@@ -369,23 +370,26 @@
ofseries = {{из}{из}},
number = {{номер}{№}},
chapter = {{глава}{гл\adddot}},
- mathesis = {{магистерская диссертация}{маг\adddotspace дисс\adddot}},
- phdthesis = {{докторская диссертация}{докт\adddotspace дисс\adddot}},
- candthesis = {{кандидатская диссертация}{канд\adddotspace дисс\adddot}},
+ mathesis = {{дис\adddotspace\textellipsis\ маг\adddot}
+ {дис\adddotspace\textellipsis\ маг\adddot}},
+ phdthesis = {{дис\adddotspace\textellipsis\ док\adddot}
+ {дис\adddotspace\textellipsis\ док\adddot}},
+ candthesis = {{дис\adddotspace\textellipsis\ канд\adddot}
+ {дис\adddotspace\textellipsis\ канд\adddot}},
resreport = {{научный отчёт}{науч\adddotspace отч\adddot}},
techreport = {{технический отчёт}{тех\adddotspace отч\adddot}},
software = {{программное обеспечение}{прогр\adddotspace обесп\adddot}},
datacd = {{CD-ROM}{CD-ROM}},
audiocd = {{audio CD}{audio CD}},
version = {{версия}{вер\adddot}},
- url = {{адрес}{адр\adddot}},
-% urlfrom = {{}{}},% FIXME: missing
+ url = {{url}{url}},
+ urlfrom = {{режим доступа}{режим доступа}},
urlseen = {{дата обращения}{дата\addabbrvspace обр\adddot}},
inpreparation = {{в\addabbrvspace подготовке}{в подг\adddot}},
submitted = {{представлено}{предст\adddot}},
forthcoming = {{в печати}{в печ\adddot}},
inpress = {{в\addabbrvspace печати}{в печ\adddot}},
-% prepublished = {{}{}},% FIXME: missing
+ prepublished = {{предварительная публикация}{пред\adddotspace пуб\adddot}},% FIXME: unsure
citedas = {{далее цитируется как}{далее цит\addabbrvspace как}},
thiscite = {{здесь}{здесь}},
seenote = {{смотри сноску}{см\adddotspace сн\adddot}},
@@ -406,57 +410,58 @@
sequentes = {{и следующие}{и\addabbrvspace сл\adddot}},
passim = {{всюду}{всюду}},
see = {{смотри}{см\adddot}},
- seealso = {{смотри также}{см. также}},
+ seealso = {{смотри также}{см\adddotspace также}},
backrefpage = {{цитируется на странице}{цит\adddotspace на\addabbrvspace с\adddot}},
backrefpages = {{цитируется на страницах}{цит\adddotspace на\addabbrvspace с\adddot}},
january = {{январь}{янв\adddot}},
- february = {{февраль}{фев\adddot}},
- march = {{март}{мар\adddot}},
+ february = {{февраль}{февр\adddot}},
+ march = {{март}{март}},
april = {{апрель}{апр\adddot}},
may = {{май}{май}},
- june = {{июнь}{июн\adddot}},
- july = {{июль}{июл\adddot}},
+ june = {{июнь}{июнь}},
+ july = {{июль}{июль}},
august = {{август}{авг\adddot}},
september = {{сентябрь}{сент\adddot}},
october = {{октябрь}{окт\adddot}},
- november = {{ноябрь}{ноя\adddot}},
+ november = {{ноябрь}{нояб\adddot}},
december = {{декабрь}{дек\adddot}},
datejanuary = {{января}{янв\adddot}},
- datefebruary = {{февраля}{фев\adddot}},
- datemarch = {{марта}{мар\adddot}},
+ datefebruary = {{февраля}{февр\adddot}},
+ datemarch = {{марта}{марта}},
dateapril = {{апреля}{апр\adddot}},
datemay = {{мая}{мая}},
- datejune = {{июня}{июн\adddot}},
- datejuly = {{июля}{июл\adddot}},
+ datejune = {{июня}{июня}},
+ datejuly = {{июля}{июля}},
dateaugust = {{августа}{авг\adddot}},
dateseptember = {{сентября}{сент\adddot}},
dateoctober = {{октября}{окт\adddot}},
- datenovember = {{ноября}{ноя\adddot}},
+ datenovember = {{ноября}{нояб\adddot}},
datedecember = {{декабря}{дек\adddot}},
- langamerican = {{американский}{американский}},
- langbrazilian = {{бразильский}{бразильский}},
-% langcatalan = {{}{}},% FIXME: missing
- langcroatian = {{хорватский}{хорватский}},
-% langczech = {{}{}},% FIXME: missing
- langdanish = {{датский}{датский}},
- langdutch = {{голландский}{голландский}},
- langenglish = {{английский}{английский}},
- langfinnish = {{финский}{финский}},
- langfrench = {{французский}{французский}},
- langgerman = {{немецкий}{немецкий}},
- langgreek = {{греческий}{греческий}},
- langitalian = {{итальянский}{итальянский}},
- langlatin = {{латинский}{латинский}},
- langnorwegian = {{норвежский}{норвежский}},
- langportuguese = {{португальский}{португальский}},
- langrussian = {{русский}{русский}},
- langspanish = {{испанский}{испанский}},
- langswedish = {{шведский}{шведский}},
+ langamerican = {{американский}{амер\adddot}},
+ langbrazilian = {{бразильский}{браз\adddot}},
+ langcatalan = {{каталонский}{катал\adddot}},
+ langcroatian = {{хорватский}{хорв\adddot}},
+ langczech = {{чешский}{чеш\adddot}},
+ langdanish = {{датский}{дат\adddot}},
+ langdutch = {{нидерландский}{нидерл\adddot}},
+ langenglish = {{английский}{англ\adddot}},
+ langfinnish = {{финский}{фин\adddot}},
+ langfrench = {{французский}{фр\adddot}},
+ langgerman = {{немецкий}{нем\adddot}},
+ langgreek = {{греческий}{греч\adddot}},
+ langitalian = {{итальянский}{итал\adddot}},
+ langlatin = {{латинский}{лат\adddot}},
+ langnorwegian = {{норвежский}{норв\adddot}},
+ langpolish = {{польский}{пол\adddot}},
+ langportuguese = {{португальский}{порт\adddot}},
+ langrussian = {{русский}{рус\adddot}},
+ langspanish = {{испанский}{исп\adddot}},
+ langswedish = {{шведский}{швед\adddot}},
fromamerican = {{с американского}{с\addabbrvspace амер\adddot}},
frombrazilian = {{с бразильского}{с\addabbrvspace браз\adddot}},
-% fromcatalan = {{}{}},% FIXME: missing
+ fromcatalan = {{с каталонского}{с\addabbrvspace катал\adddot}},
fromcroatian = {{с хорватского}{с\addabbrvspace хорв\adddot}},
-% fromczech = {{}{}},% FIXME: missing
+ fromczech = {{с чешского}{с\addabbrvspace чеш\adddot}},
fromdanish = {{с датского}{с\addabbrvspace дат\adddot}},
fromdutch = {{с нидерландского}{с\addabbrvspace нидерл\adddot}},
fromenglish = {{с английского}{с\addabbrvspace англ\adddot}},
@@ -464,35 +469,36 @@
fromfrench = {{с французского}{с\addabbrvspace фр\adddot}},
fromgerman = {{с немецкого}{с\addabbrvspace нем\adddot}},
fromgreek = {{с греческого}{с\addabbrvspace греч\adddot}},
- fromitalian = {{с итальянского}{с\addabbrvspace ит\adddot}},
+ fromitalian = {{с итальянского}{с\addabbrvspace итал\adddot}},
fromlatin = {{с латинского}{с\addabbrvspace лат\adddot}},
fromnorwegian = {{с норвежского}{с\addabbrvspace норв\adddot}},
+ frompolish = {{с польского}{с пол\adddot}},
fromportuguese = {{с португальского}{с\addabbrvspace порт\adddot}},
fromrussian = {{с русского}{с\addabbrvspace рус\adddot}},
fromspanish = {{с испанского}{с\addabbrvspace исп\adddot}},
fromswedish = {{со шведского}{со\addabbrvspace швед\adddot}},
- countryde = {{Германия}{DE}},
- countryeu = {{Европейский Союз}{EU}},
- countryep = {{Европейский Союз}{EP}},
- countryfr = {{Франция}{FR}},
- countryuk = {{Великобритания}{GB}},
- countryus = {{Соединённые Штаты Америки}{US}},
+ countryde = {{Германия}{Германия}},
+ countryeu = {{Европейский Союз}{ЕС}},
+ countryep = {{Европейский Союз}{ЕС}},
+ countryfr = {{Франция}{Франция}},
+ countryuk = {{Великобритания}{Великобритания}},
+ countryus = {{Соединённые Штаты Америки}{США}},
patent = {{патент}{пат\adddot}},
patentde = {{патент Германии}{пат\adddotspace Германии}},
patenteu = {{патент Европы}{пат\adddotspace Европы}},
patentfr = {{патент Франции}{пат\adddotspace Франции}},
patentuk = {{патент Великобритании}{пат\adddotspace Великобритании}},
patentus = {{патент США}{пат\adddotspace США}},
- patreq = {{заявка на патент}{заявка на пат\adddot}},
+ patreq = {{заявка}{заявка}},
patreqde = {{заявка на патент Германии}{заявка на пат\adddotspace Германии}},
patreqeu = {{заявка на патент Европы}{заявка на пат\adddotspace Европы}},
patreqfr = {{заявка на патент Франции}{заявка на пат\adddotspace Франции}},
patrequk = {{заявка на патент Великобритании}{заявка на пат\adddotspace Великобритании}},
patrequs = {{заявка на патент США}{заявка на пат\adddotspace США}},
file = {{файл}{файл}},
- library = {{библиотека}{библ\adddot}},
+ library = {{библиотека}{б-ка}},
abstract = {{резюме}{рез\adddot}},
- annotation = {{аннотация}{анн\adddot}},
+ annotation = {{аннотация}{аннот\adddot}},
}
\protected\gdef\lbx@ru@mkbibdatemonth#1{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
index 7388d558315..fd0e8c0ee5c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
@@ -7,6 +7,7 @@
\protected\def\bibrangedash{\mbox{-}}% non-breaking hyphen
\protected\def\bibdatedash{\bibrangedash}% FIXME: unsure
\let\finalandcomma=\empty
+ \let\finalandsemicolon=\empty
\def\mkbibordinal{\mkbibmascord}%
\providecommand*{\sptext}{\textsuperscript}% \sptext -> spanish.ldf (babel)
\protected\def\mkbibmascord#1{\stripzeros{#1}\sptext{o}}%
@@ -351,6 +352,7 @@
langitalian = {{italiano}{italiano}},
langlatin = {{lat\'{\i}n}{lat\'{\i}n}},
langnorwegian = {{noruego}{noruego}},
+% langpolish = {{}{}},% FIXME: missing
langportuguese = {{portugu\'es}{portugu\'es}},
% langrussian = {{}{}},% FIXME: missing
langspanish = {{espa\~nol}{espa\~nol}},
@@ -370,6 +372,7 @@
fromitalian = {{del italiano}{del italiano}},
fromlatin = {{del lat\'{\i}n}{del lat\'{\i}n}},
fromnorwegian = {{del noruego}{del noruego}},
+% frompolish = {{}{}},% FIXME: missing
fromportuguese = {{del portugu\'es}{del portugu\'es}},
% fromrussian = {{}{}},% FIXME: missing
fromspanish = {{del espa\~nol}{del espa\~nol}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
index 07d3de3856b..d0fc59a56b8 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
@@ -28,6 +28,7 @@
\textendash\penalty\hyphenpenalty}% breakable dash
\protected\def\bibdatedash{\bibrangedash}%
\let\finalandcomma=\empty
+ \let\finalandsemicolon=\empty
\protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}%
% The following is for ordinals like "2:a" and "12:e".
% (Hedberg uses just "2." and "12." as above;
@@ -382,6 +383,7 @@
langitalian = {{italienska}{italienska}},
langlatin = {{latin}{latin}},
langnorwegian = {{norska}{norska}},
+% langpolish = {{}{}},% FIXME: missing
% langportuguese = {{}{}},% FIXME: missing
% langrussian = {{}{}},% FIXME: missing
langspanish = {{spanska}{spanska}},
@@ -401,6 +403,7 @@
fromitalian = {{fr\aa n italienska}{fr\aa n italienska}},
fromlatin = {{fr\aa n latin}{fr\aa n latin}},
fromnorwegian = {{fr\aa n norska}{fr\aa n norska}},
+% frompolish = {{}{}},% FIXME: missing
% fromportuguese = {{}{}},% FIXME: missing
% fromrussian = {{}{}},% FIXME: missing
fromspanish = {{fr\aa n spanska}{fr\aa n spanska}},