diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex')
65 files changed, 2379 insertions, 4926 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx index 8a41db44fa8..06d91ba6c07 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx @@ -4,16 +4,10 @@ \RequireBibliographyStyle{standard} \ExecuteBibliographyOptions{labelalpha,sorting=anyt} -\providebool{bbx:subentry} - -\DeclareBibliographyOption[boolean]{subentry}[true]{% - \setbool{bbx:subentry}{#1}} - \DeclareNameAlias{author}{default} \DeclareNameAlias{editor}{default} \DeclareNameAlias{translator}{default} -\DeclareFieldFormat{bibentrysetcount}{\mkbibparens{\mknumalph{#1}}} \DeclareFieldFormat{labelalphawidth}{\mkbibbrackets{#1}} \DeclareFieldFormat{shorthandwidth}{\mkbibbrackets{#1}} @@ -21,7 +15,7 @@ {\list {\printtext[labelalphawidth]{% \printfield{labelprefix}% - \printfield{labelalpha}% + \printfield{labelalpha}% \printfield{extraalpha}}} {\setlength{\labelwidth}{\labelalphawidth}% \setlength{\leftmargin}{\labelwidth}% @@ -46,15 +40,4 @@ {\endlist} {\item} -\DeclareBibliographyDriver{set}{% - \entryset - {\ifbool{bbx:subentry} - {\printfield[bibentrysetcount]{entrysetcount}% - \printunit*{\addnbspace}} - {}} - {}% - \newunit\newblock - \usebibmacro{setpageref}% - \finentry} - \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx index cd89399bfaa..a3f26dd9fe2 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx @@ -69,8 +69,8 @@ {\usebibmacro{bbx:dashcheck} {\bibnamedash} {\printnames{author}% - \setunit{\printdelim{authortypedelim}}% - \usebibmacro{bbx:savehash}}% + \setunit{\addcomma\space}% + \usebibmacro{bbx:savehash}}% \usebibmacro{authorstrg}} {\global\undef\bbx@lasthash}} @@ -87,8 +87,8 @@ {\usebibmacro{bbx:dashcheck} {\bibnamedash} {\printnames{editor}% - \setunit{\printdelim{editortypedelim}}% - \usebibmacro{bbx:savehash}}% + \setunit{\addcomma\space}% + \usebibmacro{bbx:savehash}}% \usebibmacro{#1}% \clearname{editor}} {\global\undef\bbx@lasthash}} @@ -106,7 +106,7 @@ {\usebibmacro{bbx:dashcheck} {\bibnamedash} {\printnames{translator}% - \setunit{\printdelim{translatortypedelim}}% + \setunit{\addcomma\space}% \usebibmacro{bbx:savehash}}% \usebibmacro{#1}% \clearname{translator}} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx index 62df365d2d7..e27b18904e2 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx @@ -17,80 +17,59 @@ {Valid values are 'maximum', 'compact', 'basic', 'minimum',\MessageBreak 'true' (=compact), and 'false'.}}} -\providebibmacro*{date+extradate}{} -\providebibmacro*{date+extrayear}{\usebibmacro{date+extradate}} +\providebibmacro*{date+extrayear}{} \def\bbx@opt@mergedate@true{\bbx@opt@mergedate@compact} % merge date/issue with date label \def\bbx@opt@mergedate@maximum{% - \renewbibmacro*{date+extradate}{% + \renewbibmacro*{date+extrayear}{% \iffieldundef{labelyear} {} {\printtext[parens]{% - \iflabeldateisdate - {\printfield{issue}% - \setunit*{\addspace}% - \printdateextra} - {\printlabeldateextra}}}}% - \renewbibmacro*{date}{% - \iflabeldateisdate - {} - {\printdate}}% - \renewbibmacro*{issue+date}{% - \iflabeldateisdate - {} - {\printtext[parens]{% \printfield{issue}% \setunit*{\addspace}% - \printdate}}}} + \iffieldsequal{year}{labelyear} + {\printlabeldateextra}% + {\printfield{labelyear}% + \printfield{extrayear}}}}}% + \renewbibmacro*{date}{}% + \renewbibmacro*{issue+date}{}} % merge date with date label \def\bbx@opt@mergedate@compact{% - \renewbibmacro*{date+extradate}{% + \renewbibmacro*{date+extrayear}{% \iffieldundef{labelyear} {} {\printtext[parens]{% - \iflabeldateisdate - {\printdateextra} - {\printlabeldateextra}}}}% - \renewbibmacro*{date}{% - \iflabeldateisdate - {} - {\printdate}}% + \iffieldsequal{year}{labelyear} + {\printlabeldateextra}% + {\printfield{labelyear}% + \printfield{extrayear}}}}}% + \renewbibmacro*{date}{}% \renewbibmacro*{issue+date}{% - \ifboolexpr{not test {\iffieldundef{issue}} - or not test {\iflabeldateisdate}} - {\printtext[parens]{% - \printfield{issue}% - \setunit*{\addspace}% - \iflabeldateisdate - {} - {\printdate}}} - {}% + \iffieldundef{issue} + {} + {\printtext[parens]{\printfield{issue}}}% \newunit}} % merge year-only date with date label \def\bbx@opt@mergedate@basic{% - \renewbibmacro*{date+extradate}{% + \renewbibmacro*{date+extrayear}{% \iffieldundef{labelyear} {} - {\printtext[parens]{\printlabeldateextra}}}% + {\printtext[parens]{% + \printfield{labelyear}% + \printfield{extrayear}}}}% \renewbibmacro*{date}{% - \ifboolexpr{ - test {\iflabeldateisdate} - and - not test {\ifdateshavedifferentprecision{label}{}} - } + \iffieldundef{month} {} {\printdate}}% \renewbibmacro*{issue+date}{% \ifboolexpr{ - test {\iflabeldateisdate} - and - not test {\ifdateshavedifferentprecision{label}{}} - and test {\iffieldundef{issue}} + and + test {\iffieldundef{month}} } {} {\printtext[parens]{% @@ -101,29 +80,27 @@ % merge year-only date with year-only date label \def\bbx@opt@mergedate@minimum{% - \renewbibmacro*{date+extradate}{% + \renewbibmacro*{date+extrayear}{% \iffieldundef{labelyear} {} - {\printtext[parens]{\printlabeldateextra}}}% + {\printtext[parens]{% + \printfield{labelyear}% + \printfield{extrayear}}}}% \renewbibmacro*{date}{% \ifboolexpr{ - test {\iflabeldateisdate} + test {\iffieldundef{month}} and - not test {\ifdateshavedifferentprecision{label}{}} - and - test {\iffieldundef{extradate}} + test {\iffieldundef{extrayear}} } {} {\printdate}}% \renewbibmacro*{issue+date}{% \ifboolexpr{ - test {\iflabeldateisdate} - and - not test {\ifdateshavedifferentprecision{label}{}} + test {\iffieldundef{issue}} and - test {\iffieldundef{extradate}} + test {\iffieldundef{month}} and - test {\iffieldundef{issue}} + test {\iffieldundef{extrayear}} } {} {\printtext[parens]{% @@ -134,18 +111,21 @@ % don't merge date/issue with date label \def\bbx@opt@mergedate@false{% - \renewbibmacro*{date+extradate}{% + \renewbibmacro*{date+extrayear}{% \iffieldundef{labelyear} {} - {\printtext[parens]{\printlabeldateextra}}}% + {\printtext[parens]{% + \printfield{labelyear}% + \printfield{extrayear}}}}% \renewbibmacro*{date}{\printdate}% \renewbibmacro*{issue+date}{% \printtext[parens]{% \printfield{issue}% \setunit*{\addspace}% - \usebibmacro{date}}% + \printdate}% \newunit}} +% n.b. the default labeldate=year overrides merging of months and days \ExecuteBibliographyOptions{labeldateparts,sorting=nyt,pagetracker,mergedate} \DeclareFieldFormat{shorthandwidth}{#1} @@ -209,7 +189,7 @@ \printnames{author}% \iffieldundef{authortype} {\setunit{\printdelim{nameyeardelim}}} - {\setunit{\printdelim{authortypedelim}}}}% + {\setunit{\addcomma\space}}}% \iffieldundef{authortype} {} {\usebibmacro{authorstrg}% @@ -217,7 +197,7 @@ {\global\undef\bbx@lasthash \usebibmacro{labeltitle}% \setunit*{\printdelim{nonameyeardelim}}}% - \usebibmacro{date+extradate}} + \usebibmacro{date+extrayear}} \renewbibmacro*{editor}{% \usebibmacro{bbx:editor}{editorstrg}} @@ -232,7 +212,7 @@ {\usebibmacro{bbx:dashcheck} {\bibnamedash} {\printnames{editor}% - \setunit{\printdelim{editortypedelim}}% + \setunit{\addcomma\space}% \usebibmacro{bbx:savehash}}% \usebibmacro{#1}% \clearname{editor}% @@ -240,7 +220,7 @@ {\global\undef\bbx@lasthash \usebibmacro{labeltitle}% \setunit*{\printdelim{nonameyeardelim}}}% - \usebibmacro{date+extradate}} + \usebibmacro{date+extrayear}} \renewbibmacro*{translator}{% \usebibmacro{bbx:translator}{translatorstrg}} @@ -255,15 +235,15 @@ {\usebibmacro{bbx:dashcheck} {\bibnamedash} {\printnames{translator}% - \setunit{\printdelim{translatortypedelim}}% + \setunit{\addcomma\space}% \usebibmacro{bbx:savehash}}% - \usebibmacro{#1}% + \usebibmacro{translator+othersstrg}% \clearname{translator}% \setunit{\printdelim{nameyeardelim}}}% {\global\undef\bbx@lasthash \usebibmacro{labeltitle}% \setunit*{\printdelim{nonameyeardelim}}}% - \usebibmacro{date+extradate}} + \usebibmacro{date+extrayear}} \newbibmacro*{bbx:dashcheck}[2]{% \ifboolexpr{ diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx index 1c573251577..e86e97ac041 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx @@ -18,7 +18,7 @@ \setlength{\itemsep}{\bibitemsep}% \setlength{\parsep}{\bibparsep}% \renewcommand*{\makelabel}[1]{% - \hspace\labelsep\bfseries##1}}} + \hspace\labelsep\bfseries##1}}} {\endlist} {\item} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx index 70c2134c4eb..5458f8a5957 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx @@ -20,8 +20,8 @@ \defbibenvironment{bibliography} {\list {\printtext[labelnumberwidth]{% - \printfield{labelprefix}% - \printfield{labelnumber}}} + \printfield{labelprefix}% + \printfield{labelnumber}}} {\setlength{\labelwidth}{\labelnumberwidth}% \setlength{\leftmargin}{\labelwidth}% \setlength{\labelsep}{\biblabelsep}% @@ -49,7 +49,7 @@ \entryset {\ifbool{bbx:subentry} {\printfield[bibentrysetcount]{entrysetcount}% - \printunit*{\addnbspace}} + \printunit*{\addnbspace}} {}} {}% \newunit\newblock diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx index 8edb549d154..d5bf3f198d1 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx @@ -719,10 +719,10 @@ {\iffieldundef{maintitle} {} {\usebibmacro{maintitle}% - \newunit\newblock - \iffieldundef{volume} - {} - {\printfield{volume}% + \newunit\newblock + \iffieldundef{volume} + {} + {\printfield{volume}% \printfield{part}% \setunit{\addcolon\space}}}}% \usebibmacro{title}% @@ -771,7 +771,11 @@ {\newunit \printfield{series}% \setunit{\addspace}}% - \usebibmacro{volume+number+eid}% + \printfield{volume}% + \setunit*{\adddot}% + \printfield{number}% + \setunit{\addcomma\space}% + \printfield{eid}% \setunit{\addspace}% \usebibmacro{issue+date}% \setunit{\addcolon\space}% @@ -780,9 +784,11 @@ \newbibmacro*{issue+date}{% \printtext[parens]{% - \printfield{issue}% - \setunit*{\addspace}% - \usebibmacro{date}}% + \iffieldundef{issue} + {\usebibmacro{date}} + {\printfield{issue}% + \setunit*{\addspace}% + \usebibmacro{date}}}% \newunit} \newbibmacro*{event+venue+date}{% diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def index 2d0d142a570..653677f34e4 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def @@ -19,8 +19,7 @@ \def\do#1{% \csdef{mkbibname#1}##1{##1}% \define@key{blx@opt@namepart}{#1}{\csdef{namepart#1}{##1}}% - \define@key{blx@opt@namepart}{#1i}{\csdef{namepart#1i}{##1}}% - \define@key{blx@opt@namepart}{#1un}{\csdef{namepart#1un}{##1}}} + \define@key{blx@opt@namepart}{#1i}{\csdef{namepart#1i}{##1}}} \expandafter\docsvlist\expandafter{\blx@datamodel@constant@nameparts} % legacy aliases @@ -33,66 +32,63 @@ \ifdefempty\mkbibnamelast {\let\@mkbibnamelastsaved\mkbibnamefamily}% not redefined by user {\blx@warning@noline{% - Attempt to redefine deprecated '\string\mkbibnamelast'.\MessageBreak - Please use '\string\mkbibnamefamily' instead.\MessageBreak - Using '\string\mkbibnamefamily'}% + Attempt to redefine deprecated \string\mkbibnamelast\space, please + use \string\mkbibnamefamily\space instead. Using + \string\mkbibnamefamily}% \let\@mkbibnamelastsaved\mkbibnamelast \let\mkbibnamefamily\@mkbibnamelastsaved}% % Now redefine it in case it's used \def\mkbibnamelast{% \blx@warning@noline{% - '\string\mkbibnamelast' is deprecated.\MessageBreak - Please use '\string\mkbibnamefamily'.\MessageBreak - Using '\string\mkbibnamefamily'}% + \string\mkbibnamelast\space is deprecated, please use + \string\mkbibnamefamily. Using \string\mkbibnamefamily}% \@mkbibnamelastsaved} \ifdefempty\mkbibnamefirst {\let\@mkbibnamefirstsaved\mkbibnamegiven}% not redefined by user {\blx@warning@noline{% - Attempt to redefine deprecated '\string\mkbibnamefirst'.\MessageBreak - Please use '\string\mkbibnamegiven' instead.\MessageBreak - Using '\string\mkbibnamegiven'}% + Attempt to redefine deprecated \string\mkbibnamefirst\space, please + use \string\mkbibnamegiven\space instead. Using + \string\mkbibnamegiven}% \let\@mkbibnamefirstsaved\mkbibnamefirst \let\mkbibnamegiven\@mkbibnamefirstsaved}% % Now redefine it in case it's used \def\mkbibnamefirst{% \blx@warning@noline{% - '\string\mkbibnamefirst' is deprecated.\MessageBreak - Please use '\string\mkbibnamegiven'.\MessageBreak - Using '\string\mkbibnamegiven'}% + \string\mkbibnamefirst\space is deprecated, please use + \string\mkbibnamegiven. Using \string\mkbibnamegiven}% \@mkbibnamefirstsaved} \ifdefempty\mkbibnameaffix {\let\@mkbibnameaffixsaved\mkbibnamesuffix}% not redefined by user {\blx@warning@noline{% - Attempt to redefine deprecated '\string\mkbibnameaffix'.\MessageBreak - Please use '\string\mkbibnamesuffix' instead.\MessageBreak - Using '\string\mkbibnamesuffix'}% + Attempt to redefine deprecated \string\mkbibnameaffix\space, please + use \string\mkbibnamesuffix\space instead. Using + \string\mkbibnamesuffix}% \let\@mkbibnameaffixsaved\mkbibnameaffix \let\mkbibnamesuffix\@mkbibnameaffixsaved}% % Now redefine it in case it's used \def\mkbibnameaffix{% \blx@warning@noline{% - '\string\mkbibnameaffix' is deprecated.\MessageBreak - Please use '\string\mkbibnamesuffix'.\MessageBreak - Using \string\mkbibnamesuffix}% + \string\mkbibnameaffix\space is deprecated, please use + \string\mkbibnamesuffix. Using \string\mkbibnamesuffix}% \@mkbibnameaffixsaved}} \newcommand*{\bibellipsis}{[\textellipsis\unkern]\midsentence} % Delimiters used in citations, bibliography and bibliography lists -\DeclareDelimFormat{multinamedelim}{\addcomma\space} -\DeclareDelimFormat{finalnamedelim}{% +\newcommand*{\multinamedelim}{\addcomma\space} +\newcommand*{\finalnamedelim}{% \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}% \addspace\bibstring{and}\space} -\DeclareDelimFormat{revsdnamedelim}{} -\DeclareDelimFormat{andothersdelim}{\addspace} +\newcommand*{\revsdnamedelim}{} +\newcommand*{\andothersdelim}{\addspace} -\DeclareDelimFormat{multilistdelim}{\addcomma\space} -\DeclareDelimFormat{finallistdelim}{% +\newcommand*{\multilistdelim}{\addcomma\space} +\newcommand*{\finallistdelim}{% \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}% \addspace\bibstring{and}\space} -\DeclareDelimFormat{andmoredelim}{\addspace} +\newcommand*{\andmoredelim}{\addspace} \newcommand*{\multicitedelim}{\addsemicolon\space} \newcommand*{\compcitedelim}{\addcomma\space} @@ -109,26 +105,21 @@ {\iftextcitepunct{\addsemicolon}{\addcomma}}% \space} - % context-sensitive delimiters -% retain compatibility with \labelnamepunct et al. -% The seemingly redundant definitions are needed because -% hard-coded punctuation was replaced by context-sensitive -% delimiters, changes to here need to be made explicitly -% to avoid unwanted effects of redefining the global delimiter. -\DeclareDelimFormat{authortypedelim}{\addcomma\space} -\DeclareDelimFormat{editortypedelim}{\addcomma\space} -\DeclareDelimFormat{translatortypedelim}{\addcomma\space} +% retain compatibility with \labelnamepunct \DeclareDelimFormat{namelabeldelim}{\addspace} \DeclareDelimFormat{nametitledelim}{\addcomma\space} -\DeclareDelimFormat[bib,biblist]{nametitledelim}{\labelnamepunct} +\DeclareDelimFormat[bib]{nametitledelim}{\labelnamepunct} +\DeclareDelimFormat[biblist]{nametitledelim}{\labelnamepunct} \DeclareDelimFormat[textcite]{nametitledelim}{\addspace} \DeclareDelimFormat{nameyeardelim}{\addspace} \DeclareDelimFormat[textcite]{nameyeardelim}{\addspace} -\DeclareDelimFormat[bib,biblist]{nameyeardelim}{\addspace} +\DeclareDelimFormat[bib]{nameyeardelim}{\addspace} +\DeclareDelimFormat[biblist]{nameyeardelim}{\addspace} \DeclareDelimFormat{nonameyeardelim}{\addspace} \DeclareDelimFormat[textcite]{nonameyeardelim}{\addspace} -\DeclareDelimFormat[bib,biblist]{nonameyeardelim}{\addspace} +\DeclareDelimFormat[bib]{nonameyeardelim}{\addspace} +\DeclareDelimFormat[biblist]{nonameyeardelim}{\addspace} \DeclareDelimFormat{dateeradelim}{\addspace} \DeclareDelimFormat{datecircadelim}{\addspace} @@ -408,10 +399,17 @@ \ifbibstring{#1}{\bibstring{#1}}{\mkyearzeros{#1}}} \DeclareFieldFormat{labelendyear}{% = the '1995' part in 'Jones 1995a' \ifbibstring{#1}{\bibstring{#1}}{\mkyearzeros{#1}}} -\DeclareFieldFormat{extradate}{% - \iffieldnums{labelyear} - {\mknumalph{#1}} - {\mkbibparens{\mknumalph{#1}}}} +% If labeldatesource is a defined field, they +% Don't check labelyear directly as it is already processed into a range with markers +% and so is never nums due to unexpandable parts of labelyear determination +\DeclareFieldFormat{extrayear}{% + \iffieldundef{\thefield{labeldatesource}} + {\iffieldnums{\thefield{labeldatesource}year} + {\mknumalph{#1}} + {\mkbibparens{\mknumalph{#1}}}} + {\iffieldnums{\thefield{labeldatesource}} + {\mknumalph{#1}} + {\mkbibparens{\mknumalph{#1}}}}}% \DeclareFieldFormat{labelalpha}{#1}% \DeclareFieldFormat{extraalpha}{\mknumalph{#1}}% \DeclareFieldFormat{shorthand}{#1\isdot} @@ -471,7 +469,7 @@ \iffieldundef{eprintclass} {} {\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}} - {\nolinkurl{#1}% + {\nolinkurl{#1} \iffieldundef{eprintclass} {} {\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}} @@ -589,55 +587,6 @@ {#1}}% \usebibmacro{list:andothers}} -\DeclareListFormat{origlanguage}{% - \usebibmacro{list:delim}{% - \ifbibstring{#1} - {\bibxstring{#1}} - {\ifbibstring{lang#1} - {\bibxstring{lang#1}} - {#1}}}% - \ifbibstring{#1} - {\bibstring{#1}} - {\ifbibstring{lang#1} - {\bibstring{lang#1}} - {#1}}% - \usebibmacro{list:andothers}} - - -\DeclareListFormat{lfromoriglanguage}{% - \begingroup - \blx@bibstringnormal - \usebibmacro{list:delim}{% - \ifbibstring{from#1} - {\bibxlstring{from#1}} - {\ifbibstring{lang#1} - {\bibxlstring{lang#1}} - {#1}}}% - \ifbibstring{from#1} - {\bibstring{from#1}} - {\ifbibstring{lang#1} - {\biblstring{lang#1}} - {#1}}% - \usebibmacro{list:andothers}% - \endgroup} - -\DeclareListFormat{sfromoriglanguage}{% - \begingroup - \blx@bibstringnormal - \usebibmacro{list:delim}{% - \ifbibstring{from#1} - {\bibxsstring{from#1}} - {\ifbibstring{lang#1} - {\bibxsstring{lang#1}} - {#1}}}% - \ifbibstring{from#1} - {\bibstring{from#1}} - {\ifbibstring{lang#1} - {\bibsstring{lang#1}} - {#1}}% - \usebibmacro{list:andothers}% - \endgroup} - \DeclareListFormat{location}{% \usebibmacro{list:delim}{#1}% #1\isdot @@ -677,13 +626,13 @@ or test \ifmoreitems } - {\printdelim{multilistdelim}} + {\multilistdelim} {\lbx@finallistdelim{#1}}} {}} \newbibmacro*{list:plain}{% \ifnumgreater{\value{listcount}}{\value{liststart}} - {\printdelim{multilistdelim}} + {\multilistdelim} {}} \newbibmacro*{list:andothers}{% @@ -695,7 +644,7 @@ {\ifnumgreater{\value{liststop}}{1} {\finalandcomma} {}% - \printdelim{andmoredelim}\bibstring{andmore}} + \andmoredelim\bibstring{andmore}} {}} \newbibmacro*{pageref:init}{% @@ -728,7 +677,7 @@ \numdef\abx@range@diff{\abx@range@diff+1}} {\usebibmacro{pageref:dump}% \ifnumgreater{\abx@range@last}{-1} - {\printdelim{multilistdelim}} + {\multilistdelim} {}% \ifhyperref {\hyperlink{page.#1}{#1}} @@ -736,7 +685,7 @@ \edef\abx@range@prev{\abx@range@num}} {\usebibmacro{pageref:dump}% \ifnumgreater{\abx@range@last}{-1} - {\printdelim{multilistdelim}} + {\multilistdelim} {}% \ifhyperref {\hyperlink{page.#1}{#1}} @@ -753,7 +702,7 @@ {\abx@range@hold}% \or % three \ifnumless{\abx@range@diff}{2} - {\printdelim{multilistdelim}} + {\multilistdelim} {\bibrangedash}% \ifhyperref {\hyperlink{page.\abx@range@hold}{\abx@range@hold}} @@ -937,7 +886,6 @@ \DeclareFieldFormat{authortype}{#1} \DeclareFieldFormat{editortype}{#1} -\DeclareFieldFormat{translatortype}{#1} % Auxiliary macros for name formatting directives % ------------------------------------------------------------------ @@ -1017,7 +965,7 @@ or test \ifmorenames } - {\printdelim{multinamedelim}} + {\multinamedelim} {\lbx@finalnamedelim{#1}}} {}} @@ -1031,7 +979,7 @@ or test {\ifnumequal{\value{liststop}}{2}} } - {\printdelim{revsdnamedelim}} + {\revsdnamedelim} {}} \newbibmacro*{name:andothers}{% @@ -1043,7 +991,7 @@ {\ifnumgreater{\value{liststop}}{1} {\finalandcomma} {}% - \printdelim{andothersdelim}\bibstring{andothers}} + \andothersdelim\bibstring{andothers}} {}} % ------------------------------------------------------------------ @@ -1265,13 +1213,6 @@ \literal{nodate} } -\DeclareExtradate{% - \scope{ - \field{labelyear} - \field{year} - } -} - \DeclareLabeltitle{% \field{shorttitle} \field{title} @@ -1290,7 +1231,7 @@ \field[strwidth=1,strside=left]{labelname} } \labelelement{ - \field[strwidth=2,strside=right]{year} + \field[strwidth=2,strside=right]{year} } } @@ -1317,7 +1258,7 @@ % SORTING % ------------------------------------------------------------------ -\DeclareSortingNamekeyTemplate{ +\DeclareSortingNamekeyScheme{ \keypart{ \namepart[use=true]{prefix} } @@ -1337,7 +1278,7 @@ \DeclarePresort{mm} -\DeclareSortingTemplate{shorthand}{ +\DeclareSortingScheme{shorthand}{ \sort[final]{ \field{sortshorthand} } @@ -1346,17 +1287,17 @@ } } -\DeclareSortingTemplate{none}{ +\DeclareSortingScheme{none}{ \sort{\citeorder} } -\DeclareSortingTemplate{debug}{ +\DeclareSortingScheme{debug}{ \sort{ \field{entrykey} } } -\DeclareSortingTemplate{nty}{ +\DeclareSortingScheme{nty}{ \sort{ \field{presort} } @@ -1385,7 +1326,7 @@ } } -\DeclareSortingTemplate{nyt}{ +\DeclareSortingScheme{nyt}{ \sort{ \field{presort} } @@ -1414,7 +1355,7 @@ } } -\DeclareSortingTemplate{nyvt}{ +\DeclareSortingScheme{nyvt}{ \sort{ \field{presort} } @@ -1443,7 +1384,7 @@ } } -\DeclareSortingTemplate{anyt}{ +\DeclareSortingScheme{anyt}{ \sort{ \field{presort} } @@ -1475,7 +1416,7 @@ } } -\DeclareSortingTemplate{anyvt}{ +\DeclareSortingScheme{anyvt}{ \sort{ \field{presort} } @@ -1507,7 +1448,7 @@ } } -\DeclareSortingTemplate{ynt}{ +\DeclareSortingScheme{ynt}{ \sort{ \field{presort} } @@ -1533,7 +1474,7 @@ } } -\DeclareSortingTemplate{ydnt}{ +\DeclareSortingScheme{ydnt}{ \sort{ \field{presort} } @@ -1666,18 +1607,18 @@ \newcommand*{\lbx@initnamehook}[1]{} \newcommand*{\lbx@inittitlehook}[1]{} -\newcommand*{\lbx@finalnamedelim}[1]{\printdelim{finalnamedelim}} -\newcommand*{\lbx@finallistdelim}[1]{\printdelim{finallistdelim}} +\newcommand*{\lbx@finalnamedelim}[1]{\finalnamedelim} +\newcommand*{\lbx@finallistdelim}[1]{\finallistdelim} \newcommand*{\lbx@lfromlang}{% - \iflistundef{origlanguage} + \iffieldundef{origlanguage} {\unspace} - {\printlist[lfromoriglanguage]{origlanguage}}} + {\biblstring{from\thefield{origlanguage}}}} \newcommand*{\lbx@sfromlang}{% - \iflistundef{origlanguage} + \iffieldundef{origlanguage} {\unspace} - {\printlist[sfromoriglanguage]{origlanguage}}} + {\bibsstring{from\thefield{origlanguage}}}} % ------------------------------------------------------------------ % MISCELLANEOUS @@ -1750,56 +1691,27 @@ \defbibheading{none}{} -\def\abx@MakeMarkcase{\MakeUppercase} -\AtEndPreamble{% - \ifcsundef{MakeMarkcase}{}{\def\abx@MakeMarkcase{\MakeMarkcase}}% - \providecommand*{\@mkdouble}[1]{\@mkboth{#1}{#1}}% - \providecommand*{\@mkright}{% - \begingroup - \ifx\@mkboth\markboth \aftergroup\markright - \else - \ifx\@mkboth\@gobbletwo \aftergroup\@gobble - \else \def\@gobbletwo##1##2{}% - \ifx \@mkboth\@gobbletwo \aftergroup\@gobble - \else - \PackageWarning{biblatex}{% changed for biblatex - package incompatibility detected!\MessageBreak - \string\@mkboth it neither \string\markboth nor any\MessageBreak - kind of two arguments gobbling,\MessageBreak - e.g., \string\@gobbletwo.\MessageBreak - So I don't known, what to do\MessageBreak - with \string\@mkright.\MessageBreak - Nevertheless, \string\markright\space will be\MessageBreak - used% - }% - \aftergroup\markright - \fi - \fi - \fi - \endgroup - }} - \ifcase\abx@classtype\relax % article \defbibheading{bibliography}[\refname]{% \section*{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}} \defbibheading{biblist}[\biblistname]{% \section*{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}} \defbibheading{bibintoc}[\refname]{% \section*{#1}% \addcontentsline{toc}{section}{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}} \defbibheading{biblistintoc}[\biblistname]{% \section*{#1}% \addcontentsline{toc}{section}{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}} \defbibheading{bibnumbered}[\refname]{% \section{#1}% - \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi} + \if@twoside\markright{\MakeUppercase{#1}}\fi} \defbibheading{biblistnumbered}[\biblistname]{% \section{#1}% - \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi} + \if@twoside\markright{\MakeUppercase{#1}}\fi} \defbibheading{subbibliography}[\refname]{% \subsection*{#1}} \defbibheading{subbibintoc}[\refname]{% @@ -1811,144 +1723,131 @@ \or % book/report \defbibheading{bibliography}[\bibname]{% \chapter*{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}} \defbibheading{biblist}[\biblistname]{% \chapter*{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}} \defbibheading{bibintoc}[\bibname]{% \chapter*{#1}% \addcontentsline{toc}{chapter}{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}} \defbibheading{biblistintoc}[\biblistname]{% \chapter*{#1}% \addcontentsline{toc}{chapter}{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}} \defbibheading{bibnumbered}[\bibname]{% \chapter{#1}% - \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi} + \if@twoside\markright{\MakeUppercase{#1}}\fi} \defbibheading{biblistnumbered}[\biblistname]{% \chapter{#1}% - \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi} + \if@twoside\markright{\MakeUppercase{#1}}\fi} \defbibheading{subbibliography}[\refname]{% \section*{#1}% - \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi} + \if@twoside\markright{\MakeUppercase{#1}}\fi} \defbibheading{subbibintoc}[\refname]{% \section*{#1}% \addcontentsline{toc}{section}{#1}% - \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi} + \if@twoside\markright{\MakeUppercase{#1}}\fi} \defbibheading{subbibnumbered}[\refname]{% \section{#1}} \or % scrartcl \defbibheading{bibliography}[\refname]{% - \ifcsundef{bibliography@heading} - {\ifkomabibtotocnumbered - {\section{#1}% - \@mkdouble{\abx@MakeMarkcase{\sectionmarkformat#1}}} - {\ifkomabibtotoc - {\addsec{#1}} - {\section*{#1}}% - \@mkdouble{\abx@MakeMarkcase{#1}}}} - {\bibliography@heading{#1}}} + \ifkomabibtotocnumbered + {\section{#1}} + {\ifkomabibtotoc + {\addsec{#1}} + {\section*{#1}}% + \markboth{#1}{#1}}} \defbibheading{biblist}[\biblistname]{% - \ifcsundef{bibliography@heading} - {\ifkomabibtotocnumbered - {\section{#1}% - \@mkdouble{\abx@MakeMarkcase{\sectionmarkformat#1}}} - {\ifkomabibtotoc - {\addsec{#1}} - {\section*{#1}}% - \@mkdouble{\abx@MakeMarkcase{#1}}}} - {\bibliography@heading{#1}}} + \ifkomabibtotocnumbered + {\section{#1}} + {\ifkomabibtotoc + {\addsec{#1}} + {\section*{#1}}% + \markboth{#1}{#1}}} \defbibheading{bibintoc}[\refname]{% \addsec{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \markboth{#1}{#1}} \defbibheading{biblistintoc}[\biblistname]{% \addsec{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \markboth{#1}{#1}} \defbibheading{bibnumbered}[\refname]{% \section{#1}% - \@mkdouble{\abx@MakeMarkcase{\sectionmarkformat#1}}} + \markboth{\sectionmarkformat#1}{\sectionmarkformat#1}} \defbibheading{biblistnumbered}[\biblistname]{% \section{#1}% - \@mkdouble{\abx@MakeMarkcase{\sectionmarkformat#1}}} + \markboth{\sectionmarkformat#1}{\sectionmarkformat#1}} \defbibheading{subbibliography}[\refname]{% - \subsection*{#1}% - \@mkright{\abx@MakeMarkcase{#1}}} + \subsection*{#1}} \defbibheading{subbibintoc}[\refname]{% \subsection*{#1}% - \addcontentsline{toc}{subsection}{#1}% - \@mkright{\abx@MakeMarkcase{#1}}} + \addcontentsline{toc}{subsection}{#1}} \defbibheading{subbibnumbered}[\refname]{% \subsection{#1}} \or % scrbook/scrreprt \defbibheading{bibliography}[\bibname]{% - \ifcsundef{bibliography@heading} - {\ifkomabibtotocnumbered - {\chapter{#1}% - \@mkdouble{\abx@MakeMarkcase{\chaptermarkformat#1}}} - {\ifkomabibtotoc - {\addchap{#1}} - {\chapter*{#1}}% - \@mkdouble{\abx@MakeMarkcase{#1}}}} - {\bibliography@heading{#1}}} + \ifkomabibtotocnumbered + {\chapter{#1}} + {\ifkomabibtotoc + {\addchap{#1}} + {\chapter*{#1}}% + \markboth{#1}{#1}}} \defbibheading{biblist}[\biblistname]{% - \ifcsundef{bibliography@heading} - {\ifkomabibtotocnumbered - {\chapter{#1}% - \@mkdouble{\abx@MakeMarkcase{\chaptermarkformat#1}}} - {\ifkomabibtotoc - {\addchap{#1}} - {\chapter*{#1}}% - \@mkdouble{\abx@MakeMarkcase{#1}}}} - {\bibliography@heading{#1}}} + \ifkomabibtotocnumbered + {\chapter{#1}} + {\ifkomabibtotoc + {\addchap{#1}} + {\chapter*{#1}}% + \markboth{#1}{#1}}} \defbibheading{bibintoc}[\bibname]{% \addchap{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \markboth{#1}{#1}} \defbibheading{biblistintoc}[\biblistname]{% \addchap{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \markboth{#1}{#1}} \defbibheading{bibnumbered}[\bibname]{% \chapter{#1}% - \@mkdouble{\abx@MakeMarkcase{\chaptermarkformat#1}}} + \markboth{\chaptermarkformat#1}{\chaptermarkformat#1}} \defbibheading{biblistnumbered}[\biblistname]{% \chapter{#1}% - \@mkdouble{\abx@MakeMarkcase{\chaptermarkformat#1}}} + \markboth{\chaptermarkformat#1}{\chaptermarkformat#1}} \defbibheading{subbibliography}[\refname]{% \section*{#1}% - \@mkright{\abx@MakeMarkcase{#1}}} + \if@twoside\markright{#1}\fi} \defbibheading{subbibintoc}[\refname]{% - \addsec{#1}} + \addsec{#1}% + \markboth{#1}{#1}} \defbibheading{subbibnumbered}[\refname]{% \section{#1}} \or % memoir (article) - \ifcsundef{memUChead}{}{\def\abx@MakeMarkcase{\memUChead}}% + \ifdef\memUChead{}{\let\memUChead\MakeUppercase} \defbibheading{bibliography}[\refname]{% \chapter*{#1}% \ifmemoirbibintoc {\phantomsection \addcontentsline{toc}{chapter}{#1}} {}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \markboth{\memUChead{#1}}{\memUChead{#1}}} \defbibheading{biblist}[\biblistname]{% \chapter*{#1}% \ifmemoirbibintoc {\phantomsection \addcontentsline{toc}{chapter}{#1}} {}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \markboth{\memUChead{#1}}{\memUChead{#1}}} \defbibheading{bibintoc}[\refname]{% \chapter*{#1}% \phantomsection \addcontentsline{toc}{chapter}{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \markboth{\memUChead{#1}}{\memUChead{#1}}} \defbibheading{biblistintoc}[\biblistname]{% \chapter*{#1}% \phantomsection \addcontentsline{toc}{chapter}{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \markboth{\memUChead{#1}}{\memUChead{#1}}} \defbibheading{bibnumbered}[\refname]{% \chapter{#1}} \defbibheading{biblistnumbered}[\biblistname]{% @@ -1959,59 +1858,59 @@ {\phantomsection \addcontentsline{toc}{section}{#1}} {}% - \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi} + \if@twoside\markright{\memUChead{#1}}\fi} \defbibheading{subbibintoc}[\refname]{% \section*{#1}% \phantomsection \addcontentsline{toc}{section}{#1}% - \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi} + \if@twoside\markright{\memUChead{#1}}\fi} \defbibheading{subbibnumbered}[\refname]{% \section{#1}} \or % memoir (book) - \ifcsundef{memUChead}{}{\def\abx@MakeMarkcase{\memUChead}}% + \ifdef\memUChead{}{\let\memUChead\MakeUppercase} \defbibheading{bibliography}[\bibname]{% \chapter*{#1}% \ifmemoirbibintoc {\phantomsection \addcontentsline{toc}{chapter}{#1}} {}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \markboth{\memUChead{#1}}{\memUChead{#1}}} \defbibheading{biblist}[\biblistname]{% \chapter*{#1}% \ifmemoirbibintoc {\phantomsection \addcontentsline{toc}{chapter}{#1}} {}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \markboth{\memUChead{#1}}{\memUChead{#1}}} \defbibheading{bibintoc}[\bibname]{% \chapter*{#1}% \phantomsection \addcontentsline{toc}{chapter}{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \markboth{\memUChead{#1}}{\memUChead{#1}}} \defbibheading{biblistintoc}[\biblistname]{% \chapter*{#1}% \phantomsection \addcontentsline{toc}{chapter}{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \markboth{\memUChead{#1}}{\memUChead{#1}}} \defbibheading{bibnumbered}[\bibname]{% \chapter{#1}% - \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi} + \if@twoside\markright{\memUChead{#1}}\fi} \defbibheading{biblistnumbered}[\biblistname]{% \chapter{#1}% - \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi} + \if@twoside\markright{\memUChead{#1}}\fi} \defbibheading{subbibliography}[\refname]{% \section*{#1}% \ifmemoirbibintoc {\phantomsection \addcontentsline{toc}{section}{#1}} {}% - \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi} + \if@twoside\markright{\memUChead{#1}}\fi} \defbibheading{subbibintoc}[\refname]{% \section*{#1}% \phantomsection \addcontentsline{toc}{section}{#1}% - \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi} + \if@twoside\markright{\memUChead{#1}}\fi} \defbibheading{subbibnumbered}[\refname]{% \section{#1}} @@ -2093,7 +1992,7 @@ {\boolfalse{citetracker}% \boolfalse{pagetracker}% \usebibmacro{prenote}} - {\printfield{year}\printfield{extradate}} + {\printfield{year}\printfield{extrayear}} {\multicitedelim} {\usebibmacro{postnote}} @@ -2349,7 +2248,7 @@ {\printnames{author}% \iffieldundef{authortype} {} - {\setunit{\printdelim{authortypedelim}}% + {\setunit{\addcomma\space}% \usebibmacro{authorstrg}}} {}} @@ -2360,7 +2259,7 @@ not test {\ifnameundef{editor}} } {\printnames{editor}% - \setunit{\printdelim{editortypedelim}}% + \setunit{\addcomma\space}% \usebibmacro{editorstrg}% \clearname{editor}} {}} @@ -2372,7 +2271,7 @@ not test {\ifnameundef{editor}} } {\printnames{editor}% - \setunit{\printdelim{editortypedelim}}% + \setunit{\addcomma\space}% \usebibmacro{editor+othersstrg}% \clearname{editor}} {}} @@ -2384,7 +2283,7 @@ not test {\ifnameundef{translator}} } {\printnames{translator}% - \setunit{\printdelim{translatortypedelim}}% + \setunit{\addcomma\space}% \usebibmacro{translatorstrg}% \clearname{translator}} {}} @@ -2396,7 +2295,7 @@ not test {\ifnameundef{translator}} } {\printnames{translator}% - \setunit{\printdelim{translatortypedelim}}% + \setunit{\addcomma\space}% \usebibmacro{translator+othersstrg}% \clearname{translator}} {}} @@ -2478,14 +2377,13 @@ {\usebibmacro{editorstrg}}} \newbibmacro*{translatorstrg}{% - \printtext[translatortype]{% - \ifboolexpr{ - test {\ifnumgreater{\value{translator}}{1}} - or - test {\ifandothers{translator}} - } - {\bibstring{translators}} - {\bibstring{translator}}}} + \ifboolexpr{ + test {\ifnumgreater{\value{translator}}{1}} + or + test {\ifandothers{translator}} + } + {\bibstring{translators}} + {\bibstring{translator}}} \newbibmacro*{translator+othersstrg}{% \ifboolexpr{ @@ -2512,7 +2410,7 @@ {\appto\abx@tempa{af}% \clearname{afterword}} {}}}% - \printtext[translatortype]{\bibstring{\abx@tempa}}} + \bibstring{\abx@tempa}} \newbibmacro*{byauthor}{% \ifboolexpr{ @@ -2742,11 +2640,7 @@ \printfield{maintitleaddon}} \newbibmacro*{journal}{% - \ifboolexpr{ - test {\iffieldundef{journaltitle}} - and - test {\iffieldundef{journalsubtitle}} - } + \iffieldundef{journaltitle} {} {\printtext[journaltitle]{% \printfield[titlecase]{journaltitle}% @@ -2754,11 +2648,7 @@ \printfield[titlecase]{journalsubtitle}}}} \newbibmacro*{periodical}{% - \ifboolexpr{ - test {\iffieldundef{title}} - and - test {\iffieldundef{subtitle}} - } + \iffieldundef{title} {} {\printtext[title]{% \printfield[titlecase]{title}% @@ -2766,11 +2656,7 @@ \printfield[titlecase]{subtitle}}}} \newbibmacro*{issue}{% - \ifboolexpr{ - test {\iffieldundef{issuetitle}} - and - test {\iffieldundef{issuesubtitle}} - } + \iffieldundef{issuetitle} {} {\printtext[issuetitle]{% \printfield[titlecase]{issuetitle}% @@ -2840,9 +2726,9 @@ {}}% \renewbibmacro*{related:init}{}% \DeclareNameAlias{sortname}{default}% - \ifbibmacroundef{date+extradate} + \ifbibmacroundef{date+extrayear} {} - {\renewbibmacro*{date+extradate}{}% + {\renewbibmacro*{date+extrayear}{}% \renewbibmacro*{date}{\printdate}}% \renewbibmacro*{pageref}{}} {\thefield{entrytype}}}} @@ -2880,7 +2766,7 @@ test {\ifnamesequal{author}{savedauthor}} or test {\ifnameundef{author}} - } + } {} {\usebibmacro{bytypestrg}{author}{author}% \setunit{\addspace}% @@ -2890,7 +2776,7 @@ test {\ifnamesequal{editor}{savededitor}} or test {\ifnameundef{editor}} - } + } {} {\usebibmacro{byeditor+others}% \newunit\newblock}% diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty index 4d72ad97533..8cac4f17a05 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty @@ -1,5 +1,5 @@ % Copyright (c) 2006-2011 Philipp Lehman. -% 2012-2017 Philip Kime, Audrey Boruvka, Joseph Wright +% 2012-2016 Philip Kime, Audrey Boruvka, Joseph Wright % % Permission is granted to copy, distribute and/or modify this % software under the terms of the LaTeX Project Public License @@ -11,8 +11,8 @@ % particular purpose. % Set up the version strings here -\def\abx@date{2017/11/04} -\def\abx@version{3.8} +\def\abx@date{2016/12/05} +\def\abx@version{3.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)} @@ -21,12 +21,12 @@ % This is not updated by build script as the control file version % does not necessarily change with the package version. % This is used when writing the .bcf -\def\blx@bcfversion{3.4} +\def\blx@bcfversion{3.3} % 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.9} +\def\blx@bblversion{2.8} \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{biblatex} @@ -52,31 +52,6 @@ This is a fatal error. I'm aborting now.}% \endinput} -\@ifpackagelater{xstring}{2013/10/13} - {} - {\PackageError{biblatex} - {Outdated 'xstring' package} - {Upgrade to xstring v1.7c (2013/10/13) or later.\MessageBreak - I found: '\csuse{xstringversion}'.\MessageBreak - This is a fatal error. I'm aborting now.}% - \endinput} - -% polyglossia pretends to be babel, so we need to make sure -% we are definitely talking to babel here. -\AtEndPreamble{% - \@ifpackageloaded{polyglossia} - {} - {\@ifpackageloaded{babel} - {\@ifpackagelater{babel}{2016/04/23} - {} - {\PackageError{biblatex} - {Outdated 'babel' package} - {Upgrade to babel 3.9r (2016/04/23) or later.\MessageBreak - I found: '\csuse{ver@babel.sty}'.\MessageBreak - This is a fatal error. I'm aborting now.}% - \endinput}} - {}}} - %% Category codes \def\blx@docatcodes{% @@ -100,26 +75,6 @@ %% Compatibility -\begingroup -\catcode`\#=12 -\gdef\blx@patchbidifootnotes{% - \patchcmd\@footnotetext - {#1} - {\toggletrue{blx@footnote}#1} - {\togglefalse{blx@tempa}} - {}% - \patchcmd\@LTRfootnotetext - {#1} - {\toggletrue{blx@footnote}#1} - {\togglefalse{blx@tempa}} - {}% - \patchcmd\@RTLfootnotetext - {#1} - {\toggletrue{blx@footnote}#1} - {\togglefalse{blx@tempa}} - {}} -\endgroup - \AtEndPreamble{% \def\do#1{% \@ifpackageloaded{#1} @@ -130,7 +85,7 @@ \docsvlist{% amsrefs,apacite,babelbib,backref,bibtopic,bibunits,chapterbib, cite,citeref,drftcite,footbib,inlinebib,jurabib,mcite,mciteplus, - mlbib,multibbl,multibib,natbib,opcit,overcite,splitbib,ucs,etextools}% + mlbib,multibbl,multibib,natbib,opcit,overcite,splitbib,ucs}% \def\blx@langstrings{}% % Set up sortlocale defaults and default language if babel/polyglossia is not loaded \ifdefstring\blx@sortlocale{auto} @@ -144,7 +99,7 @@ \ifundef\xpg@loaded {\let\xpg@loaded\@empty \let\xpg@vloaded\@empty - \PackageWarningNoLine{biblatex}{Upgrade package 'polyglossia' to > v1.42.0 recommended}} + \PackageWarningNoLine{biblatex}{Upgrade package 'polyglossia' to >v1.42.0 recommended}} {}% \def\do#1{\blx@langsetup{#1}}% \expandafter\docsvlist\expandafter{\xpg@loaded}% @@ -183,24 +138,21 @@ \undef\blx@mkautolangbabel \undef\blx@mkautolangpoly \undef\blx@mknoautolang - \ifnum\blx@hyperref=\thr@@ + \ifnum\blx@hyperref=\z@ + \blx@mknohyperref \else - \ifnum\blx@hyperref=\z@ - \blx@mknohyperref - \else - \@ifpackageloaded{hyperref} - {\blx@mkhyperref} - {\ifnum\blx@hyperref=\@ne - \blx@warning@noline{% - Missing 'hyperref' package.\MessageBreak - Setting 'hyperref=false'}% - \fi - \blx@mknohyperref}% - \fi - \undef\blx@mkhyperref - \undef\blx@mknohyperref + \@ifpackageloaded{hyperref} + {\blx@mkhyperref} + {\ifnum\blx@hyperref=\@ne + \blx@warning@noline{% + Missing 'hyperref' package.\MessageBreak + Setting hyperref=false}% + \fi + \blx@mknohyperref}% \fi \providecommand*{\nolinkurl}{\url}% + \undef\blx@mkhyperref + \undef\blx@mknohyperref \ifundef\TE@hook {\let\TE@hook\@empty \toggletrue{blx@tempa}% @@ -243,9 +195,6 @@ {\togglefalse{blx@tempa}} {}} {}% - \@ifpackageloaded{bidi}% bidi - {\blx@patchbidifootnotes} - {}% \@ifclassloaded{memoir} {\def\do#1{% \patchcmd#1% @@ -459,8 +408,8 @@ \def\themaxextratitle{\the\c@maxextratitle} \newcounter{maxextratitleyear} \def\themaxextratitleyear{\the\c@maxextratitleyear} -\newcounter{maxextradate} -\def\themaxextradate{\the\c@maxextradate} +\newcounter{maxextrayear} +\def\themaxextrayear{\the\c@maxextrayear} \newcounter{maxextraalpha} \def\themaxextraalpha{\the\c@maxextraalpha} \newcounter{abbrvpenalty} @@ -552,7 +501,6 @@ \newtoggle{blx@mcite} \newtoggle{blx@loadfiles} \newtoggle{blx@singletitle} -\newtoggle{blx@sortsets} \newtoggle{blx@crossrefsource} \newtoggle{blx@xrefsource} \newtoggle{blx@uniqueprimaryauthor} @@ -573,7 +521,6 @@ \newtoggle{blx@bibindex} \newtoggle{blx@localnumber} \newtoggle{blx@refcontext} -\newtoggle{blx@nosuffrecurse} % Nice command from etextools which causes too many problems if you load % the whole package @@ -599,29 +546,18 @@ \listadd\blx@allrefsections{0} % Used to track sorting name key specifications -\global\let\blx@sortingnamekeytemplates\@empty - -% Used to track uniquename templates -\global\let\blx@untemplatespecs\@empty - -% Used to track labelalphaname templates -\global\let\blx@lantemplatespecs\@empty +\global\let\blx@sortingnamekeyspecs\@empty % Used to track transliterations \global\let\blx@translits\@empty -% Use to track every entry found in .bbl -% Used to issue defernumbers warning about missing keys because this causes -% defernumbers labelling to fail. -\global\let\blx@entries\@empty - -% Initialise some lists which track changing citations/sortingtemplates +% Initialise some lists which track changing citations/sortschemes % etc. between runs \global\let\blx@cites\@empty \global\let\blx@refcontexts\@empty \global\let\blx@lastrefcontexts\@empty -\global\let\blx@sortingtemplatenames\@empty -\global\let\blx@dlistnames\@empty +\global\let\blx@sortschemes\@empty +\global\let\blx@lastsortschemes\@empty \global\let\blx@biblists\@empty \global\let\blx@lastbiblists\@empty \global\let\blx@lastcites\@empty @@ -640,57 +576,18 @@ % Deprecations \newrobustcmd*{\DeprecateField}[2]{% \csdef{abx@field@#1}{% - \ifcsundef{abx@field@legacy@warning@#1}{\blx@warning@noline{Field '#1' is deprecated. #2}}{}% + \ifcsundef{abx@field@legacy@warning@#1}{\blx@warning@noline{Field '#1' deprecated. #2}}{}% \global\csdef{abx@field@legacy@warning@#1}{}}}% \newrobustcmd*{\DeprecateList}[2]{% \csdef{abx@list@#1}{% - \ifcsundef{abx@list@legacy@warning@#1}{\blx@warning@noline{List '#1' is deprecated. #2}}{}% + \ifcsundef{abx@list@legacy@warning@#1}{\blx@warning@noline{List '#1' deprecated. #2}}{}% \global\csdef{abx@list@legacy@warning@#1}{}}}% \newrobustcmd*{\DeprecateName}[2]{% \csdef{abx@name@#1}{% - \ifcsundef{abx@name@legacy@warning@#1}{\blx@warning@noline{Name '#1' is deprecated. #2}}{}% + \ifcsundef{abx@name@legacy@warning@#1}{\blx@warning@noline{Name '#1' deprecated. #2}}{}% \global\csdef{abx@name@legacy@warning@#1}{}}}% -\let\blx@aliasfields\@empty - -\newrobustcmd*{\DeprecateFieldWithReplacement}[2]{% - \appto\blx@aliasfields{% - \ifcsundef{abx@field@#2} - {} - {\csdef{abx@field@#1}{% - \csuse{abx@field@#2}% - \ifcsundef{abx@field@legacy@warning@#1} - {\blx@warning@noline{Field '#1' is deprecated.\MessageBreak - Please use '#2' instead.\MessageBreak - Using '#2' now.}} - {}% - \global\csdef{abx@field@legacy@warning@#1}{}}}}} - -\newrobustcmd*{\DeprecateListWithReplacement}[2]{% - \appto\blx@aliasfields{% - \ifcsundef{abx@list@#2} - {} - {\csdef{abx@list@#1}{% - \csuse{abx@list@#2}% - \ifcsundef{abx@list@legacy@warning@#1} - {\blx@warning@noline{List '#1' is deprecated.\MessageBreak - Please use '#2' instead.\MessageBreak - Using '#2' now.}} - {}% - \global\csdef{abx@list@legacy@warning@#1}{}}}}} - -\newrobustcmd*{\DeprecateNameWithReplacement}[2]{% - \appto\blx@aliasfields{% - \ifcsundef{abx@name@#2} - {} - {\csdef{abx@name@#1}{% - \csuse{abx@name@#2}% - \ifcsundef{abx@name@legacy@warning@#1} - {\blx@warning@noline{Name '#1' is deprecated.\MessageBreak - Please use '#2' instead.\MessageBreak - Using '#2' now.}} - {}% - \global\csdef{abx@name@legacy@warning@#1}{}}}}} +\DeprecateField{prefixnumber}{Please use 'labelprefix' instead} %% Initialisation \def\blx@blxinit{% @@ -1042,8 +939,8 @@ \def\blx@err@nosort#1{% \blx@error - {Sorting template '#1' not found} - {The sorting template '#1' does not seem to have been defined anywhere}} + {Sorting scheme '#1' not found} + {The sorting scheme '#1' does not seem to have been defined anywhere}} \def\blx@err@secfirst{% \blx@error @@ -1133,8 +1030,8 @@ \def\blx@inf@refsec{% \blx@info{Reference section=\the\c@refsection}}% -\def\blx@inf@delimdeclare#1#2{% - \blx@info{Delimiter '#1' in context '#2' already defined, overwriting}} +\def\blx@warn@delimdeclare#1#2{% + \blx@warning{Delimiter '#1' in context '#2' already defined, overwriting}} \def\blx@warn@delimuse#1#2{% \blx@warning{Delimiter '#1' in context '#2' undefined}} @@ -1413,7 +1310,7 @@ {\blx@defprefchars} {\let\blx@prefchars\@empty \blx@defprefchars}} -\DeclarePrefChars{'’-} +\DeclarePrefChars{'} \protected\def\blx@imc@ifprefchar{% \ifhmode @@ -1995,22 +1892,6 @@ \def\blx@defbibmacro#1#2{% \expandafter#1\csname abx@macro@\detokenize{#2}\endcsname} -% {<alias>}{<name>} -\newrobustcmd*{\letbibmacro}{% - \@ifstar - {\blx@letbibmacro@i} - {\blx@letbibmacro}} - -\def\blx@letbibmacro#1#2{% - \blx@letbibmacro@i{\detokenize{#1}}{\detokenize{#2}}} - -\def\blx@letbibmacro@i#1#2{% - \ifcsundef{abx@macro@#2} - {\blx@error - {Bibliography macro '#2' undefined} - {Use '\string\newbibmacro' to define this macro}} - {\csletcs{abx@macro@#1}{abx@macro@#2}}} - % {<name>} \newrobustcmd*{\usebibmacro}{% \@ifstar @@ -2282,7 +2163,7 @@ \begingroup \letcs\blx@tempa{abx@field@#2}% \letcs\blx@tempb{abx@field@#1}% - \blx@resetdata + \csundef{abx@field@#1}% \blx@getdata{\blx@tempa}% \blx@imc@iffieldequals{#1}\blx@tempb {\aftergroup\@firstoftwo} @@ -2308,7 +2189,7 @@ \begingroup \letcs\blx@tempa{abx@field@#2}% \letcs\blx@tempb{abx@list@#1}% - \blx@resetdata + \csundef{abx@list@#1}% \blx@getdata{\blx@tempa}% \blx@imc@iflistequals{#1}\blx@tempb {\aftergroup\@firstoftwo} @@ -2327,7 +2208,7 @@ \begingroup \letcs\blx@tempa{abx@field@#2}% \letcs\blx@tempb{abx@name@#1}% - \blx@resetdata + \csundef{abx@name@#1}% \blx@getdata{\blx@tempa}% \blx@imc@ifnameequals{#1}\blx@tempb {\aftergroup\@firstoftwo} @@ -2918,15 +2799,15 @@ % [<pagination>][<postpro>]{<string>} \newrobustcmd*{\blx@imc@mkpagetotal}[1][bookpagination]{% \begingroup - \def\blx@tempa{\blx@mkpagetotal{pagetotal}}% + \def\blx@tempa{\blx@mkpagetotal{page}}% \iffieldundef{#1} {} {\iffieldequalstr{#1}{none} {\def\blx@tempa{\blx@mkpagetotal@i}} - {\iffieldbibstring{#1total} - {\edef\blx@tempa{\blx@mkpagetotal{\thefield{#1total}}}} + {\iffieldbibstring{#1} + {\edef\blx@tempa{\blx@mkpagetotal{\thefield{#1}}}} {\blx@warning@entry{% - Unknown pagination type '\strfield{#1total}'}}}}% + Unknown pagination type '\strfield{#1}'}}}}% \@ifnextchar[%] {\blx@tempa} {\blx@tempa[\@firstofone]}} @@ -2963,6 +2844,8 @@ {\csuse{abx@range@#1}} {}} +\let\frangelen\rangelen % Legacy name for \rangelen + % <*>[<postpro>]{<string>} \newrobustcmd*{\mkcomprange}{% \begingroup @@ -3210,46 +3093,19 @@ {\blx@declaredelim@i{}{}{#2}{#3}} {\def\do##1{% \listcsgadd{blx@declaredelimcontexts@#2}{##1}% - \blx@declaredelim@i{blx@printdelim@##1@}{##1}{#2}{#3}}% + \blx@declaredelim@i{blx@printdelim@##1@}{##1}{#2}{#3}} \docsvlist{#1}}}% \def\blx@declaredelim@i#1#2#3#4{% \begingroup \def\do##1{% \ifcsdef{#1##1} - {\blx@inf@delimdeclare{##1}{#2}} + {\blx@warn@delimdeclare{##1}{#2}} {}% \csgdef{#1##1}{#4}}% - \docsvlist{#3}% + \docsvlist{#3} \endgroup} -% *[<contextname, ...>]{<alias>}{<delim>} -\newrobustcmd*{\DeclareDelimAlias}{% - \@ifstar - {\blx@declaredelimalias} - {\blx@declaredelimaliasauto}} - -\newrobustcmd*{\blx@declaredelimalias}[3][]{% - \ifblank{#1} - {\blx@declaredelimalias@i{}{#2}{#3}} - {\def\do##1{% - \blx@declaredelimalias@i{blx@printdelim@##1@}{#2}{#3}}% - \docsvlist{#1}}} - -\newrobustcmd*{\blx@declaredelimaliasauto}[2]{% - \blx@declaredelimalias@i{}{#1}{#2}% - \ifcsvoid{blx@declaredelimcontexts@#2} - {} - {\def\do##1{% - \blx@declaredelimalias@i{blx@printdelim@##1@}{#1}{#2}}% - \dolistcsloop{blx@declaredelimcontexts@#2}}} - -\def\blx@declaredelimalias@i#1#2#3{% - \ifcsdef{#1#2} - {\blx@inf@delimdeclare{#2}{#1}} - {}% - \global\csletcs{#1#2}{#1#3}} - \def\blx@delimcontext{none} \newcommand*{\printdelim}[2][]{% \ifblank{#1} @@ -3273,25 +3129,13 @@ \newcommand*{\DeclareDelimcontextAlias}[2]{% \csgdef{blx@delimcontextalias@#1}{#2}} -\newrobustcmd*{\AtUsedriver}{% - \@ifstar - {\global\undef\blx@hook@usedriver - \gappto\blx@hook@usedriver} - {\gappto\blx@hook@usedriver}} -\@onlypreamble\AtUsedriver -\def\blx@imc@UseUsedriverHook{\csuse{blx@hook@usedriver}} -\blx@regimcs{\UseUsedriverHook} - -\AtUsedriver{% - \let\finentry\blx@finentry@usedrv - \let\newblock\relax - \let\abx@macro@bibindex\@empty - \let\abx@macro@pageref\@empty} - % {<init>}{<entrytype>} \protected\def\blx@imc@usedriver#1#2{% \begingroup - \csuse{blx@hook@usedriver}% + \let\finentry\blx@finentry@usedrv + \let\newblock\relax + \let\abx@macro@bibindex\@empty + \let\abx@macro@pageref\@empty \csuse{blx@hook@bbxinit}#1% \delimcontext{bib}% \blx@beglangbib @@ -3401,44 +3245,11 @@ \blx@setunit\entrysetpunct \global\toggletrue{blx@block}} -\def\ifentryseen{\blx@imc@ifentryseen} -\def\ifentryinbib{\blx@imc@ifentryinbib} -\def\ifentrycategory{\blx@imc@ifentrycategory} -\def\ifentrykeyword{\blx@imc@ifentrykeyword} - -\def\blx@imc@iflabeldateisdate{% - \ifboolexpr{% - togl {blx@labeldateparts} - and not test {\iffieldundef{labeldatesource}} - and - (test {\iffieldequalstr{labeldatesource}{}} - or test {\iffieldequalstr{labeldatesource}{year}})}} - -\def\blx@imc@ifdatehasyearonlyprecision#1{% - \ifboolexpr{not test {\iffieldundef{#1year}} - and (test {\ifcsstring{blx@dateformat@#1date}{year}} - or (test {\iffieldundef{#1month}} - and test {\iffieldundef{#1season}}))}} - -\def\blx@imc@ifdatehastime#1{% - \ifboolexpr{togl {blx@#1dateusetime} - and not test {\iffieldundef{#1hour}}}} - -\def\blx@imc@ifdateshavedifferentprecision#1#2{% - \ifboolexpr{ (test {\ifdatehasyearonlyprecision{#1}} - and not test {\ifdatehasyearonlyprecision{#2}}) - or (not test {\ifdatehasyearonlyprecision{#1}} - and test {\ifdatehasyearonlyprecision{#2}}) - or (test {\ifdatehastime{#1}} - and not test {\ifdatehastime{#2}}) - or (not test {\ifdatehastime{#1}} - and test {\ifdatehastime{#2}})}} - \blx@regimcs{% \ifdriver \thefield \strfield \csfield \usefield \thelist \strlist \thename \strname \clearfield \clearlist \clearname \restorefield \restorelist \restorename - \ifcategory \ifkeyword - \ifciteseen \ifciteibid \ifciteidem \ifopcit \ifloccit + \ifcategory \ifentrycategory \ifkeyword \ifentrykeyword + \ifciteseen \ifentryseen \ifentryinbib \ifciteibid \ifciteidem \ifopcit \ifloccit \ifcurrentfield \ifcurrentlist \ifcurrentname \ifentrytype \iffieldequalcs \iffieldequals \iffieldequalstr \iffieldsequal \ifbibmacroundef \iffieldundef \iffieldxref \iflistequalcs \iflistequals @@ -3449,8 +3260,6 @@ \savelistcs \savename \savenamecs \usedriver \ifinteger \ifnumeral \ifnumerals \ifpages \iffieldint \iffieldnum \iffieldnums \iffieldpages - \iflabeldateisdate \ifdatehasyearonlyprecision \ifdatehastime - \ifdateshavedifferentprecision \mkpageprefix \mkpagetotal \newblock \newunit \setunit \printunit \finentry} @@ -3668,15 +3477,7 @@ \long\def\blx@mksc@ingroup#1{% \if\noexpand\@let@token\relax - \ifx\@let@token\blx@mkcp@sgl - \blx@mksc@nocase{{#2}}% - \else - \ifx\@let@token\blx@mkcp@dbl - \blx@mksc@nocase{{#2}}% - \else - \blx@mksc@locase{{#2}}% - \fi - \fi + \blx@mksc@locase{{#2}}% \else \blx@mksc@nocase{{#2}}% \fi} @@ -3767,7 +3568,7 @@ {\xifinlist{#1}\blx@cmksc@lang}} %% Main formatting commands -% They work by creating a \let alias: +% The work by creating a \let alias: % \abx@<class>@<entrytype>@<formatname> -> \blx@defformat@d % for later use in \print* % Then, \blx@defformat@d is defined by calling @@ -4033,25 +3834,16 @@ {\setkeys{blx@opt@namelist}{#1}}% \def\blx@thedata{#2}} -% These are options in the .bbl that biber makes explicit as they are needed in biblatex -% for various reasons. Not all namelist/name scope options are necessary in the .bbl as -% some are used by biber only and are not needed by biblatex after biber has finished -% generating the .bbl % Per-namelist options \define@key{blx@opt@namelist}{uniquelist}{\c@uniquelist#1\relax} \define@key{blx@opt@namelist}{useprefix}{\settoggle{blx@useprefix}{#1}} -\define@key{blx@opt@namelist}{sortingnamekeytemplatename}{\def\blx@refcontext@sortingnamekeytemplatename{#1}} -\define@key{blx@opt@namelist}{uniquenametemplatename}{\def\blx@refcontext@uniquenametemplatename{#1}} -\define@key{blx@opt@namelist}{labelalphanametemplatename}{\def\blx@refcontext@labelalphanametemplatename{#1}} +\define@key{blx@opt@namelist}{sortnamekeyscheme}{\def\blx@refcontext@sortingnamekey{#1}} % Per-name options \define@key{blx@opt@name}{uniquename}{\c@uniquename#1\relax} -\define@key{blx@opt@name}{uniquepart}{\def\abx@field@uniquepart{#1}} \define@key{blx@opt@name}{hash}{\edef\abx@field@hash{\detokenize{#1}}} \define@key{blx@opt@name}{useprefix}{\settoggle{blx@useprefix}{#1}} -\define@key{blx@opt@name}{sortingnamekeytemplatename}{\def\blx@refcontext@sortingnamekeytemplatename{#1}} -\define@key{blx@opt@name}{uniquenametemplatename}{\def\blx@refcontext@uniquenametemplatename{#1}} -\define@key{blx@opt@name}{labelalphanametemplatename}{\def\blx@refcontext@labelalphanametemplatename{#1}} +\define@key{blx@opt@name}{sortnamekeyscheme}{\def\blx@refcontext@sortingnamekey{#1}} \newrobustcmd*{\bibinitperiod}{\adddot} \newrobustcmd*{\bibinitdelim}{\addnbspace} @@ -4236,7 +4028,6 @@ \blx@getdata{#1}% \blx@setoptions@type\abx@field@entrytype \def\abx@field@entrysetcount{1}% - \blx@anchor \blx@entryset@precode \blx@driver{\blx@imc@thefield{entrytype}}% \blx@entryset@postcode @@ -4254,9 +4045,8 @@ \blx@setoptions@entry \addtocounter{instcount}\@ne \blx@execute - \blx@begunit - \blx@anchor \blx@beglangbib + \blx@begunit \blx@entryset@precode \blx@driver{\blx@imc@thefield{entrytype}} \blx@entryset@postcode @@ -4281,20 +4071,12 @@ \newrobustcmd*{\blx@imc@bibsstring}[2][\@firstofone]{% \blx@bibstring{#1}{abx@sstr}{#2}} -\def\blx@bibstringsimple{% - \let\bibstring\blx@imc@bibxstring - \let\biblstring\blx@imc@bibxlstring - \let\bibsstring\blx@imc@bibxsstring} - -\def\blx@bibstringnormal{% - \let\bibstring\blx@imc@bibstring - \let\biblstring\blx@imc@biblstring - \let\bibsstring\blx@imc@bibsstring} - \protected\def\blx@bibstring#1#2#3{% \blx@begunit \blx@hyphenreset - \blx@bibstringsimple + \let\bibstring\blx@imc@bibxstring + \let\biblstring\blx@imc@bibxlstring + \let\bibsstring\blx@imc@bibxsstring \lowercase{\edef\blx@tempa{#3}}% \ifcsundef{#2@\blx@tempa} {\blx@warn@nostring\blx@tempa @@ -4317,7 +4099,9 @@ \protected\def\blx@bibcpstring#1#2#3{% \blx@begunit \blx@hyphenreset - \blx@bibstringsimple + \let\bibstring\blx@imc@bibxstring + \let\biblstring\blx@imc@bibxlstring + \let\bibsstring\blx@imc@bibxsstring \lowercase{\edef\blx@tempa{#3}}% \ifcsundef{#2@\blx@tempa} {\blx@warn@nostring\blx@tempa @@ -4338,7 +4122,9 @@ \protected\def\blx@biblcstring#1#2#3{% \blx@begunit \blx@hyphenreset - \blx@bibstringsimple + \let\bibstring\blx@imc@bibxstring + \let\biblstring\blx@imc@bibxlstring + \let\bibsstring\blx@imc@bibxsstring \lowercase{\edef\blx@tempa{#3}}% \ifcsundef{#2@\blx@tempa} {\blx@warn@nostring\blx@tempa @@ -4359,7 +4145,9 @@ \protected\def\blx@bibucstring#1#2#3{% \blx@begunit \blx@hyphenreset - \blx@bibstringsimple + \let\bibstring\blx@imc@bibxstring + \let\biblstring\blx@imc@bibxlstring + \let\bibsstring\blx@imc@bibxsstring \lowercase{\edef\blx@tempa{#3}}% \ifcsundef{#2@\blx@tempa} {\blx@warn@nostring\blx@tempa @@ -4589,9 +4377,6 @@ \do{withintroduction}% \do{withforeword}% \do{withafterword}% - \do{organizer}% - \do{organizers}% - \do{byorganizer}% \do{byeditortr}% \do{byeditorco}% \do{byeditoran}% @@ -4650,31 +4435,19 @@ \do{origpubin}% \do{astitle}% \do{bypublisher}% - \do{nodate}% \do{page}% \do{pages}% \do{column}% \do{columns}% \do{line}% \do{lines}% + \do{nodate}% \do{verse}% \do{verses}% \do{section}% \do{sections}% \do{paragraph}% \do{paragraphs}% - \do{pagetotal}% - \do{pagetotals}% - \do{columntotal}% - \do{columntotals}% - \do{linetotal}% - \do{linetotals}% - \do{versetotal}% - \do{versetotals}% - \do{sectiontotal}% - \do{sectiontotals}% - \do{paragraphtotal}% - \do{paragraphtotals}% \do{in}% \do{inseries}% \do{ofseries}% @@ -4740,7 +4513,6 @@ \do{december}% \do{langamerican}% \do{langbrazilian}% - \do{langbulgarian}% \do{langcatalan}% \do{langcroatian}% \do{langczech}% @@ -4750,7 +4522,6 @@ \do{langestonian}% \do{langfinnish}% \do{langfrench}% - \do{langgalician}% \do{langgerman}% \do{langgreek}% \do{langitalian}% @@ -4764,10 +4535,8 @@ \do{langslovene}% \do{langspanish}% \do{langswedish}% - \do{langukrainian}% \do{fromamerican}% \do{frombrazilian}% - \do{frombulgarian}% \do{fromcatalan}% \do{fromcroatian}% \do{fromczech}% @@ -4777,7 +4546,6 @@ \do{fromestonian}% \do{fromfinnish}% \do{fromfrench}% - \do{fromgalician}% \do{fromgerman}% \do{fromgreek}% \do{fromitalian}% @@ -4791,7 +4559,6 @@ \do{fromslovene}% \do{fromspanish}% \do{fromswedish}% - \do{fromukrainian}% \do{countryde}% \do{countryep}% \do{countryeu}% @@ -4840,7 +4607,6 @@ % in *.cbx/bbx/tex: (implicit) % in *.lbx: inherit = {<language>}, \define@key{blx@lbx}{inherit}{% - \global\toggletrue{blx@nosuffrecurse}% \blx@lbxinput{#1}{}{\blx@err@nolang{#1}}% \csuse{abx@strings@#1}} @@ -4884,7 +4650,6 @@ % {<language>}{<language>} \def\blx@letbibextras#1#2{% - \global\toggletrue{blx@nosuffrecurse}% \blx@lbxinput{#2}{}{\blx@err@nolang{#2}}% \global\csletcs{abx@extras@#1}{abx@extras@#2} \global\csletcs{abx@noextras@#1}{abx@noextras@#2}}% @@ -4929,7 +4694,6 @@ % {<language>}{<language>} \def\blx@letbibstrings#1#2{% - \global\toggletrue{blx@nosuffrecurse}% \blx@lbxinput{#2}{}{\blx@err@nolang{#2}}% \global\csletcs{abx@strings@#1}{abx@strings@#2}}% @@ -4949,30 +4713,13 @@ \hyphenation{#2}% \endgroup}} -% {<mapping suffix>} -\newrobustcmd*{\DeclareLanguageMappingSuffix}[1]{% - \gdef\blx@lng@suff{#1}} -\@onlypreamble\DeclareLanguageMappingSuffix -\let\blx@lng@suff\@empty - % {<language>}{<mapping>} \newrobustcmd*{\DeclareLanguageMapping}[2]{% - \csgdef{blx@lng@#1}{#2}% - \csgdef{blx@lng@explicit@#1}{#2}} + \csgdef{blx@lng@#1}{#2}} \@onlypreamble\DeclareLanguageMapping % {<language>}{<success>}{<failure>} \def\blx@lbxinput#1{% - \ifdefempty\blx@lng@suff - {} - {\ifcsdef{blx@lng@explicit@#1}% \DeclareLanguageMapping overrides \DeclareLanguageMappingSuffix - {} - {\nottoggle{blx@nosuffrecurse} - {\csgdef{blx@lng@#1}{#1\blx@lng@suff}} - {}}}% - \blx@lbxinput@0{#1}} - -\def\blx@lbxinput@0#1{% \ifcsdef{blx@lng@#1} {\expandafter\expandafter\expandafter\blx@lbxinput@i \expandafter\expandafter\expandafter{% @@ -4984,19 +4731,12 @@ \global\csundef{blx@lng@#2}% \IfFileExists{#1.lbx} {\blx@lbxinput@ii{#2}{#1}{language '#2' -> '#1'}} - {\ifcsdef{blx@suffmaptried@#2} - {} - {\blx@warning@noline{% - File '#1.lbx' not found!\MessageBreak - Ignoring mapping '#2' -> '#1'}% - \cslet{blx@suffmaptried@#2}\@empty}% - \blx@lbxinput@0{#2}}} + {\blx@warning@noline{% + File '#1.lbx' not found!\MessageBreak + Ignoring mapping '#2' -> '#1'}% + \blx@lbxinput{#2}}} % {<language>}{<lbxfile>}{<message>} -% toggle 'blx@nosuffrecurse' is set to true at the places where recursion into here -% can occur when loading a .lbx otherwise, when using \DeclareLanguageMappingSuffix -% it is possible to get into infinite loops. We only want to apply the suffix to explicitly -% loaded languages, not those loaded by recursion. \def\blx@lbxinput@ii#1#2#3{% \begingroup \setbox\@tempboxa=\hbox\bgroup @@ -5007,7 +4747,7 @@ \global\cslet{abx@noextras@#1}\@empty \blx@maplang{#1}{#1}% \def\InheritBibliographyStrings{% - \blx@letbibstrings{#1}}% + \blx@letbibstrings{#1}}% \def\DeclareBibliographyStrings####1{% \begingroup \let\blx@defstring\blx@lbx@defstring @@ -5028,8 +4768,7 @@ \csuse{blx@hook@noextras@#1}% \csuse{blx@hook@noextras@#2}% \csuse{blx@hook@hyph@#1}% - \csuse{blx@hook@hyph@#2}% - \global\togglefalse{blx@nosuffrecurse}} + \csuse{blx@hook@hyph@#2}} {\aftergroup\@firstoftwo} {\aftergroup\@secondoftwo}% \egroup} @@ -5211,9 +4950,9 @@ \dateuncertainprint \dateeraprint{#2year}% \iffieldundef{#2endyear} - {\printfield{extradate}} + {\printfield{extrayear}} {\iffieldequalstr{#2endyear}{} - {\printfield{extradate}% + {\printfield{extrayear}% \printtext{\mbox{\bibdaterangesep}}} {\printtext{% \bibdaterangesep @@ -5223,7 +4962,7 @@ % Optionally print the time after the date \blx@printtime{#2}{end}} {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% - \printfield{extradate}% + \printfield{extrayear}% \enddateuncertainprint \dateeraprint{#2endyear}}}}}}} @@ -5246,14 +4985,14 @@ {\dateeraprint{#2year}}}} {\iffieldsequal{#2year}{#2endyear} {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}% + {\csuse{mkbibseasondate#1}{#2year}{#2season} \iffieldsequal{#2dateera}{#2enddateera}{} {\dateeraprint{#2year}}}}% \dateuncertainprint \iffieldundef{#2endyear} - {\printfield{extradate}} + {\printfield{extrayear}} {\iffieldequalstr{#2endyear}{} - {\printfield{extradate}% + {\printfield{extrayear}% \printtext{\mbox{\bibdaterangesep}}} {\printtext{% \bibdaterangesep @@ -5261,25 +5000,17 @@ \iffieldundef{#2season} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% - \printfield{extradate}% + \printfield{extrayear}% \enddateuncertainprint \dateeraprint{#2endyear}}}}}}} \newrobustcmd*{\mkdaterangeyear}[1]{% - \blx@imc@clearfield{#1season}% \blx@imc@clearfield{#1month}% \blx@imc@clearfield{#1day}% - \blx@imc@clearfield{#1hour}% - \blx@imc@clearfield{#1minute}% - \blx@imc@clearfield{#1second}% - \blx@imc@clearfield{#1timezone}% - \blx@imc@clearfield{#1endseason}% + \blx@imc@clearfield{#1season}% \blx@imc@clearfield{#1endmonth}% \blx@imc@clearfield{#1endday}% - \blx@imc@clearfield{#1endhour}% - \blx@imc@clearfield{#1endminute}% - \blx@imc@clearfield{#1endsecond}% - \blx@imc@clearfield{#1endtimezone}% + \blx@imc@clearfield{#1endseason}% \iffieldsequal{#1year}{#1endyear} {\blx@imc@clearfield{#1endyear}} {}% @@ -5325,7 +5056,7 @@ % Such a season component can only come from an EDTF 5.1.5 season which replaces % a normal month so if it exists, we know that a normal date print is ruled out \iffieldundef{#1season} - {\blx@ymddate[extradate]{#1}{}% + {\blx@ymddate[extrayear]{#1}{}% % Optionally print the time after the date \blx@printtime{#1}{}} {\csuse{mkbibseasondateshort}{#1year}{#1season}}% @@ -5346,7 +5077,7 @@ \enddateuncertainprint \dateeraprint{#1endyear}}}}}} -% [extradate]{<datetype>}{''|end} +% [extrayear]{<datetype>}{''|end} \newrobustcmd*{\blx@ymddate}[3][]{% \dateeraprintpre{#2#3year}% \mkyearzeros{\thefield{#2#3year}}\ifblank{#1}{}{\printfield{#1}}% @@ -5354,20 +5085,12 @@ \iffieldundef{#2#3day}{}{\bibdatesep\mkdayzeros{\thefield{#2#3day}}}} \newrobustcmd*{\mkdaterangeyearextra}[1]{% - \blx@imc@clearfield{#1season}% \blx@imc@clearfield{#1month}% \blx@imc@clearfield{#1day}% - \blx@imc@clearfield{#1hour}% - \blx@imc@clearfield{#1minute}% - \blx@imc@clearfield{#1second}% - \blx@imc@clearfield{#1timezone}% - \blx@imc@clearfield{#1endseason}% + \blx@imc@clearfield{#1season}% \blx@imc@clearfield{#1endmonth}% \blx@imc@clearfield{#1endday}% - \blx@imc@clearfield{#1endhour}% - \blx@imc@clearfield{#1endminute}% - \blx@imc@clearfield{#1endsecond}% - \blx@imc@clearfield{#1endtimezone}% + \blx@imc@clearfield{#1endseason}% \iffieldsequal{#1year}{#1endyear} {\blx@imc@clearfield{#1endyear}} {}% @@ -5385,7 +5108,7 @@ {}} \newrobustcmd*{\mkdaterangeedtf}[1]{% - \blx@metadateinfo{#1}% + \blx@metadateinfo{#1}% \def\bibdatetimesep{T}% \iffieldundef{#1year} {} @@ -5413,6 +5136,7 @@ {}% \enddateuncertainprint \enddatecircaprintedtf}}}} +\cslet{mkdaterangeiso8601}\mkdaterangeedtf% Legacy option support \newrobustcmd*{\mkdaterangeedtfextra}[1]{% \blx@metadateinfo{#1}% @@ -5420,7 +5144,7 @@ \iffieldundef{#1year} {} {\printtext[#1date]{% - \blx@edtfdate[extradate]{#1}{}% + \blx@edtfdate[extrayear]{#1}{}% \ifboolexpr{% togl {blx@#1dateusetime} and @@ -5443,8 +5167,9 @@ {}% \enddateuncertainprint \enddatecircaprintedtf}}} +\cslet{mkdaterangeiso8601extra}\mkdaterangeedtfextra% Legacy option support -% [extradate]{<datetype>}{''|end} +% [extrayear]{<datetype>}{''|end} \newrobustcmd*{\blx@edtfdate}[3][]{% \dateeraprintpre{#2#3year}% \blx@imc@forcezerosy{\thefield{#2#3year}}\ifblank{#1}{}{\printfield{#1}}% @@ -5482,6 +5207,7 @@ \newrobustcmd*{\bibdateeraendprefix}{\,\bibdateeraprefix} \newrobustcmd*{\bibdatesep}{\hyphen} \newrobustcmd*{\bibdaterangesep}{\bibrangedash} +\newrobustcmd*{\bibdatedash}{\bibrangedash}%LEGACY(<3.5) % date+times \newrobustcmd*{\bibdatetimesep}{\space} % ranges @@ -5568,6 +5294,23 @@ \blx@regimcs{\printlabeldate \printlabeltime \printlabeldateextra \stripzeros \forcezerosy \forcezerosmdt \mkyearzeros \mkmonthzeros \mkdayzeros \mktimezeros} +\protected\def\mkdatezeros{% + \blx@warning@noline{% + '\string\mkdatezeros' is deprecated, please use '\string\mkyearzeros',\MessageBreak + '\string\mkmonthzeros' or '\string\mkdayzeros' as appropriate. \MessageBreak + falling back to '\string\mkmonthzeros'}% + \mkmonthzeros} + +\protected\def\printdatelabel{% + \blx@warning@noline{% + '\string\printdatelabel' is deprecated, please use '\string\printlabeldate'}% + \blx@imc@printlabeldate} + +\protected\def\printdatelabelextra{% + \blx@warning@noline{% + '\string\printdatelabelextra' is deprecated, please use '\string\printlabeldateextra'}% + \blx@imc@printlabeldateextra} + % User macro for retrieving currrent language \def\currentlang{\blx@languagename} @@ -5608,8 +5351,8 @@ \gdef\blx@mkautolangbabel{% \ifundef\bbl@main@language {\blx@error - {No default 'babel' language defined} - {You must define a default language for 'babel'}} + {No default babel language defined} + {You must define a default language for babel}} {}% \pretocmd\select@language{\blx@langsetup{#1}} {\ifdef\blx@thelangenv @@ -5653,10 +5396,9 @@ \gdef\blx@mkautolangpoly{% \ifundef\bbl@main@language {\blx@error - {No default 'polyglossia' language defined} - {You must define a default language for 'polyglossia'}} + {No default polyglossia language defined} + {You must define a default language for polyglossia}} {}% - \edef\blx@saved@underscore@catcode{\the\catcode`\_}% \catcode`\_=11% polyglossia uses "_" as a letter \pretocmd\select@language{\blx@langsetup{#1}} {\ifdef\blx@thelangenv @@ -5696,11 +5438,9 @@ {\csname\abx@field@langid\endcsname}} {\csname\blx@thelangenv\expandafter\endcsname\expandafter{\abx@field@langid}}% % These lines are equal to \blx@maplang - \ifcsstring{blx@thelangenv}{hyphenrules} - {} - {\blx@resetpunct - \csuse{abx@extras@\abx@field@langid}% - \csuse{abx@strings@\abx@field@langid}}}} + \blx@resetpunct + \csuse{abx@extras@\abx@field@langid}% + \csuse{abx@strings@\abx@field@langid}}} {}}} {}% % polyglossia needs this - it doesn't get the @@ -5717,7 +5457,7 @@ \blx@langsetup\bbl@main@language} {\blx@err@patch{'polyglossia' package}% \blx@mknoautolang}% - \catcode`\_=\blx@saved@underscore@catcode\relax} + \catcode`\_=8} \endgroup \def\blx@mknoautolang{% @@ -5870,7 +5610,7 @@ \abx@dodates % main date field has an empty prefix (''date) which can't be added to a list % and so do it explicity -% This is one of the few (only?) hard-coded datamodel assumptions but it is +% This is one of the few (only?) hard-coded datamodel assumptions but it is % very unlikely that anyone would *remove* the main date field in a custom application ... \def\abx@dodatetypes{\do{}\dolistloop\blx@datetypes} @@ -5881,22 +5621,9 @@ \blx@collectopts{boolean}{blx@namelistopts}{useprefix}% for passing to bcf \blx@collectopts{boolean}{blx@nameopts}{useprefix}% for passing to the .bcf -% nametemplates meta-option entry/namelist/name scope -\blx@collectopts{string}{blx@entryopts}{nametemplates} -\blx@collectopts{string}{blx@namelistopts}{nametemplates}% for passing to bcf -\blx@collectopts{string}{blx@nameopts}{nametemplates}% for passing to the .bcf - -% sortingnamekeytemplate namelist/name scope -\blx@collectopts{string}{blx@namelistopts}{sortingnamekeytemplatename}% for passing to bcf -\blx@collectopts{string}{blx@nameopts}{sortingnamekeytemplatename}% for passing to the .bcf - -% uniquenametemplate namelist/name scope -\blx@collectopts{string}{blx@namelistopts}{uniquenametemplatename}% for passing to bcf -\blx@collectopts{string}{blx@nameopts}{uniquenametemplatename}% for passing to the .bcf - -% labelalphanametemplate namelist/name scope -\blx@collectopts{string}{blx@namelistopts}{labelalphanametemplatename}% for passing to bcf -\blx@collectopts{string}{blx@nameopts}{labelalphanametemplatename}% for passing to the .bcf +% sortnamekeyscheme namelist/name scope +\blx@collectopts{string}{blx@namelistopts}{sortnamekeyscheme}% for passing to bcf +\blx@collectopts{string}{blx@nameopts}{sortnamekeyscheme}% for passing to the .bcf % Misc globalopts \blx@collectopts{xml}{blx@globalopts}{datamodel}% for passing to the .bcf @@ -6023,8 +5750,7 @@ \def\do#1{% \listxadd\blx@namepartmetafields{#1namehash}% - \listxadd\blx@namepartmetafields{#1fullhash}% - \listxadd\blx@namepartmetafields{#1bibnamehash}} + \listxadd\blx@namepartmetafields{#1fullhash}} \abx@donameparts \def\do#1{% @@ -6032,6 +5758,7 @@ \abx@dodateparts \def\abx@dointernalfields{% + \do{childentrykey}% \do{clonesourcekey}% \do{labeldate}% \do{labeldatesource}% @@ -6044,7 +5771,7 @@ \do{extraalpha}% \do{extratitle}% \do{extratitleyear}% - \do{extradate}% + \do{extrayear}% \do{fullhash}% \do{labelalpha}% \do{labelnumber}% @@ -6052,7 +5779,6 @@ \do{labeltitleyear}% \do{localnumber}% \do{namehash}% - \do{bibnamehash}% \do{options}% \do{sortinit}% \do{sortinithash}% @@ -6157,76 +5883,76 @@ {}}}% \iftoggle{blx@labeldateparts} {\def\iflabeldateera#1{% start era - \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates - {\ifcsstring{abx@field@\abx@field@labeldatesource dateera}{#1}} - {\@secondoftwo}}% - \appto\blx@TE@hook{\def\iflabeldateera#1{% - \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates - {\blx@TE{\ifcsstring{abx@field@\abx@field@labeldatesource dateera}{#1}}} - {\@secondoftwo}}}% - % end era - \def\iflabelenddateera#1{% - \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates - {\ifcsstring{abx@field@\abx@field@labeldatesource enddateera}{#1}} - {\@secondoftwo}}% - \appto\blx@TE@hook{\def\iflabelenddateera#1{% - \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates - {\blx@TE{\ifcsstring{abx@field@\abx@field@labeldatesource enddateera}{#1}}} - {\@secondoftwo}}}% - % start circa - \def\iflabeldatecirca{% - \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates - {\iftoggle{abx@bool@\abx@field@labeldatesource datecirca}} - {\@secondoftwo}}% - \appto\blx@TE@hook{\def\iflabeldatecirca{% - \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates - {\blx@TE{\iftoggle{abx@bool@\abx@field@labeldatesource datecirca}}} - {\@secondoftwo}}}% - % end circa - \def\iflabelenddatecirca{% - \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates - {\iftoggle{abx@bool@\abx@field@labeldatesource enddatecirca}} - {\@secondoftwo}}% - \appto\blx@TE@hook{\def\iflabelenddatecirca{% - \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates - {\blx@TE{\iftoggle{abx@bool@\abx@field@labeldatesource enddatecirca}}} - {\@secondoftwo}}}% - % start julian - \def\iflabeldatejulian{% - \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates - {\iftoggle{abx@bool@\abx@field@labeldatesource datejulian}} - {\@secondoftwo}}% - \appto\blx@TE@hook{\def\iflabeldatejulian{% - \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates - {\blx@TE{\iftoggle{abx@bool@\abx@field@labeldatesource datejulian}}} - {\@secondoftwo}}}% - % end julian - \def\iflabelenddatejulian{% - \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates - {\iftoggle{abx@bool@\abx@field@labeldatesource enddatejulian}} - {\@secondoftwo}}% - \appto\blx@TE@hook{\def\iflabelenddatejulian{% - \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates - {\blx@TE{\iftoggle{abx@bool@\abx@field@labeldatesource enddatejulian}}} - {\@secondoftwo}}}% - % start uncertain - \def\iflabeldateuncertain{% - \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates - {\iftoggle{abx@bool@\abx@field@labeldatesource dateuncertain}} - {\@secondoftwo}}% - \appto\blx@TE@hook{\def\iflabeldateuncertain{% - \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates - {\blx@TE{\iftoggle{abx@bool@\abx@field@labeldatesource dateuncertain}}} - {\@secondoftwo}}}% - % end uncertain - \def\iflabelenddateuncertain{% - \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates - {\iftoggle{abx@bool@\abx@field@labeldatesource enddateuncertain}} - {\@secondoftwo}}% - \appto\blx@TE@hook{\def\iflabelenddateuncertain{% - \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates - {\blx@TE{\iftoggle{abx@bool@\abx@field@labeldatesource enddateuncertain}}} - {\@secondoftwo}}}}% + \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates + {\ifcsstring{abx@field@\abx@field@labeldatesource dateera}{#1}} + {\@secondoftwo}}% + \appto\blx@TE@hook{\def\iflabeldateera#1{% + \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates + {\blx@TE{\ifcsstring{abx@field@\abx@field@labeldatesource dateera}{#1}}} + {\@secondoftwo}}}% + % end era + \def\iflabelenddateera#1{% + \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates + {\ifcsstring{abx@field@\abx@field@labeldatesource enddateera}{#1}} + {\@secondoftwo}}% + \appto\blx@TE@hook{\def\iflabelenddateera#1{% + \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates + {\blx@TE{\ifcsstring{abx@field@\abx@field@labeldatesource enddateera}{#1}}} + {\@secondoftwo}}}% + % start circa + \def\iflabeldatecirca{% + \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates + {\iftoggle{abx@bool@\abx@field@labeldatesource datecirca}} + {\@secondoftwo}}% + \appto\blx@TE@hook{\def\iflabeldatecirca{% + \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates + {\blx@TE{\iftoggle{abx@bool@\abx@field@labeldatesource datecirca}}} + {\@secondoftwo}}}% + % end circa + \def\iflabelenddatecirca{% + \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates + {\iftoggle{abx@bool@\abx@field@labeldatesource enddatecirca}} + {\@secondoftwo}}% + \appto\blx@TE@hook{\def\iflabelenddatecirca{% + \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates + {\blx@TE{\iftoggle{abx@bool@\abx@field@labeldatesource enddatecirca}}} + {\@secondoftwo}}}% + % start julian + \def\iflabeldatejulian{% + \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates + {\iftoggle{abx@bool@\abx@field@labeldatesource datejulian}} + {\@secondoftwo}}% + \appto\blx@TE@hook{\def\iflabeldatejulian{% + \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates + {\blx@TE{\iftoggle{abx@bool@\abx@field@labeldatesource datejulian}}} + {\@secondoftwo}}}% + % end julian + \def\iflabelenddatejulian{% + \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates + {\iftoggle{abx@bool@\abx@field@labeldatesource enddatejulian}} + {\@secondoftwo}}% + \appto\blx@TE@hook{\def\iflabelenddatejulian{% + \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates + {\blx@TE{\iftoggle{abx@bool@\abx@field@labeldatesource enddatejulian}}} + {\@secondoftwo}}}% + % start uncertain + \def\iflabeldateuncertain{% + \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates + {\iftoggle{abx@bool@\abx@field@labeldatesource dateuncertain}} + {\@secondoftwo}}% + \appto\blx@TE@hook{\def\iflabeldateuncertain{% + \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates + {\blx@TE{\iftoggle{abx@bool@\abx@field@labeldatesource dateuncertain}}} + {\@secondoftwo}}}% + % end uncertain + \def\iflabelenddateuncertain{% + \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates + {\iftoggle{abx@bool@\abx@field@labeldatesource enddateuncertain}} + {\@secondoftwo}}% + \appto\blx@TE@hook{\def\iflabelenddateuncertain{% + \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates + {\blx@TE{\iftoggle{abx@bool@\abx@field@labeldatesource enddateuncertain}}} + {\@secondoftwo}}}}% {}} % Name toggles like \ifauthor etc. need to be dynamically created for all @@ -6248,6 +5974,12 @@ \settoggle{abx@bool@#1inits}{##1}}} \abx@donameparts +%LEGACY(<3.3) legacy name for \ifgiveninits which is autogenerated now +\def\iffirstinits{ + \blx@warning@noline{% + '\string\iffirstinits' is deprecated, use '\string\ifgiveninits'}% + \iftoggle{abx@bool@giveninits}} + \def\do#1{% % Define use<name> options scope for biber \blx@collectopts{boolean}{blx@globalopts}{use#1}% @@ -6664,7 +6396,6 @@ \csuse{blx@data@\the\c@refsection @\blx@refcontext@context @#1}% \blx@adjustyears \blx@getlabeldata - \blx@aliasfields \blx@setcitecounter} \def\blx@adjustyears{% @@ -6801,39 +6532,20 @@ {\edef\abx@field@labelendseason{\csuse{abx@field@\abx@field@labeldatesource endseason}}} {}}}} -% This gets the entry data for a citation \def\blx@getdata@cite#1{% - \blx@getdata{#1}% - % Inject the relevant set parent fields like labelnumber/labelprefix into child \ifcsdef{blx@setc@\the\c@refsection @#1} - {\blx@ifdata{#1} - {\def\abx@field@childentrykey{#1}%LEGACY(<3.8) - \edef\abx@field@childentrytype{\abx@field@entrytype}%LEGACY(<3.8) + {\expandafter\expandafter\expandafter\blx@getdata + \expandafter\expandafter\expandafter{% + \csname blx@setc@\the\c@refsection @#1\endcsname}% + \blx@ifdata{#1} + {\def\abx@field@childentrykey{#1}% \begingroup - \expandafter\expandafter\expandafter\blx@getdata\expandafter\expandafter\expandafter{% - \csname blx@setc@\the\c@refsection @#1\endcsname}% - \let\blx@tempa\@empty - % Inject labelnumber if it exists - \ifdef\abx@field@labelnumber - {\appto\blx@tempa{\def\noexpand\abx@field@labelnumber{\abx@field@labelnumber}}} - {}% - % Inject labelprefix if it exists - \ifdef\abx@field@labelprefix - {\appto\blx@tempa{\def\noexpand\abx@field@labelprefix{\abx@field@labelprefix}}} - {}% - % Inject labelalpha if it exists - \ifdef\abx@field@labelalpha - {\appto\blx@tempa{\def\noexpand\abx@field@labelalpha{\abx@field@labelalpha}}} - {}% - % Inject extraalpha if it exists - \ifdef\abx@field@extraalpha - {\appto\blx@tempa{\def\noexpand\abx@field@extraalpha{\abx@field@extraalpha}}} - {}% - % Perform the injection - \edef\blx@tempb{\endgroup\blx@tempa}% - \blx@tempb} + \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} {\letcs\abx@field@entrysetcount{blx@seti@\the\c@refsection @#1}} {}} @@ -6903,13 +6615,13 @@ \csgdef{blx@keyalias@\the\c@refsection @#1}{\detokenize{#2}}% \listcsgadd{blx@keyaliases@\the\c@refsection}{#1}} -% blx@dlist@list@<section>@<refcontext> - a list of list items in a refcontext in a +% blx@slist@list@<section>@<scheme> - a list of list items in a scheme in a % section (for tracking bibliography lists, % obeys skipbiblist) -% blx@dlist@entry@<section>@<list> - a list of normal entries in a list in a +% blx@slist@entry@<section>@<scheme> - a list of normal entries in a scheme in a % section (for tracking bibliographies, % obeys skipbib) -% blx@dlist@centry@<section>@<list> - a list of normal entries in a list in a +% blx@slist@centry@<section>@<scheme> - a list of normal entries in a scheme in a % section (for tracking citations, % obeys skipbib). Same as @entry@ but % with added set children @@ -6921,10 +6633,9 @@ \blx@setoptions@type{#2}% \blx@bbl@options{#3}% \blx@setoptions@entry - \edef\blx@bbl@data{blx@data@\the\c@refsection @\blx@dlist@name @\abx@field@entrykey}% + \edef\blx@bbl@data{blx@data@\the\c@refsection @\blx@slist@name @\abx@field@entrykey}% \csuse\blx@bbl@data \blx@bbl@addfield{entrykey}{\abx@field@entrykey}% - \listxadd\blx@entries{\abx@field@entrykey}% \blx@bbl@addfield{entrytype}{#2}% \blx@imc@iffieldundef{options} {} @@ -6942,9 +6653,9 @@ \toggletrue{blx@skipbiblist}% \toggletrue{blx@skiplab}}% \nottoggle{blx@skipbib} - {\expandafter\ifstrequal\expandafter{\blx@dlist@type}{entry} - {\listcsxadd{blx@dlist@entry@\the\c@refsection @\blx@dlist@name}{\abx@field@entrykey}% - \listcsxadd{blx@dlist@centry@\the\c@refsection @\blx@dlist@name}{\abx@field@entrykey}% + {\expandafter\ifstrequal\expandafter{\blx@slist@type}{entry} + {\listcsxadd{blx@slist@entry@\the\c@refsection @\blx@slist@name}{\abx@field@entrykey}% + \listcsxadd{blx@slist@centry@\the\c@refsection @\blx@slist@name}{\abx@field@entrykey}% \listcsxadd{blx@type@\the\c@refsection @\abx@field@entrytype}{\abx@field@entrykey}% \ifdef\abx@field@entrysubtype {\listcsxadd{blx@subt@\the\c@refsection @\abx@field@entrysubtype}{\abx@field@entrykey}} @@ -6952,9 +6663,9 @@ {}}% {}% \nottoggle{blx@skipbiblist} - {\expandafter\ifstrequal\expandafter{\blx@dlist@type}{list} + {\expandafter\ifstrequal\expandafter{\blx@slist@type}{list} {\blx@bbl@labelfields - \listcsxadd{blx@dlist@\blx@dlist@type @\the\c@refsection @\blx@dlist@name}{\abx@field@entrykey}} + \listcsxadd{blx@slist@\blx@slist@type @\the\c@refsection @\blx@slist@name}{\abx@field@entrykey}} {}}% {}% \nottoggle{blx@skiplab} @@ -6987,15 +6698,13 @@ % available in the current context sortlist. \def\blx@addset{% \begingroup - \ifcsdef{blx@dlist@centry@\the\c@refsection @\blx@refcontext@context} - {\letcs\blx@tempa{blx@dlist@centry@\the\c@refsection @\blx@refcontext@context}% - \global\cslet{blx@dlist@centry@\the\c@refsection @\blx@refcontext@context}\@empty - \forlistloop\blx@addset@i\blx@tempa} - {\PackageWarningNoLine{biblatex}{Sorting template has changed}}% + \letcs\blx@tempa{blx@slist@centry@\the\c@refsection @\blx@refcontext@context}% + \global\cslet{blx@slist@centry@\the\c@refsection @\blx@refcontext@context}\@empty + \forlistloop\blx@addset@i\blx@tempa \endgroup} \def\blx@addset@i#1{% - \listcsgadd{blx@dlist@centry@\the\c@refsection @\blx@refcontext@context}{#1}% + \listcsgadd{blx@slist@centry@\the\c@refsection @\blx@refcontext@context}{#1}% \ifcsdef{blx@setp@\the\c@refsection @#1} {\expandafter\expandafter\expandafter\forcsvlist \expandafter\expandafter\expandafter\blx@addset@ii @@ -7004,7 +6713,7 @@ {}} \def\blx@addset@ii#1{% - \listcsgadd{blx@dlist@centry@\the\c@refsection @\blx@refcontext@context}{#1}} + \listcsgadd{blx@slist@centry@\the\c@refsection @\blx@refcontext@context}{#1}} \def\blx@bbl@labelfields{% \def\do##1{% @@ -7097,10 +6806,10 @@ \fi}} \def\blx@bbl@labeldate{% - \ifundef\abx@field@extradate + \ifundef\abx@field@extrayear {} - {\ifnum\abx@field@extradate>\c@maxextradate - \global\c@maxextradate\abx@field@extradate\relax + {\ifnum\abx@field@extrayear>\c@maxextrayear + \global\c@maxextrayear\abx@field@extrayear\relax \fi}} \def\blx@bbl@titles{% @@ -7143,8 +6852,8 @@ \let\endentry\blx@bbl@endentry \let\missing\blx@bbl@missing \let\keyalias\blx@bbl@keyalias - \let\datalist\blx@bbl@dlist - \let\enddatalist\blx@bbl@enddlist + \let\sortlist\blx@bbl@slist + \let\endsortlist\blx@bbl@endslist \let\set\blx@bbl@set \let\inset\blx@bbl@inset \let\xref\blx@bbl@xref % A No-op for Biber @@ -7163,28 +6872,25 @@ \let\endlverb\blx@bbl@verblend \let\annotation\blx@bbl@annotationdef} -\def\blx@bblend{% - % Special warning for defernumbers when a citation cannot be found - \iftoggle{blx@defernumbers} - {\def\do##1{\ifinlist{##1}\blx@entries - {} - {\blx@warning@noline{% - citation '##1' was not found at all in the .bbl, bibliography labels cannot be generated, please correct the citation}}}% - \dolistloop\blx@lastcites} - {}} +\def\blx@bblend{} % {<entrykey>} % Get the saved information on which citations were mentioned last run \protected\def\abx@aux@cite#1{% \listxadd\blx@lastcites{\detokenize{#1}}} +% {<sortschemename>} +% Get the saved information on which sorting schemes were mentioned last run +\protected\def\abx@aux@sortscheme#1{% + \listgadd\blx@lastsortschemes{#1}} + % {<refcontext>} % Get the saved information on which refcontexts were mentioned last run \protected\def\abx@aux@refcontext#1{% \listgadd\blx@lastrefcontexts{#1}} -% {<sortingtemplatename>} -% Get the saved information on which shorthand sorting templates were mentioned last run +% {<sortschemename>} +% Get the saved information on which shorthand sorting schemes were mentioned last run \protected\def\abx@aux@biblist#1{% \listgadd\blx@lastbiblists{#1}} @@ -7203,7 +6909,7 @@ \AtEndDocument{% % Here we run some tests to decide if we need to issue re-run % messages in certain circumstances. In general, if we add/remove - % any citations or add/remove any sorting templates, we need to re-run + % any citations or add/remove any sorting schemes, we need to re-run % biber. Also, if we have to re-run biber, we need to defer writing % the defernumbers .aux information because it will not yet be correct. @@ -7215,15 +6921,15 @@ \begingroup \def\do#1{\ifinlist{#1}\blx@cites{}{\blx@logreq@active{}}\relax}% \dolistloop\blx@lastcites - % Special case - if we are using sortingtemplate "none" anywhere, then changes + % Special case - if we are using sortscheme "none" anywhere, then changes % in citation order matter and we need to re-run biber. So a special test % to see if the cites from last run are identical in order. We have % already tested for more or less cites between runs by now, we are % testing here for exactly the same cites by treating the cite and % lastcite lists as strings and comparing them. This doesn't apply - % to biblist sortingtemplates as nobody wants to sort biblists with + % to biblist sortschemes as nobody wants to sort biblists with % "none", since it makes no sense - \ifinlist{none}\blx@sortingtemplatenames + \ifinlist{none}\blx@sortschemes {\ifdefstrequal{\blx@cites}{\blx@lastcites} {} {\blx@logreq@active{}}} @@ -7296,31 +7002,29 @@ % regenerates localnumber requiring another run but then % the pagebreaks change back again ... etc. \ifcsundef{blx@defer@\the\c@refsection @\blx@refcontext@context @\abx@field@entrykey} - {\ifundef\abx@field@localnumber - {} - {\listxadd\blx@localnumaux{% - \string\abx@aux@number% - {\the\c@instcount}% - {\abx@field@entrykey}% - {\the\c@refsection}% - {\blx@refcontext@context}% - {\abx@field@localnumber}}% - % record that we have already generated and output localnum - % for this key in this refsection/refcontext - \csgdef{blx@defer@\the\c@refsection @\blx@refcontext@context @\abx@field@entrykey}{}}} + {\listxadd\blx@localnumaux{% + \string\abx@aux@number% + {\the\c@instcount}% + {\abx@field@entrykey}% + {\the\c@refsection}% + {\blx@refcontext@context}% + {\abx@field@localnumber}}% + % record that we have already generated and output localnum + % for this key in this refsection/refcontext + \csgdef{blx@defer@\the\c@refsection @\blx@refcontext@context @\abx@field@entrykey}{}} {}} {}}% {}} {}% \endgroup} -% {<datalistname>} -\def\blx@bbl@dlist[#1]#2{% +% {<sortlistname>} +\def\blx@bbl@slist[#1]#2{% \begingroup - \def\blx@dlist@type{#1}% - \def\blx@dlist@name{#2}} + \def\blx@slist@type{#1}% + \def\blx@slist@name{#2}} -\def\blx@bbl@enddlist{% +\def\blx@bbl@endslist{% \csnumgdef{blx@labelnumber@\the\c@refsection}{0}% \endgroup} @@ -7490,8 +7194,9 @@ \define@key{blx@bib1}{prenote}{} \define@key{blx@bib1}{postnote}{} \define@key{blx@bib1}{omitnumbers}[]{} +\define@key{blx@bib1}{prefixnumbers}{}%LEGACY(<3.4) legacy name for labelprefix % Here we are using the first pass to see if there is an explicit setting for resetnumbers -% If there isn't we will use the default behaviour where if there is a labelprefix, +% If there isn't we will use the default behaviour where if there is a labelprefix, % resetnumbers will default to "true" \define@key{blx@bib1}{resetnumbers}[true]{% \toggletrue{blx@resetnumsexplicit}} @@ -7519,6 +7224,10 @@ \define@key{blx@biblist2}{section}{} \define@key{blx@biblist2}{sorting}{} +\define@key{blx@bib1}{sorting}{% + \blx@warning@noline{% + sorting option to \string\printbibliography\space is no longer supported, use 'sorting' option to \string\newrefcontext}} + \define@key{blx@bib1}{section}{% \ifcsundef{blx@sections@#1} {\blx@err@nosec{#1}} @@ -7531,6 +7240,10 @@ {\c@refsection#1\relax \def\blx@tempe{#1}}} +\define@key{blx@biblist1}{sorting}{% + \blx@warning@noline{% + sorting option to \string\printbiblist\space is no longer supported, use 'sorting' option to \string\newrefcontext}} + \define@key{blx@bbg}{section}{% \ifcsundef{blx@sections@#1} {\blx@err@nosec{#1}} @@ -7749,6 +7462,10 @@ Ignoring 'omitnumbers=true'}}} {}} +\define@key{blx@bib2}{prefixnumbers}{% + \blx@warning@noline{% + prefixnumbers option to \string\printbibliography\space is no longer supported, use 'labelprefix' option to \string\newrefcontext}} + % [<options>] \newrobustcmd*{\printbibheading}{% \begingroup @@ -7791,8 +7508,21 @@ \let\blx@thetitle\@empty % defaults \let\blx@tempa\@empty% before there is a .bbl, this must not be undef + \edef\blx@tempd{% + \blx@xml@sorting{% + \ifcsdef{blx@sortdef@locale@\blx@refcontext@sorting} + { locale="\csuse{blx@sortdef@locale@\blx@refcontext@sorting}"} + {}}{% + \csuse{blx@sorting@\blx@refcontext@sorting}}}% default to context \edef\blx@tempe{\the\c@refsection}% default refsection is current \blx@safe@actives + \edef\blx@tempd{% + \blx@xml@sorting{% + \ifcsdef{blx@sortdef@locale@\blx@refcontext@sorting} + { locale="\csuse{blx@sortdef@locale@\blx@refcontext@sorting}"} + {}}{% + \csuse{blx@sorting@\blx@refcontext@sorting}}}% + % \togglefalse{blx@resetnumsexplicit}% \setkeys{blx@bib1}{#1}% First pass options keys - section and resetnumbers % Is there a user-specified option for resetnumbers? If so, this overrides the default @@ -7803,9 +7533,9 @@ {} {\setkeys{blx@bib2}{resetnumbers}}}% \blx@rest@actives - \ifcsvoid{blx@dlist@entry@\blx@tempe @\blx@refcontext@context} + \ifcsvoid{blx@slist@entry@\blx@tempe @\blx@refcontext@context} {} - {\letcs\blx@tempa{blx@dlist@entry@\blx@tempe @\blx@refcontext@context}}% + {\letcs\blx@tempa{blx@slist@entry@\blx@tempe @\blx@refcontext@context}}% \blx@safe@actives % Must reset omitnumbers as it's a global macro and if we don't, any % \printbibliography following one with this set will inherit any @@ -7813,12 +7543,8 @@ \togglefalse{blx@omitnumbers}% \setkeys{blx@bib2}{#1}% ... now we have correct \blx@tempa, set rest of options \blx@rest@actives - % Add datalist to list of seen datalists to prevent duplicates - \xifinlist{\blx@refcontext@context @entry}\blx@dlistnames - {} - {\listxadd\blx@dlistnames{\blx@refcontext@context @entry}% - \csxappto{blx@dlists}{% - \blx@xml@dlist{\blx@refcontext@context}{entry}{\blx@tempe}{\blx@xml@dlist@refcontext{\blx@refcontext@sortingtemplatename}{\blx@refcontext@sortingnamekeytemplatename}{\blx@refcontext@labelprefix}{\blx@refcontext@uniquenametemplatename}{\blx@refcontext@labelalphanametemplatename}}{}}}% + \csxappto{blx@slists}{% + \blx@xml@slist{\blx@refcontext@context}{entry}{\blx@tempe}{\blx@refcontext@sorting}{\blx@refcontext@sortingnamekey}{\blx@refcontext@labelprefix}{\blx@tempd}{}}% \ifdefvoid\blx@tempa {\blx@warn@bibempty\endgroup} {\blx@bibliography\blx@tempa}} @@ -7849,11 +7575,11 @@ \blx@refsections} \def\blx@refsections{% - \ifcsvoid{blx@dlist@entry@\the\c@refsection @\blx@refcontext@context} + \ifcsvoid{blx@slist@entry@\the\c@refsection @\blx@refcontext@context} {} {\toggletrue{blx@tempa}% \begingroup - \expandafter\blx@bibliography\csname blx@dlist@entry@\the\c@refsection @\blx@refcontext@context\endcsname}% + \expandafter\blx@bibliography\csname blx@slist@entry@\the\c@refsection @\blx@refcontext@context\endcsname}% \ifnum\c@refsection<\blx@maxsection \advance\c@refsection\@ne \expandafter\blx@refsections @@ -7893,9 +7619,9 @@ {\toggletrue{blx@tempa}% \begingroup \let\blx@tempa\@empty - \ifcsvoid{blx@dlist@entry@\the\c@refsection @\blx@refcontext@context} + \ifcsvoid{blx@slist@entry@\the\c@refsection @\blx@refcontext@context} {} - {\letcs\blx@tempa{blx@dlist@entry@\the\c@refsection @\blx@refcontext@context}}% + {\letcs\blx@tempa{blx@slist@entry@\the\c@refsection @\blx@refcontext@context}}% \blx@filter\blx@tempa{blx@segm@\the\c@refsection @\the\c@refsegment}% \blx@bibliography\blx@tempa}% \ifnum\c@refsegment<\csname blx@maxsegment@\the\c@refsection\endcsname @@ -7939,9 +7665,9 @@ \begingroup \blx@key@heading{#1}% \let\blx@tempa\@empty - \ifcsvoid{blx@dlist@entry@\the\c@refsection @\blx@refcontext@context} + \ifcsvoid{blx@slist@entry@\the\c@refsection @\blx@refcontext@context} {} - {\letcs\blx@tempa{blx@dlist@entry@\the\c@refsection @\blx@refcontext@context}}% + {\letcs\blx@tempa{blx@slist@entry@\the\c@refsection @\blx@refcontext@context}}% \blx@filter\blx@tempa{blx@catg@#1}% \blx@bibliography\blx@tempa}}% @@ -8175,6 +7901,14 @@ \appto\blx@mknohyperref{\let\blx@anchor\relax} +% Legacy alias for \printshorthands +\def\printshorthands{% + \@ifnextchar[%] + {\blx@printshorthands} + {\blx@printshorthands[]}} + +\def\blx@printshorthands[#1]{\printbiblist[#1]{shorthand}} + % Custom bibliography list % [<otions>]{biblistname} \newrobustcmd*{\printbiblist}[2][]{% @@ -8191,33 +7925,42 @@ \let\blx@thetitle\@empty % defaults \let\blx@tempa\@empty% before there is a .bbl, this must not be undef - % default sorting template and template name for list is same name as list + % default sorting scheme and scheme name for list is same name as list % name, then current context if not found \edef\blx@tempc{% - \ifcsdef{blx@sortingtemplate@#2} + \ifcsdef{blx@sorting@#2} {#2} - {\blx@refcontext@sortingtemplatename}}% - % locally define this since we want to fetch data from the datalist named + {\blx@refcontext@sorting}}% + % locally define this since we want to fetch data from the slist named % after the list we are printing rather than the data in refcontext list - \edef\blx@refcontext@context{\blx@tempc/\blx@refcontext@sortingnamekeytemplatename/\blx@refcontext@labelprefix/\blx@refcontext@uniquenametemplatename/\blx@refcontext@labelalphanametemplatename}% - \xifinlist\blx@tempc\blx@sortingtemplatenames - {} - {\listxadd\blx@sortingtemplatenames\blx@tempc}% + \edef\blx@refcontext@context{\blx@tempc/\blx@refcontext@sortingnamekey/\blx@refcontext@labelprefix}% + \edef\blx@tempd{% + \blx@xml@sorting + {\ifcsdef{blx@sortdef@locale@#2} + { locale="\csuse{blx@sortdef@locale@#2}"} + {}} + {\csuse{blx@sorting@\blx@tempc}}}% \let\blx@printbibchecks\relax \edef\blx@tempe{\the\c@refsection}% default refsection is current \blx@safe@actives \blx@printbibchecks - % Add the sortingtemplate to the list of sortingtemplates for this biblist + % Add the sortscheme to the list of sortschemes for this biblist % so we can compare on next run \xifinlist\blx@tempc\blx@biblists {} {\listxadd\blx@biblists\blx@tempc \blx@auxwrite\@mainaux{}{\string\abx@aux@biblist{\blx@tempc}}}% + \edef\blx@tempd{% + \blx@xml@sorting{% + \ifcsdef{blx@sortdef@locale@\blx@tempc} + { locale="\csuse{blx@sortdef@locale@\blx@tempc}"} + {}}{% + \csuse{blx@sorting@\blx@tempc}}}% \setkeys{blx@biblist1}{#1}% Set section only, if present ... \blx@rest@actives - \ifcsvoid{blx@dlist@list@\blx@tempe @\blx@refcontext@context} + \ifcsvoid{blx@slist@list@\blx@tempe @\blx@refcontext@context} {} - {\letcs\blx@tempa{blx@dlist@list@\blx@tempe @\blx@refcontext@context}}% + {\letcs\blx@tempa{blx@slist@list@\blx@tempe @\blx@refcontext@context}}% \blx@safe@actives \setkeys{blx@biblist2}{#1}% ... now we have correct \blx@tempa, set rest of options \ifundef\blx@bibcheck @@ -8226,12 +7969,8 @@ {}} {}% \blx@rest@actives - % Add datalist to list of seen datalists to prevent duplicates - \xifinlist{\blx@refcontext@context @list}\blx@dlistnames - {} - {\listxadd\blx@dlistnames{\blx@refcontext@context @list}% - \csxappto{blx@dlists}{% - \blx@xml@dlist{\blx@refcontext@context}{list}{\blx@tempe}{\blx@xml@dlist@refcontext{\blx@tempc}{\blx@refcontext@sortingnamekeytemplatename}{\blx@refcontext@labelprefix}{\blx@refcontext@uniquenametemplatename}{\blx@refcontext@labelalphanametemplatename}}{\csuse{blx@biblistfilters@#2}}}}% + \csxappto{blx@slists}{% + \blx@xml@slist{\blx@refcontext@context}{list}{\blx@tempe}{\blx@tempc}{\blx@refcontext@sortingnamekey}{\blx@refcontext@labelprefix}{\blx@tempd}{\csuse{blx@biblistfilters@#2}}}% \ifdefvoid\blx@tempa {\blx@warn@biblistempty{#2}\endgroup} {\blx@biblist\blx@tempa}} @@ -8272,6 +8011,12 @@ \endgroup \if@restonecol\twocolumn\fi} +% Legacy aliases +\def\AtBeginShorthands{\AtBeginBiblist{shorthand}} +\def\AtEveryLositem{\AtEveryBiblistitem{shorthand}} +\@onlypreamble\AtBeginShorthands +\@onlypreamble\AtEveryLositem + % {<biblistname>} \newrobustcmd*{\AtBeginBiblist}[1]{\csgappto{blx@hook@biblistinit@#1}} \newrobustcmd*{\AtEveryBiblistitem}[1]{\csgappto{blx@hook@biblistitem@#1}} @@ -8341,50 +8086,35 @@ {\edef\z{\noexpand\setkeys{blx@refcontext}{\csuse{blx@refcontext@name@#2}}}\z}% % Override with explicit refcontext keyvals, if given \setkeys{blx@refcontext}{#1}% - % Add the sortingtemplate to the list of sortingtemplates so we can track + % Add the sortscheme to the list of sortschemes so we can track % special cases like sorting=none which need cite order change detection - \xifinlist\blx@refcontext@sortingtemplatename\blx@sortingtemplatenames + \xifinlist\blx@refcontext@sorting\blx@sortschemes {} - {\listxadd\blx@sortingtemplatenames\blx@refcontext@sortingtemplatename}% - \xdef\blx@refcontext@context{\blx@refcontext@sortingtemplatename/\blx@refcontext@sortingnamekeytemplatename/\blx@refcontext@labelprefix/\blx@refcontext@uniquenametemplatename/\blx@refcontext@labelalphanametemplatename}% + {\listxadd\blx@sortschemes\blx@refcontext@sorting + \blx@auxwrite\@mainaux{}{\string\abx@aux@sortscheme{\blx@refcontext@sorting}}}% + \xdef\blx@refcontext@context{\blx@refcontext@sorting/\blx@refcontext@sortingnamekey/\blx@refcontext@labelprefix}% % Add the refcontext to the list of refcontexts so we can compare on next run \xifinlist\blx@refcontext@context\blx@refcontexts {} {\listxadd\blx@refcontexts\blx@refcontext@context \blx@auxwrite\@mainaux{}{\string\abx@aux@refcontext{\blx@refcontext@context}}}% - \ifcsundef{blx@sortingtemplate@\blx@refcontext@sortingtemplatename} - {\blx@err@invopt{sorting=\blx@refcontext@sortingtemplatename}{}} - {}% - \ifcsundef{blx@sortingnamekeytemplate@\blx@refcontext@sortingnamekeytemplatename} - {\blx@err@invopt{sortingnamekeytemplate=\blx@refcontext@sortingnamekeytemplatename}{}} + \ifcsundef{blx@sorting@\blx@refcontext@sorting} + {\blx@err@invopt{sorting=\blx@refcontext@sorting}{}} {}% - \ifcsundef{blx@uniquenametemplate@\blx@refcontext@uniquenametemplatename} - {\blx@err@invopt{uniquenametemplate=\blx@refcontext@uniquenametemplatename}{}} - {}% - \ifcsundef{blx@labelalphanametemplate@\blx@refcontext@labelalphanametemplatename} - {\blx@err@invopt{labelalphanametemplate=\blx@refcontext@labelalphanametemplatename}{}} + \ifcsundef{blx@sortingnamekey@\blx@refcontext@sortingnamekey} + {\blx@err@invopt{sortingnamekeyscheme=\blx@refcontext@sortingnamekey}{}} {}}} % Reset to global sorting etc. when we leave a ref context (since they can't be nested) \protected\def\endrefcontext{% \togglefalse{blx@refcontext}% \global\let\blx@refcontext@labelprefix\@empty - \xdef\blx@refcontext@sortingtemplatename{\blx@sorting}% - \gdef\blx@refcontext@sortingnamekeytemplatename{global}% - \gdef\blx@refcontext@uniquenametemplatename{global}% - \gdef\blx@refcontext@labelalphanametemplatename{global}% - \xdef\blx@refcontext@context{\blx@refcontext@sortingtemplatename/\blx@refcontext@sortingnamekeytemplatename//\blx@refcontext@uniquenametemplatename/\blx@refcontext@labelalphanametemplatename}} - -% Meta option to set all name template options -\define@key{blx@refcontext}{nametemplates}{% - \gdef\blx@refcontext@sortingnamekeytemplatename{#1}% - \gdef\blx@refcontext@uniquenametemplatename{#1}% - \gdef\blx@refcontext@labelalphanametemplatename{#1}} - -\define@key{blx@refcontext}{sorting}{\gdef\blx@refcontext@sortingtemplatename{#1}} -\define@key{blx@refcontext}{sortingnamekeytemplatename}{\gdef\blx@refcontext@sortingnamekeytemplatename{#1}} -\define@key{blx@refcontext}{uniquenametemplatename}{\gdef\blx@refcontext@uniquenametemplatename{#1}} -\define@key{blx@refcontext}{labelalphanametemplatename}{\gdef\blx@refcontext@labelalphanametemplatename{#1}} + \xdef\blx@refcontext@sorting{\blx@sorting}% + \gdef\blx@refcontext@sortingnamekey{global}% + \xdef\blx@refcontext@context{\blx@refcontext@sorting/\blx@refcontext@sortingnamekey/}} + +\define@key{blx@refcontext}{sorting}{\gdef\blx@refcontext@sorting{#1}} +\define@key{blx@refcontext}{sortingnamekeyscheme}{\gdef\blx@refcontext@sortingnamekey{#1}} \define@key{blx@refcontext}{labelprefix}{% \gdef\blx@refcontext@labelprefix{#1}% \iftoggle{blx@defernumbers} @@ -8394,6 +8124,11 @@ Option 'labelprefix' requires global\MessageBreak 'defernumbers=true'}} {}}} +\define@key{blx@refcontext}{prefixnumbers}{%LEGACY(<3.3) + \blx@warning@noline{% + prefixnumbers option to \string\newrefcontext\space has been renamed, + use 'labelprefix' option instead}% + \setkeys{blx@refcontext}{labelprefix=#1}} % [refcontext keys]{<keyword1>,<keyword2>,...} \newcommand*{\assignrefcontextkeyws}{% @@ -8405,12 +8140,10 @@ \edef\blx@tempa{\blx@sorting}% \def\blx@tempb{global}% \let\blx@tempc\@empty% - \def\blx@tempd{global}% - \def\blx@tempe{global}% \setkeys{blx@assignrefcontext}{#2}% \def\do##1{% \listxadd\blx@assignedrefcontextkeywlist{##1}% - \csxdef{blx@assignedrefcontextkeyws#1@\the\c@refsection @##1}{\blx@tempa/\blx@tempb/\blx@tempc/\blx@tempd/\blx@tempe}} + \csxdef{blx@assignedrefcontextkeyws#1@\the\c@refsection @##1}{\blx@tempa/\blx@tempb/\blx@tempc}} \docsvlist{#3}} % [refcontext keys]{<category1>,<category2>,...} @@ -8423,12 +8156,10 @@ \edef\blx@tempa{\blx@sorting}% \def\blx@tempb{global}% \let\blx@tempc\@empty% - \def\blx@tempd{global}% - \def\blx@tempe{global}% \setkeys{blx@assignrefcontext}{#2}% \def\do##1{% \listxadd\blx@assignedrefcontextcatlist{##1}% - \csxdef{blx@assignedrefcontextcats#1@\the\c@refsection @##1}{\blx@tempa/\blx@tempb/\blx@tempc/\blx@tempd/\blx@tempe}} + \csxdef{blx@assignedrefcontextcats#1@\the\c@refsection @##1}{\blx@tempa/\blx@tempb/\blx@tempc}} \docsvlist{#3}} % [refcontext keys]{<entrykey1>,<entrykey2>,...} @@ -8441,24 +8172,14 @@ \edef\blx@tempa{\blx@sorting}% \def\blx@tempb{global}% \let\blx@tempc\@empty% - \def\blx@tempd{global}% - \def\blx@tempe{global}% \setkeys{blx@assignrefcontext}{#2}% \def\do##1{% - \csxdef{blx@assignedrefcontextkeys#1@\the\c@refsection @##1}{\blx@tempa/\blx@tempb/\blx@tempc/\blx@tempd/\blx@tempe}}% + \csxdef{blx@assignedrefcontextkeys#1@\the\c@refsection @##1}{\blx@tempa/\blx@tempb/\blx@tempc}}% \docsvlist{#3}} -% Meta option to set all name template options -\define@key{blx@assignrefcontext}{nametemplates}{% - \def\blx@tempb{#1}% - \def\blx@tempd{#1}% - \def\blx@tempe{#1}} - \define@key{blx@assignrefcontext}{sorting}{\def\blx@tempa{#1}} -\define@key{blx@assignrefcontext}{sortingnamekeytemplatename}{\def\blx@tempb{#1}} +\define@key{blx@assignrefcontext}{sortingnamekeyscheme}{\def\blx@tempb{#1}} \define@key{blx@assignrefcontext}{labelprefix}{\def\blx@tempc{#1}} -\define@key{blx@assignrefcontext}{uniquenametemplatename}{\def\blx@tempd{#1}} -\define@key{blx@assignrefcontext}{labelalphanametemplatename}{\def\blx@tempe{#1}} % Reference sections \newrobustcmd*{\newrefsection}{% @@ -8923,13 +8644,33 @@ \protected\def\abx@aux@segm#1#2#3{% \listcsxadd{blx@segm@#1@#2}{\detokenize{#3}}} +\def\blx@citation@set#1#2{% + \blx@citation@entry{#1}{#2}% + \begingroup + \def\do##1{\blx@citation@entry{##1}\blx@msg@cundef}% + \expandafter\expandafter\expandafter\docsvlist + \expandafter\expandafter\expandafter{% + \csname blx@setp@\the\c@refsection @#1\endcsname}% + \endgroup} + +\def\blx@citation@inset#1#2{% + \blx@citation@entry{#1}{#2}% + \expandafter\expandafter\expandafter\blx@citation@inset@i + \expandafter\expandafter\expandafter{% + \csname blx@setc@\the\c@refsection @#1\endcsname}\blx@msg@cundef} + +\def\blx@citation@inset@i#1{% + \ifcsdef{blx@setp@\the\c@refsection @#1} + {\blx@citation@set{#1}} + {\blx@citation@entry{#1}}} + \def\blx@citation@all{% \ifbool{citerequest} {\blx@bibreq{*}% \global\csletcs {blx@segm@\the\c@refsection @\the\c@refsegment} - {blx@dlist@entry@\the\c@refsection @\blx@refcontext@context}% - \ifcsvoid{blx@dlist@entry@\the\c@refsection @\blx@refcontext@context} + {blx@slist@entry@\the\c@refsection @\blx@refcontext@context}% + \ifcsvoid{blx@slist@entry@\the\c@refsection @\blx@refcontext@context} {\blx@logreq@active{}} {}} {}} @@ -8986,8 +8727,6 @@ % {<entrykey>,...} \protected\def\blx@citeloop#1{% \begingroup - % This must be here and not after \blx@citeadd as this changes the refcontext - \letcs\blx@tempb{blx@dlist@centry@\the\c@refsection @\blx@refcontext@context}% % Make sure this counter exists. Sometimes it might not when using, e.g: % refsection=chapter and \includeonly to put in the chapters or when % inserting citations into table of contents @@ -9004,9 +8743,8 @@ \ifnum\blx@tempcntb>\z@ \multicitedelim \fi - \else - \blx@postpunct@saved \fi + \letcs\blx@tempb{blx@slist@centry@\the\c@refsection @\blx@refcontext@context}% % \blx@tempb is a sorted list of all cites, \blx@tempa is the list of cites to % sort using this list \blx@thecitesort @@ -9061,7 +8799,7 @@ % refcontext defined \ifcsdef{blx@assignedrefcontextbib@\the\c@refsection @#1} {\letcs\blx@refcontext@context{blx@assignedrefcontextbib@\the\c@refsection @#1}} - {\edef\blx@refcontext@context{\blx@sorting/global//global/global}}% + {\edef\blx@refcontext@context{\blx@sorting/global/}}% % assignment via keyword list \ifdef\blx@assignedrefcontextkeywlist {\def\do##1{% @@ -9149,7 +8887,6 @@ \ifnum\c@citecount=\c@citetotal \def\blx@thecheckpunct{\blx@err@nestcite\@gobble}% \blx@postcode - \blx@postpunct@saved \fi \blx@endlangcite \endgroup @@ -9807,8 +9544,7 @@ \def\blx@precode{\delimcontext{#1}#2}% \def\blx@loopcode{#3}% \def\blx@dlimcode{#4}% - \def\blx@postcode{#5}% - \def\blx@postpunct@saved{##4}% + \def\blx@postcode{#5##4}% \blx@citeloop{##3}% \endgroup}} @@ -10070,10 +9806,9 @@ \abx@missing{#5}} {\printnames[#4]{#5}}}% \def\blx@dlimcode{\multicitedelim}% - \def\blx@postpunct@saved{#6}% \ifblank{#2} - {\let\blx@postcode\@empty} - {\def\blx@postcode{\usebibmacro{postnote}}}% + {\def\blx@postcode{#6}} + {\def\blx@postcode{\usebibmacro{postnote}#6}}% \boolfalse{citetracker}% \boolfalse{pagetracker}% \blx@citeloop{#3}% @@ -10098,10 +9833,9 @@ \abx@missing{#5}} {\printlist[#4]{#5}}}% \def\blx@dlimcode{\multicitedelim}% - \def\blx@postpunct@saved{#6}% \ifblank{#2} - {\let\blx@postcode\@empty} - {\def\blx@postcode{\usebibmacro{postnote}}}% + {\def\blx@postcode{#6}} + {\def\blx@postcode{\usebibmacro{postnote}#6}}% \boolfalse{citetracker}% \boolfalse{pagetracker}% \blx@citeloop{#3}% @@ -10127,10 +9861,9 @@ \abx@missing{#5}} {\printfield[#4]{#5}}}% \def\blx@dlimcode{\multicitedelim}% - \def\blx@postpunct@saved{#6}% \ifblank{#2} - {\let\blx@postcode\@empty} - {\def\blx@postcode{\usebibmacro{postnote}}}% + {\def\blx@postcode{#6}} + {\def\blx@postcode{\usebibmacro{postnote}#6}}% \boolfalse{citetracker}% \boolfalse{pagetracker}% \blx@citeloop{#3}% @@ -10224,13 +9957,7 @@ \def\ifuniquebaretitle{\blx@TE{\iftoggle{abx@bool@uniquebaretitle}}}% \def\ifuniquework{\blx@TE{\iftoggle{abx@bool@uniquework}}}% \def\ifuniqueprimaryauthor{\blx@TE{\iftoggle{abx@bool@uniqueprimaryauthor}}}% - \def\ifandothers#1{\blx@TE{\iftoggle{abx@bool@more#1}}}% - \def\iflabeldateisdate{\blx@TE\blx@imc@iflabeldateisdate}% - \def\ifdatehasyearonlyprecision#1{% - \blx@TE{\blx@imc@ifdatehasyearonlyprecision{#1}}}% - \def\ifdatehastime#1{\blx@TE{\blx@imc@ifdatehastime{#1}}}% - \def\ifdateshavedifferentprecision#1#2{% - \blx@TE{\blx@imc@ifdateshavedifferentprecision{#1}{#2}}}}} + \def\ifandothers#1{\blx@TE{\iftoggle{abx@bool@more#1}}}}} % {<listmacro>}{<filtercsname>} => matches in <listmacro> \protected\def\blx@bibfilter#1#2{% @@ -10649,7 +10376,7 @@ ~~~~~~~~<bcf:map\string_step#1/>\blx@nl} \xdef\blx@xml@labelalphanametemplate#1#2{% - ~~<bcf:labelalphanametemplate name="#1">\blx@nl + ~~<bcf:labelalphanametemplate type="#1">\blx@nl #2% ~~</bcf:labelalphanametemplate>\blx@nl} \xdef\blx@xml@labelalphanametemplatenamepart#1#2#3{% @@ -10666,17 +10393,6 @@ \xdef\blx@xml@labelalpha@part#1#2{% ~~~~~~<bcf:labelpart#1>#2</bcf:labelpart>\blx@nl} -\xdef\blx@xml@extradate#1{% - ~~<bcf:extradatespec>\blx@nl - #1% - ~~</bcf:extradatespec>\blx@nl} -\xdef\blx@xml@extradatescope#1{% - ~~~~<bcf:scope>\blx@nl - #1% - ~~~~</bcf:scope>\blx@nl} -\xdef\blx@xml@edordered#1#2{% - ~~~~~~<bcf:field order="#1">#2</bcf:field>\blx@nl} - \xdef\blx@xml@inheritance#1{% ~~<bcf:inheritance>\blx@nl #1% @@ -10724,18 +10440,18 @@ \xdef\blx@xml@nolabelwidthcount#1{% ~~~~<bcf:nolabelwidthcount value="#1"/>\blx@nl} -\xdef\blx@xml@uniquenametemplate#1#2{% - ~~<bcf:uniquenametemplate name="#1">\blx@nl% - #2% +\xdef\blx@xml@uniquenametemplate#1{% + ~~<bcf:uniquenametemplate>\blx@nl% + #1% ~~</bcf:uniquenametemplate>\blx@nl} \xdef\blx@xml@uniquenametemplatenamepart#1#2#3{% ~~~~<bcf:namepart #1#2>#3</bcf:namepart>\blx@nl} -\xdef\blx@xml@sortingnamekeytemplate#1#2{% - ~~<bcf:sortingnamekeytemplate name="#1">\blx@nl% +\xdef\blx@xml@sortingnamekey#1#2{% + ~~<bcf:sortingnamekey keyscheme="#1">\blx@nl% #2% - ~~</bcf:sortingnamekeytemplate>\blx@nl} + ~~</bcf:sortingnamekey>\blx@nl} \xdef\blx@xml@sortingnamekeykeypart#1#2{% ~~~~<bcf:keypart#1>\blx@nl @@ -10748,26 +10464,26 @@ \xdef\blx@xml@sortingnamekeyliteral#1#2{% ~~~~~~<bcf:part type="literal"#1>#2</bcf:part>\blx@nl} -\xdef\blx@xml@sortingtemplate#1#2#3{% - ~~<bcf:sortingtemplate name="#1"#2>\blx@nl% - #3% - ~~</bcf:sortingtemplate>\blx@nl} +\xdef\blx@xml@sorting#1#2{% + ~~<bcf:sorting#1>\blx@nl% + #2% + ~~</bcf:sorting>\blx@nl} \xdef\blx@xml@presort#1#2{% - ~~<bcf:presort\noexpand\ifblank{#1}{}{ type="#1"}>% + ~~~~<bcf:presort\noexpand\ifblank{#1}{}{ type="#1"}>% #2</bcf:presort>\blx@nl} \xdef\blx@xml@sortexclude#1#2{% - ~~<bcf:sortexclusion\noexpand\ifblank{#1}{}{ type="#1"}>\blx@nl + ~~~~<bcf:sortexclusion\noexpand\ifblank{#1}{}{ type="#1"}>\blx@nl #2% - ~~</bcf:sortexclusion>\blx@nl} + ~~~~</bcf:sortexclusion>\blx@nl} \xdef\blx@xml@exclude#1{% - ~~~~<bcf:exclusion>#1</bcf:exclusion>\blx@nl} + ~~~~~~<bcf:exclusion>#1</bcf:exclusion>\blx@nl} \xdef\blx@xml@sortinclude#1#2{% - ~~<bcf:sortinclusion\noexpand\ifblank{#1}{}{ type="#1"}>\blx@nl + ~~~~<bcf:sortinclusion\noexpand\ifblank{#1}{}{ type="#1"}>\blx@nl #2% - ~~</bcf:sortinclusion>\blx@nl} + ~~~~</bcf:sortinclusion>\blx@nl} \xdef\blx@xml@include#1{% - ~~~~<bcf:inclusion>#1</bcf:inclusion>\blx@nl} + ~~~~~~<bcf:inclusion>#1</bcf:inclusion>\blx@nl} \xdef\blx@xml@sort#1#2{% ~~~~<bcf:sort #1>\blx@nl #2% @@ -10779,24 +10495,17 @@ \xdef\blx@xml@endsection{% ~~</bcf:section>} -\xdef\blx@xml@dlist@refcontext#1#2#3#4#5{% - ~~~~~~~~~~~~~~~~sortingtemplatename="#1"\blx@nl - ~~~~~~~~~~~~~~~~sortingnamekeytemplatename="#2"\blx@nl - ~~~~~~~~~~~~~~~~labelprefix="#3"\blx@nl - ~~~~~~~~~~~~~~~~uniquenametemplatename="#4"\blx@nl - ~~~~~~~~~~~~~~~~labelalphanametemplatename="#5"} -\xdef\blx@xml@dlist#1#2#3#4#5{% - ~~<bcf:datalist section="#3"\blx@nl - ~~~~~~~~~~~~~~~~name="#1"\blx@nl - ~~~~~~~~~~~~~~~~type="#2"\blx@nl - #4>\blx@nl - #5% - ~~</bcf:datalist>\blx@nl} -\xdef\blx@xml@dlistfilterorbegin{% +\xdef\blx@xml@slist#1#2#3#4#5#6#7#8{% + ~~<bcf:sortlist section="#3" name="#1" type="#2" sortscheme="#4" + sortnamekeyscheme="#5" labelprefix="#6">\blx@nl + #8% + #7% + ~~</bcf:sortlist>\blx@nl} +\xdef\blx@xml@slistfilterorbegin{% ~~~~<bcf:filteror>\blx@nl} -\xdef\blx@xml@dlistfilterorend{% +\xdef\blx@xml@slistfilterorend{% ~~~~</bcf:filteror>\blx@nl} -\xdef\blx@xml@dlistfilter#1#2{% +\xdef\blx@xml@slistfilter#1#2{% ~~~~<bcf:filter type="#1">#2</bcf:filter>\blx@nl} \xdef\blx@xml@bibdata#1#2{% @@ -10851,8 +10560,7 @@ \blx@xml@toggle{singletitle}% \blx@xml@svalue{sortalphaothers}{\sortalphaothers}% \blx@xml@svalue{sortlocale}{\blx@sortlocale}% - \blx@xml@svalue{sortingtemplatename}{\blx@sorting}% - \blx@xml@toggle{sortsets}% + \blx@xml@svalue{sortscheme}{\blx@sorting}% \blx@xml@svalue{uniquelist}{\blx@uniquelist}% \blx@xml@svalue{uniquename}{\blx@uniquename}% \blx@xml@toggle{uniqueprimaryauthor}% @@ -11021,56 +10729,68 @@ {}}}} {}% % labelalpha name template - \eappto\blx@tempa{\blx@xml@comment{LABELALPHA NAME TEMPLATE}}% + \eappto\blx@tempa{% + \blx@xml@comment{LABELALPHA NAME TEMPLATE}}% \def\do##1{% \eappto\blx@tempa{% - \blx@xml@labelalphanametemplate{##1}{\csuse{blx@labelalphanametemplate@##1}}}}% - \dolistloop\blx@lantemplatespecs + \blx@xml@labelalphanametemplate{##1}{% + \csuse{blx@labelalphanametemplate@##1}}% + }% + }% + \dolistloop\blx@lantem@type % labelalpha template \eappto\blx@tempa{% \blx@xml@comment{LABELALPHA TEMPLATE}}% \def\do##1{% \eappto\blx@tempa{% \blx@xml@labelalphatemplate{##1}{% - \csuse{blx@labelalphatemplate@##1}}}}% + \csuse{blx@labelalphatemplate@##1}}% + }% + }% \dolistloop\blx@latem@type - % extradate specification - \eappto\blx@tempa{% - \blx@xml@comment{EXTRADATE}% - \blx@xml@extradate{\csuse{blx@bcf@extradatespec}}}% % data inheritance \eappto\blx@tempa{% \blx@xml@comment{INHERITANCE}% \blx@xml@inheritance{% \csuse{blx@inherit@default}% - \csuse{blx@inherit@data}}}% + \csuse{blx@inherit@data}% + }% + }% % noinit \ifcsdef{blx@noinit} {\eappto\blx@tempa{% \blx@xml@comment{NOINIT}% \blx@xml@noinits{% - \csuse{blx@noinit}}}}% + \csuse{blx@noinit}% + }% + }} {}% % nolabel \ifcsdef{blx@nolabel} {\eappto\blx@tempa{% \blx@xml@comment{NOLABEL}% \blx@xml@nolabels{% - \csuse{blx@nolabel}}}}% + \csuse{blx@nolabel}% + }% + }} {}% % nolabel \ifcsdef{blx@nolabelwidthcount} {\eappto\blx@tempa{% \blx@xml@comment{NOLABELWIDTHCOUNT}% \blx@xml@nolabelwidthcounts{% - \csuse{blx@nolabelwidthcount}}}}% + \csuse{blx@nolabelwidthcount}% + }% + }} {}% % nosort \ifcsdef{blx@nosort} {\eappto\blx@tempa{% \blx@xml@comment{NOSORT}% \blx@xml@nosorts{% - \csuse{blx@nosort}}}}% + \csuse{blx@nosort}% + }% + }} {}% % transliteration \ifdefempty\blx@translits @@ -11080,18 +10800,16 @@ \eappto\blx@tempa{\blx@xml@transliteration{##1}{\csuse{blx@translit@##1}}}}% \dolistloop\blx@translits}% % uniquenametemplate - \eappto\blx@tempa{\blx@xml@comment{UNIQUENAME TEMPLATES}}% - \def\do##1{% - \eappto\blx@tempa{% - \blx@xml@uniquenametemplate{##1}{\csuse{blx@uniquenametemplate@##1}}}}% - \dolistloop\blx@untemplatespecs - % sortingnamekeytemplate - \eappto\blx@tempa{\blx@xml@comment{SORTING NAME KEY TEMPLATES}}% + \eappto\blx@tempa{\blx@xml@comment{UNIQUENAME TEMPLATE}}% + \eappto\blx@tempa{\blx@xml@uniquenametemplate{\blx@uniquenametemplate}}% + % sortingnamekey + \eappto\blx@tempa{\blx@xml@comment{SORTING NAME KEY}}% \def\do##1{% \eappto\blx@tempa{% - \blx@xml@sortingnamekeytemplate{##1}{\csuse{blx@sortingnamekeytemplate@##1}}}}% - \dolistloop\blx@sortingnamekeytemplates - % presort/sorting excludes/sorting includes + \blx@xml@sortingnamekey{##1}{% + \csuse{blx@sortingnamekey@##1}}}}% + \dolistloop\blx@sortingnamekeyspecs + % sorting \def\do##1{% \eappto\blx@bcf@presort{\csuse{blx@bcf@presort@##1}}% \eappto\blx@bcf@exclude{\csuse{blx@bcf@exclude@##1}}% @@ -11099,9 +10817,14 @@ \abx@doentrytypes \do{*}% entrytype wildcard \eappto\blx@tempa{% - \blx@bcf@presort - \blx@bcf@exclude - \blx@bcf@include}% + \blx@xml@comment{SORTING}% + \blx@xml@sorting{}{% + \blx@bcf@presort + \blx@bcf@exclude + \blx@bcf@include + \csuse{blx@sorting@\blx@sorting}% + }% + }% % datamodel \eappto\blx@tempa{% \blx@xml@comment{DATA MODEL}% @@ -11133,18 +10856,9 @@ \global\undef\blx@tempa \endgroup \AfterEndDocument{% - \def\do##1{% - \csxappto{blx@sortingtemplates}{% - \blx@xml@sortingtemplate{##1} - {\ifcsdef{blx@sortdef@locale@##1}{ locale="\csuse{blx@sortdef@locale@##1}"}{}} - {\csuse{blx@sortingtemplate@##1}}}}% - \dolistloop\blx@sortingtemplatenames \blx@auxwrite\blx@bcfout{}{% \blx@xml@endsection\blx@nl - \blx@xml@comment{SORTING TEMPLATES}% - \csuse{blx@sortingtemplates}% - \blx@xml@comment{DATALISTS}% - \csuse{blx@dlists}% + \csuse{blx@slists}% \blx@xml@endfile}% \immediate\closeout\blx@bcfout}} @@ -11433,25 +11147,29 @@ \define@key{blx@sourcemap@step}{replace}{% characters \eappto\blx@tempf{ map\string_replace="#1"}} -% [<specname>]{<spec>} +% [<entrytype>]{<spec>} \newrobustcmd*{\DeclareLabelalphaNameTemplate}[2][]{% + \ifblank{#1} + {\blx@lantem{#2}{global}} + {\forcsvlist{\blx@lantem{#2}}{#1}}} +\@onlypreamble\DeclareLabelalphaNameTemplate +\blx@collectopts{xml}{blx@globalopts}{labelalphanametemplate}% for passing to the .bcf +\blx@collectopts{xml}{blx@typeopts}{labelalphanametemplate}% for passing to the .bcf + +\def\blx@lantem#1#2{% \begingroup - \ifblank{#1} - {\def\blx@lantname{global}}% default - {\def\blx@lantname{#1}}% \let\namepart\blx@lantem@namepart \let\blx@tempa\@empty \blx@tempcnta\z@ - #2% - \global\cslet{blx@labelalphanametemplate@\blx@lantname}\blx@tempa - \xifinlist\blx@lantname\blx@lantemplatespecs - {} - {\listxadd\blx@lantemplatespecs\blx@lantname}% + #1% + \ifdef\blx@lantem@type + {\ifinlist{#2}\blx@lantem@type + {\global\cslet{blx@labelalphanametemplate@#2}\blx@tempa} + {\listgadd\blx@lantem@type{#2}% + \global\cslet{blx@labelalphanametemplate@#2}\blx@tempa}} + {\listgadd\blx@lantem@type{#2}% + \global\cslet{blx@labelalphanametemplate@#2}\blx@tempa}% \endgroup} -\@onlypreamble\DeclareLabelalphaNameTemplate -\blx@collectopts{xml}{blx@globalopts}{labelalphanametemplate}% for passing to the .bcf -\DeclareEntryOption[string]{labelalphanametemplatename}{% - \def\blx@refcontext@labelalphanametemplatename{#1}} \newcommand*{\blx@lantem@namepart}[2][]{% \advance\blx@tempcntb\@ne @@ -11532,6 +11250,23 @@ \eappto\blx@tempb{% \blx@xml@labelalpha@part{\blx@tempc}{#2}}} +% Legacy options moved to \namepart in \DeclareLabelalphaNameTemplate +\define@key{blx@latem@field}{compound}{% deprecated + \blx@warning@noline{% + Ignored 'compound' option to \string\field\space in \string\DeclareLabelalphaNameTemplate\MessageBreak + This is now the 'compound' option of \string\namepart\space in\MessageBreak + \string\DeclareLabelalphaNameTemplate}} +\define@key{blx@latem@field}{pcompound}{% deprecated + \blx@warning@noline{% + Ignored 'pcompound' option to \string\field\space in \string\DeclareLabelalphaNameTemplate\MessageBreak + This is now the 'compound' option of \string\namepart\space in\MessageBreak + \string\DeclareLabelalphaNameTemplate}} +\define@key{blx@latem@field}{pstrwidth}{% deprecated + \blx@warning@noline{% + Ignored 'pstrwidth' option to \string\field\space in \string\DeclareLabelalphaNameTemplate\MessageBreak + This is now the 'strwidth' option of \string\namepart\space in\MessageBreak + \string\DeclareLabelalphaNameTemplate}} + \define@key{blx@latem@field}{uppercase}[true]{% true|false \ifstrequal{#1}{true} {\appto\blx@tempc{ uppercase="1"}} @@ -11691,16 +11426,16 @@ \@onlypreamble\DeclareBiblistFilter \newcommand*{\blx@biblistfilteror}[1]{% - \eappto\blx@tempa{\blx@xml@dlistfilterorbegin}% + \eappto\blx@tempa{\blx@xml@slistfilterorbegin}% #1% - \eappto\blx@tempa{\blx@xml@dlistfilterorend}} + \eappto\blx@tempa{\blx@xml@slistfilterorend}} \newcommand*{\blx@biblistfilter}[1][2]{% \let\blx@tempc\@empty \let\blx@tempd\@empty \setkeys{blx@biblistfilter@filter}{#1}% \eappto\blx@tempa{% - \blx@xml@dlistfilter{\blx@tempc}{\blx@tempd}}} + \blx@xml@slistfilter{\blx@tempc}{\blx@tempd}}} \define@key{blx@biblistfilter@filter}{type}{% \def\blx@tempc{#1}} @@ -11733,25 +11468,17 @@ \eappto\blx@tempb{% \blx@xml@translit{#1}{#2}{#3}}} -% [<specname>]{<spec>} -\newrobustcmd*{\DeclareUniquenameTemplate}[2][]{% +% {<spec>} +\newrobustcmd*{\DeclareUniquenameTemplate}[1]{% \begingroup - \ifblank{#1} - {\def\blx@untname{global}}% default - {\def\blx@untname{#1}}% \let\namepart\blx@untemp@namepart \let\blx@tempa\@empty \blx@tempcnta\z@ - #2% - \global\cslet{blx@uniquenametemplate@\blx@untname}\blx@tempa - \xifinlist\blx@untname\blx@untemplatespecs - {} - {\listxadd\blx@untemplatespecs\blx@untname}% + #1% + \global\let\blx@uniquenametemplate\blx@tempa \endgroup} \@onlypreamble\DeclareUniquenameTemplate \blx@collectopts{xml}{blx@globalopts}{uniquenametemplate}% for passing to the .bcf -\DeclareEntryOption[string]{uniquenametemplatename}{% - \def\blx@refcontext@uniquenametemplatename{#1}} \newcommand*{\blx@untemp@namepart}[2][]{% \advance\blx@tempcntb\@ne @@ -11773,11 +11500,8 @@ {\appto\blx@tempc{ base="1"}} {}} -\define@key{blx@untemp@namepart}{disambiguation}{% disambiguation option for namepart none|inits|full|fullonly - \appto\blx@tempc{ disambiguation="#1"}} - -% [<templatename>]{<template>} -\newrobustcmd*{\DeclareSortingNamekeyTemplate}[2][]{% +% [<specname>]{<spec>} +\newrobustcmd*{\DeclareSortingNamekeyScheme}[2][]{% \begingroup \ifblank{#1} {\def\blx@snkname{global}}% default @@ -11788,23 +11512,19 @@ \let\blx@tempa\@empty \blx@tempcnta\z@ #2% - \global\cslet{blx@sortingnamekeytemplate@\blx@snkname}\blx@tempa - \xifinlist\blx@snkname\blx@sortingnamekeytemplates + \global\cslet{blx@sortingnamekey@\blx@snkname}\blx@tempa + \xifinlist\blx@snkname\blx@sortingnamekeyspecs {} - {\listxadd\blx@sortingnamekeytemplates\blx@snkname}% + {\listxadd\blx@sortingnamekeyspecs\blx@snkname}% \endgroup} -\@onlypreamble\DeclareSortingNamekeyTemplate -\blx@collectopts{xml}{blx@globalopts}{sortingnamekeytemplate}% for passing to the .bcf -\DeclareEntryOption[string]{sortingnamekeytemplatename}{% - \def\blx@refcontext@sortingnamekeytemplatename{#1}} - -% User-mode macro for checking sorting name template options -\def\ifuniquenametemplatename#1{% - \expandafter\ifstrequal\expandafter{\blx@refcontext@uniquenametemplatename}{#1}} -\def\iflabelalphanametemplatename#1{% - \expandafter\ifstrequal\expandafter{\blx@refcontext@labelalphanametemplatename}{#1}} -\def\ifsortingnamekeytemplatename#1{% - \expandafter\ifstrequal\expandafter{\blx@refcontext@sortingnamekeytemplatename}{#1}} +\@onlypreamble\DeclareSortingNamekeyScheme +\blx@collectopts{xml}{blx@globalopts}{sortingnamekey}% for passing to the .bcf +\DeclareEntryOption[string]{sortnamekeyscheme}{% + \def\blx@refcontext@sortingnamekey{#1}} + +% User-mode macro for checking sorting name key scheme +\def\ifsortnamekeyscheme#1{% + \expandafter\ifstrequal\expandafter{\blx@refcontext@sortingnamekey}{#1}} \newcommand*{\blx@sortnk@keypart}[1]{% \advance\blx@tempcnta\@ne @@ -11842,8 +11562,8 @@ {\appto\blx@tempc{ inits="1"}} {\appto\blx@tempc{ inits="0"}}} -% [options]{<templatename>}{<template>} -\newrobustcmd*{\DeclareSortingTemplate}[3][]{% +% {<name>}{<spec>} +\newrobustcmd*{\DeclareSortingScheme}[3][]{% \ifblank{#1} {} {\setkeys{blx@sortdef@sorting}{#1}% @@ -11864,10 +11584,10 @@ \blx@tempcnta\z@ \let\blx@tempa\@empty #3% - \global\cslet{blx@sortingtemplate@#2}\blx@tempa + \global\cslet{blx@sorting@#2}\blx@tempa \endgroup} -\@onlypreamble\DeclareSortingTemplate -\blx@collectopts{xml}{blx@globalopts}{sortingtemplate}% for passing to the .bcf +\@onlypreamble\DeclareSortingScheme +\blx@collectopts{xml}{blx@globalopts}{sortscheme}% for passing to the .bcf \define@key{blx@sortdef@sorting}{locale}{% locale name \def\blx@templ{#1}} @@ -11936,6 +11656,7 @@ \blx@xml@sortitem{order="\the\blx@tempcntb"}{\blx@tempe}}} % [<type,type,...>]{<string>} + \newrobustcmd*{\DeclarePresort}[2][]{% \begingroup \blx@xmlsanitizeafter{\def\blx@tempa}{#2}% @@ -11993,29 +11714,6 @@ \def\blx@sortinclude@i#1{% \appto\blx@tempa{\blx@xml@include{#1}}} -% {<field,field,...>} -\newrobustcmd*{\DeclareExtradate}[1]{% - \begingroup - \let\blx@tempa\@empty - \let\scope\blx@extradate@scope - #1% - \global\let\blx@bcf@extradatespec\blx@tempa - \endgroup} -\@onlypreamble\DeclareExtradate -\blx@collectopts{xml}{blx@globalopts}{extradatespec}% for passing to the .bcf - -\newrobustcmd*{\blx@extradate@scope}[1]{% - \let\blx@tempb\@empty - \let\field\blx@ordereded@field - #1% - \csxappto{blx@tempa}{% - \noexpand\blx@xml@extradatescope{\blx@tempb}}} - -\newcommand*{\blx@ordereded@field}[1]{% - \advance\blx@tempcnta\@ne - \csxappto{blx@tempb}{% - \noexpand\blx@xml@edordered{\the\blx@tempcnta}{#1}}} - % [<type,type,...>]{<field,field,...>} \newrobustcmd*{\DeclareLabelname}[2][]{% \begingroup @@ -12049,6 +11747,10 @@ \blx@collectopts{xml}{blx@globalopts}{labeltitlespec}% for passing to the .bcf \blx@collectopts{xml}{blx@typeopts}{labeltitlespec}% for passing to the .bcf +\newrobustcmd*{\DeclareLabelyear}[2][]{% + \blx@warning@noline{% + 'DeclareLabelyear' is deprecated, please use 'DeclareLabeldate'}} + \newrobustcmd*{\DeclareLabeldate}[2][]{% \begingroup \let\blx@tempa\@empty @@ -12212,29 +11914,21 @@ \settoggle{blx@safeinputenc}{#1}} \newtoggle{blx@safeinputenc} -% global "sorting" option becomes "sortingtemplatename" in the .bcf and so -% don't use \DeclareBibliographyOption. This is a legacy naming issue -% unlikely to be corrected as "sorting" is an obvious name for biblatex users -% "sorting" is used in the .bcf for the actual sorting template definitions and is -% an XML format option -\define@key{blx@opt@pre}{sorting}{% +\DeclareBibliographyOption[string]{sorting}{% \def\blx@sorting{#1}% - \def\blx@refcontext@sortingtemplatename{#1}} -\blx@collectopts{string}{blx@globalopts}{sortingtemplatename}% for passing to the .bcf + \def\blx@refcontext@sorting{#1}} \AtEndPreamble{% - \ifcsdef{blx@sortingtemplate@\blx@sorting} + \ifcsdef{blx@sorting@\blx@sorting} {} {\blx@err@invopt{sorting=\blx@sorting}{}% \def\blx@sorting{nty}% - \def\blx@refcontext@sortingtemplatename{nty}}% - \listxadd\blx@sortingtemplatenames\blx@sorting - \def\blx@refcontext@sortingnamekeytemplatename{global}% - \let\blx@refcontext@labelprefix\@empty - \def\blx@refcontext@uniquenametemplatename{global}% - \def\blx@refcontext@labelalphanametemplatename{global}% - \xdef\blx@refcontext@context{\blx@refcontext@sortingtemplatename/\blx@refcontext@sortingnamekeytemplatename/\blx@refcontext@labelprefix/\blx@refcontext@uniquenametemplatename/\blx@refcontext@labelalphanametemplatename}% - \listxadd\blx@refcontexts\blx@refcontext@context} + \def\blx@refcontext@sorting{nty}}% + \listxadd\blx@sortschemes\blx@sorting + \def\blx@refcontext@sortingnamekey{global}% + \let\blx@refcontext@labelprefix\@empty + \xdef\blx@refcontext@context{\blx@refcontext@sorting/\blx@refcontext@sortingnamekey/\blx@refcontext@labelprefix}% + \listxadd\blx@refcontexts\blx@refcontext@context} \DeclareBibliographyOption[boolean]{sortcase}[true]{% \settoggle{blx@sortcase}{#1}} @@ -12242,6 +11936,10 @@ \DeclareBibliographyOption[boolean]{sortupper}[true]{% \settoggle{blx@sortupper}{#1}} +\DeclareBibliographyOption[string]{sortlos}{% + \blx@warning@noline{% + sortlos option is deprecated, use 'sorting' option to \string\printbiblist}} + \DeclareBibliographyOption[integer]{maxnames}{% \numdef\blx@maxcitenames{#1}% \numdef\blx@maxbibnames{#1}} @@ -12384,6 +12082,22 @@ #3=#4} {}} +% Legacy for giveninits +\DeclareBibliographyOption[boolean]{firstinits}[true]{% + \blx@warning@noline{% + 'firstinits' option is deprecated, use 'giveninits' instead}% + \settoggle{abx@bool@giveninits}{#1}} + +% Legacy for sortfirstinits/sortgiveninits +\DeclareBibliographyOption[boolean]{sortfirstinits}[true]{% + \blx@warning@noline{% + 'sortfirstinits' option is deprecated, use 'inits' option\MessageBreak + to \string\namepart\space in \string\DeclareSortingNamekeyScheme}} +\DeclareBibliographyOption[boolean]{sortgiveninits}{% + \blx@warning@noline{% + 'sortgiveninits' option is deprecated, use 'inits' option\MessageBreak + to \string\namepart\space in \string\DeclareSortingNamekeyScheme}} + \DeclareBibliographyOption[boolean]{terseinits}[true]{% \ifstrequal{#1}{true} {\toggletrue{blx@terseinits} @@ -12445,6 +12159,11 @@ \DeclareBibliographyOption[boolean]{clearlang}[true]{% \settoggle{blx@clearlang}{#1}} +\DeclareBibliographyOption[string]{babel}{% + \blx@warning@noline{% + 'babel' option is deprecated, use 'autolang' instead}% + \blx@autolang@i{#1}} + \DeclareBibliographyOption[string]{autolang}{% \blx@autolang@i{#1}} @@ -12507,9 +12226,6 @@ {\let\blx@thecitesort\blx@citenosort \let\blx@thenotecheck\relax}} -\DeclareBibliographyOption[boolean]{sortsets}[true]{% - \settoggle{blx@sortsets}{#1}} - \DeclareBibliographyOption[boolean]{hyperref}[true]{% \ifcsdef{blx@opt@hyperref@#1} {\letcs\blx@hyperref{blx@opt@hyperref@#1}} @@ -12517,35 +12233,6 @@ \def\blx@opt@hyperref@false{0} \def\blx@opt@hyperref@true{1} \def\blx@opt@hyperref@auto{2} -\def\blx@opt@hyperref@manual{3} - -\def\blx@warn@usedmanualhyperrefs#1{% - \blx@warning@noline{The command '\string#1' can\MessageBreak - only be used with 'hyperref=manual'}} -\def\blx@warn@multiplemanualhyperrefs{% - \blx@warning@noline{You must call either '\string\BiblatexManualHyperrefOn'\MessageBreak - or '\string\BiblatexManualHyperrefOff' exactly once.\MessageBreak - Subsequent calls to either command will be ignored}} -\def\BiblatexManualHyperrefOn{% - \ifnum\blx@hyperref=\thr@@ - \blx@mkhyperref - \global\undef\blx@mkhyperref - \global\undef\blx@mknohyperref - \global\let\BiblatexManualHyperrefOn\blx@warn@multiplemanualhyperrefs - \global\let\BiblatexManualHyperrefOff\blx@warn@multiplemanualhyperrefs - \else - \blx@warn@usedmanualhyperrefs{\BiblatexManualHyperrefOn}% - \fi} -\def\BiblatexManualHyperrefOff{% - \ifnum\blx@hyperref=\thr@@ - \blx@mknohyperref - \global\undef\blx@mkhyperref - \global\undef\blx@mknohyperref - \global\let\BiblatexManualHyperrefOn\blx@warn@multiplemanualhyperrefs - \global\let\BiblatexManualHyperrefOff\blx@warn@multiplemanualhyperrefs - \else - \blx@warn@usedmanualhyperrefs{\BiblatexManualHyperrefOff}% - \fi} \DeclareBibliographyOption[boolean]{backref}[true]{% \ifstrequal{#1}{true} @@ -12839,7 +12526,7 @@ test {\ifstrequal{#1}{false}}} {\blx@warning@noline{% 'labeldate' option used to determine whether to provide label date fields and\MessageBreak - extradate field is renamed to 'labeldateparts', setting this instead. This option is + extrayear field is renamed to 'labeldateparts', setting this instead. This option is now used to set the format of the labeldate}% \settoggle{blx@labeldateparts}{#1}} {\ifstrequal{#1}{iso8601} @@ -12864,6 +12551,11 @@ \protected\def\blx@imc@printlabeldateextra{\csuse{mkbibrange#1extra}{label}}} {\blx@err@invopt{labeldate=#1}{}}}}} +\DeclareBibliographyOption[string]{datelabel}{% + \blx@warning@noline{% + 'datelabel' option is deprecated, use 'labeldate' instead}% + \setkeys{blx@opt@pre}{labeldate=#1}} + \DeclareBibliographyOption[string]{labeltime}{% \ifcsdef{mktimerange#1} {\def\blx@timeformat@labeltime{#1}% @@ -13079,6 +12771,15 @@ \DeclareTypeOption[boolean]{labeldateparts}[true]{% \settoggle{blx@labeldateparts}{#1}} +\DeclareBibliographyOption[boolean]{labelyear}[true]{% + \blx@warning@noline{% + 'labelyear' option is deprecated, use 'labeldateparts' instead}% + \settoggle{blx@labeldateparts}{#1}} +\DeclareTypeOption[boolean]{labelyear}[true]{% + \blx@warning@noline{% + 'labelyear' option is deprecated, use 'labeldateparts' instead}% + \settoggle{blx@labeldateparts}{#1}} + \DeclareBibliographyOption[boolean]{uniquelist}[true]{% \ifcsdef{blx@opt@uniquelist@#1} {\letcs\blx@uniquelist{blx@opt@uniquelist@#1}} @@ -13252,6 +12953,15 @@ \DeclareEntryOption[boolean]{skipbib}[true]{% \settoggle{blx@skipbib}{#1}} +\DeclareTypeOption[boolean]{skiplos}{% + \blx@warning@noline{% + skiplos option is deprecated, use 'skipbiblist' instead}% + \settoggle{blx@skipbiblist}{#1}} +\DeclareEntryOption[boolean]{skiplos}{% + \blx@warning@noline{% + skiplos option is deprecated, use 'skipbiblist' instead}% + \settoggle{blx@skipbiblist}{#1}} + \DeclareTypeOption[boolean]{skipbiblist}[true]{% \settoggle{blx@skipbiblist}{#1}} \DeclareEntryOption[boolean]{skipbiblist}[true]{% @@ -13482,6 +13192,7 @@ % Deferred last minute setup \AtBeginDocument{% + \blx@auxwrite\@mainaux{}{\string\abx@aux@sortscheme{\blx@sorting}}% \blx@auxwrite\@mainaux{}{\string\abx@aux@refcontext{\blx@refcontext@context}} \blx@checkencoding \if@filesw diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def b/Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def index 13fcee24063..a96aa733775 100644 --- a/Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def +++ b/Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def @@ -199,7 +199,7 @@ \protected\def\blx@bibreq#1{% \blx@auxwrite\blx@aux{}{\string\citation{#1}}} -% bibtex doesn't parse ISO8601 dates so these overrides do nothing +% bibtex doesn't parse EDTF dates so these overrides do nothing \appto\blx@blxinit{% \def\iflabeldateera#1{\@secondoftwo}% \def\iflabelenddateera#1{\@secondoftwo}% @@ -356,26 +356,6 @@ {}} {}} -\def\blx@citation@set#1#2{% - \blx@citation@entry{#1}{#2}% - \begingroup - \def\do##1{\blx@citation@entry{##1}\blx@msg@cundef}% - \expandafter\expandafter\expandafter\docsvlist - \expandafter\expandafter\expandafter{% - \csname blx@setp@\the\c@refsection @#1\endcsname}% - \endgroup} - -\def\blx@citation@inset#1#2{% - \blx@citation@entry{#1}{#2}% - \expandafter\expandafter\expandafter\blx@citation@inset@i - \expandafter\expandafter\expandafter{% - \csname blx@setc@\the\c@refsection @#1\endcsname}\blx@msg@cundef} - -\def\blx@citation@inset@i#1{% - \ifcsdef{blx@setp@\the\c@refsection @#1} - {\blx@citation@set{#1}} - {\blx@citation@entry{#1}}} - \def\blx@citation@xref#1{% \begingroup \edef\blx@tempa{blx@refp@\the\c@refsection @% @@ -443,7 +423,6 @@ % Disable some interfaces \renewrobustcmd*{\DeclareSortingScheme}[3][]{} -\renewrobustcmd*{\DeclareExtradate}[1]{} \def\blx@checkencoding{} diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-compat.def b/Master/texmf-dist/tex/latex/biblatex/blx-compat.def index 54fb9d14d31..dfead5ff694 100644 --- a/Master/texmf-dist/tex/latex/biblatex/blx-compat.def +++ b/Master/texmf-dist/tex/latex/biblatex/blx-compat.def @@ -50,43 +50,19 @@ {}% \DeclareOption{bibtotoc}{% \let\ifkomabibtotoc=\@firstoftwo - \let\ifkomabibtotocnumbered=\@secondoftwo}% + \let\ifkomabibtotocnumbered=\@secondoftwo} \DeclareOption{bibtotocnumbered}{% \let\ifkomabibtotoc=\@firstoftwo \let\ifkomabibtotocnumbered=\@firstoftwo}% - \DeclareOption{bibliography=notoc}{% - \let\ifkomabibtotoc=\@secondoftwo - \let\ifkomabibtotocnumbered=\@secondoftwo}% - \DeclareOption{bibliography=nottotoc}{% - \let\ifkomabibtotoc=\@secondoftwo - \let\ifkomabibtotocnumbered=\@secondoftwo}% - \DeclareOption{bibliography=plainheading}{% - \let\ifkomabibtotoc=\@secondoftwo - \let\ifkomabibtotocnumbered=\@secondoftwo}% \DeclareOption{bibliography=totoc}{% \let\ifkomabibtotoc=\@firstoftwo - \let\ifkomabibtotocnumbered=\@secondoftwo}% - \DeclareOption{bibliography=toc}{% - \let\ifkomabibtotoc=\@firstoftwo - \let\ifkomabibtotocnumbered=\@secondoftwo}% - \DeclareOption{bibliography=notnumbered}{% - \let\ifkomabibtotoc=\@firstoftwo - \let\ifkomabibtotocnumbered=\@secondoftwo}% - \DeclareOption{bibliography=numbered}{% - \let\ifkomabibtotoc=\@firstoftwo - \let\ifkomabibtotocnumbered=\@firstoftwo}% + \let\ifkomabibtotocnumbered=\@secondoftwo} + \DeclareOption{bibliography=nottotoc}{% + \let\ifkomabibtotoc=\@secondoftwo + \let\ifkomabibtotocnumbered=\@secondoftwo} \DeclareOption{bibliography=totocnumbered}{% \let\ifkomabibtotoc=\@firstoftwo \let\ifkomabibtotocnumbered=\@firstoftwo}% - \DeclareOption{bibliography=tocnumbered}{% - \let\ifkomabibtotoc=\@firstoftwo - \let\ifkomabibtotocnumbered=\@firstoftwo}% - \DeclareOption{bibliography=numberedtotoc}{% - \let\ifkomabibtotoc=\@firstoftwo - \let\ifkomabibtotocnumbered=\@firstoftwo}% - \DeclareOption{bibliography=numberedtoc}{% - \let\ifkomabibtotoc=\@firstoftwo - \let\ifkomabibtotocnumbered=\@firstoftwo}% \DeclareOption{bibliography=oldstyle}{% \ExecuteBibliographyOptions{block=space}}% \DeclareOption{bibliography=openstyle}{% @@ -143,192 +119,4 @@ \define@key{blx@bbg}{minitems}{\blx@warn@depropt{minitems}} \define@key{blx@bbc}{minitems}{\blx@warn@depropt{minitems}} -% Legacy alias for \printshorthands -\def\printshorthands{% - \@ifnextchar[%] - {\blx@printshorthands} - {\blx@printshorthands[]}} - -\def\blx@printshorthands[#1]{\printbiblist[#1]{shorthand}} - -% Legacy aliases -\def\AtBeginShorthands{\AtBeginBiblist{shorthand}} -\def\AtEveryLositem{\AtEveryBiblistitem{shorthand}} -\@onlypreamble\AtBeginShorthands -\@onlypreamble\AtEveryLositem - -\let\frangelen\rangelen % Legacy name for \rangelen - -\DeclareBibliographyOption[string]{sortlos}{% - \blx@warning@noline{% - 'sortlos' option is deprecated.\MessageBreak - Please use 'sorting' option to '\string\printbiblist'}} - -\define@key{blx@bib1}{sorting}{% - \blx@warning@noline{% - 'sorting' option to '\string\printbibliography' is no longer supported.\MessageBreak - Please use 'sorting' option to '\string\newrefcontext'}} - -\define@key{blx@biblist1}{sorting}{% - \blx@warning@noline{% - 'sorting' option to '\string\printbiblist' is no longer supported.\MessageBreak - Please use 'sorting' option to '\string\newrefcontext'}} - -\define@key{blx@bib2}{prefixnumbers}{% - \blx@warning@noline{% - 'prefixnumbers' option to '\string\printbibliography' is no longer supported.\MessageBreak - Please use 'labelprefix' option to '\string\newrefcontext'}} - - -\DeclareBibliographyOption[string]{babel}{% - \blx@warning@noline{% - 'babel' option is deprecated.\MessageBreak - Please use 'autolang' instead}% - \blx@autolang@i{#1}} - -\DeclareTypeOption[boolean]{skiplos}{% - \blx@warning@noline{% - skiplos option is deprecated.\MessageBreak - Please use 'skipbiblist' instead}% - \settoggle{blx@skipbiblist}{#1}} -\DeclareEntryOption[boolean]{skiplos}{% - \blx@warning@noline{% - skiplos option is deprecated.\MessageBreak - Please use 'skipbiblist' instead}% - \settoggle{blx@skipbiblist}{#1}} - -% Legacy options moved to \namepart in \DeclareLabelalphaNameTemplate -\define@key{blx@latem@field}{compound}{% deprecated - \blx@warning@noline{% - Ignored 'compound' option to '\string\field' in '\string\DeclareLabelalphaNameTemplate'\MessageBreak - This is now the 'compound' option of '\string\namepart\space' in\MessageBreak - '\string\DeclareLabelalphaNameTemplate'}} -\define@key{blx@latem@field}{pcompound}{% deprecated - \blx@warning@noline{% - Ignored 'pcompound' option to '\string\field' in '\string\DeclareLabelalphaNameTemplate'\MessageBreak - This is now the 'compound' option of '\string\namepart' in\MessageBreak - '\string\DeclareLabelalphaNameTemplate'}} -\define@key{blx@latem@field}{pstrwidth}{% deprecated - \blx@warning@noline{% - Ignored 'pstrwidth' option to '\string\field' in '\string\DeclareLabelalphaNameTemplate'\MessageBreak - This is now the 'strwidth' option of '\string\namepart' in\MessageBreak - '\string\DeclareLabelalphaNameTemplate'}} - -%LEGACY(<3.3) legacy name for \ifgiveninits which is autogenerated now -\def\iffirstinits{ - \blx@warning@noline{% - '\string\iffirstinits' is deprecated.\MessageBreak - Please use '\string\ifgiveninits'}% - \iftoggle{abx@bool@giveninits}} - -% Legacy for giveninits -\DeclareBibliographyOption[boolean]{firstinits}[true]{% - \blx@warning@noline{% - 'firstinits' option is deprecated.\MessageBreak - Please use 'giveninits' instead}% - \settoggle{abx@bool@giveninits}{#1}} - -% Legacy for sortfirstinits/sortgiveninits -\DeclareBibliographyOption[boolean]{sortfirstinits}[true]{% - \blx@warning@noline{% - 'sortfirstinits' option is deprecated.\MessageBreak - Please use 'inits' option to '\string\namepart\space'\MessageBreak - in '\string\DeclareSortingNamekeyTemplate'}} -\DeclareBibliographyOption[boolean]{sortgiveninits}{% - \blx@warning@noline{% - 'sortgiveninits' option is deprecated.\MessageBreak - Please use 'inits' option to '\string\namepart'\MessageBreak - in '\string\DeclareSortingNamekeyTemplate' instead}} - -\define@key{blx@refcontext}{prefixnumbers}{%LEGACY(<3.3) - \blx@warning@noline{% - prefixnumbers option to '\string\newrefcontext' has been renamed.\MessageBreak - Please use 'labelprefix' option instead}% - \setkeys{blx@refcontext}{labelprefix=#1}} - -% biblatex < 3.4 -\define@key{blx@bib1}{prefixnumbers}{}%LEGACY(<3.4) legacy name for labelprefix -\DeprecateFieldWithReplacement{prefixnumber}{labelprefix} -\DeclareFieldAlias{prefixnumber}{labelprefix} - -% biblatex < 3.5 -\DeclareBibliographyOption[string]{datelabel}{% - \blx@warning@noline{% - 'datelabel' option is deprecated.\MessageBreak - Please use 'labeldate' instead}% - \setkeys{blx@opt@pre}{labeldate=#1}} - -\DeclareBibliographyOption[boolean]{labelyear}[true]{% - \blx@warning@noline{% - 'labelyear' option is deprecated.\MessageBreak - Please use 'labeldateparts' instead}% - \settoggle{blx@labeldateparts}{#1}} -\DeclareTypeOption[boolean]{labelyear}[true]{% - \blx@warning@noline{% - 'labelyear' option is deprecated.\MessageBreak - Please use 'labeldateparts' instead}% - \settoggle{blx@labeldateparts}{#1}} - -\protected\def\mkdatezeros{% - \blx@warning@noline{% - '\string\mkdatezeros' is deprecated.\MessageBreak - Please use '\string\mkyearzeros', '\string\mkmonthzeros' or\MessageBreak - '\string\mkdayzeros' as appropriate. \MessageBreak - Falling back to '\string\mkmonthzeros'}% - \mkmonthzeros} - -\protected\def\printdatelabel{% - \blx@warning@noline{% - '\string\printdatelabel' is deprecated.\MessageBreak - Please use '\string\printlabeldate'}% - \blx@imc@printlabeldate} - -\protected\def\printdatelabelextra{% - \blx@warning@noline{% - '\string\printdatelabelextra' is deprecated.\MessageBreak - Please use '\string\printlabeldateextra'}% - \blx@imc@printlabeldateextra} - -\newrobustcmd*{\DeclareLabelyear}[2][]{% - \blx@warning@noline{% - 'DeclareLabelyear' is deprecated.\MessageBreak - Please use 'DeclareLabeldate'}} - -\cslet{mkdaterangeiso8601}\mkdaterangeedtf% Legacy option support -\cslet{mkdaterangeiso8601extra}\mkdaterangeedtfextra% Legacy option support - -\newrobustcmd*{\bibdatedash}{\bibrangedash}%LEGACY(<3.5) - -% biblatex < 3.8 -\define@key{blx@refcontext}{sortingnamekeyscheme}{% - \blx@warning@noline{'sortingnamekeyscheme' is deprecated.\MessageBreak - Please use 'sortingnamekeytemplatename' instead}% - \gdef\blx@refcontext@sortingnamekeytemplatename{#1}} - -\define@key{blx@assignrefcontext}{sortingnamekeyscheme}{% - \blx@warning@noline{'sortingnamekeyscheme' is deprecated.\MessageBreak - Please use 'sortingnamekeytemplatename' instead}% - \def\blx@tempb{#1}} - -\def\DeclareSortingScheme{% - \blx@warning@noline{% - '\string\DeclareSortingScheme' is deprecated.\MessageBreak - Please use '\string\DeclareSortingTemplate'}% - \DeclareSortingTemplate} - -\def\DeclareSortingNamekeyScheme{% - \blx@warning@noline{% - '\string\DeclareSortingNamekeyScheme' is deprecated.\MessageBreak - Please use '\string\DeclareSortingNamekeyTemplate'}% - \DeclareSortingNamekeyTemplate} - -\def\ifsortnamekeyscheme#1{% - \blx@warning@noline{% - '\string\ifsortnamekeyscheme' is deprecated in sorting specifications.\MessageBreak - Please use '\string\ifsortingnamekeytemplate'}% - \expandafter\ifstrequal\expandafter{\blx@refcontext@sortingnamekeytemplatename}{#1}} - -\DeprecateFieldWithReplacement{extrayear}{extradate} -\DeclareFieldAlias{extrayear}{extradate} - \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def index 959dbd398dc..7677cb148d6 100644 --- a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def +++ b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def @@ -82,7 +82,7 @@ \global\let\blx@bcf@datamodel@entryfields\@empty} \newrobustcmd*{\ResetDatamodelConstraints}{% - \global\let\blx@bcf@datamodel@constraints\@empty} + \global\letblx@bcf@datamodel@constraints\@empty} \newrobustcmd*{\DeclareDatamodelEntrytypes}[2][]{% \begingroup @@ -435,7 +435,6 @@ standard, suppbook, suppcollection, - suppperiodical, thesis, unpublished, video} @@ -512,8 +511,9 @@ shortseries, shorttitle} +\DeclareDatamodelFields[type=field, datatype=integer, skipout]{sortyear} + \DeclareDatamodelFields[type=field, datatype=literal, skipout]{ - sortyear, sorttitle, sortshorthand, sortkey, @@ -567,11 +567,12 @@ nameatype, namebtype, namectype, + origlanguage, pagination, pubstate, type} -\DeclareDatamodelFields[type=list, datatype=key]{language,origlanguage} +\DeclareDatamodelFields[type=list, datatype=key]{language} \DeclareDatamodelFields[type=field, datatype=entrykey]{ crossref, @@ -609,21 +610,11 @@ authortype, bookpagination, crossref, - day, - endday, - endhour, - endminute, - endmonth, - endseason, - endsecond, - endtimezone, - endyear, entryset, entrysubtype, execute, file, gender, - hour, ids, indextitle, indexsorttitle, @@ -641,25 +632,13 @@ listd, liste, listf, - minute, - month, nameaddon, options, origday, origendday, - origendhour, - origendminute, origendmonth, - origendseason, - origendsecond, - origendtimezone, origendyear, - orighour, - origminute, origmonth, - origseason, - origsecond, - origtimezone, origyear, origlocation, origpublisher, @@ -670,8 +649,6 @@ relatedoptions, relatedstring, relatedtype, - season, - second, shortauthor, shorteditor, shorthand, @@ -684,22 +661,6 @@ sortshorthand, sorttitle, sortyear, - timezone, - url, - urlday, - urlendday, - urlendhour, - urlendminute, - urlendmonth, - urlendsecond, - urlendtimezone, - urlendyear, - urlhour, - urlminute, - urlmonth, - urlsecond, - urltimezone, - urlyear, usera, userb, userc, @@ -710,17 +671,24 @@ verbb, verbc, xdata, - xref, - year} + xref} \DeclareDatamodelEntryfields[set]{ entryset, crossref} \DeclareDatamodelEntryfields[article]{ + author, + journaltitle, + title, + day, + endday, + endmonth, + endyear, + month, + year, addendum, annotator, - author, commentator, doi, editor, @@ -740,7 +708,6 @@ issuetitle, issuesubtitle, journalsubtitle, - journaltitle, language, note, number, @@ -749,9 +716,15 @@ pubstate, series, subtitle, - title, titleaddon, translator, + url, + urlday, + urlendday, + urlendmonth, + urlendyear, + urlmonth, + urlyear, version, volume} @@ -759,6 +732,13 @@ \DeclareDatamodelEntryfields[book]{ author, + title, + day, + endday, + endmonth, + endyear, + month, + year, addendum, afterword, annotator, @@ -795,17 +775,30 @@ pubstate, series, subtitle, - title, titleaddon, translator, + url, + urlday, + urlendday, + urlendmonth, + urlendyear, + urlmonth, + urlyear, volume, volumes} \DeclareDatamodelEntryfields[mvbook]{ + author, + title, + day, + endday, + endmonth, + endyear, + month, + year, addendum, afterword, annotator, - author, commentator, doi, edition, @@ -833,18 +826,31 @@ pubstate, series, subtitle, - title, titleaddon, translator, + url, + urlday, + urlendday, + urlendmonth, + urlendyear, + urlmonth, + urlyear, volume, volumes} \DeclareDatamodelEntryfields[inbook,bookinbook,suppbook]{ + author, + title, + booktitle, + day, + endday, + endmonth, + endyear, + month, + year, addendum, afterword, annotator, - author, - booktitle, bookauthor, booksubtitle, booktitleaddon, @@ -880,19 +886,32 @@ pubstate, series, subtitle, - title, titleaddon, translator, + url, + urlday, + urlendday, + urlendmonth, + urlendyear, + urlmonth, + urlyear, volume, volumes} \DeclareDatamodelEntryfields[booklet]{ - addendum, author, - chapter, - doi, editor, editortype, + title, + day, + endday, + endmonth, + endyear, + month, + year, + addendum, + chapter, + doi, eprint, eprintclass, eprinttype, @@ -904,11 +923,25 @@ pagetotal, pubstate, subtitle, - title, titleaddon, - type} + type, + url, + urlday, + urlendday, + urlendmonth, + urlendyear, + urlmonth, + urlyear} \DeclareDatamodelEntryfields[collection,reference]{ + editor, + title, + day, + endday, + endmonth, + endyear, + month, + year, addendum, afterword, annotator, @@ -916,7 +949,6 @@ commentator, doi, edition, - editor, editora, editorb, editorc, @@ -945,17 +977,30 @@ pubstate, series, subtitle, - title, titleaddon, translator, + url, + urlday, + urlendday, + urlendmonth, + urlendyear, + urlmonth, + urlyear, volume, volumes} \DeclareDatamodelEntryfields[mvcollection,mvreference]{ + author, + title, + day, + endday, + endmonth, + endyear, + month, + year, addendum, afterword, annotator, - author, commentator, doi, edition, @@ -981,25 +1026,38 @@ publisher, pubstate, subtitle, - title, titleaddon, translator, + url, + urlday, + urlendday, + urlendmonth, + urlendyear, + urlmonth, + urlyear, volume, volumes} \DeclareDatamodelEntryfields[incollection,suppcollection,inreference]{ + author, + editor, + title, + booktitle, + day, + endday, + endmonth, + endyear, + month, + year, addendum, afterword, annotator, - author, booksubtitle, - booktitle, booktitleaddon, chapter, commentator, doi, edition, - editor, editora, editorb, editorc, @@ -1027,13 +1085,26 @@ pubstate, series, subtitle, - title, titleaddon, translator, + url, + urlday, + urlendday, + urlendmonth, + urlendyear, + urlmonth, + urlyear, volume, volumes} \DeclareDatamodelEntryfields[manual]{ + title, + day, + endday, + endmonth, + endyear, + month, + year, addendum, author, chapter, @@ -1056,12 +1127,29 @@ pubstate, series, subtitle, - title, titleaddon, type, + url, + urlday, + urlendday, + urlendmonth, + urlendyear, + urlmonth, + urlyear, version} \DeclareDatamodelEntryfields[misc]{ + title, + day, + endday, + endmonth, + endyear, + day, + endday, + endmonth, + endyear, + month, + year, addendum, author, doi, @@ -1077,28 +1165,59 @@ organization, pubstate, subtitle, - title, titleaddon, type, + url, + urlday, + urlendday, + urlendmonth, + urlendyear, + urlmonth, + urlyear, version} \DeclareDatamodelEntryfields[online]{ + title, + url, addendum, author, editor, editortype, language, + month, note, organization, pubstate, subtitle, - title, titleaddon, - version} + urlhour, + urlminute, + urlsecond, + urltimezone, + urlendhour, + urlendminute, + urlendsecond, + urlendtimezone, + urlday, + urlendday, + urlendmonth, + urlendyear, + urlmonth, + urlyear, + version, + year} \DeclareDatamodelEntryfields[patent]{ - addendum, author, + title, + number, + day, + endday, + endmonth, + endyear, + month, + year, + addendum, doi, eprint, eprintclass, @@ -1106,18 +1225,30 @@ holder, location, note, - number, pubstate, subtitle, - title, titleaddon, type, + url, + urlday, + urlendday, + urlendmonth, + urlendyear, + urlmonth, + urlyear, version} \DeclareDatamodelEntryfields[periodical]{ + editor, + title, + day, + endday, + endmonth, + endyear, + month, + year, addendum, doi, - editor, editora, editorb, editorc, @@ -1136,17 +1267,29 @@ note, number, pubstate, - season, series, subtitle, - title, + url, + urlday, + urlendday, + urlendmonth, + urlendyear, + urlmonth, + urlyear, volume} \DeclareDatamodelEntryfields[mvproceedings]{ - addendum, - doi, editor, editortype, + title, + day, + endday, + endmonth, + endyear, + month, + year, + addendum, + doi, eprint, eprintclass, eprinttype, @@ -1169,17 +1312,30 @@ pubstate, series, subtitle, - title, titleaddon, + url, + urlday, + urlendday, + urlendmonth, + urlendyear, + urlmonth, + urlyear, venue, volumes} \DeclareDatamodelEntryfields[proceedings]{ + editor, + editortype, + title, + day, + endday, + endmonth, + endyear, + month, + year, addendum, chapter, doi, - editor, - editortype, eprint, eprintclass, eprinttype, @@ -1207,22 +1363,35 @@ pubstate, series, subtitle, - title, titleaddon, + url, + urlday, + urlendday, + urlendmonth, + urlendyear, + urlmonth, + urlyear, venue, volume, volumes} \DeclareDatamodelEntryfields[inproceedings]{ - addendum, author, - booksubtitle, + editor, + editortype, + title, booktitle, + day, + endday, + endmonth, + endyear, + month, + year, + addendum, + booksubtitle, booktitleaddon, chapter, doi, - editor, - editortype, eprint, eprintclass, eprinttype, @@ -1249,21 +1418,35 @@ pubstate, series, subtitle, - title, titleaddon, + url, + urlday, + urlendday, + urlendmonth, + urlendyear, + urlmonth, + urlyear, venue, volume, volumes} \DeclareDatamodelEntryfields[report]{ - addendum, author, + title, + type, + institution, + day, + endday, + endmonth, + endyear, + month, + year, + addendum, chapter, doi, eprint, eprintclass, eprinttype, - institution, isrn, language, location, @@ -1273,20 +1456,33 @@ pagetotal, pubstate, subtitle, - title, titleaddon, - type, + url, + urlday, + urlendday, + urlendmonth, + urlendyear, + urlmonth, + urlyear, version} \DeclareDatamodelEntryfields[thesis]{ - addendum, author, + title, + type, + institution, + day, + endday, + endmonth, + endyear, + month, + year, + addendum, chapter, doi, eprint, eprintclass, eprinttype, - institution, language, location, note, @@ -1294,21 +1490,39 @@ pagetotal, pubstate, subtitle, - title, titleaddon, - type} + url, + urlday, + urlendday, + urlendmonth, + urlendyear, + urlmonth, + urlyear} \DeclareDatamodelEntryfields[unpublished]{ - addendum, author, + title, + day, + endday, + endmonth, + endyear, + month, + year, + addendum, howpublished, language, location, note, pubstate, subtitle, - title, - titleaddon} + titleaddon, + url, + urlday, + urlendday, + urlendmonth, + urlendyear, + urlmonth, + urlyear} \DeclareDatamodelConstraints[ article, 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 efcc901a715..26625b06fb7 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx @@ -5,18 +5,11 @@ \renewcommand*{\iffinalcitedelim}{\iflastcitekey} -\providebool{bbx:subentry} - -\DeclareFieldFormat{entrysetcount}{\mkbibparens{\mknumalph{#1}}} - \newbibmacro*{cite}{% \printtext[bibhyperref]{% \printfield{labelprefix}% \printfield{labelalpha}% - \printfield{extraalpha}% - \ifbool{bbx:subentry} - {\printfield{entrysetcount}} - {}}} + \printfield{extraalpha}}} \newbibmacro*{textcite}{% \ifnameundef{labelname} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx index e6f4d7d4253..434986c6627 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx @@ -6,19 +6,13 @@ \renewcommand*{\iffinalcitedelim}{% \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}} -\providebool{bbx:subentry} \newbool{cbx:parens} -\DeclareFieldFormat{entrysetcount}{\mkbibparens{\mknumalph{#1}}} - \newbibmacro*{cite}{% \printtext[bibhyperref]{% \printfield{labelprefix}% \printfield{labelalpha}% - \printfield{extraalpha}% - \ifbool{bbx:subentry} - {\printfield{entrysetcount}} - {}}} + \printfield{extraalpha}}} \newbibmacro*{textcite}{% \iffieldequals{namehash}{\cbx@lasthash} @@ -37,7 +31,7 @@ \usebibmacro{cite}% \setunit{% \ifbool{cbx:parens} - {\bibclosebracket\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \textcitedelim}} @@ -53,11 +47,11 @@ {\setunit{}% \printtext{% \ifbool{cbx:parens} - {\bibclosebracket\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}}} {\setunit{% \ifbool{cbx:parens} - {\bibclosebracket\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \textcitedelim}}} 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 6d0daecea0a..1bf883a4196 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx @@ -25,8 +25,10 @@ \iffieldundef{shorthand} {\iffieldequals{namehash}{\cbx@lasthash} {\setunit{\compcitedelim}} - {\printnames{labelname}% - \setunit*{\printdelim{nametitledelim}}% + {\ifnameundef{labelname} + {} + {\printnames{labelname}% + \setunit{\printdelim{nametitledelim}}}% \savefield{namehash}{\cbx@lasthash}}% \usebibmacro{cite:title}} {\usebibmacro{cite:shorthand}% @@ -42,10 +44,12 @@ \newbibmacro*{textcite}{% \iffieldequals{namehash}{\cbx@lasthash} {\setunit{\compcitedelim}} - {\printnames{labelname}% - \setunit*{% - \global\booltrue{cbx:parens}% - \printdelim{nametitledelim}\bibopenparen}% + {\ifnameundef{labelname} + {} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nametitledelim}\bibopenparen}}% \stepcounter{textcitecount}% \savefield{namehash}{\cbx@lasthash}}% \ifnumequal{\value{citecount}}{1} 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 4c901a43b78..3b6618314b9 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx @@ -20,8 +20,10 @@ \iffieldundef{shorthand} {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} - {\printnames{labelname}% - \setunit*{\printdelim{nametitledelim}}% + {\ifnameundef{labelname} + {} + {\printnames{labelname}% + \setunit{\printdelim{nametitledelim}}}% \usebibmacro{cite:title}}}% {\usebibmacro{cite:shorthand}}} @@ -35,10 +37,12 @@ \newbibmacro*{textcite}{% \global\boolfalse{cbx:loccit}% - \printnames{labelname}% - \setunit*{% - \global\booltrue{cbx:parens}% - \printdelim{nametitledelim}\bibopenparen}% + \ifnameundef{labelname} + {} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nametitledelim}\bibopenparen}}% \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% 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 3ae9a578027..2c6190900cd 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx @@ -35,11 +35,13 @@ {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} {\iffieldequals{namehash}{\cbx@lasthash} - {\setunit{\compcitedelim}} - {\printnames{labelname}% - \setunit*{\printdelim{nametitledelim}}% + {\setunit{\compcitedelim}} + {\ifnameundef{labelname} + {} + {\printnames{labelname}% + \setunit{\printdelim{nametitledelim}}}% \savefield{namehash}{\cbx@lasthash}}% - \usebibmacro{cite:title}}}% + \usebibmacro{cite:title}}}% {\usebibmacro{cite:shorthand}% \usebibmacro{cite:reinit}}% \setunit{\multicitedelim}} @@ -55,10 +57,12 @@ \newbibmacro*{textcite}{% \iffieldequals{namehash}{\cbx@lasthash} {\setunit{\compcitedelim}} - {\printnames{labelname}% - \setunit*{% - \global\booltrue{cbx:parens}% - \printdelim{nametitledelim}\bibopenparen}% + {\ifnameundef{labelname} + {} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nametitledelim}\bibopenparen}}% \stepcounter{textcitecount}% \savefield{namehash}{\cbx@lasthash}}% \ifnumequal{\value{citecount}}{1} @@ -98,20 +102,20 @@ {} {\ifnameundef{labelname} {\setunit{% - \global\booltrue{cbx:parens}% - \extpostnotedelim\bibopenparen}} + \global\booltrue{cbx:parens}% + \extpostnotedelim\bibopenparen}} {\setunit{\postnotedelim}}% \printfield{postnote}}% \ifthenelse{\value{multicitecount}=\value{multicitetotal}} {\setunit{}% \printtext{% \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} - {}}} + {\bibcloseparen\global\boolfalse{cbx:parens}} + {}}} {\setunit{% \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} - {}% + {\bibcloseparen\global\boolfalse{cbx:parens}} + {}% \textcitedelim}}} \DeclareCiteCommand{\cite} 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 bd463aa5a28..85cce7eedcd 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx @@ -17,8 +17,8 @@ {\ifsingletitle {\printtext[bibhyperref]{\printnames{labelname}}} {\printnames{labelname}% - \setunit{\printdelim{nametitledelim}}% - \usebibmacro{cite:title}}}% + \setunit{\printdelim{nametitledelim}}% + \usebibmacro{cite:title}}}% \savefield{namehash}{\cbx@lasthash}}} {\usebibmacro{cite:shorthand}% \usebibmacro{cite:reinit}}% @@ -42,24 +42,24 @@ {\usebibmacro{cite:shorthand}}} {\ifnameundef{labelname} {\ifnumequal{\value{citecount}}{1} - {\usebibmacro{prenote}} - {}% + {\usebibmacro{prenote}} + {}% \iffieldundef{shorthand} - {\usebibmacro{cite:title}}% - {\usebibmacro{cite:shorthand}}} + {\usebibmacro{cite:title}}% + {\usebibmacro{cite:shorthand}}} {\ifthenelse{\ifsingletitle\AND \(\iffieldundef{prenote}\OR\value{citecount}>1\)} {\printtext[bibhyperref]{\printnames{labelname}}} {\printnames{labelname} \setunit{% - \global\booltrue{cbx:parens}% - \printdelim{nametitledelim}\bibopenparen}% - \ifnumequal{\value{citecount}}{1} - {\usebibmacro{prenote}} - {}% - \iffieldundef{shorthand} - {\usebibmacro{cite:title}}% - {\usebibmacro{cite:shorthand}}}}% + \global\booltrue{cbx:parens}% + \printdelim{nametitledelim}\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \iffieldundef{shorthand} + {\usebibmacro{cite:title}}% + {\usebibmacro{cite:shorthand}}}}% \stepcounter{textcitecount}% \savefield{namehash}{\cbx@lasthash}}% \setunit{% @@ -79,12 +79,12 @@ {\setunit{}% \printtext{% \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} - {}}} + {\bibcloseparen\global\boolfalse{cbx:parens}} + {}}} {\setunit{% \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} - {}% + {\bibcloseparen\global\boolfalse{cbx:parens}} + {}% \textcitedelim}}} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx index 1ffd3ba454d..d83c432fd56 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx @@ -11,8 +11,8 @@ {\ifsingletitle {\printtext[bibhyperref]{\printnames{labelname}}} {\printnames{labelname}% - \setunit{\printdelim{nametitledelim}}% - \usebibmacro{cite:title}}}}% + \setunit{\printdelim{nametitledelim}}% + \usebibmacro{cite:title}}}}% {\usebibmacro{cite:shorthand}}} \renewbibmacro*{textcite}{% @@ -27,14 +27,14 @@ \(\iffieldundef{prenote}\OR\value{citecount}>1\)} {\printtext[bibhyperref]{\printnames{labelname}}} {\printnames{labelname}% - \setunit{% - \global\booltrue{cbx:parens}% - \printdelim{nametitledelim}\bibopenparen}% - \ifnumequal{\value{citecount}}{1} - {\usebibmacro{prenote}} - {}% - \iffieldundef{shorthand} - {\usebibmacro{cite:title}}% - {\usebibmacro{cite:shorthand}}}}} + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nametitledelim}\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \iffieldundef{shorthand} + {\usebibmacro{cite:title}}% + {\usebibmacro{cite:shorthand}}}}} \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 1fe4075cf31..54f10d6baaf 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx @@ -12,15 +12,15 @@ {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} {\iffieldequals{namehash}{\cbx@lasthash} - {\setunit{\compcitedelim}% + {\setunit{\compcitedelim}% \usebibmacro{cite:title}} - {\ifnameundef{labelname} + {\ifnameundef{labelname} {\usebibmacro{cite:title}} {\ifsingletitle - {\printtext[bibhyperref]{\printnames{labelname}}} - {\printnames{labelname}% - \setunit{\printdelim{nametitledelim}}% - \usebibmacro{cite:title}}}% + {\printtext[bibhyperref]{\printnames{labelname}}} + {\printnames{labelname}% + \setunit{\printdelim{nametitledelim}}% + \usebibmacro{cite:title}}}% \savefield{namehash}{\cbx@lasthash}}}} {\usebibmacro{cite:shorthand}% \usebibmacro{cite:reinit}}% @@ -31,9 +31,9 @@ {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} {\iffieldequals{namehash}{\cbx@lasthash} - {\setunit{\compcitedelim}} - {\savefield{namehash}{\cbx@lasthash}}% - \usebibmacro{cite:title}}} + {\setunit{\compcitedelim}} + {\savefield{namehash}{\cbx@lasthash}}% + \usebibmacro{cite:title}}} {\usebibmacro{cite:shorthand}% \usebibmacro{cite:reinit}}% \setunit{\multicitedelim}} @@ -44,32 +44,32 @@ \iffieldundef{shorthand} {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} - {\usebibmacro{cite:title}}}% + {\usebibmacro{cite:title}}}% {\usebibmacro{cite:shorthand}}} {\ifnameundef{labelname} {\ifnumequal{\value{citecount}}{1} - {\usebibmacro{prenote}} - {}% + {\usebibmacro{prenote}} + {}% \iffieldundef{shorthand} - {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} + {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} - {\usebibmacro{cite:title}}}% - {\usebibmacro{cite:shorthand}}} + {\usebibmacro{cite:title}}}% + {\usebibmacro{cite:shorthand}}} {\ifthenelse{\ifsingletitle\AND \(\iffieldundef{prenote}\OR\value{citecount}>1\)} {\printtext[bibhyperref]{\printnames{labelname}}} {\printnames{labelname} \setunit{% - \global\booltrue{cbx:parens}% - \printdelim{nametitledelim}\bibopenparen}% - \ifnumequal{\value{citecount}}{1} - {\usebibmacro{prenote}} - {}% - \iffieldundef{shorthand} - {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} - {\usebibmacro{cite:ibid}} - {\usebibmacro{cite:title}}}% - {\usebibmacro{cite:shorthand}}}}% + \global\booltrue{cbx:parens}% + \printdelim{nametitledelim}\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \iffieldundef{shorthand} + {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} + {\usebibmacro{cite:ibid}} + {\usebibmacro{cite:title}}}% + {\usebibmacro{cite:shorthand}}}}% \stepcounter{textcitecount}% \savefield{namehash}{\cbx@lasthash}}% \setunit{% @@ -89,12 +89,12 @@ {\setunit{}% \printtext{% \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} - {}}} + {\bibcloseparen\global\boolfalse{cbx:parens}} + {}}} {\setunit{% \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} - {}% + {\bibcloseparen\global\boolfalse{cbx:parens}} + {}% \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 3b3ed80deb7..8d52c873f3a 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx @@ -9,8 +9,10 @@ \newbibmacro*{cite}{% \iffieldundef{shorthand} - {\printnames{labelname}% - \setunit*{\printdelim{nametitledelim}}% + {\ifnameundef{labelname} + {} + {\printnames{labelname}% + \setunit{\printdelim{nametitledelim}}}% \usebibmacro{cite:title}}% {\usebibmacro{cite:shorthand}}} @@ -20,10 +22,12 @@ {\usebibmacro{cite:shorthand}}} \newbibmacro*{textcite}{% - \printnames{labelname}% - \setunit*{% - \global\booltrue{cbx:parens}% - \printdelim{nametitledelim}\bibopenparen}% + \ifnameundef{labelname} + {} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nametitledelim}\bibopenparen}}% \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% 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 71e49ffbc9e..73f975bb976 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx @@ -28,19 +28,19 @@ {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}} {\usebibmacro{cite:label}% \setunit{\printdelim{nonameyeardelim}}% - \usebibmacro{cite:labeldate+extradate}% + \usebibmacro{cite:labelyear+extrayear}% \usebibmacro{cite:reinit}} {\iffieldequals{namehash}{\cbx@lasthash} {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)} {\setunit{\addcomma}% - \usebibmacro{cite:extradate}} + \usebibmacro{cite:extrayear}} {\setunit{\compcitedelim}% - \usebibmacro{cite:labeldate+extradate}% + \usebibmacro{cite:labelyear+extrayear}% \savefield{labelyear}{\cbx@lastyear}}} {\printnames{labelname}% \setunit{\printdelim{nameyeardelim}}% - \usebibmacro{cite:labeldate+extradate}% + \usebibmacro{cite:labelyear+extrayear}% \savefield{namehash}{\cbx@lasthash}% \savefield{labelyear}{\cbx@lastyear}}}} {\usebibmacro{cite:shorthand}% @@ -56,11 +56,11 @@ {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)} {\setunit{\addcomma}% - \usebibmacro{cite:extradate}} + \usebibmacro{cite:extrayear}} {\setunit{\compcitedelim}% - \usebibmacro{cite:labeldate+extradate}% + \usebibmacro{cite:labelyear+extrayear}% \savefield{labelyear}{\cbx@lastyear}}} - {\usebibmacro{cite:labeldate+extradate}% + {\usebibmacro{cite:labelyear+extrayear}% \savefield{namehash}{\cbx@lasthash}% \savefield{labelyear}{\cbx@lastyear}}}} {\usebibmacro{cite:shorthand}% @@ -73,9 +73,9 @@ {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)} {\setunit{\addcomma}% - \usebibmacro{cite:extradate}} + \usebibmacro{cite:extrayear}} {\setunit{\compcitedelim}% - \usebibmacro{cite:labeldate+extradate}% + \usebibmacro{cite:labelyear+extrayear}% \savefield{labelyear}{\cbx@lastyear}}} {\setunit{\compcitedelim}% \usebibmacro{cite:shorthand}% @@ -89,7 +89,7 @@ \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% - \usebibmacro{cite:labeldate+extradate}} + \usebibmacro{cite:labelyear+extrayear}} {\usebibmacro{cite:shorthand}}} {\printnames{labelname}% \setunit{% @@ -101,7 +101,7 @@ \iffieldundef{shorthand} {\iffieldundef{labelyear} {\usebibmacro{cite:label}} - {\usebibmacro{cite:labeldate+extradate}}% + {\usebibmacro{cite:labelyear+extrayear}}% \savefield{labelyear}{\cbx@lastyear}} {\usebibmacro{cite:shorthand}% \global\undef\cbx@lastyear}}% @@ -121,25 +121,43 @@ {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}} {\printtext[bibhyperref]{\printfield{label}}}} -\newbibmacro*{cite:labeldate+extradate}{% +% Inside \printtext, argumentless macros also need '%' afterwards +% otherwise the newlines are spaces +\newbibmacro*{cite:labelyear+extrayear}{% \iffieldundef{labelyear} {} - {\printtext[bibhyperref]{\printlabeldateextra}}} - -\newbibmacro{cite:labelyear+extrayear}{% - \def\blx@warning{bibmacro 'cite:labelyear+extrayear' is deprecated.\MessageBreak - Using 'cite:labeldate+extradate' instead.}% - \usebibmacro{cite:labeldate+extradate}} + {\printtext[bibhyperref]{% + \ifdefstring\blx@dateformat@labeldate{edtf} + {} + {\datecircaprint}% + \dateeraprintpre{labelyear}% + \printfield{labelyear}% + \printfield{extrayear}% + \iffieldsequal{labeldateera}{labelenddateera}{} + {\dateeraprint{labelyear}}% + \dateuncertainprint% + \ifdefstring\blx@dateformat@labeldate{edtf} + {\datecircaprintedtf} + {}% + \iffieldundef{labelendyear} + {} + {\iffieldsequal{labelyear}{labelendyear}{} + {\ifdefstring\blx@dateformat@labeldate{edtf} + {\slash}% strict EDTF + {\bibdaterangesep + \enddatecircaprint}% + \dateeraprintpre{labelendyear}% + \printfield{labelendyear}% + \enddateuncertainprint + \ifdefstring\blx@dateformat@labeldate{edtf} + {\enddatecircaprintedtf} + {}% + \dateeraprint{labelendyear}}}}}} -\newbibmacro*{cite:extradate}{% - \iffieldundef{extradate} +\newbibmacro*{cite:extrayear}{% + \iffieldundef{extrayear} {} - {\printtext[bibhyperref]{\printfield{extradate}}}} - -\newbibmacro{cite:extrayear}{% - \def\blx@warning{bibmacro 'cite:extrayear' is deprecated.\MessageBreak - Using 'cite:extrayear' instead.}% - \usebibmacro{cite:extrayear}} + {\printtext[bibhyperref]{\printfield{extrayear}}}} \newbibmacro*{textcite:postnote}{% \usebibmacro{postnote}% 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 c69a1a28b4e..7148258f0fd 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx @@ -25,7 +25,7 @@ \setunit{\printdelim{nonameyeardelim}}} {\printnames{labelname}% \setunit{\printdelim{nameyeardelim}}}% - \usebibmacro{cite:labeldate+extradate}}} + \usebibmacro{cite:labelyear+extrayear}}} {\usebibmacro{cite:shorthand}}} \newbibmacro*{citeyear}{% @@ -35,7 +35,7 @@ {\usebibmacro{cite:ibid}} {\iffieldundef{labelyear} {\usebibmacro{cite:label}} - {\usebibmacro{cite:labeldate+extradate}}}} + {\usebibmacro{cite:labelyear+extrayear}}}} {\usebibmacro{cite:shorthand}}} \newbibmacro*{textcite}{% @@ -49,7 +49,7 @@ \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% - \usebibmacro{cite:labeldate+extradate}} + \usebibmacro{cite:labelyear+extrayear}} {\usebibmacro{cite:shorthand}}} {\printnames{labelname}% \setunit{% @@ -63,7 +63,7 @@ {\usebibmacro{cite:ibid}} {\iffieldundef{labelyear} {\usebibmacro{cite:label}} - {\usebibmacro{cite:labeldate+extradate}}}} + {\usebibmacro{cite:labelyear+extrayear}}}} {\usebibmacro{cite:shorthand}}}} \newbibmacro*{cite:shorthand}{% @@ -80,15 +80,38 @@ {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}} {\printtext[bibhyperref]{\printfield{label}}}} -\newbibmacro*{cite:labeldate+extradate}{% +% Inside \printtext, argumentless macros also need '%' afterwards +% otherwise the newlines are spaces +\newbibmacro*{cite:labelyear+extrayear}{% \iffieldundef{labelyear} {} - {\printtext[bibhyperref]{\printlabeldateextra}}} - -\newbibmacro{cite:labelyear+extrayear}{% - \def\blx@warning{bibmacro 'cite:labelyear+extrayear' is deprecated.\MessageBreak - Using 'cite:labeldate+extradate' instead.}% - \usebibmacro{cite:labeldate+extradate}} + {\printtext[bibhyperref]{% + \ifdefstring\blx@dateformat@labeldate{edtf} + {} + {\datecircaprint}% + \dateeraprintpre{labelyear}% + \printfield{labelyear}% + \printfield{extrayear}% + \iffieldsequal{labeldateera}{labelenddateera}{} + {\dateeraprint{labelyear}}% + \dateuncertainprint% + \ifdefstring\blx@dateformat@labeldate{edtf} + {\datecircaprintedtf} + {}% + \iffieldundef{labelendyear} + {} + {\iffieldsequal{labelyear}{labelendyear}{} + {\ifdefstring\blx@dateformat@labeldate{edtf} + {\slash}% strict EDTF + {\bibdaterangesep + \enddatecircaprint}% + \dateeraprintpre{labelendyear}% + \printfield{labelendyear}% + \enddateuncertainprint + \ifdefstring\blx@dateformat@labeldate{edtf} + {\enddatecircaprintedtf} + {}% + \dateeraprint{labelendyear}}}}}} \newbibmacro*{cite:postnote}{% \ifbool{cbx:loccit} 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 b7d9cc6ce8f..4bb47ceeea1 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx @@ -38,19 +38,19 @@ {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}} {\usebibmacro{cite:label}% \setunit{\printdelim{nonameyeardelim}}% - \usebibmacro{cite:labeldate+extradate}% + \usebibmacro{cite:labelyear+extrayear}% \usebibmacro{cite:reinit}} {\iffieldequals{namehash}{\cbx@lasthash} {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)} {\setunit{\addcomma}% - \usebibmacro{cite:extradate}} + \usebibmacro{cite:extrayear}} {\setunit{\compcitedelim}% - \usebibmacro{cite:labeldate+extradate}% + \usebibmacro{cite:labelyear+extrayear}% \savefield{labelyear}{\cbx@lastyear}}} {\printnames{labelname}% \setunit{\printdelim{nameyeardelim}}% - \usebibmacro{cite:labeldate+extradate}% + \usebibmacro{cite:labelyear+extrayear}% \savefield{namehash}{\cbx@lasthash}% \savefield{labelyear}{\cbx@lastyear}}}}} {\usebibmacro{cite:shorthand}% @@ -68,11 +68,11 @@ {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)} {\setunit{\addcomma}% - \usebibmacro{cite:extradate}} + \usebibmacro{cite:extrayear}} {\setunit{\compcitedelim}% - \usebibmacro{cite:labeldate+extradate}% + \usebibmacro{cite:labelyear+extrayear}% \savefield{labelyear}{\cbx@lastyear}}} - {\usebibmacro{cite:labeldate+extradate}% + {\usebibmacro{cite:labelyear+extrayear}% \savefield{namehash}{\cbx@lasthash}% \savefield{labelyear}{\cbx@lastyear}}}}} {\usebibmacro{cite:shorthand}% @@ -85,9 +85,9 @@ {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)} {\setunit{\addcomma}% - \usebibmacro{cite:extradate}} + \usebibmacro{cite:extrayear}} {\setunit{\compcitedelim}% - \usebibmacro{cite:labeldate+extradate}% + \usebibmacro{cite:labelyear+extrayear}% \savefield{labelyear}{\cbx@lastyear}}} {\setunit{\compcitedelim}% \usebibmacro{cite:shorthand}% @@ -103,7 +103,7 @@ {}% \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} - {\usebibmacro{cite:labeldate+extradate}}} + {\usebibmacro{cite:labelyear+extrayear}}} {\usebibmacro{cite:shorthand}}} {\printnames{labelname}% \setunit{% @@ -117,7 +117,7 @@ {\usebibmacro{cite:label}} {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} - {\usebibmacro{cite:labeldate+extradate}}}% + {\usebibmacro{cite:labelyear+extrayear}}}% \savefield{labelyear}{\cbx@lastyear}} {\usebibmacro{cite:shorthand}% \global\undef\cbx@lastyear}}% @@ -137,25 +137,43 @@ {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}} {\printtext[bibhyperref]{\printfield{label}}}} -\newbibmacro*{cite:labeldate+extradate}{% +% Inside \printtext, argumentless macros also need '%' afterwards +% otherwise the newlines are spaces +\newbibmacro*{cite:labelyear+extrayear}{% \iffieldundef{labelyear} {} - {\printtext[bibhyperref]{\printlabeldateextra}}} - -\newbibmacro{cite:labelyear+extrayear}{% - \def\blx@warning{bibmacro 'cite:labelyear+extrayear' is deprecated.\MessageBreak - Using 'cite:labeldate+extradate' instead.}% - \usebibmacro{cite:labeldate+extradate}} - -\newbibmacro*{cite:extradate}{% - \iffieldundef{extradate} + {\printtext[bibhyperref]{% + \ifdefstring\blx@dateformat@labeldate{edtf} + {} + {\datecircaprint}% + \dateeraprintpre{labelyear}% + \printfield{labelyear}% + \printfield{extrayear}% + \iffieldsequal{labeldateera}{labelenddateera}{} + {\dateeraprint{labelyear}}% + \dateuncertainprint% + \ifdefstring\blx@dateformat@labeldate{edtf} + {\datecircaprintedtf} + {}% + \iffieldundef{labelendyear} + {} + {\iffieldsequal{labelyear}{labelendyear}{} + {\ifdefstring\blx@dateformat@labeldate{edtf} + {\slash}% strict EDTF + {\bibdaterangesep + \enddatecircaprint}% + \dateeraprintpre{labelendyear}% + \printfield{labelendyear}% + \enddateuncertainprint + \ifdefstring\blx@dateformat@labeldate{edtf} + {\enddatecircaprintedtf} + {}% + \dateeraprint{labelendyear}}}}}} + +\newbibmacro*{cite:extrayear}{% + \iffieldundef{extrayear} {} - {\printtext[bibhyperref]{\printfield{extradate}}}} - -\newbibmacro{cite:extrayear}{% - \def\blx@warning{bibmacro 'cite:extrayear' is deprecated.\MessageBreak - Using 'cite:extrayear' instead.}% - \usebibmacro{cite:extrayear}} + {\printtext[bibhyperref]{\printfield{extrayear}}}} \newbibmacro*{cite:ibid}{% \printtext[bibhyperref]{\bibstring[\mkibid]{ibidem}}% diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx index cff210e5f1f..fd411c90b55 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx @@ -14,14 +14,14 @@ \setunit{\printdelim{nonameyeardelim}}} {\printnames{labelname}% \setunit{\printdelim{nameyeardelim}}}% - \usebibmacro{cite:labeldate+extradate}} + \usebibmacro{cite:labelyear+extrayear}} {\usebibmacro{cite:shorthand}}} \newbibmacro*{citeyear}{% \iffieldundef{shorthand} {\iffieldundef{labelyear} {\usebibmacro{cite:label}} - {\usebibmacro{cite:labeldate+extradate}}} + {\usebibmacro{cite:labelyear+extrayear}}} {\usebibmacro{cite:shorthand}}} \newbibmacro*{textcite}{% @@ -34,7 +34,7 @@ \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% - \usebibmacro{cite:labeldate+extradate}} + \usebibmacro{cite:labelyear+extrayear}} {\usebibmacro{cite:shorthand}}} {\printnames{labelname}% \setunit{% @@ -53,15 +53,38 @@ {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}} {\printtext[bibhyperref]{\printfield{label}}}} -\newbibmacro*{cite:labeldate+extradate}{% +% Inside \printtext, argumentless macros also need '%' afterwards +% otherwise the newlines are spaces +\newbibmacro*{cite:labelyear+extrayear}{% \iffieldundef{labelyear} {} - {\printtext[bibhyperref]{\printlabeldateextra}}} - -\newbibmacro{cite:labelyear+extrayear}{% - \def\blx@warning{bibmacro 'cite:labelyear+extrayear' is deprecated.\MessageBreak - Using 'cite:labeldate+extradate' instead.}% - \usebibmacro{cite:labeldate+extradate}} + {\printtext[bibhyperref]{% + \ifdefstring\blx@dateformat@labeldate{edtf} + {} + {\datecircaprint}% + \dateeraprintpre{labelyear}% + \printfield{labelyear}% + \printfield{extrayear}% + \dateuncertainprint% + \iffieldsequal{labeldateera}{labelenddateera}{} + {\dateeraprint{labelyear}}% + \ifdefstring\blx@dateformat@labeldate{edtf} + {\datecircaprintedtf} + {}% + \iffieldundef{labelendyear} + {} + {\iffieldsequal{labelyear}{labelendyear}{} + {\ifdefstring\blx@dateformat@labeldate{edtf} + {\slash}% strict EDTF + {\bibdaterangesep + \enddatecircaprint}% + \dateeraprintpre{labelendyear}% + \printfield{labelendyear}% + \enddateuncertainprint + \ifdefstring\blx@dateformat@labeldate{edtf} + {\enddatecircaprintedtf} + {}% + \dateeraprint{labelendyear}}}}}} \newbibmacro*{textcite:postnote}{% \iffieldundef{postnote} 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 b649cbeaee8..7f2b64d569c 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx @@ -103,7 +103,7 @@ {\usebibmacro{cite:comp}} {\usebibmacro{cite:dump}% \ifbool{cbx:parens} - {\printtext{\bibclosebracket}\global\boolfalse{cbx:parens}} + {\bibclosebracket\global\boolfalse{cbx:parens}} {}% \iffirstcitekey {} @@ -112,8 +112,8 @@ \ifnameundef{labelname} {\printfield[citetitle]{labeltitle}} {\printnames{labelname}}% - \setunit*{\printdelim{namelabeldelim}}% - \printtext{\bibopenbracket}\global\booltrue{cbx:parens}% + \global\booltrue{cbx:parens}% + \printdelim{namelabeldelim}\bibopenbracket% \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx index 8ea47d1338d..81b3bcb80e5 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx @@ -26,8 +26,9 @@ {\ifnameundef{labelname} {\printfield[citetitle]{labeltitle}} {\printnames{labelname}}% - \setunit*{\printdelim{namelabeldelim}}% - \printtext{\bibopenbracket}\global\booltrue{cbx:parens}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{namelabeldelim}\bibopenbracket}% \stepcounter{textcitecount}% \savefield{namehash}{\cbx@lasthash}}% \ifnumequal{\value{citecount}}{1} @@ -36,7 +37,7 @@ \usebibmacro{cite}% \setunit{% \ifbool{cbx:parens} - {\bibclosebracket\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \textcitedelim}} @@ -52,11 +53,11 @@ {\setunit{}% \printtext{% \ifbool{cbx:parens} - {\bibclosebracket\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}}} {\setunit{% \ifbool{cbx:parens} - {\bibclosebracket\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \textcitedelim}}} 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 02a7aad2d89..ae5dccc7ca7 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx @@ -78,9 +78,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}} @@ -101,8 +101,8 @@ {\iffieldundef{shorthand} {\ifboolexpr{ test {\ifciteibid} - and - not test {\iffirstonpage} + and + not test {\iffirstonpage} } {\usebibmacro{cite:ibid}} {\usebibmacro{cite:short}}} 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 5749af7793d..6fc88f6b6d6 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx @@ -79,9 +79,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}} @@ -178,8 +178,8 @@ {\ifsamepage{\the\value{instcount}} {\csuse{cbx@f@\thefield{entrykey}}} {} - {\addcomma\space\bibstring{page}\addnbspace - \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}} + {\addcomma\space\bibstring{page}\addnbspace + \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}} {}}} \newbibmacro*{footcite:shorthand}{% 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 5b67757ce4d..42156224c97 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx @@ -73,9 +73,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}} @@ -155,8 +155,8 @@ {\ifsamepage{\the\value{instcount}} {\csuse{cbx@f@\thefield{entrykey}}} {} - {\addcomma\space\bibstring{page}\addnbspace - \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}} + {\addcomma\space\bibstring{page}\addnbspace + \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}} {}}} \newbibmacro*{footcite:shorthand}{% 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 a361766f169..33841be3ed6 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx @@ -79,9 +79,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}} @@ -116,8 +116,8 @@ {\usebibmacro{cite:name}% \ifopcit {\ifloccit - {\usebibmacro{cite:loccit}} - {\usebibmacro{cite:opcit}}} + {\usebibmacro{cite:loccit}} + {\usebibmacro{cite:opcit}}} {\usebibmacro{cite:title}}}}}% \usebibmacro{cite:save}} {\usebibmacro{cite:shorthand}}} 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 9ad583e1992..0461eb14d20 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx @@ -86,9 +86,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}} @@ -119,7 +119,7 @@ {\usebibmacro{cite:idem}} {\usebibmacro{cite:name}}% \usebibmacro{cite:title}}% - \usebibmacro{cite:save}} + \usebibmacro{cite:save}} {\usebibmacro{cite:shorthand}}} {\usebibmacro{cite:full}% \usebibmacro{cite:save}}}} 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 1fab909cc4f..80a45d6a004 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx @@ -74,9 +74,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}} @@ -96,13 +96,13 @@ \ifciteseen {\ifciteibid {\ifloccit - {\usebibmacro{cite:ibid}} - {\iffieldundef{shorthand} - {\usebibmacro{cite:opcit}} - {\usebibmacro{cite:shorthand}}}} + {\usebibmacro{cite:ibid}} + {\iffieldundef{shorthand} + {\usebibmacro{cite:opcit}} + {\usebibmacro{cite:shorthand}}}} {\iffieldundef{shorthand} - {\usebibmacro{cite:short}} - {\usebibmacro{cite:shorthand}}}} + {\usebibmacro{cite:short}} + {\usebibmacro{cite:shorthand}}}} {\usebibmacro{cite:full}}} \newbibmacro*{cite:full}{% diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx index cc01743e3cc..80e2fd4ede3 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx @@ -97,14 +97,14 @@ founders = {{fundadores}{fund\adddot}}, continuator = {{continuador}{cont\adddot}}, continuators = {{continuadores}{cont\adddot}}, - collaborator = {{colaborador}{colab\adddot}}, - collaborators = {{colaboradores}{colab\adddot}}, + collaborator = {{colaborador}{col\adddot}}, + collaborators = {{colaboradores}{cols\adddot}}, translator = {{tradutor}{trad\adddot}}, - translators = {{tradutores}{trad\adddot}}, + translators = {{tradutores}{trads\adddot}}, commentator = {{comentador}{coment\adddot}}, - commentators = {{comentadores}{coment\adddot}}, + commentators = {{comentadores}{coments\adddot}}, annotator = {{anotador}{anot\adddot}}, - annotators = {{anotadores}{anot\adddot}}, + annotators = {{anotadores}{anots\adddot}}, commentary = {{coment\'ario}{coment\adddot}}, annotations = {{notas}{notas}}, introduction = {{introdu\c{c}\~ao}{introd\adddot}}, @@ -113,15 +113,15 @@ editortr = {{editor e tradutor}% {ed\adddotspace e trad\adddot}}, editorstr = {{editores e tradutores}% - {eds\adddotspace e trad\adddot}}, + {eds\adddotspace e trads\adddot}}, editorco = {{editor e comentador}% {ed\adddotspace e coment\adddot}}, editorsco = {{editores e comentadores}% - {eds\adddotspace e coment\adddot}}, + {eds\adddotspace e coments\adddot}}, editoran = {{editor e anotador}% {ed\adddotspace e anot\adddot}}, editorsan = {{editores e anotadores}% - {eds\adddotspace e anot\adddot}}, + {eds\adddotspace e anots\adddot}}, editorin = {{editor e introdu\c{c}\~ao}% {ed\adddotspace e introd\adddot}}, editorsin = {{editores e introdu\c{c}\~ao}% @@ -137,79 +137,79 @@ editortrco = {{editor, tradutor e comentador}% {ed., trad\adddot\ e coment\adddot}}, editorstrco = {{editores, tradutores e comentadores}% - {eds., trad\adddot\ e coment\adddot}}, + {eds., trads\adddot\ e coments\adddot}}, editortran = {{editor, tradutor e anotador}% {ed., trad\adddot\ e anot\adddot}}, editorstran = {{editores, tradutores e anotadores}% - {eds., trad\adddot\ e anot\adddot}}, + {eds., trads\adddot\ e anots\adddot}}, editortrin = {{editor, tradutor e introdu\c{c}\~ao}% {ed., trad\adddot\ e introd\adddot}}, editorstrin = {{editores, tradutores e introdu\c{c}\~ao}% - {eds., trad\adddot\ e introd\adddot}}, + {eds., trads\adddot\ e introd\adddot}}, editortrfo = {{editor, tradutor e pref\'acio}% {ed., trad\adddot\ e pref\adddot}}, editorstrfo = {{editores, tradutores e pref\'acio}% - {eds., trad\adddot\ e pref\adddot}}, + {eds., trads\adddot\ e pref\adddot}}, editortraf = {{editor, tradutor e posf\'acio}% {ed., trad\adddot\ e posf\adddot}}, editorstraf = {{editores, tradutores e posf\'acio}% - {eds., trad\adddot\ e posf\adddot}}, + {eds., trads\adddot\ e posf\adddot}}, editorcoin = {{editor, comentador e introdu\c{c}\~ao}% {ed., coment\adddot\ e introd\adddot}}, editorscoin = {{editores, comentadores e introdu\c{c}\~ao}% - {eds., coment\adddot\ e introd\adddot}}, + {eds., coments\adddot\ e introd\adddot}}, editorcofo = {{editor, comentador e pref\'acio}% {ed., coment\adddot\ e pref\adddot}}, editorscofo = {{editores, comentadores e pref\'acio}% - {eds., coment\adddot\ e pref\adddot}}, + {eds., coments\adddot\ e pref\adddot}}, editorcoaf = {{editor, comentador e posf\'acio}% {ed., coment\adddot\ e posf\adddot}}, editorscoaf = {{editores, comentadores e posf\'acio}% - {eds., coment\adddot\ e posf\adddot}}, + {eds., coments\adddot\ e posf\adddot}}, editoranin = {{editor, anotador e introdu\c{c}\~ao}% {ed., anot\adddot\ e introd\adddot}}, editorsanin = {{editores, anotadores e introdu\c{c}\~ao}% - {eds., anot\adddot\ e introd\adddot}}, + {eds., anots\adddot\ e introd\adddot}}, editoranfo = {{editor, anotador e pref\'acio}% {ed., anot\adddot\ e pref\adddot}}, editorsanfo = {{editores, anotadores e pref\'acio}% - {eds., anot\adddot\ e pref\adddot}}, + {eds., anots\adddot\ e pref\adddot}}, editoranaf = {{editor, anotador e posf\'acio}% {ed., anot\adddot\ e posf\adddot}}, editorsanaf = {{editores, anotadores e posf\'acio}% - {eds., anot\adddot\ e posf\adddot}}, + {eds., anots\adddot\ e posf\adddot}}, editortrcoin = {{editor, tradutor, comentador e introdu\c{c}\~ao}% {ed., trad., coment\adddot\ e introd\adddot}}, editorstrcoin = {{editores, tradutores, comentadores e introdu\c{c}\~ao}% - {eds., trad., coment\adddot\ e introd\adddot}}, + {eds., trads., coments\adddot\ e introd\adddot}}, editortrcofo = {{editor, tradutor, comentador e pref\'acio}% {ed., trad., coment\adddot\ e pref\adddot}}, editorstrcofo = {{editores, tradutores, comentadores e pref\'acio}% - {eds., trad., coment\adddot\ e pref\adddot}}, + {eds., trads., coments\adddot\ e pref\adddot}}, editortrcoaf = {{editor, tradutor, comentador e posf\'acio}% {ed., trad., coment\adddot\ e posf\adddot}}, editorstrcoaf = {{editores, tradutores, comentadores e posf\'acio}% - {eds., trad., coment\adddot\ e posf\adddot}}, + {eds., trads., coments\adddot\ e posf\adddot}}, editortranin = {{editor, tradutor, anotador e introdu\c{c}\~ao}% {ed., trad., anot\adddot\ e introd\adddot}}, editorstranin = {{editores, tradutores, anotadores e introdu\c{c}\~ao}% - {eds., trad., anot\adddot\ e introd\adddot}}, + {eds., trads., anots\adddot\ e introd\adddot}}, editortranfo = {{editor, tradutor, anotador e pref\'acio}% {ed., trad., anot\adddot\ e pref\adddot}}, editorstranfo = {{editores, tradutores, anotadores e pref\'acio}% - {eds., trad., anot\adddot\ e pref\adddot}}, + {eds., trads., anots\adddot\ e pref\adddot}}, editortranaf = {{editor, tradutor, anotador e posf\'acio}% {ed., trad., anot\adddot\ e posf\adddot}}, editorstranaf = {{editores, tradutores, anotadores e posf\'acio}% - {eds., trad., anot\adddot\ e posf\adddot}}, - translatorco = {{tradu\c{c}\~ao e coment\'ario}% + {eds., trads., anots\adddot\ e posf\adddot}}, + translatorco = {{tradutor e comentador}% {trad\adddot\ e coment\adddot}}, - translatorsco = {{tradu\c{c}\~ao e coment\'ario}% - {trad\adddot\ e coment\adddot}}, - translatoran = {{tradu\c{c}\~ao e notas}% - {trad\adddot\ e notas}}, - translatorsan = {{tradu\c{c}\~ao e notas}% - {trad\adddot\ e notas}}, + translatorsco = {{tradutores e comentadores}% + {trads\adddot\ e coments\adddot}}, + translatoran = {{tradutor e anotador}% + {trad\adddot\ e anot\adddot}}, + translatorsan = {{tradutores e anotadores}% + {trads\adddot\ e anots\adddot}}, translatorin = {{tradu\c{c}\~ao e introdu\c{c}\~ao}% {trad\adddot\ e introd\adddot}}, translatorsin = {{tradu\c{c}\~ao e introdu\c{c}\~ao}% @@ -246,21 +246,18 @@ {trad., notas e posf\adddot}}, translatorsanaf = {{tradu\c{c}\~ao, notas e posf\'acio}% {trad., notas e posf\adddot}}, - organizer = {{organizador}{org\adddot}}, - organizers = {{organizadores}{orgs\adddot}}, byauthor = {{por}{por}}, byeditor = {{editado por}{ed\adddotspace por}}, bycompiler = {{compilado por}{comp\adddotspace por}}, byredactor = {{redigido por}{red\adddotspace por}}, byreviser = {{revisado por}{rev\adddotspace por}}, - byreviewer = {{resenhado por}{res\adddotspace por}}, + byreviewer = {{resenhado por}{res\adddotspace}}, byfounder = {{fundado por}{fund\adddotspace por}}, bycontinuator = {{continuado por}{cont\adddotspace por}}, - bycollaborator = {{em colabora\c{c}\~ao com}{em colab\adddotspace com}}, + bycollaborator = {{em colabora\c{a}\~o com}{em col\adddotspace com}}, bytranslator = {{traduzido \lbx@lfromlang\ por}{trad\adddot\ \lbx@sfromlang\ por}}, - bycommentator = {{comentado por}{coment\adddot\ por}}, + bycommentator = {{comentado por}{com\adddot\ por}}, byannotator = {{anotado por}{anot\adddot\ por}}, - byorganizer = {{organizado por}{org\adddotspace por}}, withcommentator = {{com coment\'ario de}{com coment\adddot\ de}}, withannotator = {{com notas de}{com notas de}}, withintroduction = {{com introdu\c{c}\~ao de}{com introd\adddot\ de}}, @@ -269,7 +266,7 @@ byeditortr = {{editado e traduzido \lbx@lfromlang\ por}% {ed\adddotspace e trad\adddot\ \lbx@sfromlang\ por}}, byeditorco = {{editado e comentado por}% - {ed\adddotspace e coment\adddot\ por}}, + {ed\adddotspace e com\adddot\ por}}, byeditoran = {{editado e anotado por}% {ed\adddotspace e anot\adddot\ por}}, byeditorin = {{editado e introduzido por}% @@ -279,7 +276,7 @@ byeditoraf = {{editado e posfaciado por}% {ed\adddotspace e posf\adddot\ por}}, byeditortrco = {{editado, traduzido \lbx@lfromlang\ e comentado por}% - {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e coment\adddot\ por}}, + {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e com\adddot\ por}}, byeditortran = {{editado, traduzido \lbx@lfromlang\ e anotado por}% {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e anot\adddot\ por}}, byeditortrin = {{editado, traduzido \lbx@lfromlang\ e introduzido por}% @@ -289,11 +286,11 @@ byeditortraf = {{editado, traduzido \lbx@lfromlang\ e posfaciado por}% {ed.,\addabbrvspace trad. \lbx@sfromlang\ e posf\adddot\ por}}, byeditorcoin = {{editado, comentado e introduzido por}% - {ed.,\addabbrvspace coment\adddot\ e introd\adddot\ por}}, + {ed.,\addabbrvspace com\adddot\ e introd\adddot\ por}}, byeditorcofo = {{editado, comentado e prefaciado por}% - {ed.,\addabbrvspace coment\adddot\ e pref\adddot\ por}}, + {ed.,\addabbrvspace com\adddot\ e pref\adddot\ por}}, byeditorcoaf = {{editado, comentado e posfaciado por}% - {ed.,\addabbrvspace coment\adddot\ e posf\adddot\ por}}, + {ed.,\addabbrvspace com\adddot\ e posf\adddot\ por}}, byeditoranin = {{editado, anotado e introduzido por}% {ed.,\addabbrvspace anot\adddot\ e introd\adddot\ por}}, byeditoranfo = {{editado, anotado e prefaciado por}% @@ -301,11 +298,11 @@ byeditoranaf = {{editado, anotado e posfaciado por}% {ed.,\addabbrvspace anot\adddot\ e posf\adddot\ por}}, byeditortrcoin = {{editado, traduzido \lbx@lfromlang, comentado e introduzido por}% - {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, coment\adddot\ e introd\adddot\ por}}, + {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e introd\adddot\ por}}, byeditortrcofo = {{editado, traduzido \lbx@lfromlang, comentado e prefaciado por}% - {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, coment\adddot\ e pref\adddot\ por}}, + {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e pref\adddot\ por}}, byeditortrcoaf = {{editado, traduzido \lbx@lfromlang, comentado e posfaciado por}% - {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, coment\adddot\ e posf\adddot\ por}}, + {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e posf\adddot\ por}}, byeditortranin = {{editado, traduzido \lbx@lfromlang, anotado e introduzido por}% {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, anot\adddot\ e introd\adddot\ por}}, byeditortranfo = {{editado, traduzido \lbx@lfromlang, anotado e prefaciado por}% @@ -313,7 +310,7 @@ byeditortranaf = {{editado, traduzido \lbx@lfromlang, anotado e posfaciado por}% {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, anot\adddot\ e posf\adddot\ por}}, bytranslatorco = {{traduzido \lbx@lfromlang\ e comentado por}% - {trad\adddot\ \lbx@sfromlang\ e coment\adddot\ por}}, + {trad\adddot\ \lbx@sfromlang\ e com\adddot\ por}}, bytranslatoran = {{traduzido \lbx@lfromlang\ e anotado por}% {trad\adddot\ \lbx@sfromlang\ e anot\adddot\ por}}, bytranslatorin = {{traduzido \lbx@lfromlang\ e introduzido por}% @@ -323,11 +320,11 @@ bytranslatoraf = {{traduzido \lbx@lfromlang\ e posfaciado por}% {trad\adddot\ \lbx@sfromlang\ e posf\adddot\ por}}, bytranslatorcoin = {{traduzido \lbx@lfromlang, comentado e introduzido por}% - {trad\adddot\ \lbx@sfromlang, coment\adddot\ e introd\adddot\ por}}, + {trad\adddot\ \lbx@sfromlang, com\adddot\ e introd\adddot\ por}}, bytranslatorcofo = {{traduzido \lbx@lfromlang, comentado e prefaciado por}% - {trad\adddot\ \lbx@sfromlang, coment\adddot\ e pref\adddot\ por}}, + {trad\adddot\ \lbx@sfromlang, com\adddot\ e pref\adddot\ por}}, bytranslatorcoaf = {{traduzido \lbx@lfromlang, comentado e posfaciado por}% - {trad\adddot\ \lbx@sfromlang, coment\adddot\ e posf\adddot\ por}}, + {trad\adddot\ \lbx@sfromlang, com\adddot\ e posf\adddot\ por}}, bytranslatoranin = {{traduzido \lbx@lfromlang, anotado e introduzido por}% {trad\adddot\ \lbx@sfromlang, anot\adddot\ e introd\adddot\ por}}, bytranslatoranfo = {{traduzido \lbx@lfromlang, anotado e prefaciado por}% @@ -344,7 +341,7 @@ jourser = {{s\'erie}{s\'er\adddot}}, book = {{livro}{livro}}, part = {{parte}{parte}}, - issue = {{n\'umero}{n\'um\adddot}}, + issue = {{edi\c{c}\~ao}{edi\c{c}\~ao}}, newseries = {{nova s\'erie}{nova s\'er\adddot}}, oldseries = {{s\'erie antiga}{s\'er\adddot\ antiga}}, edition = {{edi\c{c}\~ao}{ed\adddot}}, @@ -360,55 +357,42 @@ origpubin = {{originalmente publicado em}{orig\adddotspace pub\adddotspace em}}, astitle = {{como}{como}}, bypublisher = {{por}{por}}, - nodate = {{sem\space data}{s\adddot d\adddot}}, page = {{p\'agina}{p\adddot}}, pages = {{p\'aginas}{pp\adddot}}, column = {{coluna}{col\adddot}}, columns = {{colunas}{cols\adddot}}, line = {{linha}{l\adddot}}, lines = {{linhas}{ll\adddot}}, + nodate = {{sem\space data}{s\adddot d\adddot}}, verse = {{verso}{v\adddot}}, verses = {{versos}{vv\adddot}}, section = {{se\c{c}\~ao}{\S}}, sections = {{se\c{c}\~oes}{\S\S}}, paragraph = {{par\'agrafo}{par\adddot}}, - paragraphs = {{par\'agrafos}{par\adddot}}, - pagetotal = {{p\'agina}{p\adddot}}, - pagetotals = {{p\'aginas}{pp\adddot}}, - columntotal = {{coluna}{col\adddot}}, - columntotals = {{colunas}{cols\adddot}}, - linetotal = {{linha}{l\adddot}}, - linetotals = {{linhas}{ll\adddot}}, - versetotal = {{verso}{v\adddot}}, - versetotals = {{versos}{vv\adddot}}, - sectiontotal = {{se\c{c}\~ao}{\S}}, - sectiontotals = {{se\c{c}\~oes}{\S\S}}, - paragraphtotal = {{par\'agrafo}{par\adddot}}, - paragraphtotals = {{par\'agrafos}{par\adddot}}, + paragraphs = {{par\'agrafo}{pars\adddot}}, in = {{em}{em}}, inseries = {{em}{em}}, ofseries = {{de}{de}}, - number = {{n\'umero}{n\adddot\textordmasculine}}, + number = {{n\'umero}{n\textordmasculine}}, chapter = {{cap\'\i tulo}{cap\adddot}}, - mathesis = {{disserta\c{c}\~ao de mestrado}{diss\adddot\ de mestr\adddot}}, - phdthesis = {{tese de doutorado}{tese de dout\adddot}}, - candthesis = {{trabalho de conclus\~ao}{trab\adddotspace de conc\adddot}}, - resreport = {{relat\'orio de pesquisa}{rel\adddotspace de pesq\adddot}}, - techreport = {{relat\'orio t\'ecnico}{rel\adddotspace t\'ecn\adddot}}, + mathesis = {{disserta\c{c}\~ao de mestrado}{diss\adddot\ de mestrado}}, + phdthesis = {{tese de doutorado}{tese de doutorado}}, +% candthesis = {{}{}},% FIXME: missing + resreport = {{relat\'orio de pesquisa}{rel\adddotspace de pesquisa}}, + techreport = {{relat\'orio t\'ecnico}{rel\adddotspace t\'ec\adddot}}, software = {{software}{software}}, datacd = {{CD-ROM}{CD-ROM}}, audiocd = {{CD de \'audio}{CD de \'audio}}, version = {{vers\~ao}{vers\~ao}}, - url = {{endere\c{c}o}{endere\c{c}o}}, - urlfrom = {{dispon\'ivel em}{disp\adddotspace em}}, + url = {{endere\c{c}o eletr\^onico}{endere\c{c}o}}, +% urlfrom = {{}{}},% FIXME: missing urlseen = {{acesso em}{acesso em}}, - inpreparation = {{em prepara\c{c}\~ao}{em prepara\c{c}\~ao}}, - submitted = {{submetido}{submetido}}, - forthcoming = {{aceito para publica\c{c}\~ao}{aceito para publica\c{c}\~ao}}, + inpreparation = {{em prepara\c{c}\~ao}{em prep\adddot}}, + submitted = {{submetido}{subm\adddot}}, + forthcoming = {{aceito para publica\c{c}\~ao}{aceito para publ\adddot}}, inpress = {{no prelo}{no prelo}}, - prepublished = {{pr\'e-publicado}{pr\'e-publicado}}, +% prepublished = {{pr\'e-publicado}{pr\'e-publ\adddot}},% FIXME: missing citedas = {{doravante citado como}{doravante citado como}}, - thiscite = {{especialmente}{esp\adddot}}, seenote = {{ver nota}{ver nota}}, quotedin = {{apud}{apud}}, idem = {{idem}{idem}}, @@ -434,7 +418,7 @@ february = {{fevereiro}{fev\adddot}}, march = {{mar\c{c}o}{mar\adddot}}, april = {{abril}{abr\adddot}}, - may = {{maio}{mai\adddot}}, + may = {{maio}{maio}}, june = {{junho}{jun\adddot}}, july = {{julho}{jul\adddot}}, august = {{agosto}{ago\adddot}}, @@ -444,71 +428,63 @@ december = {{dezembro}{dez\adddot}}, langamerican = {{ingl\^es}{ingl\^es}}, langbrazilian = {{portugu{\^e}s}{portugu{\^e}s}}, - langbulgarian = {{b\'ulgaro}{b\'ulgaro}}, - langcatalan = {{catal\~ao}{catal\~ao}}, +% langcatalan = {{}{}},% FIXME: missing langcroatian = {{croata}{croata}}, - langczech = {{tcheco}{tcheco}}, +% langczech = {{}{}},% FIXME: missing langdanish = {{dinamarqu\^es}{dinamarqu\^es}}, langdutch = {{holand{\^e}s}{holand{\^e}s}}, langenglish = {{ingl\^es}{ingl\^es}}, langfinnish = {{finland\^es}{finland\^es}}, - langestonian = {{estoniano}{estoniano}}, +% langestonian = {{}{}},% FIXME: missing langfrench = {{franc\^es}{franc\^es}}, - langgalician = {{galego}{galego}}, langgerman = {{alem\~ao}{alem\~ao}}, langgreek = {{grego}{grego}}, langitalian = {{italiano}{italiano}}, - langjapanese = {{japon\^es}{japon\^es}}, langlatin = {{latim}{latim}}, langnorwegian = {{noruegu\^es}{noruegu\^es}}, - langpolish = {{polon\^es}{polon\^es}}, +% langpolish = {{}{}},% FIXME: missing langportuguese = {{portugu{\^e}s}{portugu{\^e}s}}, langrussian = {{russo}{russo}}, - langslovak = {{eslovaco}{eslovaco}}, - langslovene = {{esloveno}{esloveno}}, +% langslovene = {{}{}},% FIXME: missing langspanish = {{espanhol}{espanhol}}, langswedish = {{sueco}{sueco}}, fromamerican = {{do ingl\^es}{do ingl\^es}}, frombrazilian = {{do portugu{\^e}s}{do portugu{\^e}s}}, - frombulgarian = {{do b\'ulgaro}{do b\'ulgaro}}, - fromcatalan = {{do catal\~ao}{do catal\~ao}}, +% fromcatalan = {{}{}},% FIXME: missing fromcroatian = {{do croata}{do croata}}, - fromczech = {{do tcheco}{do tcheco}}, +% fromczech = {{}{}},% FIXME: missing fromdanish = {{do dinamarqu\^es}{do dinamarqu\^es}}, fromdutch = {{do holand{\^e}s}{do holand{\^e}s}}, fromenglish = {{do ingl\^es}{do ingl\^es}}, - fromestonian = {{do estoniano}{do estoniano}}, +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{do finland\^es}{do finland\^es}}, fromfrench = {{do franc\^es}{do franc\^es}}, - fromgalician = {{do galego}{do galego}}, fromgerman = {{do alem\~ao}{do alem\~ao}}, fromgreek = {{do grego}{do grego}}, fromitalian = {{do italiano}{do italiano}}, - fromjapanese = {{do japon\^es}{do japon\^es}}, fromlatin = {{do latim}{do latim}}, fromnorwegian = {{do noruegu\^es}{do noruegu\^es}}, - frompolish = {{do polon\^es}{do polon\^es}}, +% frompolish = {{}{}},% FIXME: missing fromportuguese = {{do portugu{\^e}s}{do portugu{\^e}s}}, fromrussian = {{do russo}{do russo}}, - fromslovak = {{do eslovaco}{do eslovaco}}, - fromslovene = {{do esloveno}{do esloveno}}, +% fromslovene = {{}{}},% FIXME: missing fromspanish = {{do espanhol}{do espanhol}}, fromswedish = {{do sueco}{do sueco}}, countryde = {{Alemanha}{DE}}, - countryeu = {{Uni\~ao Europeia}{EU}}, - countryep = {{Uni\~ao Europeia}{EP}}, + countryeu = {{Uni\~ao Europ\'eia}{EU}}, + countryep = {{Uni\~ao Europ\'eia}{EP}}, countryfr = {{Fran\c{c}a}{FR}}, countryuk = {{Reino Unido}{GB}}, - countryus = {{Estados Unidos}{US}}, + countryus = {{Estados Unidos da Am\'erica}{US}}, patent = {{patente}{pat\adddot}}, patentde = {{patente alem\~a}{pat\adddot\ alem\~a}}, - patenteu = {{patente europeia}{pat\adddot\ europeia}}, - patentfr = {{patente francesa}{pat\adddot\ francesa}}, + patenteu = {{patente europ\'eia}{pat\adddot\ europ\'eia}}, + patentfr = {{patente francesa}{pat\adddot francesa}}, patentuk = {{patente brit\^anica}{pat\adddot\ brit\^anica}}, patentus = {{patente americana}{pat\adddot\ americana}}, patreq = {{pedido de patente}{ped\adddot\ de pat\adddot}}, patreqde = {{pedido de patente alem\~a}{ped\adddot\ de pat\adddot\ alem\~a}}, - patreqeu = {{pedido de patente europeia}{ped\adddot\ de pat\adddot\ europeia}}, + patreqeu = {{pedido de patente europ\'eia}{ped\adddot\ de pat\adddot\ europ\'eia}}, patreqfr = {{pedido de patente francesa}{ped\adddot\ de pat\adddot\ francesa}}, patrequk = {{pedido de patente brit\^anica}{ped\adddot\ de pat\adddot\ brit\^anica}}, patrequs = {{pedido de patente americana}{ped\adddot\ de pat\adddot\ americana}}, @@ -520,11 +496,11 @@ beforecommonera = {{antes da Era Comum}{AEC}}, annodomini = {{depois de Cristo}{d\adddot C\adddot}}, beforechrist = {{antes de Cristo}{a\adddot C\adddot}}, - circa = {{circa}{ca\adddot}}, - spring = {{primavera}{primavera}}, - summer = {{ver\~ao}{ver\~ao}}, - autumn = {{outono}{outono}}, - winter = {{inverno}{inverno}}, +% circa = {{}{}},% FIXME: missing +% spring = {{}{}},% FIXME: missing +% summer = {{}{}},% FIXME: missing +% autumn = {{}{}},% FIXME: missing +% winter = {{}{}},% FIXME: missing am = {{AM}{AM}}, pm = {{PM}{PM}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx index 49f90393cc3..fe10f05545d 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx @@ -76,11 +76,6 @@ \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } -\DeclareBibliographyStrings{% - inherit = {english}, - organizer = {{organiser}{org\adddot}}, - organizers = {{organisers}{orgs\adddot}}, - byorganizer = {{organised by}{org\adddotspace by}}, -} +\InheritBibliographyStrings{english} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/bulgarian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/bulgarian.lbx deleted file mode 100644 index e0a2647c9d0..00000000000 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/bulgarian.lbx +++ /dev/null @@ -1,593 +0,0 @@ -\ProvidesFile{bulgarian.lbx} -[\abx@lbxid] - -\DeclareRedundantLanguages{bulgarian}{bulgarian} - -% This file requires UTF-8 support! - -\lbx@ifutfinput - {} - {\PackageError{biblatex} - {Bulgarian requires UTF-8 support} - {The 'bulgarian.lbx' file requires UTF-8 encoding but you - seem\MessageBreak to be using a different encoding. - This is a fatal error. I will\MessageBreak abort loading - bulgarian.lbx now.}% - \endinput} - -\NewBibliographyString{% Used only Bulgarian for month checks - datejanuary, - datefebruary, - datemarch, - dateapril, - datemay, - datejune, - datejuly, - dateaugust, - dateseptember, - dateoctober, - datenovember, - datedecember% -} - -\DeclareBibliographyExtras{% - \protected\def\bibrangedash{% - \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-я}% - \protected\def\mkbibneutord#1{#1-е}% - \protected\def\mkbibdatelong#1#2#3{% - \iffieldundef{#3} - {} - {\stripzeros{\thefield{#3}}% - \iffieldundef{#2}{}{\nobreakspace}}% - \iffieldundef{#2} - {} - {\iffieldundef{#3} - {\mkbibmonth{\thefield{#2}}} - {\lbx@ru@mkbibdatemonth{\thefield{#2}}}% - \iffieldundef{#1}{}{\space}}% - \iffieldbibstring{#1} - {\bibstring{\thefield{#1}}} - {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% - \protected\def\mkbibdateshort#1#2#3{% - \iffieldundef{#3} - {} - {\mkdayzeros{\thefield{#3}}% - \iffieldundef{#2}{}{\adddot}}% - \iffieldundef{#2} - {} - {\mkmonthzeros{\thefield{#2}}% - \iffieldundef{#1}{}{\adddot}}% - \iffieldbibstring{#1} - {\bibstring{\thefield{#1}}} - {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% - \savecommand\mkbibordedition - \savecommand\mkbibordseries - \def\mkbibordedition{\mkbibneutord}% - \def\mkbibordseries{\mkbibfemord}% - \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% - \iffieldundef{#1}{} - {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% - \iffieldundef{#2}{} - {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% - \iffieldundef{#3}{} - {\printtext{\mktimezeros{\thefield{#3}}}}% - \setunit{}% - \iffieldundef{#4}{} - {\bibtimezonesep - \mkbibtimezone{\thefield{#4}}}}% - \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% - \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep - \forcezerosmdt{\thefield{#2}}% - \iffieldundef{#3}{} - {\bibtimesep - \forcezeros{\thefield{#3}}}% - \space - \ifnumless{\thefield{#1}}{12} - {\bibstring{am}} - {\bibstring{pm}}% - \iffieldundef{#4}{} - {\space\bibtimezonesep - \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% - \iffieldundef{#1}{}{\space}% - \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% - \iffieldundef{#1}{}{\space}% - \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% -} - -\UndeclareBibliographyExtras{% - \restorecommand\mkbibordedition - \restorecommand\mkbibordseries -} - -\DeclareBibliographyStrings{% - bibliography = {{Библиография}{Библиография}},%book-like (chapter) - references = {{Литература}{Литература}},%article-like (section) - shorthands = {{Списък на съкращенията}{Съкращения}}, - editor = {{редактор}{ред\adddot}}, - editors = {{редактори}{ред\adddot}}, - compiler = {{съставител}{съст\adddot}}, - compilers = {{съставители}{съст\adddot}}, - redactor = {{редактор}{ред\adddot}},% FIXME: unsure - redactors = {{редактори}{ред\adddot}},% FIXME: unsure - 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 = {{уводна статия}{ув\adddotspace ст\adddot}}, - foreword = {{предговор}{предг\adddot}}, - afterword = {{послеслов}{послесл\adddot}}, - editortr = {{редактор и преводач}% - {ред\adddotspace и прев\adddot}}, - editorstr = {{редактори и преводачи}% - {ред\adddotspace и прев\adddot}}, - editorco = {{редактор и коментатор}% - {ред\adddotspace и комент\adddot}}, - editorsco = {{редактори и коментатори}% - {ред\adddotspace и комент\adddot}}, - editoran = {{редактор и съставител на бележките}% - {ред\adddotspace и съст\adddotspace на бел\adddot}}, - editorsan = {{редактори и съставители на бележките}% - {ред\adddotspace и съст\adddotspace на бел\adddot}}, - editorin = {{редактор и автор на уводната статия}% - {ред\adddotspace и авт\adddotspace на ув\adddotspace ст\adddot}}, - editorsin = {{редактори и автори на уводната статия}% - {ред\adddotspace и авт\adddotspace на ув\adddotspace ст\adddot}}, - editorfo = {{редактор и автор на предговора}% - {ред\adddotspace и авт\adddotspace на предг\adddot}}, - editorsfo = {{редактори и автори на предговора}% - {ред\adddotspace и авт\adddotspace на предговора\adddot}}, - editoraf = {{редактор и автор на послеслова}% - {ред\adddotspace и авт\adddotspace на послесл\adddot}}, - editorsaf = {{редактори и автори на послеслова}% - {ред\adddotspace и авт\adddotspace на послесл\adddot}}, - editortrco = {{редактор, преводач и автор на коментарите}% - {ред.,\addabbrvspace прев\adddotspace и авт\adddotspace на комент\adddot}}, - editorstrco = {{редактори, преводачи и автори коментарите}% - {ред.,\addabbrvspace прев\adddotspace и авт\adddotspace на комент\adddot}}, - editortran = {{редактор, преводач и съставител на бележките}% - {ред.,\addabbrvspace прев.\adddotspace и съст\adddotspace на бел\adddot}}, - editorstran = {{редактори, преводачи и съставители на бележките}% - {ред.,\addabbrvspace прев.\adddotspace и съст\adddotspace на бел\adddot}}, - editortrin = {{редактор, преводач и автор на уводната статия}% - {ред.,\addabbrvspace прев\adddotspace и авт\adddotspace на ув\adddotspace ст\adddot}}, - editorstrin = {{редактори, преводачи и автори на уводната статия}% - {ред.,\addabbrvspace прев\adddotspace и авт\adddotspace на ув\adddotspace ст\adddot}}, - editortrfo = {{редактор, преводач и автор на предговора}% - {ред.,\addabbrvspace прев\adddotspace и авт\adddotspace на предг\adddot}}, - editorstrfo = {{редактори, преводачи и автори на предговора}% - {ред.,\addabbrvspace прев\adddotspace и авт\adddotspace на предг\adddot}}, - editortraf = {{редактор, преводач и автор на послеслова}% - {ред.,\addabbrvspace прев\adddotspace и авт\adddotspace на послеслова\adddot}}, - editorstraf = {{редактори, преводачи и автори на послеслова}% - {ред.,\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 = {{редактор, съставител на бележките и автор на предговора}% - {ред.,\addabbrvspace съст\adddotspace на бел\adddotspace и авт\adddotspace на предг\adddot}}, - editorsanfo = {{редактори, съставители на бележките и автори на предговора}% - {ред.,\addabbrvspace съст\adddotspace на бел\adddotspace и авт\adddotspace на предг\adddot}}, - editoranaf = {{редактор, съставител на бележките и автор на послеслова}% - {ред.,\addabbrvspace съст\adddotspace на бел\adddotspace и авт\adddotspace на послесл\adddot}}, - editorsanaf = {{редактори, съставители на бележките и автори на послеслова}% - {ред.,\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 = {{редактор, преводач, съставител на бележките и автор на предговора}% - {ред.,\addabbrvspace прев.,\addabbrvspace съст\adddotspace на бел\adddotspace и авт\adddotspace на предг\adddot}}, - editorstranfo = {{редактор, преводач, съставител на бележките и автор на предговора}% - {ред.,\addabbrvspace прев.,\addabbrvspace съст\adddotspace на бел\adddotspace и авт\adddotspace на предг\adddot}}, - editortranaf = {{редактор, преводач, съставител на бележките и автор на послеслова}% - {ред.,\addabbrvspace прев.,\addabbrvspace съст\adddotspace на бел\adddotspace и авт\adddotspace на послесл\adddot}}, - editorstranaf = {{редактори, преводачи, съставители на бележките и автори на послеслова}% - {ред.,\addabbrvspace прев.,\addabbrvspace съст\adddotspace на бел\adddotspace и авт\adddotspace на послесл\adddot}}, - translatorco = {{преводач и автор на коментарите}% - {прев\adddotspace и авт\adddotspace на комент\adddot}}, - translatorsco = {{преводачи и автори на коментарите}% - {прев\adddotspace и авт\adddotspace на комент\adddot}}, - translatoran = {{преводач и съставител на бележките}% - {прев\adddotspace и съст\adddotspace на бел\adddot}}, - translatorsan = {{преводачи и съставители на бележките}% - {прев\adddotspace и съст\adddotspace на бел\adddot}}, - translatorin = {{преводач и автор на уводната статия}% - {прев\adddotspace и авт\adddotspace на ув\adddotspace ст\adddot}}, - translatorsin = {{преводач и автор на уводната статия}% - {прев\adddotspace и авт\adddotspace на ув\adddotspace ст\adddot}}, - translatorfo = {{преводач и автор на предговора}% - {прев\adddotspace и авт\adddotspace на предг\adddot}}, - translatorsfo = {{преводачи и автори на предговора}% - {прев\adddotspace и авт\adddotspace на предг\adddot}}, - translatoraf = {{преводач и автор на послеслова}% - {прев\adddotspace и авт\adddotspace на послесл\adddot}}, - translatorsaf = {{преводачи и автори на послеслова}% - {прев\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}}, -% organizer = {{}{}},% FIXME: missing -% organizers = {{}{}},% FIXME: missing -% byorganizer = {{}{}},% FIXME: missing -% byauthor = {{}{}},% FIXME: missing - byeditor = {{под редакцията на}{под\addabbrvspace ред\adddotspace на}}, - bycompiler = {{съставител}{съст\adddot}}, - byredactor = {{под редакцията на }{под\addabbrvspace ред\adddotspace на}}, - byreviser = {{коригирано от}{кор\adddotspace от}}, - byreviewer = {{рецензия от}{рец\adddotspace от}}, - byfounder = {{основател}{осн\adddot}}, - bycontinuator = {{продължител}{продълж\adddot}}, - bycollaborator = {{сътрудник}{сътр\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, под редакцията на}% - {прев\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, предговор}% - {под ред.,\addabbrvspace прев\adddot\ \lbx@sfromlang, предг\adddot}}, - byeditortraf = {{под редакцията на, превод \lbx@lfromlang, послеслов}% - {под ред\adddotspace и прев\adddot\ \lbx@sfromlang, послесл\adddot}}, - byeditorcoin = {{под редакцията на, коментари и уводна статия}% - {под ред.,\addabbrvspace комент\adddotspace и ув\adddotspace ст\adddot}}, - byeditorcofo = {{под редакцията на, коментари и предговор}% - {под ред.,\addabbrvspace комент\adddotspace и предг\adddot}}, - byeditorcoaf = {{под редакцията на, коментари и послеслов}% - {под ред.,\addabbrvspace комент\adddotspace и послесл\adddot}}, - byeditoranin = {{под редакцията на, бележки и уводна статия}% - {под ред.,\addabbrvspace бел\adddotspace и ув\adddotspace ст\adddot}}, - byeditoranfo = {{под редакцията на, бележки и предговор}% - {под ред.,\addabbrvspace бел\adddotspace и предг\adddot}}, - byeditoranaf = {{под редакцията на, бележки и послеслов}% - {под ред.,\addabbrvspace бел\adddotspace и послесл\adddot}}, - byeditortrcoin = {{под редакцията на, превод \lbx@lfromlang, коментари и уводна статия}% - {под ред.,\addabbrvspace прев\adddot\ \lbx@sfromlang, комент\adddotspace и ув\adddotspace ст\adddot}}, - byeditortrcofo = {{под редакцията на, превод \lbx@lfromlang, коментари и предгово}% - {под ред.,\addabbrvspace прев\adddot\ \lbx@sfromlang, комент\adddotspace и предг\adddot}}, - byeditortrcoaf = {{под редакцията на, превод \lbx@lfromlang, коментари и послеслов}% - {под ред.,\addabbrvspace прев\adddot\ \lbx@sfromlang, комент\adddotspace и послесл\adddot}}, - byeditortranin = {{под редакцията на, превод \lbx@lfromlang, бележки и уводна статия}% - {под ред.,\addabbrvspace прев\adddot\ \lbx@sfromlang, бел\adddotspace и ув\adddotspace ст\adddot}}, - byeditortranfo = {{под редакцията на, превод \lbx@lfromlang, бележки и предговор}% - {под ред.,\addabbrvspace прев\adddot\ \lbx@sfromlang, бел\adddotspace и предг\adddot}}, - byeditortranaf = {{под редакцията на, превод \lbx@lfromlang, бележки и послеслов}% - {под ред.,\addabbrvspace прев\adddot\ \lbx@sfromlang, бел\adddotspace и послесл\adddot}}, - bytranslatorco = {{превод \lbx@lfromlang\ и коментари}% - {прев\adddot\ \lbx@sfromlang\ и коммент\adddot}}, - bytranslatoran = {{превод \lbx@lfromlang\ и бележки}% - {прев\adddot\ \lbx@sfromlang\ и бел\adddot}}, - bytranslatorin = {{превод \lbx@lfromlang\ и уводна статия}% - {прев\adddot\ \lbx@sfromlang\ и ув\adddotspace ст\adddot}}, - bytranslatorfo = {{превод \lbx@lfromlang\ и предговор}% - {прев\adddot\ \lbx@sfromlang\ и предг\adddot}}, - bytranslatoraf = {{превод \lbx@lfromlang\ и послеслов}% - {прев\adddot\ \lbx@sfromlang\ и и послесл\adddot}}, - bytranslatorcoin = {{превод \lbx@lfromlang, коментари и уводна статия}% - {прев\adddot\ \lbx@sfromlang, комент\adddotspace и ув\adddotspace ст\adddot}}, - bytranslatorcofo = {{превод \lbx@lfromlang, коментари и предговор}% - {прев\adddot\ \lbx@sfromlang, комент\adddotspace и предг\adddot}}, - bytranslatorcoaf = {{превод \lbx@lfromlang, коментари и послеслов}% - {прев\adddot\ \lbx@sfromlang, комент\adddotspace и послесл\adddot}}, - bytranslatoranin = {{превод \lbx@lfromlang, бележки и уводна статия}% - {прев\adddot\ \lbx@sfromlang, бел\adddotspace и ув\adddotspace ст\adddot}}, - bytranslatoranfo = {{превод \lbx@lfromlang, бележки и предговор}% - {прев\adddot\ \lbx@sfromlang, бел\adddotspace и предг\adddot}}, - bytranslatoranaf = {{превод \lbx@lfromlang, бележки и послеслов}% - {прев\adddot\ \lbx@sfromlang, бел\adddotspace и послесл\adddot}}, - and = {{и}{и}}, - andothers = {{и\addabbrvspace др\adddot}{и\addabbrvspace др\adddot}}, - andmore = {{и\addabbrvspace др\adddot}{и\addabbrvspace др\adddot}}, - volume = {{том}{т\adddot}}, - volumes = {{тома}{т\adddot}}, - involumes = {{в}{в}}, - jourvol = {{том}{т\adddot}}, - jourser = {{поредица}{пор\adddot}}, - book = {{книга}{кн\adddot}}, - part = {{част}{ч\adddot}}, - issue = {{брой}{бр\adddot}}, - newseries = {{нова поредица}{нова пор\adddot}}, - oldseries = {{стара поредица}{стара пор\adddot}}, - edition = {{издание}{изд\adddot}}, - reprint = {{преиздание}{преизд\adddot}}, - reprintof = {{преиздание на}{преизд\adddotspace на}}, - reprintas = {{переиздадено като}{преизд\adddotspace като}}, - reprintfrom = {{преиздадено с}{преизд\adddotspace с}}, - translationof = {{превод по изданието\addcolon}{прев\adddotspace по изд\adddot\addcolon}}, - translationas = {{превод\addcolon}{прев\adddot\addcolon}}, - translationfrom = {{превод от}{прев\adddotspace от}}, - reviewof = {{рецензия на\addcolon}{рец\adddotspace на\addcolon}}, - origpubas = {{първо публикуване\addcolon}% - {първо публ\adddot\addcolon}}, - origpubin = {{първо публикувано в}% - {първо публ\adddotspace в}}, - astitle = {{под заглавие\addcolon}{под загл\adddot\addcolon}}, - bypublisher = {{издател\addcomma}{изд\addcomma}},% FIXME: unsure - nodate = {{б\adddot г\adddot}{б\adddot г\adddot}}, - page = {{страница}{с\adddot}}, - pages = {{страници}{с\adddot}}, - column = {{колона}{кол\adddot}}, - columns = {{колони}{кол\adddot}}, - line = {{ред}{ред}}, - lines = {{редове}{редове}}, - verse = {{стих}{стих}}, - verses = {{стихове}{стихове}}, - section = {{параграф}{\S}}, - sections = {{параграфи}{\S\S}}, - paragraph = {{абзац}{абз\adddot}}, - paragraphs = {{абзаци}{абз\adddot}}, -% pagetotal = {{}{}},% FIXME: missing -% pagetotals = {{}{}},% FIXME: missing -% columntotal = {{}{}},% FIXME: missing -% columntotals = {{}{}},% FIXME: missing -% linetotal = {{}{}},% FIXME: missing -% linetotals = {{}{}},% FIXME: missing -% versetotal = {{}{}},% FIXME: missing -% versetotals = {{}{}},% FIXME: missing -% sectiontotal = {{}{}},% FIXME: missing -% sectiontotals = {{}{}},% FIXME: missing -% paragraphtotal = {{}{}},% FIXME: missing -% paragraphtotals = {{}{}},% FIXME: missing - in = {{в}{в}}, - inseries = {{в}{в}}, - ofseries = {{от}{от}}, - number = {{номер}{№}}, - chapter = {{глава}{гл\adddot}}, - mathesis = {{маг\adddotspace\textellipsis\ дис\adddot} - {маг\adddotspace\textellipsis\ дис\adddot}}, - phdthesis = {{докт\adddotspace\textellipsis\ дис\adddot} - {докт\adddotspace\textellipsis\ дис\adddot}}, - candthesis = {{канд\adddotspace\textellipsis\ дис\adddot} - {канд\adddotspace\textellipsis\ дис\adddot}}, - resreport = {{научен доклад}{научен докл\adddot}}, - techreport = {{технически доклад}{техн\adddotspace докл\adddot}}, - software = {{програмно обезпечение}{прогр\adddotspace обезп\adddot}}, - datacd = {{CD-ROM}{CD-ROM}}, - audiocd = {{audio CD}{audio CD}}, - version = {{версия}{вер\adddot}}, - url = {{url}{url}}, - urlfrom = {{режим на достъп}{режим на достъп}}, - urlseen = {{дата на посещение}{дата\addabbrvspace на посещ\adddot}}, - inpreparation = {{в\addabbrvspace подготовка на}{в подг\adddotspace на}}, - submitted = {{изпратено}{изпр\adddot}}, - forthcoming = {{предстоящо публикуване}{предст\adddotspace публ\adddot}}, - inpress = {{под\addabbrvspace печат}{под печ\adddot}}, - prepublished = {{предварителна публикация}{предв\adddotspace публ\adddot}},% FIXME: unsure - citedas = {{по-нататък цитирано като}{по-нататък цит\addabbrvspace като}}, - thiscite = {{тук}{тук}}, - seenote = {{виж бележката под линия}{вж\adddotspace бел\adddotspace под линия}}, - quotedin = {{цитирано в}{цит\adddotspace в}}, - idem = {{същия\addabbrvspace автор}{същ\adddotspace авт\adddot}}, - idemsm = {{същия\addabbrvspace автор}{същ\adddotspace авт\adddot}}, - idemsf = {{същия\addabbrvspace автор}{същ\adddotspace авт\adddot}}, - idemsn = {{същия\addabbrvspace автор}{същ\adddotspace авт\adddot}}, - idempm = {{същите\addabbrvspace автори}{същ\adddotspace авт\adddot}}, - idempf = {{същите\addabbrvspace автори}{същ\adddotspace авт\adddot}}, - idempn = {{същите\addabbrvspace автори}{същ\adddotspace авт\adddot}}, - idempp = {{същите\addabbrvspace автори}{същ\adddotspace авт\adddot}}, - ibidem = {{пак\addabbrvspace там}{пак\addabbrvspace там}}, - opcit = {{цит\adddotspace съч\adddot}{цит\adddotspace съч\adddot}}, - loccit = {{цит\adddotspace място}{цит\adddotspace място}}, - confer = {{сравни}{срв\adddot}}, - sequens = {{и следващата}{и\addabbrvspace следв\adddot}}, - sequentes = {{и следващите}{и\addabbrvspace следв\adddot}}, - passim = {{навсякъде}{навс\adddot}}, - see = {{виж}{вж\adddot}}, - seealso = {{виж също}{вж\adddotspace също}}, - backrefpage = {{цитирано на страница}{цит\adddotspace на\addabbrvspace с\adddot}}, - backrefpages = {{цитирано на страници}{цит\adddotspace на\addabbrvspace с\adddot}}, - january = {{януари}{ян\adddot}}, - february = {{февруари}{февр\adddot}}, - march = {{март}{март}}, - april = {{април}{апр\adddot}}, - may = {{май}{май}}, - june = {{юни}{юни}}, - july = {{юли}{юли}}, - august = {{август}{авг\adddot}}, - september = {{септември}{септ\adddot}}, - october = {{октомври}{окт\adddot}}, - november = {{ноември}{ноем\adddot}}, - december = {{декември}{дек\adddot}}, - datejanuary = {{януари}{ян\adddot}}, - datefebruary = {{февруари}{февр\adddot}}, - datemarch = {{март}{март}}, - dateapril = {{април}{апр\adddot}}, - datemay = {{май}{май}}, - datejune = {{юни}{юни}}, - datejuly = {{юли}{юли}}, - dateaugust = {{август}{авг\adddot}}, - dateseptember = {{септември}{септ\adddot}}, - dateoctober = {{октомври}{окт\adddot}}, - datenovember = {{ноември}{ноем\adddot}}, - datedecember = {{декември}{дек\adddot}}, - langamerican = {{американски}{амер\adddot}}, - langbrazilian = {{бразилски}{браз\adddot}}, - langbulgarian = {{български}{бълг\adddot}}, - langcatalan = {{каталунски}{катал\adddot}}, - langcroatian = {{хърватски}{хърв\adddot}}, - langczech = {{чешки}{чеш\adddot}}, - langdanish = {{датски}{дат\adddot}}, - langdutch = {{нидерландски}{нидерл\adddot}}, - langenglish = {{английски}{англ\adddot}}, - langestonian = {{естонски}{ест\adddot}}, - langfinnish = {{фински}{фин\adddot}}, - langfrench = {{френски}{фр\adddot}}, - langgalician = {{галисийски}{гал\adddot}}, - langgerman = {{немски}{нем\adddot}}, - langgreek = {{гръцки}{гр\adddot}}, - langitalian = {{италиански}{итал\adddot}}, - langjapanese = {{японски}{яп\adddot}}, - langlatin = {{латински}{лат\adddot}}, - langnorwegian = {{норвежки}{норв\adddot}}, - langpolish = {{полски}{пол\adddot}}, - langportuguese = {{португалски}{порт\adddot}}, - langrussian = {{русски}{рус\adddot}}, - langslovene = {{словенски}{слов\adddot}}, - langspanish = {{испански}{исп\adddot}}, - langswedish = {{шведски}{швед\adddot}}, - fromamerican = {{от американски}{от\addabbrvspace амер\adddot}}, - frombrazilian = {{от бразилски}{от\addabbrvspace браз\adddot}}, - frombulgarian = {{от български}{от\addabbrvspace бълг\adddot}}, - fromcatalan = {{от каталунски}{от\addabbrvspace катал\adddot}}, - fromcroatian = {{от хърватски}{от\addabbrvspace хърв\adddot}}, - fromczech = {{от чешки}{от\addabbrvspace чеш\adddot}}, - fromdanish = {{от датски}{от\addabbrvspace дат\adddot}}, - fromdutch = {{от нидерландски}{от\addabbrvspace нидерл\adddot}}, - fromenglish = {{от английски}{от\addabbrvspace англ\adddot}}, - fromestonian = {{от естонски}{от\addabbrvspace эст\adddot}}, - fromfinnish = {{от фински}{от\addabbrvspace фин\adddot}}, - fromfrench = {{от френски}{от\addabbrvspace фр\adddot}}, - fromgalician = {{от галисийски}{от\addabbrvspace гал\adddot}}, - fromgerman = {{от немски}{от\addabbrvspace нем\adddot}}, - fromgreek = {{от гръцки}{от\addabbrvspace греч\adddot}}, - fromitalian = {{от италиански}{от\addabbrvspace итал\adddot}}, - fromjapanese = {{от японски}{от\addabbrvspace яп\adddot}}, - fromlatin = {{от латински}{от\addabbrvspace лат\adddot}}, - fromnorwegian = {{от норвежки}{от\addabbrvspace норв\adddot}}, - frompolish = {{от полски}{от пол\adddot}}, - fromportuguese = {{от португалски}{от\addabbrvspace порт\adddot}}, - fromrussian = {{от руски}{от\addabbrvspace рус\adddot}}, - fromslovene = {{от словенски}{от\addabbrvspace слов\adddot}}, - fromspanish = {{от испански}{от\addabbrvspace исп\adddot}}, - fromswedish = {{от шведски}{от\addabbrvspace швед\adddot}}, - countryde = {{Германия}{Германия}}, - countryeu = {{Европейски съюз}{ЕС}}, - countryep = {{Европейски съюз}{ЕС}}, - countryfr = {{Франция}{Франция}}, - countryuk = {{Великобритания}{Великобритания}}, - countryus = {{Съединени американски щати}{САЩ}}, - patent = {{патент}{пат\adddot}}, - patentde = {{патент на Германия}{пат\adddotspace на Германия}}, - patenteu = {{патент на Европа}{пат\adddotspace на Европа}}, - patentfr = {{патент на Франция}{пат\adddotspace на Франции}}, - patentuk = {{патент на Великобритания}{пат\adddotspace на Великобритания}}, - patentus = {{патент на САЩ}{пат\adddotspace на САЩ}}, - patreq = {{заявка}{заявка}}, - patreqde = {{заявка за патент на Германии}{заявка за пат\adddotspace на Германия}}, - patreqeu = {{заявка за патент на Европа}{заявка за пат\adddotspace на Европа}}, - patreqfr = {{заявка за патент на Франция}{заявка за пат\adddotspace на Франция}}, - patrequk = {{заявка за патент на Великобритания}{заявка за пат\adddotspace на Великобритания}}, - patrequs = {{заявка за патент на САЩ}{заявка за пат\adddotspace на САЩ}}, - file = {{файл}{файл}}, - library = {{библиотека}{б-ка}}, - abstract = {{резюме}{рез\adddot}}, - annotation = {{анотация}{анот\adddot}}, - commonera = {{новата ера}{н\adddotspace е\adddot}}, - beforecommonera = {{до новата ера}{до н\adddotspace е\adddot}}, - annodomini = {{след Христа}{сл\adddotspace Хр\adddot}}, - beforechrist = {{до Христа}{до Хр\adddot}}, - circa = {{около}{ок\adddot}}, - spring = {{пролет}{пролет}}, - summer = {{лято}{лято}}, - autumn = {{есен}{есен}}, - winter = {{зима}{зима}}, - am = {{преди обяд}{преди обяд}}, - pm = {{след обяд}{сдед обяд}}, -} - -\protected\gdef\lbx@bg@mkbibdatemonth#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
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx index 257bc601e2c..8b6675d12b0 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx @@ -11,7 +11,7 @@ \protected\def\mkbibmascord#1{% \begingroup \@tempcnta0#1\relax\number\@tempcnta - \ifcase\@tempcnta\or r\or n\or r\or t\else\`e\fi + \ifcase\@tempcnta\or r\or n\or r\or t\else\`e\fi \endgroup}% \protected\def\mkbibfemord#1{\stripzeros{#1}a}% \protected\def\mkbibdatelong#1#2#3{% maintainers: check me @@ -266,9 +266,6 @@ {trad.,\addabbrvspace anot\adddotspace i aut\adddotspace de l'ep\adddot}}, translatorsanaf = {{traductors, anotadors i autors de l'ep{\'\i}leg} {trad.,\addabbrvspace anot\adddotspace i aut\adddotspace de l'ep\adddot}}, -% organizer = {{}{}},% FIXME: missing -% organizers = {{}{}},% FIXME: missing -% byorganizer = {{}{}},% FIXME: missing byauthor = {{per}{per}}, byeditor = {{edici\'o a cura \smartof}{ed\adddotspace\smartof}}, bycompiler = {{compilaci\'o a cura \smartof}{comp\adddotspace\smartof}}, @@ -384,27 +381,15 @@ pages = {{p\`agines}{p\`ag\adddot}}, column = {{columna}{col\adddot}}, columns = {{columnes}{cols\adddot}}, - line = {{l{\'\i}nia}{l{\'\i}n\adddot}}, + line = {{l{\'\i}nia}{l{\'\i}n\adddot}}, lines = {{l{\'\i}nies}{l{\'\i}n\adddot}}, nodate = {{sine data}{s\adddotspace d\adddot}}, - verse = {{vers}{v\adddot}}, + verse = {{vers}{v\adddot}}, verses = {{versos}{v\adddot}}, section = {{apartat}{\S}}, sections = {{apartats}{\S}}, paragraph = {{par\`agraf}{\P}}, paragraphs = {{par\`agrafs}{\P}}, -% pagetotal = {{}{}},% FIXME: missing -% pagetotals = {{}{}},% FIXME: missing -% columntotal = {{}{}},% FIXME: missing -% columntotals = {{}{}},% FIXME: missing -% linetotal = {{}{}},% FIXME: missing -% linetotals = {{}{}},% FIXME: missing -% versetotal = {{}{}},% FIXME: missing -% versetotals = {{}{}},% FIXME: missing -% sectiontotal = {{}{}},% FIXME: missing -% sectiontotals = {{}{}},% FIXME: missing -% paragraphtotal = {{}{}},% FIXME: missing -% paragraphtotals = {{}{}},% FIXME: missing in = {{a}{a}}, inseries = {{\smartof}{\smartof}}, ofseries = {{\smartof}{\smartof}}, @@ -464,17 +449,15 @@ december = {{desembre}{des\adddot}}, langamerican = {{angl\`es americ\`a}{ang\adddotspace amer\adddot}}, langbrazilian = {{portugu\`es brasiler}{port\adddotspace bras\adddot}}, -% langbulgarian = {{}{}},% FIXME: missing langcatalan = {{catal\`a}{cat\adddot}}, langczech = {{txec}{txec}}, langcroatian = {{croat}{croat}}, langdanish = {{dan\`es}{dan\adddot}}, langdutch = {{neerland\`es}{neerl\adddot}}, langenglish = {{angl\`es}{ang\adddot}}, -% langestonian = {{}{}},% FIXME: missing +% langestonian = {{}{}},% FIXME: missing langfinnish = {{fin\`es}{fin\adddot}}, langfrench = {{franc\`es}{fr\adddot}}, - langgalician = {{gallec}{gal\adddot}}, langgerman = {{alemany}{al\adddot}}, langgreek = {{grec}{grec}}, langitalian = {{itali\`a}{it\adddot}}, @@ -488,17 +471,15 @@ langswedish = {{suec}{suec}}, fromamerican = {{de l'angl\`es americ\`a}{de l'ang\adddotspace amer\adddot}}, frombrazilian = {{del portugu\`es brasiler}{del port\adddotspace bras\adddot}}, -% frombulgarian = {{}{}},% FIXME: missing fromcatalan = {{del catal\`a}{del cat\adddot}}, fromcroatian = {{del croat}{del croat}}, fromczech = {{del txec}{del txec}}, fromdanish = {{del dan\`es}{del dan\adddot}}, fromdutch = {{del neerland\`es}{del neerl\adddot}}, fromenglish = {{de l'angl\`es}{de l'ang\adddot}}, -% fromestonian = {{}{}},% FIXME: missing +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{del fin\`es}{del fin\adddot}}, fromfrench = {{del franc\`es}{del fr\adddot}}, - fromgalician = {{del gallec}{del gal\adddot}}, fromgerman = {{de l'alemany}{de l'al\adddot}}, fromgreek = {{del grec}{del grec}}, fromitalian = {{de l'itali\`a}{de l'it\adddot}}, @@ -530,8 +511,8 @@ patrequs = {{so\l.licitud de patent estatunidenca}{so\l.l\adddotspace de pat\adddot\ EUA}}, file = {{fitxer}{fitx\adddot}}, library = {{biblioteca}{bibl\adddot}}, - abstract = {{resum}{res\adddot}}, - annotation = {{nota}{n\adddot}}, + abstract = {{resum}{res\adddot}}, + annotation = {{nota}{n\adddot}}, commonera = {{Era Comuna}{EC}}, beforecommonera = {{abans de l’Era Comuna}{AEC}}, annodomini = {{despr\'es de Crist}{dC}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx index f47be0901c9..cacb3ced281 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx @@ -262,9 +262,6 @@ {prijevod, bilje\v{s}ke i pogovor}}, translatorsanaf = {{prijevod, bilje\v{s}ke i pogovor}% {prijevod, bilje\v{s}ke i pogovor}}, -% organizer = {{}{}},% FIXME: missing -% organizers = {{}{}},% FIXME: missing -% byorganizer = {{}{}},% FIXME: missing byauthor = {{autor\addcolon}{autor\addcolon}},% gender biased byeditor = {{obrada\addcolon}{ur\adddot}},% bycompiler = {{sastavlja\v{c}\addcolon}{sast\adddot}},% gender biased @@ -377,31 +374,19 @@ % origpubin = {{}{}},% FIXME: missing % astitle = {{}{}},% FIXME: missing % bypublisher = {{}{}},% FIXME: missing - nodate = {{no date}{n\adddot d\adddot}},% FIXME page = {{stranica}{str\adddot}}, pages = {{stranice}{str\adddot}}, column = {{stupac}{stupac}}, columns = {{stupci}{stupci}}, line = {{linija}{l\adddot}}, lines = {{linije}{ll\adddot}}, + nodate = {{no date}{n\adddot d\adddot}},% FIXME verse = {{stih}{stih}}, verses = {{stihovi}{stihovi}}, section = {{odjeljak}{\S}}, sections = {{odjeljci}{\S\S}}, paragraph = {{stavak}{st\adddot}}, paragraphs = {{stavci}{st\adddot}}, -% pagetotal = {{}{}},% FIXME: missing -% pagetotals = {{}{}},% FIXME: missing -% columntotal = {{}{}},% FIXME: missing -% columntotals = {{}{}},% FIXME: missing -% linetotal = {{}{}},% FIXME: missing -% linetotals = {{}{}},% FIXME: missing -% versetotal = {{}{}},% FIXME: missing -% versetotals = {{}{}},% FIXME: missing -% sectiontotal = {{}{}},% FIXME: missing -% sectiontotals = {{}{}},% FIXME: missing -% paragraphtotal = {{}{}},% FIXME: missing -% paragraphtotals = {{}{}},% FIXME: missing in = {{}{}},% FIXME: check inseries = {{u seriji}{u seriji}}, ofseries = {{iz serije}{iz serije}}, @@ -473,17 +458,15 @@ datedecember = {{prosinca}{prosinca}}, langamerican = {{engleski}{engleski}}, langbrazilian = {{portugalski}{portugalski}}, -% langbulgarian = {{}{}},% FIXME: missing % langcatalan = {{}{}},% FIXME: missing langcroatian = {{hrvatski}{hrvatski}}, % langczech = {{}{}},% FIXME: missing langdanish = {{danski}{danski}}, langdutch = {{nizozemski}{nizozemski}}, langenglish = {{engleski}{engleski}}, -% langestonian = {{}{}},% FIXME: missing +% langestonian = {{}{}},% FIXME: missing % langfinnish = {{}{}},% FIXME: missing langfrench = {{francuski}{francuski}}, - langgalician = {{galicijski}{galicijski}}, langgerman = {{njema\v{c}ki}{njema\v{c}ki}}, langgreek = {{gr\v{c}ki}{gr\v{c}ki}}, langitalian = {{talijanski}{talijanski}}, @@ -497,17 +480,15 @@ langswedish = {{\v{s}vedski}{\v{s}vedski}}, fromamerican = {{s engleskog}{s engleskog}}, frombrazilian = {{s portugalskog}{s portugalskog}}, -% frombulgarian = {{}{}},% FIXME: missing % fromcatalan = {{}{}},% FIXME: missing fromcroatian = {{s hrvatskog}{s hrvatskog}}, % fromczech = {{}{}},% FIXME: missing fromdanish = {{s danskog}{s danskog}}, fromdutch = {{s nizozemskog}{s nizozemskog}}, fromenglish = {{s engleskog}{s engleskog}}, -% fromestonian = {{}{}},% FIXME: missing +% fromestonian = {{}{}},% FIXME: missing % fromfinnish = {{}{}},% FIXME: missing fromfrench = {{s francuskog}{s francuskog}}, - fromgalician = {{s galicijskog}{s galicijskog}}, fromgerman = {{s njema\v{c}kog}{s njema\v{c}kog}}, fromgreek = {{s gr\v{c}kog}{s gr\v{c}kog}}, fromitalian = {{s talijanskog}{s talijanskog}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx index e5a2dc1908e..0a8cfeeef94 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx @@ -32,8 +32,8 @@ {} {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#1} - {} - {\iffieldundef{#3}{/}{\adddot\thinspace}}}% + {} + {\iffieldundef{#3}{/}{\adddot\thinspace}}}% \iffieldbibstring{#1} {\bibstring{\thefield{#1}}} {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% @@ -199,9 +199,6 @@ translatorsanfo = {{p\v{r}eklad, anotace,\ a p\v{r}edmluva}{p\v{r}ekl., anot\adddot\ a p\v{r}edml\adddot}}, translatoranaf = {{p\v{r}eklad, anotace,\ a doslov}{p\v{r}ekl., anot\adddot\ a dosl\adddot}}, translatorsanaf = {{p\v{r}eklad, anotace,\ a doslov}{p\v{r}ekl., anot\adddot\ a dosl\adddot}}, -% organizer = {{}{}},% FIXME: missing -% organizers = {{}{}},% FIXME: missing -% byorganizer = {{}{}},% FIXME: missing byauthor = {{by}{by}}, byeditor = {{editov\'{a}no}{ed\adddotspace}}, bycompiler = {{sestaveno}{comp\adddotspace}}, @@ -300,31 +297,19 @@ origpubin = {{p\r{u}vodn\v{e} vyd\'{a}no v}{p\r{u}v\adddotspace vyd\adddotspace v}}, astitle = {{jako}{as}}, bypublisher = {{od}{od}},% nejist\'{e} - nodate = {{n\adddot d\adddot}{n\adddot d\adddot}},%FIXME page = {{strana}{s\adddot}}, pages = {{strany}{s\adddot}}, column = {{sloupek}{sl\adddot}},% nebo sloupec? columns = {{sloupce}{sl\adddot}}, line = {{\v{r}\'{a}dek}{\v{r}\adddot}}, lines = {{\v{r}\'{a}dky}{\v{r}\adddot}}, + nodate = {{n\adddot d\adddot}{n\adddot d\adddot}},%FIXME verse = {{ver\v{s}}{v\adddot}}, verses = {{ver\v{s}e}{v\adddot}}, section = {{sekce}{\S}}, sections = {{sekce}{\S\S}}, paragraph = {{odstavec}{ods\adddot}}, paragraphs = {{odstavce}{ods\adddot}}, -% pagetotal = {{}{}},% FIXME: missing -% pagetotals = {{}{}},% FIXME: missing -% columntotal = {{}{}},% FIXME: missing -% columntotals = {{}{}},% FIXME: missing -% linetotal = {{}{}},% FIXME: missing -% linetotals = {{}{}},% FIXME: missing -% versetotal = {{}{}},% FIXME: missing -% versetotals = {{}{}},% FIXME: missing -% sectiontotal = {{}{}},% FIXME: missing -% sectiontotals = {{}{}},% FIXME: missing -% paragraphtotal = {{}{}},% FIXME: missing -% paragraphtotals = {{}{}},% FIXME: missing in = {{in}{in}},% Pouziti napriklad u sborniku nebo inseries = {{in}{in}},% casopisu, zni to lip new "v". % V pripade potreby pouzit lokalni lbx soubor @@ -385,17 +370,15 @@ december = {{prosince}{pros\adddot}}, langamerican = {{americk\'{a} angli\v{c}tina}{am\adddot angl\adddot}}, langbrazilian = {{brazilsk\'{a} portugal\v{s}tina}{braz\adddot portugal\adddot}}, -% langbulgarian = {{}{}},% FIXME: missing % langcatalan = {{}{}},% FIXME: missing langcroatian = {{chorvat\v{s}tina}{chorv\adddot}}, % langczech = {{}{}},% FIXME: missing langdanish = {{d\'{a}n\v{s}tina}{d\'{a}n\adddot}}, langdutch = {{holand\v{s}tina}{hol.\adddot}}, langenglish = {{angli\v{c}tina}{angl\adddot}}, -% langestonian = {{}{}},% FIXME: missing +% langestonian = {{}{}},% FIXME: missing langfinnish = {{fin\v{s}tina}{fin\adddot}}, langfrench = {{francouz\v{s}tina}{franc\adddot}}, - langgalician = {{galicij\v{s}tina}{gal\adddot}}, langgerman = {{n\v{e}m\v{c}ina}{n\v{e}m\adddot}}, langgreek = {{\v{r}e\v{c}tina}{\v{r}e\v{c}\adddot}}, langitalian = {{ital\v{s}tina}{ital\adddot}}, @@ -408,17 +391,15 @@ langswedish = {{\v{s}v\'{e}d\v{s}tina}{\v{s}v\'{e}d\adddot}}, fromamerican = {{z americk\'{e} angli\v{c}tiny}{z amer\adddot angl\adddot}}, frombrazilian = {{z brazilsk\'{e} portugal\v{s}tiny}{z braz\adddotspace port\adddot}}, -% frombulgarian = {{}{}},% FIXME: missing % fromcatalan = {{}{}},% FIXME: missing fromcroatian = {{z chorvat\v{s}tiny}{z chorv.}}, % fromczech = {{}{}},% FIXME: missing fromdanish = {{z d\'{a}n\v{s}tiny}{z d\'{a}n\adddot}}, fromdutch = {{z holand\v{s}tiny}{z hol\adddot}}, fromenglish = {{z angli\v{c}tiny}{z angl\adddot}}, -% fromestonian = {{}{}},% FIXME: missing +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{z fin\v{s}tiny}{z fin.}}, fromfrench = {{z francouz\v{s}tiny}{z franc\adddot}}, - fromgalician = {{z galicij\v{s}tiny}{z gal\adddot}}, fromgerman = {{z n\v{e}m\v{c}iny}{z n\v{e}m\adddot}}, fromgreek = {{z \v{r}e\v{c}tiny}{z \v{r}e\v{c}\adddot}}, fromitalian = {{z ital\v{s}tiny}{z ital\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx index b2f229d0fae..c9786e9ee96 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx @@ -242,9 +242,6 @@ {overs., forkl\adddotspace og efterord}}, translatorsanaf = {{overs\ae ttere, forklaringer og efterord}% {overs., forkl\adddotspace og efterord}}, -% organizer = {{}{}},% FIXME: missing -% organizers = {{}{}},% FIXME: missing -% byorganizer = {{}{}},% FIXME: missing byauthor = {{af}{af}}, byeditor = {{udgivet af}{udg\adddotspace af}}, bycompiler = {{kompileret af}{komp\adddotspace af}}, @@ -363,13 +360,13 @@ origpubin = {{oprindeligt udgivet i}{oprindeligt udgivet i}},% FIXME: check astitle = {{i}{i}},% FIXME: check bypublisher = {{af}{af}},% FIXME: check - nodate = {{n\adddot d\adddot}{n\adddot d\adddot}},%FIXME page = {{side}{s\adddot}}, pages = {{sider}{s\adddot}}, column = {{spalte}{sp\adddot}}, columns = {{spalter}{sp\adddot}}, line = {{linje}{l\adddot}}, lines = {{linjer}{l\adddot}}, + nodate = {{n\adddot d\adddot}{n\adddot d\adddot}},%FIXME verse = {{vers}{v\adddot}}, verses = {{vers}{v\adddot}}, section = {{afsnit}{\S}},% FIXME: check @@ -379,18 +376,6 @@ % sections = {{paragrafer}{\S\S}}, % paragraph = {{}{}},% FIXME: missing % paragraphs = {{}{}},% FIXME: missing -% pagetotal = {{}{}},% FIXME: missing -% pagetotals = {{}{}},% FIXME: missing -% columntotal = {{}{}},% FIXME: missing -% columntotals = {{}{}},% FIXME: missing -% linetotal = {{}{}},% FIXME: missing -% linetotals = {{}{}},% FIXME: missing -% versetotal = {{}{}},% FIXME: missing -% versetotals = {{}{}},% FIXME: missing -% sectiontotal = {{}{}},% FIXME: missing -% sectiontotals = {{}{}},% FIXME: missing -% paragraphtotal = {{}{}},% FIXME: missing -% paragraphtotals = {{}{}},% FIXME: missing in = {{i}{i}}, inseries = {{r\ae kken}{r\ae kken}}, ofseries = {{af r\ae kken}{af r\ae kken}}, @@ -452,17 +437,15 @@ december = {{december}{dec\adddot}}, langamerican = {{amerikansk-engelsk}{amerikansk-engelsk}}, langbrazilian = {{brasiliansk-portugisisk}{brasiliansk-portugisisk}}, -% langbulgarian = {{}{}},% FIXME: missing langcatalan = {{catalansk}{catalansk}}, langcroatian = {{kroatisk}{kroatisk}}, langczech = {{tjekkisk}{tjekkisk}}, langdanish = {{dansk}{dansk}}, langdutch = {{nederlandsk}{nederlandsk}}, langenglish = {{engelsk}{engelsk}}, -% langestonian = {{}{}},% FIXME: missing +% langestonian = {{}{}},% FIXME: missing langfinnish = {{finsk}{finsk}}, langfrench = {{fransk}{fransk}}, - langgalician = {{galicisk}{galicisk}}, langgerman = {{tysk}{tysk}}, langgreek = {{gr\ae sk}{gr\ae sk}}, langitalian = {{italiensk}{italiensk}}, @@ -476,17 +459,15 @@ langswedish = {{svensk}{svensk}}, fromamerican = {{fra amerikansk-engelsk}{fra amerikansk-engelsk}}, frombrazilian = {{fra brasiliansk-portugisisk}{fra brasiliansk-portugisisk}}, -% frombulgarian = {{}{}},% FIXME: missing fromcatalan = {{fra catalansk}{fra catalansk}}, fromcroatian = {{fra kroatisk}{fra kroatisk}}, fromczech = {{fra tjekkisk}{fra tjekkisk}}, fromdanish = {{fra dansk}{fra dansk}}, fromdutch = {{fra nederlandsk}{fra nederlandsk}}, fromenglish = {{fra engelsk}{fra engelsk}}, -% fromestonian = {{}{}},% FIXME: missing +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{fra finsk}{fra finsk}}, fromfrench = {{fra fransk}{fra fransk}}, - fromgalician = {{fra galicisk}{fra galicisk}}, fromgerman = {{fra tysk}{fra tysk}}, fromgreek = {{fra gr\ae sk}{fra gr\ae sk}}, fromitalian = {{fra italiensk}{fra italiensk}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx index 95469a497e8..e9a068242a5 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx @@ -250,9 +250,6 @@ {vert., annot\adddotspace en naw\adddot}}, translatorsanaf = {{vertaling, annotaties en nawoord}% {vert., annot\adddotspace en naw\adddot}}, -% organizer = {{}{}},% FIXME: missing -% organizers = {{}{}},% FIXME: missing -% byorganizer = {{}{}},% FIXME: missing byauthor = {{door}{door}}, byeditor = {{geredigeerd door}{red\adddot\addabbrvspace door}}, bycompiler = {{samengesteld door}{sam\adddot\addabbrvspace door}}, @@ -367,8 +364,8 @@ translationas = {{vertaald als}{vert\adddotspace als}}, translationfrom = {{vertaald van}{vert\adddotspace van}}, reviewof = {{bespreking van}{bespr\adddotspace van}}, - origpubas = {{oorspronkelijk gepubliceerd als}{oorspr\adddotspace gep\adddotspace als}}, - origpubin = {{oorspronkelijk gepubliceerd in}{oorspr\adddotspace gep\adddotspace in}}, + 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}}, @@ -376,7 +373,6 @@ % forthcoming = {{onderweg}{onderweg}},% FIXME: check inpress = {{in druk}{in druk}}, prepublished = {{voorpublicatie}{voorpublicatie}}, - nodate = {{geen\space datum}{{}g\adddot d\adddot}}, page = {{pagina}{p\adddot}}, pages = {{pagina's}{p\adddot}}, column = {{kolom}{kol\adddot}}, @@ -389,18 +385,7 @@ verses = {{verzen}{v\adddot}}, line = {{regel}{r\adddot}}, lines = {{regels}{r\adddot}}, - pagetotal = {{pagina}{p\adddot}}, - pagetotals = {{pagina's}{p\adddot}}, - columntotal = {{kolom}{kol\adddot}}, - columntotals = {{kolommen}{kol\adddot}}, - linetotal = {{regel}{r\adddot}}, - linetotals = {{regels}{r\adddot}}, - versetotal = {{vers}{v\adddot}}, - versetotals = {{verzen}{v\adddot}}, - sectiontotal = {{sectie}{\S}}, - sectiontotals = {{secties}{\S}}, - paragraphtotal = {{paragraaf}{par\adddot}}, - paragraphtotals = {{paragrafen}{par\adddot}}, + nodate = {{geen\space datum}{{}g\adddot d\adddot}}, mathesis = {{masterscriptie}{masterscriptie}}, phdthesis = {{proefschrift}{proefschrift}}, resreport = {{onderzoeksrapport}{onderzoeksrap\adddot}}, @@ -455,58 +440,48 @@ december = {{december}{dec}}, langamerican = {{Amerikaans Engels}{Amerikaans Engels}}, langbrazilian = {{Braziliaans Portugeens}{Braziliaans Portugees}}, - langbulgarian = {{Bulgaars}{Bulgaars}}, langcatalan = {{Catalaans}{Catalaans}}, langcroatian = {{Kroatisch}{Kroatisch}}, langczech = {{Tsjechisch}{Tsjechisch}}, langdanish = {{Deens}{Deens}}, langdutch = {{Nederlands}{Nederlands}}, langenglish = {{Engels}{Engels}}, - langestonian = {{Estisch}{Estisch}}, +% langestonian = {{}{}},% FIXME: missing langfinnish = {{Fins}{Fins}}, langfrench = {{Frans}{Frans}}, - langgalician = {{Galicisch}{Galicisch}}, langgerman = {{Duits}{Duits}}, langgreek = {{Grieks}{Grieks}}, langitalian = {{Italiaans}{Italiaans}}, - langjapanese = {{Japaans}{Japaans}}, langlatin = {{Latijn}{Latijn}}, langnorwegian = {{Noors}{Noors}}, langpolish = {{Pools}{Pools}}, langportuguese = {{Portugees}{Portugees}}, langrussian = {{Russisch}{Russisch}}, - langslovak = {{Slowaaks}{Slowaaks}},% FIXME: or Slovaaks - langslovene = {{Sloveens}{Sloveens}}, +% langslovene = {{}{}},% FIXME: missing langspanish = {{Spaans}{Spaans}}, langswedish = {{Zweeds}{Zweeds}}, - langukrainian = {{Oekra\"iens}{Oekra\"iens}}, fromamerican = {{uit het Amerikaans Engels}{uit het Amerikaans Engels}}, frombrazilian = {{uit het Braziliaans Portugees}{uit het Braziliaans Portugees}}, - frombulgarian = {{uit het Bulgaars}{uit het Bulgaars}}, 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}}, - fromestonian = {{uit het Estisch}{uit het Estisch}}, +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{uit het Fins}{uit het Fins}}, fromfrench = {{uit het Frans}{uit het Frans}}, - fromgalician = {{uit het Galicisch}{uit het Galicisch}}, fromgerman = {{uit het Duits}{uit het Duits}}, fromgreek = {{uit het Grieks}{uit het Grieks}}, fromitalian = {{uit het Italiaans}{uit het Italiaans}}, - fromjapanese = {{uit het Japaans}{uit het Japaans}}, fromlatin = {{uit het Latijn}{uit het Latijn}}, fromnorwegian = {{uit het Noors}{uit het Noors}}, frompolish = {{uit het Pools}{uit het Pools}}, fromportuguese = {{uit het Portugees}{uit het Portugees}}, fromrussian = {{uit het Russisch}{uit het Russisch}}, - fromslovak = {{uit het Slowaaks}{uit het Slowaaks}},% FIXME: or Slovaaks - fromslovene = {{uit het Sloveens}{uit het Sloveens}}, +% fromslovene = {{}{}},% FIXME: missing fromspanish = {{uit het Spaans}{uit het Spaans}}, fromswedish = {{uit het Zweeds}{uit het Zweeds}}, - fromukrainian = {{uit het Oekra\"iens}{uit het Oekra\"iens}}, countryde = {{Duitsland}{DE}}, countryeu = {{Europese Unie}{EU}}, countryep = {{Europese Unie}{EP}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx index fefd5e87f94..b8f5ff5728c 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx @@ -27,7 +27,7 @@ canadian,australian,newzealand,USenglish,UKenglish} {\mkbibmonth{\thefield{#2}}% \iffieldundef{#3} {\iffieldundef{#1}{}{\space}} - {\nobreakspace}}% + {\nobreakspace}}% \iffieldundef{#3} {} {\stripzeros{\thefield{#3}}% @@ -268,9 +268,6 @@ canadian,australian,newzealand,USenglish,UKenglish} {trans., annot\adddot\finalandcomma\ and afterw\adddot}}, translatorsanaf = {{translation, annotations\finalandcomma\ and afterword}% {trans., annot\adddot\finalandcomma\ and afterw\adddot}}, - organizer = {{organizer}{org\adddot}}, - organizers = {{organizers}{orgs\adddot}}, - byorganizer = {{organized by}{org\adddotspace by}}, byauthor = {{by}{by}}, byeditor = {{edited by}{ed\adddotspace by}}, bycompiler = {{compiled by}{comp\adddotspace by}}, @@ -382,31 +379,19 @@ canadian,australian,newzealand,USenglish,UKenglish} origpubin = {{originally published in}{orig\adddotspace pub\adddotspace in}}, astitle = {{as}{as}}, bypublisher = {{by}{by}}, - nodate = {{no date}{n\adddot d\adddot}}, page = {{page}{p\adddot}}, pages = {{pages}{pp\adddot}}, column = {{column}{col\adddot}}, columns = {{columns}{cols\adddot}}, line = {{line}{l\adddot}}, lines = {{lines}{ll\adddot}}, + nodate = {{no date}{n\adddot d\adddot}}, verse = {{verse}{v\adddot}}, verses = {{verses}{vv\adddot}}, section = {{section}{\S}}, sections = {{sections}{\S\S}}, paragraph = {{paragraph}{par\adddot}}, paragraphs = {{paragraphs}{par\adddot}}, - pagetotal = {{page}{p\adddot}}, - pagetotals = {{pages}{pp\adddot}}, - columntotal = {{column}{col\adddot}}, - columntotals = {{columns}{cols\adddot}}, - linetotal = {{line}{l\adddot}}, - linetotals = {{lines}{ll\adddot}}, - versetotal = {{verse}{v\adddot}}, - versetotals = {{verses}{vv\adddot}}, - sectiontotal = {{section}{\S}}, - sectiontotals = {{sections}{\S\S}}, - paragraphtotal = {{paragraph}{par\adddot}}, - paragraphtotals = {{paragraphs}{par\adddot}}, in = {{in}{in}}, inseries = {{in}{in}}, ofseries = {{of}{of}}, @@ -466,7 +451,6 @@ canadian,australian,newzealand,USenglish,UKenglish} december = {{December}{Dec\adddot}}, langamerican = {{American}{American}}, langbrazilian = {{Brazilian}{Brazilian}}, - langbulgarian = {{Bulgarian}{Bulgarian}}, langcatalan = {{Catalan}{Catalan}}, langcroatian = {{Croatian}{Croatian}}, langczech = {{Czech}{Czech}}, @@ -476,7 +460,6 @@ canadian,australian,newzealand,USenglish,UKenglish} langestonian = {{Estonian}{Estonian}}, langfinnish = {{Finnish}{Finnish}}, langfrench = {{French}{French}}, - langgalician = {{Galician}{Galician}}, langgerman = {{German}{German}}, langgreek = {{Greek}{Greek}}, langitalian = {{Italian}{Italian}}, @@ -488,10 +471,8 @@ canadian,australian,newzealand,USenglish,UKenglish} langslovene = {{Slovene}{Slovene}}, langspanish = {{Spanish}{Spanish}}, langswedish = {{Swedish}{Swedish}}, - langukrainian = {{Ukrainian}{Ukrainian}}, fromamerican = {{from the American}{from the American}}, frombrazilian = {{from the Brazilian}{from the Brazilian}}, - frombulgarian = {{from the Bulgarian}{from the Bulgarian}}, fromcatalan = {{from the Catalan}{from the Catalan}}, fromcroatian = {{from the Croatian}{from the Croatian}}, fromczech = {{from the Czech}{from the Czech}}, @@ -501,7 +482,6 @@ canadian,australian,newzealand,USenglish,UKenglish} fromestonian = {{from the Estonian}{from the Estonian}}, fromfinnish = {{from the Finnish}{from the Finnish}}, fromfrench = {{from the French}{from the French}}, - fromgalician = {{from the Galician}{from the Galician}}, fromgerman = {{from the German}{from the German}}, fromgreek = {{from the Greek}{from the Greek}}, fromitalian = {{from the Italian}{from the Italian}}, @@ -513,7 +493,6 @@ canadian,australian,newzealand,USenglish,UKenglish} fromslovene = {{from the Slovene}{from the Slovene}}, fromspanish = {{from the Spanish}{from the Spanish}}, fromswedish = {{from the Swedish}{from the Swedish}}, - fromukrainian = {{from the Ukrainian}{from the Ukrainian}}, countryde = {{Germany}{DE}}, countryeu = {{European Union}{EU}}, countryep = {{European Union}{EP}}, @@ -622,9 +601,9 @@ canadian,australian,newzealand,USenglish,UKenglish} \dateeraprint{#2}}% \dateuncertainprint \iffieldundef{#2endyear} - {\printfield{extradate}} + {\printfield{extrayear}} {\iffieldequalstr{#2endyear}{} - {\printfield{extradate}% + {\printfield{extrayear}% \mbox{\bibdaterangesep}} {\bibdaterangesep \enddatecircaprint @@ -635,7 +614,7 @@ canadian,australian,newzealand,USenglish,UKenglish} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% - \printfield{extradate}% + \printfield{extrayear}% \enddateuncertainprint \dateeraprint{#2}}}}}} @@ -654,16 +633,16 @@ canadian,australian,newzealand,USenglish,UKenglish} \dateeraprint{#2}}% \dateuncertainprint \iffieldundef{#2endyear} - {\printfield{extradate}} + {\printfield{extrayear}} {\iffieldequalstr{#2endyear}{} - {\printfield{extradate}% + {\printfield{extrayear}% \mbox{\bibdaterangesep}} {\bibdaterangesep \enddatecircaprint \iffieldundef{#2season} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% - \printfield{extradate}% + \printfield{extrayear}% \enddateuncertainprint \dateeraprint{#2}}}}}} diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/estonian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/estonian.lbx index 36d22587ea8..3af5e3c9cb0 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/estonian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/estonian.lbx @@ -59,21 +59,21 @@ {} {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#1} - {} - {\iffieldundef{#3}{/}{\adddot\thinspace}}}% + {} + {\iffieldundef{#3}{/}{\adddot\thinspace}}}% \iffieldbibstring{#1} {\bibstring{\thefield{#1}}} {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% \savecommand\lbx@lfromlang \savecommand\lbx@sfromlang \def\lbx@lfromlang{% - \iflistundef{origlanguage} + \iffieldundef{origlanguage} {} - {\printlist[lfromoriglanguage]{origlanguage}\space}}% + {\biblstring{from\thefield{origlanguage}}\space}}% \def\lbx@sfromlang{% - \iflistundef{origlanguage} + \iffieldundef{origlanguage} {} - {\printlist[sfromoriglanguage]{origlanguage}\space}}% + {\bibsstring{from\thefield{origlanguage}}\space}}% \savebibmacro{in:}% \renewbibmacro{in:}{% \iffieldequalstr{entrytype}{article} @@ -140,14 +140,14 @@ translator = {{t\~{o}lkija}{t\~{o}lkija}}, translators = {{t\~{o}lkijad}{t\~{o}lkijad}}, commentator = {{kommentaator}{kommentaator}}, - commentators = {{kommentaatorid}{kommentaatorid}}, + commentators = {{kommentaatorid}{kommentaatorid}}, annotator = {{selityksin varustanut}{selityksin varustanut}}, annotators = {{selityksin varustaneet}{selityksin varustaneet}}, commentary = {{kommentaaris}{kommentaaris}}, annotations = {{annotatsioonide}{annotatsioonide}}, introduction = {{sissejuhatus}{sissejuhatus}}, foreword = {{eess\~{o}na}{eess\~{o}na}}, - afterword = {{j\"{a}rels\~{o}na}{j\"{a}rels\~{o}na}}, + afterword = {{j\"{a}rels\~{o}na}{j\"{a}rels\~{o}na}}, editortr = {{toimetaja ja t\~{o}lkija}% {toim\adddotspace ja t\~{o}lk\adddot}}, editorstr = {{toimetajad ja t\~{o}lkijate}% @@ -156,9 +156,9 @@ {toimetaja ja kommentaator}}, editorsco = {{toimetajad ja kommentaatorid}% {toimetajad ja kommentaatorid}}, - editoran = {{toimetaja ja annotator}% + editoran = {{toimetaja ja annotator}% {toimetaja ja annotator}}, - editorsan = {{toimetajad ja annotators}% + editorsan = {{toimetajad ja annotators}% {toimetajad ja annotators}}, editorin = {{toimetaja ja sissejuhatus}% {toimetaja ja sissejuhatus}}, @@ -172,121 +172,118 @@ {toimetaja ja j\"{a}rels\~{o}na}}, editorsaf = {{toimetajad ja j\"{a}rels\~{o}na}% {toimetajad ja j\"{a}rels\~{o}na}}, - editortrco = {{toimetaja, translator\finalandcomma\ ja kommentaator} % - {toim, \addabbrvspace trans\adddot\finalandcomma\ ja comm\adddot}}, + editortrco = {{toimetaja, translator\finalandcomma\ ja kommentaator} % + {toim, \addabbrvspace trans\adddot\finalandcomma\ ja comm\adddot}}, editorstrco = {{toimetajad, translators\finalandcomma\ ja kommentaatorid} % - {eds., \addabbrvspace trans\adddot\finalandcomma\ ja comm\adddot}}, + {eds., \addabbrvspace trans\adddot\finalandcomma\ ja comm\adddot}}, editortran = {{toimetaja, translator\finalandcomma\ ja annotator} % - {toim, \addabbrvspace trans\adddot\finalandcomma\ ja annot\adddot}}, - editorstran = {{toimetajad, translators\finalandcomma\ ja annotators} % - {eds., \addabbrvspace trans\adddot\finalandcomma\ ja annot\adddot}}, + {toim, \addabbrvspace trans\adddot\finalandcomma\ ja annot\adddot}}, + editorstran = {{toimetajad, translators\finalandcomma\ ja annotators} % + {eds., \addabbrvspace trans\adddot\finalandcomma\ ja annot\adddot}}, editortrin = {{toimetaja, translator\finalandcomma\ ja Sissejuhatus} % - {toim, \addabbrvspace trans\adddot\finalandcomma\ ja introd\adddot}}, - editorstrin = {{toimetajad, translators\finalandcomma\ ja Sissejuhatus} % - {eds., \addabbrvspace trans\adddot\finalandcomma\ ja introd\adddot}}, + {toim, \addabbrvspace trans\adddot\finalandcomma\ ja introd\adddot}}, + editorstrin = {{toimetajad, translators\finalandcomma\ ja Sissejuhatus} % + {eds., \addabbrvspace trans\adddot\finalandcomma\ ja introd\adddot}}, editortrfo = {{toimetaja, translator\finalandcomma\ ja eess\~{o}na} % - {toim, \addabbrvspace trans\adddot\finalandcomma\ ja forew\adddot}}, - editorstrfo = {{toimetajad, translators\finalandcomma\ ja eess\~{o}na} % - {eds., \addabbrvspace trans\adddot\finalandcomma\ ja forew\adddot}}, + {toim, \addabbrvspace trans\adddot\finalandcomma\ ja forew\adddot}}, + editorstrfo = {{toimetajad, translators\finalandcomma\ ja eess\~{o}na} % + {eds., \addabbrvspace trans\adddot\finalandcomma\ ja forew\adddot}}, editortraf = {{toimetaja, translator\finalandcomma\ ja J\"{a}rels\~{o}na} % - {toim, \addabbrvspace trans\adddot\finalandcomma\ ja afterw\adddot}}, + {toim, \addabbrvspace trans\adddot\finalandcomma\ ja afterw\adddot}}, editorstraf = {{toimetajad, translators\finalandcomma\ ja J\"{a}rels\~{o}na} % - {eds., \addabbrvspace trans\adddot\finalandcomma\ ja afterw\adddot}}, - editorcoin = {{toimetaja, commentator\finalandcomma\ ja Sissejuhatus} % - {toim, \addabbrvspace comm\adddot\finalandcomma\ ja introd\adddot}}, - editorscoin = {{toimetajad, commentators\finalandcomma\ ja Sissejuhatus} % - {eds., \addabbrvspace comm\adddot\finalandcomma\ ja introd\adddot}}, - editorcofo = {{toimetaja, commentator\finalandcomma\ ja eess\~{o}na} % - {toim, \addabbrvspace comm\adddot\finalandcomma\ ja forew\adddot}}, - editorscofo = {{toimetajad, commentators\finalandcomma\ ja eess\~{o}na} % - {eds., \addabbrvspace comm\adddot\finalandcomma\ ja forew\adddot}}, + {eds., \addabbrvspace trans\adddot\finalandcomma\ ja afterw\adddot}}, + editorcoin = {{toimetaja, commentator\finalandcomma\ ja Sissejuhatus} % + {toim, \addabbrvspace comm\adddot\finalandcomma\ ja introd\adddot}}, + editorscoin = {{toimetajad, commentators\finalandcomma\ ja Sissejuhatus} % + {eds., \addabbrvspace comm\adddot\finalandcomma\ ja introd\adddot}}, + editorcofo = {{toimetaja, commentator\finalandcomma\ ja eess\~{o}na} % + {toim, \addabbrvspace comm\adddot\finalandcomma\ ja forew\adddot}}, + editorscofo = {{toimetajad, commentators\finalandcomma\ ja eess\~{o}na} % + {eds., \addabbrvspace comm\adddot\finalandcomma\ ja forew\adddot}}, editorcoaf = {{toimetaja, commentator\finalandcomma\ ja J\"{a}rels\~{o}na} % - {toim, \addabbrvspace comm\adddot\finalandcomma\ ja afterw\adddot}}, - editorscoaf = {{toimetajad, commentators\finalandcomma\ ja J\"{a}rels\~{o}na} % - {eds., \addabbrvspace comm\adddot\finalandcomma\ ja afterw\adddot}}, + {toim, \addabbrvspace comm\adddot\finalandcomma\ ja afterw\adddot}}, + editorscoaf = {{toimetajad, commentators\finalandcomma\ ja J\"{a}rels\~{o}na} % + {eds., \addabbrvspace comm\adddot\finalandcomma\ ja afterw\adddot}}, editoranin = {{toimetaja, annotator\finalandcomma\ ja Sissejuhatus} % - {toim, \addabbrvspace annot\adddot\finalandcomma\ ja introd\adddot}}, - editorsanin = {{toimetajad, annotators\finalandcomma\ ja Sissejuhatus} % - {eds., \addabbrvspace annot\adddot\finalandcomma\ ja introd\adddot}}, + {toim, \addabbrvspace annot\adddot\finalandcomma\ ja introd\adddot}}, + editorsanin = {{toimetajad, annotators\finalandcomma\ ja Sissejuhatus} % + {eds., \addabbrvspace annot\adddot\finalandcomma\ ja introd\adddot}}, editoranfo = {{toimetaja, annotator\finalandcomma\ ja eess\~{o}na} % - {toim, \addabbrvspace annot\adddot\finalandcomma\ ja forew\adddot}}, - editorsanfo = {{toimetajad, annotators\finalandcomma\ ja eess\~{o}na} % - {eds., \addabbrvspace annot\adddot\finalandcomma\ ja forew\adddot}}, + {toim, \addabbrvspace annot\adddot\finalandcomma\ ja forew\adddot}}, + editorsanfo = {{toimetajad, annotators\finalandcomma\ ja eess\~{o}na} % + {eds., \addabbrvspace annot\adddot\finalandcomma\ ja forew\adddot}}, editoranaf = {{toimetaja, annotator\finalandcomma\ ja J\"{a}rels\~{o}na} % - {toim, \addabbrvspace annot\adddot\finalandcomma\ ja afterw\adddot}}, - editorsanaf = {{toimetajad, annotators\finalandcomma\ ja J\"{a}rels\~{o}na} % - {eds., \addabbrvspace annot\adddot\finalandcomma\ ja afterw\adddot}}, - editortrcoin = {{toimetaja, t\~{o}lkija, commentator\finalandcomma\ ja Sissejuhatus} % - {toim, \addabbrvspace trans., comm\adddot\finalandcomma\ ja introd\adddot}}, - editorstrcoin = {{toimetajad, t\~{o}lkijad, commentators\finalandcomma\ ja Sissejuhatus} % - {eds., \addabbrvspace trans., comm\adddot\finalandcomma\ ja introd\adddot}}, + {toim, \addabbrvspace annot\adddot\finalandcomma\ ja afterw\adddot}}, + editorsanaf = {{toimetajad, annotators\finalandcomma\ ja J\"{a}rels\~{o}na} % + {eds., \addabbrvspace annot\adddot\finalandcomma\ ja afterw\adddot}}, + editortrcoin = {{toimetaja, t\~{o}lkija, commentator\finalandcomma\ ja Sissejuhatus} % + {toim, \addabbrvspace trans., comm\adddot\finalandcomma\ ja introd\adddot}}, + editorstrcoin = {{toimetajad, t\~{o}lkijad, commentators\finalandcomma\ ja Sissejuhatus} % + {eds., \addabbrvspace trans., comm\adddot\finalandcomma\ ja introd\adddot}}, editortrcofo = {{toimetaja, t\~{o}lkija, commentator\finalandcomma\ ja eess\~{o}na} % - {toim, \addabbrvspace trans., comm\adddot\finalandcomma\ ja forew\adddot}}, - editorstrcofo = {{toimetajad, t\~{o}lkijad, commentators\finalandcomma\ ja eess\~{o}na} % - {eds., \addabbrvspace trans., comm\adddot\finalandcomma\ ja forew\adddot}}, + {toim, \addabbrvspace trans., comm\adddot\finalandcomma\ ja forew\adddot}}, + editorstrcofo = {{toimetajad, t\~{o}lkijad, commentators\finalandcomma\ ja eess\~{o}na} % + {eds., \addabbrvspace trans., comm\adddot\finalandcomma\ ja forew\adddot}}, editortrcoaf = {{toimetaja, t\~{o}lkija, commentator\finalandcomma\ ja J\"{a}rels\~{o}na} % - {toim, \addabbrvspace trans., comm\adddot\finalandcomma\ ja afterw\adddot}}, - editorstrcoaf = {{toimetajad, t\~{o}lkijad, commentators\finalandcomma\ ja J\"{a}rels\~{o}na} % - {eds., \addabbrvspace trans., comm\adddot\finalandcomma\ ja afterw\adddot}}, + {toim, \addabbrvspace trans., comm\adddot\finalandcomma\ ja afterw\adddot}}, + editorstrcoaf = {{toimetajad, t\~{o}lkijad, commentators\finalandcomma\ ja J\"{a}rels\~{o}na} % + {eds., \addabbrvspace trans., comm\adddot\finalandcomma\ ja afterw\adddot}}, editortranin = {{toimetaja, t\~{o}lkija, annotator\finalandcomma\ ja Sissejuhatus} % - {toim, \addabbrvspace trans., annot\adddot\finalandcomma\ ja introd\adddot}}, - editorstranin = {{toimetajad, t\~{o}lkijad, annotators\finalandcomma\ ja Sissejuhatus} % - {eds., \addabbrvspace trans., annot\adddot\finalandcomma\ ja introd\adddot}}, + {toim, \addabbrvspace trans., annot\adddot\finalandcomma\ ja introd\adddot}}, + editorstranin = {{toimetajad, t\~{o}lkijad, annotators\finalandcomma\ ja Sissejuhatus} % + {eds., \addabbrvspace trans., annot\adddot\finalandcomma\ ja introd\adddot}}, editortranfo = {{toimetaja, t\~{o}lkija, annotator\finalandcomma\ ja eess\~{o}na} % - {toim, \addabbrvspace trans., annot\adddot\finalandcomma\ ja forew\adddot}}, - editorstranfo = {{toimetajad, t\~{o}lkijad, annotators\finalandcomma\ ja eess\~{o}na} % - {eds., \addabbrvspace trans., annot\adddot\finalandcomma\ ja forew\adddot}}, + {toim, \addabbrvspace trans., annot\adddot\finalandcomma\ ja forew\adddot}}, + editorstranfo = {{toimetajad, t\~{o}lkijad, annotators\finalandcomma\ ja eess\~{o}na} % + {eds., \addabbrvspace trans., annot\adddot\finalandcomma\ ja forew\adddot}}, editortranaf = {{toimetaja, t\~{o}lkija, annotator\finalandcomma\ ja J\"{a}rels\~{o}na} % - {toim, \addabbrvspace trans., annot\adddot\finalandcomma\ ja afterw\adddot}}, - editorstranaf = {{toimetajad, t\~{o}lkijad, annotators\finalandcomma\ ja J\"{a}rels\~{o}na} % - {eds., \addabbrvspace trans., annot\adddot\finalandcomma\ ja afterw\adddot}}, + {toim, \addabbrvspace trans., annot\adddot\finalandcomma\ ja afterw\adddot}}, + editorstranaf = {{toimetajad, t\~{o}lkijad, annotators\finalandcomma\ ja J\"{a}rels\~{o}na} % + {eds., \addabbrvspace trans., annot\adddot\finalandcomma\ ja afterw\adddot}}, translatorco = {{t\~{o}lkija ja kommentaator} % - {trans\adddot\ ja comm\adddot}}, - translatorsco = {{t\~{o}lkijate ja kommentaatorid} % - {trans\adddot\ ja comm\adddot}}, + {trans\adddot\ ja comm\adddot}}, + translatorsco = {{t\~{o}lkijate ja kommentaatorid} % + {trans\adddot\ ja comm\adddot}}, translatoran = {{t\~{o}lkija ja annotator} % - {trans\adddot\ ja annot\adddot}}, - translatorsan = {{t\~{o}lkijate ja annotators} % - {trans\adddot\ ja annot\adddot}}, + {trans\adddot\ ja annot\adddot}}, + translatorsan = {{t\~{o}lkijate ja annotators} % + {trans\adddot\ ja annot\adddot}}, translatorin = {{t\~{o}lkimine ja Sissejuhatus} % - {trans\adddot\ ja introd\adddot}}, + {trans\adddot\ ja introd\adddot}}, translatorsin = {{t\~{o}lkimine ja Sissejuhatus} % - {trans\adddot\ ja introd\adddot}}, - translatorfo = {{t\~{o}lkimine ja eess\~{o}na} % - {trans\adddot\ ja forew\adddot}}, + {trans\adddot\ ja introd\adddot}}, + translatorfo = {{t\~{o}lkimine ja eess\~{o}na} % + {trans\adddot\ ja forew\adddot}}, translatorsfo = {{t\~{o}lkimine ja eess\~{o}na} % - {trans\adddot\ ja forew\adddot}}, + {trans\adddot\ ja forew\adddot}}, translatoraf = {{t\~{o}lkimine ja J\"{a}rels\~{o}na} % - {trans\adddot\ ja afterw\adddot}}, + {trans\adddot\ ja afterw\adddot}}, translatorsaf = {{t\~{o}lkimine ja J\"{a}rels\~{o}na} % - {trans\adddot\ ja afterw\adddot}}, + {trans\adddot\ ja afterw\adddot}}, translatorcoin = {{t\~{o}lkimine, commentary\finalandcomma\ ja Sissejuhatus} % - {trans., comm\adddot\finalandcomma\ ja introd\adddot}}, + {trans., comm\adddot\finalandcomma\ ja introd\adddot}}, translatorscoin = {{t\~{o}lkimine, commentary\finalandcomma\ ja Sissejuhatus} % - {trans., comm\adddot\finalandcomma\ ja introd\adddot}}, + {trans., comm\adddot\finalandcomma\ ja introd\adddot}}, translatorcofo = {{t\~{o}lkimine, commentary\finalandcomma\ ja eess\~{o}na} % - {trans., comm\adddot\finalandcomma\ ja forew\adddot}}, + {trans., comm\adddot\finalandcomma\ ja forew\adddot}}, translatorscofo = {{t\~{o}lkimine, commentary\finalandcomma\ ja eess\~{o}na} % - {trans., comm\adddot\finalandcomma\ ja forew\adddot}}, + {trans., comm\adddot\finalandcomma\ ja forew\adddot}}, translatorcoaf = {{t\~{o}lkimine, commentary\finalandcomma\ ja J\"{a}rels\~{o}na} % - {trans., comm\adddot\finalandcomma\ ja afterw\adddot}}, + {trans., comm\adddot\finalandcomma\ ja afterw\adddot}}, translatorscoaf = {{t\~{o}lkimine, commentary\finalandcomma\ ja J\"{a}rels\~{o}na} % - {trans., comm\adddot\finalandcomma\ ja afterw\adddot}}, + {trans., comm\adddot\finalandcomma\ ja afterw\adddot}}, translatoranin = {{t\~{o}lkimine, annotations\finalandcomma\ ja Sissejuhatus} % - {trans., annot\adddot\finalandcomma\ ja introd\adddot}}, + {trans., annot\adddot\finalandcomma\ ja introd\adddot}}, translatorsanin = {{t\~{o}lkimine, annotations\finalandcomma\ ja Sissejuhatus} % - {trans., annot\adddot\finalandcomma\ ja introd\adddot}}, + {trans., annot\adddot\finalandcomma\ ja introd\adddot}}, translatoranfo = {{t\~{o}lkimine, annotations\finalandcomma\ ja eess\~{o}na} % - {trans., annot\adddot\finalandcomma\ ja forew\adddot}}, + {trans., annot\adddot\finalandcomma\ ja forew\adddot}}, translatorsanfo = {{t\~{o}lkimine, annotations\finalandcomma\ ja eess\~{o}na} % - {trans., annot\adddot\finalandcomma\ ja forew\adddot}}, + {trans., annot\adddot\finalandcomma\ ja forew\adddot}}, translatoranaf = {{t\~{o}lkimine, annotations\finalandcomma\ ja J\"{a}rels\~{o}na} % - {trans., annot\adddot\finalandcomma\ ja afterw\adddot}}, + {trans., annot\adddot\finalandcomma\ ja afterw\adddot}}, translatorsanaf = {{t\~{o}lkimine, annotations\finalandcomma\ ja J\"{a}rels\~{o}na} % - {trans., annot\adddot\finalandcomma\ ja afterw\adddot}}, -% organizer = {{}{}},% FIXME: missing -% organizers = {{}{}},% FIXME: missing -% byorganizer = {{}{}},% FIXME: missing + {trans., annot\adddot\finalandcomma\ ja afterw\adddot}}, byauthor = {{kirjuttanud}{kirj\adddot}}, byeditor = {{toimittanud}{toim\adddot}}, bycompiler = {{koontanud}{koontanud}}, @@ -295,7 +292,7 @@ byreviewer = {{vaadanud}{rev\adddotspace poolt}}, byfounder = {{asutasid}{found\adddotspace poolt}}, bycontinuator = {{j\"{a}tkas}{cont\adddotspace poolt}}, - bycollaborator = {{koost\"{o}\"{o}s}{in collab\adddotspace koos}}, + bycollaborator = {{koost\"{o}\"{o}s}{in collab\adddotspace koos}}, bytranslator = {{t\~{o}lgitud \lbx@lfromlang\ poolt}{trans\adddot\ \lbx@sfromlang\ poolt}}, bycommentator = {{kommentaarin kirjoittanut}{kommentaarin kirjoittanut}},% FIXME: unsure byannotator = {{selgitustega poolt}{annot\adddot\ poolt}}, @@ -304,66 +301,66 @@ withintroduction = {{koos tutvustus poolt}{koos poolt intro\adddot }}, withforeword = {{mis eess\~{o}na Autor}{koos forew\adddot\ poolt}}, withafterword = {{koos J\"{a}rels\~{o}na poolt}{koos poolt afterw\adddot }}, - byeditortr = {{redigeeritud ja t\~{o}lgitud \lbx@lfromlang\ poolt} + byeditortr = {{redigeeritud ja t\~{o}lgitud \lbx@lfromlang\ poolt} {toim\adddotspace ja \lbx@sfromlang k\"a\"ant\adddot}}, byeditorco = {{toimetatud ja kommenteeritud} % - {ed\adddotspace ja comm\adddot\ poolt}}, + {ed\adddotspace ja comm\adddot\ poolt}}, byeditoran = {{redigeerida ja kanda} % - {ed\adddotspace ja annot\adddot\ poolt}}, + {ed\adddotspace ja annot\adddot\ poolt}}, byeditorin = {{redigeerida, tutvustus, Autor} % - {toim, \addabbrvspace koos m\~{o}ne introd. esitab}}, - byeditorfo = {{redigeerinud, eess\~{o}na, kus autor} % - {toim, \addabbrvspace koos forew., poolt}}, + {toim, \addabbrvspace koos m\~{o}ne introd. esitab}}, + byeditorfo = {{redigeerinud, eess\~{o}na, kus autor} % + {toim, \addabbrvspace koos forew., poolt}}, byeditoraf = {{redigeerida, j\"{a}rels\~{o}na, Autor} % - {toim, koos m\~{o}ne afterw., \addabbrvspace poolt}}, + {toim, koos m\~{o}ne afterw., \addabbrvspace poolt}}, byeditortrco = {{toimetatud, \lbx@lfromlang\finalandcomma\ t\~{o}lgitud ja kommenteeritud} % - {toim, \addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ ja comm\adddot\ poolt}}, + {toim, \addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ ja comm\adddot\ poolt}}, byeditortran = {{redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja kanda} % - {toim, \addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ ja annot\adddot\ poolt}}, + {toim, \addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ ja annot\adddot\ poolt}}, byeditortrin = {{edited and translated \lbx@lfromlang, with an introduction, by} % - {ed\adddotspace ja trans\adddot\ \lbx@sfromlang, koos m\~{o}ne introd. esitab}}, + {ed\adddotspace ja trans\adddot\ \lbx@sfromlang, koos m\~{o}ne introd. esitab}}, byeditortrfo = {{edited and translated \lbx@lfromlang, with a foreword, by} % - {ed\adddotspace ja trans\adddot\ \lbx@sfromlang, koos forew., poolt}}, + {ed\adddotspace ja trans\adddot\ \lbx@sfromlang, koos forew., poolt}}, byeditortraf = {{edited and translated \lbx@lfromlang, with an afterword, by} % - {ed\adddotspace ja trans\adddot\ \lbx@sfromlang, koos m\~{o}ne afterw., poolt}}, + {ed\adddotspace ja trans\adddot\ \lbx@sfromlang, koos m\~{o}ne afterw., poolt}}, byeditorcoin = {{toimetanud ja kommenteerinud koos tutvustus,} % - {ed\adddotspace ja comm., koos m\~{o}ne introd. esitab}}, + {ed\adddotspace ja comm., koos m\~{o}ne introd. esitab}}, byeditorcofo = {{toimetanud ja kommenteerinud mis eess\~{o}na,} % - {ed\adddotspace ja comm., koos forew., poolt}}, - byeditorcoaf = {{toimetanud ja kommenteerinud koos J\"{a}rels\~{o}na,} % - {ed\adddotspace ja comm., koos m\~{o}ne afterw., poolt}}, + {ed\adddotspace ja comm., koos forew., poolt}}, + byeditorcoaf = {{toimetanud ja kommenteerinud koos J\"{a}rels\~{o}na,} % + {ed\adddotspace ja comm., koos m\~{o}ne afterw., poolt}}, byeditoranin = {{redigeerida ja selgitustega koos tutvustus,} % - {ed\adddotspace ja annot., koos m\~{o}ne introd. esitab}}, + {ed\adddotspace ja annot., koos m\~{o}ne introd. esitab}}, byeditoranfo = {{redigeerida ja selgitustega mis eess\~{o}na,} % - {ed\adddotspace ja annot., koos forew., poolt}}, - byeditoranaf = {{redigeerida ja selgitustega koos J\"{a}rels\~{o}na,} % - {ed\adddotspace ja annot., koos m\~{o}ne afterw., poolt}}, + {ed\adddotspace ja annot., koos forew., poolt}}, + byeditoranaf = {{redigeerida ja selgitustega koos J\"{a}rels\~{o}na,} % + {ed\adddotspace ja annot., koos m\~{o}ne afterw., poolt}}, byeditortrcoin = {{redigeerida, \lbx@lfromlang\finalandcomma\ t\~{o}lkinud ja kommenteerinud koos tutvustus,} % - {redigeerida, \lbx@lfromlang\finalandcomma\ t\~{o}lkinud ja kommenteerinud koos tutvustus,}}, + {redigeerida, \lbx@lfromlang\finalandcomma\ t\~{o}lkinud ja kommenteerinud koos tutvustus,}}, byeditortrcofo = {{redigeerida, \lbx@lfromlang\finalandcomma\ t\~{o}lkinud ja kommenteerinud mis eess\~{o}na,} % - {redigeerida, \lbx@lfromlang\finalandcomma\ t\~{o}lkinud ja kommenteerinud mis eess\~{o}na,}}, - byeditortrcoaf = {{toimetatud, \lbx@lfromlang\finalandcomma\ t\~{o}lgitud ja kommenteeritud koos J\"{a}rels\~{o}na,} % - {toimetatud, \lbx@lfromlang\finalandcomma\ t\~{o}lgitud ja kommenteeritud koos J\"{a}rels\~{o}na,}}, + {redigeerida, \lbx@lfromlang\finalandcomma\ t\~{o}lkinud ja kommenteerinud mis eess\~{o}na,}}, + byeditortrcoaf = {{toimetatud, \lbx@lfromlang\finalandcomma\ t\~{o}lgitud ja kommenteeritud koos J\"{a}rels\~{o}na,} % + {toimetatud, \lbx@lfromlang\finalandcomma\ t\~{o}lgitud ja kommenteeritud koos J\"{a}rels\~{o}na,}}, byeditortranin = {{redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega koos tutvustus,} % - {redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega koos tutvustus,}}, + {redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega koos tutvustus,}}, byeditortranfo = {{redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega mis eess\~{o}na,} % - {redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega mis eess\~{o}na,}}, - byeditortranaf = {{redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega koos J\"{a}rels\~{o}na,} % - {redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega koos J\"{a}rels\~{o}na,}}, + {redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega mis eess\~{o}na,}}, + byeditortranaf = {{redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega koos J\"{a}rels\~{o}na,} % + {redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega koos J\"{a}rels\~{o}na,}}, bytranslatorco = {{\lbx@lfromlang\ t\~{o}lgitud ja kommenteeritud} % - {\lbx@lfromlang\ t\~{o}lgitud ja kommenteeritud}}, + {\lbx@lfromlang\ t\~{o}lgitud ja kommenteeritud}}, bytranslatoran = {{t\~{o}lgitud \lbx@lfromlang\ ja kanda} % - {t\~{o}lgitud \lbx@lfromlang\ ja kanda}}, + {t\~{o}lgitud \lbx@lfromlang\ ja kanda}}, bytranslatorin = {{translated \lbx@lfromlang, with an introduction, by} % - {trans\adddot\ \lbx@sfromlang, with an introd., by}}, + {trans\adddot\ \lbx@sfromlang, with an introd., by}}, bytranslatorfo = {{translated \lbx@lfromlang, with a foreword, by} % - {trans\adddot\ \lbx@sfromlang, with a forew., by}}, + {trans\adddot\ \lbx@sfromlang, with a forew., by}}, bytranslatoraf = {{translated \lbx@lfromlang, with an afterword, by} % - {trans\adddot\ \lbx@sfromlang, with an afterw., by}}, - bytranslatorcoin = {{\lbx@lfromlang\ t\~{o}lkinud ja kommenteerinud koos tutvustus,} % - {\lbx@lfromlang\ t\~{o}lkinud ja kommenteerinud koos tutvustus,}}, + {trans\adddot\ \lbx@sfromlang, with an afterw., by}}, + bytranslatorcoin = {{\lbx@lfromlang\ t\~{o}lkinud ja kommenteerinud koos tutvustus,} % + {\lbx@lfromlang\ t\~{o}lkinud ja kommenteerinud koos tutvustus,}}, bytranslatorcofo = {{\lbx@lfromlang\ t\~{o}lkinud ja kommenteerinud mis eess\~{o}na,} % - {\lbx@lfromlang\ t\~{o}lkinud ja kommenteerinud mis eess\~{o}na,}}, + {\lbx@lfromlang\ t\~{o}lkinud ja kommenteerinud mis eess\~{o}na,}}, bytranslatorcoaf = {{\lbx@lfromlang\ t\~{o}lkinud ja kommenteerinud koos J\"{a}rels\~{o}na,} % {\lbx@lfromlang\ t\~{o}lkinud ja kommenteerinud koos J\"{a}rels\~{o}na,}}, bytranslatoranin = {{t\~{o}lgitud \lbx@lfromlang\ ja selgitustega koos tutvustus,} % @@ -411,18 +408,6 @@ sections = {{kohdat}{kohdat}}, paragraph = {{kappale}{kappale}}, paragraphs = {{kappaleet}{kappaleet}}, -% pagetotal = {{}{}},% FIXME: missing -% pagetotals = {{}{}},% FIXME: missing -% columntotal = {{}{}},% FIXME: missing -% columntotals = {{}{}},% FIXME: missing -% linetotal = {{}{}},% FIXME: missing -% linetotals = {{}{}},% FIXME: missing -% versetotal = {{}{}},% FIXME: missing -% versetotals = {{}{}},% FIXME: missing -% sectiontotal = {{}{}},% FIXME: missing -% sectiontotals = {{}{}},% FIXME: missing -% paragraphtotal = {{}{}},% FIXME: missing -% paragraphtotals = {{}{}},% FIXME: missing in = {{teoksessa}{teoksessa}}, inseries = {{sarjassa}{sarjassa}}, ofseries = {{sarjassa}{sarjassa}}, @@ -445,12 +430,12 @@ forthcoming = {{tulevases}{tulevases}}, inpress = {{ajakirjanduses}{ajakirjanduses}}, prepublished = {{eelnevalt avaldatud} {eelnevalt avaldatud}}, - citedas = {{edaspidi viidatud kui}{edaspidi viidatud kui}}, + citedas = {{edaspidi viidatud kui}{edaspidi viidatud kui}}, thiscite = {{eriti}{eriti}}, seenote = {{vaata m\"{a}rkus}{vaata m\"{a}rkus}}, quotedin = {{noteeritud}{noteeritud}}, idem = {{idem}{idem}}, % It its not necessary to translate Latin phrases. - idemsm = {{idem}{idem}}, + idemsm = {{idem}{idem}}, idemsf = {{eadem}{eadem}}, idemsn = {{idem}{idem}}, idempm = {{eidem}{eidem}}, @@ -494,7 +479,6 @@ basicdecember = {{detsember}{detsember}}, langamerican = {{Ameerika}{Ameerika}}, langbrazilian = {{Brasiilia}{Brasiilia}}, -% langbulgarian = {{}{}},% FIXME: missing langcatalan = {{katalaani}{katalaani}}, langcroatian = {{horvaadi}{horvaadi}}, langczech = {{t\v{s}ehhii}{t\v{s}ehhii}}, @@ -504,7 +488,6 @@ langestonian = {{eesti}{eesti}}, langfinnish = {{soome}{soome}}, langfrench = {{prantsuse}{prantsuse}}, - langgalician = {{galeegi}{galeegi}}, langgerman = {{saksa}{saksa}}, langgreek = {{kreeka}{kreeka}}, langitalian = {{itaalia}{itaalia}}, @@ -518,7 +501,6 @@ langswedish = {{rootsi}{rootsi}}, fromamerican = {{alates USA}{alates USA}}, frombrazilian = {{alates Brasiilia}{: Brasiilia}}, -% frombulgarian = {{}{}},% FIXME: missing fromcatalan = {{alates katalaani}{: Catalan}}, fromcroatian = {{alates horvaadi}{: Horvaatia}}, fromczech = {{alates T\v{s}ehhi}{: T\v{s}ehhi}}, @@ -528,7 +510,6 @@ fromestonian = {{eesti kielest\"a}{eesti kielest\"a}}, fromfinnish = {{Soome}{alates Soome}}, fromfrench = {{alates Prantsuse}{alates prantsuse}}, - fromgalician = {{alates Galeegi}{alates Galeegi}}, fromgerman = {{, saksa keeles}{: Saksa}}, fromgreek = {{alates Kreeka}{alates Kreeka}}, fromitalian = {{alates Itaalia}{: Itaalia}}, @@ -557,7 +538,7 @@ patreqeu = {{Euroopa patendi taotluse}{Euroopa pat\adddot\ req\adddot}}, patreqfr = {{Prantsuse patent taotluse}{Prantsuse pat\adddot\ req\adddot}}, patrequk = {{Briti patendi taotluse}{Briti pat\adddot\ req\adddot}}, - patrequs = {{U.S\adddotspace patent request}{U.S\adddotspace pat\adddot\ req\adddot}}, + patrequs = {{U.S\adddotspace patent request}{U.S\adddotspace pat\adddot\ req\adddot}}, file = {{faili}{faili}}, library = {{raamatukogu}{raamatukogu}}, abstract = {{abstraktne}{abstraktne}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx index 9f15fd16e52..6b987a3127d 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx @@ -58,21 +58,21 @@ {} {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#1} - {} - {\iffieldundef{#3}{/}{\adddot\thinspace}}}% + {} + {\iffieldundef{#3}{/}{\adddot\thinspace}}}% \iffieldbibstring{#1} {\bibstring{\thefield{#1}}} {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% \savecommand\lbx@lfromlang \savecommand\lbx@sfromlang \def\lbx@lfromlang{% - \iflistundef{origlanguage} + \iffieldundef{origlanguage} {} - {\printlist[lfromoriglanguage]{origlanguage}\space}}% + {\biblstring{from\thefield{origlanguage}}\space}}% \def\lbx@sfromlang{% - \iflistundef{origlanguage} + \iffieldundef{origlanguage} {} - {\printlist[sfromoriglanguage]{origlanguage}\space}}% + {\bibsstring{from\thefield{origlanguage}}\space}}% \savebibmacro{in:}% \renewbibmacro{in:}{% \iffieldequalstr{entrytype}{article} @@ -283,9 +283,6 @@ {k\"a\"ant\"anyt, selitykset ja j\"alkisanat kirjoittanut}}, translatorsanaf = {{k\"a\"ant\"aneet, selitykset ja j\"alkisanat kirjoittaneet}% {k\"a\"ant\"aneet, selitykset ja j\"alkisanat kirjoittaneet}}, -% organizer = {{}{}},% FIXME: missing -% organizers = {{}{}},% FIXME: missing -% byorganizer = {{}{}},% FIXME: missing byauthor = {{kirjoittanut}{kirj\adddot}}, byeditor = {{toimittanut}{toim\adddot}}, bycompiler = {{koontanut}{koontanut}}, @@ -410,18 +407,6 @@ sections = {{kohdat}{kohdat}},% Bad translation, but "pyk\"al\"at" is no better. paragraph = {{kappale}{kappale}}, paragraphs = {{kappaleet}{kappaleet}}, -% pagetotal = {{}{}},% FIXME: missing -% pagetotals = {{}{}},% FIXME: missing -% columntotal = {{}{}},% FIXME: missing -% columntotals = {{}{}},% FIXME: missing -% linetotal = {{}{}},% FIXME: missing -% linetotals = {{}{}},% FIXME: missing -% versetotal = {{}{}},% FIXME: missing -% versetotals = {{}{}},% FIXME: missing -% sectiontotal = {{}{}},% FIXME: missing -% sectiontotals = {{}{}},% FIXME: missing -% paragraphtotal = {{}{}},% FIXME: missing -% paragraphtotals = {{}{}},% FIXME: missing in = {{teoksessa}{teoksessa}}, inseries = {{sarjassa}{sarjassa}}, ofseries = {{sarjassa}{sarjassa}}, @@ -493,17 +478,15 @@ basicdecember = {{joulukuu}{joulukuu}}, langamerican = {{amerikanenglanti}{amerikanenglanti}}, langbrazilian = {{brasilianportugali}{brasilianportugali}}, -% langbulgarian = {{}{}},% FIXME: missing langcatalan = {{katalonia}{katalonia}}, langcroatian = {{kroataia}{kroatia}}, langczech = {{t\v{s}ekki}{t\v{s}ekki}}, langdanish = {{tanska}{tanska}}, langdutch = {{hollanti}{hollanti}}, langenglish = {{englanti}{englanti}}, -% langestonian = {{}{}},% FIXME: missing +% langestonian = {{}{}},% FIXME: missing langfinnish = {{suomi}{suomi}}, langfrench = {{ranska}{ranska}}, - langgalician = {{galician}{galician}}, langgerman = {{saksa}{saksa}}, langgreek = {{kreikka}{kreikka}}, langitalian = {{italia}{italia}}, @@ -517,17 +500,15 @@ langswedish = {{ruotsi}{ruotsi}}, fromamerican = {{englannin kielest\"a}{englannin kielest\"a}}, frombrazilian = {{portugalin kielest\"a}{portugalin kielest\"a}}, -% frombulgarian = {{}{}},% FIXME: missing fromcatalan = {{katalonian kielest\"a}{katalonian kielest\"a}}, fromcroatian = {{kroatian kielest\"a}{kroatian kielest\"a}}, fromczech = {{t\v{s}ekin kielest\"a}{t\v{s}ekin kielest\"a}}, fromdanish = {{tanskan kielest\"a}{tanskan kielest\"a}}, fromdutch = {{hollannin kielest\"a}{hollannin kielest\"a}}, fromenglish = {{englannin kielest\"a}{englannin kielest\"a}}, -% fromestonian = {{}{}},% FIXME: missing +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{suomen kielest\"a}{suomen kielest\"a}}, fromfrench = {{ranskan kielest\"a}{ranskan kielest\"a}}, - fromgalician = {{galician kielest\"a}{galician kielest\"a}}, fromgerman = {{saksan kielest\"a}{saksan kielest\"a}}, fromgreek = {{kreikan kielest\"a}{kreikan kielest\"a}}, fromitalian = {{italian kielest\"a}{italian 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 954b3da99f3..becb278054c 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx @@ -6,7 +6,8 @@ \DeclareRedundantLanguages{french}{french} \DeclareBibliographyExtras{% - \protected\def\bibrangedash{-}% + \protected\def\bibrangedash{% + \textendash\penalty\hyphenpenalty}% breakable dash \let\finalandcomma=\empty \let\finalandsemicolon=\empty \def\mkbibordinal{\mkbibmascord}% @@ -112,7 +113,7 @@ references = {{R\'ef\'erences}{R\'ef\'erences}}, shorthands = {{Liste des sigles}{Sigles}}, editor = {{\'editeur}{\'ed\adddot}}, - editors = {{\'editeurs}{\'ed\adddot}}, + editors = {{\'editeurs}{\'eds\adddot}}, compiler = {{compilateur}{comp\adddot}}, compilers = {{compilateurs}{comp\adddot}}, redactor = {{r\'edacteur}{r\'ed\adddot}}, @@ -136,116 +137,116 @@ introduction = {{introduction}{introd\adddot}}, foreword = {{pr\'eface}{pr\'ef\adddot}}, afterword = {{postface}{postf\adddot}}, - editortr = {{\'editeur et traducteur}{\'ed\adddotspace et trad\adddot}}, - editorstr = {{\'editeurs et traducteurs}{\'ed\adddotspace et trad\adddot}}, + editortr = {{\'editeur et traducteur}{\'ed et trad\adddot}}, + editorstr = {{\'editeurs et traducteurs}{\'ed\adddot et trad\adddot}}, editorco = {{\'editeur et commentateur}% {\'ed\adddotspace et comm\adddot}}, editorsco = {{\'editeurs et commentateurs}% - {\'ed\adddotspace et comm\adddot}}, + {\'eds\adddotspace et comm\adddot}}, editoran = {{\'editeur et annotateur}% {\'ed\adddotspace et annot\adddot}}, editorsan = {{\'editeurs et annotateurs}% - {\'ed\adddotspace et annot\adddot}}, + {\'eds\adddotspace et annot\adddot}}, editorin = {{\'editeur et introduction}% {\'ed\adddotspace et introd\adddot}}, editorsin = {{\'editeurs et introduction}% - {\'ed\adddotspace et introd\adddot}}, + {\'eds\adddotspace et introd\adddot}}, editorfo = {{\'editeur et pr\'eface}% {\'ed\adddotspace et pr\'ef\adddot}}, editorsfo = {{\'editeurs et pr\'eface}% - {\'ed\adddotspace et pr\'ef\adddot}}, + {\'eds\adddotspace et pr\'ef\adddot}}, editoraf = {{\'editeur et postface}% {\'ed\adddotspace et postf\adddot}}, editorsaf = {{\'editeurs et postface}% - {\'ed\adddotspace et postf\adddot}}, + {\'eds\adddotspace et postf\adddot}}, editortrco = {{\'editeur, traducteur et commentateur}% - {\'ed.,\addabbrvspace trad\adddotspace et comm\adddot}}, + {\'ed.,\addabbrvspace trans\adddotspace et comm\adddot}}, editorstrco = {{\'editeurs, traducteurs et commentateurs}% - {\'ed.,\addabbrvspace trad\adddotspace et comm\adddot}}, + {\'eds.,\addabbrvspace trans\adddotspace et comm\adddot}}, editortran = {{\'editeur, traducteur et annotateur}% - {\'ed.,\addabbrvspace trad\adddotspace et annot\adddot}}, + {\'ed.,\addabbrvspace trans\adddotspace et annot\adddot}}, editorstran = {{\'editeurs, traducteurs et annotateurs}% - {\'ed.,\addabbrvspace trad\adddotspace et annot\adddot}}, + {\'eds.,\addabbrvspace trans\adddotspace et annot\adddot}}, editortrin = {{\'editeur, traducteur et introduction}% - {\'ed.,\addabbrvspace trad\adddotspace et introd\adddot}}, + {\'ed.,\addabbrvspace trans\adddotspace et introd\adddot}}, editorstrin = {{\'editeurs, traducteurs et introduction}% - {\'ed.,\addabbrvspace trad\adddotspace et introd\adddot}}, + {\'eds.,\addabbrvspace trans\adddotspace et introd\adddot}}, editortrfo = {{\'editeur, traducteur et pr\'eface}% - {\'ed.,\addabbrvspace trad\adddotspace et pr\'ef\adddot}}, + {\'ed.,\addabbrvspace trans\adddotspace et pr\'ef\adddot}}, editorstrfo = {{\'editeurs, traducteurs et pr\'eface}% - {\'ed.,\addabbrvspace trad\adddotspace et pr\'ef\adddot}}, + {\'eds.,\addabbrvspace trans\adddotspace et pr\'ef\adddot}}, editortraf = {{\'editeur, traducteur et postface}% - {\'ed.,\addabbrvspace trad\adddotspace et postf\adddot}}, + {\'ed.,\addabbrvspace trans\adddotspace et postf\adddot}}, editorstraf = {{\'editeurs, traducteurs et postface}% - {\'ed.,\addabbrvspace trad\adddot et postf\adddot}}, + {\'eds.,\addabbrvspace trans\adddot et postf\adddot}}, editorcoin = {{\'editeur, commentateur et introduction}% {\'ed.,\addabbrvspace comm\adddotspace et introd\adddot}}, editorscoin = {{\'editeurs, commentateurs et introduction}% - {\'ed.,\addabbrvspace comm\adddotspace et introd\adddot}}, + {\'eds.,\addabbrvspace comm\adddotspace et introd\adddot}}, editorcofo = {{\'editeur, commentateur et pr\'eface}% {\'ed.,\addabbrvspace comm\adddotspace et pr\'ef\adddot}}, editorscofo = {{\'editeurs, commentateurs et pr\'eface}% - {\'ed.,\addabbrvspace comm\adddotspace et pr\'ef\adddot}}, + {\'eds.,\addabbrvspace comm\adddotspace et pr\'ef\adddot}}, editorcoaf = {{\'editeur, commentateur et postface}% {\'ed.,\addabbrvspace comm\adddotspace et postf\adddot}}, editorscoaf = {{\'editeurs, commentateurs et postface}% - {\'ed.,\addabbrvspace comm\adddotspace et postf\adddot}}, + {\'eds.,\addabbrvspace comm\adddotspace et postf\adddot}}, editoranin = {{\'editeur, annotateur et introduction}% {\'ed.,\addabbrvspace annot\adddotspace et introd\adddot}}, editorsanin = {{\'editeurs, annotateurs et introduction}% - {\'ed.,\addabbrvspace annot\adddotspace et introd\adddot}}, + {\'eds.,\addabbrvspace annot\adddotspace et introd\adddot}}, editoranfo = {{\'editeur, annotateur et pr\'eface}% {\'ed.,\addabbrvspace annot\adddotspace et pr\'ef\adddot}}, editorsanfo = {{\'editeurs, annotateurs et pr\'eface}% - {\'ed.,\addabbrvspace annot\adddotspace et pr\'ef\adddot}}, + {\'eds.,\addabbrvspace annot\adddotspace et pr\'ef\adddot}}, editoranaf = {{\'editeur, annotateur et postface}% {\'ed.,\addabbrvspace annot\adddotspace et postf\adddot}}, editorsanaf = {{\'editeurs, annotateurs et postface}% - {\'ed.,\addabbrvspace annot\adddotspace et postf\adddot}}, + {\'eds.,\addabbrvspace annot\adddotspace et postf\adddot}}, editortrcoin = {{\'editeur, traducteur, commentateur et introduction}% {\'ed.,\addabbrvspace trad., comm\adddotspace et introd\adddot}}, editorstrcoin = {{\'editeurs, traducteurs, commentateurs et introduction}% - {\'ed.,\addabbrvspace trad., comm\adddotspace et introd\adddot}}, + {\'eds.,\addabbrvspace trad., comm\adddotspace et introd\adddot}}, editortrcofo = {{\'editeur, traducteur, commentateur et pr\'eface}% {\'ed.,\addabbrvspace trad., comm\adddotspace et pr\'ef\adddot}}, editorstrcofo = {{\'editeurs, traducteurs, commentateurs et pr\'eface}% - {\'ed.,\addabbrvspace trad., comm\adddotspace et pr\'ef\adddot}}, + {\'eds.,\addabbrvspace trad., comm\adddotspace et pr\'ef\adddot}}, editortrcoaf = {{\'editeur, traducteur, commentateur et postface}% {\'ed.,\addabbrvspace trad., comm\adddotspace et postf\adddot}}, editorstrcoaf = {{\'editeurs, traducteurs, commentateurs et postface}% - {\'ed.,\addabbrvspace trad., comm\adddotspace et postf\adddot}}, + {\'eds.,\addabbrvspace trad., comm\adddotspace et postf\adddot}}, editortranin = {{\'editeur, traducteur, annotateur et introduction}% {\'ed.,\addabbrvspace trad., annot\adddotspace et introd\adddot}}, editorstranin = {{\'editeurs, traducteurs, annotateurs et introduction}% - {\'ed.,\addabbrvspace trad., annot\adddotspace et introd\adddot}}, + {\'eds.,\addabbrvspace trad., annot\adddotspace et introd\adddot}}, editortranfo = {{\'editeur, traducteur, annotateur et pr\'eface}% {\'ed.,\addabbrvspace trad., annot\adddotspace et pr\'ef\adddot}}, editorstranfo = {{\'editeurs, traducteurs, annotateurs et pr\'eface}% - {\'ed.,\addabbrvspace trad., annot\adddotspace et pr\'ef\adddot}}, + {\'eds.,\addabbrvspace trad., annot\adddotspace et pr\'ef\adddot}}, editortranaf = {{\'editeur, traducteur, annotateur et postface}% {\'ed.,\addabbrvspace trad., annot\adddotspace et postf\adddot}}, editorstranaf = {{\'editeurs, traducteurs, annotateurs et postface}% - {\'ed.,\addabbrvspace trad., annot\adddotspace et postf\adddot}}, + {\'eds.,\addabbrvspace trad., annot\adddotspace et postf\adddot}}, translatorco = {{traducteur et commentateur}% - {trad\adddotspace et comm\adddot}}, + {trans\adddotspace et comm\adddot}}, translatorsco = {{traducteurs et commentateurs}% - {trad\adddotspace et comm\adddot}}, + {trans\adddotspace et comm\adddot}}, translatoran = {{traducteur et annotateur}% - {trad\adddotspace et annot\adddot}}, + {trans\adddotspace et annot\adddot}}, translatorsan = {{traducteurs et annotateurs}% - {trad\adddotspace et annot\adddot}}, + {trans\adddotspace et annot\adddot}}, translatorin = {{traduction et introduction}% - {trad\adddotspace et introd\adddot}}, + {trans\adddotspace et introd\adddot}}, translatorsin = {{traduction et introduction}% - {trad\adddotspace et introd\adddot}}, + {trans\adddotspace et introd\adddot}}, translatorfo = {{traduction et pr\'eface}% - {trad\adddotspace et pr\'ef\adddot}}, + {trans\adddotspace et pr\'ef\adddot}}, translatorsfo = {{traduction et pr\'eface}% - {trad\adddotspace et pr\'ef\adddot}}, + {trans\adddotspace et pr\'ef\adddot}}, translatoraf = {{traduction et postface}% - {trad\adddotspace et postf\adddot}}, + {trans\adddotspace et postf\adddot}}, translatorsaf = {{traduction et postface}% - {trad\adddotspace et postf\adddot}}, + {trans\adddotspace et postf\adddot}}, translatorcoin = {{traduction, commentaire et introduction}% {trad., comm\adddotspace et introd\adddot}}, translatorscoin = {{traduction, commentaire et introduction}% @@ -270,9 +271,6 @@ {trad., annot\adddotspace et postf\adddot}}, translatorsanaf = {{traduction, annotations et postface}% {trad., annot\adddotspace et postf\adddot}}, - organizer = {{organisateur}{org\adddot}},% - organizers = {{organisateurs}{org\adddot}},% - byorganizer = {{organis\'e par}{org\adddotspace par}},% byauthor = {{par}{par}}, byeditor = {{sous la direction \smartof}{sous la dir\adddotspace\smartof}}, bycompiler = {{compil\'e par}{comp\adddotspace par}}, @@ -385,37 +383,25 @@ origpubin = {{publi\'e \`a l'origine en}{pub\adddotspace \`a l'orig\adddotspace en}}, astitle = {{sous le titre}{sous le titre}}, bypublisher = {{par}{par}}, - nodate = {{pas\space de\space date}{{}p\adddotspace d\adddot}}, page = {{page}{p\adddot}}, pages = {{pages}{p\adddot}}, column = {{colonne}{col\adddot}}, columns = {{colonnes}{col\adddot}}, line = {{ligne}{l\adddot}}, lines = {{lignes}{l\adddot}}, + nodate = {{pas\space de\space date}{{}p\adddot d\adddot}}, verse = {{vers}{v\adddot}}, verses = {{vers}{v\adddot}}, section = {{section}{\S}}, - sections = {{sections}{\S}}, + sections = {{sections}{\S\S}}, paragraph = {{paragraphe}{par\adddot}}, paragraphs = {{paragraphes}{par\adddot}}, - pagetotal = {{page}{p\adddot}}, - pagetotals = {{pages}{p\adddot}}, - columntotal = {{colonne}{col\adddot}}, - columntotals = {{colonnes}{col\adddot}}, - linetotal = {{ligne}{l\adddot}}, - linetotals = {{lignes}{l\adddot}}, - versetotal = {{vers}{v\adddot}}, - versetotals = {{vers}{v\adddot}}, - sectiontotal = {{section}{\S}}, - sectiontotals = {{sections}{\S}}, - paragraphtotal = {{paragraphe}{par\adddot}}, - paragraphtotals = {{paragraphes}{par\adddot}}, in = {{in}{in}}, inseries = {{in}{in}}, ofseries = {{de}{de}}, number = {{num\'ero}{n\textsuperscript{o}}}, chapter = {{chapitre}{chap\adddot}}, - mathesis = {{m\'emoire de master}{m\'em\adddotspace de mast\adddot}}, + mathesis = {{m\'emoire de master}{m\'em\adddot de mast\adddot}}, phdthesis = {{th\`ese de doctorat}{th\`ese de doct\adddot}}, candthesis = {{th\`ese de candidature}{th\`ese de cand\adddot}}, resreport = {{rapport scientifique}{rapp\adddotspace scient\adddot}}, @@ -469,58 +455,48 @@ december = {{d\'ecembre}{d\'ec\adddot}}, langamerican = {{am\'ericain}{am\'ericain}}, langbrazilian = {{br\'esilien}{br\'esilien}}, - langbulgarian = {{bulgare}{bulgare}}, langcatalan = {{catalan}{catalan}}, langcroatian = {{croate}{croate}}, langczech = {{tch\`eque}{tch\`eque}}, langdanish = {{danois}{danois}}, langdutch = {{n\'eerlandais}{n\'eerlandais}}, langenglish = {{anglais}{anglais}}, - langestonian = {{estonien}{estonien}}, +% langestonian = {{}{}},% FIXME: missing langfinnish = {{finnois}{finnois}}, langfrench = {{fran\c{c}ais}{fran\c{c}ais}}, - langgalician = {{galicien}{galicien}}, langgerman = {{allemand}{allemand}}, langgreek = {{grec}{grec}}, langitalian = {{italien}{italien}}, - langjapanese = {{japonais}{japonais}}, langlatin = {{latin}{latin}}, langnorwegian = {{norv\'egien}{norv\'egien}}, langpolish = {{polonais}{polonais}}, langportuguese = {{portugais}{portugais}}, langrussian = {{russe}{russe}}, - langslovak = {{slovaque}{slovaque}}, langslovene = {{slov\`ene}{slov\`ene}}, langspanish = {{espagnol}{espagnol}}, langswedish = {{su\'edois}{su\'edois}}, - langukrainian = {{ukrainien}{ukrainien}}, fromamerican = {{de l'am\'ericain}{de l'am\'ericain}}, frombrazilian = {{du br\'esilien}{du br\'esilien}}, - frombulgarian = {{du bulgare}{du bulgare}}, fromcatalan = {{du catalan}{du catalan}}, fromcroatian = {{du croate}{du croate}}, 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}}, - fromestonian = {{de l'estonien}{de l'estonien}}, +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{du finnois}{du finnois}}, fromfrench = {{du fran\c{c}ais}{du fran\c{c}ais}}, - fromgalician = {{du galicien}{du galicien}}, fromgerman = {{de l'allemand}{de l'allemand}}, fromgreek = {{du grec}{du grec}}, fromitalian = {{de l'italien}{de l'italien}}, - fromjapanese = {{du japonais}{du japonais}}, fromlatin = {{du latin}{du latin}}, fromnorwegian = {{du norv\'egien}{du norv\'egien}}, frompolish = {{du polonais}{du polonais}}, fromportuguese = {{du portugais}{du portugais}}, fromrussian = {{du russe}{du russe}}, - fromslovak = {{du slovaque}{du slovaque}}, fromslovene = {{du slov\`ene}{du slov\`ene}}, fromspanish = {{de l'espagnol}{de l'espagnol}}, fromswedish = {{du su\'edois}{du su\'edois}}, - fromukrainian = {{de l'ukrainien}{de l'ukrainien}}, countryde = {{Allemagne}{DE}}, countryeu = {{Union europ\'eenne}{EU}}, countryep = {{Union europ\'eenne}{EP}}, @@ -545,13 +521,13 @@ annotation = {{annotations}{annotations}}, commonera = {{de l’\`ere commune}{EC}}, beforecommonera = {{avant l’\`ere commune}{AEC}}, - annodomini = {{apr\`es J\'esus-Christ}{apr\adddotspace J\adddot-C\adddot}}, + annodomini = {{apr\`es J\'esus-Christ}{ap\adddotspace J\adddot-C\adddot}}, beforechrist = {{avant J\'esus-Christ}{av\adddotspace J\adddot-C\adddot}}, - circa = {{vers}{vers}}, - spring = {{printemps}{printemps}}, - summer = {{été}{été}}, - autumn = {{automne}{automne}}, - winter = {{hiver}{hiver}}, +% circa = {{}{}},% FIXME: missing +% spring = {{}{}},% FIXME: missing +% summer = {{}{}},% FIXME: missing +% autumn = {{}{}},% FIXME: missing +% winter = {{}{}},% FIXME: missing am = {{AM}{AM}}, pm = {{PM}{PM}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/galician.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/galician.lbx deleted file mode 100644 index 35bb4ae52ce..00000000000 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/galician.lbx +++ /dev/null @@ -1,527 +0,0 @@ -\ProvidesFile{galician.lbx} -[\abx@lbxid] - -\DeclareRedundantLanguages{galician}{galician} - -\DeclareBibliographyExtras{% - \protected\def\bibrangedash{% - \textendash\penalty\hyphenpenalty}% breakable dash - \let\finalandcomma=\empty - \let\finalandsemicolon=\empty - \def\mkbibordinal{\mkbibmascord}% - \protected\def\mkbibmascord#1{% - \stripzeros{#1}\textordmasculine}% \textordmasculine -> textcomp.sty - \protected\def\mkbibfemord#1{% - \stripzeros{#1}\textordfeminine}% \textordfeminine -> textcomp.sty - \protected\def\mkbibneutord{\mkbibmascord}% - \protected\def\mkbibdatelong#1#2#3{% - \iffieldundef{#3} - {} - {\stripzeros{\thefield{#3}}% - \iffieldundef{#2}{}{\nobreakspace de\space}}% - \iffieldundef{#2} - {} - {\mkbibmonth{\thefield{#2}}% - \iffieldundef{#1}{}{\nobreakspace de\space}}% - \iffieldbibstring{#1} - {\bibstring{\thefield{#1}}} - {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% - \protected\def\mkbibdateshort#1#2#3{% - \iffieldundef{#3} - {} - {\mkdayzeros{\thefield{#3}}% - \iffieldundef{#2}{}{/}}% - \iffieldundef{#2} - {} - {\mkmonthzeros{\thefield{#2}}% - \iffieldundef{#1}{}{/}}% - \iffieldbibstring{#1} - {\bibstring{\thefield{#1}}} - {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% - \savecommand\mkbibordedition - \savecommand\mkbibordseries - \def\mkbibordedition{\mkbibfemord}% - \def\mkbibordseries{\mkbibfemord}% - \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% - \iffieldundef{#1}{} - {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% - \iffieldundef{#2}{} - {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% - \iffieldundef{#3}{} - {\printtext{\mktimezeros{\thefield{#3}}}}% - \setunit{}% - \iffieldundef{#4}{} - {\bibtimezonesep - \mkbibtimezone{\thefield{#4}}}}% - \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% - \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep - \forcezerosmdt{\thefield{#2}}% - \iffieldundef{#3}{} - {\bibtimesep - \forcezeros{\thefield{#3}}}% - \space - \ifnumless{\thefield{#1}}{12} - {\bibstring{am}} - {\bibstring{pm}}% - \iffieldundef{#4}{} - {\space\bibtimezonesep - \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% - \iffieldundef{#1}{}{\space}% - \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% - \iffieldundef{#1}{}{\space}% - \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% -} - -\UndeclareBibliographyExtras{% - \restorecommand\mkbibordedition - \restorecommand\mkbibordseries -} - -\DeclareBibliographyStrings{% - bibliography = {{Bibliograf\'ia}{Bibliograf\'ia}}, - references = {{Referencias}{Referencias}}, - shorthands = {{Lista de abreviaturas}{Abreviaturas}}, - editor = {{editor}{ed\adddot}}, - editors = {{editores}{eds\adddot}}, - compiler = {{compilador}{comp\adddot}}, - compilers = {{compiladores}{comp\adddot}}, - redactor = {{redactor}{red\adddot}}, - redactors = {{redactores}{red\adddot}}, - reviser = {{revisor}{rev\adddot}}, - revisers = {{revisores}{revs\adddot}}, - founder = {{fundador}{fund\adddot}}, - founders = {{fundadores}{fund\adddot}}, - continuator = {{continuador}{cont\adddot}}, - continuators = {{continuadores}{cont\adddot}}, - collaborator = {{colaborador}{col\adddot}}, - collaborators = {{colaboradores}{cols\adddot}}, - translator = {{tradutor}{trad\adddot}}, - translators = {{tradutores}{trads\adddot}}, - commentator = {{comentador}{coment\adddot}}, - commentators = {{comentadores}{coments\adddot}}, - annotator = {{anotador}{anot\adddot}}, - annotators = {{anotadores}{anots\adddot}}, - commentary = {{comentario}{coment\adddot}}, - annotations = {{notas}{notas}}, - introduction = {{introduci\'on}{introd\adddot}}, - foreword = {{prefacio}{pref\adddot}}, - afterword = {{posfacio}{posf\adddot}}, - editortr = {{editor e tradutor}% - {ed\adddotspace e trad\adddot}}, - editorstr = {{editores e tradutores}% - {eds\adddotspace e trads\adddot}}, - editorco = {{editor e comentador}% - {ed\adddotspace e coment\adddot}}, - editorsco = {{editores e comentadores}% - {eds\adddotspace e coments\adddot}}, - editoran = {{editor e anotador}% - {ed\adddotspace e anot\adddot}}, - editorsan = {{editores e anotadores}% - {eds\adddotspace e anots\adddot}}, - editorin = {{editor e introduci\'on}% - {ed\adddotspace e introd\adddot}}, - editorsin = {{editores e introduci\'on}% - {eds\adddotspace e introd\adddot}}, - editorfo = {{editor e prefacio}% - {ed\adddotspace e pref\adddot}}, - editorsfo = {{editores e prefacio}% - {eds\adddotspace e pref\adddot}}, - editoraf = {{editor e posfacio}% - {ed\adddotspace e posf\adddot}}, - editorsaf = {{editores e posfacio}% - {eds\adddotspace e posf\adddot}}, - editortrco = {{editor, tradutor e comentador}% - {ed., trad\adddot\ e coment\adddot}}, - editorstrco = {{editores, tradutores e comentadores}% - {eds., trads\adddot\ e coments\adddot}}, - editortran = {{editor, tradutor e anotador}% - {ed., trad\adddot\ e anot\adddot}}, - editorstran = {{editores, tradutores e anotadores}% - {eds., trads\adddot\ e anots\adddot}}, - editortrin = {{editor, tradutor e introduci\'on}% - {ed., trad\adddot\ e introd\adddot}}, - editorstrin = {{editores, tradutores e introduci\'on}% - {eds., trads\adddot\ e introd\adddot}}, - editortrfo = {{editor, tradutor e prefacio}% - {ed., trad\adddot\ e pref\adddot}}, - editorstrfo = {{editores, tradutores e prefacio}% - {eds., trads\adddot\ e pref\adddot}}, - editortraf = {{editor, tradutor e posfacio}% - {ed., trad\adddot\ e posf\adddot}}, - editorstraf = {{editores, tradutores e posfacio}% - {eds., trads\adddot\ e posf\adddot}}, - editorcoin = {{editor, comentador e introduci\'on}% - {ed., coment\adddot\ e introd\adddot}}, - editorscoin = {{editores, comentadores e introduci\'on}% - {eds., coments\adddot\ e introd\adddot}}, - editorcofo = {{editor, comentador e prefacio}% - {ed., coment\adddot\ e pref\adddot}}, - editorscofo = {{editores, comentadores e prefacio}% - {eds., coments\adddot\ e pref\adddot}}, - editorcoaf = {{editor, comentador e posfacio}% - {ed., coment\adddot\ e posf\adddot}}, - editorscoaf = {{editores, comentadores e posfacio}% - {eds., coments\adddot\ e posf\adddot}}, - editoranin = {{editor, anotador e introduci\'on}% - {ed., anot\adddot\ e introd\adddot}}, - editorsanin = {{editores, anotadores e introduci\'on}% - {eds., anots\adddot\ e introd\adddot}}, - editoranfo = {{editor, anotador e prefacio}% - {ed., anot\adddot\ e pref\adddot}}, - editorsanfo = {{editores, anotadores e prefacio}% - {eds., anots\adddot\ e pref\adddot}}, - editoranaf = {{editor, anotador e posfacio}% - {ed., anot\adddot\ e posf\adddot}}, - editorsanaf = {{editores, anotadores e posfacio}% - {eds., anots\adddot\ e posf\adddot}}, - editortrcoin = {{editor, tradutor, comentador e introduci\'on}% - {ed., trad., coment\adddot\ e introd\adddot}}, - editorstrcoin = {{editores, tradutores, comentadores e introduci\'on}% - {eds., trads., coments\adddot\ e introd\adddot}}, - editortrcofo = {{editor, tradutor, comentador e prefacio}% - {ed., trad., coment\adddot\ e pref\adddot}}, - editorstrcofo = {{editores, tradutores, comentadores e prefacio}% - {eds., trads., coments\adddot\ e pref\adddot}}, - editortrcoaf = {{editor, tradutor, comentador e posfacio}% - {ed., trad., coment\adddot\ e posf\adddot}}, - editorstrcoaf = {{editores, tradutores, comentadores e posfacio}% - {eds., trads., coments\adddot\ e posf\adddot}}, - editortranin = {{editor, tradutor, anotador e introduci\'on}% - {ed., trad., anot\adddot\ e introd\adddot}}, - editorstranin = {{editores, tradutores, anotadores e introduci\'on}% - {eds., trads., anots\adddot\ e introd\adddot}}, - editortranfo = {{editor, tradutor, anotador e prefacio}% - {ed., trad., anot\adddot\ e pref\adddot}}, - editorstranfo = {{editores, tradutores, anotadores e prefacio}% - {eds., trads., anots\adddot\ e pref\adddot}}, - editortranaf = {{editor, tradutor, anotador e posfacio}% - {ed., trad., anot\adddot\ e posf\adddot}}, - editorstranaf = {{editores, tradutores, anotadores e posfacio}% - {eds., trads., anots\adddot\ e posf\adddot}}, - translatorco = {{tradutor e comentador}% - {trad\adddot\ e coment\adddot}}, - translatorsco = {{tradutores e comentadores}% - {trads\adddot\ e coments\adddot}}, - translatoran = {{tradutor e anotador}% - {trad\adddot\ e anot\adddot}}, - translatorsan = {{tradutores e anotadores}% - {trads\adddot\ e anots\adddot}}, - translatorin = {{traduci\'on e introduci\'on}% - {trad\adddot\ e introd\adddot}}, - translatorsin = {{traduci\'on e introduci\'on}% - {trad\adddot\ e introd\adddot}}, - translatorfo = {{traduci\'on e prefacio}% - {trad\adddot\ e pref\adddot}}, - translatorsfo = {{traduci\'on e prefacio}% - {trad\adddot\ e pref\adddot}}, - translatoraf = {{traduci\'on e posfacio}% - {trad\adddot\ e posf\adddot}}, - translatorsaf = {{traduci\'on e posfacio}% - {trad\adddot\ e posf\adddot}}, - translatorcoin = {{traduci\'on, comentario e introduci\'on}% - {trad., coment\adddot\ e introd\adddot}}, - translatorscoin = {{traduci\'on, comentario e introduci\'on}% - {trad., coment\adddot\ e introd\adddot}}, - translatorcofo = {{traduci\'on, comentario e prefacio}% - {trad., coment\adddot\ e pref\adddot}}, - translatorscofo = {{traduci\'on, comentario e prefacio}% - {trad., coment\adddot\ e pref\adddot}}, - translatorcoaf = {{traduci\'on, comentario e posfacio}% - {trad., coment\adddot\ e posf\adddot}}, - translatorscoaf = {{traduci\'on, comentario e posfacio}% - {trad., coment\adddot\ e posf\adddot}}, - translatoranin = {{traduci\'on, notas e introduci\'on}% - {trad., notas e introd\adddot}}, - translatorsanin = {{traduci\'on, notas e introduci\'on}% - {trad., notas e introd\adddot}}, - translatoranfo = {{traduci\'on, notas e prefacio}% - {trad., notas e pref\adddot}}, - translatorsanfo = {{traduci\'on, notas e prefacio}% - {trad., notas e pref\adddot}}, - translatoranaf = {{traduci\'on, notas e posfacio}% - {trad., notas e posf\adddot}}, - translatorsanaf = {{traduci\'on, notas e posfacio}% - {trad., notas e posf\adddot}}, -% organizer = {{}{}},% FIXME: missing -% organizers = {{}{}},% FIXME: missing -% byorganizer = {{}{}},% FIXME: missing - byauthor = {{por}{por}}, - byeditor = {{editado por}{ed\adddotspace por}}, - bycompiler = {{compilado por}{comp\adddotspace por}}, - byredactor = {{redactado por}{red\adddotspace por}}, - byreviser = {{revisto por}{rev\adddotspace por}}, - byreviewer = {{avaliado por}{aval\adddotspace por}}, - byfounder = {{fundado por}{fund\adddotspace por}}, - bycontinuator = {{continuado por}{cont\adddotspace por}}, - bycollaborator = {{en colaboraci\'on con}{en col\adddotspace con}}, - bytranslator = {{traducido \lbx@lfromlang\ por}{trad\adddot\ \lbx@sfromlang\ por}}, - bycommentator = {{comentado por}{com\adddot\ por}}, - byannotator = {{notas de}{notas de}}, - withcommentator = {{con comentarios de}{con coment\adddot\ de}}, - withannotator = {{con notas de}{con notas de}}, - withintroduction = {{con introduci\'on de}{con introd\adddot\ de}}, - withforeword = {{con prefacio de}{con pref\adddot\ de}}, - withafterword = {{con posfacio de}{con posf\adddot\ de}}, - byeditortr = {{editado e traducido \lbx@lfromlang\ por}% - {ed\adddotspace e trad\adddot\ \lbx@sfromlang\ por}}, - byeditorco = {{editado e comentado por}% - {ed\adddotspace e com\adddot\ por}}, - byeditoran = {{editado e anotado por}% - {ed\adddotspace e anot\adddot\ por}}, - byeditorin = {{editado e introducido por}% - {ed\adddotspace e introd\adddot\ por}}, - byeditorfo = {{editado e prefaciado por}% - {ed\adddotspace e pref\adddot\ por}}, - byeditoraf = {{editado e posfaciado por}% - {ed\adddotspace e posf\adddot\ por}}, - byeditortrco = {{editado, traducido \lbx@lfromlang\ e comentado por}% - {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e com\adddot\ por}}, - byeditortran = {{editado, traducido \lbx@lfromlang\ e anotado por}% - {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e anot\adddot\ por}}, - byeditortrin = {{editado, traducido \lbx@lfromlang\ e introducido por}% - {ed.,\addabbrvspace trad. \lbx@sfromlang\ e introd\adddot\ por}}, - byeditortrfo = {{editado, traducido \lbx@lfromlang\ e prefaciado por}% - {ed.,\addabbrvspace trad. \lbx@sfromlang\ e pref\adddot\ por}}, - byeditortraf = {{editado, traducido \lbx@lfromlang\ e posfaciado por}% - {ed.,\addabbrvspace trad. \lbx@sfromlang\ e posf\adddot\ por}}, - byeditorcoin = {{editado, comentado e introducido por}% - {ed.,\addabbrvspace com\adddot\ e introd\adddot\ por}}, - byeditorcofo = {{editado, comentado e prefaciado por}% - {ed.,\addabbrvspace com\adddot\ e pref\adddot\ por}}, - byeditorcoaf = {{editado, comentado e posfaciado por}% - {ed.,\addabbrvspace com\adddot\ e posf\adddot\ por}}, - byeditoranin = {{editado, anotado e introducido por}% - {ed.,\addabbrvspace anot\adddot\ e introd\adddot\ por}}, - byeditoranfo = {{editado, anotado e prefaciado por}% - {ed.,\addabbrvspace anot\adddot\ e pref\adddot\ por}}, - byeditoranaf = {{editado, anotado e posfaciado por}% - {ed.,\addabbrvspace anot\adddot\ e posf\adddot\ por}}, - byeditortrcoin = {{editado, traducido \lbx@lfromlang, comentado e introducido por}% - {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e introd\adddot\ por}}, - byeditortrcofo = {{editado, traducido \lbx@lfromlang, comentado e prefaciado por}% - {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e pref\adddot\ por}}, - byeditortrcoaf = {{editado, traducido \lbx@lfromlang, comentado e posfaciado por}% - {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e posf\adddot\ por}}, - byeditortranin = {{editado, traducido \lbx@lfromlang, anotado e introducido por}% - {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, anot\adddot\ e introd\adddot\ por}}, - byeditortranfo = {{editado, traducido \lbx@lfromlang, anotado e prefaciado por}% - {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, anot\adddot\ e pref\adddot\ por}}, - byeditortranaf = {{editado, traducido \lbx@lfromlang, anotado e posfaciado por}% - {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, anot\adddot\ e posf\adddot\ por}}, - bytranslatorco = {{traducido \lbx@lfromlang\ e comentado por}% - {trad\adddot\ \lbx@sfromlang\ e com\adddot\ por}}, - bytranslatoran = {{traducido \lbx@lfromlang\ e anotado por}% - {trad\adddot\ \lbx@sfromlang\ e anot\adddot\ por}}, - bytranslatorin = {{traducido \lbx@lfromlang\ e introducido por}% - {trad\adddot\ \lbx@sfromlang\ e introd\adddot\ por}}, - bytranslatorfo = {{traducido \lbx@lfromlang\ e prefaciado por}% - {trad\adddot\ \lbx@sfromlang\ e pref\adddot\ por}}, - bytranslatoraf = {{traducido \lbx@lfromlang\ e posfaciado por}% - {trad\adddot\ \lbx@sfromlang\ e posf\adddot\ por}}, - bytranslatorcoin = {{traducido \lbx@lfromlang, comentado e introducido por}% - {trad\adddot\ \lbx@sfromlang, com\adddot\ e introd\adddot\ por}}, - bytranslatorcofo = {{traducido \lbx@lfromlang, comentado e prefaciado por}% - {trad\adddot\ \lbx@sfromlang, com\adddot\ e pref\adddot\ por}}, - bytranslatorcoaf = {{traducido \lbx@lfromlang, comentado e posfaciado por}% - {trad\adddot\ \lbx@sfromlang, com\adddot\ e posf\adddot\ por}}, - bytranslatoranin = {{traducido \lbx@lfromlang, anotado e introducido por}% - {trad\adddot\ \lbx@sfromlang, anot\adddot\ e introd\adddot\ por}}, - bytranslatoranfo = {{traducido \lbx@lfromlang, anotado e prefaciado por}% - {trad\adddot\ \lbx@sfromlang, anot\adddot\ e pref\adddot\ por}}, - bytranslatoranaf = {{traducido \lbx@lfromlang, anotado e posfaciado por}% - {trad\adddot\ \lbx@sfromlang, anot\adddot\ e posf\adddot\ por}}, - and = {{e}{e}}, - andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, - andmore = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, - volume = {{volume}{vol\adddot}}, - volumes = {{volumes}{vols\adddot}}, - involumes = {{en}{en}}, - jourvol = {{volume}{vol\adddot}}, - jourser = {{serie}{ser\adddot}}, - book = {{libro}{libro}}, - part = {{parte}{parte}}, - issue = {{n\'umero}{n\'umero}}, - newseries = {{nova serie}{nova ser\adddot}}, - oldseries = {{serie antiga}{ser\adddot\ antiga}}, - edition = {{edici\'on}{ed\adddot}}, - reprint = {{reimpresi\'on}{reimpr\adddot}}, - reprintof = {{reimpresi\'on' de}{reimpr\adddotspace de}}, - reprintas = {{reimpreso como}{reimpr\adddotspace como}}, - reprintfrom = {{reimpreso de}{reimpr\adddotspace de}}, - translationof = {{traduci\'on de}{trad\adddotspace de}}, - translationas = {{traducido como}{trad\adddotspace como}}, - translationfrom = {{traducido de}{trad\adddotspace de}}, - reviewof = {{recensi\'on de}{rec.\adddotspace de}}, - origpubas = {{orixinalmente publicado como}{orix\adddotspace pub\adddotspace como}}, - origpubin = {{orixinalmente publicado en}{orix\adddotspace pub\adddotspace en}}, - astitle = {{como}{como}}, - bypublisher = {{por}{por}}, -nodate = {{sen data}{s\adddot d\adddot}}, - page = {{p\'axina}{p\adddot}}, - pages = {{p\'axinas}{pp\adddot}}, - column = {{coluna}{col\adddot}}, - columns = {{colunas}{cols\adddot}}, - line = {{li\~{n}a}{l\adddot}}, - lines = {{li\~{n}as}{ll\adddot}}, - verse = {{verso}{v\adddot}}, - verses = {{versos}{vv\adddot}}, - section = {{secci\'on}{\S}}, - sections = {{secci\'ons'}{\S\S}}, - paragraph = {{par\'agrafo}{par\adddot}}, - paragraphs = {{par\'agrafo}{pars\adddot}}, -% pagetotal = {{}{}},% FIXME: missing -% pagetotals = {{}{}},% FIXME: missing -% columntotal = {{}{}},% FIXME: missing -% columntotals = {{}{}},% FIXME: missing -% linetotal = {{}{}},% FIXME: missing -% linetotals = {{}{}},% FIXME: missing -% versetotal = {{}{}},% FIXME: missing -% versetotals = {{}{}},% FIXME: missing -% sectiontotal = {{}{}},% FIXME: missing -% sectiontotals = {{}{}},% FIXME: missing -% paragraphtotal = {{}{}},% FIXME: missing -% paragraphtotals = {{}{}},% FIXME: missing - in = {{en}{en}}, - inseries = {{en}{en}}, - ofseries = {{de}{de}}, - number = {{n\'umero}{n\adddot\textordmasculine}}, - chapter = {{cap\'itulo}{cap\adddot}}, - mathesis = {{tese de mestrado}{tese de mestrado}}, - phdthesis = {{tese de doutoramento}{tese de doutoramento}}, - candthesis = {{proposta de tese}{proposta de tese}}, - resreport = {{memoria de investigaci\'on'}{mem\adddotspace de inv\adddot}}, - techreport = {{informe t\'ecnico}{inf\adddotspace t\'ec\adddot}}, - software = {{software}{software}}, - datacd = {{CD-ROM}{CD-ROM}}, - audiocd = {{CD audio}{CD audio}}, - version = {{versi\'on'}{versi\'on}}, - url = {{URL}{URL}}, - urlfrom = {{URL}{URL}}, - urlseen = {{accedido en}{accedido en}}, - inpreparation = {{en preparaci\'on'}{en prep\adddot}}, - submitted = {{enviado}{env\adddot}}, - forthcoming = {{no prelo}{no prelo}}, - inpress = {{no prelo}{no prelo}}, - prepublished = {{prepublicado}{prepub\adddot}}, - citedas = {{de agora en diante}{de agora en diante}}, - seenote = {{ver nota}{ver nota}}, - quotedin = {{citado en}{citado en}}, - idem = {{\'idem}{\'idem}}, - idemsm = {{\'idem}{\'idem}}, - idemsf = {{\'idem}{\'idem}}, - idemsn = {{\'idem}{\'idem}}, - idempm = {{\'idem}{\'idem}}, - idempf = {{\'idem}{\'idem}}, - idempn = {{\'idem}{\'idem}}, - idempp = {{\'idem}{\'idem}}, - ibidem = {{ib\'idem}{ib\'id\adddot}}, - opcit = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}}, - loccit = {{loc\adddotspace cit\adddot}{loc\adddotspace cit\adddot}}, - confer = {{cf\adddot}{cf\adddot}}, - sequens = {{sq\adddot}{sq\adddot}}, - sequentes = {{sqq\adddot}{sqq\adddot}}, - passim = {{p\'assim}{p\'ass\adddot}}, - see = {{v\'exase}{vid\adddotspace}}, - seealso = {{v\'exase tam\'en}{vid\adddotspace tam\'en}}, - backrefpage = {{v\'exase p\'axina}{vid\adddotspace p\adddot}}, - backrefpages = {{v\'exanse p\'axinas}{vid\adddotspace pp\adddot}}, - january = {{xaneiro}{xan\adddot}}, - february = {{febreiro}{feb\adddot}}, - march = {{marzo}{mar\adddot}}, - april = {{abril}{abr\adddot}}, - may = {{maio}{maio}}, - june = {{xu\~{n}o}{xu\~{n}\adddot}}, - july = {{xullo}{xul\adddot}}, - august = {{agosto}{ago\adddot}}, - september = {{setembro}{set\adddot}}, - october = {{outubro}{out\adddot}}, - november = {{novembro}{nov\adddot}}, - december = {{decembro}{dec\adddot}}, - langamerican = {{ingl\'es americano}{ing\adddotspace am\adddot}}, - langbulgarian = {{b\'ulgaro}{b\'ulg\adddot}} - langbrazilian = {{portugu\'es brasileiro}{port\adddotspace br\adddot}}, - langcatalan = {{catal\'an}{cat\adddot}}, - langcroatian = {{croata}{croata}}, - langczech = {{checo}{checo}}, - langdanish = {{dinamarqu\'es}{dan\'es}}, - langdutch = {{neerland\'es}{neerl\adddot}}, - langenglish = {{ingl\'es}{ing\adddot}}, - langestonian = {{estoniano}{eston\adddot}}, - langfinnish = {{fin\'es}{fin\'es}}, - langfrench = {{franc\'es}{fr\adddot}}, - langgalician = {{galego}{gal\adddot}}, - langgerman = {{alem\'an}{al\adddot}}, - langgreek = {{grego}{grego}}, - langitalian = {{italiano}{ital\adddot}}, - langlatin = {{lat\'in}{lat\adddot}}, - langnorwegian = {{noruegu\'es}{nor\adddot}}, - langpolish = {{polaco}{pol\adddot}}, - langportuguese = {{portugu\'es}{port\adddot}}, - langrussian = {{ruso}{ruso}}, - langslovene = {{esloveno}{eslov\adddot}}, - langspanish = {{castel\'an}{cast\adddot}}, - langswedish = {{sueco}{sueco}}, - fromamerican = {{do ingl\'es americano}{do ingl\adddotspace am\adddot}}, - frombulgarian = {{do b\'ulgaro}{do b\'ulg\adddot}}, - frombrazilian = {{do portugu\'es brasileiro}{do port\adddotspace br\adddot}}, - fromcatalan = {{do catal\~ao}{do cat\adddot}}, - fromcroatian = {{do croata}{do croata}}, - fromczech = {{do checo}{do checo}}, - fromdanish = {{do dinamarqu\'es}{do dan\'es}}, - fromdutch = {{do neerland\'es}{do neerl\adddot}}, - fromenglish = {{do ingl\'es}{do ing\adddo}}, - fromestonian = {{do estoniano}{do eston\adddot}}, - fromfinnish = {{do fin\'es}{do fin\'es}}, - fromfrench = {{do franc\'es}{do fr\adddot}}, - fromgalician = {{do galego}{do gal\adddot}}, - fromgerman = {{do alem\'an}{do al\adddot}}, - fromgreek = {{do grego}{do grego}}, - fromitalian = {{do italiano}{do ital\adddot}}, - fromlatin = {{do lat\'in'}{do lat\adddot}}, - fromnorwegian = {{do noruegu\'es}{do nor\adddot}}, - frompolish = {{do polaco}{do pol\adddot}}, - fromportuguese = {{do portugu\'es}{do port\adddot}}, - fromrussian = {{do ruso}{do ruso}}, - fromslovene = {{do esloveno}{do eslov\adddot}}, - fromspanish = {{do castel\'an}{do cast\adddot}}, - fromswedish = {{do sueco}{do sueco}}, - countryde = {{Aleman\{{n}a}{DE}}, - countryeu = {{Uni\'on Europea}{EU}}, - countryep = {{Uni\'on Europea}{EU}}, - countryfr = {{Francia}{FR}}, - countryuk = {{Reino Unido}{GB}}, - countryus = {{Estados Unidos de Am\'erica}{EUA}}, - patent = {{patente}{pat\adddot}}, - patentde = {{patente alem\'a}{pat\adddot\ al\adddot}}, - patenteu = {{patente europea}{pat\adddot\ eur\adddot}}, - patentfr = {{patente francesa}{pat\adddot fr\adddot}}, - patentuk = {{patente brit\'anica}{pat\adddot\ brit\adddot}}, - patentus = {{patente americana}{pat\adddot\ am\adddot}}, - patreq = {{solicitude de patente}{sol\adddot\ de pat\adddot}}, - patreqde = {{solicitude de patente alem\'a}{sol\adddot\ de pat\adddot\ al\adddot}}, - patreqeu = {{solicitude de patente europea}{sol\adddot\ de pat\adddot\ eur\adddot}}, - patreqfr = {{solicitude de patente francesa}{sol\adddot\ de pat\adddot\ fr\adddot}}, - patrequk = {{solicitude de patente brit\'anica}{sol\adddot\ de pat\adddot\ brit\adddot}}, - patrequs = {{solicitude de patente americana}{sol\adddot\ de pat\adddot\ EUA}}, - file = {{arquivo}{arq\adddot}}, - library = {{biblioteca}{bibl\adddot}}, - abstract = {{resumo}{res\adddot}}, - annotation = {{anotaci\'on}{anot\adddot}}, - commonera = {{Era Com\'un'}{EC}}, - beforecommonera = {{antes da Era Com\'un'}{AEC}}, - annodomini = {{despois de Cristo}{d\adddot C\adddot}}, - beforechrist = {{antes de Cristo}{a\adddot C\adddot}}, - circa = {{circa}{ca\adddot}}, - spring = {{primavera}{primavera}}, - summer = {{ver\'an}{ver\'an}}, - autumn = {{outono}{outono}}, - winter = {{inverno}{inverno}}, - am = {{AM}{AM}}, - pm = {{PM}{PM}}, -} - -\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx index 0b28a6b1e37..29dc2a10f1b 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx @@ -34,21 +34,21 @@ {} {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#1} - {} - {\iffieldundef{#3}{/}{\adddot\thinspace}}}% + {} + {\iffieldundef{#3}{/}{\adddot\thinspace}}}% \iffieldbibstring{#1} {\bibstring{\thefield{#1}}} {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% \savecommand\lbx@lfromlang \savecommand\lbx@sfromlang \def\lbx@lfromlang{% - \iflistundef{origlanguage} + \iffieldundef{origlanguage} {} - {\printlist[lfromoriglanguage]{origlanguage}\space}}% + {\bibstring{from\thefield{origlanguage}}\space}}% \def\lbx@sfromlang{% - \iflistundef{origlanguage} + \iffieldundef{origlanguage} {} - {\printlist[sfromoriglanguage]{origlanguage}\space}}% + {\bibstring{from\thefield{origlanguage}}\space}}% \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% \iffieldundef{#1}{} {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% @@ -253,9 +253,6 @@ {\"Ubers., Erl\"aut\adddot\ und Nachw\adddot}}, translatorsanaf = {{\"Ubersetzung, Erl\"auterungen und Nachwort}% {\"Ubers., Erl\"aut\adddot\ und Nachw\adddot}}, -% organizer = {{}{}},% FIXME: missing -% organizers = {{}{}},% FIXME: missing -% byorganizer = {{}{}},% FIXME: missing byauthor = {{von}{von}}, byeditor = {{herausgegeben von}{hrsg\adddotspace von}}, bycompiler = {{kompiliert von}{komp\adddotspace von}}, @@ -367,31 +364,19 @@ origpubin = {{Zuerst publiziert in}{Zuerst publ\adddotspace in}}, astitle = {{unter dem Titel}{unter dem Titel}}, bypublisher = {{von}{von}}, - nodate = {{ohne\space Datum}{{}o\adddot D\adddot}}, page = {{Seite}{S\adddot}}, pages = {{Seiten}{S\adddot}}, column = {{Spalte}{Sp\adddot}}, columns = {{Spalten}{Sp\adddot}}, line = {{Zeile}{Z\adddot}}, lines = {{Zeilen}{Z\adddot}}, + nodate = {{ohne\space Datum}{{}o\adddot D\adddot}}, verse = {{Vers}{V\adddot}}, verses = {{Verse}{V\adddot}}, section = {{Paragraph}{\S}}, sections = {{Paragraphen}{\S\S}}, paragraph = {{Absatz}{Abs\adddot}}, paragraphs = {{Abs\"atze}{Abs\adddot}}, - pagetotal = {{Seite}{S\adddot}}, - pagetotals = {{Seiten}{S\adddot}}, - columntotal = {{Spalte}{Sp\adddot}}, - columntotals = {{Spalten}{Sp\adddot}}, - linetotal = {{Zeile}{Z\adddot}}, - linetotals = {{Zeilen}{Z\adddot}}, - versetotal = {{Vers}{V\adddot}}, - versetotals = {{Verse}{V\adddot}}, - sectiontotal = {{Paragraph}{\S}}, - sectiontotals = {{Paragraphen}{\S\S}}, - paragraphtotal = {{Absatz}{Abs\adddot}}, - paragraphtotals = {{Abs\"atze}{Abs\adddot}}, in = {{in}{in}}, inseries = {{der Reihe}{der Reihe}}, ofseries = {{der Reihe}{der Reihe}}, @@ -451,58 +436,46 @@ december = {{Dezember}{Dez\adddot}}, langamerican = {{Amerikanisch}{Amerikanisch}}, langbrazilian = {{Brasilianisch}{Brasilianisch}}, - langbulgarian = {{Bulgarisch}{Bulgarisch}}, langcatalan = {{Katalanisch}{Katalanisch}}, langcroatian = {{Kroatisch}{Kroatisch}}, langczech = {{Tschechisch}{Tschechisch}}, langdanish = {{D\"anisch}{D\"anisch}}, langdutch = {{Niederl\"andisch}{Niederl\"andisch}}, langenglish = {{Englisch}{Englisch}}, - langestonian = {{Estnisch}{Estnisch}}, langfinnish = {{Finnisch}{Finnisch}}, langfrench = {{Franz\"osisch}{Franz\"osisch}}, - langgalician = {{Galicisch}{Galicisch}}, langgerman = {{Deutsch}{Deutsch}}, langgreek = {{Griechisch}{Griechisch}}, langitalian = {{Italienisch}{Italienisch}}, - langjapanese = {{Japanisch}{Japanisch}}, langlatin = {{Lateinisch}{Lateinisch}}, langnorwegian = {{Norwegisch}{Norwegisch}}, langpolish = {{Polnisch}{Polnisch}}, langportuguese = {{Portugiesisch}{Portugiesisch}}, langrussian = {{Russisch}{Russisch}}, - langslovak = {{Slowakisch}{Slowakisch}}, langslovene = {{Slowenisch}{Slowenisch}}, langspanish = {{Spanisch}{Spanisch}}, langswedish = {{Schwedisch}{Schwedisch}}, - langukrainian = {{Ukrainisch}{Ukrainisch}}, fromamerican = {{aus dem Amerikanischen}{aus dem Amerikanischen}}, frombrazilian = {{aus dem Brasilianischen}{aus dem Brasilianischen}}, - frombulgarian = {{aus dem Bulgarischen}{aus dem Bulgarischen}}, fromcatalan = {{aus dem Katalanischen}{aus dem Katalanischen}}, fromcroatian = {{aus dem Kroatischen}{aus dem Kroatischen}}, fromczech = {{aus dem Tschechischen}{aus dem Tschechischen}}, fromdanish = {{aus dem D\"anischen}{aus dem D\"anischen}}, fromdutch = {{aus dem Niederl\"andischen}{aus dem Niederl\"andischen}}, fromenglish = {{aus dem Englischen}{aus dem Englischen}}, - fromestonian = {{aus dem Estnischen}{aus dem Estnischen}}, fromfinnish = {{aus dem Finnischen}{aus dem Finnischen}}, fromfrench = {{aus dem Franz\"osischen}{aus dem Franz\"osischen}}, - fromgalician = {{aus dem Galicischen}{aus dem Galicischen}}, fromgerman = {{aus dem Deutschen}{aus dem Deutschen}}, fromgreek = {{aus dem Griechischen}{aus dem Griechischen}}, fromitalian = {{aus dem Italienischen}{aus dem Italienischen}}, - fromjapanese = {{aus dem Japanischen}{aus dem Japanischen}}, fromlatin = {{aus dem Lateinischen}{aus dem Lateinischen}}, fromnorwegian = {{aus dem Norwegischen}{aus dem Norwegischen}}, frompolish = {{aus dem Polnischen}{aus dem Polnischen}}, fromportuguese = {{aus dem Portugiesischen}{aus dem Portugiesischen}}, fromrussian = {{aus dem Russischen}{aus dem Russischen}}, - fromslovak = {{aus dem Slowakischen}{aus dem Slowakischen}}, fromslovene = {{aus dem Slowenischen}{aus dem Slowenischen}}, fromspanish = {{aus dem Spanischen}{aus dem Spanischen}}, fromswedish = {{aus dem Schwedischen}{aus dem Schwedischen}}, - fromukrainian = {{aus dem Ukrainischen}{aus dem Ukrainischen}}, countryde = {{Deutschland}{DE}}, countryep = {{Europ\"aische Union}{EP}}, countryeu = {{Europ\"aische Union}{EU}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx index d2d1a9fc1da..f397ce37454 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx @@ -281,9 +281,6 @@ {μτφρ., επισημ\adddot\ και επίλ\adddot}}, translatorsanaf = {{μετάφραση, επισημείωση και επίλογος} {μτφρ., επισημ\adddot\ και επίλ\adddot}}, -% organizer = {{}{}},% FIXME: missing -% organizers = {{}{}},% FIXME: missing -% byorganizer = {{}{}},% FIXME: missing byauthor = {{υπό}{υπό}}, byeditor = {{επιμέλεια υπό}{επιμέλεια υπό}}, bycompiler = {{σύνταξη υπό}{σύνταξη υπό}}, @@ -374,18 +371,6 @@ sections = {{ενότητες}{ενότητες}}, paragraph = {{παράγραφος}{§}}, paragraphs = {{παράγραφοι}{§§}}, -% pagetotal = {{}{}},% FIXME: missing -% pagetotals = {{}{}},% FIXME: missing -% columntotal = {{}{}},% FIXME: missing -% columntotals = {{}{}},% FIXME: missing -% linetotal = {{}{}},% FIXME: missing -% linetotals = {{}{}},% FIXME: missing -% versetotal = {{}{}},% FIXME: missing -% versetotals = {{}{}},% FIXME: missing -% sectiontotal = {{}{}},% FIXME: missing -% sectiontotals = {{}{}},% FIXME: missing -% paragraphtotal = {{}{}},% FIXME: missing -% paragraphtotals = {{}{}},% FIXME: missing in = {{στο}{στο}}, inseries = {{στη}{στη}}, ofseries = {{της}{της}}, @@ -470,17 +455,15 @@ datedecember = {{Δεκεμβρίου}{Δεκ\adddot}}, langamerican = {{Αγγλικά}{Αγγλικά}}, langbrazilian = {{Βραζιλιάνικα}{Βραζιλιάνικα}}, -% langbulgarian = {{}{}},% FIXME: missing % langcatalan = {{}{}},% FIXME: missing % langcroatian = {{}{}},% FIXME: missing % langczech = {{}{}},% FIXME: missing langdanish = {{Δανέζικα}{Δανέζικα}}, langdutch = {{Ολλανδικά}{Ολλανδικά}}, langenglish = {{Αγγλικά}{Αγγλικά}}, -% langestonian = {{}{}},% FIXME: missing +% langestonian = {{}{}},% FIXME: missing % langfinnish = {{}{}},% FIXME: missing langfrench = {{Γαλλικά}{Γαλλικά}}, - langgalician = {{Γαλικιανή}{Γαλικιανή}}, langgerman = {{Γερμανικά}{Γερμανικά}}, langgreek = {{Ελληνικά}{Ελληνικά}}, langitalian = {{Ιταλικά}{Ιταλικά}}, @@ -494,17 +477,15 @@ langswedish = {{Σουηδικά}{Σουηδικά}}, fromamerican = {{από τα Αγγλικά}{από τα Αγγλικά}}, frombrazilian = {{από τα Βραζιλιάνικα}{από τα Βραζιλιάνικα}}, -% frombulgarian = {{}{}},% FIXME: missing % fromcatalan = {{}{}},% FIXME: missing % fromcroatian = {{}{}},% FIXME: missing % fromczech = {{}{}},% FIXME: missing fromdanish = {{από τα Δανέζικα}{από τα Δανέζικα}}, fromdutch = {{από τα Ολλανδικά}{από τα Ολλανδικά}}, fromenglish = {{από τα Αγγλικά}{από τα Αγγλικά}}, -% fromestonian = {{}{}},% FIXME: missing +% fromestonian = {{}{}},% FIXME: missing % fromfinnish = {{}{}},% FIXME: missing fromfrench = {{από τα Γαλλικά}{από τα Γαλλικά}}, - fromgalician = {{από τα Γαλικιανή}{από τα Γαλικιανή}}, fromgerman = {{από τα Γερμανικά}{από τα Γερμανικά}}, fromgreek = {{από τα Ελληνικά}{από τα Ελληνικά}}, fromitalian = {{από τα Ιταλικά}{από τα Ιταλικά}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx index ba4b2bc4ae4..3085110ed7f 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx @@ -194,9 +194,6 @@ % translatorsanfo = {{}{}},% FIXME: missing % translatoranaf = {{}{}},% FIXME: missing % translatorsanaf = {{}{}},% FIXME: missing -% organizer = {{}{}},% FIXME: missing -% organizers = {{}{}},% FIXME: missing -% byorganizer = {{}{}},% FIXME: missing byauthor = {{h\"ofundur}{h\"of\adddot}}, byeditor = {{gefi\dh{} \'ut af}{gefi\dh{} \'ut af}}, bycompiler = {{teki\dh{} saman af}{teki\dh{} saman af}}, @@ -310,31 +307,19 @@ % origpubas = {{}{}},% FIXME: missing % origpubin = {{}{}},% FIXME: missing % astitle = {{}{}},% FIXME: missing - nodate = {{\'an \'ars}{\'an \'ars}}, page = {{bla\dh{}s\'{\i}\dh{}a}{bls\adddot}}, pages = {{bla\dh{}s\'{\i}\dh{}ur}{bls\adddot}}, column = {{d\'alkur}{dlk\adddot}}, columns = {{d\'alkar}{dlk\adddot}}, line = {{l\'{\i}na}{l\adddot}}, lines = {{l\'{\i}nur}{l\adddot}}, + nodate = {{\'an \'ars}{\'an \'ars}}, verse = {{erindi}{er\adddot}}, verses = {{erindi}{er\adddot}}, section = {{grein}{\S}}, sections = {{grein}{\S\S}}, paragraph = {{m\'alsgrein}{mgr\adddot}}, paragraphs = {{m\'alsgreinar}{mgr\adddot}}, -% pagetotal = {{}{}},% FIXME: missing -% pagetotals = {{}{}},% FIXME: missing -% columntotal = {{}{}},% FIXME: missing -% columntotals = {{}{}},% FIXME: missing -% linetotal = {{}{}},% FIXME: missing -% linetotals = {{}{}},% FIXME: missing -% versetotal = {{}{}},% FIXME: missing -% versetotals = {{}{}},% FIXME: missing -% sectiontotal = {{}{}},% FIXME: missing -% sectiontotals = {{}{}},% FIXME: missing -% paragraphtotal = {{}{}},% FIXME: missing -% paragraphtotals = {{}{}},% FIXME: missing in = {{\'{\i}}{\'{\i}}}, inseries = {{ritr\"o\dh{}in}{ritr\"o\dh{}in}}, ofseries = {{\'ur ritr\"o\dh{}inni}{\'ur ritr\adddot}}, @@ -393,17 +378,15 @@ december = {{desember}{des\adddot}}, langamerican = {{bandar\'{\i}ska}{bandar\'{\i}ska}}, % langbrazilian = {{}{}},% FIXME: missing -% langbulgarian = {{}{}},% FIXME: missing % langcatalan = {{}{}},% FIXME: missing % langcroatian = {{}{}},% FIXME: missing % langczech = {{}{}},% FIXME: missing langdanish = {{danska}{danska}}, langdutch = {{hollenska}{hollenska}}, langenglish = {{enska}{enska}}, -% langestonian = {{}{}},% FIXME: missing +% langestonian = {{}{}},% FIXME: missing langfinnish = {{finnska}{finnska}}, langfrench = {{franska}{franska}}, - langgalician = {{galis\'iska}{galis\'iska}}, langgerman = {{\th\'yska}{\th\'yska}}, langgreek = {{gr\'{\i}ska}{gr\'{\i}ska}}, langitalian = {{\'{\i}talska}{\'{\i}talska}}, @@ -417,17 +400,15 @@ langswedish = {{s\ae{}nska}{s\ae{}nska}}, fromamerican = {{\'ur bandar\'{\i}sku}{\'ur bandar\'{\i}sku}}, % frombrazilian = {{}{}},% FIXME: missing -% frombulgarian = {{}{}},% FIXME: missing % fromcatalan = {{}{}},% FIXME: missing % fromcroatian = {{}{}},% FIXME: missing % fromczech = {{}{}},% FIXME: missing fromdanish = {{\'ur d\"onsku}{\'ur d\"onsku}}, fromdutch = {{\'ur hollensku}{\'ur hollensku}}, fromenglish = {{\'ur ensku}{\'ur ensku}}, -% fromestonian = {{}{}},% FIXME: missing +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{\'ur finnsku}{\'ur finnsku}}, fromfrench = {{\'ur fr\"onsku}{\'ur fr\"onsku}}, - fromgalician = {{\'ur galis\'isku}{\'ur galis\'isku}}, fromgerman = {{\'ur \th\'ysku}{\'ur \th\'ysku}}, fromgreek = {{\'ur gr\'{\i}sku}{\'ur gr\'{\i}sku}}, fromitalian = {{\'ur \'{\i}t\"olsku}{\'ur \'{\i}t\"olsku}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx index c0087da6d4b..d039a568d6d 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx @@ -178,9 +178,6 @@ % translatorsanfo = {{}{}},% FIXME: missing % translatoranaf = {{}{}},% FIXME: missing % translatorsanaf = {{}{}},% FIXME: missing -% organizer = {{}{}},% FIXME: missing -% organizers = {{}{}},% FIXME: missing -% byorganizer = {{}{}},% FIXME: missing byauthor = {{di}{di}}, byeditor = {{a cura di}{a cura di}}, bycompiler = {{compilato da}{comp\adddotspace da}}, @@ -292,31 +289,19 @@ % origpubin = {{}{}},% FIXME: missing % astitle = {{}{}},% FIXME: missing % bypublisher = {{}{}},% FIXME: missing - nodate = {{senza\space data}{{}n\adddot d\adddot}}, page = {{pagina}{p\adddot}}, pages = {{pagine}{pp\adddot}}, column = {{colonna}{col\adddot}}, columns = {{colonne}{coll\adddot}}, line = {{riga}{r\adddot}}, lines = {{righe}{rr\adddot}}, + nodate = {{senza\space data}{{}n\adddot d\adddot}}, verse = {{verso}{v\adddot}}, verses = {{versi}{vv\adddot}}, % section = {{}{\S}},% FIXME: missing % sections = {{}{\S\S}},% FIXME: missing paragraph = {{paragrafo}{par\adddot}}, paragraphs = {{paragrafi}{par\adddot}}, -% pagetotal = {{}{}},% FIXME: missing -% pagetotals = {{}{}},% FIXME: missing -% columntotal = {{}{}},% FIXME: missing -% columntotals = {{}{}},% FIXME: missing -% linetotal = {{}{}},% FIXME: missing -% linetotals = {{}{}},% FIXME: missing -% versetotal = {{}{}},% FIXME: missing -% versetotals = {{}{}},% FIXME: missing -% sectiontotal = {{}{}},% FIXME: missing -% sectiontotals = {{}{}},% FIXME: missing -% paragraphtotal = {{}{}},% FIXME: missing -% paragraphtotals = {{}{}},% FIXME: missing in = {{in}{in}}, inseries = {{in}{in}}, ofseries = {{di}{di}}, @@ -376,17 +361,15 @@ december = {{dicembre}{dic\adddot}}, langamerican = {{americano}{americano}}, langbrazilian = {{brasiliano}{brasiliano}}, -% langbulgarian = {{}{}},% FIXME: missing % langcatalan = {{}{}},% FIXME: missing % langcroatian = {{}{}},% FIXME: missing % langczech = {{}{}},% FIXME: missing langdanish = {{danese}{danese}}, langdutch = {{olandese}{olandese}}, langenglish = {{inglese}{inglese}}, -% langestonian = {{}{}},% FIXME: missing +% langestonian = {{}{}},% FIXME: missing % langfinnish = {{}{}},% FIXME: missing langfrench = {{francese}{francese}}, - langgalician = {{galiziano}{galiziano}}, langgerman = {{tedesco}{tedesco}}, langgreek = {{greco}{greco}}, langitalian = {{italiano}{italiano}}, @@ -400,17 +383,15 @@ langswedish = {{svedese}{svedese}}, fromamerican = {{dall'americano}{dall'americano}}, frombrazilian = {{dall brasiliano}{dall brasiliano}}, -% frombulgarian = {{}{}},% FIXME: missing % fromcatalan = {{}{}},% FIXME: missing % fromcroatian = {{}{}},% FIXME: missing % fromczech = {{}{}},% FIXME: missing fromdanish = {{dal danese}{dal danese}}, fromdutch = {{dall'olandese}{dall'olandese}}, fromenglish = {{dall'inglese}{dall'inglese}}, -% fromestonian = {{}{}},% FIXME: missing +% fromestonian = {{}{}},% FIXME: missing % fromfinnish = {{}{}},% FIXME: missing fromfrench = {{dal francese}{dal francese}}, - fromgalician = {{dal galiziano}{dal galiziano}}, fromgerman = {{dal tedesco}{dal tedesco}}, fromgreek = {{dal greco}{dal greco}}, fromitalian = {{dall'italiano}{dall'italiano}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx index bcd2181858b..fbf1a7f542e 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx @@ -10,8 +10,6 @@ % alternative spelling, uncomment to enable: % section = {{Paragraf}{\S}}, % sections = {{Paragrafen}{\S\S}}, -% sectiontotal = {{Paragraf}{\S}}, -% sectiontotals = {{Paragrafen}{\S\S}}, } \DeclareHyphenationExceptions{% diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx index e8e26aedf6b..459b92acb67 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx @@ -9,8 +9,6 @@ % alternative spelling, uncomment to enable: % section = {{Paragraf}{\S}}, % sections = {{Paragrafen}{\S\S}}, -% sectiontotal = {{Paragraf}{\S}}, -% sectiontotals = {{Paragrafen}{\S\S}}, } \DeclareHyphenationExceptions{% diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx index bf6ffd52fb3..adfadba47f9 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx @@ -1,527 +1,10 @@ \ProvidesFile{norsk.lbx} [\abx@lbxid] -\DeclareRedundantLanguages{norsk}{norwegian,nynorsk} +% Status: +% - 'norsk' and 'nynorsk' use the same translations, correct? -\DeclareBibliographyExtras{% - \protected\def\bibrangedash{% - \textendash\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}% - \protected\def\mkbibneutord{\mkbibordinal}% - \protected\def\mkbibdatelong#1#2#3{% - \iffieldundef{#3} - {} - {\mkbibordinal{\thefield{#3}}% - \iffieldundef{#2}{}{\nobreakspace}}% - \iffieldundef{#2} - {} - {\mkbibmonth{\thefield{#2}}% - \iffieldundef{#1}{}{\space}}% - \iffieldbibstring{#1} - {\bibstring{\thefield{#1}}} - {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% - \protected\def\mkbibdateshort#1#2#3{% - \iffieldundef{#3} - {} - {\mkdayzeros{\thefield{#3}}\adddot}% - \iffieldundef{#2} - {} - {\mkmonthzeros{\thefield{#2}}% - \iffieldundef{#1}{}{\adddot}}% - \iffieldbibstring{#1} - {\bibstring{\thefield{#1}}} - {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% - \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% - \iffieldundef{#1}{} - {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% - \iffieldundef{#2}{} - {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% - \iffieldundef{#3}{} - {\printtext{\mktimezeros{\thefield{#3}}}}% - \setunit{}% - \iffieldundef{#4}{} - {\bibtimezonesep - \mkbibtimezone{\thefield{#4}}}}% - \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% - \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep - \forcezerosmdt{\thefield{#2}}% - \iffieldundef{#3}{} - {\bibtimesep - \forcezeros{\thefield{#3}}}% - \space - \ifnumless{\thefield{#1}}{12} - {\bibstring{am}} - {\bibstring{pm}}% - \iffieldundef{#4}{} - {\space\bibtimezonesep - \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% - \iffieldundef{#1}{}{\space}% - \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% - \iffieldundef{#1}{}{\space}% - \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% -} - -\DeclareBibliographyStrings{% - bibliography = {{Bibliografi}{Bibliografi}}, - references = {{Referanser}{Referanser}}, - shorthands = {{Forkortelser}{Forkortelser}}, - editor = {{redakt{\o}r}{red\adddot}}, - editors = {{redakt{\o}rer}{red\adddot}}, - compiler = {{kompilator}{komp\adddot}}, - compilers = {{kompilatorer}{komp\adddot}}, - redactor = {{bearbeidelse}{bearb\adddot}}, - redactors = {{bearbeidelse}{bearb\adddot}}, - reviser = {{revisjon}{rev\adddot}}, - revisers = {{revisjon}{rev\adddot}}, - founder = {{grunnlegger}{grunnl\adddot}}, - founders = {{grunnleggere}{grunnl\adddot}}, - continuator = {{videref{\o}ring}{videref\adddot}}, - continuators = {{videref{\o}ring}{videref\adddot}}, - collaborator = {{samarbeid}{samarb\adddot}}, - collaborators = {{samarbeid}{samarb\adddot}}, - translator = {{oversetter}{overs\adddot}}, - translators = {{oversettere}{overs\adddot}}, - commentator = {{kommentarer}{komm\adddot}}, - commentators = {{kommentarer}{komm\adddot}}, - annotator = {{forklaringer}{forkl\adddot}}, - annotators = {{forklaringer}{forkl\adddot}}, - commentary = {{kommentarer}{komm\adddot}}, - annotations = {{forklaringer}{forkl\adddot}}, - introduction = {{innledning}{innl\adddot}}, - foreword = {{forord}{forord}}, - afterword = {{etterord}{etterord}}, - editortr = {{redakt{\o}r og oversetter}% - {red\adddotspace og overs\adddot}}, - editorstr = {{redakt{\o}rer og oversettere}% - {red\adddotspace og overs\adddot}}, - editorco = {{redakt{\o}r og kommentarer} - {red\adddotspace og komm\adddot}}, - editorsco = {{redakt{\o}rer og kommentarer} - {red\adddotspace og komm\adddot}}, - editoran = {{redakt{\o}r og forklaringer}% - {red\adddotspace og forkl\adddot}}, - editorsan = {{redakt{\o}rer og forklaringer}% - {red\adddotspace og forkl\adddot}}, - editorin = {{redakt{\o}r og innledning}% - {red\adddotspace og innl\adddot}}, - editorsin = {{redakt{\o}rer og innledning}% - {red\adddotspace og innl\adddot}}, - editorfo = {{redakt{\o}r og forord}% - {red\adddotspace og forord}}, - editorsfo = {{redakt{\o}rer og forord}% - {red\adddotspace og forord}}, - editoraf = {{redakt{\o}r og etterord}% - {red\adddotspace og etterord}}, - editorsaf = {{redakt{\o}rer og etterord}% - {red\adddotspace og etterord}}, - editortrco = {{redakt{\o}r, oversetter og kommentarer}% - {red.,\addabbrvspace overs\adddotspace og komm\adddot}}, - editorstrco = {{redakt{\o}rer, oversettere og kommentarer}% - {red.,\addabbrvspace overs\adddotspace og komm\adddot}}, - editortran = {{redakt{\o}r, oversetter og forklaringer}% - {red.,\addabbrvspace overs\adddotspace og forkl\adddot}}, - editorstran = {{redakt{\o}rer, oversettere og forklaringer}% - {red.,\addabbrvspace overs\adddotspace og forkl\adddot}}, - editortrin = {{redakt{\o}r, oversetter og innledning}% - {red.,\addabbrvspace overs\adddotspace og innl\adddot}}, - editorstrin = {{redakt{\o}rer, oversettere og innledning}% - {red.,\addabbrvspace overs\adddotspace og innl\adddot}}, - editortrfo = {{redakt{\o}r, oversetter og forord}% - {red.,\addabbrvspace overs\adddotspace og forord}}, - editorstrfo = {{redakt{\o}rer, oversettere og forord}% - {red.,\addabbrvspace overs\adddotspace og forord}}, - editortraf = {{redakt{\o}r, oversetter og etterord}% - {red.,\addabbrvspace overs\adddotspace og etterord}}, - editorstraf = {{redakt{\o}rer, oversettere og etterord}% - {red.,\addabbrvspace overs\adddotspace og etterord}}, - editorcoin = {{redakt{\o}r, kommentarer og innledning}% - {red.,\addabbrvspace komm\adddotspace og innl\adddot}}, - editorscoin = {{redakt{\o}rer, kommentarer og innledning}% - {red.,\addabbrvspace komm\adddotspace og innl\adddot}}, - editorcofo = {{redakt{\o}r, kommentarer og forord}% - {red.,\addabbrvspace komm\adddotspace og forord}}, - editorscofo = {{redakt{\o}rer, kommentarer og forord}% - {red.,\addabbrvspace komm\adddotspace og forord}}, - editorcoaf = {{redakt{\o}r, kommentarer og etterord}% - {red.,\addabbrvspace komm\adddotspace og etterord}}, - editorscoaf = {{redakt{\o}rer, kommentarer og etterord}% - {red.,\addabbrvspace komm\adddotspace og etterord}}, - editoranin = {{redakt{\o}r, forklaringer og innledning}% - {red.,\addabbrvspace forkl\adddotspace og innl\adddot}}, - editorsanin = {{redakt{\o}rer, forklaringer og innledning}% - {red.,\addabbrvspace forkl\adddotspace og innl\adddot}}, - editoranfo = {{redakt{\o}r, forklaringer og forord}% - {red.,\addabbrvspace forkl\adddotspace og forord}}, - editorsanfo = {{redakt{\o}rer, forklaringer og forord}% - {red.,\addabbrvspace forkl\adddotspace og forord}}, - editoranaf = {{redakt{\o}r, forklaringer og etterord}% - {red.,\addabbrvspace forkl\adddotspace og etterord}}, - editorsanaf = {{redakt{\o}rer, forklaringer og etterord}% - {red.,\addabbrvspace forkl\adddotspace og etterord}}, - editortrcoin = {{redakt{\o}r, oversetter, kommentarer og innledning}% - {red.,\addabbrvspace overs., komm\adddotspace og innl\adddot}}, - editorstrcoin = {{redakt{\o}rer, oversettere, kommentarer og innledning}% - {red.,\addabbrvspace overs., komm\adddotspace og innl\adddot}}, - editortrcofo = {{redakt{\o}r, oversetter, kommentarer og forord}% - {red.,\addabbrvspace overs., komm\adddotspace og forord}}, - editorstrcofo = {{redakt{\o}rer, oversettere, kommentarer og forord}% - {red.,\addabbrvspace overs., komm\adddotspace og forord}}, - editortrcoaf = {{redakt{\o}r, oversetter, kommentarer og etterord}% - {red.,\addabbrvspace overs., komm\adddotspace og etterord}}, - editorstrcoaf = {{redakt{\o}rer, oversettere, kommentarer og etterord}% - {red.,\addabbrvspace overs., komm\adddotspace og etterord}}, - editortranin = {{redakt{\o}r, oversetter, forklaringer og innledning}% - {red.,\addabbrvspace overs., forkl\adddotspace og innl\adddot}}, - editorstranin = {{redakt{\o}rer, oversettere, forklaringer og innledning}% - {red.,\addabbrvspace overs., forkl\adddotspace og innl\adddot}}, - editortranfo = {{redakt{\o}r, oversetter, forklaringer og forord}% - {red.,\addabbrvspace overs., forkl\adddotspace og forord}}, - editorstranfo = {{redakt{\o}rer, oversettere, forklaringer og forord}% - {red.,\addabbrvspace overs., forkl\adddotspace og forord}}, - editortranaf = {{redakt{\o}r, oversetter, forklaringer og etterord}% - {red.,\addabbrvspace overs., forkl\adddotspace og etterord}}, - editorstranaf = {{redakt{\o}rer, oversettere, forklaringer og etterord}% - {red.,\addabbrvspace overs., forkl\adddotspace og etterord}}, - translatorco = {{oversetter og kommentarer}% - {overs\adddotspace og komm\adddot}}, - translatorsco = {{oversettere og kommentarer}% - {overs\adddotspace og komm\adddot}}, - translatoran = {{oversetter og forklaringer}% - {overs\adddotspace og forkl\adddot}}, - translatorsan = {{oversettere og forklaringer}% - {overs\adddotspace og forkl\adddot}}, - translatorin = {{oversetter og innledning}% - {overs\adddotspace og innl\adddot}}, - translatorsin = {{oversettere og innledning}% - {overs\adddotspace og innl\adddot}}, - translatorfo = {{oversetter og forord}% - {overs\adddotspace og forord}}, - translatorsfo = {{oversettere og forord}% - {overs\adddotspace og forord}}, - translatoraf = {{oversetter og etterord}% - {overs\adddotspace og etterord}}, - translatorsaf = {{oversettere og etterord}% - {overs\adddotspace og etterord}}, - translatorcoin = {{oversetter, kommentarer og innledning}% - {overs., komm\adddotspace og innl\adddot}}, - translatorscoin = {{oversettere, kommentarer og innledning}% - {overs., komm\adddotspace og innl\adddot}}, - translatorcofo = {{oversetter, kommentarer og forord}% - {overs., komm\adddotspace og forord}}, - translatorscofo = {{oversettere, kommentarer og forord}% - {overs., komm\adddotspace og forord}}, - translatorcoaf = {{oversetter, kommentarer og etterord}% - {overs., komm\adddotspace og etterord}}, - translatorscoaf = {{oversettere, kommentarer og etterord}% - {overs., komm\adddotspace og etterord}}, - translatoranin = {{oversetter, forklaringer og innledning}% - {overs., forkl\adddotspace og innl\adddot}}, - translatorsanin = {{oversettere, forklaringer og innledning}% - {overs., forkl\adddotspace og innl\adddot}}, - translatoranfo = {{oversetter, forklaringer og forord}% - {overs., forkl\adddotspace og forord}}, - translatorsanfo = {{oversettere, forklaringer og forord}% - {overs., forkl\adddotspace og forord}}, - translatoranaf = {{oversetter, forklaringer og etterord}% - {overs., forkl\adddotspace og etterord}}, - translatorsanaf = {{oversettere, forklaringer og etterord}% - {overs., forkl\adddotspace og etterord}}, - organizer = {{organisator}{org\adddot}}, - organizers = {{organisatorer}{org\adddot}}, - byorganizer = {{organisert av}{org\adddotspace av}}, - byauthor = {{av}{av}}, - byeditor = {{redigert av}{red\adddotspace av}}, - bycompiler = {{kompilert av}{komp\adddotspace av}}, - byredactor = {{bearbeidet av}{bearb\adddotspace av}}, - byreviser = {{revidert av}{rev\adddotspace av}}, - byreviewer = {{kritikk ved}{krit\adddotspace ved}}, - byfounder = {{grunnlagt av}{grunnl\adddotspace av}}, - bycontinuator = {{videref{\o}rt av}{videref\adddotspace av}}, - bycollaborator = {{i samarbeid med}{i samarb\adddotspace med}}, - bytranslator = {{oversatt \lbx@lfromlang\ av}{overs\adddot\ \lbx@sfromlang\ av}}, - bycommentator = {{kommentert av}{komm\adddot\ av}}, - byannotator = {{forklart av}{forkl\adddot\ av}}, - withcommentator = {{med kommentarer av}{med komm\adddot\ av}}, - withannotator = {{med forklaringer av}{med forkl\adddot\ av}}, - withintroduction = {{med innledning av}{med innl\adddot\ av}}, - withforeword = {{med forord av}{med forord av}}, - withafterword = {{med etterord av}{med etterord av}}, - byeditortr = {{redigert og oversatt \lbx@lfromlang\ av}% - {red\adddotspace og overs\adddot\ \lbx@sfromlang\ av}}, - byeditorco = {{redigert og kommentert av}% - {red\adddotspace og komm\adddot\ av}}, - byeditoran = {{redigert og forklart av}% - {red\adddotspace og forkl\adddot\ av}}, - byeditorin = {{redigert, med innledning, av}% - {red.,\addabbrvspace med innl., av}}, - byeditorfo = {{redigert, med forord, av}% - {red.,\addabbrvspace med forord, av}}, - byeditoraf = {{redigert, med etterord, av}% - {red.,\addabbrvspace med etterord, av}}, - byeditortrco = {{redigert, oversatt \lbx@lfromlang\ og kommentert av}% - {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og komm\adddot\ av}}, - byeditortran = {{redigert, oversatt \lbx@lfromlang\ og forklart av}% - {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og forkl\adddot\ av}}, - byeditortrin = {{redigert og oversatt \lbx@lfromlang, med innledning, av}% - {red\adddotspace og overs\adddot\ \lbx@sfromlang, med innl., av}}, - byeditortrfo = {{redigert og oversatt \lbx@lfromlang, med forord, av}% - {red\adddotspace og overs\adddot\ \lbx@sfromlang, med forord, av}}, - byeditortraf = {{redigert og oversatt \lbx@lfromlang, med etterord, av}% - {red\adddotspace og overs\adddot\ \lbx@sfromlang, med etterord, av}}, - byeditorcoin = {{redigert og kommentert, med innledning, av}% - {red\adddotspace og komm., med innl., av}}, - byeditorcofo = {{redigert og kommentert, med forord, av}% - {red\adddotspace og komm., med forord, av}}, - byeditorcoaf = {{redigert og kommentert, med etterord, av}% - {red\adddotspace og komm., med etterord, av}}, - byeditoranin = {{redigert og forklart, med innledning, av}% - {red\adddotspace og forkl., med innl., av}}, - byeditoranfo = {{redigert og forklart, med forord, av}% - {red\adddotspace og forkl., med forord, av}}, - byeditoranaf = {{redigert og forklart, med etterord, av}% - {red\adddotspace og forkl., med etterord, av}}, - byeditortrcoin = {{redigert, oversatt \lbx@lfromlang\ og kommentert, med innledning, av}% - {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og komm., med innl., av}}, - byeditortrcofo = {{redigert, oversatt \lbx@lfromlang\ og kommentert, med forord, av}% - {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og komm., med forord, av}}, - byeditortrcoaf = {{redigert, oversatt \lbx@lfromlang\ og kommentert, med etterord, av}% - {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og komm., med etterord, av}}, - byeditortranin = {{redigert, oversatt \lbx@lfromlang\ og forklart, med innledning, av}% - {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og forkl., med innl., av}}, - byeditortranfo = {{redigert, oversatt \lbx@lfromlang\ og forklart, med forord, av}% - {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og forkl., med forord, av}}, - byeditortranaf = {{redigert, oversatt \lbx@lfromlang\ og forklart, med etterord, av}% - {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og forkl., med etterord, av}}, - bytranslatorco = {{oversatt \lbx@lfromlang\ og kommentert av}% - {overs\adddot\ \lbx@sfromlang\ og komm\adddot\ av}}, - bytranslatoran = {{oversatt \lbx@lfromlang\ og forklart av}% - {overs\adddot\ \lbx@sfromlang\ og forkl\adddot\ av}}, - bytranslatorin = {{oversatt \lbx@lfromlang, med innledning, av}% - {overs\adddot\ \lbx@sfromlang, med innl., av}}, - bytranslatorfo = {{oversatt \lbx@lfromlang, med forord, av}% - {overs\adddot\ \lbx@sfromlang, med forord, av}}, - bytranslatoraf = {{oversatt \lbx@lfromlang, med etterord, av}% - {overs\adddot\ \lbx@sfromlang, med etterord, av}}, - bytranslatorcoin = {{oversatt \lbx@lfromlang\ og kommentert, med innledning, av}% - {overs\adddot\ \lbx@sfromlang\ og komm., med innl., av}}, - bytranslatorcofo = {{oversatt \lbx@lfromlang\ og kommentert, med forord, av}% - {overs\adddot\ \lbx@sfromlang\ og komm., med forord, av}}, - bytranslatorcoaf = {{oversatt \lbx@lfromlang\ og kommentert, med etterord, av}% - {overs\adddot\ \lbx@sfromlang\ og komm., med etterord, av}}, - bytranslatoranin = {{oversatt \lbx@lfromlang\ og forklart, med innledning, av}% - {overs\adddot\ \lbx@sfromlang\ og forkl., med innl., av}}, - bytranslatoranfo = {{oversatt \lbx@lfromlang\ og forklart, med forord, av}% - {overs\adddot\ \lbx@sfromlang\ og forkl., med forord, av}}, - bytranslatoranaf = {{oversatt \lbx@lfromlang\ og forklart, med etterord, av}% - {overs\adddot\ \lbx@sfromlang\ og forkl., med etterord, av}}, - and = {{og}{og}}, - andothers = {{med flere}{mfl\adddot}}, - andmore = {{med mer}{m.m\adddot}}, - volume = {{bind}{bd\adddot}}, - volumes = {{bind}{bd\adddot}}, - involumes = {{i}{i}}, - jourvol = {{{\aa}rgang}{{\aa}rg\adddot}}, - jourser = {{serie}{ser\adddot}}, - book = {{bok}{bok}}, - part = {{del}{del}}, - issue = {{nummer}{nr\adddot}}, - newseries = {{ny serie}{ny ser\adddot}}, - oldseries = {{gammel serie}{gl\adddotspace ser\adddot}}, - edition = {{utgave}{utg\adddot}}, - reprint = {{opptrykk}{opptr\adddot}}, - reprintof = {{opptrykk av}{opptr\adddotspace av}}, - reprintas = {{trykt om som}{tr\adddotspace om som}}, - reprintfrom = {{opptrykk fra}{opptr\adddotspace fra}}, - translationof = {{oversettelse av}{overs\adddotspace av}}, - translationas = {{oversatt som}{overs\adddotspace som}}, - translationfrom = {{oversatt fra}{overs\adddotspace fra}}, - reviewof = {{kritikk av}{krit\adddotspace av}}, - origpubas = {{opprinnelig utgitt som}{oppr\adddot\ utg\adddot\ som}}, - origpubin = {{opprinnelig utgitt i}{oppr\adddot\ utg\adddot\ i}}, - astitle = {{som}{som}}, - bypublisher = {{av}{av}}, - nodate = {{udatert}{udatert}}, - page = {{side}{s\adddot}}, - pages = {{sider}{s\adddot}}, - column = {{spalte}{sp\adddot}}, - columns = {{spalter}{sp\adddot}}, - line = {{linje}{l\adddot}}, - lines = {{linjer}{l\adddot}}, - verse = {{vers}{v\adddot}}, - verses = {{vers}{v\adddot}}, - section = {{avsnitt}{avsn\adddot}}, - sections = {{avsnitt}{avsn\adddot}}, - paragraph = {{avsnitt}{avsn\adddot}}, - paragraphs = {{avsnitt}{avsn\adddot}}, - pagetotal = {{side}{s\adddot}}, - pagetotals = {{sider}{s\adddot}}, - columntotal = {{spalte}{sp\adddot}}, - columntotals = {{spalter}{sp\adddot}}, - linetotal = {{linje}{l\adddot}}, - linetotals = {{linjer}{l\adddot}}, - versetotal = {{vers}{v\adddot}}, - versetotals = {{vers}{v\adddot}}, - sectiontotal = {{avsnitt}{avsn\adddot}}, - sectiontotals = {{avsnitt}{avsn\adddot}}, - paragraphtotal = {{avsnitt}{avsn\adddot}}, - paragraphtotals = {{avsnitt}{avsn\adddot}}, - in = {{i}{i}}, - inseries = {{i}{i}}, - ofseries = {{av}{av}}, - number = {{nummer}{nr\adddot}}, - chapter = {{kapittel}{kap\adddot}}, - mathesis = {{masteroppgave}{masteroppg\adddot}}, - phdthesis = {{ph.d.-avhandling}{ph.d.-avh\adddot}}, - candthesis = {{hovedoppgave}{hovedoppg\adddot}}, - resreport = {{forskningsrapport}{forskn.rapp\adddot}}, - techreport = {{teknisk rapport}{tekn\adddotspace rapp\adddot}}, - software = {{programvare}{programvare}}, - datacd = {{data-cd}{data-cd}}, - audiocd = {{lyd-cd}{lyd-cd}}, - version = {{versjon}{versjon}}, - url = {{adresse}{adresse}}, - urlfrom = {{tilgjengelig fra}{tilgj\adddotspace fra}}, - urlseen = {{sjekket}{sjekket}}, - inpreparation = {{under utarbeidelse}{under utarb\adddot}}, - submitted = {{innsendt}{innsendt}}, - forthcoming = {{under utgivelse}{under utgiv\adddot}}, - inpress = {{i trykken}{i trykken}}, - prepublished = {{prepublisert}{prepubl\adddot}}, - citedas = {{heretter sitert som}{heretter sit\adddotspace som}}, - thiscite = {{her}{her}}, - seenote = {{se note}{se n\adddot}}, - quotedin = {{sitert i}{sit\adddotspace i}}, - idem = {{den samme}{d.s\adddot}}, - idemsf = {{den samme}{d.s\adddot}}, - idemsm = {{den samme}{d.s\adddot}}, - idemsn = {{det samme}{d.s\adddot}}, - idempf = {{de samme}{d.s\adddot}}, - idempm = {{de samme}{d.s\adddot}}, - idempn = {{de samme}{d.s\adddot}}, - idempp = {{de samme}{d.s\adddot}}, - ibidem = {{samme sted}{sst\adddot}}, - opcit = {{samme sted}{sst\adddot}}, - loccit = {{samme sted}{sst\adddot}}, - confer = {{jamf{\o}r}{jf\adddot}}, - sequens = {{f\adddot}{f\adddot}}, - sequentes = {{ff\adddot}{ff\adddot}}, - passim = {{passim}{pass\adddot}}, - see = {{se}{se}}, - seealso = {{se ogs{\aa}}{se ogs{\aa}}}, - backrefpage = {{se side}{se s\adddot}}, - backrefpages = {{se sidene}{se s\adddot}}, - january = {{januar}{jan\adddot}}, - february = {{februar}{feb\adddot}}, - march = {{mars}{mar\adddot}}, - april = {{april}{apr\adddot}}, - may = {{mai}{mai}}, - june = {{juni}{jun\adddot}}, - july = {{juli}{jul\adddot}}, - august = {{august}{aug\adddot}}, - september = {{september}{sep\adddot}}, - october = {{oktober}{okt\adddot}}, - november = {{november}{nov\adddot}}, - december = {{desember}{des\adddot}}, - langamerican = {{amerikansk-engelsk}{amerikansk-engelsk}}, - langbrazilian = {{brasiliansk-portugisisk}{brasiliansk-portugisisk}}, - langbulgarian = {{bulgarsk}{bulgarsk}}, - langcatalan = {{katalansk}{katalansk}}, - langcroatian = {{kroatisk}{kroatisk}}, - langczech = {{tsjekkisk}{tsjekkisk}}, - langdanish = {{dansk}{dansk}}, - langdutch = {{nederlandsk}{nederlandsk}}, - langenglish = {{engelsk}{engelsk}}, - langestonian = {{estisk}{estisk}}, - langfinnish = {{finsk}{finsk}}, - langfrench = {{fransk}{fransk}}, - langgalician = {{galisisk}{galisisk}}, - langgerman = {{tysk}{tysk}}, - langgreek = {{gresk}{gresk}}, - langitalian = {{italiensk}{italiensk}}, - langjapanese = {{japansk}{japansk}}, - langlatin = {{latin}{latin}}, - langnorwegian = {{norsk}{norsk}}, - langpolish = {{polsk}{polsk}}, - langportuguese = {{portugisisk}{portugisisk}}, - langrussian = {{russisk}{russisk}}, - langslovak = {{slovakisk}{slovakisk}}, - langslovene = {{slovensk}{slovensk}}, - langspanish = {{spansk}{spansk}}, - langswedish = {{svensk}{svensk}}, - langukrainian = {{ukrainsk}{ukrainsk}}, - fromamerican = {{fra amerikansk-engelsk}{fra amerikansk-engelsk}}, - frombrazilian = {{fra brasiliansk-portugisisk}{fra brasiliansk-portugisisk}}, - frombulgarian = {{fra bulgarsk}{fra bulgarsk}}, - fromcatalan = {{fra katalansk}{fra katalansk}}, - fromcroatian = {{fra kroatisk}{fra kroatisk}}, - fromczech = {{fra tsjekkisk}{fra tsjekkisk}}, - fromdanish = {{fra dansk}{fra dansk}}, - fromdutch = {{fra nederlandsk}{fra nederlandsk}}, - fromenglish = {{fra engelsk}{fra engelsk}}, - fromestonian = {{fra estisk}{fra estisk}}, - fromfinnish = {{fra finsk}{fra finsk}}, - fromfrench = {{fra fransk}{fra fransk}}, - fromgalician = {{fra galisisk}{fra galisisk}}, - fromgerman = {{fra tysk}{fra tysk}}, - fromgreek = {{fra gresk}{fra gresk}}, - fromitalian = {{fra italiensk}{fra italiensk}}, - fromjapanese = {{fra japansk}{fra japansk}}, - fromlatin = {{fra latin}{fra latin}}, - fromnorwegian = {{fra norsk}{fra norsk}}, - frompolish = {{fra polsk}{fra polsk}}, - fromportuguese = {{fra portugisisk}{fra portugisisk}}, - fromrussian = {{fra russisk}{fra russisk}}, - fromslovak = {{fra slovakisk}{fra slovakisk}}, - fromslovene = {{fra slovensk}{fra slovensk}}, - fromspanish = {{fra spansk}{fra spansk}}, - fromswedish = {{fra svensk}{fra svensk}}, - fromukrainian = {{fra ukrainsk}{fra ukrainsk}}, - countryde = {{Tyskland}{DE}}, - countryeu = {{Den europeiske union}{EU}}, - countryep = {{Den europeiske union}{EP}}, - countryfr = {{Frankrike}{FR}}, - countryuk = {{Storbritannia}{GB}}, - countryus = {{USA}{US}}, - patent = {{patent}{patent}}, - patentde = {{tysk patent}{ty\adddotspace pat\adddot}}, - patenteu = {{europeisk patent}{eur\adddotspace pat\adddot}}, - patentfr = {{fransk patent}{fr\adddotspace pat\adddot}}, - patentuk = {{britisk patent}{br\adddotspace pat\adddot}}, - patentus = {{amerikansk patent}{am\adddotspace pat\adddot}}, - patreq = {{patents{\o}knad}{pat.s{\o}kn\adddot}}, - patreqde = {{tysk patents{\o}knad}% - {ty\adddotspace pat.s{\o}kn\adddot}}, - patreqeu = {{europeisk patents{\o}knad}% - {eur\adddotspace pat.s{\o}kn\adddot}}, - patreqfr = {{fransk patents{\o}knad}% - {fr\adddotspace pat.s{\o}kn\adddot}}, - patrequk = {{britisk patents{\o}knad}% - {br\adddotspace pat.s{\o}kn\adddot}}, - patrequs = {{amerikansk patents{\o}knad}% - {am\adddotspace pat.s{\o}kn\adddot}}, - file = {{fil}{fil}}, - library = {{bibliotek}{bibliotek}}, - abstract = {{sammendrag}{sammendrag}}, - annotation = {{merknad}{merknad}}, - commonera = {{etter v{\aa}r tidsregning}{evt\adddot}}, - beforecommonera = {{f{\o}r v{\aa}r tidsregning}{fvt\adddot}}, - annodomini = {{etter Kristus}{e\adddot Kr\adddot}}, - beforechrist = {{f{\o}r Kristus}{f\adddot Kr\adddot}}, - circa = {{cirka}{ca\adddot}}, - spring = {{v{\aa}r}{v{\aa}r}}, - summer = {{sommer}{sommer}}, - autumn = {{h{\o}st}{h{\o}st}}, - winter = {{vinter}{vinter}}, - am = {{a\adddot m\adddot}{a\adddot m\adddot}}, - pm = {{p\adddot m\adddot}{p\adddot m\adddot}}, -} +\InheritBibliographyExtras{norwegian} +\InheritBibliographyStrings{norwegian} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx new file mode 100644 index 00000000000..9b251e2b824 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx @@ -0,0 +1,502 @@ +\ProvidesFile{norwegian.lbx} +[\abx@lbxid] + +\DeclareRedundantLanguages{norwegian}{norsk,nynorsk} + +\DeclareBibliographyExtras{% + \protected\def\bibrangedash{% + \textendash\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}% + \protected\def\mkbibneutord{\mkbibordinal}% + \protected\def\mkbibdatelong#1#2#3{% + \iffieldundef{#3} + {} + {\mkbibordinal{\thefield{#3}}% + \iffieldundef{#2}{}{\nobreakspace}}% + \iffieldundef{#2} + {} + {\mkbibmonth{\thefield{#2}}% + \iffieldundef{#1}{}{\space}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% + \protected\def\mkbibdateshort#1#2#3{% + \iffieldundef{#3} + {} + {\mkdayzeros{\thefield{#3}}\adddot}% + \iffieldundef{#2} + {} + {\mkmonthzeros{\thefield{#2}}% + \iffieldundef{#1}{}{\adddot}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% +} + +\DeclareBibliographyStrings{% + bibliography = {{Bibliografi}{Bibliografi}}, + references = {{Referanser}{Referanser}}, + shorthands = {{Forkortelser}{Forkortelser}}, + editor = {{redakt{\o}r}{red\adddot}}, + editors = {{redakt{\o}rer}{red\adddot}}, + compiler = {{kompilator}{komp\adddot}}, + compilers = {{kompilatorer}{komp\adddot}}, + redactor = {{bearbeidelse}{bearb\adddot}}, + redactors = {{bearbeidelse}{bearb\adddot}}, + reviser = {{revisjon}{rev\adddot}}, + revisers = {{revisjon}{rev\adddot}}, + founder = {{grunnlegger}{grunnl\adddot}}, + founders = {{grunnleggere}{grunnl\adddot}}, + continuator = {{videref{\o}ring}{videref\adddot}}, + continuators = {{videref{\o}ring}{videref\adddot}}, + collaborator = {{samarbeid}{samarb\adddot}}, + collaborators = {{samarbeid}{samarb\adddot}}, + translator = {{oversetter}{overs\adddot}}, + translators = {{oversettere}{overs\adddot}}, + commentator = {{kommentarer}{komm\adddot}}, + commentators = {{kommentarer}{komm\adddot}}, + annotator = {{forklaringer}{forkl\adddot}}, + annotators = {{forklaringer}{forkl\adddot}}, + commentary = {{kommentarer}{komm\adddot}}, + annotations = {{forklaringer}{forkl\adddot}}, + introduction = {{innledning}{innl\adddot}}, + foreword = {{forord}{forord}}, + afterword = {{etterord}{etterord}}, + editortr = {{redakt{\o}r og oversetter}% + {red\adddotspace og overs\adddot}}, + editorstr = {{redakt{\o}rer og oversettere}% + {red\adddotspace og overs\adddot}}, + editorco = {{redakt{\o}r og kommentarer} + {red\adddotspace og komm\adddot}}, + editorsco = {{redakt{\o}rer og kommentarer} + {red\adddotspace og komm\adddot}}, + editoran = {{redakt{\o}r og forklaringer}% + {red\adddotspace og forkl\adddot}}, + editorsan = {{redakt{\o}rer og forklaringer}% + {red\adddotspace og forkl\adddot}}, + editorin = {{redakt{\o}r og innledning}% + {red\adddotspace og innl\adddot}}, + editorsin = {{redakt{\o}rer og innledning}% + {red\adddotspace og innl\adddot}}, + editorfo = {{redakt{\o}r og forord}% + {red\adddotspace og forord}}, + editorsfo = {{redakt{\o}rer og forord}% + {red\adddotspace og forord}}, + editoraf = {{redakt{\o}r og etterord}% + {red\adddotspace og etterord}}, + editorsaf = {{redakt{\o}rer og etterord}% + {red\adddotspace og etterord}}, + editortrco = {{redakt{\o}r, oversetter og kommentarer}% + {red.,\addabbrvspace overs\adddotspace og komm\adddot}}, + editorstrco = {{redakt{\o}rer, oversettere og kommentarer}% + {red.,\addabbrvspace overs\adddotspace og komm\adddot}}, + editortran = {{redakt{\o}r, oversetter og forklaringer}% + {red.,\addabbrvspace overs\adddotspace og forkl\adddot}}, + editorstran = {{redakt{\o}rer, oversettere og forklaringer}% + {red.,\addabbrvspace overs\adddotspace og forkl\adddot}}, + editortrin = {{redakt{\o}r, oversetter og innledning}% + {red.,\addabbrvspace overs\adddotspace og innl\adddot}}, + editorstrin = {{redakt{\o}rer, oversettere og innledning}% + {red.,\addabbrvspace overs\adddotspace og innl\adddot}}, + editortrfo = {{redakt{\o}r, oversetter og forord}% + {red.,\addabbrvspace overs\adddotspace og forord}}, + editorstrfo = {{redakt{\o}rer, oversettere og forord}% + {red.,\addabbrvspace overs\adddotspace og forord}}, + editortraf = {{redakt{\o}r, oversetter og etterord}% + {red.,\addabbrvspace overs\adddotspace og etterord}}, + editorstraf = {{redakt{\o}rer, oversettere og etterord}% + {red.,\addabbrvspace overs\adddotspace og etterord}}, + editorcoin = {{redakt{\o}r, kommentarer og innledning}% + {red.,\addabbrvspace komm\adddotspace og innl\adddot}}, + editorscoin = {{redakt{\o}rer, kommentarer og innledning}% + {red.,\addabbrvspace komm\adddotspace og innl\adddot}}, + editorcofo = {{redakt{\o}r, kommentarer og forord}% + {red.,\addabbrvspace komm\adddotspace og forord}}, + editorscofo = {{redakt{\o}rer, kommentarer og forord}% + {red.,\addabbrvspace komm\adddotspace og forord}}, + editorcoaf = {{redakt{\o}r, kommentarer og etterord}% + {red.,\addabbrvspace komm\adddotspace og etterord}}, + editorscoaf = {{redakt{\o}rer, kommentarer og etterord}% + {red.,\addabbrvspace komm\adddotspace og etterord}}, + editoranin = {{redakt{\o}r, forklaringer og innledning}% + {red.,\addabbrvspace forkl\adddotspace og innl\adddot}}, + editorsanin = {{redakt{\o}rer, forklaringer og innledning}% + {red.,\addabbrvspace forkl\adddotspace og innl\adddot}}, + editoranfo = {{redakt{\o}r, forklaringer og forord}% + {red.,\addabbrvspace forkl\adddotspace og forord}}, + editorsanfo = {{redakt{\o}rer, forklaringer og forord}% + {red.,\addabbrvspace forkl\adddotspace og forord}}, + editoranaf = {{redakt{\o}r, forklaringer og etterord}% + {red.,\addabbrvspace forkl\adddotspace og etterord}}, + editorsanaf = {{redakt{\o}rer, forklaringer og etterord}% + {red.,\addabbrvspace forkl\adddotspace og etterord}}, + editortrcoin = {{redakt{\o}r, oversetter, kommentarer og innledning}% + {red.,\addabbrvspace overs., komm\adddotspace og innl\adddot}}, + editorstrcoin = {{redakt{\o}rer, oversettere, kommentarer og innledning}% + {red.,\addabbrvspace overs., komm\adddotspace og innl\adddot}}, + editortrcofo = {{redakt{\o}r, oversetter, kommentarer og forord}% + {red.,\addabbrvspace overs., komm\adddotspace og forord}}, + editorstrcofo = {{redakt{\o}rer, oversettere, kommentarer og forord}% + {red.,\addabbrvspace overs., komm\adddotspace og forord}}, + editortrcoaf = {{redakt{\o}r, oversetter, kommentarer og etterord}% + {red.,\addabbrvspace overs., komm\adddotspace og etterord}}, + editorstrcoaf = {{redakt{\o}rer, oversettere, kommentarer og etterord}% + {red.,\addabbrvspace overs., komm\adddotspace og etterord}}, + editortranin = {{redakt{\o}r, oversetter, forklaringer og innledning}% + {red.,\addabbrvspace overs., forkl\adddotspace og innl\adddot}}, + editorstranin = {{redakt{\o}rer, oversettere, forklaringer og innledning}% + {red.,\addabbrvspace overs., forkl\adddotspace og innl\adddot}}, + editortranfo = {{redakt{\o}r, oversetter, forklaringer og forord}% + {red.,\addabbrvspace overs., forkl\adddotspace og forord}}, + editorstranfo = {{redakt{\o}rer, oversettere, forklaringer og forord}% + {red.,\addabbrvspace overs., forkl\adddotspace og forord}}, + editortranaf = {{redakt{\o}r, oversetter, forklaringer og etterord}% + {red.,\addabbrvspace overs., forkl\adddotspace og etterord}}, + editorstranaf = {{redakt{\o}rer, oversettere, forklaringer og etterord}% + {red.,\addabbrvspace overs., forkl\adddotspace og etterord}}, + translatorco = {{oversetter og kommentarer}% + {overs\adddotspace og komm\adddot}}, + translatorsco = {{oversettere og kommentarer}% + {overs\adddotspace og komm\adddot}}, + translatoran = {{oversetter og forklaringer}% + {overs\adddotspace og forkl\adddot}}, + translatorsan = {{oversettere og forklaringer}% + {overs\adddotspace og forkl\adddot}}, + translatorin = {{oversetter og innledning}% + {overs\adddotspace og innl\adddot}}, + translatorsin = {{oversettere og innledning}% + {overs\adddotspace og innl\adddot}}, + translatorfo = {{oversetter og forord}% + {overs\adddotspace og forord}}, + translatorsfo = {{oversettere og forord}% + {overs\adddotspace og forord}}, + translatoraf = {{oversetter og etterord}% + {overs\adddotspace og etterord}}, + translatorsaf = {{oversettere og etterord}% + {overs\adddotspace og etterord}}, + translatorcoin = {{oversetter, kommentarer og innledning}% + {overs., komm\adddotspace og innl\adddot}}, + translatorscoin = {{oversettere, kommentarer og innledning}% + {overs., komm\adddotspace og innl\adddot}}, + translatorcofo = {{oversetter, kommentarer og forord}% + {overs., komm\adddotspace og forord}}, + translatorscofo = {{oversettere, kommentarer og forord}% + {overs., komm\adddotspace og forord}}, + translatorcoaf = {{oversetter, kommentarer og etterord}% + {overs., komm\adddotspace og etterord}}, + translatorscoaf = {{oversettere, kommentarer og etterord}% + {overs., komm\adddotspace og etterord}}, + translatoranin = {{oversetter, forklaringer og innledning}% + {overs., forkl\adddotspace og innl\adddot}}, + translatorsanin = {{oversettere, forklaringer og innledning}% + {overs., forkl\adddotspace og innl\adddot}}, + translatoranfo = {{oversetter, forklaringer og forord}% + {overs., forkl\adddotspace og forord}}, + translatorsanfo = {{oversettere, forklaringer og forord}% + {overs., forkl\adddotspace og forord}}, + translatoranaf = {{oversetter, forklaringer og etterord}% + {overs., forkl\adddotspace og etterord}}, + translatorsanaf = {{oversettere, forklaringer og etterord}% + {overs., forkl\adddotspace og etterord}}, + byauthor = {{av}{av}}, + byeditor = {{redigert av}{red\adddotspace av}}, + bycompiler = {{kompilert av}{komp\adddotspace av}}, + byredactor = {{bearbeidet av}{bearb\adddotspace av}}, + byreviser = {{revidert av}{rev\adddotspace av}}, + byreviewer = {{kritikk ved}{krit\adddotspace ved}}, + byfounder = {{grunnlagt av}{grunnl\adddotspace av}}, + bycontinuator = {{videref{\o}rt av}{videref\adddotspace av}}, + bycollaborator = {{i samarbeid med}{i samarb\adddotspace med}}, + bytranslator = {{oversatt \lbx@lfromlang\ av}{overs\adddot\ \lbx@sfromlang\ av}}, + bycommentator = {{kommentert av}{komm\adddot\ av}}, + byannotator = {{forklart av}{forkl\adddot\ av}}, + withcommentator = {{med kommentarer av}{med komm\adddot\ av}}, + withannotator = {{med forklaringer av}{med forkl\adddot\ av}}, + withintroduction = {{med innledning av}{med innl\adddot\ av}}, + withforeword = {{med forord av}{med forord av}}, + withafterword = {{med etterord av}{med etterord av}}, + byeditortr = {{redigert og oversatt \lbx@lfromlang\ av}% + {red\adddotspace og overs\adddot\ \lbx@sfromlang\ av}}, + byeditorco = {{redigert og kommentert av}% + {red\adddotspace og komm\adddot\ av}}, + byeditoran = {{redigert og forklart av}% + {red\adddotspace og forkl\adddot\ av}}, + byeditorin = {{redigert, med innledning, av}% + {red.,\addabbrvspace med innl., av}}, + byeditorfo = {{redigert, med forord, av}% + {red.,\addabbrvspace med forord, av}}, + byeditoraf = {{redigert, med etterord, av}% + {red.,\addabbrvspace med etterord, av}}, + byeditortrco = {{redigert, oversatt \lbx@lfromlang\ og kommentert av}% + {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og komm\adddot\ av}}, + byeditortran = {{redigert, oversatt \lbx@lfromlang\ og forklart av}% + {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og forkl\adddot\ av}}, + byeditortrin = {{redigert og oversatt \lbx@lfromlang, med innledning, av}% + {red\adddotspace og overs\adddot\ \lbx@sfromlang, med innl., av}}, + byeditortrfo = {{redigert og oversatt \lbx@lfromlang, med forord, av}% + {red\adddotspace og overs\adddot\ \lbx@sfromlang, med forord, av}}, + byeditortraf = {{redigert og oversatt \lbx@lfromlang, med etterord, av}% + {red\adddotspace og overs\adddot\ \lbx@sfromlang, med etterord, av}}, + byeditorcoin = {{redigert og kommentert, med innledning, av}% + {red\adddotspace og komm., med innl., av}}, + byeditorcofo = {{redigert og kommentert, med forord, av}% + {red\adddotspace og komm., med forord, av}}, + byeditorcoaf = {{redigert og kommentert, med etterord, av}% + {red\adddotspace og komm., med etterord, av}}, + byeditoranin = {{redigert og forklart, med innledning, av}% + {red\adddotspace og forkl., med innl., av}}, + byeditoranfo = {{redigert og forklart, med forord, av}% + {red\adddotspace og forkl., med forord, av}}, + byeditoranaf = {{redigert og forklart, med etterord, av}% + {red\adddotspace og forkl., med etterord, av}}, + byeditortrcoin = {{redigert, oversatt \lbx@lfromlang\ og kommentert, med innledning, av}% + {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og komm., med innl., av}}, + byeditortrcofo = {{redigert, oversatt \lbx@lfromlang\ og kommentert, med forord, av}% + {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og komm., med forord, av}}, + byeditortrcoaf = {{redigert, oversatt \lbx@lfromlang\ og kommentert, med etterord, av}% + {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og komm., med etterord, av}}, + byeditortranin = {{redigert, oversatt \lbx@lfromlang\ og forklart, med innledning, av}% + {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og forkl., med innl., av}}, + byeditortranfo = {{redigert, oversatt \lbx@lfromlang\ og forklart, med forord, av}% + {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og forkl., med forord, av}}, + byeditortranaf = {{redigert, oversatt \lbx@lfromlang\ og forklart, med etterord, av}% + {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og forkl., med etterord, av}}, + bytranslatorco = {{oversatt \lbx@lfromlang\ og kommentert av}% + {overs\adddot\ \lbx@sfromlang\ og komm\adddot\ av}}, + bytranslatoran = {{oversatt \lbx@lfromlang\ og forklart av}% + {overs\adddot\ \lbx@sfromlang\ og forkl\adddot\ av}}, + bytranslatorin = {{oversatt \lbx@lfromlang, med innledning, av}% + {overs\adddot\ \lbx@sfromlang, med innl., av}}, + bytranslatorfo = {{oversatt \lbx@lfromlang, med forord, av}% + {overs\adddot\ \lbx@sfromlang, med forord, av}}, + bytranslatoraf = {{oversatt \lbx@lfromlang, med etterord, av}% + {overs\adddot\ \lbx@sfromlang, med etterord, av}}, + bytranslatorcoin = {{oversatt \lbx@lfromlang\ og kommentert, med innledning, av}% + {overs\adddot\ \lbx@sfromlang\ og komm., med innl., av}}, + bytranslatorcofo = {{oversatt \lbx@lfromlang\ og kommentert, med forord, av}% + {overs\adddot\ \lbx@sfromlang\ og komm., med forord, av}}, + bytranslatorcoaf = {{oversatt \lbx@lfromlang\ og kommentert, med etterord, av}% + {overs\adddot\ \lbx@sfromlang\ og komm., med etterord, av}}, + bytranslatoranin = {{oversatt \lbx@lfromlang\ og forklart, med innledning, av}% + {overs\adddot\ \lbx@sfromlang\ og forkl., med innl., av}}, + bytranslatoranfo = {{oversatt \lbx@lfromlang\ og forklart, med forord, av}% + {overs\adddot\ \lbx@sfromlang\ og forkl., med forord, av}}, + bytranslatoranaf = {{oversatt \lbx@lfromlang\ og forklart, med etterord, av}% + {overs\adddot\ \lbx@sfromlang\ og forkl., med etterord, av}}, + and = {{og}{og}}, + andothers = {{med flere}{mfl\adddot}}, + andmore = {{med mer}{m.m\adddot}}, + volume = {{bind}{bd\adddot}}, + volumes = {{bind}{bd\adddot}}, + involumes = {{i}{i}}, + jourvol = {{{\aa}rgang}{{\aa}rg\adddot}}, + jourser = {{serie}{ser\adddot}}, + book = {{bok}{bok}}, + part = {{del}{del}}, + issue = {{nummer}{nr\adddot}}, + newseries = {{ny serie}{ny ser\adddot}}, + oldseries = {{gammel serie}{gl\adddotspace ser\adddot}}, + edition = {{utgave}{utg\adddot}}, + reprint = {{opptrykk}{opptr\adddot}}, + reprintof = {{opptrykk av}{opptr\adddotspace av}}, + reprintas = {{trykt om som}{tr\adddotspace om som}}, + reprintfrom = {{opptrykk fra}{opptr\adddotspace fra}}, + translationof = {{oversettelse av}{overs\adddotspace av}}, + translationas = {{oversatt som}{overs\adddotspace som}}, + translationfrom = {{oversatt fra}{overs\adddotspace fra}}, + reviewof = {{kritikk av}{krit\adddotspace av}}, + origpubas = {{opprinnelig utgitt som}{oppr\adddot\ utg\adddot\ som}}, + origpubin = {{opprinnelig utgitt i}{oppr\adddot\ utg\adddot\ i}}, + astitle = {{som}{som}}, + bypublisher = {{av}{av}}, + page = {{side}{s\adddot}}, + pages = {{sider}{s\adddot}}, + column = {{spalte}{sp\adddot}}, + columns = {{spalter}{sp\adddot}}, + line = {{linje}{l\adddot}}, + lines = {{linjer}{l\adddot}}, + nodate = {{udatert}{udatert}}, + verse = {{vers}{v\adddot}}, + verses = {{vers}{v\adddot}}, + section = {{avsnitt}{avsn\adddot}}, + sections = {{avsnitt}{avsn\adddot}}, + paragraph = {{avsnitt}{avsn\adddot}}, + paragraphs = {{avsnitt}{avsn\adddot}}, + in = {{i}{i}}, + inseries = {{i}{i}}, + ofseries = {{av}{av}}, + number = {{nummer}{nr\adddot}}, + chapter = {{kapittel}{kap\adddot}}, + mathesis = {{masteroppgave}{masteroppg\adddot}}, + phdthesis = {{ph.d.-avhandling}{ph.d.-avh\adddot}}, + candthesis = {{hovedoppgave}{hovedoppg\adddot}}, + resreport = {{forskningsrapport}{forskn.rapp\adddot}}, + techreport = {{teknisk rapport}{tekn\adddotspace rapp\adddot}}, + software = {{programvare}{programvare}}, + datacd = {{data-cd}{data-cd}}, + audiocd = {{lyd-cd}{lyd-cd}}, + version = {{versjon}{versjon}}, + url = {{side}{side}}, + urlfrom = {{tilgjengelig fra}{tilgj\adddotspace fra}}, + urlseen = {{sjekket}{sjekket}}, + inpreparation = {{under utarbeidelse}{under utarb\adddot}}, + submitted = {{innsendt}{innsendt}}, + forthcoming = {{under utgivelse}{under utgiv\adddot}}, + inpress = {{i trykken}{i trykken}}, + prepublished = {{prepublisert}{prepubl\adddot}}, + citedas = {{fremover sitert som}{fremover sit\adddotspace som}}, + thiscite = {{her}{her}}, + seenote = {{se note}{se n\adddot}}, + quotedin = {{sitert i}{sit\adddotspace i}}, + idem = {{den samme}{d.s\adddot}}, + idemsf = {{den samme}{d.s\adddot}}, + idemsm = {{den samme}{d.s\adddot}}, + idemsn = {{det samme}{d.s\adddot}}, + idempf = {{de samme}{d.s\adddot}}, + idempm = {{de samme}{d.s\adddot}}, + idempn = {{de samme}{d.s\adddot}}, + idempp = {{de samme}{d.s\adddot}}, + ibidem = {{samme sted}{sst\adddot}}, + opcit = {{samme sted}{sst\adddot}}, + loccit = {{samme sted}{sst\adddot}}, + confer = {{jamf{\o}r}{jf\adddot}}, + sequens = {{f\adddot}{f\adddot}}, + sequentes = {{ff\adddot}{ff\adddot}}, + passim = {{passim}{pass\adddot}}, + see = {{se}{se}}, + seealso = {{se ogs{\aa}}{se ogs{\aa}}}, + backrefpage = {{se side}{se s\adddot}}, + backrefpages = {{se sidene}{se s\adddot}}, + january = {{januar}{jan\adddot}}, + february = {{februar}{feb\adddot}}, + march = {{mars}{mar\adddot}}, + april = {{april}{apr\adddot}}, + may = {{mai}{mai}}, + june = {{juni}{jun\adddot}}, + july = {{juli}{jul\adddot}}, + august = {{august}{aug\adddot}}, + september = {{september}{sep\adddot}}, + october = {{oktober}{okt\adddot}}, + november = {{november}{nov\adddot}}, + december = {{desember}{des\adddot}}, + langamerican = {{amerikansk-engelsk}{amerikansk-engelsk}}, + langbrazilian = {{brasiliansk-portugisisk}{brasiliansk-portugisisk}}, + langcatalan = {{katalansk}{katalansk}}, + langcroatian = {{kroatisk}{kroatisk}}, + langczech = {{tsjekkisk}{tsjekkisk}}, + langdanish = {{dansk}{dansk}}, + langdutch = {{nederlandsk}{nederlandsk}}, + langenglish = {{engelsk}{engelsk}}, +% langestonian = {{}{}},% FIXME: missing + langfinnish = {{finsk}{finsk}}, + langfrench = {{fransk}{fransk}}, + langgerman = {{tysk}{tysk}}, + langgreek = {{gresk}{gresk}}, + langitalian = {{italiensk}{italiensk}}, + langlatin = {{latin}{latin}}, + langnorwegian = {{norsk}{norsk}}, +% langpolish = {{}{}},% FIXME: missing + langportuguese = {{portugisisk}{portugisisk}}, + langrussian = {{russisk}{russisk}}, +% langslovene = {{}{}},% FIXME: missing + langspanish = {{spansk}{spansk}}, + langswedish = {{svensk}{svensk}}, + fromamerican = {{fra amerikansk-engelsk}{fra amerikansk-engelsk}}, + frombrazilian = {{fra brasiliansk-portugisisk}{fra brasiliansk-portugisisk}}, + fromcatalan = {{fra katalansk}{fra katalansk}}, + fromcroatian = {{fra kroatisk}{fra kroatisk}}, + fromczech = {{fra tsjekkisk}{fra tsjekkisk}}, + fromdanish = {{fra dansk}{fra dansk}}, + fromdutch = {{fra nederlandsk}{fra nederlandsk}}, + fromenglish = {{fra engelsk}{fra engelsk}}, +% fromestonian = {{}{}},% FIXME: missing + fromfinnish = {{fra finsk}{fra finsk}}, + fromfrench = {{fra fransk}{fra fransk}}, + fromgerman = {{fra tysk}{fra tysk}}, + fromgreek = {{fra gresk}{fra gresk}}, + 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}}, +% fromslovene = {{}{}},% FIXME: missing + fromspanish = {{fra spansk}{fra spansk}}, + fromswedish = {{fra svensk}{fra svensk}}, + countryde = {{Tyskland}{DE}}, + countryeu = {{Den europeiske union}{EU}}, + countryep = {{Den europeiske union}{EP}}, + countryfr = {{Frankrike}{FR}}, + countryuk = {{Storbritannia}{GB}}, + countryus = {{USA}{US}}, + patent = {{patent}{patent}}, + patentde = {{tysk patent}{ty\adddotspace pat\adddot}}, + patenteu = {{europeisk patent}{eur\adddotspace pat\adddot}}, + patentfr = {{fransk patent}{fr\adddotspace pat\adddot}}, + patentuk = {{britisk patent}{br\adddotspace pat\adddot}}, + patentus = {{amerikansk patent}{am\adddotspace pat\adddot}}, + patreq = {{patents{\o}knad}{pat.s{\o}kn\adddot}}, + patreqde = {{tysk patents{\o}knad}% + {ty\adddotspace pat.s{\o}kn\adddot}}, + patreqeu = {{europeisk patents{\o}knad}% + {eur\adddotspace pat.s{\o}kn\adddot}}, + patreqfr = {{fransk patents{\o}knad}% + {fr\adddotspace pat.s{\o}kn\adddot}}, + patrequk = {{britisk patents{\o}knad}% + {br\adddotspace pat.s{\o}kn\adddot}}, + patrequs = {{amerikansk patents{\o}knad}% + {am\adddotspace pat.s{\o}kn\adddot}}, + file = {{fil}{fil}}, + library = {{bibliotek}{bibliotek}}, + abstract = {{sammendrag}{sammendrag}}, + annotation = {{merknad}{merknad}}, + commonera = {{etter v\aa r tidsregning}{evt\adddot}}, + beforecommonera = {{f{\o}r v\aa r tidsregning}{fvt\adddot}}, + annodomini = {{etter Kristus}{e\adddot Kr\adddot}}, + beforechrist = {{f{\o}r Kristus}{f\adddot Kr\adddot}}, +% circa = {{}{}},% FIXME: missing +% spring = {{}{}},% FIXME: missing +% summer = {{}{}},% FIXME: missing +% autumn = {{}{}},% FIXME: missing +% winter = {{}{}},% FIXME: missing + am = {{a\adddot m\adddot}{a\adddot m\adddot}}, + pm = {{p\adddot m\adddot}{p\adddot m\adddot}}, +} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/nswissgerman.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/nswissgerman.lbx index f54a078b267..65b02b83d16 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/nswissgerman.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/nswissgerman.lbx @@ -5,7 +5,7 @@ % Swiss time sep is a dot \DeclareBibliographyExtras{% - \protected\def\bibtimesep{.}% + \protected\def\bibtimesep{.} } % One point where Swiss German spelling @@ -18,8 +18,6 @@ % alternative spelling, uncomment to enable: % section = {{Paragraf}{\S}}, % sections = {{Paragrafen}{\S\S}}, -% sectiontotal = {{Paragraf}{\S}}, -% sectiontotals = {{Paragrafen}{\S\S}}, } \DeclareHyphenationExceptions{% diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx index 7930ffba1f4..5f2e12c24d2 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx @@ -1,17 +1,14 @@ \ProvidesFile{nynorsk.lbx} [\abx@lbxid] -% Remarks by translators: -% -% Since "nynorsk" inherits "norsk" (bokmål) only strings that are -% different in the two languages are included. In particular, this -% means that no language or month name strings are listed below. -% +% Status: +% - 'norsk' and 'nynorsk' use the same translations, correct? -\InheritBibliographyExtras{norsk} +\InheritBibliographyExtras{norwegian} +\InheritBibliographyStrings{norwegian} \DeclareBibliographyStrings{% - inherit = {norsk}, + inherit = {norwegian}, references = {{Referansar}{Referansar}}, shorthands = {{Forkortingar}{Forkortingar}}, editors = {{redakt{\o}rar}{red\adddot}}, @@ -166,7 +163,6 @@ {oms., forkl\adddotspace og etterord}}, translatorsanaf = {{omsetjarar, forklaringar og etterord}% {oms., forkl\adddotspace og etterord}}, - organizers = {{organisatorar}{org\adddot}}, byredactor = {{omarbeidd av}{omarb\adddotspace av}}, bycontinuator = {{vidaref{\o}rt av}{vidaref\adddotspace av}}, bytranslator = {{omsett \lbx@lfromlang\ av}% @@ -246,12 +242,11 @@ mathesis = {{masteroppg{\aa}ve}{masteroppg\adddot}}, candthesis = {{hovudoppg{\aa}ve}{hovudoppg\adddot}}, resreport = {{forskingsrapport}{forsk.rapp\adddot}}, - url = {{adresse}{adresse}}, urlfrom = {{tilgjengeleg fr{\aa}}{tilgj\adddotspace fr{\aa}}}, urlseen = {{sjekka}{sjekka}}, inpreparation = {{under utarbeiding}{under utarb\adddot}}, forthcoming = {{under utgiving}{under utgiv\adddot}}, - citedas = {{heretter sitert som}{heretter sit\adddotspace som}}, + citedas = {{framover sitert som}{framover sit\adddotspace som}}, seenote = {{sj{\aa} note}{sj{\aa} n\adddot}}, idem = {{den same}{d.s\adddot}}, idemsf = {{den same}{d.s\adddot}}, @@ -270,31 +265,26 @@ backrefpages = {{sj{\aa} sidene}{sj{\aa} s\adddot}}, fromamerican = {{fr{\aa} amerikansk-engelsk}{fr{\aa} amerikansk-engelsk}}, frombrazilian = {{fr{\aa} brasiliansk-portugisisk}{fr{\aa} brasiliansk-portugisisk}}, - frombulgarian = {{fr{\aa} bulgarsk}{fr{\aa} bulgarsk}}, fromcatalan = {{fr{\aa} katalansk}{fr{\aa} katalansk}}, fromcroatian = {{fr{\aa} kroatisk}{fr{\aa} kroatisk}}, fromczech = {{fr{\aa} tsjekkisk}{fr{\aa} tsjekkisk}}, fromdanish = {{fr{\aa} dansk}{fr{\aa} dansk}}, fromdutch = {{fr{\aa} nederlandsk}{fr{\aa} nederlandsk}}, fromenglish = {{fr{\aa} engelsk}{fr{\aa} engelsk}}, - fromestonian = {{fr{\aa} estisk}{fr{\aa} estisk}}, +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{fr{\aa} finsk}{fr{\aa} finsk}}, fromfrench = {{fr{\aa} fransk}{fr{\aa} fransk}}, - fromgalician = {{fr{\aa} galisisk}{fr{\aa} galisisk}}, fromgerman = {{fr{\aa} tysk}{fr{\aa} tysk}}, fromgreek = {{fr{\aa} gresk}{fr{\aa} gresk}}, fromitalian = {{fr{\aa} italiensk}{fr{\aa} italiensk}}, - fromjapanese = {{fr{\aa} japansk}{fr{\aa} japansk}}, fromlatin = {{fr{\aa} latin}{fr{\aa} latin}}, fromnorwegian = {{fr{\aa} norsk}{fr{\aa} norsk}}, - frompolish = {{fr{\aa} polsk}{fr{\aa} polsk}}, +% frompolish = {{}{}},% FIXME: missing fromportuguese = {{fr{\aa} portugisisk}{fr{\aa} portugisisk}}, fromrussian = {{fr{\aa} russisk}{fr{\aa} russisk}}, - fromslovene = {{fr{\aa} slovakisk}{fr{\aa} slovakisk}}, - fromslovak = {{fr{\aa} slovensk}{fr{\aa} slovensk}}, +% fromslovene = {{}{}},% FIXME: missing fromspanish = {{fr{\aa} spansk}{fr{\aa} spansk}}, fromswedish = {{fr{\aa} svensk}{fr{\aa} svensk}}, - fromukrainian = {{fr{\aa} ukrainsk}{fr{\aa} ukrainsk}}, countryeu = {{Den europeiske unionen}{EU}}, countryep = {{Den europeiske unionen}{EP}}, abstract = {{samandrag}{samandrag}}, @@ -302,13 +292,13 @@ beforecommonera = {{f{\o}r vesterlandsk tidsrekning}{f\adddot v\adddot t\adddot}}, annodomini = {{e\adddot Kr\adddot}{e\adddot Kr\adddot}}, beforechrist = {{f\adddot Kr\adddot}{f\adddot Kr\adddot}}, - circa = {{cirka}{ca\adddot}}, - spring = {{v{\aa}r}{v{\aa}r}}, - summer = {{sommar}{sommar}}, - autumn = {{haust}{haust}}, - winter = {{vinter}{vinter}}, - am = {{a\adddot m\adddot}{a\adddot m\adddot}}, - pm = {{p\adddot m\adddot}{p\adddot m\adddot}}, +% circa = {{}{}},% FIXME: missing +% spring = {{}{}},% FIXME: missing +% summer = {{}{}},% FIXME: missing +% autumn = {{}{}},% FIXME: missing +% winter = {{}{}},% FIXME: missing + am = {{formiddag}{f\adddot m\adddot}}, + pm = {{ettermiddag}{e\adddot m\adddot}}, } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx index e8c49a1b989..d8a4e9566e2 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx @@ -257,9 +257,6 @@ {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}}, -% organizer = {{}{}},% FIXME: missing -% organizers = {{}{}},% FIXME: missing -% byorganizer = {{}{}},% FIXME: missing byauthor = {{autorstwo}{aut\adddot}},% FIXME: unsure byeditor = {{wyedytowano}{wyed\adddot}},% FIXME: unsure bycompiler = {{wykonano}{wyk\adddot}},% FIXME: unsure @@ -375,18 +372,6 @@ sections = {{paragrafy}{par\adddot}},% FIXME: check paragraph = {{akapit}{aka\adddot}}, paragraphs = {{akapity}{aka\adddot}}, -% pagetotal = {{}{}},% FIXME: missing -% pagetotals = {{}{}},% FIXME: missing -% columntotal = {{}{}},% FIXME: missing -% columntotals = {{}{}},% FIXME: missing -% linetotal = {{}{}},% FIXME: missing -% linetotals = {{}{}},% FIXME: missing -% versetotal = {{}{}},% FIXME: missing -% versetotals = {{}{}},% FIXME: missing -% sectiontotal = {{}{}},% FIXME: missing -% sectiontotals = {{}{}},% FIXME: missing -% paragraphtotal = {{}{}},% FIXME: missing -% paragraphtotals = {{}{}},% FIXME: missing in = {{w}{w}}, inseries = {{w}{w}}, ofseries = {{z}{z}}, @@ -459,7 +444,6 @@ datedecember = {{grudnia}{grud\adddot}}, langamerican = {{ameryka\'{n}ski}{ameryka\'{n}ski}}, langbrazilian = {{brazylijski}{brazylijski}}, -% langbulgarian = {{}{}},% FIXME: missing % langcatalan = {{}{}},% FIXME: missing langcroatian = {{chorwacki}{chorwacki}}, % langczech = {{}{}},% FIXME: missing @@ -469,7 +453,6 @@ % langestonian = {{}{}},% FIXME: missing langfinnish = {{fi\'{n}ski}{fi\'{n}ski}}, langfrench = {{francuski}{francuski}}, - langgalician = {{galicyjski}{galicyjski}}, langgerman = {{niemiecki}{niemiecki}}, langgreek = {{grecki}{grecki}}, langitalian = {{w\l oski}{w\l oski}}, @@ -483,7 +466,6 @@ langswedish = {{szwedzki}{szwedzki}}, fromamerican = {{z ameryka\'{n}skiego}{z amer\adddot}}, frombrazilian = {{z brazylijskiego}{z braz\adddot}}, -% frombulgarian = {{}{}},% FIXME: missing % fromcatalan = {{}{}},% FIXME: missing fromcroatian = {{z chorwackiego}{z chorw\adddot}}, % fromczech = {{}{}},% FIXME: missing @@ -493,7 +475,6 @@ % fromestonian = {{}{}},% FIXME: missing fromfinnish = {{z fi\'{n}skiego}{z fi\'{n}\adddot}}, fromfrench = {{z francuzkiego}{z fran\adddot}}, - fromgalician = {{z galicyjzkiego}{z gal\adddot}}, fromgerman = {{z niemieckiego}{z niem\adddot}}, fromgreek = {{z greckiego}{z grec\adddot}}, fromitalian = {{z w\l oskiego}{z w\l os\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx index cefaa1de8f1..929fd5eac65 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx @@ -92,19 +92,19 @@ redactor = {{redator}{red\adddot}}, redactors = {{redatores}{red\adddot}}, reviser = {{revisor}{rev\adddot}}, - revisers = {{revisores}{rev\adddot}}, + revisers = {{revisores}{revs\adddot}}, founder = {{fundador}{fund\adddot}}, founders = {{fundadores}{fund\adddot}}, continuator = {{continuador}{cont\adddot}}, continuators = {{continuadores}{cont\adddot}}, collaborator = {{colaborador}{col\adddot}}, - collaborators = {{colaboradores}{col\adddot}}, + collaborators = {{colaboradores}{cols\adddot}}, translator = {{tradutor}{trad\adddot}}, - translators = {{tradutores}{trad\adddot}}, + translators = {{tradutores}{trads\adddot}}, commentator = {{comentador}{coment\adddot}}, - commentators = {{comentadores}{coment\adddot}}, + commentators = {{comentadores}{coments\adddot}}, annotator = {{anotador}{anot\adddot}}, - annotators = {{anotadores}{anot\adddot}}, + annotators = {{anotadores}{anots\adddot}}, commentary = {{coment\'ario}{coment\adddot}}, annotations = {{notas}{notas}}, introduction = {{introdu\c{c}\~ao}{introd\adddot}}, @@ -113,15 +113,15 @@ editortr = {{editor e tradutor}% {ed\adddotspace e trad\adddot}}, editorstr = {{editores e tradutores}% - {eds\adddotspace e trad\adddot}}, + {eds\adddotspace e trads\adddot}}, editorco = {{editor e comentador}% {ed\adddotspace e coment\adddot}}, editorsco = {{editores e comentadores}% - {eds\adddotspace e coment\adddot}}, + {eds\adddotspace e coments\adddot}}, editoran = {{editor e anotador}% {ed\adddotspace e anot\adddot}}, editorsan = {{editores e anotadores}% - {eds\adddotspace e anot\adddot}}, + {eds\adddotspace e anots\adddot}}, editorin = {{editor e introdu\c{c}\~ao}% {ed\adddotspace e introd\adddot}}, editorsin = {{editores e introdu\c{c}\~ao}% @@ -137,79 +137,79 @@ editortrco = {{editor, tradutor e comentador}% {ed., trad\adddot\ e coment\adddot}}, editorstrco = {{editores, tradutores e comentadores}% - {eds., trad\adddot\ e coment\adddot}}, + {eds., trads\adddot\ e coments\adddot}}, editortran = {{editor, tradutor e anotador}% {ed., trad\adddot\ e anot\adddot}}, editorstran = {{editores, tradutores e anotadores}% - {eds., trad\adddot\ e anot\adddot}}, + {eds., trads\adddot\ e anots\adddot}}, editortrin = {{editor, tradutor e introdu\c{c}\~ao}% {ed., trad\adddot\ e introd\adddot}}, editorstrin = {{editores, tradutores e introdu\c{c}\~ao}% - {eds., trad\adddot\ e introd\adddot}}, + {eds., trads\adddot\ e introd\adddot}}, editortrfo = {{editor, tradutor e pref\'acio}% {ed., trad\adddot\ e pref\adddot}}, editorstrfo = {{editores, tradutores e pref\'acio}% - {eds., trad\adddot\ e pref\adddot}}, + {eds., trads\adddot\ e pref\adddot}}, editortraf = {{editor, tradutor e posf\'acio}% {ed., trad\adddot\ e posf\adddot}}, editorstraf = {{editores, tradutores e posf\'acio}% - {eds., trad\adddot\ e posf\adddot}}, + {eds., trads\adddot\ e posf\adddot}}, editorcoin = {{editor, comentador e introdu\c{c}\~ao}% {ed., coment\adddot\ e introd\adddot}}, editorscoin = {{editores, comentadores e introdu\c{c}\~ao}% - {eds., coment\adddot\ e introd\adddot}}, + {eds., coments\adddot\ e introd\adddot}}, editorcofo = {{editor, comentador e pref\'acio}% {ed., coment\adddot\ e pref\adddot}}, editorscofo = {{editores, comentadores e pref\'acio}% - {eds., coment\adddot\ e pref\adddot}}, + {eds., coments\adddot\ e pref\adddot}}, editorcoaf = {{editor, comentador e posf\'acio}% {ed., coment\adddot\ e posf\adddot}}, editorscoaf = {{editores, comentadores e posf\'acio}% - {eds., coment\adddot\ e posf\adddot}}, + {eds., coments\adddot\ e posf\adddot}}, editoranin = {{editor, anotador e introdu\c{c}\~ao}% {ed., anot\adddot\ e introd\adddot}}, editorsanin = {{editores, anotadores e introdu\c{c}\~ao}% - {eds., anot\adddot\ e introd\adddot}}, + {eds., anots\adddot\ e introd\adddot}}, editoranfo = {{editor, anotador e pref\'acio}% {ed., anot\adddot\ e pref\adddot}}, editorsanfo = {{editores, anotadores e pref\'acio}% - {eds., anot\adddot\ e pref\adddot}}, + {eds., anots\adddot\ e pref\adddot}}, editoranaf = {{editor, anotador e posf\'acio}% {ed., anot\adddot\ e posf\adddot}}, editorsanaf = {{editores, anotadores e posf\'acio}% - {eds., anot\adddot\ e posf\adddot}}, + {eds., anots\adddot\ e posf\adddot}}, editortrcoin = {{editor, tradutor, comentador e introdu\c{c}\~ao}% {ed., trad., coment\adddot\ e introd\adddot}}, editorstrcoin = {{editores, tradutores, comentadores e introdu\c{c}\~ao}% - {eds., trad., coment\adddot\ e introd\adddot}}, + {eds., trads., coments\adddot\ e introd\adddot}}, editortrcofo = {{editor, tradutor, comentador e pref\'acio}% {ed., trad., coment\adddot\ e pref\adddot}}, editorstrcofo = {{editores, tradutores, comentadores e pref\'acio}% - {eds., trad., coment\adddot\ e pref\adddot}}, + {eds., trads., coments\adddot\ e pref\adddot}}, editortrcoaf = {{editor, tradutor, comentador e posf\'acio}% {ed., trad., coment\adddot\ e posf\adddot}}, editorstrcoaf = {{editores, tradutores, comentadores e posf\'acio}% - {eds., trad., coment\adddot\ e posf\adddot}}, + {eds., trads., coments\adddot\ e posf\adddot}}, editortranin = {{editor, tradutor, anotador e introdu\c{c}\~ao}% {ed., trad., anot\adddot\ e introd\adddot}}, editorstranin = {{editores, tradutores, anotadores e introdu\c{c}\~ao}% - {eds., trad., anot\adddot\ e introd\adddot}}, + {eds., trads., anots\adddot\ e introd\adddot}}, editortranfo = {{editor, tradutor, anotador e pref\'acio}% {ed., trad., anot\adddot\ e pref\adddot}}, editorstranfo = {{editores, tradutores, anotadores e pref\'acio}% - {eds., trad., anot\adddot\ e pref\adddot}}, + {eds., trads., anots\adddot\ e pref\adddot}}, editortranaf = {{editor, tradutor, anotador e posf\'acio}% {ed., trad., anot\adddot\ e posf\adddot}}, editorstranaf = {{editores, tradutores, anotadores e posf\'acio}% - {eds., trad., anot\adddot\ e posf\adddot}}, + {eds., trads., anots\adddot\ e posf\adddot}}, translatorco = {{tradutor e comentador}% {trad\adddot\ e coment\adddot}}, translatorsco = {{tradutores e comentadores}% - {trad\adddot\ e coment\adddot}}, + {trads\adddot\ e coments\adddot}}, translatoran = {{tradutor e anotador}% {trad\adddot\ e anot\adddot}}, translatorsan = {{tradutores e anotadores}% - {trad\adddot\ e anot\adddot}}, + {trads\adddot\ e anots\adddot}}, translatorin = {{tradu\c{c}\~ao e introdu\c{c}\~ao}% {trad\adddot\ e introd\adddot}}, translatorsin = {{tradu\c{c}\~ao e introdu\c{c}\~ao}% @@ -246,21 +246,18 @@ {trad., notas e posf\adddot}}, translatorsanaf = {{tradu\c{c}\~ao, notas e posf\'acio}% {trad., notas e posf\adddot}}, - organizer = {{organizador}{org\adddot}}, - organizers = {{organizadores}{orgs\adddot}}, - byorganizer = {{organizado por}{org\adddotspace por}}, byauthor = {{por}{por}}, byeditor = {{editado por}{ed\adddotspace por}}, bycompiler = {{compilado por}{comp\adddotspace por}}, byredactor = {{redigido por}{red\adddotspace por}}, byreviser = {{revisto por}{rev\adddotspace por}}, - byreviewer = {{resenhado por}{res\adddotspace por}},% FIXME: check + byreviewer = {{avaliado por}{aval\adddotspace por}}, byfounder = {{fundado por}{fund\adddotspace por}}, bycontinuator = {{continuado por}{cont\adddotspace por}}, - bycollaborator = {{em colabora\c{c}\~ao com}{em col\adddotspace com}}, + bycollaborator = {{em colabora\c{a}\~o com}{em col\adddotspace com}}, bytranslator = {{traduzido \lbx@lfromlang\ por}{trad\adddot\ \lbx@sfromlang\ por}}, - bycommentator = {{comentado por}{coment\adddot\ por}}, - byannotator = {{notas de}{notas de}}, + bycommentator = {{comentado por}{com\adddot\ por}}, + byannotator = {{notas de}{not\adddot\ de}}, withcommentator = {{com coment\'arios de}{com coment\adddot\ de}}, withannotator = {{com notas de}{com notas de}}, withintroduction = {{com introdu\c{c}\~ao de}{com introd\adddot\ de}}, @@ -269,7 +266,7 @@ byeditortr = {{editado e traduzido \lbx@lfromlang\ por}% {ed\adddotspace e trad\adddot\ \lbx@sfromlang\ por}}, byeditorco = {{editado e comentado por}% - {ed\adddotspace e coment\adddot\ por}}, + {ed\adddotspace e com\adddot\ por}}, byeditoran = {{editado e anotado por}% {ed\adddotspace e anot\adddot\ por}}, byeditorin = {{editado e introduzido por}% @@ -279,7 +276,7 @@ byeditoraf = {{editado e posfaciado por}% {ed\adddotspace e posf\adddot\ por}}, byeditortrco = {{editado, traduzido \lbx@lfromlang\ e comentado por}% - {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e coment\adddot\ por}}, + {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e com\adddot\ por}}, byeditortran = {{editado, traduzido \lbx@lfromlang\ e anotado por}% {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e anot\adddot\ por}}, byeditortrin = {{editado, traduzido \lbx@lfromlang\ e introduzido por}% @@ -289,11 +286,11 @@ byeditortraf = {{editado, traduzido \lbx@lfromlang\ e posfaciado por}% {ed.,\addabbrvspace trad. \lbx@sfromlang\ e posf\adddot\ por}}, byeditorcoin = {{editado, comentado e introduzido por}% - {ed.,\addabbrvspace coment\adddot\ e introd\adddot\ por}}, + {ed.,\addabbrvspace com\adddot\ e introd\adddot\ por}}, byeditorcofo = {{editado, comentado e prefaciado por}% - {ed.,\addabbrvspace coment\adddot\ e pref\adddot\ por}}, + {ed.,\addabbrvspace com\adddot\ e pref\adddot\ por}}, byeditorcoaf = {{editado, comentado e posfaciado por}% - {ed.,\addabbrvspace coment\adddot\ e posf\adddot\ por}}, + {ed.,\addabbrvspace com\adddot\ e posf\adddot\ por}}, byeditoranin = {{editado, anotado e introduzido por}% {ed.,\addabbrvspace anot\adddot\ e introd\adddot\ por}}, byeditoranfo = {{editado, anotado e prefaciado por}% @@ -301,11 +298,11 @@ byeditoranaf = {{editado, anotado e posfaciado por}% {ed.,\addabbrvspace anot\adddot\ e posf\adddot\ por}}, byeditortrcoin = {{editado, traduzido \lbx@lfromlang, comentado e introduzido por}% - {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, coment\adddot\ e introd\adddot\ por}}, + {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e introd\adddot\ por}}, byeditortrcofo = {{editado, traduzido \lbx@lfromlang, comentado e prefaciado por}% - {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, coment\adddot\ e pref\adddot\ por}}, + {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e pref\adddot\ por}}, byeditortrcoaf = {{editado, traduzido \lbx@lfromlang, comentado e posfaciado por}% - {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, coment\adddot\ e posf\adddot\ por}}, + {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e posf\adddot\ por}}, byeditortranin = {{editado, traduzido \lbx@lfromlang, anotado e introduzido por}% {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, anot\adddot\ e introd\adddot\ por}}, byeditortranfo = {{editado, traduzido \lbx@lfromlang, anotado e prefaciado por}% @@ -313,7 +310,7 @@ byeditortranaf = {{editado, traduzido \lbx@lfromlang, anotado e posfaciado por}% {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, anot\adddot\ e posf\adddot\ por}}, bytranslatorco = {{traduzido \lbx@lfromlang\ e comentado por}% - {trad\adddot\ \lbx@sfromlang\ e coment\adddot\ por}}, + {trad\adddot\ \lbx@sfromlang\ e com\adddot\ por}}, bytranslatoran = {{traduzido \lbx@lfromlang\ e anotado por}% {trad\adddot\ \lbx@sfromlang\ e anot\adddot\ por}}, bytranslatorin = {{traduzido \lbx@lfromlang\ e introduzido por}% @@ -323,11 +320,11 @@ bytranslatoraf = {{traduzido \lbx@lfromlang\ e posfaciado por}% {trad\adddot\ \lbx@sfromlang\ e posf\adddot\ por}}, bytranslatorcoin = {{traduzido \lbx@lfromlang, comentado e introduzido por}% - {trad\adddot\ \lbx@sfromlang, coment\adddot\ e introd\adddot\ por}}, + {trad\adddot\ \lbx@sfromlang, com\adddot\ e introd\adddot\ por}}, bytranslatorcofo = {{traduzido \lbx@lfromlang, comentado e prefaciado por}% - {trad\adddot\ \lbx@sfromlang, coment\adddot\ e pref\adddot\ por}}, + {trad\adddot\ \lbx@sfromlang, com\adddot\ e pref\adddot\ por}}, bytranslatorcoaf = {{traduzido \lbx@lfromlang, comentado e posfaciado por}% - {trad\adddot\ \lbx@sfromlang, coment\adddot\ e posf\adddot\ por}}, + {trad\adddot\ \lbx@sfromlang, com\adddot\ e posf\adddot\ por}}, bytranslatoranin = {{traduzido \lbx@lfromlang, anotado e introduzido por}% {trad\adddot\ \lbx@sfromlang, anot\adddot\ e introd\adddot\ por}}, bytranslatoranfo = {{traduzido \lbx@lfromlang, anotado e prefaciado por}% @@ -355,36 +352,24 @@ translationof = {{tradu\c{c}\~ao de}{trad\adddotspace de}},% FIXME: check translationas = {{traduzido como}{trad\adddotspace como}},% FIXME: check translationfrom = {{traduzido do}{trad\adddotspace do}},% FIXME: check - reviewof = {{resenha de}{res\adddotspace de}},% FIXME: check + reviewof = {{avaliação de}{aval\adddotspace de}}, origpubas = {{originalmente publicado como}{orig\adddotspace pub\adddotspace como}},% FIXME: check origpubin = {{originalmente publicado em}{orig\adddotspace pub\adddotspace em}},% FIXME: check astitle = {{como}{como}},% FIXME: check bypublisher = {{por}{por}},% FIXME: check - nodate = {{sem data}{s\adddot d\adddot}},% FIXME: latin: sine die page = {{p\'agina}{p\adddot}}, pages = {{p\'aginas}{pp\adddot}}, column = {{coluna}{col\adddot}}, columns = {{colunas}{cols\adddot}}, line = {{linha}{l\adddot}}, lines = {{linhas}{ll\adddot}},% FIXME: check + nodate = {{sem data}{s\adddot d\adddot}},% FIXME: latin: sine die verse = {{verso}{v\adddot}}, verses = {{versos}{vv\adddot}},% FIXME: check section = {{se\c{c}\~ao}{\S}}, sections = {{se\c{c}\~oes}{\S\S}}, paragraph = {{par\'agrafo}{par\adddot}}, - paragraphs = {{par\'agrafo}{par\adddot}}, - pagetotal = {{p\'agina}{p\adddot}}, - pagetotals = {{p\'aginas}{pp\adddot}}, - columntotal = {{coluna}{col\adddot}}, - columntotals = {{colunas}{cols\adddot}}, - linetotal = {{linha}{l\adddot}}, - linetotals = {{linhas}{ll\adddot}},% FIXME: check - versetotal = {{verso}{v\adddot}}, - versetotals = {{versos}{vv\adddot}},% FIXME: check - sectiontotal = {{se\c{c}\~ao}{\S}}, - sectiontotals = {{se\c{c}\~oes}{\S\S}}, - paragraphtotal = {{par\'agrafo}{par\adddot}}, - paragraphtotals = {{par\'agrafo}{par\adddot}}, + paragraphs = {{par\'agrafo}{pars\adddot}}, in = {{em}{em}}, inseries = {{em}{em}}, ofseries = {{de}{de}}, @@ -402,13 +387,12 @@ url = {{URL}{URL}}, urlfrom = {{URL}{URL}}, urlseen = {{acedido em}{acedido em}}, - inpreparation = {{em prepara\c{c}\~ao}{em prep\adddot}}, + inpreparation = {{em preparação}{em prep\adddot}}, submitted = {{submetido}{subm\adddot}}, forthcoming = {{no prelo}{no prelo}}, inpress = {{no prelo}{no prelo}}, - prepublished = {{pr\'e publicado}{pr\'e pub\adddot}},% FIXME: check + prepublished = {{pr\'e publicada}{pr\'e pub\adddot}}, citedas = {{doravante citado como}{doravante citado como}}, - thiscite = {{especialmente}{esp\adddot}},% FIXME: check seenote = {{ver nota}{ver nota}}, quotedin = {{apud}{apud}}, idem = {{idem}{idem}}, @@ -444,66 +428,58 @@ december = {{dezembro}{dez\adddot}}, langamerican = {{ingl\^es}{ingl\^es}}, langbrazilian = {{portugu{\^e}s}{portugu{\^e}s}}, - langbulgarian = {{b\'ulgaro}{b\'ulgaro}}, langcatalan = {{catal\~ao}{catal\~ao}}, langcroatian = {{croata}{croata}}, langczech = {{checo}{checo}}, langdanish = {{dinamarqu\^es}{dinamarqu\^es}}, langdutch = {{holand{\^e}s}{holand{\^e}s}}, langenglish = {{ingl\^es}{ingl\^es}}, - langestonian = {{est\'onio}{est\'onio}},% FIXME: check + langestonian = {{estoniano}{estoniano}}, langfinnish = {{finland\^es}{finland\^es}}, langfrench = {{franc\^es}{franc\^es}}, - langgalician = {{galego}{galego}}, langgerman = {{alem\~ao}{alem\~ao}}, langgreek = {{grego}{grego}}, langitalian = {{italiano}{italiano}}, - langjapanese = {{japon\^es}{japon\^es}}, langlatin = {{latim}{latim}}, langnorwegian = {{noruegu\^es}{noruegu\^es}}, langpolish = {{polaco}{polaco}}, langportuguese = {{portugu{\^e}s}{portugu{\^e}s}}, langrussian = {{russo}{russo}}, - langslovak = {{eslovaco}{eslovaco}}, langslovene = {{esloveno}{esloveno}}, langspanish = {{espanhol}{espanhol}}, langswedish = {{sueco}{sueco}}, fromamerican = {{do ingl\^es}{do ingl\^es}}, frombrazilian = {{do portugu{\^e}s}{do portugu{\^e}s}}, - frombulgarian = {{do b\'ulgaro}{do b\'ulgaro}}, fromcatalan = {{do catal\~ao}{do catal\~ao}}, fromcroatian = {{do croata}{do croata}}, fromczech = {{do checo}{do checo}}, fromdanish = {{do dinamarqu\^es}{do dinamarqu\^es}}, fromdutch = {{do holand{\^e}s}{do holand{\^e}s}}, fromenglish = {{do ingl\^es}{do ingl\^es}}, - fromestonian = {{do est\'onio}{do est\'onio}},% FIXME: check + fromestonian = {{da est\'onia}{da est\'onia}}, fromfinnish = {{do finland\^es}{do finland\^es}}, fromfrench = {{do franc\^es}{do franc\^es}}, - fromgalician = {{do galego}{do galego}}, fromgerman = {{do alem\~ao}{do alem\~ao}}, fromgreek = {{do grego}{do grego}}, fromitalian = {{do italiano}{do italiano}}, - fromjapanese = {{do japon\^es}{do japon\^es}}, fromlatin = {{do latim}{do latim}}, fromnorwegian = {{do noruegu\^es}{do noruegu\^es}}, frompolish = {{do polaco}{do polaco}}, fromportuguese = {{do portugu{\^e}s}{do portugu{\^e}s}}, fromrussian = {{do russo}{do russo}}, - fromslovak = {{do eslovaco}{do eslovaco}}, fromslovene = {{do esloveno}{do esloveno}}, fromspanish = {{do espanhol}{do espanhol}}, fromswedish = {{do sueco}{do sueco}}, countryde = {{Alemanha}{DE}},% FIXME: abbrev.: ISO 3166 or translated? countryeu = {{Uni\~ao Europeia}{EU}},% FIXME: abbrev.: ISO 3166 or translated? - countryep = {{Uni\~ao Europeia}{EP}},% FIXME: check +% countryep = {{}{}},% FIXME: missing https://en.wikipedia.org/wiki/ISO_3166-1 countryfr = {{Fran\c{c}a}{FR}},% FIXME: abbrev.: ISO 3166 or translated? countryuk = {{Reino Unido}{GB}},% FIXME: abbrev.: ISO 3166 or translated? countryus = {{Estados Unidos da Am\'erica}{US}},% FIXME: abbrev.: ISO 3166 or translated? patent = {{patente}{pat\adddot}}, patentde = {{patente alem\~a}{pat\adddot\ alem\~a}}, patenteu = {{patente europeia}{pat\adddot\ europeia}}, - patentfr = {{patente francesa}{pat\adddot\ francesa}}, + patentfr = {{patente francesa}{pat\adddot francesa}}, patentuk = {{patente brit\^anica}{pat\adddot\ brit\^anica}}, patentus = {{patente americana}{pat\adddot\ americana}}, patreq = {{pedido de patente}{ped\adddot\ de pat\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx index d8b3832f4aa..0c1bde1261a 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx @@ -273,9 +273,6 @@ {пер.,\addabbrvspace авт\adddotspace коммент\adddotspace и послесл\adddot}}, translatorsanaf = {{переводчики, авторы комментариев и послесловия}% {пер.,\addabbrvspace авт\adddotspace коммент\adddotspace и послесл\adddot}}, - organizer = {{организатор}{орг\adddot}}, - organizers = {{организаторы}{орг\adddot}}, - byorganizer = {{организатор}{орг\adddot}},% FIXME: unsure byauthor = {{}{}}, byeditor = {{под редакцией}{под\addabbrvspace ред\adddot}}, bycompiler = {{составитель}{сост\adddot}}, @@ -389,31 +386,19 @@ {перв\adddotspace публ\adddotspace в}}, astitle = {{\addcolon}{\addcolon}},% FIXME: unsure bypublisher = {{\addcomma}{\addcomma}},% FIXME: unsure - nodate = {{б\adddot г\adddot}{б\adddot г\adddot}}, page = {{страница}{с\adddot}}, pages = {{страницы}{с\adddot}}, column = {{колонка}{кол\adddot}}, columns = {{колонки}{кол\adddot}}, line = {{строка}{строка}}, lines = {{строки}{строка}}, + nodate = {{б\adddot г\adddot}{б\adddot г\adddot}}, verse = {{стих}{стих}}, verses = {{стихи}{стихи}}, section = {{параграф}{\S}}, sections = {{параграфы}{\S\S}}, paragraph = {{абзац}{абз\adddot}}, paragraphs = {{абзацы}{абз\adddot}}, - pagetotal = {{страница}{с\adddot}}, - pagetotals = {{страницы}{с\adddot}}, - columntotal = {{колонка}{кол\adddot}}, - columntotals = {{колонки}{кол\adddot}}, - linetotal = {{строка}{строка}}, - linetotals = {{строки}{строка}}, - versetotal = {{стих}{стих}}, - versetotals = {{стихи}{стихи}}, - sectiontotal = {{параграф}{\S}}, - sectiontotals = {{параграфы}{\S\S}}, - paragraphtotal = {{абзац}{абз\adddot}}, - paragraphtotals = {{абзацы}{абз\adddot}}, in = {{в}{в}}, inseries = {{в}{в}}, ofseries = {{из}{из}}, @@ -488,7 +473,6 @@ datedecember = {{декабря}{дек\adddot}}, langamerican = {{американский}{амер\adddot}}, langbrazilian = {{бразильский}{браз\adddot}}, - langbulgarian = {{болгарский}{болг\adddot}}, langcatalan = {{каталонский}{катал\adddot}}, langcroatian = {{хорватский}{хорв\adddot}}, langczech = {{чешский}{чеш\adddot}}, @@ -498,7 +482,6 @@ langestonian = {{эстонский}{эст\adddot}}, langfinnish = {{финский}{фин\adddot}}, langfrench = {{французский}{фр\adddot}}, - langgalician = {{галисийский}{гал\adddot}}, langgerman = {{немецкий}{нем\adddot}}, langgreek = {{греческий}{греч\adddot}}, langitalian = {{итальянский}{итал\adddot}}, @@ -511,10 +494,8 @@ langslovene = {{словенский}{слов\adddot}}, langspanish = {{испанский}{исп\adddot}}, langswedish = {{шведский}{швед\adddot}}, - langukrainian = {{украинский}{укр\adddot}}, fromamerican = {{с американского}{с\addabbrvspace амер\adddot}}, frombrazilian = {{с бразильского}{с\addabbrvspace браз\adddot}}, - frombulgarian = {{с болгарского}{с\addabbrvspace болг\adddot}}, fromcatalan = {{с каталонского}{с\addabbrvspace катал\adddot}}, fromcroatian = {{с хорватского}{с\addabbrvspace хорв\adddot}}, fromczech = {{с чешского}{с\addabbrvspace чеш\adddot}}, @@ -524,7 +505,6 @@ fromestonian = {{с эстонского}{с\addabbrvspace эст\adddot}}, fromfinnish = {{с финского}{с\addabbrvspace фин\adddot}}, fromfrench = {{с французского}{с\addabbrvspace фр\adddot}}, - fromgalician = {{c галисийского}{c\addabbrvspace гал\adddot}}, fromgerman = {{с немецкого}{с\addabbrvspace нем\adddot}}, fromgreek = {{с греческого}{с\addabbrvspace греч\adddot}}, fromitalian = {{с итальянского}{с\addabbrvspace итал\adddot}}, @@ -537,7 +517,6 @@ fromslovene = {{со словенского}{со\addabbrvspace слов\adddot}}, fromspanish = {{с испанского}{с\addabbrvspace исп\adddot}}, fromswedish = {{со шведского}{со\addabbrvspace швед\adddot}}, - fromukrainian = {{с украинского}{с\addabbrvspace укр\adddot}}, countryde = {{Германия}{Германия}}, countryeu = {{Европейский Союз}{ЕС}}, countryep = {{Европейский Союз}{ЕС}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/slovak.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/slovak.lbx index a30ec7018bc..4cb194af110 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/slovak.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/slovak.lbx @@ -34,8 +34,8 @@ {} {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#1} - {} - {\iffieldundef{#3}{/}{\adddot\thinspace}}}% + {} + {\iffieldundef{#3}{/}{\adddot\thinspace}}}% \iffieldbibstring{#1} {\bibstring{\thefield{#1}}} {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% @@ -266,9 +266,6 @@ {prekl., anot\adddot\ a dosl\adddot}}, translatorsanaf = {{prekladatelia, anot\'{a}tori\ a doslov}% {prekl., anot\adddot\ a dosl\adddot}}, -% organizer = {{}{}},% FIXME: missing -% organizers = {{}{}},% FIXME: missing -% byorganizer = {{}{}},% FIXME: missing byauthor = {{}% {}}, byeditor = {{editovan\'{e}}% @@ -306,7 +303,7 @@ byeditoran = {{editovan\'{e} a anotovan\'{e}}% {ed\adddotspace a anot\adddot\ }}, byeditorin = {{editovan\'{e}, s\addnbspace \'{u}vodom}% - {ed.,\addabbrvspace s\addnbspace \'{u}v\adddot}}, + {ed.,\addabbrvspace s\addnbspace \'{u}v\addot}}, byeditorfo = {{editovan\'{e}, s\addnbspace predhovorom}% {ed.,\addabbrvspace s\addnbspace predh.,}}, byeditoraf = {{editovan\'{e}, s\addnbspace doslovom}% @@ -316,31 +313,31 @@ byeditortran = {{editovan\'{e}, prelo\v{z}en\'{e} \lbx@lfromlang\ a anotovan\'{e}}% {ed.,\addabbrvspace prel\adddot\ \lbx@sfromlang\ a anot\adddot\ }}, byeditortrin = {{editovan\'{e} a prelo\v{z}en\'{e} \lbx@lfromlang, s\addnbspace \'{u}vodom}% - {ed\adddotspace a prel\adddot\ \lbx@sfromlang, s\addnbspace \'{u}v\adddot}}, + {ed\adddotspace a prel\adddot\ \lbx@sfromlang, s\addnbspace \'{u}v\addot}}, byeditortrfo = {{editovan\'{e} a prelo\v{z}en\'{e} \lbx@lfromlang, s\addnbspace predhovorom}% {ed\adddotspace a prel\adddot\ \lbx@sfromlang, s\addnbspace predh\adddot}}, byeditortraf = {{editovan\'{e} a prelo\v{z}en\'{e} \lbx@lfromlang, s\addnbspace doslovom}% {ed\adddotspace a prekl\adddot\ \lbx@sfromlang, s\addnbspace dosl\adddot}}, byeditorcoin = {{editovan\'{e} a komentovan\'{e}, s\addnbspace \'{u}vodom}% - {ed\adddotspace a kom., s\addnbspace \'{u}v\adddot}}, + {ed\adddotspace a kom., s\addnbspace \'{u}v\addot}}, byeditorcofo = {{editovan\'{e} a komentovan\'{e}, s\addnbspace predhovorom}% {ed\adddotspace a kom., s\addnbspace predh\adddot}}, byeditorcoaf = {{editovan\'{e} a komentovan\'{e}, s\addnbspace doslovom}% {ed\adddotspace a kom., s\addnbspace dosl\adddot}}, byeditoranin = {{editovan\'{e} a anotovan\'{e}, s\addnbspace \'{u}vodom}% - {ed\adddotspace a anot., s\addnbspace \'{u}v\adddot}}, + {ed\adddotspace a anot., s\addnbspace \'{u}v\addot}}, byeditoranfo = {{editovan\'{e} a anotovan\'{e}, s\addnbspace predhovorom}% {ed\adddotspace a anot., s\addnbspace predh\adddot}}, byeditoranaf = {{editovan\'{e} a anotovan\'{e}, s\addnbspace doslovom}% {ed\adddotspace a anot., s\addnbspace dosl\adddot}}, byeditortrcoin = {{editovan\'{e}, prelo\v{z}en\'{e} \lbx@lfromlang\ a komentovan\'{e}, s\addnbspace \'{u}vodom}% - {ed.,\addabbrvspace prel\adddot\ \lbx@sfromlang\ a kom., s\addnbspace \'{u}v\adddot}}, + {ed.,\addabbrvspace prel\adddot\ \lbx@sfromlang\ a kom., s\addnbspace \'{u}v\addot}}, byeditortrcofo = {{editovan\'{e}, prelo\v{z}en\'{e} \lbx@lfromlang\ a komentovan\'{e}, s\addnbspace predhovorom}% {ed.,\addabbrvspace prel\adddot\ \lbx@sfromlang\ a kom., s\addnbspace predh\adddot}}, byeditortrcoaf = {{editovan\'{e}, prelo\v{z}en\'{e} \lbx@lfromlang\ a komentovan\'{e}, s\addnbspace doslovom}% {ed.,\addabbrvspace prel\adddot\ \lbx@sfromlang\ a kom., s\addnbspace dosl\adddot}}, byeditortranin = {{editovan\'{e}, prelo\v{z}en\'{e} \lbx@lfromlang\ a anotovan\'{e}, s\addnbspace \'{u}vodom}% - {ed.,\addabbrvspace prel\adddot\ \lbx@sfromlang\ a anot\adddot, s\addnbspace \'{u}v\adddot}}, + {ed.,\addabbrvspace prel\adddot\ \lbx@sfromlang\ a anot\adddot, s\addnbspace \'{u}v\addot}}, byeditortranfo = {{editovan\'{e}, prelo\v{z}en\'{e} \lbx@lfromlang\ a anotovan\'{e}, s\addnbspace predhovorom}% {ed.,\addabbrvspace prel\adddot\ \lbx@sfromlang\ a anot\adddot, s\addnbspace predh\adddot}}, byeditortranaf = {{editovan\'{e}, prelo\v{z}en\'{e} \lbx@lfromlang\ a anotovan\'{e}, s\addnbspace doslovom}% @@ -350,19 +347,19 @@ bytranslatoran = {{prelo\v{z}en\'{e} \lbx@lfromlang\ a anotovan\'{e}}% {prel\adddot\ \lbx@sfromlang\ a anot\adddot}}, bytranslatorin = {{prelo\v{z}en\'{e} \lbx@lfromlang, s\addnbspace \'{u}vodom}% - {prel\adddot\ \lbx@sfromlang, s\addnbspace \'{u}v\adddot}}, + {prel\adddot\ \lbx@sfromlang, s\addnbspace \'{u}v\addot}}, bytranslatorfo = {{prelo\v{z}en\'{e} \lbx@lfromlang, s\addnbspace predhovorom}% {prel\adddot\ \lbx@sfromlang, s\addnbspace predh\adddot}}, bytranslatoraf = {{prelo\v{z}en\'{e} \lbx@lfromlang, s\addnbspace doslovom}% {prel\adddot\ \lbx@sfromlang, s\addnbspace dosl\adddot}}, bytranslatorcoin = {{prelo\v{z}en\'{e} \lbx@lfromlang\ a komentovan\'{e}, s\addnbspace \'{u}vodom}% - {prel\adddot\ \lbx@sfromlang\ a kom., s\addnbspace \'{u}v\adddot}}, + {prel\adddot\ \lbx@sfromlang\ a kom., s\addnbspace \'{u}v\addot}}, bytranslatorcofo = {{prelo\v{z}en\'{e} \lbx@lfromlang\ a komentovan\'{e}, s\addnbspace predhovorom}% {prel\adddot\ \lbx@sfromlang\ a kom., s\addnbspace predh\adddot}}, bytranslatorcoaf = {{prelo\v{z}en\'{e} \lbx@lfromlang\ a komentovan\'{e}, s\addnbspace doslovom}% {prel\adddot\ \lbx@sfromlang\ a kom., s\addnbspace dosl\adddot}}, bytranslatoranin = {{prelo\v{z}en\'{e} \lbx@lfromlang\ a anotovan\'{e}, s\addnbspace \'{u}vodom}% - {prel\adddot\ \lbx@sfromlang\ a anot., s\addnbspace \'{u}v\adddot}}, + {prel\adddot\ \lbx@sfromlang\ a anot., s\addnbspace \'{u}v\addot}}, bytranslatoranfo = {{prelo\v{z}en\'{e} \lbx@lfromlang\ a anotovan\'{e}, s\addnbspace predhovorom}% {prel\adddot\ \lbx@sfromlang\ a anot., s\addnbspace predh\adddot}}, bytranslatoranaf = {{prelo\v{z}en\'{e} \lbx@lfromlang\ a anotovan\'{e}, s\addnbspace doslovom}% @@ -392,7 +389,7 @@ newseries = {{nov\'{a} ed\'{i}cia}% % ISO 690 -- section 2.17 {n\adddotspace ed\adddot}}, oldseries = {{star\'{a} ed\'{i}cia}% % ISO 690 -- section 2.17 - {st\adddotspace ed\adddot}}, + {st\adddotspace ed\addot}}, edition = {{vydanie}% {vyd\adddot}}, reprint = {{dotla\v{c}}% @@ -563,7 +560,6 @@ {am\adddot angl\adddot}}, langbrazilian = {{braz\'{i}lska portugal\v{c}ina}% {braz\adddot portugal\adddot}}, -% langbulgarian = {{}{}},% FIXME: missing langcatalan = {{katal\'{a}n\v{c}ina}% {katal\adddot}}, langcroatian = {{chorv\'{a}t\v{c}ina}% @@ -576,13 +572,11 @@ {hol\adddot}}, langenglish = {{angli\v{c}tina}% {angl\adddot}}, -% langestonian = {{}{}},% FIXME: missing +% langestonian = {{}{}},% FIXME: missing langfinnish = {{f\'{i}n\v{c}ina}% {f\'{i}n\adddot}}, langfrench = {{franc\'{u}z\v{s}tina}% {franc\adddot}}, - langgalician = {{gal\'icij\v{c}ina}% - {gal\adddot}}, langgerman = {{nem\v{c}ina}% {nem\adddot}}, langgreek = {{gr\'{e}\v{c}tina}% @@ -613,7 +607,6 @@ {z\addnbspace amer\adddot angl\adddot}}, frombrazilian = {{z\addnbspace braz\'{i}lskej portugal\v{c}iny}% {z\addnbspace braz\adddotspace portugal\adddot}}, -% frombulgarian = {{}{}},% FIXME: missing fromcatalan = {{z\addnbspace katal\'{a}n\v{c}iny}% {z\addnbspace katal\adddot}}, fromcroatian = {{z\addnbspace chorvat\v{c}iny}% @@ -626,13 +619,11 @@ {z\addnbspace hol\adddot}}, fromenglish = {{z\addnbspace angli\v{c}tiny}% {z\addnbspace angl\adddot}}, -% fromestonian = {{}{}},% FIXME: missing +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{z\addnbspace f\'{i}n\v{c}iny}% {z\addnbspace f\'{i}n\adddot}}, fromfrench = {{z\addnbspace franc\'{u}z\v{s}tiny}% {z\addnbspace franc\adddot}}, - fromgalician = {{z\addnbspace gal\'icij\v{c}ina}% - {z\addbnspace gal\adddot}}, fromgerman = {{z\addnbspace nem\v{c}iny}% {z\addnbspace nem\adddot}}, fromgreek = {{z\addnbspace gr\'{e}\v{c}tiny}% diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/slovene.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/slovene.lbx index e165cd6dc73..1eb41919233 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/slovene.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/slovene.lbx @@ -1,7 +1,7 @@ \ProvidesFile{slovene.lbx} [\abx@lbxid] -\DeclareRedundantLanguages{slovene}{slovene,slovenian} +\DeclareRedundantLanguages{slovene}{slovene} \DeclareBibliographyExtras{% \protected\def\bibrangedash{\textendash\penalty\hyphenpenalty}% @@ -243,9 +243,6 @@ {avt\adddotspace prev\adddotspace, opomb in spr\adddotspace b\adddot}}, translatorsanaf = {{avtorji prevoda, opomb in spremne besede}% {avt\adddotspace prev\adddotspace, opomb in spr\adddotspace b\adddot}}, -% organizer = {{}{}},% FIXME: missing -% organizers = {{}{}},% FIXME: missing -% byorganizer = {{}{}},% FIXME: missing byauthor = {{}{}}, byeditor = {{uredil}{ur\adddot}},% FIXME: unsure bycompiler = {{sestavil}{sest\adddot}},% FIXME: unsure @@ -357,31 +354,19 @@ origpubin = {{izvirno izdano v}{izvirno izdano v}}, astitle = {{}{}}, bypublisher = {{}{}}, - nodate = {{brez datuma}{b\adddot d\adddot}}, page = {{stran}{str\adddot}}, pages = {{strani}{str\adddot}}, column = {{stolpec}{st\adddot}}, columns = {{stolpci}{st\adddot}}, line = {{vrstica}{v\adddot}}, lines = {{vrstice}{v\adddot}}, + nodate = {{brez datuma}{b\adddot d\adddot}}, verse = {{verz}{v\adddot}}, verses = {{verzi}{v\adddot}}, section = {{razdelek}{\S}}, sections = {{razdelek}{\S\S}}, paragraph = {{odstavek}{odstavek}}, paragraphs = {{odstavki}{odstavki}}, -% pagetotal = {{}{}},% FIXME: missing -% pagetotals = {{}{}},% FIXME: missing -% columntotal = {{}{}},% FIXME: missing -% columntotals = {{}{}},% FIXME: missing -% linetotal = {{}{}},% FIXME: missing -% linetotals = {{}{}},% FIXME: missing -% versetotal = {{}{}},% FIXME: missing -% versetotals = {{}{}},% FIXME: missing -% sectiontotal = {{}{}},% FIXME: missing -% sectiontotals = {{}{}},% FIXME: missing -% paragraphtotal = {{}{}},% FIXME: missing -% paragraphtotals = {{}{}},% FIXME: missing in = {{v}{v}}, inseries = {{v zbirki}{v zbirki}}, ofseries = {{iz zbirke}{iz zbirke}}, @@ -389,7 +374,7 @@ chapter = {{poglavje}{pogl\adddot}}, mathesis = {{Magistrsko delo}{Magistrsko delo}}, phdthesis = {{Doktorska disertacija}{Doktorska disertacija}}, -% candthesis = {{Candidate thesis}{Cand\adddotspace thesis}},% FIXME: don't know + %candthesis = {{Candidate thesis}{Cand\adddotspace thesis}},% FIXME: don't know resreport = {{Raziskovalno poro\v{c}ilo}{Razisk\adddotspace poro\v{c}ilo}}, techreport = {{Tehni\v{c}no poro\v{c}ilo}{Teh\adddotspace poro\v{c}ilo}}, software = {{Ra\v{c}unalni\v{s}ki program}{Ra\v{c}\adddotspace prog\adddot}}, @@ -417,12 +402,12 @@ idempn = {{ista}{id\adddot}}, idempp = {{isti}{id\adddot}}, ibidem = {{prav tam}{ibid\adddot}}, -% opcit = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},% FIXME: don't know -% loccit = {{loc\adddotspace cit\adddot}{loc\adddotspace cit\adddot}},% FIXME: don't know + %opcit = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},% FIXME: don't know + %loccit = {{loc\adddotspace cit\adddot}{loc\adddotspace cit\adddot}},% FIXME: don't know confer = {{primerjaj}{prim\adddot}}, -% sequens = {{sq\adddot}{sq\adddot}},% FIXME: don't know -% sequentes = {{sqq\adddot}{sqq\adddot}},% FIXME: don't know -% passim = {{passim}{pass\adddot}},% FIXME: don't know + %sequens = {{sq\adddot}{sq\adddot}},% FIXME: don't know + %sequentes = {{sqq\adddot}{sqq\adddot}},% FIXME: don't know + %passim = {{passim}{pass\adddot}},% FIXME: don't know see = {{glej}{gl\adddot}}, seealso = {{glej tudi}{gl\adddotspace tudi}}, backrefpage = {{citirano na strani}{cit\adddotspace na str\adddot}}, @@ -441,17 +426,15 @@ december = {{december}{dec\adddot}}, langamerican = {{angle\v{s}\v{c}ina}{angl\adddot}}, langbrazilian = {{brazil\v{s}\v{c}ina}{braz\adddot}}, -% langbulgarian = {{}{}},% FIXME: missing langcatalan = {{katalon\v{s}\v{c}ina}{kat\adddot}}, langcroatian = {{hrva\v{s}\v{c}ina}{hrv\adddot}}, langczech = {{\v{c}e\v{s}\v{c}ina}{\v{c}e\v{s}\adddot}}, langdanish = {{dan\v{s}\v{c}ina}{dan\adddot}}, langdutch = {{nizozem\v{s}\v{c}ina}{niz\adddot}}, langenglish = {{angle\v{s}\v{c}ina}{angl\adddot}}, -% langestonian = {{}{}},% FIXME: missing +% langestonian = {{}{}},% FIXME: missing langfinnish = {{fin\v{s}\v{c}ina}{fin\adddot}}, langfrench = {{franco\v{s}\v{c}ina}{fr\adddot}}, - langgalician = {{galicij\v{s}\v{c}ina}{gal\adddot}}, langgerman = {{nem\v{s}\v{c}ina}{nem\adddot}}, langgreek = {{gr\v{s}\v{c}ina}{gr\adddot}}, langitalian = {{italijan\v{s}\v{c}ina}{it\adddot}}, @@ -465,17 +448,15 @@ langswedish = {{\v{s}ved\v{s}\v{c}ina}{\v{s}ved\adddot}}, fromamerican = {{iz angle\v{s}\v{c}ine}{iz angl\adddot}}, frombrazilian = {{iz brazil\v{s}\v{c}ine}{iz braz\adddot}}, -% frombulgarian = {{}{}},% FIXME: missing fromcatalan = {{iz katalon\v{s}\v{c}ine}{iz kat\adddot}}, fromcroatian = {{iz hrva\v{s}\v{c}ine}{iz hrv\adddot}}, fromczech = {{iz \v{c}e\v{s}\v{c}ine}{iz \v{c}e\v{s}\adddot}}, fromdanish = {{iz dan\v{s}\v{c}ine}{iz dan\adddot}}, fromdutch = {{iz nizozem\v{s}\v{c}ine}{iz niz\adddot}}, fromenglish = {{iz angle\v{s}\v{c}ine}{iz angl\adddot}}, -% fromestonian = {{}{}},% FIXME: missing +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{iz fin\v{s}\v{c}ine}{iz fin\adddot}}, fromfrench = {{iz franco\v{s}\v{c}ine}{iz fr\adddot}}, - fromgalician = {{iz galicij\v{s}\v{c}ine}{iz gal\adddot}} fromgerman = {{iz nem\v{s}\v{c}ine}{iz nem\adddot}}, fromgreek = {{iz gr\v{s}\v{c}ine}{iz gr\adddot}}, fromitalian = {{iz italijan\v{s}\v{c}ine}{iz it\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/slovenian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/slovenian.lbx deleted file mode 100644 index 69214d40324..00000000000 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/slovenian.lbx +++ /dev/null @@ -1,7 +0,0 @@ -\ProvidesFile{slovenian.lbx} -[\abx@lbxid] - -\InheritBibliographyExtras{slovene} -\InheritBibliographyStrings{slovene} - -\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx index ffdf2fcae0d..e6fbf676755 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx @@ -179,21 +179,18 @@ translatorsfo = {{traducc\'{\i}on \lbx@sfromlang y pr\'{o}logo}{trads\adddotspace \lbx@sfromlang\ y pr\'{o}l\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang y pr\'{o}logo} instead of {traductores \lbx@sfromlang y prologuistas} or {traductoras \lbx@sfromlang y prologuistas} translatoraf = {{traducc\'{\i}on \lbx@sfromlang y ep\'{\i}logo}{trad\adddotspace \lbx@sfromlang\ y ep\'{\i}l\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang y ep\'{\i}logo} instead of {traductor \lbx@sfromlang y epiloguista} or {traductora \lbx@sfromlang y epiloguista} translatorsaf = {{traducc\'{\i}on \lbx@sfromlang y ep\'{\i}logo}{trads\adddotspace \lbx@sfromlang\ y ep\'{\i}l\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang y ep\'{\i}logo} instead of {traductores \lbx@sfromlang y epiloguistas} or {traductoras \lbx@sfromlang y epiloguistas} - translatorcoin = {{traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentario}{trad\adddotspace \lbx@sfromlang, intr\adddotspace y com\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentario} instead of {traductor \lbx@sfromlang, introducci\'{o}n y comentario} or {traductora \lbx@sfromlang, introducci\'{o}n y comentario} - translatorscoin = {{traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentarios}{trads\adddotspace \lbx@sfromlang, intr\adddotspace y coms\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentarios} instead of {traductores \lbx@sfromlang, introducci\'{o}n y comentarios} or {traductoras \lbx@sfromlang, introducci\'{o}n y comentarios} - translatorcofo = {{traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y comentario}{trad\adddotspace \lbx@sfromlang, pr\'{o}l\adddotspace y com\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentario} instead of {traductor \lbx@sfromlang, pr\'{o}logo y comentario} or {traductora \lbx@sfromlang, pr\'{o}logo y comentario} - translatorscofo = {{traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y comentarios}{trads\adddotspace \lbx@sfromlang, pr\'{o}l\adddotspace y coms\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentarios} instead of {traductores \lbx@sfromlang, pr\'{o}logo y comentarios} or {traductoras \lbx@sfromlang, pr\'{o}logo y comentarios} - translatorcoaf = {{traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y comentario}{trad\adddotspace \lbx@sfromlang, ep\'{\i}l\adddotspace y com\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentarios} instead of {traductor \lbx@sfromlang, ep\'{\i}logo y comentario} or {traductora \lbx@sfromlang, ep\'{\i}logo y comentario} - translatorscoaf = {{traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y comentarios}{trads\adddotspace \lbx@sfromlang, ep\'{\i}l\adddotspace y coms\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentarios} instead of {traductores \lbx@sfromlang, ep\'{\i}logo y comentarios} or {traductoras \lbx@sfromlang, ep\'{\i}logo y comentarios} - translatoranin = {{traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y notas}{trad\adddotspace \lbx@sfromlang, intr\adddotspace y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y notas} instead of {traductor \lbx@sfromlang, introducci\'{o}n y notas} or {traductora \lbx@sfromlang, introducci\'{o}n y notas} - translatorsanin = {{traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y notas}{trads\adddotspace \lbx@sfromlang, intr\adddotspace y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y notas} instead of {traductores \lbx@sfromlang, introducci\'{o}n y notas} or {traductoras \lbx@sfromlang, introducci\'{o}n y notas} - translatoranfo = {{traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y notas}{trad\adddotspace \lbx@sfromlang, pr\'{o}l\adddotspace y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y notas} instead of {traductor \lbx@sfromlang, pr\'{o}logo y notas} or {traductora \lbx@sfromlang, pr\'{o}logo y notas} - translatorsanfo = {{traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y notas}{trads\adddotspace \lbx@sfromlang, pr\'{o}l\adddotspace y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y notas} instead of {traductores \lbx@sfromlang, pr\'{o}logo y notas} or {traductoras \lbx@sfromlang, pr\'{o}logo y notas} - translatoranaf = {{traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y notas}{trad\adddotspace \lbx@sfromlang, ep\'{\i}l\adddotspace y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y notas} instead of {traductor \lbx@sfromlang, ep\'{\i}logo y notas} or {traductora \lbx@sfromlang, ep\'{\i}logo y notas} - translatorsanaf = {{traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y notas}{trads\adddotspace \lbx@sfromlang, ep\'{\i}l\adddotspace y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y notas} instead of {traductores \lbx@sfromlang, ep\'{\i}logo y notas} or {traductora \lbx@sfromlang, ep\'{\i}logo y notas} -% organizer = {{}{}},% FIXME: missing -% organizers = {{}{}},% FIXME: missing -% byorganizer = {{}{}},% FIXME: missing + translatorcoin = {{traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentario}{trad\adddotspace \lbx@sfromlang, intr\addot y com\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentario} instead of {traductor \lbx@sfromlang, introducci\'{o}n y comentario} or {traductora \lbx@sfromlang, introducci\'{o}n y comentario} + translatorscoin = {{traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentarios}{trads\adddotspace \lbx@sfromlang, intr\addot y coms\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentarios} instead of {traductores \lbx@sfromlang, introducci\'{o}n y comentarios} or {traductoras \lbx@sfromlang, introducci\'{o}n y comentarios} + translatorcofo = {{traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y comentario}{trad\adddotspace \lbx@sfromlang, pr\'{o}l\addot y com\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentario} instead of {traductor \lbx@sfromlang, pr\'{o}logo y comentario} or {traductora \lbx@sfromlang, pr\'{o}logo y comentario} + translatorscofo = {{traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y comentarios}{trads\adddotspace \lbx@sfromlang, pr\'{o}l\addot y coms\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentarios} instead of {traductores \lbx@sfromlang, pr\'{o}logo y comentarios} or {traductoras \lbx@sfromlang, pr\'{o}logo y comentarios} + translatorcoaf = {{traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y comentario}{trad\adddotspace \lbx@sfromlang, ep\'{\i}l\addot y com\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentarios} instead of {traductor \lbx@sfromlang, ep\'{\i}logo y comentario} or {traductora \lbx@sfromlang, ep\'{\i}logo y comentario} + translatorscoaf = {{traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y comentarios}{trads\adddotspace \lbx@sfromlang, ep\'{\i}l\addot y coms\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentarios} instead of {traductores \lbx@sfromlang, ep\'{\i}logo y comentarios} or {traductoras \lbx@sfromlang, ep\'{\i}logo y comentarios} + translatoranin = {{traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y notas}{trad\adddotspace \lbx@sfromlang, intr\addot y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y notas} instead of {traductor \lbx@sfromlang, introducci\'{o}n y notas} or {traductora \lbx@sfromlang, introducci\'{o}n y notas} + translatorsanin = {{traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y notas}{trads\adddotspace \lbx@sfromlang, intr\addot y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y notas} instead of {traductores \lbx@sfromlang, introducci\'{o}n y notas} or {traductoras \lbx@sfromlang, introducci\'{o}n y notas} + translatoranfo = {{traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y notas}{trad\adddotspace \lbx@sfromlang, pr\'{o}l\addot y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y notas} instead of {traductor \lbx@sfromlang, pr\'{o}logo y notas} or {traductora \lbx@sfromlang, pr\'{o}logo y notas} + translatorsanfo = {{traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y notas}{trads\adddotspace \lbx@sfromlang, pr\'{o}l\addot y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y notas} instead of {traductores \lbx@sfromlang, pr\'{o}logo y notas} or {traductoras \lbx@sfromlang, pr\'{o}logo y notas} + translatoranaf = {{traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y notas}{trad\adddotspace \lbx@sfromlang, ep\'{\i}l\addot y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y notas} instead of {traductor \lbx@sfromlang, ep\'{\i}logo y notas} or {traductora \lbx@sfromlang, ep\'{\i}logo y notas} + translatorsanaf = {{traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y notas}{trads\adddotspace \lbx@sfromlang, ep\'{\i}l\addot y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y notas} instead of {traductores \lbx@sfromlang, ep\'{\i}logo y notas} or {traductora \lbx@sfromlang, ep\'{\i}logo y notas} byauthor = {{de}{de}}, byeditor = {{editado por}{ed\adddotspace por}}, bycompiler = {{compilado por}{comp\adddotspace por}}, @@ -305,31 +302,19 @@ origpubin = {{publicado originalmente en}{pub\adddot orig\adddot en}},% FIXME: check astitle = {{con el t\'{\i}tulo}{con el t\'{\i}t\adddot}},% FIXME: check bypublisher = {{por la editorial}{por la ed\adddot}}, - nodate = {{sin fecha}{{}s\adddot f\adddot}}, page = {{p\'agina}{p\'ag\adddot}}, pages = {{p\'aginas}{p\'ags\adddot}}, column = {{columna}{col\adddot}}, columns = {{columnas}{cols\adddot}}, line = {{l\'{\i}nea}{l\adddot}},% FIXME: abbrev. unsure. There is no standard lines = {{l\'{\i}neas}{ll\adddot}},% FIXME: abbrev. unsure. There is no standard + nodate = {{sin fecha}{{}s\adddot f\adddot}}, verse = {{verso}{v\adddot}}, verses = {{versos}{vv\adddot}}, section = {{secci\'{o}}{sec\adddot}}, sections = {{secciones}{secs\adddot}}, paragraph = {{p\'{a}rrafo}{p\'{a}rr\adddot}}, paragraphs = {{p\'{a}rrafos}{p\'{a}rrs\adddot}}, -% pagetotal = {{}{}},% FIXME: missing -% pagetotals = {{}{}},% FIXME: missing -% columntotal = {{}{}},% FIXME: missing -% columntotals = {{}{}},% FIXME: missing -% linetotal = {{}{}},% FIXME: missing -% linetotals = {{}{}},% FIXME: missing -% versetotal = {{}{}},% FIXME: missing -% versetotals = {{}{}},% FIXME: missing -% sectiontotal = {{}{}},% FIXME: missing -% sectiontotals = {{}{}},% FIXME: missing -% paragraphtotal = {{}{}},% FIXME: missing -% paragraphtotals = {{}{}},% FIXME: missing in = {{en}{en}}, inseries = {{en}{en}}, ofseries = {{de}{de}}, @@ -389,17 +374,15 @@ december = {{diciembre}{dic\adddot}}, langamerican = {{ingl\'{e}s americano}{ingl\'{e}s americano}}, langbrazilian = {{brasile\~no}{brasile\~no}}, -% langbulgarian = {{}{}},% FIXME: missing langcatalan = {{catal\'{a}n}{catal\'{a}n}}, langcroatian = {{croata}{croata}}, langczech = {{checo}{checo}}, langdanish = {{dan\'es}{dan\'es}}, langdutch = {{neerland\'es}{neerland\'es}}, langenglish = {{ingl\'es}{ingl\'es}}, -% langestonian = {{}{}},% FIXME: missing +% langestonian = {{}{}},% FIXME: missing langfinnish = {{fin\'{e}s}{fin\'{e}s}}, langfrench = {{franc\'es}{franc\'es}}, - langgalician = {{gallego}{gallego}}, langgerman = {{alem\'an}{alem\'an}}, langgreek = {{griego}{griego}}, langitalian = {{italiano}{italiano}}, @@ -413,17 +396,15 @@ langswedish = {{sueco}{sueco}}, fromamerican = {{del ingl\'{e}s americano}{del ingl\'{e}s americano}}, frombrazilian = {{del brasile\~no}{del brasile\~no}}, -% frombulgarian = {{}{}},% FIXME: missing fromcatalan = {{del catal\'{a}n}{del catal\'{a}n}}, fromcroatian = {{del croata}{del croata}}, fromczech = {{del checo}{del checo}}, fromdanish = {{del dan\'es}{del dan\'es}}, fromdutch = {{del neerland\'es}{del neerland\'es}}, fromenglish = {{del ingl\'es}{del ingl\'es}}, -% fromestonian = {{}{}},% FIXME: missing +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{del fin\'{e}s}{del fin\'{e}s}}, fromfrench = {{del franc\'es}{del franc\'es}}, - fromgalician = {{del gallego}{del gallego}}, fromgerman = {{del alem\'an}{del alem\'an}}, fromgreek = {{del griego}{del griego}}, fromitalian = {{del italiano}{del italiano}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx index b9fd68b89e0..6413918075a 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx @@ -212,9 +212,6 @@ % translatorsanfo = {{}{}},% FIXME: missing % translatoranaf = {{}{}},% FIXME: missing % translatorsanaf = {{}{}},% FIXME: missing -% organizer = {{}{}},% FIXME: missing -% organizers = {{}{}},% FIXME: missing -% byorganizer = {{}{}},% FIXME: missing byauthor = {{av}{av}}, byeditor = {{utgiven av}{utg\adddotspace av}}, bycompiler = {{sammanst\"alld av}{sammanst\adddotspace av}}, @@ -332,13 +329,13 @@ origpubin = {{ursprungligen publicerad}{ursprungligen publ\adddot}}, astitle = {{som}{som}}, bypublisher = {{av}{av}}, - nodate = {{u\adddot d\adddot}{n\adddot d\adddot}},%FIXME 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 = {{u\adddot d\adddot}{n\adddot d\adddot}},%FIXME verse = {{vers}{v\adddot}}, verses = {{verserna}{v\adddot}}, section = {{paragraf}{\S}}, @@ -347,18 +344,6 @@ % more suitable for works referenced by paragraphs paragraph = {{paragraf}{\S}}, paragraphs = {{paragraferna}{\S}}, - pagetotal = {{sida}{s\adddot}}, - pagetotals = {{sidor}{s\adddot}}, - columntotal = {{spalt}{sp\adddot}}, - columntotals = {{spalter}{sp\adddot}}, - linetotal = {{rad}{r\adddot}}, - linetotals = {{rader}{r\adddot}}, - versetotal = {{vers}{v\adddot}}, - versetotals = {{verser}{v\adddot}}, - sectiontotal = {{paragraf}{\S}}, - sectiontotals = {{paragrafer}{\S}}, - paragraphtotal = {{paragraf}{\S}}, - paragraphtotals = {{paragrafer}{\S}}, in = {{i}{i}}, inseries = {{i}{i}}, ofseries = {{i}{i}}, @@ -420,17 +405,15 @@ december = {{december}{dec\adddot}}, langamerican = {{amerikanska}{amerikanska}}, % langbrazilian = {{}{}},% FIXME: missing -% langbulgarian = {{}{}},% FIXME: missing langcatalan = {{katalanska}{katalanska}}, langcroatian = {{kroatiska}{kroatiska}}, langczech = {{tjeckiska}{tjeckiska}}, langdanish = {{danska}{danska}}, langdutch = {{nederl\"andska}{nederl\"andska}}, langenglish = {{engelska}{engelska}}, -% langestonian = {{}{}},% FIXME: missing +% langestonian = {{}{}},% FIXME: missing langfinnish = {{finska}{finska}}, langfrench = {{franska}{franska}}, - langgalician = {{galiciska}{galiciska}}, langgerman = {{tyska}{tyska}}, langgreek = {{grekiska}{grekiska}}, langitalian = {{italienska}{italienska}}, @@ -444,17 +427,15 @@ langswedish = {{svenska}{svenska}}, fromamerican = {{fr\aa n amerikanska}{fr\aa n amerikanska}}, % frombrazilian = {{}{}},% FIXME: missing -% frombulgarian = {{}{}},% FIXME: missing fromcatalan = {{fr\aa n katalanska}{fr\aa n 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 = {{fr\aa n nederl\"andska}{fr\aa n nederl\"andska}}, fromenglish = {{fr\aa n engelska}{fr\aa n engelska}}, -% fromestonian = {{}{}},% FIXME: missing +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{fr\aa n finska}{fr\aa n finska}}, fromfrench = {{fr\aa n franska}{fr\aa n franska}}, - fromgalician = {{fr\aa n galiciska}{fr\aa n galiciska}}, 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}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/swissgerman.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/swissgerman.lbx index f82ad9b0570..3ed0714388d 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/swissgerman.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/swissgerman.lbx @@ -5,7 +5,7 @@ % Swiss time sep is a dot \DeclareBibliographyExtras{% - \protected\def\bibtimesep{.}% + \protected\def\bibtimesep{.} } % One point where Swiss German spelling diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/ukrainian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/ukrainian.lbx deleted file mode 100644 index 340e2b73f1b..00000000000 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/ukrainian.lbx +++ /dev/null @@ -1,595 +0,0 @@ -\ProvidesFile{ukrainian.lbx} -[\abx@lbxid] - -\DeclareRedundantLanguages{ukrainian}{ukrainian} - -% This file requires UTF-8 support! - -\lbx@ifutfinput - {} - {\PackageError{biblatex} - {Ukrainian requires UTF-8 support} - {The 'ukrainian.lbx' file requires UTF-8 encoding but you - seem\MessageBreak to be using a different encoding. - This is a fatal error. I will\MessageBreak abort loading - ukrainian.lbx now.}% - \endinput} - -\NewBibliographyString{% Used only Ukrainian for month checks - datejanuary, - datefebruary, - datemarch, - dateapril, - datemay, - datejune, - datejuly, - dateaugust, - dateseptember, - dateoctober, - datenovember, - datedecember% -} - -\DeclareBibliographyExtras{% - \protected\def\bibrangedash{% - \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-я}% - \protected\def\mkbibneutord#1{#1-е}% - \protected\def\mkbibdatelong#1#2#3{% - \iffieldundef{#3} - {} - {\stripzeros{\thefield{#3}}% - \iffieldundef{#2}{}{\nobreakspace}}% - \iffieldundef{#2} - {} - {\iffieldundef{#3} - {\mkbibmonth{\thefield{#2}}} - {\lbx@ru@mkbibdatemonth{\thefield{#2}}}% - \iffieldundef{#1}{}{\space}}% - \iffieldbibstring{#1} - {\bibstring{\thefield{#1}}} - {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% - \protected\def\mkbibdateshort#1#2#3{% - \iffieldundef{#3} - {} - {\mkdayzeros{\thefield{#3}}% - \iffieldundef{#2}{}{\adddot}}% - \iffieldundef{#2} - {} - {\mkmonthzeros{\thefield{#2}}% - \iffieldundef{#1}{}{\adddot}}% - \iffieldbibstring{#1} - {\bibstring{\thefield{#1}}} - {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% - \savecommand\mkbibordedition - \savecommand\mkbibordseries - \def\mkbibordedition{\mkbibneutord}% - \def\mkbibordseries{\mkbibfemord}% - \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% - \iffieldundef{#1}{} - {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% - \iffieldundef{#2}{} - {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% - \iffieldundef{#3}{} - {\printtext{\mktimezeros{\thefield{#3}}}}% - \setunit{}% - \iffieldundef{#4}{} - {\bibtimezonesep - \mkbibtimezone{\thefield{#4}}}}% - \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% - \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep - \forcezerosmdt{\thefield{#2}}% - \iffieldundef{#3}{} - {\bibtimesep - \forcezeros{\thefield{#3}}}% - \space - \ifnumless{\thefield{#1}}{12} - {\bibstring{am}} - {\bibstring{pm}}% - \iffieldundef{#4}{} - {\space\bibtimezonesep - \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% - \iffieldundef{#1}{}{\space}% - \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% - \iffieldundef{#1}{}{\space}% - \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% -} - -\UndeclareBibliographyExtras{% - \restorecommand\mkbibordedition - \restorecommand\mkbibordseries -} - -\DeclareBibliographyStrings{% - bibliography = {{Перелік літератури}{Література}},%book-like (chapter) - references = {{Перелік літератури}{Література}},%article-like (section) - shorthands = {{Перелік скорочень}{Скорочення}}, - editor = {{редактор}{ред\adddot}}, - editors = {{редактори}{ред\adddot}}, - compiler = {{укладач}{уклад\adddot}}, - compilers = {{укладачі}{уклад\adddot}}, - redactor = {{редактор}{ред\adddot}},% FIXME: unsure - redactors = {{редактори}{ред\adddot}},% FIXME: unsure - 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 = {{вступна стаття}{вступ\adddotspace ст\adddot}}, - foreword = {{передмова}{передм\adddot}}, - afterword = {{післямова}{післям\adddot}}, - editortr = {{редактор та перекладач}% - {ред\adddotspace та пер\adddot}}, - editorstr = {{редактори та перекладачі}% - {ред\adddotspace та пер\adddot}}, - editorco = {{редактор та коментатор}% - {ред\adddotspace та комент\adddot}}, - editorsco = {{редактори та коментатори}% - {ред\adddotspace та комент\adddot}}, - editoran = {{редактор та укладач приміток}% - {ред\adddotspace та укл\adddotspace прим\adddot}}, - editorsan = {{редактори та укладачі приміток}% - {ред\adddotspace та укл\adddotspace прим\adddot}}, - editorin = {{редактор та автор вступної статті}% - {ред\adddotspace та авт\adddotspace вступ\adddotspace ст\adddot}}, - editorsin = {{редактори та автори вступної статті}% - {ред\adddotspace та авт\adddotspace вступ\adddotspace ст\adddot}}, - editorfo = {{редактор та автор передмови}% - {ред\adddotspace та авт\adddotspace передм\adddot}}, - editorsfo = {{редактори та автори передмови}% - {ред\adddotspace та авт\adddotspace передм\adddot}}, - editoraf = {{редактор та автор післямови}% - {ред\adddotspace та авт\adddotspace післям\adddot}}, - editorsaf = {{редактори та автори післямови}% - {ред\adddotspace та авт\adddotspace післям\adddot}}, - editortrco = {{редактор, перекладач та автор коментарів}% - {ред.,\addabbrvspace пер\adddotspace та авт\adddotspace комент\adddot}}, - editorstrco = {{редактори, перекладачі та автори коментарів}% - {ред.,\addabbrvspace пер\adddotspace та авт\adddotspace комент\adddot}}, - editortran = {{редактор, перекладач та укладач приміток}% - {ред.,\addabbrvspace пер\adddotspace та укл\adddotspace прим\adddot}}, - editorstran = {{редактори, перекладачі та укладачі приміток}% - {ред.,\addabbrvspace пер\adddotspace та укл\adddotspace прим\adddot}}, - editortrin = {{редактор, перекладач та автор вступної статті}% - {ред.,\addabbrvspace пер\adddotspace та авт\adddotspace вступ\adddotspace ст\adddot}}, - editorstrin = {{редактори, перекладачі та автори вступної статті}% - {ред.,\addabbrvspace пер\adddotspace та авт\adddotspace вступ\adddotspace ст\adddot}}, - editortrfo = {{редактор, перекладач та автор передмови}% - {ред.,\addabbrvspace пер\adddotspace та авт\adddotspace передм\adddot}}, - editorstrfo = {{редактори, перекладачі та автори передмови}% - {ред.,\addabbrvspace пер\adddotspace та авт\adddotspace передм\adddot}}, - editortraf = {{редактор, перекладач та автор післямови}% - {ред.,\addabbrvspace пер\adddotspace та авт\adddotspace післямови\adddot}}, - editorstraf = {{редактори, перекладачі та автори післямови}% - {ред.,\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 = {{редактор, укладач приміток та автор передмови}% - {ред.,\addabbrvspace укл\adddotspace прим\adddotspace та авт\adddotspace передм\adddot}}, - editorsanfo = {{редактори, укладачі приміток та автори передмови}% - {ред.,\addabbrvspace укл\adddotspace прим\adddotspace та авт\adddotspace передм\adddot}}, - editoranaf = {{редактор, укладач приміток та автор післямови}% - {ред.,\addabbrvspace укл\adddotspace прим\adddotspace та авт\adddotspace післям\adddot}}, - editorsanaf = {{редактори, укладачі приміток та автори післямови}% - {ред.,\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 = {{редактор, перекладач, укладач приміток та автор передмови}% - {ред.,\addabbrvspace пер.,\addabbrvspace укл\adddotspace прим\adddotspace та авт\adddotspace передм\adddot}}, - editorstranfo = {{редактори, перекладачі, укладачі приміток та автори передмови}% - {ред.,\addabbrvspace пер.,\addabbrvspace укл\adddotspace прим\adddotspace та авт\adddotspace передм\adddot}}, - editortranaf = {{редактор, перекладач, укладач приміток та автор післямови}% - {ред.,\addabbrvspace пер.,\addabbrvspace укл\adddotspace прим\adddotspace та авт\adddotspace післям\adddot}}, - editorstranaf = {{редактори, перекладачі, укладачі приміток та автори післямови}% - {ред.,\addabbrvspace пер.,\addabbrvspace укл\adddotspace прим\adddotspace та авт\adddotspace післям\adddot}}, - translatorco = {{перекладач та автор коментарів}% - {пер\adddotspace та авт\adddotspace комент\adddot}}, - translatorsco = {{перекладачі та автор коментарів}% - {пер\adddotspace та авт\adddotspace комент\adddot}}, - translatoran = {{перекладач та автор приміток}% - {пер\adddotspace та укл\adddotspace прим\adddot}}, - translatorsan = {{перекладачі та укладачі приміток}% - {пер\adddotspace та уклад\adddotspace прим\adddot}}, - translatorin = {{перекладач та автор вступної статті}% - {пер\adddotspace та авт\adddotspace вступ\adddotspace ст\adddot}}, - translatorsin = {{перекладачі та автори вступної статті}% - {пер\adddotspace та авт\adddotspace вступ\adddotspace ст\adddot}}, - translatorfo = {{перекладач та автор передмови}% - {пер\adddotspace та авт\adddotspace передм\adddot}}, - translatorsfo = {{перекладачі та автори передмови}% - {пер\adddotspace та авт\adddotspace передм\adddot}}, - translatoraf = {{перекладач та автор післямови}% - {пер\adddotspace та авт\adddotspace післям\adddot}}, - translatorsaf = {{перекладачі та автори післямови}% - {пер\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}}, - organizer = {{організатор}{орг\adddot}}, - organizers = {{організатори}{орг\adddot}}, - byorganizer = {{організатор}{орг\adddot}},% FIXME: unsure - byauthor = {{згідно автора}{згідн\adddot авт\adddot}}, - byeditor = {{за редакцією}{за\addabbrvspace ред\adddot}}, - bycompiler = {{укладач}{уклад\adddot}}, - byredactor = {{за редакцією}{за\addabbrvspace ред\adddot}}, - byreviser = {{виправлено}{випр\adddot}}, - byreviewer = {{рецензія}{рец\adddot}}, - byfounder = {{засновник}{засн\adddot}},% FIXME: unsure - bycontinuator = {{продовження}{продовж\adddot}},% FIXME: unsure - bycollaborator = {{за участю}{за\addabbrvspace уч\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, за редакцією}% - {пер\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, передмовие}% - {за ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang, передм\adddot}}, - byeditortraf = {{за редакцією, переклад \lbx@lfromlang, післямова}% - {за ред\adddotspace та пер\adddot\ \lbx@sfromlang, післям\adddot}}, - byeditorcoin = {{за редакцією, коментарі та вступна стаття}% - {за ред.,\addabbrvspace комент\adddotspace та вступ\adddotspace ст\adddot}}, - byeditorcofo = {{за редакцією, коментарі та передмова}% - {за ред.,\addabbrvspace комент\adddotspace та передм\adddot}}, - byeditorcoaf = {{за редакцією, коментарі та післямова}% - {за ред.,\addabbrvspace комент\adddotspace та післям\adddot}}, - byeditoranin = {{за редакцією, примітки та вступна стаття}% - {за ред.,\addabbrvspace приміт\adddotspace та вступ\adddotspace ст\adddot}}, - byeditoranfo = {{за редакцією, примітки та передмова}% - {за ред.,\addabbrvspace приміт\adddotspace та передм\adddot}}, - byeditoranaf = {{за редакцією, примітки та післямова}% - {за ред.,\addabbrvspace приміт\adddotspace та післям\adddot}}, - byeditortrcoin = {{за редакцією, переклад \lbx@lfromlang, коментарі та вступна стаття}% - {за ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang, комент\adddotspace та вступ\adddotspace ст\adddot}}, - byeditortrcofo = {{за редакцією, переклад \lbx@lfromlang, коментарі та передмова}% - {за ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang, комент\adddotspace та передм\adddot}}, - byeditortrcoaf = {{за редакцією, переклад \lbx@lfromlang, коментарі та післямова}% - {за ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang, комент\adddotspace та післям\adddot}}, - byeditortranin = {{за редакцією, переклад \lbx@lfromlang, примітки та вступна стаття}% - {за ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang, прим\adddotspace та вступ\adddotspace ст\adddot}}, - byeditortranfo = {{за редакцією, переклад \lbx@lfromlang, примітки та передмова}% - {за ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang, прим\adddotspace та передм\adddot}}, - byeditortranaf = {{за редакцією, переклад \lbx@lfromlang, примітки та післямова}% - {за ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang, прим\adddotspace та післям\adddot}}, - bytranslatorco = {{переклад \lbx@lfromlang\ та коментарі}% - {пер\adddot\ \lbx@sfromlang\ та комент\adddot}}, - bytranslatoran = {{переклад \lbx@lfromlang\ та примітки}% - {пер\adddot\ \lbx@sfromlang\ та прим\adddot}}, - bytranslatorin = {{переклад \lbx@lfromlang\ та вступна стаття}% - {пер\adddot\ \lbx@sfromlang\ та вступ\adddotspace ст\adddot}}, - bytranslatorfo = {{переклад \lbx@lfromlang\ та передмова}% - {пер\adddot\ \lbx@sfromlang\ та передм\adddot}}, - bytranslatoraf = {{переклад \lbx@lfromlang\ та післямова}% - {пер\adddot\ \lbx@sfromlang\ та післям\adddot}}, - bytranslatorcoin = {{переклад \lbx@lfromlang, коментарі та вступна стаття}% - {пер\adddot\ \lbx@sfromlang, комент\adddotspace та вступ\adddotspace ст\adddot}}, - bytranslatorcofo = {{переклад \lbx@lfromlang, коментарі та передмова}% - {пер\adddot\ \lbx@sfromlang, комент\adddotspace та передм\adddot}}, - bytranslatorcoaf = {{переклад \lbx@lfromlang, коментарі та післямова}% - {пер\adddot\ \lbx@sfromlang, комент\adddotspace та післям\adddot}}, - bytranslatoranin = {{переклад \lbx@lfromlang, примітки та вступна стаття}% - {пер\adddot\ \lbx@sfromlang, прим\adddotspace та вступ\adddotspace ст\adddot}}, - bytranslatoranfo = {{переклад \lbx@lfromlang, примітки та передмова}% - {пер\adddot\ \lbx@sfromlang, прим\adddotspace та передм\adddot}}, - bytranslatoranaf = {{переклад \lbx@lfromlang, примітки та післямова}% - {пер\adddot\ \lbx@sfromlang, прим\adddotspace та післям\adddot}}, - and = {{та}{та}}, - andothers = {{та\addabbrvspace ін\adddot}{та\addabbrvspace ін\adddot}}, - andmore = {{та\addabbrvspace ін\adddot}{та\addabbrvspace ін\adddot}}, - volume = {{том}{т\adddot}}, - volumes = {{томах}{т\adddot}}, - involumes = {{в}{в}}, - jourvol = {{том}{т\adddot}}, - jourser = {{серія}{сер\adddot}}, - book = {{книга}{кн\adddot}}, - part = {{частина}{ч\adddot}}, - issue = {{випуск}{вип\adddot}}, - newseries = {{нова серія}{нов\adddotspace сер\adddot}}, - oldseries = {{стара серія}{стар\adddotspace сер\adddot}}, - edition = {{видання}{вид\adddot}}, - reprint = {{перевидання}{перевид\adddot}}, - reprintof = {{перевидання}{перевид\adddot}}, - 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 - nodate = {{б\adddot р\adddot}{б\adddot р\adddot}}, - page = {{сторінка}{с\adddot}}, - pages = {{сторінки}{с\adddot}}, - column = {{колонка}{кол\adddot}}, - columns = {{колонки}{кол\adddot}}, - line = {{рядок}{рядок}}, - lines = {{рядки}{рядки}}, - verse = {{вірш}{вірш}}, - verses = {{вірші}{вірші}}, - section = {{параграф}{\S}}, - sections = {{параграфи}{\S\S}}, - paragraph = {{абзац}{абз\adddot}}, - paragraphs = {{абзаци}{абз\adddot}}, - pagetotal = {{сторінка}{с\adddot}}, - pagetotals = {{сторінки}{с\adddot}}, - columntotal = {{колонка}{кол\adddot}}, - columntotals = {{колонки}{кол\adddot}}, - linetotal = {{рядок}{рядок}}, - linetotals = {{рядки}{рядки}}, - versetotal = {{вірш}{вірш}}, - versetotals = {{вірші}{вірші}}, - sectiontotal = {{параграф}{\S}}, - sectiontotals = {{параграфи}{\S\S}}, - paragraphtotal = {{абзац}{абз\adddot}}, - paragraphtotals = {{абзаци}{абз\adddot}}, - in = {{в}{в}}, - inseries = {{в}{в}}, - ofseries = {{із}{із}}, - number = {{номер}{№}}, - chapter = {{глава}{гл\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 = {{url}{url}}, - urlfrom = {{режим доступу}{режим доступу}}, - urlseen = {{дата звернення}{дата\addabbrvspace зверн\adddot}}, - inpreparation = {{в\addabbrvspace підготовці}{в підг\adddot}}, - submitted = {{представлено}{предст\adddot}}, - forthcoming = {{в друці}{в друц\adddot}}, - inpress = {{в\addabbrvspace друці}{в друці\adddot}}, - prepublished = {{попередня публікация}{попер\adddotspace пуб\adddot}},% FIXME: unsure - citedas = {{далі цитується як}{далі цит\addabbrvspace як}}, - thiscite = {{тут}{тут}}, - seenote = {{дивись зноску}{див\adddotspace зн\adddot}}, - quotedin = {{цитується за}{цит\adddotspace за}}, - idem = {{він\addabbrvspace же}{він\addabbrvspace же}}, - idemsm = {{він\addabbrvspace же}{він\addabbrvspace же}}, - idemsf = {{вона\addabbrvspace же}{вона\addabbrvspace же}}, - idemsn = {{він\addabbrvspace же}{він\addabbrvspace же}}, - idempm = {{вони\addabbrvspace ж}{вони\addabbrvspace ж}}, - idempf = {{вони\addabbrvspace ж}{вони\addabbrvspace ж}}, - idempn = {{вони\addabbrvspace ж}{вони\addabbrvspace ж}}, - idempp = {{вони\addabbrvspace ж}{вони\addabbrvspace ж}}, - ibidem = {{там\addabbrvspace же}{там\addabbrvspace же}}, - opcit = {{вказ\adddotspace твор\adddot}{вказ\adddotspace твор\adddot}}, - loccit = {{вказ\adddotspace місце}{вказ\adddotspace місце}}, - confer = {{порівняй}{порівн\adddot}}, - sequens = {{та наступна}{та\addabbrvspace наст\adddot}}, - sequentes = {{та наступні}{и\addabbrvspace наст\adddot}}, - passim = {{всюди}{всюди}}, - see = {{дивись}{див\adddot}}, - seealso = {{дивись також}{див\adddotspace також}}, - backrefpage = {{цитується на сторінці}{цит\adddotspace на\addabbrvspace с\adddot}}, - backrefpages = {{цитується на сторінках}{цит\adddotspace на\addabbrvspace с\adddot}}, - january = {{січень}{січ\adddot}}, - february = {{лютий}{лют\adddot}}, - march = {{березень}{бер\adddot}}, - april = {{квітень}{квіт\adddot}}, - may = {{травень}{трав\adddot}}, - june = {{червень}{черв\adddot}}, - july = {{липень}{лип\adddot}}, - august = {{серпень}{серп\adddot}}, - september = {{вересень}{вер\adddot}}, - october = {{жовтень}{жовт\adddot}}, - november = {{листопад}{листоп\adddot}}, - december = {{грудень}{груд\adddot}}, - datejanuary = {{січня}{січ\adddot}}, - datefebruary = {{лютого}{лют\adddot}}, - datemarch = {{березня}{бер\adddot}}, - dateapril = {{квітня}{квіт\adddot}}, - datemay = {{травня}{трав\adddot}}, - datejune = {{червня}{черв\adddot}}, - datejuly = {{липня}{лип\adddot}}, - dateaugust = {{серпня}{серп\adddot}}, - dateseptember = {{вересня}{вер\adddot}}, - dateoctober = {{жовтня}{жовт\adddot}}, - datenovember = {{листопда}{листоп\adddot}}, - datedecember = {{грудня}{груд\adddot}}, - langamerican = {{американський}{амер\adddot}}, - langbrazilian = {{бразильський}{браз\adddot}}, - langbulgarian = {{болгарська}{болг\adddot}}, - langcatalan = {{каталонська}{катал\adddot}}, - langcroatian = {{хорватська}{хорв\adddot}}, - langczech = {{чеська}{чеськ\adddot}}, - langdanish = {{датська}{дат\adddot}}, - langdutch = {{нідерландська}{нід\adddot}}, - langenglish = {{англійська}{англ\adddot}}, - langestonian = {{естонська}{ест\adddot}}, - langfinnish = {{фінська}{фін\adddot}}, - langfrench = {{французька}{фр\adddot}}, - langgalician = {{галісійський}{гал\adddot}}, - langgerman = {{німецька}{нім\adddot}}, - langgreek = {{грецька}{грець\adddot}}, - langitalian = {{італійська}{італ\adddot}}, - langjapanese = {{японська}{яп\adddot}}, - langlatin = {{латинська}{лат\adddot}}, - langnorwegian = {{норвезька}{норв\adddot}}, - langpolish = {{польська}{пол\adddot}}, - langportuguese = {{португальська}{порт\adddot}}, - langrussian = {{російська}{рос\adddot}}, - langslovene = {{словенська}{слов\adddot}}, - langspanish = {{іспанська}{ісп\adddot}}, - langswedish = {{шведська}{швед\adddot}}, - langukrainian = {{українська}{укр\adddot}}, - fromamerican = {{з американської}{з\addabbrvspace амер\adddot}}, - frombrazilian = {{з бразильської}{з\addabbrvspace браз\adddot}}, - frombulgarian = {{з болгарскої}{з\addabbrvspace болг\adddot}}, - fromcatalan = {{з каталонської}{з\addabbrvspace катал\adddot}}, - fromcroatian = {{з хорватської}{з\addabbrvspace хорв\adddot}}, - fromczech = {{з чеської}{з\addabbrvspace чеськ\adddot}}, - fromdanish = {{з датської}{з\addabbrvspace дат\adddot}}, - fromdutch = {{з нідерландської}{з\addabbrvspace нід\adddot}}, - fromenglish = {{з англійскої}{з\addabbrvspace англ\adddot}}, - fromestonian = {{з естонської}{з\addabbrvspace ест\adddot}}, - fromfinnish = {{з фінської}{з\addabbrvspace фін\adddot}}, - fromfrench = {{з французької}{з\addabbrvspace фр\adddot}}, - fromgalician = {{з галісійської}{з\addabbrvspace гал\adddot}}, - fromgerman = {{з німецької}{з\addabbrvspace нім\adddot}}, - fromgreek = {{з грецької}{з\addabbrvspace грец\adddot}}, - fromitalian = {{з італійської}{з\addabbrvspace італ\adddot}}, - fromjapanese = {{з японської}{з\addabbrvspace яп\adddot}}, - fromlatin = {{з латинської}{з\addabbrvspace лат\adddot}}, - fromnorwegian = {{з норвезької}{з\addabbrvspace норв\adddot}}, - frompolish = {{з польської}{з\addabbrvspace пол\adddot}}, - fromportuguese = {{з португальської}{з\addabbrvspace порт\adddot}}, - fromrussian = {{з російської}{з\addabbrvspace рос\adddot}}, - fromslovene = {{зі словенської}{зі\addabbrvspace слов\adddot}}, - fromspanish = {{з іспанської}{з\addabbrvspace ісп\adddot}}, - fromswedish = {{з шведської}{з\addabbrvspace швед\adddot}}, - fromukrainian = {{з української}{з\addabbrvspace укр\adddot}}, - countryde = {{Німеччина}{Німеччина}}, - countryeu = {{Європейський Союз}{ЄС}}, - countryep = {{Європейський Союз}{ЄС}}, - countryfr = {{Франція}{Франція}}, - countryuk = {{Великобританія}{Великобританія}}, - countryus = {{Сполучені Штати Америки}{США}}, - patent = {{патент}{пат\adddot}}, - patentde = {{патент Німеччини}{пат\adddotspace Німеччини}}, - patenteu = {{патент Європи}{пат\adddotspace Європи}}, - patentfr = {{патент Франції}{пат\adddotspace Франції}}, - patentuk = {{патент Великобританії}{пат\adddotspace Великобританії}}, - patentus = {{патент США}{пат\adddotspace США}}, - patreq = {{заявка}{заявка}}, - patreqde = {{заявка на патент Німеччини}{заявка на пат\adddotspace Німеччини}}, - patreqeu = {{заявка на патент Європи}{заявка на пат\adddotspace Європи}}, - patreqfr = {{заявка на патент Франції}{заявка на пат\adddotspace Франції}}, - patrequk = {{заявка на патент Великобританії}{заявка на пат\adddotspace Великобританії}}, - patrequs = {{заявка на патент США}{заявка на пат\adddotspace США}}, - file = {{файл}{файл}}, - library = {{бібліотека}{б-ка}}, - abstract = {{резюме}{рез\adddot}}, - annotation = {{анотація}{анот\adddot}}, - commonera = {{нашої ери}{н\adddotspace е\adddot}}, - beforecommonera = {{до нашої ери}{до н\adddotspace е\adddot}}, - annodomini = {{від Різдва Христового}{від Р\adddotspace Х\adddot}}, - beforechrist = {{до Різдва Христового}{до Р\adddotspace Х\adddot}}, - circa = {{близько}{бл\adddot}}, - spring = {{весна}{весна}}, - summer = {{літо}{літо}}, - autumn = {{осінь}{осінь}}, - winter = {{зима}{зима}}, - am = {{ДП}{ДП}}, - pm = {{ПП}{ПП}}, -} - -\protected\gdef\lbx@ru@mkbibdatemonth#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 |