summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-10-27 22:52:35 +0000
committerKarl Berry <karl@freefriends.org>2013-10-27 22:52:35 +0000
commitd3eed84270fbc4f6a6acb3f046b9d722110ce875 (patch)
treeba7f7db9515e44de491302efb65fbae3f6f90dcf /Master/texmf-dist/tex/latex/biblatex
parentf85faa8bc11e179cbb70dbc4818fb575a3e9b955 (diff)
biblatex (26oct13)
git-svn-id: svn://tug.org/texlive/trunk@32011 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx103
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx12
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.def9
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.sty6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex1.sty386
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex2.sty417
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/blx-dm.def8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/blx-mcite.def2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx236
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx53
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx64
14 files changed, 814 insertions, 504 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
index 6f67296b03f..135a70083ff 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
@@ -54,6 +54,12 @@
\usebibmacro{setpageref}%
\finentry}
+\renewbibmacro*{begrelated}{%
+ \booltrue{bbx@inset}}
+
+\renewbibmacro*{endrelated}{%
+ \usebibmacro*{bbx:savehash}}
+
\renewbibmacro*{author}{%
\ifboolexpr{
test \ifuseauthor
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
index 11184cb886e..5dc44a07b22 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
@@ -1,16 +1,6 @@
\ProvidesFile{authoryear.bbx}
[\abx@bbxid]
-% authoryear styles are special in the following way:
-
-% The citation labels are "labelname (labelyear)" and since citation
-% labels are the keys into the references section, the fact that the
-% citation uses labelyear means that the references must also. This
-% means we use a special \printdate[extra]label macro to generate the
-% references section main date for an entry. Otherwise, if labeldate selects
-% anything other than DATE (or equivalently, YEAR/MONTH), then the
-% citation won't match the reference.
-
\RequireBibliographyStyle{standard}
\DeclareBibliographyOption{dashed}[true]{%
@@ -31,38 +21,46 @@
\def\bbx@opt@mergedate@true{\bbx@opt@mergedate@compact}
+% merge date/issue with date label
\def\bbx@opt@mergedate@maximum{%
\renewbibmacro*{date+extrayear}{%
- \iffieldundef{labelyear}
+ \iffieldundef{\thefield{datelabelsource}year}
{}
{\printtext[parens]{%
\printfield{issue}%
- \setunit*{\addspace}%
- \printdateextralabel}}}%
+ \setunit*{\addspace}%
+ \iffieldsequal{year}{\thefield{datelabelsource}year}
+ {\printdateextralabel}%
+ {\printfield{labelyear}%
+ \printfield{extrayear}}}}}%
\renewbibmacro*{date}{}%
- \renewbibmacro*{issue+date}{}%
-}
+ \renewbibmacro*{issue+date}{}}
+% merge date with date label
\def\bbx@opt@mergedate@compact{%
\renewbibmacro*{date+extrayear}{%
- \iffieldundef{labelyear}
+ \iffieldundef{\thefield{datelabelsource}year}
{}
- {\printtext[parens]{\printdateextralabel}}}%
+ {\printtext[parens]{%
+ \iffieldsequal{year}{\thefield{datelabelsource}year}
+ {\printdateextralabel}%
+ {\printfield{labelyear}%
+ \printfield{extrayear}}}}}%
\renewbibmacro*{date}{}%
\renewbibmacro*{issue+date}{%
\iffieldundef{issue}
{}
{\printtext[parens]{\printfield{issue}}}%
- \newunit}%
-}
+ \newunit}}
+% merge year-only date with date label
\def\bbx@opt@mergedate@basic{%
\renewbibmacro*{date+extrayear}{%
- \iffieldundef{labelyear}
+ \iffieldundef{\thefield{datelabelsource}year}
{}
{\printtext[parens]{%
- \printfield{labelyear}%
- \printfield{extrayear}}}}%
+ \printfield{\thefield{datelabelsource}year}%
+ \printfield{extrayear}}}}%
\renewbibmacro*{date}{%
\iffieldundef{month}
{}
@@ -75,19 +73,19 @@
}
{}
{\printtext[parens]{%
- \printfield{issue}%
- \setunit*{\addspace}%
- \printdate}}%
- \newunit}%
-}
+ \printfield{issue}%
+ \setunit*{\addspace}%
+ \printdate}}%
+ \newunit}}
+% merge year-only date with year-only date label
\def\bbx@opt@mergedate@minimum{%
\renewbibmacro*{date+extrayear}{%
- \iffieldundef{labelyear}
+ \iffieldundef{\thefield{datelabelsource}year}
{}
{\printtext[parens]{%
- \printfield{labelyear}%
- \printfield{extrayear}}}}%
+ \printfield{\thefield{datelabelsource}year}%
+ \printfield{extrayear}}}}%
\renewbibmacro*{date}{%
\ifboolexpr{
test {\iffieldundef{month}}
@@ -106,28 +104,28 @@
}
{}
{\printtext[parens]{%
- \printfield{issue}%
- \setunit*{\addspace}%
- \printdate}}%
- \newunit}%
-}
+ \printfield{issue}%
+ \setunit*{\addspace}%
+ \printdate}}%
+ \newunit}}
+% don't merge date/issue with date label
\def\bbx@opt@mergedate@false{%
\renewbibmacro*{date+extrayear}{%
- \iffieldundef{labelyear}
+ \iffieldundef{\thefield{datelabelsource}year}
{}
{\printtext[parens]{%
- \printfield{labelyear}%
- \printfield{extrayear}}}}%
+ \printfield{\thefield{datelabelsource}year}%
+ \printfield{extrayear}}}}%
\renewbibmacro*{date}{\printdate}%
\renewbibmacro*{issue+date}{%
\printtext[parens]{%
\printfield{issue}%
\setunit*{\addspace}%
\printdate}%
- \newunit}%
-}
+ \newunit}}
+% n.b. the default datelabel=year overrides merging of months and days
\ExecuteBibliographyOptions{labeldate,sorting=nyt,pagetracker,mergedate}
\DeclareFieldFormat{shorthandwidth}{#1}
@@ -160,8 +158,7 @@
{\endlist}
{\item}
-\InitializeBibliographyStyle{%
- \global\undef\bbx@lasthash}
+\InitializeBibliographyStyle{\global\undef\bbx@lasthash}
\newbibmacro*{bbx:savehash}{%
\savefield{fullhash}{\bbx@lasthash}}
@@ -174,6 +171,12 @@
\usebibmacro{setpageref}%
\finentry}
+\renewbibmacro*{begrelated}{%
+ \booltrue{bbx@inset}}
+
+\renewbibmacro*{endrelated}{%
+ \usebibmacro*{bbx:savehash}}
+
\renewbibmacro*{author}{%
\ifboolexpr{
test \ifuseauthor
@@ -184,13 +187,13 @@
{\bibnamedash}
{\usebibmacro{bbx:savehash}%
\printnames{author}%
- \iffieldundef{authortype}
- {\setunit{\addspace}}
- {\setunit{\addcomma\space}}}%
+ \iffieldundef{authortype}
+ {\setunit{\addspace}}
+ {\setunit{\addcomma\space}}}%
\iffieldundef{authortype}
{}
{\usebibmacro{authorstrg}%
- \setunit{\addspace}}}%
+ \setunit{\addspace}}}%
{\global\undef\bbx@lasthash
\usebibmacro{labeltitle}%
\setunit*{\addspace}}%
@@ -209,8 +212,8 @@
{\usebibmacro{bbx:dashcheck}
{\bibnamedash}
{\printnames{editor}%
- \setunit{\addcomma\space}%
- \usebibmacro{bbx:savehash}}%
+ \setunit{\addcomma\space}%
+ \usebibmacro{bbx:savehash}}%
\usebibmacro{#1}%
\clearname{editor}%
\setunit{\addspace}}%
@@ -232,8 +235,8 @@
{\usebibmacro{bbx:dashcheck}
{\bibnamedash}
{\printnames{translator}%
- \setunit{\addcomma\space}%
- \usebibmacro{bbx:savehash}}%
+ \setunit{\addcomma\space}%
+ \usebibmacro{bbx:savehash}}%
\usebibmacro{translator+othersstrg}%
\clearname{translator}%
\setunit{\addspace}}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
index 2751b61e6c1..80891b02f39 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
@@ -888,6 +888,8 @@
\newbibmacro*{begrelated}{}
\newbibmacro*{endrelated}{}
+\newbibmacro*{begrelatedloop}{}
+\newbibmacro*{endrelatedloop}{}
\def\ifrelatedloop{%
\ifboolexpr{ test {\xifinlistcs{\strfield{entrykey}}{bbx:relatedloop}}
@@ -896,7 +898,8 @@
\newbibmacro*{related}{%
\ifboolexpr{ test {\iffieldundef{related}} or test {\ifrelatedloop} }
{}
- {\def\bbx@tempa{}%
+ {\usebibmacro{begrelated}%
+ \def\bbx@tempa{}%
\setcounter{bbx:relatedtotal}{0}%
\def\do##1{%
\entrydata{##1}{%
@@ -927,7 +930,7 @@
{\def\bbx@tempb{relatedstring:default}}
{\def\bbx@tempb{relatedstring:\strfield{relatedtype}}}%
\printtext[\bbx@tempa]{%
- \usebibmacro{begrelated}%
+ \usebibmacro{begrelatedloop}%
\iffieldundef{relatedstring}
{\ifboolexpr{
test {\ifnumgreater{\value{bbx:relatedtotal}}{1}}
@@ -945,7 +948,8 @@
\bibstring[\mkrelatedstring]{\thefield{relatedstring}}}}
{\printfield[\bbx@tempb]{relatedstring}}}%
\docsvfield{related}%
- \usebibmacro{endrelated}}}%
- {}}}
+ \usebibmacro{endrelatedloop}}}%
+ {}%
+ \usebibmacro{endrelated}}}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
index 6b466241f2e..9566dd7b057 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
@@ -443,7 +443,8 @@
\DeclareFieldFormat{related:multivolume}{\par\nobreak#1}
\DeclareFieldFormat{related:origpubin}{\mkbibparens{#1}}
\DeclareFieldFormat{related:origpubas}{\mkbibparens{#1}}
-\DeclareFieldFormat{relatedstring:default}{#1\relatedpunct}
+\DeclareFieldFormat{relatedstring:default}{#1\printunit{\relatedpunct}}
+\DeclareFieldFormat{relatedstring:reprintfrom}{#1\addspace}
% Generic formats for \printtext and \printfield
@@ -1013,6 +1014,7 @@
\step[fieldset=type, fieldvalue=techreport]
}
\map{
+ \step[fieldsource=hyphenation, fieldtarget=langid]
\step[fieldsource=address, fieldtarget=location]
\step[fieldsource=school, fieldtarget=institution]
\step[fieldsource=annote, fieldtarget=annotation]
@@ -2833,8 +2835,9 @@
\newbibmacro*{related:multivolume}[1]{%
\entrydata*{#1}{%
- \printfield{volume}%
- \printfield{part}%
+ \printtext{%
+ \printfield{volume}%
+ \printfield{part}}%
\setunit*{\addcolon\space}%
\usebibmacro{title}%
\ifboolexpr{
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
index 8bbfd065998..f0299e8fd27 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/07/15}
-\def\abx@version{2.7a}
+\def\abx@date{2013/10/26}
+\def\abx@version{2.8}
\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)}
@@ -16,7 +16,7 @@
% 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
-\def\blx@bblversion{2.2}
+\def\blx@bblversion{2.3}
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{biblatex}
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty
index 1a33fa547ed..5777027e0ab 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty
@@ -69,19 +69,20 @@
amsrefs,apacite,babelbib,backref,bibtopic,bibunits,chapterbib,
cite,citeref,drftcite,footbib,inlinebib,jurabib,mcite,mciteplus,
mlbib,multibbl,multibib,natbib,opcit,overcite,splitbib,ucs}%
- \ifboolexpr{
- test {\@ifpackageloaded{babel}}
- and
- not test {\@ifpackageloaded{polyglossia}}
- }
+ \@ifpackageloaded{polyglossia}
{\iftoggle{blx@autolang}
- {\blx@mkbabel}
- {\blx@mknobabel}}
- {\blx@mknobabel}%
+ {\blx@mkautolangpoly}
+ {\blx@mknoautolang}}
+ {\@ifpackageloaded{babel}
+ {\iftoggle{blx@autolang}
+ {\blx@mkautolangbabel}
+ {\blx@mknoautolang}}
+ {{\blx@mknoautolang}}}%
\csuse{abx@extras@\blx@languagename}%
\csuse{abx@strings@\blx@languagename}%
- \undef\blx@mkbabel
- \undef\blx@mknobabel
+ \undef\blx@mkautolangbabel
+ \undef\blx@mkautolangpoly
+ \undef\blx@mknoautolang
\ifnum\blx@hyperref=\z@
\blx@mknohyperref
\else
@@ -232,7 +233,7 @@
{\newcommand*{\@quotereset}{}\newcount\@quotereset}}
{\@ifpackageloaded{babel}
{\blx@warning@noline{%
- 'babel' detected but 'csquotes' missing.\MessageBreak
+ 'babel/polyglossia' detected but 'csquotes' missing.\MessageBreak
Loading 'csquotes' recommended}}
{}%
\newcommand*{\@quotelevel}{}%
@@ -2378,15 +2379,19 @@
% {<true>}{<false>}
\protected\def\blx@ifciteseen@global{%
- \ifdef\abx@field@entrykey
- {\expandafter\blx@ifseen@global
- \expandafter{\abx@field@entrykey}}
+ \ifbool{citetracker}
+ {\ifdef\abx@field@entrykey
+ {\expandafter\blx@ifseen@global
+ \expandafter{\abx@field@entrykey}}
+ {\@secondoftwo}}
{\@secondoftwo}}
\protected\def\blx@ifciteseen@context{%
- \ifdef\abx@field@entrykey
- {\expandafter\blx@ifseen@context
- \expandafter{\abx@field@entrykey}}
+ \ifbool{citetracker}
+ {\ifdef\abx@field@entrykey
+ {\expandafter\blx@ifseen@context
+ \expandafter{\abx@field@entrykey}}
+ {\@secondoftwo}}
{\@secondoftwo}}
% {<entrykey>}{<true>}{<false>}
@@ -2398,108 +2403,142 @@
\blx@xsanitizeafter\blx@ifseen@context}
\def\blx@ifseen@global#1{%
- \ifinlistcs{#1}{blx@bsee@\the\c@refsection}}
+ \ifbool{citetracker}
+ {\ifinlistcs{#1}{blx@bsee@\the\c@refsection}}
+ {\@secondoftwo}}
\def\blx@ifseen@context#1{%
- \iftoggle{blx@footnote}
- {\ifinlistcs{#1}{blx@fsee@\the\c@refsection}}
- {\ifinlistcs{#1}{blx@bsee@\the\c@refsection}}}
+ \ifbool{citetracker}
+ {\iftoggle{blx@footnote}
+ {\ifinlistcs{#1}{blx@fsee@\the\c@refsection}}
+ {\ifinlistcs{#1}{blx@bsee@\the\c@refsection}}}
+ {\@secondoftwo}}
% {<true>}{<false>}
\def\blx@ifciteibid@global{%
- \blx@imc@iffieldequals{entrykey}\blx@lastkey@text}
+ \ifbool{citetracker}
+ {\blx@imc@iffieldequals{entrykey}\blx@lastkey@text}
+ {\@secondoftwo}}
\def\blx@ifciteibid@context{%
- \iftoggle{blx@footnote}
- {\blx@imc@iffieldequals{entrykey}\blx@lastkey@foot}
- {\blx@imc@iffieldequals{entrykey}\blx@lastkey@text}}
+ \ifbool{citetracker}
+ {\iftoggle{blx@footnote}
+ {\blx@imc@iffieldequals{entrykey}\blx@lastkey@foot}
+ {\blx@imc@iffieldequals{entrykey}\blx@lastkey@text}}
+ {\@secondoftwo}}
\def\blx@ifciteibid@strict{%
- \blx@ifcitesingle
- {\blx@ifciteibid@global}
- {\@secondoftwo}}%
+ \ifbool{citetracker}
+ {\blx@ifcitesingle
+ {\blx@ifciteibid@global}
+ {\@secondoftwo}}
+ {\@secondoftwo}}
\def\blx@ifciteibid@constrict{%
- \blx@ifcitesingle
- {\iftoggle{blx@footnote}
- {\blx@ifmpfncheck
- {\blx@imc@iffieldequals{entrykey}\blx@lastkey@foot}
- {\@secondoftwo}}
- {\blx@imc@iffieldequals{entrykey}\blx@lastkey@text}}
- {\@secondoftwo}}%
+ \ifbool{citetracker}
+ {\blx@ifcitesingle
+ {\iftoggle{blx@footnote}
+ {\blx@ifmpfncheck
+ {\blx@imc@iffieldequals{entrykey}\blx@lastkey@foot}
+ {\@secondoftwo}}
+ {\blx@imc@iffieldequals{entrykey}\blx@lastkey@text}}
+ {\@secondoftwo}}
+ {\@secondoftwo}}
% {<true>}{<false>}
\def\blx@ifciteidem@global{%
- \blx@imc@iffieldequals{fullhash}\blx@lasthash@text}
+ \ifbool{citetracker}
+ {\blx@imc@iffieldequals{fullhash}\blx@lasthash@text}
+ {\@secondoftwo}}
\def\blx@ifciteidem@context{%
- \iftoggle{blx@footnote}
- {\blx@imc@iffieldequals{fullhash}\blx@lasthash@foot}
- {\blx@imc@iffieldequals{fullhash}\blx@lasthash@text}}
+ \ifbool{citetracker}
+ {\iftoggle{blx@footnote}
+ {\blx@imc@iffieldequals{fullhash}\blx@lasthash@foot}
+ {\blx@imc@iffieldequals{fullhash}\blx@lasthash@text}}
+ {\@secondoftwo}}
\let\blx@ifciteidem@strict\blx@ifciteidem@global
\def\blx@ifciteidem@constrict{%
- \iftoggle{blx@footnote}
- {\blx@ifmpfncheck
- {\blx@imc@iffieldequals{fullhash}\blx@lasthash@foot}
- {\@secondoftwo}}
- {\blx@imc@iffieldequals{fullhash}\blx@lasthash@text}}
+ \ifbool{citetracker}
+ {\iftoggle{blx@footnote}
+ {\blx@ifmpfncheck
+ {\blx@imc@iffieldequals{fullhash}\blx@lasthash@foot}
+ {\@secondoftwo}}
+ {\blx@imc@iffieldequals{fullhash}\blx@lasthash@text}}
+ {\@secondoftwo}}
% {<true>}{<false>}
\def\blx@ifopcit@global{%
- \blx@imc@iffieldundef{namehash}
- {\@secondoftwo}
- {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@text@\abx@field@namehash}}}
+ \ifbool{citetracker}
+ {\blx@imc@iffieldundef{namehash}
+ {\@secondoftwo}
+ {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@text@\abx@field@namehash}}}
+ {\@secondoftwo}}
\def\blx@ifopcit@context{%
- \blx@imc@iffieldundef{namehash}
- {\@secondoftwo}
- {\iftoggle{blx@footnote}
- {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@foot@\abx@field@namehash}}
- {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@text@\abx@field@namehash}}}}
-
-\def\blx@ifopcit@strict{%
- \blx@ifcitesingle
- {\blx@ifopcit@global}
- {\@secondoftwo}}%
-
-\def\blx@ifopcit@constrict{%
- \blx@ifcitesingle
+ \ifbool{citetracker}
{\blx@imc@iffieldundef{namehash}
{\@secondoftwo}
{\iftoggle{blx@footnote}
- {\blx@ifmpfncheck
- {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@foot@\abx@field@namehash}}
- {\@secondoftwo}}
+ {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@foot@\abx@field@namehash}}
{\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@text@\abx@field@namehash}}}}
- {\@secondoftwo}}%
+ {\@secondoftwo}}
+
+\def\blx@ifopcit@strict{%
+ \ifbool{citetracker}
+ {\blx@ifcitesingle
+ {\blx@ifopcit@global}
+ {\@secondoftwo}}
+ {\@secondoftwo}}
+
+\def\blx@ifopcit@constrict{%
+ \ifbool{citetracker}
+ {\blx@ifcitesingle
+ {\blx@imc@iffieldundef{namehash}
+ {\@secondoftwo}
+ {\iftoggle{blx@footnote}
+ {\blx@ifmpfncheck
+ {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@foot@\abx@field@namehash}}
+ {\@secondoftwo}}
+ {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@text@\abx@field@namehash}}}}
+ {\@secondoftwo}}
+ {\@secondoftwo}}
% {<true>}{<false>}
\def\blx@ifloccit@global{%
- \blx@loccit@check{text}}
+ \ifbool{citetracker}
+ {\blx@loccit@check{text}}
+ {\@secondoftwo}}
\def\blx@ifloccit@context{%
- \iftoggle{blx@footnote}
- {\blx@loccit@check{foot}}
- {\blx@loccit@check{text}}}
+ \ifbool{citetracker}
+ {\iftoggle{blx@footnote}
+ {\blx@loccit@check{foot}}
+ {\blx@loccit@check{text}}}
+ {\@secondoftwo}}
\def\blx@ifloccit@strict{%
- \blx@ifcitesingle
- {\blx@loccit@numcheck{text}}
- {\@secondoftwo}}%
+ \ifbool{citetracker}
+ {\blx@ifcitesingle
+ {\blx@loccit@numcheck{text}}
+ {\@secondoftwo}}
+ {\@secondoftwo}}
\def\blx@ifloccit@constrict{%
- \blx@ifcitesingle
- {\iftoggle{blx@footnote}
- {\blx@ifmpfncheck
- {\blx@loccit@numcheck{foot}}
- {\@secondoftwo}}
- {\blx@loccit@numcheck{text}}}
+ \ifbool{citetracker}
+ {\blx@ifcitesingle
+ {\iftoggle{blx@footnote}
+ {\blx@ifmpfncheck
+ {\blx@loccit@numcheck{foot}}
+ {\@secondoftwo}}
+ {\blx@loccit@numcheck{text}}}
+ {\@secondoftwo}}
{\@secondoftwo}}
\def\blx@loccit@check#1{%
@@ -2535,9 +2574,11 @@
% {<true>}{<false>}
\def\blx@imc@iffirstonpage{%
- \iftoggle{blx@footnote}
- {\blx@iffirstonpage{fnpage}}
- {\blx@iffirstonpage{page}}}
+ \ifbool{pagetracker}
+ {\iftoggle{blx@footnote}
+ {\blx@iffirstonpage{fnpage}}
+ {\blx@iffirstonpage{page}}}
+ {\@secondoftwo}}
\def\blx@iffirstonpage#1{%
\ifcsundef{blx@#1@\number\c@instcount}
@@ -2565,11 +2606,13 @@
% {<count1>}{<count2>}{<true>}{<false>}
\def\blx@imc@ifsamepage#1#2{%
- \ifcsundef{blx@page@\number\numexpr#1}
- {\ifcsundef{blx@fnpage@\number\numexpr#1}
- {\@secondoftwo}
- {\blx@ifsamepage{#1}{#2}{fnpage}}}
- {\blx@ifsamepage{#1}{#2}{page}}}
+ \ifbool{pagetracker}
+ {\ifcsundef{blx@page@\number\numexpr#1}
+ {\ifcsundef{blx@fnpage@\number\numexpr#1}
+ {\@secondoftwo}
+ {\blx@ifsamepage{#1}{#2}{fnpage}}}
+ {\blx@ifsamepage{#1}{#2}{page}}}
+ {\@secondoftwo}}
\def\blx@ifsamepage#1#2#3{%
\ifcsundef{blx@page@\number\numexpr#2}
@@ -3376,8 +3419,8 @@
\@ifstar\blx@mksc@i\blx@mksc@ii}
\def\blx@mksc@i{%
- \ifdef\abx@field@hyphenation
- {\xifinlist\abx@field@hyphenation\blx@cmksc@lang
+ \ifdef\abx@field@langid
+ {\xifinlist\abx@field@langid\blx@cmksc@lang
{\blx@mksc@ii}
{\@firstofone}}
{\blx@mksc@ii}}
@@ -4855,6 +4898,26 @@
\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
\printfield{extrayear}}}}}}}
+\newrobustcmd*{\mkbibrangeyear}[1]{%
+ \blx@imc@clearfield{#1month}%
+ \blx@imc@clearfield{#1day}%
+ \blx@imc@clearfield{#1endmonth}%
+ \blx@imc@clearfield{#1endday}%
+ \iffieldsequal{#1year}{#1endyear}
+ {\blx@imc@clearfield{#1endyear}}
+ {}%
+ \mkbibrangefull{short}{#1}}
+
+\newrobustcmd*{\mkbibrangeyearextra}[1]{%
+ \blx@imc@clearfield{#1month}%
+ \blx@imc@clearfield{#1day}%
+ \blx@imc@clearfield{#1endmonth}%
+ \blx@imc@clearfield{#1endday}%
+ \iffieldsequal{#1year}{#1endyear}
+ {\blx@imc@clearfield{#1endyear}}
+ {}%
+ \mkbibrangefullextra{short}{#1}}
+
\expandafter\newrobustcmd
\expandafter*\csname mkbibrangeiso8601\endcsname[1]{%
\iffieldundef{#1year}
@@ -4911,6 +4974,8 @@
\protected\def\blx@imc@printdate{}
\protected\def\blx@imc@printdateextra{}
+\protected\def\blx@imc@printdatelabel{}
+\protected\def\blx@imc@printdateextralabel{}
\protected\def\blx@imc@printurldate{}
\protected\def\blx@imc@printeventdate{}
\protected\def\blx@imc@printorigdate{}
@@ -4947,8 +5012,7 @@
\noexpand\blx@resetpunct
\expandafter\noexpand\csname abx@noextras@#2\endcsname}}
-%% Babel interface
-
+%% babel/polyglossia interface
\def\blx@beglang{\blx@clearlang\begingroup}
\def\blx@endlang{\endgroup}
\let\blx@hook@endlang\@empty
@@ -4968,31 +5032,60 @@
\begingroup
\@makeother\#
-\gdef\blx@mkbabel{%
+\gdef\blx@mkautolangbabel{%
\pretocmd\select@language{\blx@langsetup{#1}}
{\ifdef\blx@thelangenv
{\def\blx@beglang{%
\blx@clearlang
\begingroup
- \blx@imc@iffieldundef{hyphenation}
+ \blx@imc@iffieldundef{langid}
{}
- {\ifcsundef{l@\abx@field@hyphenation}
- {\blx@warn@nohyph{\abx@field@hyphenation}}
+ {\ifcsundef{l@\abx@field@langid}
+ {\blx@warn@nohyph{\abx@field@langid}}
{\blx@hook@initlang
\def\blx@endlang{%
\blx@hook@endlang
\csname end\blx@thelangenv\endcsname
\endgroup}%
\csname\blx@thelangenv\expandafter\endcsname
- \expandafter{\abx@field@hyphenation}}}}}
+ \expandafter{\abx@field@langid}}}}}
{}%
\def\blx@imc@mainlang{\select@language{\bbl@main@language}}%
\blx@langsetup\bbl@main@language}
{\blx@err@patch{'babel' package}%
- \blx@mknobabel}}
+ \blx@mknoautolang}}
+
+\gdef\blx@mkautolangpoly{%
+ \catcode`\_=11% polyglossia uses "_" as a letter
+ \pretocmd\select@language{\blx@langsetup{#1}}
+ {\ifdef\blx@thelangenv
+ {\def\blx@beglang{%
+ \blx@clearlang
+ \begingroup
+ \blx@imc@iffieldundef{langid}
+ {}
+ {\ifcsundef{l@\abx@field@langid}
+ {\blx@warn@nohyph{\abx@field@langid}}
+ {\blx@hook@initlang
+ \def\blx@endlang{%
+ \blx@hook@endlang
+ \csname end\blx@thelangenv\endcsname
+ \endgroup}%
+ \csname\blx@thelangenv\expandafter\endcsname
+ \expandafter{\abx@field@langid}%
+ % These lines are equal to \blx@maplang
+ \blx@resetpunct
+ \csuse{abx@extras@\abx@field@langid}%
+ \csuse{abx@strings@\abx@field@langid}}}}}
+ {}%
+ \def\blx@imc@mainlang{\select@language{\bbl@main@language}}%
+ \blx@langsetup\bbl@main@language}
+ {\blx@err@patch{'polyglossia' package}%
+ \blx@mknoautolang}%
+ \catcode`\_=8}
\endgroup
-\def\blx@mknobabel{%
+\def\blx@mknoautolang{%
\blx@lbxinput{\blx@languagename}
{}
{\blx@err@nolang{\blx@languagename}}}
@@ -5137,7 +5230,6 @@
\do{related}%
\do{relatedtype}%
\do{relatedstring}%
- \do{hyphenation}%
\do{keywords}%
\do{authortype}%
\do{editortype}%
@@ -5176,6 +5268,7 @@
\do{journalsubtitle}%
\do{label}%
\do{labelalpha}%
+ \do{langid}%
\do{extraalpha}%
\do{labelnumber}%
\do{labeltitle}%
@@ -7678,7 +7771,7 @@
% ibidem tracker
-\def\blx@ibidtracker@gobal{%
+\def\blx@ibidtracker@global{%
\ifbool{citetracker}
{\global\let\blx@lastkey@text\abx@field@entrykey}
{}}
@@ -7692,8 +7785,8 @@
\def\blx@ibidtracker@strict{%
\blx@ifcitesingle
- {\blx@ibidtracker@gobal}
- {\blx@ibidreset@gobal}}%
+ {\blx@ibidtracker@global}
+ {\blx@ibidreset@global}}%
\def\blx@ibidtracker@constrict{%
\blx@ifcitesingle
@@ -7706,7 +7799,7 @@
\global\undef\blx@lastkey@foot
\blx@mpfnreset}
-\def\blx@ibidreset@gobal{%
+\def\blx@ibidreset@global{%
\global\undef\blx@lastkey@text}
\def\blx@ibidreset@context{%
@@ -7729,7 +7822,7 @@
% idem tracker
-\def\blx@idemtracker@gobal{%
+\def\blx@idemtracker@global{%
\ifbool{citetracker}
{\global\let\blx@lasthash@text\abx@field@fullhash}
{}}
@@ -7741,7 +7834,7 @@
{\global\let\blx@lasthash@text\abx@field@fullhash}}
{}}
-\let\blx@idemtracker@strict\blx@idemtracker@gobal
+\let\blx@idemtracker@strict\blx@idemtracker@global
\def\blx@idemtracker@constrict{%
\blx@mpfnsave
@@ -7752,7 +7845,7 @@
\global\undef\blx@lasthash@foot
\blx@mpfnreset}
-\def\blx@idemreset@gobal{%
+\def\blx@idemreset@global{%
\global\undef\blx@lasthash@text}
\def\blx@idemreset@context{%
@@ -7775,7 +7868,7 @@
% opcit tracker
-\def\blx@opcittracker@gobal{%
+\def\blx@opcittracker@global{%
\ifbool{citetracker}
{\blx@opcit@tracker{text}}
{}}
@@ -7789,8 +7882,8 @@
\def\blx@opcittracker@strict{%
\blx@ifcitesingle
- {\blx@opcittracker@gobal}
- {\blx@opcitreset@gobal}}%
+ {\blx@opcittracker@global}
+ {\blx@opcitreset@global}}%
\def\blx@opcittracker@constrict{%
\blx@ifcitesingle
@@ -7818,7 +7911,7 @@
\blx@opcit@reset{foot}%
\blx@mpfnreset}
-\def\blx@opcitreset@gobal{%
+\def\blx@opcitreset@global{%
\blx@opcit@reset{text}}
\def\blx@opcitreset@context{%
@@ -7864,7 +7957,7 @@
% loccit tracker
-\def\blx@loccittracker@gobal{%
+\def\blx@loccittracker@global{%
\ifbool{citetracker}
{\blx@loccit@tracker{text}}
{}}
@@ -7924,7 +8017,7 @@
\blx@loccit@reset{foot}%
\blx@mpfnreset}
-\def\blx@loccitreset@gobal{%
+\def\blx@loccitreset@global{%
\blx@loccit@reset{text}}
\def\blx@loccitreset@context{%
@@ -9834,22 +9927,31 @@
\settoggle{blx@clearlang}{#1}}
\DeclareBibliographyOption{babel}{%
- \ifcsdef{blx@opt@babel@#1}
- {\csuse{blx@opt@babel@#1}}
- {\blx@err@invopt{babel=#1}{}}}
-\def\blx@opt@babel@none{%
+ \blx@warning@noline{%
+ 'babel' option is deprecated, use 'autolang' instead}%
+ \blx@autolang@i{#1}}
+
+\DeclareBibliographyOption{autolang}{%
+ \blx@autolang@i{#1}}
+
+\def\blx@autolang@i#1{%
+ \ifcsdef{blx@opt@autolang@#1}
+ {\csuse{blx@opt@autolang@#1}}
+ {\blx@err@invopt{autolang=#1}{}}}
+
+\def\blx@opt@autolang@none{%
\undef\blx@thelangenv
\let\blx@hook@initlang\@empty
\let\blx@hook@endlang\@empty}
-\def\blx@opt@babel@hyphen{%
+\def\blx@opt@autolang@hyphen{%
\def\blx@thelangenv{hyphenrules}%
\let\blx@hook@initlang\@empty
\let\blx@hook@endlang\@empty}
-\csdef{blx@opt@babel@other*}{%
+\csdef{blx@opt@autolang@other*}{%
\def\blx@thelangenv{otherlanguage*}%
\def\blx@hook@initlang{\@quotereset\@ne}%
\def\blx@hook@endlang{\blx@postpunct}}
-\def\blx@opt@babel@other{%
+\def\blx@opt@autolang@other{%
\def\blx@thelangenv{otherlanguage}%
\def\blx@hook@initlang{\@quotereset\@ne}%
\def\blx@hook@endlang{\blx@postpunct}}
@@ -10043,8 +10145,8 @@
{\blx@err@invopt{ibidtracker=#1}{}}}
\def\blx@opt@ibidtracker@true{%
\let\blx@imc@ifciteibid\blx@ifciteibid@global
- \let\blx@ibidtracker\blx@ibidtracker@gobal
- \let\blx@ibidreset\blx@ibidreset@gobal
+ \let\blx@ibidtracker\blx@ibidtracker@global
+ \let\blx@ibidreset\blx@ibidreset@global
\booltrue{citetracker}}
\def\blx@opt@ibidtracker@false{%
\let\blx@imc@ifciteibid\@secondoftwo
@@ -10058,7 +10160,7 @@
\def\blx@opt@ibidtracker@strict{%
\let\blx@imc@ifciteibid\blx@ifciteibid@strict
\let\blx@ibidtracker\blx@ibidtracker@strict
- \let\blx@ibidreset\blx@ibidreset@gobal
+ \let\blx@ibidreset\blx@ibidreset@global
\booltrue{citetracker}}
\def\blx@opt@ibidtracker@constrict{%
\let\blx@imc@ifciteibid\blx@ifciteibid@constrict
@@ -10072,8 +10174,8 @@
{\blx@err@invopt{idemtracker=#1}{}}}
\def\blx@opt@idemtracker@true{%
\let\blx@imc@ifciteidem\blx@ifciteidem@global
- \let\blx@idemtracker\blx@idemtracker@gobal
- \let\blx@idemreset\blx@idemreset@gobal
+ \let\blx@idemtracker\blx@idemtracker@global
+ \let\blx@idemreset\blx@idemreset@global
\booltrue{citetracker}}
\def\blx@opt@idemtracker@false{%
\let\blx@imc@ifciteidem\@secondoftwo
@@ -10087,7 +10189,7 @@
\def\blx@opt@idemtracker@strict{%
\let\blx@imc@ifciteidem\blx@ifciteidem@strict
\let\blx@idemtracker\blx@idemtracker@strict
- \let\blx@idemreset\blx@idemreset@gobal
+ \let\blx@idemreset\blx@idemreset@global
\booltrue{citetracker}}
\def\blx@opt@idemtracker@constrict{%
\let\blx@imc@ifciteidem\blx@ifciteidem@constrict
@@ -10101,8 +10203,8 @@
{\blx@err@invopt{opcittracker=#1}{}}}
\def\blx@opt@opcittracker@true{%
\let\blx@imc@ifopcit\blx@ifopcit@global
- \let\blx@opcittracker\blx@opcittracker@gobal
- \let\blx@opcitreset\blx@opcitreset@gobal
+ \let\blx@opcittracker\blx@opcittracker@global
+ \let\blx@opcitreset\blx@opcitreset@global
\booltrue{citetracker}}
\def\blx@opt@opcittracker@false{%
\let\blx@imc@ifopcit\@secondoftwo
@@ -10116,7 +10218,7 @@
\def\blx@opt@opcittracker@strict{%
\let\blx@imc@ifopcit\blx@ifopcit@strict
\let\blx@opcittracker\blx@opcittracker@strict
- \let\blx@opcitreset\blx@opcitreset@gobal
+ \let\blx@opcitreset\blx@opcitreset@global
\booltrue{citetracker}}
\def\blx@opt@opcittracker@constrict{%
\let\blx@imc@ifopcit\blx@ifopcit@constrict
@@ -10130,8 +10232,8 @@
{\blx@err@invopt{loccittracker=#1}{}}}
\def\blx@opt@loccittracker@true{%
\let\blx@imc@ifloccit\blx@ifloccit@global
- \let\blx@loccittracker\blx@loccittracker@gobal
- \let\blx@loccitreset\blx@loccitreset@gobal
+ \let\blx@loccittracker\blx@loccittracker@global
+ \let\blx@loccitreset\blx@loccitreset@global
\booltrue{citetracker}}
\def\blx@opt@loccittracker@false{%
\let\blx@imc@ifloccit\@secondoftwo
@@ -10145,7 +10247,7 @@
\def\blx@opt@loccittracker@strict{%
\let\blx@imc@ifloccit\blx@ifloccit@strict
\let\blx@loccittracker\blx@loccittracker@strict
- \let\blx@loccitreset\blx@loccitreset@gobal
+ \let\blx@loccitreset\blx@loccitreset@global
\booltrue{citetracker}}
\def\blx@opt@loccittracker@constrict{%
\let\blx@imc@ifloccit\blx@ifloccit@constrict
@@ -10172,11 +10274,21 @@
\DeclareBibliographyOption{date}{%
\ifcsdef{mkbibrange#1}
{\protected\def\blx@imc@printdate{\csuse{mkbibrange#1}{}}%
- \protected\def\blx@imc@printdatelabel{\csuse{mkbibrange#1}{}}%
- \protected\def\blx@imc@printdateextra{\csuse{mkbibrange#1extra}{}}%
- \protected\def\blx@imc@printdateextralabel{\csuse{mkbibrange#1extra}{}}}
+ \protected\def\blx@imc@printdateextra{\csuse{mkbibrange#1extra}{}}}
{\blx@err@invopt{date=#1}{}}}
+\DeclareBibliographyOption{datelabel}{%
+ \ifcsdef{mkbibrange#1}
+ {\protected\def\blx@imc@printdatelabel{%
+ \blx@imc@iffieldundef{year}
+ {\csuse{mkbibrange#1}{label}}
+ {\csuse{mkbibrange#1}{}}}%
+ \protected\def\blx@imc@printdateextralabel{%
+ \blx@imc@iffieldundef{year}
+ {\csuse{mkbibrange#1extra}{label}}
+ {\csuse{mkbibrange#1extra}{}}}}
+ {\blx@err@invopt{datelabel=#1}{}}}
+
\DeclareBibliographyOption{urldate}{%
\ifcsdef{mkbibrange#1}
{\protected\def\blx@imc@printurldate{\csuse{mkbibrange#1}{url}}}
@@ -10466,11 +10578,11 @@
usetranslator=false,indexing=false,abbreviate=true,dateabbrev=true,
backref=false,backrefsetstyle=setonly,pagetracker=false,ibidtracker=false,
idemtracker=false,opcittracker=false,loccittracker=false,citetracker=false,
- citecounter=false,block=none,language=auto,clearlang=true,babel=none,
- date=comp,origdate=comp,eventdate=comp,urldate=short,autopunct=true,
- punctfont=false,defernumbers=false,refsection=none,refsegment=none,
- citereset=none,hyperref=auto,parentracker,maxparens=3,maxline=79,
- bibencoding=auto,bibwarn}
+ citecounter=false,block=none,language=auto,clearlang=true,autolang=none,
+ date=comp,datelabel=year,origdate=comp,eventdate=comp,urldate=short,
+ autopunct=true,punctfont=false,defernumbers=false,
+ refsection=none,refsegment=none,citereset=none,hyperref=auto,
+ parentracker,maxparens=3,maxline=79,bibencoding=auto,bibwarn}
% Load compatibility code
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty
index fd4576f2653..9a7bef604b1 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty
@@ -65,19 +65,20 @@
amsrefs,apacite,babelbib,backref,bibtopic,bibunits,chapterbib,
cite,citeref,drftcite,footbib,inlinebib,jurabib,mcite,mciteplus,
mlbib,multibbl,multibib,natbib,opcit,overcite,splitbib,ucs}%
- \ifboolexpr{
- test {\@ifpackageloaded{babel}}
- and
- not test {\@ifpackageloaded{polyglossia}}
- }
+ \@ifpackageloaded{polyglossia}
{\iftoggle{blx@autolang}
- {\blx@mkbabel}
- {\blx@mknobabel}}
- {\blx@mknobabel}%
+ {\blx@mkautolangpoly}
+ {\blx@mknoautolang}}
+ {\@ifpackageloaded{babel}
+ {\iftoggle{blx@autolang}
+ {\blx@mkautolangbabel}
+ {\blx@mknoautolang}}
+ {\blx@mknoautolang}}%
\csuse{abx@extras@\blx@languagename}%
\csuse{abx@strings@\blx@languagename}%
- \undef\blx@mkbabel
- \undef\blx@mknobabel
+ \undef\blx@mkautolangbabel
+ \undef\blx@mkautolangpoly
+ \undef\blx@mknoautolang
\ifnum\blx@hyperref=\z@
\blx@mknohyperref
\else
@@ -228,7 +229,7 @@
{\newcommand*{\@quotereset}{}\newcount\@quotereset}}
{\@ifpackageloaded{babel}
{\blx@warning@noline{%
- 'babel' detected but 'csquotes' missing.\MessageBreak
+ 'babel/polyglossia' detected but 'csquotes' missing.\MessageBreak
Loading 'csquotes' recommended}}
{}%
\newcommand*{\@quotelevel}{}%
@@ -2207,21 +2208,27 @@
% {<true>}{<false>}
\protected\def\blx@ifciteseen@global{%
- \ifdef\abx@field@entrykey
- {\expandafter\blx@ifseen@global
- \expandafter{\abx@field@entrykey}}
+ \ifbool{citetracker}
+ {\ifdef\abx@field@entrykey
+ {\expandafter\blx@ifseen@global
+ \expandafter{\abx@field@entrykey}}
+ {\@secondoftwo}}
{\@secondoftwo}}
\protected\def\blx@ifciteseen@context{%
- \ifdef\abx@field@entrykey
- {\expandafter\blx@ifseen@context
- \expandafter{\abx@field@entrykey}}
+ \ifbool{citetracker}
+ {\ifdef\abx@field@entrykey
+ {\expandafter\blx@ifseen@context
+ \expandafter{\abx@field@entrykey}}
+ {\@secondoftwo}}
{\@secondoftwo}}
\protected\def\blx@ifciteseen@context{%
- \ifdef\abx@field@entrykey
- {\expandafter\blx@ifseen@context
- \expandafter{\abx@field@entrykey}}
+ \ifbool{citetracker}
+ {\ifdef\abx@field@entrykey
+ {\expandafter\blx@ifseen@context
+ \expandafter{\abx@field@entrykey}}
+ {\@secondoftwo}}
{\@secondoftwo}}
% {<entrykey>}{<true>}{<false>}
@@ -2233,108 +2240,142 @@
\blx@xsanitizeafter\blx@ifseen@context}
\def\blx@ifseen@global#1{%
- \ifinlistcs{#1}{blx@bsee@\the\c@refsection}}
+ \ifbool{citetracker}
+ {\ifinlistcs{#1}{blx@bsee@\the\c@refsection}}
+ {\@secondoftwo}}
\def\blx@ifseen@context#1{%
- \iftoggle{blx@footnote}
- {\ifinlistcs{#1}{blx@fsee@\the\c@refsection}}
- {\ifinlistcs{#1}{blx@bsee@\the\c@refsection}}}
+ \ifbool{citetracker}
+ {\iftoggle{blx@footnote}
+ {\ifinlistcs{#1}{blx@fsee@\the\c@refsection}}
+ {\ifinlistcs{#1}{blx@bsee@\the\c@refsection}}}
+ {\@secondoftwo}}
% {<true>}{<false>}
\def\blx@ifciteibid@global{%
- \blx@imc@iffieldequals{entrykey}\blx@lastkey@text}
+ \ifbool{citetracker}
+ {\blx@imc@iffieldequals{entrykey}\blx@lastkey@text}
+ {\@secondoftwo}}
\def\blx@ifciteibid@context{%
- \iftoggle{blx@footnote}
- {\blx@imc@iffieldequals{entrykey}\blx@lastkey@foot}
- {\blx@imc@iffieldequals{entrykey}\blx@lastkey@text}}
+ \ifbool{citetracker}
+ {\iftoggle{blx@footnote}
+ {\blx@imc@iffieldequals{entrykey}\blx@lastkey@foot}
+ {\blx@imc@iffieldequals{entrykey}\blx@lastkey@text}}
+ {\@secondoftwo}}
\def\blx@ifciteibid@strict{%
- \blx@ifcitesingle
- {\blx@ifciteibid@global}
- {\@secondoftwo}}%
+ \ifbool{citetracker}
+ {\blx@ifcitesingle
+ {\blx@ifciteibid@global}
+ {\@secondoftwo}}
+ {\@secondoftwo}}
\def\blx@ifciteibid@constrict{%
- \blx@ifcitesingle
- {\iftoggle{blx@footnote}
- {\blx@ifmpfncheck
- {\blx@imc@iffieldequals{entrykey}\blx@lastkey@foot}
- {\@secondoftwo}}
- {\blx@imc@iffieldequals{entrykey}\blx@lastkey@text}}
- {\@secondoftwo}}%
+ \ifbool{citetracker}
+ {\blx@ifcitesingle
+ {\iftoggle{blx@footnote}
+ {\blx@ifmpfncheck
+ {\blx@imc@iffieldequals{entrykey}\blx@lastkey@foot}
+ {\@secondoftwo}}
+ {\blx@imc@iffieldequals{entrykey}\blx@lastkey@text}}
+ {\@secondoftwo}}
+ {\@secondoftwo}}
% {<true>}{<false>}
\def\blx@ifciteidem@global{%
- \blx@imc@iffieldequals{fullhash}\blx@lasthash@text}
+ \ifbool{citetracker}
+ {\blx@imc@iffieldequals{fullhash}\blx@lasthash@text}
+ {\@secondoftwo}}
\def\blx@ifciteidem@context{%
- \iftoggle{blx@footnote}
- {\blx@imc@iffieldequals{fullhash}\blx@lasthash@foot}
- {\blx@imc@iffieldequals{fullhash}\blx@lasthash@text}}
+ \ifbool{citetracker}
+ {\iftoggle{blx@footnote}
+ {\blx@imc@iffieldequals{fullhash}\blx@lasthash@foot}
+ {\blx@imc@iffieldequals{fullhash}\blx@lasthash@text}}
+ {\@secondoftwo}}
\let\blx@ifciteidem@strict\blx@ifciteidem@global
\def\blx@ifciteidem@constrict{%
- \iftoggle{blx@footnote}
- {\blx@ifmpfncheck
- {\blx@imc@iffieldequals{fullhash}\blx@lasthash@foot}
- {\@secondoftwo}}
- {\blx@imc@iffieldequals{fullhash}\blx@lasthash@text}}
+ \ifbool{citetracker}
+ {\iftoggle{blx@footnote}
+ {\blx@ifmpfncheck
+ {\blx@imc@iffieldequals{fullhash}\blx@lasthash@foot}
+ {\@secondoftwo}}
+ {\blx@imc@iffieldequals{fullhash}\blx@lasthash@text}}
+ {\@secondoftwo}}
% {<true>}{<false>}
\def\blx@ifopcit@global{%
- \blx@imc@iffieldundef{namehash}
- {\@secondoftwo}
- {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@text@\abx@field@namehash}}}
+ \ifbool{citetracker}
+ {\blx@imc@iffieldundef{namehash}
+ {\@secondoftwo}
+ {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@text@\abx@field@namehash}}}
+ {\@secondoftwo}}
\def\blx@ifopcit@context{%
- \blx@imc@iffieldundef{namehash}
- {\@secondoftwo}
- {\iftoggle{blx@footnote}
- {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@foot@\abx@field@namehash}}
- {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@text@\abx@field@namehash}}}}
-
-\def\blx@ifopcit@strict{%
- \blx@ifcitesingle
- {\blx@ifopcit@global}
- {\@secondoftwo}}%
-
-\def\blx@ifopcit@constrict{%
- \blx@ifcitesingle
+ \ifbool{citetracker}
{\blx@imc@iffieldundef{namehash}
{\@secondoftwo}
{\iftoggle{blx@footnote}
- {\blx@ifmpfncheck
- {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@foot@\abx@field@namehash}}
- {\@secondoftwo}}
+ {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@foot@\abx@field@namehash}}
{\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@text@\abx@field@namehash}}}}
- {\@secondoftwo}}%
+ {\@secondoftwo}}
+
+\def\blx@ifopcit@strict{%
+ \ifbool{citetracker}
+ {\blx@ifcitesingle
+ {\blx@ifopcit@global}
+ {\@secondoftwo}}
+ {\@secondoftwo}}
+
+\def\blx@ifopcit@constrict{%
+ \ifbool{citetracker}
+ {\blx@ifcitesingle
+ {\blx@imc@iffieldundef{namehash}
+ {\@secondoftwo}
+ {\iftoggle{blx@footnote}
+ {\blx@ifmpfncheck
+ {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@foot@\abx@field@namehash}}
+ {\@secondoftwo}}
+ {\blx@imc@iffieldequalcs{entrykey}{blx@lastkey@text@\abx@field@namehash}}}}
+ {\@secondoftwo}}
+ {\@secondoftwo}}
% {<true>}{<false>}
\def\blx@ifloccit@global{%
- \blx@loccit@check{text}}
+ \ifbool{citetracker}
+ {\blx@loccit@check{text}}
+ {\@secondoftwo}}
\def\blx@ifloccit@context{%
- \iftoggle{blx@footnote}
- {\blx@loccit@check{foot}}
- {\blx@loccit@check{text}}}
+ \ifbool{citetracker}
+ {\iftoggle{blx@footnote}
+ {\blx@loccit@check{foot}}
+ {\blx@loccit@check{text}}}
+ {\@secondoftwo}}
\def\blx@ifloccit@strict{%
- \blx@ifcitesingle
- {\blx@loccit@numcheck{text}}
- {\@secondoftwo}}%
+ \ifbool{citetracker}
+ {\blx@ifcitesingle
+ {\blx@loccit@numcheck{text}}
+ {\@secondoftwo}}
+ {\@secondoftwo}}
\def\blx@ifloccit@constrict{%
- \blx@ifcitesingle
- {\iftoggle{blx@footnote}
- {\blx@ifmpfncheck
- {\blx@loccit@numcheck{foot}}
- {\@secondoftwo}}
- {\blx@loccit@numcheck{text}}}
+ \ifbool{citetracker}
+ {\blx@ifcitesingle
+ {\iftoggle{blx@footnote}
+ {\blx@ifmpfncheck
+ {\blx@loccit@numcheck{foot}}
+ {\@secondoftwo}}
+ {\blx@loccit@numcheck{text}}}
+ {\@secondoftwo}}
{\@secondoftwo}}
\def\blx@loccit@check#1{%
@@ -2370,9 +2411,11 @@
% {<true>}{<false>}
\def\blx@imc@iffirstonpage{%
- \iftoggle{blx@footnote}
- {\blx@iffirstonpage{fnpage}}
- {\blx@iffirstonpage{page}}}
+ \ifbool{pagetracker}
+ {\iftoggle{blx@footnote}
+ {\blx@iffirstonpage{fnpage}}
+ {\blx@iffirstonpage{page}}}
+ {\@secondoftwo}}
\def\blx@iffirstonpage#1{%
\ifcsundef{blx@#1@\number\c@instcount}
@@ -2400,11 +2443,13 @@
% {<count1>}{<count2>}{<true>}{<false>}
\def\blx@imc@ifsamepage#1#2{%
- \ifcsundef{blx@page@\number\numexpr#1}
- {\ifcsundef{blx@fnpage@\number\numexpr#1}
- {\@secondoftwo}
- {\blx@ifsamepage{#1}{#2}{fnpage}}}
- {\blx@ifsamepage{#1}{#2}{page}}}
+ \ifbool{pagetracker}
+ {\ifcsundef{blx@page@\number\numexpr#1}
+ {\ifcsundef{blx@fnpage@\number\numexpr#1}
+ {\@secondoftwo}
+ {\blx@ifsamepage{#1}{#2}{fnpage}}}
+ {\blx@ifsamepage{#1}{#2}{page}}}
+ {\@secondoftwo}}
\def\blx@ifsamepage#1#2#3{%
\ifcsundef{blx@page@\number\numexpr#2}
@@ -3203,8 +3248,8 @@
\@ifstar\blx@mksc@i\blx@mksc@ii}
\def\blx@mksc@i{%
- \ifdef\abx@field@hyphenation
- {\xifinlist\abx@field@hyphenation\blx@cmksc@lang
+ \ifdef\abx@field@langid
+ {\xifinlist\abx@field@langid\blx@cmksc@lang
{\blx@mksc@ii}
{\@firstofone}}
{\blx@mksc@ii}}
@@ -4679,6 +4724,26 @@
\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
\printfield{extrayear}}}}}}}
+\newrobustcmd*{\mkbibrangeyear}[1]{%
+ \blx@imc@clearfield{#1month}%
+ \blx@imc@clearfield{#1day}%
+ \blx@imc@clearfield{#1endmonth}%
+ \blx@imc@clearfield{#1endday}%
+ \iffieldsequal{#1year}{#1endyear}
+ {\blx@imc@clearfield{#1endyear}}
+ {}%
+ \mkbibrangefull{short}{#1}}
+
+\newrobustcmd*{\mkbibrangeyearextra}[1]{%
+ \blx@imc@clearfield{#1month}%
+ \blx@imc@clearfield{#1day}%
+ \blx@imc@clearfield{#1endmonth}%
+ \blx@imc@clearfield{#1endday}%
+ \iffieldsequal{#1year}{#1endyear}
+ {\blx@imc@clearfield{#1endyear}}
+ {}%
+ \mkbibrangefullextra{short}{#1}}
+
\expandafter\newrobustcmd
\expandafter*\csname mkbibrangeiso8601\endcsname[1]{%
\iffieldundef{#1year}
@@ -4774,8 +4839,7 @@
\noexpand\blx@resetpunct
\expandafter\noexpand\csname abx@noextras@#2\endcsname}}
-%% Babel interface
-
+%% babel/polyglossia interface
\def\blx@beglang{\blx@clearlang\begingroup}
\def\blx@endlang{\endgroup}
\let\blx@hook@endlang\@empty
@@ -4795,31 +4859,72 @@
\begingroup
\@makeother\#
-\gdef\blx@mkbabel{%
+\gdef\blx@mkautolangbabel{%
\pretocmd\select@language{\blx@langsetup{#1}}
{\ifdef\blx@thelangenv
{\def\blx@beglang{%
\blx@clearlang
\begingroup
- \blx@imc@iffieldundef{hyphenation}
- {}
- {\ifcsundef{l@\abx@field@hyphenation}
- {\blx@warn@nohyph{\abx@field@hyphenation}}
+ \ifdef\abx@field@langid
+ {\ifcsundef{l@\abx@field@langid}
+ {\blx@warn@nohyph{\abx@field@langid}}
{\blx@hook@initlang
\def\blx@endlang{%
\blx@hook@endlang
\csname end\blx@thelangenv\endcsname
\endgroup}%
\csname\blx@thelangenv\expandafter\endcsname
- \expandafter{\abx@field@hyphenation}}}}}
+ \expandafter{\abx@field@langid}}}
+ {}}}
{}%
\def\blx@imc@mainlang{\select@language{\bbl@main@language}}%
\blx@langsetup\bbl@main@language}
{\blx@err@patch{'babel' package}%
- \blx@mknobabel}}
+ \blx@mknoautolang}}
+
+\gdef\blx@mkautolangpoly{%
+ \catcode`\_=11% polyglossia uses "_" as a letter
+ \pretocmd\select@language{\blx@langsetup{#1}}
+ {\ifdef\blx@thelangenv
+ {\def\blx@beglang{%
+ \blx@clearlang
+ \begingroup
+ \ifdef\abx@field@langid
+ {\ifcsundef{l@\abx@field@langid}
+ {\blx@warn@nohyph{\abx@field@langid}}
+ {\blx@hook@initlang
+ \def\blx@endlang{%
+ \blx@hook@endlang
+ % Polyglossia language envs are \<lang>[]
+ \expandafter\ifstrequal\expandafter{\blx@thelangenv}{langname}
+ {\csname end\abx@field@langid\endcsname}
+ {\csname end\blx@thelangenv\endcsname}%
+ \endgroup}%
+ \expandafter\ifstrequal\expandafter{\blx@thelangenv}{langname}
+ {\ifdef\abx@field@langidopts
+ {\csname\abx@field@langid\expandafter\endcsname\expandafter[\abx@field@langidopts]}
+ {\csname\abx@field@langid\endcsname}}
+ {\csname\blx@thelangenv\expandafter\endcsname
+ \expandafter{\abx@field@langid}}%
+ % These lines are equal to \blx@maplang
+ \blx@resetpunct
+ \csuse{abx@extras@\abx@field@langid}%
+ \csuse{abx@strings@\abx@field@langid}}}
+ {}}}
+ {}%
+ \def\blx@imc@mainlang{%
+ \select@language{\bbl@main@language}%
+ % These lines are equal to \blx@maplang
+ \blx@resetpunct
+ \csuse{abx@extras@\bbl@main@language}%
+ \csuse{abx@strings@\bbl@main@language}}%
+ \blx@langsetup\bbl@main@language}
+ {\blx@err@patch{'polyglossia' package}%
+ \blx@mknoautolang}%
+ \catcode`\_=8}
\endgroup
-\def\blx@mknobabel{%
+\def\blx@mknoautolang{%
\blx@lbxinput{\blx@languagename}
{}
{\blx@err@nolang{\blx@languagename}}}
@@ -4933,6 +5038,7 @@
\def\abx@dointernalfields{%
\do{childentrykey}%
\do{clonesourcekey}%
+ \do{datelabelsource}%
\do{entrykey}%
\do{entryset}%
\do{entrysetcount}%
@@ -4974,6 +5080,7 @@
\dolistcsloop{blx@biber@datamodel@lists}\do{pageref}%
\let\do\blx@imc@clearfield
\dolistcsloop{blx@biber@datamodel@fields}\do{options}%
+ \do{labeltitle}\do{labelyear}\do{labelmonth}\do{labelday}\do{datelabelsource}%
\abx@dointernalfields
\def\do##1{\togglefalse{abx@bool@##1}}%
\abx@dobooleans
@@ -4995,6 +5102,7 @@
\dolistcsloop{blx@biber@datamodel@lists}\do{pageref}%
\let\do\blx@savefield
\dolistcsloop{blx@biber@datamodel@fields}\do{options}%
+ \do{labeltitle}\do{labelyear}\do{labelmonth}\do{labelday}\do{datelabelsource}%
\abx@dointernalfields
\let\do\blx@savebool
\abx@dobooleans
@@ -5616,7 +5724,6 @@
\listgadd{\blx@lastsortschemeslos}{#1}}
% {<instcount>}{<entrykey>}{<refsection>}{<labelnumber>}
-
\protected\def\blx@aux@number#1#2#3#4{%
\blx@bbl@addentryfield{\detokenize{#2}}{#3}{localnumber}{#4}%
\global\toggletrue{blx@localnumber}%
@@ -7445,7 +7552,7 @@
% ibidem tracker
-\def\blx@ibidtracker@gobal{%
+\def\blx@ibidtracker@global{%
\ifbool{citetracker}
{\global\let\blx@lastkey@text\abx@field@entrykey}
{}}
@@ -7459,8 +7566,8 @@
\def\blx@ibidtracker@strict{%
\blx@ifcitesingle
- {\blx@ibidtracker@gobal}
- {\blx@ibidreset@gobal}}%
+ {\blx@ibidtracker@global}
+ {\blx@ibidreset@global}}%
\def\blx@ibidtracker@constrict{%
\blx@ifcitesingle
@@ -7473,7 +7580,7 @@
\global\undef\blx@lastkey@foot
\blx@mpfnreset}
-\def\blx@ibidreset@gobal{%
+\def\blx@ibidreset@global{%
\global\undef\blx@lastkey@text}
\def\blx@ibidreset@context{%
@@ -7496,7 +7603,7 @@
% idem tracker
-\def\blx@idemtracker@gobal{%
+\def\blx@idemtracker@global{%
\ifbool{citetracker}
{\global\let\blx@lasthash@text\abx@field@fullhash}
{}}
@@ -7508,7 +7615,7 @@
{\global\let\blx@lasthash@text\abx@field@fullhash}}
{}}
-\let\blx@idemtracker@strict\blx@idemtracker@gobal
+\let\blx@idemtracker@strict\blx@idemtracker@global
\def\blx@idemtracker@constrict{%
\blx@mpfnsave
@@ -7519,7 +7626,7 @@
\global\undef\blx@lasthash@foot
\blx@mpfnreset}
-\def\blx@idemreset@gobal{%
+\def\blx@idemreset@global{%
\global\undef\blx@lasthash@text}
\def\blx@idemreset@context{%
@@ -7542,7 +7649,7 @@
% opcit tracker
-\def\blx@opcittracker@gobal{%
+\def\blx@opcittracker@global{%
\ifbool{citetracker}
{\blx@opcit@tracker{text}}
{}}
@@ -7556,8 +7663,8 @@
\def\blx@opcittracker@strict{%
\blx@ifcitesingle
- {\blx@opcittracker@gobal}
- {\blx@opcitreset@gobal}}%
+ {\blx@opcittracker@global}
+ {\blx@opcitreset@global}}%
\def\blx@opcittracker@constrict{%
\blx@ifcitesingle
@@ -7585,7 +7692,7 @@
\blx@opcit@reset{foot}%
\blx@mpfnreset}
-\def\blx@opcitreset@gobal{%
+\def\blx@opcitreset@global{%
\blx@opcit@reset{text}}
\def\blx@opcitreset@context{%
@@ -7631,7 +7738,7 @@
% loccit tracker
-\def\blx@loccittracker@gobal{%
+\def\blx@loccittracker@global{%
\ifbool{citetracker}
{\blx@loccit@tracker{text}}
{}}
@@ -7691,7 +7798,7 @@
\blx@loccit@reset{foot}%
\blx@mpfnreset}
-\def\blx@loccitreset@gobal{%
+\def\blx@loccitreset@global{%
\blx@loccit@reset{text}}
\def\blx@loccitreset@context{%
@@ -9230,7 +9337,7 @@
\let\blx@tempc\@empty
\let\map\blx@sourcemap@map
\ifblank{#1}
- {\setkeys{blx@sourcemap@maps}{level=user}}
+ {\setkeys{blx@sourcemap@maps}{datatype=bibtex, level=user}}
{\setkeys{blx@sourcemap@maps}{#1, level=user}}%
#2%
\eappto\blx@tempa{%
@@ -9241,7 +9348,7 @@
\let\blx@tempc\@empty
\let\map\blx@sourcemap@map
\ifblank{#1}
- {\setkeys{blx@sourcemap@maps}{level=style}}
+ {\setkeys{blx@sourcemap@maps}{datatype=bibtex, level=style}}
{\setkeys{blx@sourcemap@maps}{#1, level=style}}%
#2%
\eappto\blx@tempa{%
@@ -9718,7 +9825,7 @@
{\def\do##1{%
\blx@addtypeopt{##1}%
\csxappto{blx@bcf@\blx@tempb @##1}{%
- \noexpand\blx@xml@ordered{\the\blx@tempcnta}{\blx@tempc}{#2}}}%
+ \noexpand\blx@xml@ordered{\the\blx@tempcnta}{ type="field"\blx@tempc}{#2}}}%
\expandafter\docsvlist\expandafter{\blx@tempa}}}
\newcommand*{\blx@orderedld@literal}[1]{%
@@ -10034,25 +10141,40 @@
\settoggle{blx@clearlang}{#1}}
\DeclareBibliographyOption{babel}{%
- \ifcsdef{blx@opt@babel@#1}
- {\csuse{blx@opt@babel@#1}}
- {\blx@err@invopt{babel=#1}{}}}
-\def\blx@opt@babel@none{%
+ \blx@warning@noline{%
+ 'babel' option is deprecated, use 'autolang' instead}%
+ \blx@autolang@i{#1}}
+
+\DeclareBibliographyOption{autolang}{%
+ \blx@autolang@i{#1}}
+
+\def\blx@autolang@i#1{%
+ \ifcsdef{blx@opt@autolang@#1}
+ {\csuse{blx@opt@autolang@#1}}
+ {\blx@err@invopt{autolang=#1}{}}}
+
+\def\blx@opt@autolang@none{%
\undef\blx@thelangenv
\let\blx@hook@initlang\@empty
\let\blx@hook@endlang\@empty}
-\def\blx@opt@babel@hyphen{%
+\def\blx@opt@autolang@hyphen{%
\def\blx@thelangenv{hyphenrules}%
\let\blx@hook@initlang\@empty
\let\blx@hook@endlang\@empty}
-\csdef{blx@opt@babel@other*}{%
+\csdef{blx@opt@autolang@other*}{%
\def\blx@thelangenv{otherlanguage*}%
\def\blx@hook@initlang{\@quotereset\@ne}%
\def\blx@hook@endlang{\blx@postpunct}}
-\def\blx@opt@babel@other{%
+\def\blx@opt@autolang@other{%
\def\blx@thelangenv{otherlanguage}%
\def\blx@hook@initlang{\@quotereset\@ne}%
\def\blx@hook@endlang{\blx@postpunct}}
+\def\blx@opt@autolang@langname{%
+ \@ifpackageloaded{polyglossia}
+ {\def\blx@thelangenv{langname}}
+ {\def\blx@thelangenv{otherlanguage}}%
+ \def\blx@hook@initlang{\@quotereset\@ne}%
+ \def\blx@hook@endlang{\blx@postpunct}}
\DeclareBibliographyOption{indexing}[true]{%
\blx@opt@index{#1}}
@@ -10243,8 +10365,8 @@
{\blx@err@invopt{ibidtracker=#1}{}}}
\def\blx@opt@ibidtracker@true{%
\let\blx@imc@ifciteibid\blx@ifciteibid@global
- \let\blx@ibidtracker\blx@ibidtracker@gobal
- \let\blx@ibidreset\blx@ibidreset@gobal
+ \let\blx@ibidtracker\blx@ibidtracker@global
+ \let\blx@ibidreset\blx@ibidreset@global
\booltrue{citetracker}}
\def\blx@opt@ibidtracker@false{%
\let\blx@imc@ifciteibid\@secondoftwo
@@ -10258,7 +10380,7 @@
\def\blx@opt@ibidtracker@strict{%
\let\blx@imc@ifciteibid\blx@ifciteibid@strict
\let\blx@ibidtracker\blx@ibidtracker@strict
- \let\blx@ibidreset\blx@ibidreset@gobal
+ \let\blx@ibidreset\blx@ibidreset@global
\booltrue{citetracker}}
\def\blx@opt@ibidtracker@constrict{%
\let\blx@imc@ifciteibid\blx@ifciteibid@constrict
@@ -10272,8 +10394,8 @@
{\blx@err@invopt{idemtracker=#1}{}}}
\def\blx@opt@idemtracker@true{%
\let\blx@imc@ifciteidem\blx@ifciteidem@global
- \let\blx@idemtracker\blx@idemtracker@gobal
- \let\blx@idemreset\blx@idemreset@gobal
+ \let\blx@idemtracker\blx@idemtracker@global
+ \let\blx@idemreset\blx@idemreset@global
\booltrue{citetracker}}
\def\blx@opt@idemtracker@false{%
\let\blx@imc@ifciteidem\@secondoftwo
@@ -10287,7 +10409,7 @@
\def\blx@opt@idemtracker@strict{%
\let\blx@imc@ifciteidem\blx@ifciteidem@strict
\let\blx@idemtracker\blx@idemtracker@strict
- \let\blx@idemreset\blx@idemreset@gobal
+ \let\blx@idemreset\blx@idemreset@global
\booltrue{citetracker}}
\def\blx@opt@idemtracker@constrict{%
\let\blx@imc@ifciteidem\blx@ifciteidem@constrict
@@ -10301,8 +10423,8 @@
{\blx@err@invopt{opcittracker=#1}{}}}
\def\blx@opt@opcittracker@true{%
\let\blx@imc@ifopcit\blx@ifopcit@global
- \let\blx@opcittracker\blx@opcittracker@gobal
- \let\blx@opcitreset\blx@opcitreset@gobal
+ \let\blx@opcittracker\blx@opcittracker@global
+ \let\blx@opcitreset\blx@opcitreset@global
\booltrue{citetracker}}
\def\blx@opt@opcittracker@false{%
\let\blx@imc@ifopcit\@secondoftwo
@@ -10316,7 +10438,7 @@
\def\blx@opt@opcittracker@strict{%
\let\blx@imc@ifopcit\blx@ifopcit@strict
\let\blx@opcittracker\blx@opcittracker@strict
- \let\blx@opcitreset\blx@opcitreset@gobal
+ \let\blx@opcitreset\blx@opcitreset@global
\booltrue{citetracker}}
\def\blx@opt@opcittracker@constrict{%
\let\blx@imc@ifopcit\blx@ifopcit@constrict
@@ -10330,8 +10452,8 @@
{\blx@err@invopt{loccittracker=#1}{}}}
\def\blx@opt@loccittracker@true{%
\let\blx@imc@ifloccit\blx@ifloccit@global
- \let\blx@loccittracker\blx@loccittracker@gobal
- \let\blx@loccitreset\blx@loccitreset@gobal
+ \let\blx@loccittracker\blx@loccittracker@global
+ \let\blx@loccitreset\blx@loccitreset@global
\booltrue{citetracker}}
\def\blx@opt@loccittracker@false{%
\let\blx@imc@ifloccit\@secondoftwo
@@ -10345,7 +10467,7 @@
\def\blx@opt@loccittracker@strict{%
\let\blx@imc@ifloccit\blx@ifloccit@strict
\let\blx@loccittracker\blx@loccittracker@strict
- \let\blx@loccitreset\blx@loccitreset@gobal
+ \let\blx@loccitreset\blx@loccitreset@global
\booltrue{citetracker}}
\def\blx@opt@loccittracker@constrict{%
\let\blx@imc@ifloccit\blx@ifloccit@constrict
@@ -10377,8 +10499,14 @@
\DeclareBibliographyOption{datelabel}{%
\ifcsdef{mkbibrange#1}
- {\protected\def\blx@imc@printdatelabel{\csuse{mkbibrange#1}{label}}%
- \protected\def\blx@imc@printdateextralabel{\csuse{mkbibrange#1extra}{label}}}
+ {\protected\def\blx@imc@printdatelabel{%
+ \blx@imc@iffieldundef{year}
+ {\csuse{mkbibrange#1}{label}}
+ {\csuse{mkbibrange#1}{}}}%
+ \protected\def\blx@imc@printdateextralabel{%
+ \blx@imc@iffieldundef{year}
+ {\csuse{mkbibrange#1extra}{label}}
+ {\csuse{mkbibrange#1extra}{}}}}
{\blx@err@invopt{datelabel=#1}{}}}
\DeclareBibliographyOption{urldate}{%
@@ -10397,7 +10525,8 @@
{\blx@err@invopt{origdate=#1}{}}}
\DeclareBibliographyOption{alldates}{%
- \ExecuteBibliographyOptions{date=#1,datelabel=#1,urldate=#1,eventdate=#1,origdate=#1}}
+ \ExecuteBibliographyOptions{%
+ date=#1,datelabel=#1,urldate=#1,eventdate=#1,origdate=#1}}
\DeclareBibliographyOption{datezeros}[true]{%
\ifstrequal{#1}{true}
@@ -10680,11 +10809,11 @@
usetranslator=false,indexing=false,abbreviate=true,dateabbrev=true,
backref=false,backrefsetstyle=setonly,pagetracker=false,ibidtracker=false,
idemtracker=false,opcittracker=false,loccittracker=false,citetracker=false,
- citecounter=false,block=none,language=auto,clearlang=true,babel=none,
- date=comp,datelabel=comp,origdate=comp,eventdate=comp,urldate=short,autopunct=true,
- punctfont=false,defernumbers=false,refsection=none,refsegment=none,
- citereset=none,hyperref=auto,parentracker,maxparens=3,
- bibencoding=auto,bibwarn}
+ citecounter=false,block=none,language=auto,clearlang=true,autolang=none,
+ date=comp,datelabel=year,origdate=comp,eventdate=comp,urldate=short,
+ autopunct=true,punctfont=false,defernumbers=false,
+ refsection=none,refsegment=none,citereset=none,hyperref=auto,
+ parentracker,maxparens=3,bibencoding=auto,bibwarn}
% Load compatibility code
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def
index b9c5258a532..c275d1e57ff 100644
--- a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def
+++ b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def
@@ -359,7 +359,6 @@
eventtitleaddon,
gender,
howpublished,
- hyphenation,
indexsorttitle,
indextitle,
isan,
@@ -374,6 +373,8 @@
journalsubtitle,
journaltitle,
label,
+ langid,
+ langidopts,
library,
mainsubtitle,
maintitle,
@@ -514,7 +515,6 @@
execute,
file,
gender,
- hyphenation,
ids,
indextitle,
indexsorttitle,
@@ -523,6 +523,8 @@
iswc,
keywords,
label,
+ langid,
+ langidopts,
library,
lista,
listb,
@@ -716,8 +718,10 @@
note,
number,
origlanguage,
+ pagetotal,
publisher,
pubstate,
+ series,
subtitle,
titleaddon,
translator,
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def b/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def
index 7057a4185ad..b4a8976e50f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def
+++ b/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def
@@ -48,11 +48,11 @@
\ifx\blx@mclike@tempb\@empty
\else
\ifx\blx@mclike@tempc\@empty
- \nocite{\blx@mclike@tempb}% preserve citation order for sorting=none
\else
\defbibentryset{\blx@mclike@tempb}{\blx@mclike@tempc}%
\let\blx@mclike@tempc\@empty
\fi
+ \nocite{\blx@mclike@tempb}% preserve citation order for sorting=none
\let\blx@mclike@tempb\@empty
\fi}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx
index 085b2ea85f5..911441d9e22 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx
@@ -331,13 +331,13 @@
oldseries = {{s\`erie antiga}{s\`er\adddotspace ant\adddot}},
edition = {{edici\'o}{ed\adddot}},
reprint = {{reimpressi\'o}{reimpr\adddot}},
- reprintof = {{reimpressi\'o \smartof}{reimpr\adddotspace\smartof}},
+ reprintof = {{reimpressi\'o del}{reimpr\adddotspace del}},
reprintas = {{reimpr\`es com}{reimpr\adddotspace com}},
reprintfrom = {{reimpr\`es \smartof}{reimpr\adddotspace\smartof}},
- reviewof = {{revisi\'o \smartof}{rev\adddotspace\smartof}},
- translationof = {{traducci\'o \smartof}{trad\adddotspace\smartof}},
+ reviewof = {{revisi\'o del}{rev\adddotspace del}},
+ translationof = {{traducci\'o del}{trad\adddotspace del}},
translationas = {{tradu{\"\i}t com}{trad\adddotspace com}},
- translationfrom = {{tradu{\"\i}t del}{trad\adddotspace del}},% FIXME: smartdel
+ translationfrom = {{tradu{\"\i}t del}{trad\adddotspace del}},
origpubas = {{publicat originalment com}{pub\adddotspace orig\adddotspace com}},
origpubin = {{publicat originalment el}{pub\adddotspace orig\adddotspace el}},
astitle = {{com}{com}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
index 46594e2374a..c9f5d9bb0d8 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
@@ -104,135 +104,135 @@
editorsaf = {{redacteuren en nawoord}%
{red\adddotspace en naw\adddot}},
editortrco = {{redacteur, vertaler en commentator}%
- {red.,\addabbrvspace vert\adddot\ en comm\adddot}},
+ {red.,\addabbrvspace vert\adddotspace en comm\adddot}},
editorstrco = {{redacteuren, vertalers en commentatoren}%
- {red.,\addabbrvspace vert\adddot\ en comm\adddot}},
+ {red.,\addabbrvspace vert\adddotspace en comm\adddot}},
editortran = {{redacteur, vertaler en annotator}%
- {red.,\addabbrvspace vert\adddot\ en annot\adddot}},
+ {red.,\addabbrvspace vert\adddotspace en annot\adddot}},
editorstran = {{redacteur, vertalers en annotatoren}%
- {red.,\addabbrvspace vert\adddot\ en annot\adddot}},
+ {red.,\addabbrvspace vert\adddotspace en annot\adddot}},
editortrin = {{redacteur, vertaler en inleiding}%
- {red.,\addabbrvspace vert\adddot\ en inl\adddot}},
+ {red.,\addabbrvspace vert\adddotspace en inl\adddot}},
editorstrin = {{redacteuren, vertalers en inleiding}%
- {red.,\addabbrvspace vert\adddot\ en inl\adddot}},
+ {red.,\addabbrvspace vert\adddotspace en inl\adddot}},
editortrfo = {{redacteur, vertaler en voorwoord}%
- {red.,\addabbrvspace vert\adddot\ en voorw\adddot}},
+ {red.,\addabbrvspace vert\adddotspace en voorw\adddot}},
editorstrfo = {{redacteuren, vertalers en voorwoord}%
- {red.,\addabbrvspace vert\adddot\ en voorw\adddot}},
+ {red.,\addabbrvspace vert\adddotspace en voorw\adddot}},
editortraf = {{redacteur, vertaler en nawoord}%
- {red.,\addabbrvspace vert\adddot\ en naw\adddot}},
+ {red.,\addabbrvspace vert\adddotspace en naw\adddot}},
editorstraf = {{redacteuren, vertalers en nawoord}%
- {red.,\addabbrvspace vert\adddot\ en naw\adddot}},
+ {red.,\addabbrvspace vert\adddotspace en naw\adddot}},
editorcoin = {{redacteur, commentator en inleiding}%
- {red.,\addabbrvspace comm\adddot\ en inl\adddot}},
+ {red.,\addabbrvspace comm\adddotspace en inl\adddot}},
editorscoin = {{redacteuren, commentatoren en inleiding}%
- {red.,\addabbrvspace comm\adddot\ en inl\adddot}},
+ {red.,\addabbrvspace comm\adddotspace en inl\adddot}},
editorcofo = {{redacteur, commentator en voorwoord}%
- {red.,\addabbrvspace comm\adddot\ en voorw\adddot}},
+ {red.,\addabbrvspace comm\adddotspace en voorw\adddot}},
editorscofo = {{redacteuren, commentatoren en voorwoord}%
- {red.,\addabbrvspace comm\adddot\ en voorw\adddot}},
+ {red.,\addabbrvspace comm\adddotspace en voorw\adddot}},
editorcoaf = {{redacteur, commentator en nawoord}%
- {red.,\addabbrvspace comm\adddot\ en naw\adddot}},
+ {red.,\addabbrvspace comm\adddotspace en naw\adddot}},
editorscoaf = {{redacteuren, commentatoren en nawoord}%
- {red.,\addabbrvspace comm\adddot\ en naw\adddot}},
+ {red.,\addabbrvspace comm\adddotspace en naw\adddot}},
editoranin = {{redacteur, annotator en inleiding}%
- {red.,\addabbrvspace annot\adddot\ en inl\adddot}},
+ {red.,\addabbrvspace annot\adddotspace en inl\adddot}},
editorsanin = {{redacteuren, annotatoren en inleiding}%
- {red.,\addabbrvspace annot\adddot\ en inl\adddot}},
+ {red.,\addabbrvspace annot\adddotspace en inl\adddot}},
editoranfo = {{redacteur, annotator en voorwoord}%
- {red.,\addabbrvspace annot\adddot\ en voorw\adddot}},
+ {red.,\addabbrvspace annot\adddotspace en voorw\adddot}},
editorsanfo = {{redacteuren, annotatoren en voorwoord}%
- {red.,\addabbrvspace annot\adddot\ en voorw\adddot}},
+ {red.,\addabbrvspace annot\adddotspace en voorw\adddot}},
editoranaf = {{redacteur, annotator en nawoord}%
- {red.,\addabbrvspace annot\adddot\ en nawoord\adddot}},
+ {red.,\addabbrvspace annot\adddotspace en nawoord\adddot}},
editorsanaf = {{redacteuren, annotatoren en nawoord}%
- {red.,\addabbrvspace annot\adddot\ en naw\adddot}},
+ {red.,\addabbrvspace annot\adddotspace en naw\adddot}},
editortrcoin = {{redacteur, vertaler, commentator en inleiding}%
- {red.,\addabbrvspace vert., comm\adddot\ en inl\adddot}},
+ {red.,\addabbrvspace vert., comm\adddotspace en inl\adddot}},
editorstrcoin = {{redacteuren, vertalers, commentatoren en inleiding}%
- {red.,\addabbrvspace vert., comm\adddot\ en inl\adddot}},
+ {red.,\addabbrvspace vert., comm\adddotspace en inl\adddot}},
editortrcofo = {{redacteur, vertaling, commentator en voorwoord}%
- {red.,\addabbrvspace vert., comm\adddot\ en voorw\adddot}},
+ {red.,\addabbrvspace vert., comm\adddotspace en voorw\adddot}},
editorstrcofo = {{redacteuren, vertalers, commentatoren en voorwoord}%
- {red.,\addabbrvspace vert., comm\adddot\ en voorw\adddot}},
+ {red.,\addabbrvspace vert., comm\adddotspace en voorw\adddot}},
editortrcoaf = {{redacteur, vertaler, commentator en nawoord}%
- {red.,\addabbrvspace vert., comm\adddot\ en naw\adddot}},
+ {red.,\addabbrvspace vert., comm\adddotspace en naw\adddot}},
editorstrcoaf = {{redacteuren, vertalers, commentators en nawoord}%
- {red.,\addabbrvspace vert., comm\adddot\ en naw\adddot}},
+ {red.,\addabbrvspace vert., comm\adddotspace en naw\adddot}},
editortranin = {{redacteur, vertaler, annotator en inleiding}%
- {red.,\addabbrvspace vert., annot\adddot\ en inl\adddot}},
+ {red.,\addabbrvspace vert., annot\adddotspace en inl\adddot}},
editorstranin = {{redacteuren, vertalers, annotatoren en inleiding}%
- {red.,\addabbrvspace vert., annot\adddot\ en inl\adddot}},
+ {red.,\addabbrvspace vert., annot\adddotspace en inl\adddot}},
editortranfo = {{redacteur, vertaler, annotator en voorwoord}%
- {red.,\addabbrvspace vert., annot\adddot\ en voorw\adddot}},
+ {red.,\addabbrvspace vert., annot\adddotspace en voorw\adddot}},
editorstranfo = {{redacteuren, vertalers, annotatoren en voorwoord}%
- {red.,\addabbrvspace vert., annot\adddot\ en voorw\adddot}},
+ {red.,\addabbrvspace vert., annot\adddotspace en voorw\adddot}},
editortranaf = {{redacteur, vertaler, annotator en nawoord}%
- {red.,\addabbrvspace vert., annot\adddot\ en naw\adddot}},
+ {red.,\addabbrvspace vert., annot\adddotspace en naw\adddot}},
editorstranaf = {{redacteuren, vertalers, annotatoren en nawoord}%
- {red.,\addabbrvspace vert., annot\adddot\ en naw\adddot}},
+ {red.,\addabbrvspace vert., annot\adddotspace en naw\adddot}},
translatorco = {{vertaler en commentator}%
- {vert\adddot\ en comm\adddot}},
+ {vert\adddotspace en comm\adddot}},
translatorsco = {{vertalers en commentatoren}%
- {vert\adddot\ en comm\adddot}},
+ {vert\adddotspace en comm\adddot}},
translatoran = {{vertaler en annotator}%
- {vert\adddot\ en annot\adddot}},
+ {vert\adddotspace en annot\adddot}},
translatorsan = {{vertalers en annotatoren}%
- {vert\adddot\ en annot\adddot}},
+ {vert\adddotspace en annot\adddot}},
translatorin = {{vertaling en inleiding}%
- {vert\adddot\ en inl\adddot}},
+ {vert\adddotspace en inl\adddot}},
translatorsin = {{vertaling en inleiding}%
- {vert\adddot\ en inl\adddot}},
+ {vert\adddotspace en inl\adddot}},
translatorfo = {{vertaling en voorwoord}%
- {vert\adddot\ en voorw\adddot}},
+ {vert\adddotspace en voorw\adddot}},
translatorsfo = {{vertaling en voorwoord}%
- {vert\adddot\ en voorw\adddot}},
+ {vert\adddotspace en voorw\adddot}},
translatoraf = {{vertaling en nawoord}%
- {vert\adddot\ en naw\adddot}},
+ {vert\adddotspace en naw\adddot}},
translatorsaf = {{vertaling en nawoord}%
- {vert\adddot\ en naw\adddot}},
+ {vert\adddotspace en naw\adddot}},
translatorcoin = {{vertaling, commentaar en inleiding}%
- {vert., comm\adddot\ en inl\adddot}},
+ {vert., comm\adddotspace en inl\adddot}},
translatorscoin = {{vertaling, commentaar en inleiding}%
- {vert., comm\adddot\ en inl\adddot}},
+ {vert., comm\adddotspace en inl\adddot}},
translatorcofo = {{vertaling, commentaar en voorwoord}%
- {vert., comm\adddot\ en voorwoord\adddot}},
+ {vert., comm\adddotspace en voorwoord\adddot}},
translatorscofo = {{vertaling, commentaar en voorwoord}%
- {vert., comm\adddot\ en voorw\adddot}},
+ {vert., comm\adddotspace en voorw\adddot}},
translatorcoaf = {{vertaling, commentaar en nawoord}%
- {vert., comm\adddot\ en naw\adddot}},
+ {vert., comm\adddotspace en naw\adddot}},
translatorscoaf = {{vertaling, commentaar en nawoord}%
- {vert., comm\adddot\ en naw\adddot}},
+ {vert., comm\adddotspace en naw\adddot}},
translatoranin = {{vertaling, annotaties en inleiding}%
- {vert., annot\adddot\ en inl\adddot}},
+ {vert., annot\adddotspace en inl\adddot}},
translatorsanin = {{vertaling, annotaties en inleiding}%
- {vert., annot\adddot\ en inl\adddot}},
+ {vert., annot\adddotspace en inl\adddot}},
translatoranfo = {{vertaling, annotaties en voorwoord}%
- {vert., annot\adddot\ en voorw\adddot}},
+ {vert., annot\adddotspace en voorw\adddot}},
translatorsanfo = {{vertaling, annotaties en voorwoord}%
- {vert., annot\adddot\ en voorw\adddot}},
+ {vert., annot\adddotspace en voorw\adddot}},
translatoranaf = {{vertaling, annotaties en nawoord}%
- {vert., annot\adddot\ en naw\adddot}},
+ {vert., annot\adddotspace en naw\adddot}},
translatorsanaf = {{vertaling, annotaties en nawoord}%
- {vert., annot\adddot\ en naw\adddot}},
+ {vert., annot\adddotspace en naw\adddot}},
byauthor = {{door}{door}},
byeditor = {{geredigeerd door}{red\adddot\addabbrvspace door}},
bycompiler = {{samengesteld door}{sam\adddot\addabbrvspace door}},
byfounder = {{opgericht door}{opger\adddot\addabbrvspace door}},
bycontinuator = {{opgevolgd door}{opgev\adddot\addabbrvspace door}},
- byredactor = {{geredigeerd door}{red\adddot\ door}},
- byreviser = {{nagekeken door}{nagek\adddot\addabbrvspace door}},
-% byreviewer = {{}{}},% FIXME: missing
+ byredactor = {{geredigeerd door}{red\adddotspace door}},
+ byreviser = {{gereviseerd door}{gerevis\adddot\addabbrvspace door}},
+ byreviewer = {{nagekeken door}{nagek\adddot\addabbrvspace door}},
bycollaborator = {{met medewerking van}{m\adddot m\adddot v}},
- bytranslator = {{vertaald \lbx@lfromlang\ door}{vert\adddot\ \lbx@lfromlang\ door}},
- bycommentator = {{becommentarieerd door}{comm\adddot\ door}},
- byannotator = {{geannoteerd door}{annot\adddot\ door}},
+ bytranslator = {{vertaald \lbx@lfromlang\ door}{vert\adddotspace \lbx@lfromlang\ door}},
+ bycommentator = {{becommentarieerd door}{comm\adddotspace door}},
+ byannotator = {{geannoteerd door}{annot\adddotspace door}},
byeditortr = {{geredigeerd en vertaald \lbx@lfromlang\ door}%
- {red\adddotspace en vert\adddot\ \lbx@sfromlang\ door}},
+ {red\adddotspace en vert\adddotspace \lbx@sfromlang\ door}},
byeditorco = {{geredigeerd en becommentarieerd door}%
- {red\adddotspace en comm\adddot\ door}},
+ {red\adddotspace en comm\adddotspace door}},
byeditoran = {{geredigeerd en geannoteerd door}%
- {red\adddotspace en annot\adddot\ door}},
+ {red\adddotspace en annot\adddotspace door}},
byeditorin = {{geredigeerd, met een inleiding, van}%
{red., met een inl., van}},
byeditorfo = {{geredigeerd, met een voorwoord, van}%
@@ -240,9 +240,9 @@
byeditoraf = {{geredigeerd, met een nawoord, van}%
{red., met een naw., van}},
byeditortrco = {{geredigeerd, vertaald \lbx@lfromlang\ en becommentarieerd door}%
- {red., vert\adddot\ \lbx@sfromlang\ en comm\adddot\ door}},
+ {red., vert\adddotspace \lbx@sfromlang\ en comm\adddotspace door}},
byeditortran = {{geredigeerd, vertaald \lbx@lfromlang\ en geannoteerd door}%
- {red., vert\adddot\ \lbx@sfromlang\ en annot\adddot\ door}},
+ {red., vert\adddotspace \lbx@sfromlang\ en annot\adddotspace door}},
byeditortrin = {{geredigeerd en vertaald \lbx@lfromlang, met een inleiding, door}%
{red\adddotspace en vert. \lbx@sfromlang, met een inl., door}},
byeditortrfo = {{geredigeerd en vertaald \lbx@lfromlang, met een voorwoord, door}%
@@ -262,44 +262,44 @@
byeditoranaf = {{geredigeerd en geannoteerd, met een nawoord, door}%
{red\adddotspace en annot., met een naw., door}},
byeditortrcoin = {{geredigeerd, vertaald \lbx@lfromlang\ en becommentarieerd, met een inleiding, door}%
- {red., vert\adddot\ \lbx@sfromlang\ en comm., met een inl., door}},
+ {red., vert\adddotspace \lbx@sfromlang\ en comm., met een inl., door}},
byeditortrcofo = {{geredigeerd, vertaald \lbx@lfromlang\ en becommentarieerd, met een voorwoord, door}%
- {red., vert\adddot\ \lbx@sfromlang\ en comm., met een voorw., door}},
+ {red., vert\adddotspace \lbx@sfromlang\ en comm., met een voorw., door}},
byeditortrcoaf = {{geredigeerd, vertaald \lbx@lfromlang\ en becommentarieerd, met een nawoord, door}%
- {red., vert\adddot\ \lbx@sfromlang\ en comm., met een naw., door}},
+ {red., vert\adddotspace \lbx@sfromlang\ en comm., met een naw., door}},
byeditortranin = {{geredigeerd, vertaald \lbx@lfromlang\ en geannoteerd, met een inleiding, door}%
- {red., vert\adddot\ \lbx@sfromlang\ en annot., met een inl., door}},
+ {red., vert\adddotspace \lbx@sfromlang\ en annot., met een inl., door}},
byeditortranfo = {{geredigeerd, vertaald \lbx@lfromlang\ en geannoteerd, met een voorwoord, door}%
- {red., vert\adddot\ \lbx@sfromlang\ en annot., met een voorw., door}},
+ {red., vert\adddotspace \lbx@sfromlang\ en annot., met een voorw., door}},
byeditortranaf = {{geredigeerd, vertaald \lbx@lfromlang\ en geannoteerd, met een nawoord, door}%
- {red., vert\adddot\ \lbx@sfromlang\ en annot., met een naw., door}},
+ {red., vert\adddotspace \lbx@sfromlang\ en annot., met een naw., door}},
bytranslatorco = {{vertaald \lbx@lfromlang\ en becommentarieerd door}%
- {vert\adddot\ \lbx@sfromlang\ en comm\adddot\ door}},
+ {vert\adddotspace \lbx@sfromlang\ en comm\adddotspace door}},
bytranslatoran = {{vertaald \lbx@lfromlang\ en geannoteerd door}%
- {vert\adddot\ \lbx@sfromlang\ en annot.\adddot\ door}},
+ {vert\adddotspace \lbx@sfromlang\ en annot.\adddotspace door}},
bytranslatorin = {{vertaald \lbx@lfromlang, met een inleiding, door}%
{vert. \lbx@sfromlang, met een inl., door}},
bytranslatorfo = {{vertaald \lbx@lfromlang, met een voorwoord, door}%
{vert. \lbx@sfromlang, met een voorw., door}},
bytranslatoraf = {{vertaald \lbx@lfromlang, met een nawoord, door}%
{vert. \lbx@sfromlang, met een naw., door}},
- bytranslatorcoin = {{vertaald \lbx@lfromlang\ en becommentarieerd, met een inleiding., door}%
- {vert\adddot\ \lbx@sfromlang\ en comm., met een inl., door}},
+ bytranslatorcoin = {{vertaald \lbx@lfromlang\ en becommentarieerd, met een inleiding, door}%
+ {vert\adddotspace \lbx@sfromlang\ en comm., met een inl., door}},
bytranslatorcofo = {{vertaald \lbx@lfromlang\ en becommentarieerd, met een voorwoord, door}%
- {vert\adddot\ \lbx@sfromlang\ en comm., met een voorw., door}},
+ {vert\adddotspace \lbx@sfromlang\ en comm., met een voorw., door}},
bytranslatorcoaf = {{vertaald \lbx@lfromlang\ en becommentarieerd, met een nawoord, door}%
- {vert\adddot\ \lbx@sfromlang\ en comm., met een naw., door}},
- bytranslatoranin = {{vertaald \lbx@lfromlang\ en geannoteerd, met een inleiding., door}%
- {vert\adddot\ \lbx@sfromlang\ en annot., met een inl., door}},
+ {vert\adddotspace \lbx@sfromlang\ en comm., met een naw., door}},
+ bytranslatoranin = {{vertaald \lbx@lfromlang\ en geannoteerd, met een inleiding, door}%
+ {vert\adddotspace \lbx@sfromlang\ en annot., met een inl., door}},
bytranslatoranfo = {{vertaald \lbx@lfromlang\ en geannoteerd, met een voorwoord, door}%
- {vert\adddot\ \lbx@sfromlang\ en annot., met een voorw., door}},
+ {vert\adddotspace \lbx@sfromlang\ en annot., met een voorw., door}},
bytranslatoranaf = {{vertaald \lbx@lfromlang\ en geannoteerd, met een nawoord, door}%
- {vert\adddot\ \lbx@sfromlang\ en annot., met een naw., door}},
- withcommentator = {{met een commentaar van}{met een comm\adddot\ van}},
- withannotator = {{met annotaties door}{met annot\adddot\ door}},
- withintroduction = {{met een inleiding van}{met een inl\adddot\ van}},
- withforeword = {{met een voorwoord van}{met een voorw\adddot\ van}},
- withafterword = {{met een nawoord van}{met een naw\adddot\ van}},
+ {vert\adddotspace \lbx@sfromlang\ en annot., met een naw., door}},
+ withcommentator = {{met een commentaar van}{met een comm\adddotspace van}},
+ withannotator = {{met annotaties door}{met annot\adddotspace door}},
+ withintroduction = {{met een inleiding van}{met een inl\adddotspace van}},
+ withforeword = {{met een voorwoord van}{met een voorw\adddotspace van}},
+ withafterword = {{met een nawoord van}{met een naw\adddotspace van}},
commentary = {{commentaar}{comm\adddot}},
annotations = {{annotaties}{annot\adddot}},
introduction = {{inleiding}{inl\adddot}},
@@ -309,9 +309,9 @@
volumes = {{delen}{delen}},
jourvol = {{jaargang}{jrg\adddot}},
jourser = {{reeks}{reeks}},
-% book = {{}{}},% FIXME: missing
-% part = {{}{}},% FIXME: missing
-% issue = {{}{}},% FIXME: missing
+ book = {{boek}{boek}},
+ part = {{deel}{deel}},
+ issue = {{nummer}{nr\adddot}},
newseries = {{nieuwe reeks}{nieuwe reeks}},
oldseries = {{oude reeks}{oude reeks}},
edition = {{editie}{ed\adddot}},
@@ -324,20 +324,20 @@
reprint = {{herdruk}{herdr\adddot}},
reprintof = {{herdruk van}{herdr\adddotspace van}},
reprintas = {{herdrukt als}{herdr\adddotspace als}},
- reprintfrom = {{herdrukt uit}{herdr\adddotspace uit}},% FIXME: check
- translationof = {{translation of}{trans\adddotspace of}},% FIXME: check
- translationas = {{translated as}{trans\adddotspace as}},% FIXME: check
- translationfrom = {{vertaald van}{vert\adddotspace van}},% FIXME: check
-% reviewof = {{}{}},% FIXME: missing
-% origpubas = {{}{}},% FIXME: missing
-% origpubin = {{}{}},% FIXME: missing
+ reprintfrom = {{herdrukt uit}{herdr\adddotspace uit}},
+ translationof = {{vertaling van}{vert\adddotspace van}},
+ translationas = {{vertaald als}{vert\adddotspace als}},
+ translationfrom = {{vertaald van}{vert\adddotspace van}},
+ reviewof = {{bespreking van}{bespr\addotspace van}},
+ origpubas = {{oorspronkelijk gepubliceerd als}{oorspr\addotspace gep\addotspace als}},
+ origpubin = {{oorspronkelijk gepubliceerd in}{oorspr\addotspace gep\addotspace in}},
astitle = {{als}{als}},% FIXME: check
bypublisher = {{door}{door}},% FIXME: check
inpreparation = {{in voorbereiding}{in voorbereiding}},
submitted = {{ingediend}{ingedied}},
-% forthcoming = {{}{}},% FIXME: missing
+% forthcoming = {{onderweg}{onderweg}},% FIXME: check
inpress = {{in druk}{in druk}},
-% prepublished = {{}{}},% FIXME: missing
+ prepublished = {{voorpublicatie}{voorpublicatie}},
page = {{pagina}{p\adddot}},
pages = {{pagina's}{p\adddot}},
column = {{kolom}{kol\adddot}},
@@ -350,7 +350,7 @@
verses = {{verzen}{v\adddot}},
line = {{regel}{r\adddot}},
lines = {{regels}{r\adddot}},
- nodate = {{geen\space datum}{{}n\adddot d\adddot}},
+ nodate = {{geen\space datum}{{}g\adddot d\adddot}},
mathesis = {{masterscriptie}{masterscriptie}},
phdthesis = {{proefschrift}{proefschrift}},
resreport = {{onderzoeksrapport}{onderzoeksrap\adddot}},
@@ -362,7 +362,7 @@
andothers = {{en andere}{e\adddot a\adddot}},
andmore = {{en andere}{e\adddot a\adddot}},
url = {{addres}{addres}},
-% urlfrom = {{}{}},% FIXME: missing
+ urlfrom = {{beschikbaar op}{beschikbaar op}},
urlseen = {{bezocht op}{bezocht op}},
file = {{bestand}{bestand}},
library = {{bibliotheek}{bibliotheek}},
@@ -405,42 +405,42 @@
december = {{december}{dec}},
langamerican = {{Amerikaans Engels}{Amerikaans Engels}},
langbrazilian = {{Braziliaans Portugeens}{Braziliaans Portugees}},
-% langcatalan = {{}{}},% FIXME: missing
-% langcroatian = {{}{}},% FIXME: missing
-% langczech = {{}{}},% FIXME: missing
+ langcatalan = {{Catalaans}{Catalaans}},
+ langcroatian = {{Kroatisch}{Kroatisch}},
+ langczech = {{Tsjechisch}{Tsjechisch}},
langdanish = {{Deens}{Deens}},
langdutch = {{Nederlands}{Nederlands}},
langenglish = {{Engels}{Engels}},
-% langfinnish = {{}{}},% FIXME: missing
+ langfinnish = {{Fins}{Fins}},
langfrench = {{Frans}{Frans}},
langgerman = {{Duits}{Duits}},
langgreek = {{Grieks}{Grieks}},
langitalian = {{Italiaans}{Italiaans}},
langlatin = {{Latijn}{Latijn}},
langnorwegian = {{Noors}{Noors}},
-% langpolish = {{}{}},% FIXME: missing
+ langpolish = {{Pools}{Pools}},
langportuguese = {{Portugees}{Portugees}},
-% langrussian = {{}{}},% FIXME: missing
+ langrussian = {{Russisch}{Russisch}},
langspanish = {{Spaans}{Spaans}},
langswedish = {{Zweeds}{Zweeds}},
fromamerican = {{uit het Amerikaans Engels}{uit het Amerikaans Engels}},
frombrazilian = {{uit het Braziliaans Portugees}{uit het Braziliaans Portugees}},
-% fromcatalan = {{}{}},% FIXME: missing
-% fromcroatian = {{}{}},% FIXME: missing
-% fromczech = {{}{}},% FIXME: missing
+ fromcatalan = {{uit het Catalaans}{uit het Catalaans}},
+ fromcroatian = {{uit het Kroatisch}{uit het Kroatisch}},
+ fromczech = {{uit het Tsjechisch}{uit het Tsjechisch}},
fromdanish = {{uit het Deens}{uit het Deens}},
fromdutch = {{uit het Nederlands}{uit het Nederlands}},
fromenglish = {{uit het Engels}{uit het Engels}},
-% fromfinnish = {{}{}},% FIXME: missing
+ fromfinnish = {{uit het Fins}{uit het Fins}},
fromfrench = {{uit het Frans}{uit het Frans}},
fromgerman = {{uit het Duits}{uit het Duits}},
fromgreek = {{uit het Grieks}{uit het Grieks}},
fromitalian = {{uit het Italiaans}{uit het Italiaans}},
fromlatin = {{uit het Latijn}{uit het Latijn}},
fromnorwegian = {{uit het Noors}{uit het Noors}},
-% frompolish = {{}{}},% FIXME: missing
+ frompolish = {{uit het Pools}{uit het Pools}},
fromportuguese = {{uit het Portugees}{uit het Portugees}},
-% fromrussian = {{}{}},% FIXME: missing
+ fromrussian = {{uit het Russisch}{uit het Russisch}},
fromspanish = {{uit het Spaans}{uit het Spaans}},
fromswedish = {{uit het Zweeds}{uit het Zweeds}},
countryde = {{Duitsland}{DE}},
@@ -451,16 +451,16 @@
countryus = {{Verenigde Staten van Amerika}{VS}},
patent = {{patent}{pat\adddot}},
patentde = {{Duits patent}{Duits pat\adddot}},
- patenteu = {{Europees patent}{Europees pat\adddot}},
+ patenteu = {{Europees patent}{Eur\adddot pat\adddot}},
patentfr = {{Frans patent}{Frans pat\adddot}},
patentuk = {{Brits patent}{Brits pat\adddot}},
- patentus = {{Amerikaans patent}{Amerikaans pat\adddot}},
+ patentus = {{Amerikaans patent}{Amer\adddot pat\adddot}},
patreq = {{patentaanvraag}{patentaanvr\adddot}},
patreqde = {{Duitse patentaanvraag}{Duitse patentaanvr\adddot}},
- patreqeu = {{Europese patentaanvraag}{Europese patentaanvr\adddot}},
+ patreqeu = {{Europese patentaanvraag}{Eur\adddot patentaanvr\adddot}},
patreqfr = {{Franse patentaanvraag}{Franse patentaanvr\adddot}},
patrequk = {{Britse patentaanvraag}{Britse patentaanvr\adddot}},
- patrequs = {{Amerikaanse patentaanvraag}{Amerikaanse patentaanvr\adddot}},
+ patrequs = {{Amerikaanse patentaanvraag}{Amer\adddot patentaanvr\adddot}},
}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
index 41eb5ad9ed3..f0d1f867413 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
@@ -9,6 +9,21 @@
\DeclareRedundantLanguages{finnish}{finnish}
+\NewBibliographyString{%
+ basicjanuary,
+ basicfebruary,
+ basicmarch,
+ basicapril,
+ basicmay,
+ basicjune,
+ basicjuly,
+ basicaugust,
+ basicseptember,
+ basicoctober,
+ basicnovember,
+ basicdecember%
+}
+
\DeclareBibliographyExtras{%
% dashes: may be either \textendash or \textemdash
\protected\def\bibrangedash{%
@@ -27,8 +42,11 @@
\iffieldundef{#2}{}{\nobreakspace}}%
\iffieldundef{#2}
{}
- {\mkbibmonth{\thefield{#2}}%
- \iffieldundef{#1}{}{\space}}%
+ {\iffieldundef{#3}
+ {\lbx@fi@mkbibmonthbasic{\thefield{#2}}%
+ \iffieldundef{#1}{}{\space}}%
+ {\mkbibmonth{\thefield{#2}}%
+ \iffieldundef{#1}{}{\space}}}%
\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}%
\protected\def\mkbibdateshort#1#2#3{%
\iffieldundef{#3}
@@ -411,6 +429,18 @@
october = {{lokakuuta}{lokakuuta}},
november = {{marraskuuta}{marraskuuta}},
december = {{joulukuuta}{joulukuuta}},
+ basicjanuary = {{tammikuu}{tammikuu}},
+ basicfebruary = {{helmikuu}{helmikuu}},
+ basicmarch = {{maaliskuu}{maaliskuu}},
+ basicapril = {{huhtikuu}{huhtikuu}},
+ basicmay = {{toukokuu}{toukokuu}},
+ basicjune = {{kes\"akuu}{kes\"akuu}},
+ basicjuly = {{hein\"akuu}{hein\"akuu}},
+ basicaugust = {{elokuu}{elokuu}},
+ basicseptember = {{syyskuu}{syyskuu}},
+ basicoctober = {{lokakuu}{lokakuu}},
+ basicnovember = {{marraskuu}{marraskuu}},
+ basicdecember = {{joulukuu}{joulukuu}},
langamerican = {{amerikanenglanti}{amerikanenglanti}},
langbrazilian = {{brasilianportugali}{brasilianportugali}},
% langcatalan = {{}{}},% FIXME: missing
@@ -475,4 +505,23 @@
annotation = {{selitykset}{selitykset}},% FIXME: unsure
}
+\protected\gdef\lbx@fi@mkbibmonthbasic#1{%
+ \ifcase0#1\relax
+ #1\BibliographyWarning{Month out of range}%
+ \or\abx@bibmonth{basicjanuary}%
+ \or\abx@bibmonth{basicfebruary}%
+ \or\abx@bibmonth{basicmarch}%
+ \or\abx@bibmonth{basicapril}%
+ \or\abx@bibmonth{basicmay}%
+ \or\abx@bibmonth{basicjune}%
+ \or\abx@bibmonth{basicjuly}%
+ \or\abx@bibmonth{basicaugust}%
+ \or\abx@bibmonth{basicseptember}%
+ \or\abx@bibmonth{basicoctober}%
+ \or\abx@bibmonth{basicnovember}%
+ \or\abx@bibmonth{basicdecember}%
+ \else
+ #1\BibliographyWarning{Month out of range}%
+ \fi}%
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
index 97f63819a11..f85c12ad3c2 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
@@ -337,13 +337,13 @@
oldseries = {{ancienne s\'erie}{anc\adddotspace s\'er\adddot}},
edition = {{\'edition}{\'ed\adddot}},
reprint = {{r\'eimpression}{r\'eimpr\adddot}},
- reprintof = {{r\'eimpression \smartof}{r\'eimpr\adddotspace\smartof}},
+ reprintof = {{r\'eimpression de}{r\'eimpr\adddotspace de}},
reprintas = {{r\'eimpression sous le titre}{r\'eimpr\adddotspace sous le titre}},
reprintfrom = {{r\'eimpression \`a partir \smartof}{r\'eimpr\adddotspace \`a part\adddotspace\smartof}},
- translationof = {{traduction \smartof}{trad\adddotspace\smartof}},
+ translationof = {{traduction de}{trad\adddotspace de}},
translationas = {{traduit sous le titre}{trad\adddotspace sous le titre}},
- translationfrom = {{traduit \smartof}{trad\adddotspace\smartof}},
- reviewof = {{critique \smartof}{crit.\adddotspace\smartof}},
+ translationfrom = {{traduit de}{trad\adddotspace de}},
+ reviewof = {{critique de}{crit.\adddotspace de}},
origpubas = {{publi\'e \`a l'origine sous le titre}{pub\adddotspace \`a l'orig\adddotspace sous le titre}},
origpubin = {{publi\'e \`a l'origine en}{pub\adddotspace \`a l'orig\adddotspace en}},
astitle = {{sous le titre}{sous le titre}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
index d0fc59a56b8..6a0bbed3519 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
@@ -109,8 +109,8 @@
introduction = {{inledning}{inl\adddot}},
foreword = {{f\"orord}{f\"orord}},
afterword = {{efterord}{efterord}},
-% editortr = {{}{}},% FIXME: missing
-% editorstr = {{}{}},% FIXME: missing
+ editortr = {{utgivare och \"overs\"attare}{utg\adddot\ och \"overs\adddot}},
+ editorstr = {{utgivare och \"overs\"attare}{utg\adddot\ och \"overs\adddot}},
% editorco = {{}{}},% FIXME: missing
% editorsco = {{}{}},% FIXME: missing
% editoran = {{}{}},% FIXME: missing
@@ -181,7 +181,7 @@
byeditor = {{utgiven av}{utg\adddotspace av}},
bycompiler = {{sammanst\"alld av}{sammanst\adddotspace av}},
byredactor = {{bearbetad av}{bearb\adddotspace av}},
-% byreviser = {{}{}},% FIXME: missing
+ byreviser = {{reviderad av}{rev\adddotspace av}},
% byreviewer = {{}{}},% FIXME: missing
% byfounder = {{}{}},% FIXME: missing
% bycontinuator = {{}{}},% FIXME: missing
@@ -268,11 +268,11 @@
andmore = {{m.\,fl\adddot}{m.\,fl\adddot}},
volume = {{volym}{vol\adddot}},
volumes = {{volymer}{vol\adddot}},
- involumes = {{i}{i}},% FIXME: unsure
+ involumes = {{i}{i}},
jourvol = {{\aa rg\aa ng}{\aa rg\adddot}},
jourser = {{serie}{ser\adddot}},
-% book = {{}{}},% FIXME: missing
-% part = {{}{}},% FIXME: missing
+ book = {{bok}{bok}},
+ part = {{del}{del}},
% issue = {{}{}},% FIXME: missing
% Both "ny serie (N.S.)" and "ny f\"oljd (N.F.)" are common
newseries = {{ny f\"oljd}{N.\,F\adddot}},
@@ -286,21 +286,21 @@
reprintof = {{nytryck av}{nytr\adddotspace av}},
reprintas = {{nytryckt som}{nytr\adddotspace som}},
reprintfrom = {{nytryckt fr\aa n}{nytryckt fr\aa n}},% FIXME: check
-% translationof = {{}{}},% FIXME: missing
-% translationas = {{}{}},% FIXME: missing
-% translationfrom = {{}{}},% FIXME: missing
-% reviewof = {{}{}},% FIXME: missing
-% origpubas = {{}{}},% FIXME: missing
-% origpubin = {{}{}},% FIXME: missing
-% astitle = {{}{}},% FIXME: missing
- bypublisher = {{av}{av}},% FIXME: check
+ translationof = {{\"overs\"attning av}{\"overs\adddot\ av}},
+ translationas = {{\"overs\"attning som}{\"overs\adddot\ som}},
+ translationfrom = {{\"overs\"attning fr\aa n}{\"overs\adddotspace fr\aa n}},
+ reviewof = {{recension av}{recension av}},
+ origpubas = {{ursprungligen publicerad som}{ursprunglingen publ\adddot\ som}},
+ origpubin = {{ursprungligen publicerad}{ursprungligen publ\adddot}},
+ astitle = {{som}{som}},
+ bypublisher = {{av}{av}},
page = {{sidan}{s\adddot}},
pages = {{sidorna}{s\adddot}},
column = {{spalt}{sp\adddot}},
columns = {{spalterna}{sp\adddot}},
line = {{rad}{r\adddot}},
lines = {{raderna}{r\adddot}},
- nodate = {{n\adddot d\adddot}{n\adddot d\adddot}},%FIXME
+ nodate = {{u\adddot d\adddot}{n\adddot d\adddot}},%FIXME
verse = {{vers}{v\adddot}},
verses = {{verserna}{v\adddot}},
section = {{paragraf}{\S}},
@@ -326,7 +326,7 @@
audiocd = {{ljud-cd}{ljud-cd}},
version = {{version}{version}},
url = {{webbadress}{URL}},
-% urlfrom = {{}{}},% FIXME: missing
+ urlfrom = {{tillg\"anglig fr\aa n}{tillg\"anglig fr\aa n}},
urlseen = {{senast h\"amtad}{h\"amtad}},
% inpreparation = {{}{}},% FIXME: missing
% submitted = {{}{}},% FIXME: missing
@@ -370,42 +370,42 @@
december = {{december}{dec\adddot}},
langamerican = {{amerikanska}{amerikanska}},
% langbrazilian = {{}{}},% FIXME: missing
-% langcatalan = {{}{}},% FIXME: missing
-% langcroatian = {{}{}},% FIXME: missing
-% langczech = {{}{}},% FIXME: missing
+ langcatalan = {{katalanska}{katalanska}},
+ langcroatian = {{kroatiska}{kroatiska}},
+ langczech = {{tjeckiska}{tjeckiska}},
langdanish = {{danska}{danska}},
-% langdutch = {{}{}},% FIXME: missing
+ langdutch = {{nederl\"andska}{nederl\"andska}},
langenglish = {{engelska}{engelska}},
-% langfinnish = {{}{}},% FIXME: missing
+ langfinnish = {{finska}{finska}},
langfrench = {{franska}{franska}},
langgerman = {{tyska}{tyska}},
langgreek = {{grekiska}{grekiska}},
langitalian = {{italienska}{italienska}},
langlatin = {{latin}{latin}},
langnorwegian = {{norska}{norska}},
-% langpolish = {{}{}},% FIXME: missing
-% langportuguese = {{}{}},% FIXME: missing
-% langrussian = {{}{}},% FIXME: missing
+ langpolish = {{polska}{polska}},
+ langportuguese = {{portugisiska}{portugisiska}},
+ langrussian = {{ryska}{ryska}},
langspanish = {{spanska}{spanska}},
langswedish = {{svenska}{svenska}},
fromamerican = {{fr\aa n amerikanska}{fr\aa n amerikanska}},
% frombrazilian = {{}{}},% FIXME: missing
-% fromcatalan = {{}{}},% FIXME: missing
-% fromcroatian = {{}{}},% FIXME: missing
-% fromczech = {{}{}},% FIXME: missing
+ fromcatalan = {{fr\aan katalanska}{fr\aan katalanska}},
+ fromcroatian = {{fr\aa n kroatiska}{fr\aa n kroatiska}},
+ fromczech = {{fr\aa n tjeckiska}{fr\aa n tjeckiska}},
fromdanish = {{fr\aa n danska}{fr\aa n danska}},
-% fromdutch = {{}{}},% FIXME: missing
+ fromdutch = {{fr\aa n nederl\"andska}{fr\aa n nederl\"andska}},
fromenglish = {{fr\aa n engelska}{fr\aa n engelska}},
-% fromfinnish = {{}{}},% FIXME: missing
+ fromfinnish = {{fr\aa n finska}{fr\aa n finska}},
fromfrench = {{fr\aa n franska}{fr\aa n franska}},
fromgerman = {{fr\aa n tyska}{fr\aa n tyska}},
fromgreek = {{fr\aa n grekiska}{fr\aa n grekiska}},
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
+ frompolish = {{fr\aa n polska}{fr\aa n polska}},
+ fromportuguese = {{fr\aa n portugisiska}{fr\aa n portugisiska}},
+ fromrussian = {{fr\aa n ryska}{fr\aa n ryska}},
fromspanish = {{fr\aa n spanska}{fr\aa n spanska}},
fromswedish = {{fr\aa n svenska}{fr\aa n svenska}},
countryde = {{Tyskland}{DE}},