diff options
author | Karl Berry <karl@freefriends.org> | 2018-11-03 21:11:01 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-11-03 21:11:01 +0000 |
commit | 75d35a09f72ec23912d8aa1b40dcbf674a91c398 (patch) | |
tree | c6bdec0150292bc936d76dd87049fe00452aba3a /Master/texmf-dist/tex/latex/biblatex | |
parent | f1dd9b42c3592316b29602acadfbce3f2d975424 (diff) |
biblatex (3nov18)
git-svn-id: svn://tug.org/texlive/trunk@49069 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex')
37 files changed, 3354 insertions, 1675 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx index cd89399bfaa..d378cd55c48 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx @@ -17,6 +17,10 @@ \DeclareNameAlias{editor}{sortname} \DeclareNameAlias{translator}{sortname} +\DeclareNameWrapperAlias{author}{sortname} +\DeclareNameWrapperAlias{editor}{sortname} +\DeclareNameWrapperAlias{translator}{sortname} + \defbibenvironment{bibliography} {\list {} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx index 0a2a8a741ef..b7f558329da 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx @@ -24,6 +24,13 @@ Using 'date+extradate' instead}% \usebibmacro{date+extradate}} +\newbibmacro*{bbx:ifmergeddate}{\@secondoftwo} + +\renewbibmacro*{date}{% + \usebibmacro{bbx:ifmergeddate} + {} + {\printdate}}% + \def\bbx@opt@mergedate@true{\bbx@opt@mergedate@compact} % merge date/issue with date label @@ -37,12 +44,9 @@ \setunit*{\addspace}% \printdateextra} {\printlabeldateextra}}}}% - \renewbibmacro*{date}{% - \iflabeldateisdate - {} - {\printdate}}% + \renewbibmacro*{bbx:ifmergeddate}{\iflabeldateisdate}% \renewbibmacro*{issue+date}{% - \iflabeldateisdate + \usebibmacro{bbx:ifmergeddate} {} {\printtext[parens]{% \printfield{issue}% @@ -58,20 +62,18 @@ \iflabeldateisdate {\printdateextra} {\printlabeldateextra}}}}% - \renewbibmacro*{date}{% - \iflabeldateisdate - {} - {\printdate}}% + \renewbibmacro*{bbx:ifmergeddate}{\iflabeldateisdate}% \renewbibmacro*{issue+date}{% - \ifboolexpr{not test {\iffieldundef{issue}} - or not test {\iflabeldateisdate}} + \ifboolexpr{test {\usebibmacro{bbx:ifmergeddate}} + and + test {\iffieldundef{issue}}} + {} {\printtext[parens]{% \printfield{issue}% \setunit*{\addspace}% - \iflabeldateisdate + \usebibmacro{bbx:ifmergeddate} {} - {\printdate}}} - {}% + {\printdate}}}% \newunit}} % merge year-only date with date label @@ -80,19 +82,16 @@ \iffieldundef{labelyear} {} {\printtext[parens]{\printlabeldateextra}}}% - \renewbibmacro*{date}{% + \renewbibmacro*{bbx:ifmergeddate}{% \ifboolexpr{ test {\iflabeldateisdate} and not test {\ifdateshavedifferentprecision{label}{}} - } - {} - {\printdate}}% + }% + }% \renewbibmacro*{issue+date}{% \ifboolexpr{ - test {\iflabeldateisdate} - and - not test {\ifdateshavedifferentprecision{label}{}} + test {\usebibmacro{bbx:ifmergeddate}} and test {\iffieldundef{issue}} } @@ -109,23 +108,18 @@ \iffieldundef{labelyear} {} {\printtext[parens]{\printlabeldateextra}}}% - \renewbibmacro*{date}{% + \renewbibmacro*{bbx:ifmergeddate}{% \ifboolexpr{ test {\iflabeldateisdate} and not test {\ifdateshavedifferentprecision{label}{}} and test {\iffieldundef{extradate}} - } - {} - {\printdate}}% + }% + }% \renewbibmacro*{issue+date}{% \ifboolexpr{ - test {\iflabeldateisdate} - and - not test {\ifdateshavedifferentprecision{label}{}} - and - test {\iffieldundef{extradate}} + test {\usebibmacro{bbx:ifmergeddate}} and test {\iffieldundef{issue}} } @@ -142,7 +136,7 @@ \iffieldundef{labelyear} {} {\printtext[parens]{\printlabeldateextra}}}% - \renewbibmacro*{date}{\printdate}% + \renewbibmacro*{bbx:ifmergeddate}{\@secondoftwo}% \renewbibmacro*{issue+date}{% \printtext[parens]{% \printfield{issue}% @@ -159,6 +153,10 @@ \DeclareNameAlias{editor}{sortname} \DeclareNameAlias{translator}{sortname} +\DeclareNameWrapperAlias{author}{sortname} +\DeclareNameWrapperAlias{editor}{sortname} +\DeclareNameWrapperAlias{translator}{sortname} + \defbibenvironment{bibliography} {\list {} diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def index ef48dc2d932..3cb0eaa94f9 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def @@ -545,7 +545,7 @@ % Generic formats for \printtext and \printfield \DeclareFieldFormat{emph}{\mkbibemph{#1}} -\DeclareFieldFormat{bold}{\textbf{#1}} +\DeclareFieldFormat{bold}{\mkbibbold{#1}} \DeclareFieldFormat{smallcaps}{\textsc{#1}} \DeclareFieldFormat{parens}{\mkbibparens{#1}} \DeclareFieldFormat{brackets}{\mkbibbrackets{#1}} @@ -562,6 +562,8 @@ % Formatting directives for literal lists % ------------------------------------------------------------------ +\DeclareListWrapperFormat{default}{#1} + % The fallback used by \printlist \DeclareListFormat{default}{% @@ -809,7 +811,8 @@ % Formatting directives for name lists % ------------------------------------------------------------------ -\DeclareNameAlias{first-last}{given-family}% legacy alias +\DeclareNameWrapperFormat{default}{#1} + \DeclareNameFormat{given-family}{% \ifgiveninits {\usebibmacro{name:given-family} @@ -824,7 +827,8 @@ {\namepartsuffix}}% \usebibmacro{name:andothers}} -\DeclareNameAlias{last-first}{family-given}% legacy alias +\DeprecateNameFormatWithReplacement{first-last}{given-family} + \DeclareNameFormat{family-given}{% \ifgiveninits {\usebibmacro{name:family-given} @@ -838,8 +842,10 @@ {\namepartprefix} {\namepartsuffix}}% \usebibmacro{name:andothers}} + +\DeprecateNameFormatWithReplacement{last-first}{family-given} + -\DeclareNameAlias{last-first/first-last}{family-given/given-family}% legacy alias \DeclareNameFormat{family-given/given-family}{% \ifnumequal{\value{listcount}}{1} {\ifgiveninits @@ -872,6 +878,8 @@ {\namepartsuffix}}}% \usebibmacro{name:andothers}} +\DeprecateNameFormatWithReplacement{last-first/first-last}{family-given/given-family} + \DeclareNameFormat{initsonly}{% \usebibmacro{name:given-family} {\namepartfamilyi} @@ -1091,6 +1099,8 @@ % The fallback used by \indexlist +\DeclareIndexListWrapperFormat{default}{#1} + \DeclareIndexListFormat{default}{\index{#1}} % ------------------------------------------------------------------ @@ -1102,6 +1112,8 @@ % The fallback used by \indexnames +\DeclareIndexNameWrapperFormat{default}{#1} + \DeclareIndexNameFormat{default}{% \usebibmacro{index:name} {\index} @@ -1756,7 +1768,7 @@ \defbibheading{none}{} \def\abx@MakeMarkcase{\MakeUppercase} -\AtEndPreamble{% +\AtBeginDocument{% \ifcsundef{MakeMarkcase}{}{\def\abx@MakeMarkcase{\MakeMarkcase}}} \ifcase\abx@classtype\relax % article @@ -2966,7 +2978,9 @@ \usebibmacro{publisher+location+date}% \newunit\newblock \usebibmacro{chapter+pages}} - {\printfield[title:hook]{journaltitle}% + {\renewbibmacro*{journal}{% + \printfield[title:hook]{journaltitle}}% + \usebibmacro{journal+issuetitle}% \newunit\newblock \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 fdb30d4b2c5..85de524be78 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty @@ -12,8 +12,8 @@ % particular purpose. % Set up the version strings here -\def\abx@date{2018/03/04} -\def\abx@version{3.11} +\def\abx@date{2018/11/02} +\def\abx@version{3.12} \def\abx@bbxid{\abx@date\space v\abx@version\space biblatex bibliography style (PK/MW)} \def\abx@cbxid{\abx@date\space v\abx@version\space biblatex citation style (PK/MW)} \def\abx@lbxid{\abx@date\space v\abx@version\space biblatex localization (PK/MW)} @@ -22,26 +22,25 @@ % 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.5} % This is not updated by build script as the bbl version % does not necessarily change with the package version. % This is used when checking the .bbl -\def\blx@bblversion{2.9} +\def\blx@bblversion{3.0} \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{biblatex} [\abx@date\space v\abx@version\space programmable bibliographies (PK/MW)] %% Dependencies -\RequirePackage{pdftexcmds} +\RequirePackage{pdftexcmds}[2018/01/30] \RequirePackage{etoolbox} \RequirePackage{keyval} \RequirePackage{kvoptions} \RequirePackage{logreq} \RequirePackage{ifthen} \RequirePackage{url} -\RequirePackage{xstring} %\RequirePackage{trace} \@ifpackagelater{etoolbox}{2010/11/29} @@ -53,15 +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{% @@ -99,7 +89,94 @@ \catcode`\^=7 \def\blx@nl{^^J} +\protected\def\blx@safe@actives{% + \let\blx@if@safe@actives\if@safe@actives + \let\if@safe@actives\iftrue} + +\protected\def\blx@rest@actives{% + \let\if@safe@actives\blx@if@safe@actives} + +%% Early errors and warnings +\protected\def\blx@error#1#2{% + \begingroup + \blx@safe@actives + \PackageError{biblatex}{#1}{#2.}% + \endgroup} + +\protected\def\blx@warning@noline#1{% + \begingroup + \blx@safe@actives + \PackageWarningNoLine{biblatex}{#1}% + \endgroup} +\let\blx@warning\blx@warning@noline +\AtEndOfPackage{% + \protected\def\blx@warning#1{% + \begingroup + \blx@safe@actives + \PackageWarning{biblatex}{#1}% + \endgroup}} + %% Compatibility +\def\blx@packageincompatibility{% + \def\do##1{% + \@ifpackageloaded{##1} + {\ifcsundef{blx@pkgloaded@##1} + {\global\cslet{blx@pkgloaded@##1}\@empty + \blx@error + {Incompatible package '##1'} + {The '##1' package and biblatex are incompatible}} + {}} + {}}% + \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 is special, it gets an option to demote the error to a warning + % remind people to restore \forlistloop + \ifcsdef{blx@noerroretextools} + {\@ifpackageloaded{etextools} + {\ifcsundef{blx@pkgloaded@etextools} + {\global\cslet{blx@pkgloaded@etextools}\@empty + \blx@warning@noline{% + Incompatible package 'etextools' loaded,\MessageBreak + no error is thrown because you defined\MessageBreak + '\string\blx@noerroretextools'.\MessageBreak + 'etextools' redefines '\string\forlistloop', you must\MessageBreak + restore the definition from 'etoolbox'\MessageBreak + before you load biblatex}} + {}} + {}} + {\@ifpackageloaded{etextools} + {\ifcsundef{blx@pkgloaded@etextools} + {\global\cslet{blx@pkgloaded@etextools}\@empty + \blx@error + {Incompatible package 'etextools'} + {The 'etextools' package and biblatex are + incompatible.\MessageBreak + If you must load 'etextools' at all costs, define the command% + \MessageBreak '\string\blx@noerroretextools'}} + {}} + {}}} + +% Call this right here, almost immediately after loading to give sensible +% errors for incompatibilities that arise at loading-time. +% The macro is called again a second time in \AtEndPreamble when all packages +% should be loaded. +% This still can't catch all cases, \usepackage{biblatex}\usepackage{natbib} +% still gives a weird error. +\blx@packageincompatibility + +% people should not be abusing noerroretextools, so warn if it is not needed +\def\blx@packageincompatibility@endpreambleonly{% + \ifcsdef{blx@noerroretextools} + {\@ifpackageloaded{etextools} + {} + {\blx@warning@noline{% + You defined '\string\blx@noerroretextools',\MessageBreak + but 'etextools' is not loaded.\MessageBreak + Please do not define '\string\blx@noerroretextools'\MessageBreak + unless you really need it}}} + {}} \begingroup \catcode`\#=12 @@ -122,35 +199,8 @@ \endgroup \AtEndPreamble{% - \def\do#1{% - \@ifpackageloaded{#1} - {\blx@error - {Incompatible package '#1'} - {The '#1' package and biblatex are incompatible}} - {}}% - \docsvlist{% - amsrefs,apacite,babelbib,backref,bibtopic,bibunits,chapterbib, - cite,citeref,drftcite,footbib,inlinebib,jurabib,mcite,mciteplus, - mlbib,multibbl,multibib,natbib,opcit,overcite,splitbib,ucs}% - \iftoggle{blx@noerroretextools} - {\@ifpackageloaded{etextools} - {\blx@warning@noline{% - Incompatible package 'etextools' loaded,\MessageBreak - no error is thrown because you set\MessageBreak - 'noerroretextools=true'.\MessageBreak - 'etextools' redefines '\string\forlistloop', you will\MessageBreak - need to restore the definition from 'etoolbox'}} - {\blx@warning@noline{% - You set 'noerroretextools=true',\MessageBreak - but 'etextools' is not loaded.\MessageBreak - Please do not set 'noerroretextools' to 'true'\MessageBreak - unless you really need it}}} - {\@ifpackageloaded{etextools} - {\blx@error - {Incompatible package 'etextools'} - {The 'etextools' package and biblatex are incompatible.\MessageBreak - If you must load 'etextools' at all costs, set 'noerroretextools=true'}} - {}}% + \blx@packageincompatibility + \blx@packageincompatibility@endpreambleonly \def\blx@langstrings{}% % Set up sortlocale defaults and default language if babel/polyglossia is not loaded \ifdefstring\blx@sortlocale{auto} @@ -164,15 +214,15 @@ \ifundef\xpg@loaded {\let\xpg@loaded\@empty \let\xpg@vloaded\@empty - \PackageWarningNoLine{biblatex}{Upgrade package 'polyglossia' to > v1.42.0 recommended}} + \blx@warning@noline{Upgrade package 'polyglossia' to > v1.42.0 recommended}} {}% \def\do#1{\blx@langsetup{#1}}% \expandafter\docsvlist\expandafter{\xpg@loaded}% \expandafter\docsvlist\expandafter{\xpg@vloaded}% \ifboolexpr{ - not test {\iftoggle{blx@autolangbib}} + not togl {blx@autolangbib} and - not test {\iftoggle{blx@autolangcite}}} + not togl {blx@autolangcite}} {\blx@mknoautolang} {\blx@mkautolangpoly}} {\@ifpackageloaded{babel} @@ -180,9 +230,9 @@ \def\do#1{\blx@langsetup{#1}}% \expandafter\docsvlist\expandafter{\bbl@loaded}% \ifboolexpr{ - not test {\iftoggle{blx@autolangbib}} + not togl {blx@autolangbib} and - not test {\iftoggle{blx@autolangcite}}} + not togl {blx@autolangcite}} {\blx@mknoautolang} {\blx@mkautolangbabel}} {\blx@mknoautolang}}% @@ -256,12 +306,15 @@ \l@doldold@footnotetext,% ledmac \predefinedfootnotetext,% linguex \@fntORI}% frenchle - \iftoggle{blx@tempa}% ams classes - {\patchcmd\@footnotetext - {\@makefntext} - {\toggletrue{blx@footnote}\@makefntext} - {\togglefalse{blx@tempa}} - {}} + \iftoggle{blx@tempa}% ams classes ... + {\def\do#1{% + \patchcmd#1 + {\@makefntext} + {\toggletrue{blx@footnote}\@makefntext} + {\togglefalse{blx@tempa}} + {}}% + \docsvlist{\@footnotetext,% ams classes standard + \H@@footnotetext}}% hyperref {}% \@ifpackageloaded{bidi}% bidi {\blx@patchbidifootnotes} @@ -378,7 +431,14 @@ {}% \@ifpackagelater{csquotes}{2010/06/09} {} - {\newcommand*{\@quotereset}{}\newcount\@quotereset}} + {\newcommand*{\@quotereset}{}\newcount\@quotereset}% + \newcommand*{\blx@initoquote}{\initoquote}% + \newcommand*{\blx@textooquote}{\textooquote}% + \newcommand*{\blx@textcoquote}{\textcoquote}% + \newcommand*{\blx@initiquote}{\initiquote}% + \newcommand*{\blx@textoiquote}{\textoiquote}% + \newcommand*{\blx@textciquote}{\textciquote}% + \newcommand*{\blx@enquote}{\enquote}} {\@ifpackageloaded{babel} {\blx@warning@noline{% 'babel/polyglossia' detected but 'csquotes' missing.\MessageBreak @@ -390,26 +450,27 @@ \newcount\@quotereset \newcommand*{\@setquotesfcodes}{}% \let\@setquotesfcodes\relax - \newrobustcmd*{\initoquote}{\@quotelevel\@ne}% - \newrobustcmd*{\initiquote}{\@quotelevel\tw@}% - \newrobustcmd*{\textooquote}{``}% - \newrobustcmd*{\textcoquote}{''}% - \newrobustcmd*{\textoiquote}{`\relax}% block ligs - \newrobustcmd*{\textciquote}{'\relax}% block ligs - \newrobustcmd*{\enquote}{\@ifstar\blx@enquote@ii\blx@enquote}% - \def\blx@enquote{% + \newrobustcmd*{\blx@initoquote}{\@quotelevel\@ne}% + \newrobustcmd*{\blx@initiquote}{\@quotelevel\tw@}% + \newrobustcmd*{\blx@textooquote}{``}% + \newrobustcmd*{\blx@textcoquote}{''}% + \newrobustcmd*{\blx@textoiquote}{`\relax}% block ligs + \newrobustcmd*{\blx@textciquote}{'\relax}% block ligs + \newrobustcmd*{\blx@enquote} + {\@ifstar\blx@enquote@iii\blx@enquote@i}% + \def\blx@enquote@i{% \ifnum\@quotelevel>\z@ - \expandafter\blx@enquote@ii + \expandafter\blx@enquote@iii \else - \expandafter\blx@enquote@i + \expandafter\blx@enquote@ii \fi}% - \long\def\blx@enquote@i#1{% - \begingroup\initoquote - \textooquote#1\textcoquote - \endgroup}% \long\def\blx@enquote@ii#1{% - \begingroup\initiquote - \textoiquote#1\textciquote + \begingroup\blx@initoquote + \blx@textooquote#1\blx@textcoquote + \endgroup}% + \long\def\blx@enquote@iii#1{% + \begingroup\blx@initiquote + \blx@textoiquote#1\blx@textciquote \endgroup}% \appto\blx@setsfcodes{% \sfcode`\`=\z@ @@ -448,10 +509,70 @@ % trick showkeys into believing we're havard \let\HAR@checkdef\@empty -%% Allocation - \providecommand{\@gobblefive}[5]{} +\ifundef\pdf@mdfivesum + {\let\blx@mdfivesum\@firstofone + \blx@warning@noline{Command '\string\pdf@mdfivesum' undefined.\MessageBreak + 'labelprefix' may not be able to accept all input}} + {\let\blx@mdfivesum\pdf@mdfivesum} + + +% xstring replacements + +% reverse a given string +% idea by egreg (https://tex.stackexchange.com/users/4427/egreg) +% from https://tex.stackexchange.com/q/36034/ +% relicensed under LPPL according to +% https://tex.meta.stackexchange.com/a/3333/ +\def\blx@revstr#1{% + \ifblank{#1} + {} + {\blx@revstr@l #1\blx@revstr@b@i\blx@revstr@b@ii}} + +\def\blx@revstr@l#1#2\blx@revstr@b@i#3\blx@revstr@b@ii{% + \ifblank{#2} + {#1#3} + {\blx@revstr@l#2\blx@revstr@b@i#1#3\blx@revstr@b@ii}} + +% these tests are inspired by Stephan v. Bechtolsheim's TUGboat article +% https://www.tug.org/TUGboat/tb09-1/tb20bechtolsheim.pdf +% but we need to test for start and end and not for generic substring +% start is easy, delimited arguments help there +\protected\def\blx@ifstrstartswith#1#2{% + \def\blx@ifstrstartswith@i ##1#2##2&{% + \ifblank{##1}}% + \blx@ifstrstartswith@i #1#2&} + +% end is harder, so we reverse everything and apply the start test +\protected\def\blx@ifstrendswith#1#2{% + \begingroup + \edef\blx@tempa{\endgroup + \noexpand\blx@ifstrstartswith{\blx@revstr{#1}}{\blx@revstr{#2}}}% + \blx@tempa} + +% not expandable, so write the result to the macro given in #3 +% {<string>}{<strip>}{<result>} +% <result> will contain the bit of <string> +% after the first occurrence of <strip> +\protected\def\blx@stripfromstartinto#1#2#3{% + \def\blx@stripfromstart@i ##1#2##2&{% + \def#3{##2}}% + \blx@stripfromstart@i #1&} + +% {<string>}{<strip>}{<result>} +% <result> will contain the bit of <string> +% before the last occurence of <strip> +\protected\def\blx@stripfromendinto#1#2#3{% + \begingroup + \edef\blx@tempa{\endgroup + \noexpand\blx@stripfromstartinto{\blx@revstr{#1}}{\blx@revstr{#2}}}% + \blx@tempa{#3}% + \edef#3{\noexpand\blx@revstr{#3}}% + \edef#3{#3}} + +%% Allocation + % Counter to track nested tabularx environemnts so we don't % try to patch the commands more than once below as this undefs some % macros and an error is thrown @@ -486,6 +607,8 @@ \def\theminitems{\the\c@minitems} \newcounter{citecounter} \def\thecitecount{\the\c@citecounter} +\newcounter{maxcitecounter} +\def\themaxcitecounter{\the\c@maxcitecounter} \newcounter{savedcitecounter} \def\thecitecount{\the\c@savedcitecounter} \newcounter{uniquelist} @@ -500,6 +623,8 @@ \def\themaxextratitle{\the\c@maxextratitle} \newcounter{maxextratitleyear} \def\themaxextratitleyear{\the\c@maxextratitleyear} +\newcounter{maxextraname} +\def\themaxextraname{\the\c@maxextraname} \newcounter{maxextradate} \def\themaxextradate{\the\c@maxextradate} \newcounter{maxextraalpha} @@ -524,6 +649,8 @@ \newcount\blx@parenlevel@text \newcount\blx@parenlevel@foot \expandafter\newcount\csname blx@sectionciteorder@0\endcsname +\newcount\blx@entrysetcounter + \def\blx@uniquename{0} \def\blx@uniquelist{0} @@ -531,10 +658,14 @@ \def\blx@minbibnames{0} \def\blx@maxcitenames{0} \def\blx@mincitenames{0} +\def\blx@maxsortnames{0} +\def\blx@minsortnames{0} \def\blx@maxbibnames@type{\blx@maxbibnames} \def\blx@minbibnames@type{\blx@minbibnames} \def\blx@maxcitenames@type{\blx@maxcitenames} \def\blx@mincitenames@type{\blx@mincitenames} +\def\blx@maxsortnames@type{\blx@maxsortnames} +\def\blx@minsortnames@type{\blx@minsortnames} \def\blx@maxalphanames{0} \def\blx@minalphanames{0} \def\blx@maxitems{0} @@ -590,6 +721,7 @@ \newtoggle{blx@labeltitleyear} \newtoggle{blx@labeldateparts} \newtoggle{blx@natbib} +\newtoggle{blx@noroman} \newtoggle{blx@mcite} \newtoggle{blx@loadfiles} \newtoggle{blx@singletitle} @@ -615,14 +747,12 @@ \newtoggle{blx@localnumber} \newtoggle{blx@refcontext} -% Nice command from etextools which causes too many problems if you load -% the whole package -% Don't use it on arbitrary user input as it dies on non-expandable arguments -\newcommand*{\blx@xifempty}[1]{\blx@xifstrcmp{#1}{}} -% {string1}{string2}{true}{false} -\newcommand*{\blx@xifstrcmp}[2]{\csname @% - \ifnum\pdf@strcmp{#1}{#2}=0 first\else second\fi - oftwo\endcsname} +\newcommand*{\blx@xifstrequal}[2]{% + \begingroup + \edef\blx@tempa{% + \endgroup + \noexpand\ifstrequal{#1}{#2}}% + \blx@tempa} % Special fields which need resolution using the information provided by biber \listadd\abx@rfields{labeltitle} @@ -658,6 +788,8 @@ % Initialise some lists which track changing citations/sortingtemplates % etc. between runs \global\let\blx@cites\@empty +\global\let\blx@nocites\@empty +\global\let\blx@directcites\@empty \global\let\blx@refcontexts\@empty \global\let\blx@lastrefcontexts\@empty \global\let\blx@sortingtemplatenames\@empty @@ -680,16 +812,22 @@ % Deprecations \newrobustcmd*{\DeprecateField}[2]{% \csdef{abx@field@#1}{% - \ifcsundef{abx@field@legacy@warning@#1}{\blx@warning@noline{Field '#1' is deprecated. #2}}{}% - \global\cslet{abx@field@legacy@warning@#1}\@empty}}% + \ifcsundef{abx@legacywarning@field@#1} + {\blx@warning@noline{Field '#1' is deprecated. #2}} + {}% + \global\cslet{abx@legacywarning@field@#1}\@empty}}% \newrobustcmd*{\DeprecateList}[2]{% \csdef{abx@list@#1}{% - \ifcsundef{abx@list@legacy@warning@#1}{\blx@warning@noline{List '#1' is deprecated. #2}}{}% - \global\cslet{abx@list@legacy@warning@#1}\@empty}}% + \ifcsundef{abx@legacywarning@list@#1} + {\blx@warning@noline{List '#1' is deprecated. #2}} + {}% + \global\cslet{abx@legacywarning@list@#1}\@empty}} \newrobustcmd*{\DeprecateName}[2]{% \csdef{abx@name@#1}{% - \ifcsundef{abx@name@legacy@warning@#1}{\blx@warning@noline{Name '#1' is deprecated. #2}}{}% - \global\cslet{abx@name@legacy@warning@#1}\@empty}}% + \ifcsundef{abx@legacywarning@name@#1} + {\blx@warning@noline{Name '#1' is deprecated. #2}} + {}% + \global\cslet{abx@legacywarning@name@#1}\@empty}} \let\blx@aliasfields\@empty @@ -698,39 +836,39 @@ \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\cslet{abx@field@legacy@warning@#1}\@empty}}}} + \csuse{abx@field@#2}% + \ifcsundef{abx@legacywarning@field@#1} + {\blx@warning@noline{Field '#1' is deprecated.\MessageBreak + Please use '#2' instead.\MessageBreak + Using '#2' now}} + {}% + \global\cslet{abx@legacywarning@field@#1}\@empty}}}} \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\cslet{abx@list@legacy@warning@#1}\@empty}}}} + \csuse{abx@list@#2}% + \ifcsundef{abx@legacywarning@list@#1} + {\blx@warning@noline{List '#1' is deprecated.\MessageBreak + Please use '#2' instead.\MessageBreak + Using '#2' now}} + {}% + \global\cslet{abx@legacywarning@list@#1}\@empty}}}} \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\cslet{abx@name@legacy@warning@#1}\@empty}}}} + \csuse{abx@name@#2}% + \ifcsundef{abx@legacywarning@name@#1} + {\blx@warning@noline{Name '#1' is deprecated.\MessageBreak + Please use '#2' instead.\MessageBreak + Using '#2' now}} + {}% + \global\cslet{abx@legacywarning@name@#1}\@empty}}}} %% Initialisation \def\blx@blxinit{% @@ -760,13 +898,6 @@ {}} %% Auxiliary commands -\protected\def\blx@safe@actives{% - \let\blx@if@safe@actives\if@safe@actives - \let\if@safe@actives\iftrue} - -\protected\def\blx@rest@actives{% - \let\if@safe@actives\blx@if@safe@actives} - \protected\def\blx@regimc#1{% \xappto\blx@blxinit{% \let\noexpand#1\expandafter\noexpand\csname @@ -980,27 +1111,7 @@ ) }} -%% User feedback - -\protected\def\blx@error#1#2{% - \begingroup - \blx@safe@actives - \PackageError{biblatex}{#1}{#2.}% - \endgroup} - -\protected\def\blx@warning@noline#1{% - \begingroup - \blx@safe@actives - \PackageWarningNoLine{biblatex}{#1}% - \endgroup} -\let\blx@warning\blx@warning@noline -\AtEndOfPackage{ - \protected\def\blx@warning#1{% - \begingroup - \blx@safe@actives - \PackageWarning{biblatex}{#1}% - \endgroup}} - +%% More user feedback \protected\def\blx@warning@entry#1{% \ifdef\abx@field@entrykey {\blx@warning{#1\MessageBreak at entry '\abx@field@entrykey'}} @@ -1012,7 +1123,7 @@ \PackageInfo{biblatex}{#1\@gobble}% \endgroup} \let\blx@info\blx@info@noline -\AtEndOfPackage{ +\AtEndOfPackage{% \protected\def\blx@info#1{% \begingroup \blx@safe@actives @@ -1160,7 +1271,8 @@ \blx@warning{Conflicting options.\MessageBreak#1}} \def\blx@warn@badoptdt#1{% - \blx@warning{Invalid option datatype '#1'.\MessageBreak Defaulting to 'boolean'}} + \blx@warning{Invalid option datatype '#1'.\MessageBreak + Defaulting to 'boolean'}} \def\blx@warn@depropt#1{% \blx@warning{Deprecated option.\MessageBreak Ignoring '#1'}} @@ -2046,6 +2158,8 @@ \def\blx@imc@ifbibmacroundef#1{% \ifcsundef{abx@macro@#1}} +\def\ifbibmacroundef{\blx@imc@ifbibmacroundef} + % {<field>} \def\blx@imc@thefield#1{\csuse{abx@field@#1}} @@ -2732,7 +2846,7 @@ \blx@imc@iffieldundef{#1} {\@secondoftwo} {\expandafter\expandafter - \expandafter\ifinteger + \expandafter\blx@imc@ifinteger \expandafter\expandafter \expandafter{\csname abx@field@#1\endcsname}}} @@ -3246,12 +3360,15 @@ {\blx@declaredelimclear} {\blx@declaredelim}} -\newrobustcmd*{\blx@declaredelimclear}[3][]{% - \ifcsvoid{blx@declaredelimcontexts@#2} +\def\blx@cleardelim#1{% + \ifcsvoid{blx@declaredelimcontexts@#1} {} - {\def\do##1{\csundef{blx@printdelim@##1@#2}}% - \dolistcsloop{blx@declaredelimcontexts@#2}}% - \cslet{blx@declaredelimcontexts@#2}\@empty + {\def\do##1{\csundef{blx@printdelim@##1@#1}}% + \dolistcsloop{blx@declaredelimcontexts@#1}}% + \cslet{blx@declaredelimcontexts@#1}\@empty} + +\newrobustcmd*{\blx@declaredelimclear}[3][]{% + \blx@cleardelim{#2}% \ifblank{#1} {\blx@declaredelim{#2}{#3}} {\blx@declaredelim[#1]{#2}{#3}}} @@ -3272,32 +3389,64 @@ \csdef{#1##1}{#4}}% \forcsvlist{\do@i}{#3}} -% *[<contextname, ...>]{<alias>}{<delim>} +% *[<alias context, ...>]{<alias>}[<delim context>]{<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}}} + {\blx@declaredelimalias@expl} + {\blx@declaredelimalias@auto}} -\newrobustcmd*{\blx@declaredelimaliasauto}[2]{% - \blx@declaredelimalias@i{}{#1}{#2}% +\newrobustcmd*{\blx@declaredelimalias@auto}[2]{% + \blx@cleardelim{#1}% + \blx@declaredelimalias@def{}{#1}{}{#2}% \ifcsvoid{blx@declaredelimcontexts@#2} {} {\def\do##1{% - \blx@declaredelimalias@i{blx@printdelim@##1@}{#1}{#2}}% + \blx@declaredelimalias@def + {blx@printdelim@##1@}{#1}{blx@printdelim@##1@}{#2}}% \dolistcsloop{blx@declaredelimcontexts@#2}}} -\def\blx@declaredelimalias@i#1#2#3{% +\def\blx@declaredelimalias@expl{% + \@ifnextchar[%] + {\blx@declaredelimalias@expl@i} + {\blx@declaredelimalias@expl@i[]}} + +\def\blx@declaredelimalias@expl@i[#1]#2{% + \@ifnextchar[%] + {\blx@declaredelimalias@expl@iii{#1}{#2}} + {\blx@declaredelimalias@expl@ii{#1}{#2}}} + +\def\blx@declaredelimalias@expl@ii#1#2#3{% + \ifblank{#1} + {\blx@declaredelimalias@def{}{#2}{}{#3}} + {\def\do##1{% + \blx@declaredelimalias@def + {blx@printdelim@##1@}{#2}{blx@printdelim@##1@}{#3}}% + \docsvlist{#1}}} + +\def\blx@declaredelimalias@expl@iii#1#2[#3]#4{% + \ifblank{#1} + {\ifblank{#3} + {\blx@declaredelimalias@def{}{#2}{}{#4}} + {\blx@declaredelimalias@def{}{#2}{blx@printdelim@#3@}{#4}}} + {\ifblank{#3} + {\def\do##1{% + \blx@declaredelimalias@def + {blx@printdelim@##1@}{#2}{}{#4}}} + {\def\do##1{% + \blx@declaredelimalias@def + {blx@printdelim@##1@}{#2}{blx@printdelim@#3@}{#4}}}% + \docsvlist{#1}}} + +\def\blx@declaredelimalias@def#1#2#3#4{% \ifcsdef{#1#2} {\blx@inf@delimdeclare{#2}{#1}} {}% - \csdef{#1#2}{\csuse{#1#3}}} + \ifblank{#1} + {} + {\ifinlistcs{#1}{blx@declaredelimcontexts@#2} + {} + {\listcsadd{blx@declaredelimcontexts@#2}{#1}}}% + \csdef{#1#2}{\ifcsundef{#3#4}{\csuse{#4}}{\csuse{#3#4}}}} \def\blx@delimcontext{none} \newcommand*{\printdelim}[2][]{% @@ -3320,7 +3469,7 @@ {#1}} \newcommand*{\DeclareDelimcontextAlias}[2]{% - \csgdef{blx@delimcontextalias@#1}{#2}} + \csdef{blx@delimcontextalias@#1}{#2}} \newrobustcmd*{\AtUsedriver}{% \@ifstar @@ -3483,6 +3632,10 @@ or (not test {\ifdatehastime{#1}} and test {\ifdatehastime{#2}})}} +\def\blx@imc@ifdateyearsequal#1#2{% + \ifboolexpr{ test {\iffieldsequal{#1year}{#2year}} + and test {\iffieldsequal{#1dateera}{#2dateera}}}} + \blx@regimcs{% \ifdriver \thefield \strfield \csfield \usefield \thelist \strlist \thename \strname \clearfield \clearlist \clearname \restorefield \restorelist \restorename @@ -3490,7 +3643,7 @@ \ifciteseen \ifciteibid \ifciteidem \ifopcit \ifloccit \ifcurrentfield \ifcurrentlist \ifcurrentname \ifentrytype \iffieldequalcs \iffieldequals \iffieldequalstr \iffieldsequal - \ifbibmacroundef \iffieldundef \iffieldxref \iflistequalcs \iflistequals + \iffieldundef \iffieldxref \iflistequalcs \iflistequals \iflistsequal \iflistundef \iflistxref \ifmorenames \ifmoreitems \iffirstcitekey \iflastcitekey \ifnameequalcs \ifnameequals \ifnamesequal \ifnameundef \ifnamexref @@ -3500,6 +3653,7 @@ \iffieldint \iffieldnum \iffieldnums \iffieldpages \iflabeldateisdate \ifdatehasyearonlyprecision \ifdatehastime \ifdateshavedifferentprecision + \ifdateyearsequal \mkpageprefix \mkpagetotal \newblock \newunit \setunit \printunit \finentry} @@ -3515,6 +3669,7 @@ \def\ifcrossrefsource{\iftoggle{abx@bool@crossrefsource}}% \def\ifxrefsource{\iftoggle{abx@bool@xrefsource}}% \def\ifsingletitle{\iftoggle{abx@bool@singletitle}}% + \def\ifnocite{\iftoggle{abx@bool@nocite}}% \def\ifuniquetitle{\iftoggle{abx@bool@uniquetitle}}% \def\ifuniquebaretitle{\iftoggle{abx@bool@uniquebaretitle}}% \def\ifuniquework{\iftoggle{abx@bool@uniquework}}% @@ -3851,6 +4006,24 @@ {\blx@defformat\blx@defplainformat{fid}*} {\blx@defformat\blx@defplainformat{fid}{}}} +\newrobustcmd*{\DeclareNameWrapperFormat}{% + \@ifstar + {\blx@defformat\blx@defnameformat{nwd}*} + {\blx@defformat\blx@defnameformat{nwd}{}}} +\newrobustcmd*{\DeclareIndexNameWrapperFormat}{% + \@ifstar + {\blx@defformat\blx@defnameformat{nxd}*} + {\blx@defformat\blx@defnameformat{nxd}{}}} + +\newrobustcmd*{\DeclareListWrapperFormat}{% + \@ifstar + {\blx@defformat\blx@defplainformat{lwd}*} + {\blx@defformat\blx@defplainformat{lwd}{}}} +\newrobustcmd*{\DeclareIndexListWrapperFormat}{% + \@ifstar + {\blx@defformat\blx@defplainformat{lxd}*} + {\blx@defformat\blx@defplainformat{lxd}{}}} + % {<macro>}{<class>}{<*>} \def\blx@defformat#1#2#3{% \@ifnextchar[%] @@ -3936,15 +4109,21 @@ \newrobustcmd*{\savefieldformat}[2][*]{\blx@save{abx@ffd@#1@#2}} \newrobustcmd*{\savelistformat}[2][*]{\blx@save{abx@lfd@#1@#2}} \newrobustcmd*{\savenameformat}[2][*]{\blx@save{abx@nfd@#1@#2}} +\newrobustcmd*{\savelistwrapperformat}[2][*]{\blx@save{abx@lwd@#1@#2}} +\newrobustcmd*{\savenamewrapperformat}[2][*]{\blx@save{abx@nwd@#1@#2}} \newrobustcmd*{\restorefieldformat}[2][*]{\blx@restore{abx@ffd@#1@#2}} \newrobustcmd*{\restorelistformat}[2][*]{\blx@restore{abx@lfd@#1@#2}} \newrobustcmd*{\restorenameformat}[2][*]{\blx@restore{abx@nfd@#1@#2}} +\newrobustcmd*{\restorelistwrapperformat}[2][*]{\blx@restore{abx@lwd@#1@#2}} +\newrobustcmd*{\restorenamewrapperformat}[2][*]{\blx@restore{abx@nwd@#1@#2}} % [<entrytype>]{<name>}{<true>}{<false>} \newrobustcmd*{\iffieldformatundef}[2][*]{\ifcsundef{abx@ffd@#1@#2}} \newrobustcmd*{\iflistformatundef}[2][*]{\ifcsundef{abx@lfd@#1@#2}} \newrobustcmd*{\ifnameformatundef}[2][*]{\ifcsundef{abx@nfd@#1@#2}} +\newrobustcmd*{\iflistwrapperformatundef}[2][*]{\ifcsundef{abx@lwd@#1@#2}} +\newrobustcmd*{\ifnamewrapperformatundef}[2][*]{\ifcsundef{abx@nwd@#1@#2}} % [<entrytype>]{<alias>}[<entrytype>]{<name>} \newrobustcmd*{\DeclareNameAlias}{\blx@defalias{nfd}} @@ -3956,6 +4135,62 @@ \newrobustcmd*{\DeclareFieldAlias}{\blx@defalias{ffd}} \newrobustcmd*{\DeclareIndexFieldAlias}{\blx@defalias{fid}} +\newrobustcmd*{\DeclareNameWrapperAlias}{\blx@defalias{nwd}} +\newrobustcmd*{\DeclareIndexNameWrapperAlias}{\blx@defalias{nxd}} + +\newrobustcmd*{\DeclareListWrapperAlias}{\blx@defalias{lwd}} +\newrobustcmd*{\DeclareIndexListWrapperAlias}{\blx@defalias{lxd}} + +% #1: internal type signature, #2: type text for warning +% #3 #4 #5 #6 +% [aliastype]{aliasname}[formattype]{formatname} +\def\blx@deprecateformat#1#2{% + \@ifnextchar[%] + {\blx@deprecateformat@i{#1}{#2}} + {\blx@deprecateformat@i{#1}{#2}[*]}} +\def\blx@deprecateformat@i#1#2[#3]#4{% + \@ifnextchar[%] + {\blx@deprecateformat@ii{#1}{#2}{#3}{#4}} + {\blx@deprecateformat@ii{#1}{#2}{#3}{#4}[*]}} +\def\blx@deprecateformat@ii#1#2#3#4[#5]#6{% + \blx@safe@actives + \afterassignment\blx@rest@actives + \csdef{abx@#1@#3@#4}{% + \ifcsundef{abx@legacywarning@#1@#3@#4} + {\global\cslet{abx@legacywarning@#1@#3@#4}\@empty + \blx@warning@noline{% + #2 '#4' deprecated.\MessageBreak + Please use '#6' instead.\MessageBreak + Using '#6' now}} + {}% + \csname abx@#1@#5@#6\endcsname}} + +% [<entrytype>]{<alias>}[<entrytype>]{<name>} +\newrobustcmd*{\DeprecateNameFormatWithReplacement}{% + \blx@deprecateformat{nfd}{Name format}} +\newrobustcmd*{\DeprecateIndexNameFormatWithReplacement}{% + \blx@deprecateformat{nid}{Index name format}} + +\newrobustcmd*{\DeprecateListFormatWithReplacement}{% + \blx@deprecateformat{lfd}{List format}} +\newrobustcmd*{\DeprecateIndexListFormatWithReplacement}{% + \blx@deprecateformat{lid}{Index list format}} + +\newrobustcmd*{\DeprecateFieldFormatWithReplacement}{% + \blx@deprecateformat{ffd}{Field format}} +\newrobustcmd*{\DeprecateIndexFieldFormatWithReplacement}{% + \blx@deprecateformat{fid}{Index field format}} + +\newrobustcmd*{\DeprecateNameWrapperFormatWithReplacement}{% + \blx@deprecateformat{nwd}{Name wrapper format}} +\newrobustcmd*{\DeprecateIndexNameWrapperFormatWithReplacement}{% + \blx@deprecateformat{nxd}{Index name wrapper format}} + +\newrobustcmd*{\DeprecateListWrapperFormatWithReplacement}{% + \blx@deprecateformat{lwd}{List wrapper format}} +\newrobustcmd*{\DeprecateIndexListWrapperFormatWithReplacement}{% + \blx@deprecateformat{lxd}{Index list wrapper format}} + % [<format>]{<text>} \newrobustcmd{\blx@imc@printtext}[2][]{% \ifblank{#2} @@ -4032,13 +4267,16 @@ \def\blx@printnames#1#2#3#4{% \blx@imc@ifnameundef{#4} {\blx@nounit} - {\blx@getformat\blx@theformat{nfd}{#1}{#4}% - \ifdefvoid\blx@theformat + {\blx@getformat\blx@thewrapperformat{nwd}{#1}{#4}% + \ifdefvoid\blx@thewrapperformat {\blx@nounit} - {\blx@begunit - \blx@namesetup{#2}{#3}{#4}% - \expandafter\blx@nameparser\blx@thedata{}&% - \blx@endunit}}} + {\blx@getformat\blx@theformat{nfd}{#1}{#4}% + \ifdefvoid\blx@theformat + {\blx@nounit} + {\blx@begunit + \blx@namesetup{#2}{#3}{#4}% + \blx@thewrapperformat{\expandafter\blx@nameparser\blx@thedata{}&}% + \blx@endunit}}}} \def\blx@namesetup#1#2#3{% \def\currentname{#3}% @@ -4119,14 +4357,17 @@ \def\blx@indexnames#1#2#3#4{% \blx@imc@ifnameundef{#4} {} - {\blx@getformat\blx@theformat{nid}{#1}{#4}% - \ifdefvoid\blx@theformat + {\blx@getformat\blx@thewrapperformat{nxd}{#1}{#4}% + \ifdefvoid\blx@thewrapperformat {} - {\begingroup - \blx@namesetup{#2}{#3}{#4}% - \blx@indexnamesetup - \expandafter\blx@nameparser\blx@thedata{}&% - \endgroup}}} + {\blx@getformat\blx@theformat{nid}{#1}{#4}% + \ifdefvoid\blx@theformat + {} + {\begingroup + \blx@namesetup{#2}{#3}{#4}% + \blx@indexnamesetup + \expandafter\blx@nameparser\blx@thedata{}&% + \endgroup}}}} \def\blx@indexnamesetup{% \let\bibinitperiod\bibindexinitperiod @@ -4154,6 +4395,7 @@ % {name opts}{nameparts} \long\def\blx@nameparser@i#1#2{% + \begingroup \ifblank{#1} {} {\setkeys{blx@opt@name}{#1}}% @@ -4166,7 +4408,8 @@ % Still pass the nameparts forward for backwards compat % When \nameparts is finally removed, remove the "{2}" and remove the % arg to \blx@defformat@d in def of \blx@defnameformat - \blx@theformat{#2}} + \blx@theformat{#2}% + \endgroup} \long\def\blx@namebreak#1&{} @@ -4178,13 +4421,16 @@ \def\blx@printlist#1#2#3#4{% \blx@imc@iflistundef{#4} {\blx@nounit} - {\blx@getformat\blx@theformat{lfd}{#1}{#4}% - \ifdefvoid\blx@theformat + {\blx@getformat\blx@thewrapperformat{lwd}{#1}{#4}% + \ifdefvoid\blx@thewrapperformat {\blx@nounit} - {\blx@begunit - \blx@listsetup{#2}{#3}{#4}% - \expandafter\blx@listparser\blx@thedata{}&% - \blx@endunit}}} + {\blx@getformat\blx@theformat{lfd}{#1}{#4}% + \ifdefvoid\blx@theformat + {\blx@nounit} + {\blx@begunit + \blx@listsetup{#2}{#3}{#4}% + \blx@thewrapperformat{\expandafter\blx@listparser\blx@thedata{}&}% + \blx@endunit}}}} \def\blx@listsetup#1#2#3{% \def\currentlist{#3}% @@ -4221,13 +4467,16 @@ \def\blx@indexlist#1#2#3#4{% \blx@imc@iflistundef{#4} {} - {\blx@getformat\blx@theformat{lid}{#1}{#4}% - \ifdefvoid\blx@theformat + {\blx@getformat\blx@thewrapperformat{lxd}{#1}{#4}% + \ifdefvoid\blx@thewrapperformat {} - {\begingroup - \blx@listsetup{#2}{#3}{#4}% - \expandafter\blx@listparser\blx@thedata{}&% - \endgroup}}} + {\blx@getformat\blx@theformat{lid}{#1}{#4}% + \ifdefvoid\blx@theformat + {} + {\begingroup + \blx@listsetup{#2}{#3}{#4}% + \expandafter\blx@listparser\blx@thedata{}&% + \endgroup}}}} % {<item1>}{<item2>}{...} \long\def\blx@listparser#1{% @@ -4285,7 +4534,8 @@ \blx@getdata{#1}% \blx@setoptions@type\abx@field@entrytype \blx@setoptions@entry - \def\abx@field@entrysetcount{1}% + \global\blx@entrysetcounter\@ne + \edef\abx@field@entrysetcount{\the\blx@entrysetcounter}% \blx@execute \blx@beglangbib \blx@begunit @@ -4304,9 +4554,10 @@ {\begingroup \blx@resetdata \blx@getdata{#1}% - \blx@entrysetcount \blx@setoptions@type\abx@field@entrytype \blx@setoptions@entry + \global\advance\blx@entrysetcounter\@ne + \edef\abx@field@entrysetcount{\the\blx@entrysetcounter}% \addtocounter{instcount}\@ne \blx@execute \blx@beglangbib @@ -4820,6 +5071,7 @@ \do{langgalician}% \do{langgerman}% \do{langgreek}% + \do{langhungarian}% \do{langitalian}% \do{langjapanese}% \do{langlatin}% @@ -4848,6 +5100,7 @@ \do{fromgalician}% \do{fromgerman}% \do{fromgreek}% + \do{fromhungarian}% \do{fromitalian}% \do{fromjapanese}% \do{fromlatin}% @@ -5081,33 +5334,39 @@ % .lbx files must be read with one of the two following commands, % do not use \blx@inputonce. Only the commands here make sure that the file % is read as many times as necessary. +% blx@file@lbx@simple@#1 only blocks the file being added to the file list +% blx@file@lbx@once@#1 blocks a file from being loaded again by the input-once +% routine % {<file>}{<message>}{<preload>}{<postload>}{<success>}{<failure>} \protected\long\def\blx@lbx@input@handler@simple#1#2#3#4#5#6{% \blx@info@noline{Trying to load #2..}% \IfFileExists{#1} {\blx@info@noline{... file '#1' found}% #3\@@input\@filef@und#4#5% - \ifcsundef{blx@file@lbx@#1} + \ifcsundef{blx@file@lbx@simple@#1} {\listxadd\blx@list@req@stat{#1}% \@addtofilelist{#1}% - \global\cslet{blx@file@lbx@#1}\@empty} + \global\cslet{blx@file@lbx@simple@#1}\@empty} {}} {\blx@info@noline{... file '#1' not found}#6}} % {<file>}{<message>}{<preload>}{<postload>}{<success>}{<failure>} \protected\long\def\blx@lbx@input@handler@once#1#2#3#4#5#6{% - \ifcsundef{blx@file@lbx@#1} + \ifcsundef{blx@file@lbx@once@#1} {\blx@info@noline{Trying to load #2..}% - \global\cslet{blx@file@lbx@#1}\@empty \IfFileExists{#1} {\blx@info@noline{... file '#1' found}% #3\@@input\@filef@und#4#5% - \listxadd\blx@list@req@stat{#1}% - \@addtofilelist{#1}} - {\blx@info@noline{... file '#1' not found}#6}} + \ifcsundef{blx@file@lbx@simple@#1} + {\listxadd\blx@list@req@stat{#1}% + \@addtofilelist{#1}} + {}} + {\blx@info@noline{... file '#1' not found}#6}% + \global\cslet{blx@file@lbx@once@#1}\@empty + \global\cslet{blx@file@lbx@simple@#1}\@empty} {#5}} -\def\blx@lbx@input@process@strings#1{ +\def\blx@lbx@input@process@strings#1{% \global\cslet{abx@strings@#1}\@empty \def\InheritBibliographyStrings{% \blx@letbibstrings{#1}}% @@ -5129,7 +5388,7 @@ \blx@lbx@input@process@extras{#1}% \def\DeclareHyphenationExceptions{\blx@hyphexcept{#1}}} -\def\blx@lbx@input@postprocess@strings#1{ +\def\blx@lbx@input@postprocess@strings#1{% \csuse{blx@hook@strings@#1}} \def\blx@lbx@input@postprocess@extras#1{% @@ -5220,39 +5479,42 @@ \mktimerange{12h}} \expandafter\newrobustcmd\expandafter*\csname mktimerange24hcomp\endcsname[1]{% - \iffieldundef{#1hour}{} + \iffieldundef{#1hour} + {} {\ifboolexpr{test {\iffieldundef{#1endhour}} or test {\iffieldequalstr{#1endhour}{}}} {\mktimerange{24h}{#1}} {\iffieldsequal{#1hour}{#1endhour} - % 14:xx:xx 14:xx:xx - {\iffieldsequal{#1minute}{#1endminute} - % 14:13:xx 14:13:xx - {\toggletrue{blx@seconds}% - \printtext[#1time]{\csuse{mkbibtime24h}{#1hour}{#1minute}{#1second}{}% - \bibtimerangesep - \csuse{mkbibtime24h}{}{}{#1endsecond}{}}} - % 14:13:xx 14:14:xx - {\toggletrue{blx@seconds}% - \printtext[#1time]{\csuse{mkbibtime24h}{#1hour}{#1minute}{}{}% - \bibtimerangesep - \csuse{mkbibtime24h}{}{#1endminute}{}{}}}} - % 14:xx:xx 15:xx:xx - {\mktimerange{24h}{#1}}}}} + % 14:xx:xx 14:xx:xx + {\iffieldsequal{#1minute}{#1endminute} + % 14:13:xx 14:13:xx + {\toggletrue{blx@seconds}% + \printtext[#1time]{% + \csuse{mkbibtime24h}{#1hour}{#1minute}{#1second}{}% + \bibtimerangesep + \csuse{mkbibtime24h}{}{}{#1endsecond}{}}} + % 14:13:xx 14:14:xx + {\toggletrue{blx@seconds}% + \printtext[#1time]{\csuse{mkbibtime24h}{#1hour}{#1minute}{}{}% + \bibtimerangesep + \csuse{mkbibtime24h}{}{#1endminute}{}{}}}} + % 14:xx:xx 15:xx:xx + {\mktimerange{24h}{#1}}}}} % {<24h|24hcomp|12h>}{<datetype>} \newrobustcmd*{\mktimerange}[2]{% - \iffieldundef{#2hour}{} + \iffieldundef{#2hour} + {\blx@nounit} {\blx@timepre{#2}{}% \printtext[#2time]{\csuse{mkbibtime#1}{#2hour}{#2minute}{#2second}{#2timezone}% - \iffieldundef{#2endhour} - {} - {\blx@timepre{#2}{end}% - \iffieldequalstr{#2endhour}{} - {\mbox{\bibtimerangesep}} - {\bibtimerangesep - \csuse{mkbibtime#1}{#2endhour}{#2endminute}{#2endsecond}{#2endtimezone}}}}}} + \iffieldundef{#2endhour} + {} + {\blx@timepre{#2}{end}% + \iffieldequalstr{#2endhour}{} + {\mbox{\bibtimerangesep}} + {\bibtimerangesep + \csuse{mkbibtime#1}{#2endhour}{#2endminute}{#2endsecond}{#2endtimezone}}}}}} % {<datetype>}{''|end} \newrobustcmd*{\blx@timepre}[2]{% @@ -5266,7 +5528,7 @@ \begingroup \blx@metadateinfo{#2}% \iffieldundef{#2year} - {} + {\blx@nounit} {\printtext[#2date]{% \datecircaprint % Such a season component can only come from an ISO8601 season which replaces @@ -5297,20 +5559,20 @@ \begingroup \blx@metadateinfo{#2}% \iffieldundef{#2year} - {} + {\blx@nounit} {\printtext[#2date]{% \datecircaprint % Such a season component can only come from an ISO8601 season which replaces % a normal month so if it exists, we know that a normal date print is ruled out \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} + {\ifdateyearsequal{#2}{#2end} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{}{}{#2day}} {\csuse{mkbibdate#1}{}{#2month}{#2day}}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \iffieldsequal{#2dateera}{#2enddateera}{} - {\dateeraprint{#2year}}}} - {\iffieldsequal{#2year}{#2endyear} + {\dateeraprint{#2year}}}} + {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibseasondate#1}{}{#2season}} {\csuse{mkbibseasondate#1}{#2year}{#2season}% \iffieldsequal{#2dateera}{#2enddateera}{} @@ -5333,7 +5595,7 @@ \begingroup \blx@metadateinfo{#2}% \iffieldundef{#2year} - {} + {\blx@nounit} {\printtext[#2date]{% \datecircaprint % Such a season component can only come from an ISO8601 season which replaces @@ -5367,23 +5629,23 @@ \begingroup \blx@metadateinfo{#2}% \iffieldundef{#2year} - {} + {\blx@nounit} {\printtext[#2date]{% \datecircaprint % Such a season component can only come from an ISO8601 season which replaces % a normal month so if it exists, we know that a normal date print is ruled out \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} + {\ifdateyearsequal{#2}{#2end} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{}{}{#2day}} {\csuse{mkbibdate#1}{}{#2month}{#2day}}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \iffieldsequal{#2dateera}{#2enddateera}{} {\dateeraprint{#2year}}}} - {\iffieldsequal{#2year}{#2endyear} + {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibseasondate#1}{}{#2season}} {\csuse{mkbibseasondate#1}{#2year}{#2season}% - \iffieldsequal{#2dateera}{#2enddateera}{} + \iffieldsequal{#2dateera}{#2enddateera}{} {\dateeraprint{#2year}}}}% \dateuncertainprint \iffieldundef{#2endyear} @@ -5417,7 +5679,7 @@ \blx@imc@clearfield{#1endminute}% \blx@imc@clearfield{#1endsecond}% \blx@imc@clearfield{#1endtimezone}% - \iffieldsequal{#1year}{#1endyear} + \ifdateyearsequal{#1}{#1end} {\blx@imc@clearfield{#1endyear}} {}% \mkdaterangefull{short}{#1}} @@ -5427,7 +5689,7 @@ \begingroup \blx@metadateinfo{#1}% \iffieldundef{#1year} - {} + {\blx@nounit} {\printtext[#1date]{% \datecircaprint % Such a season component can only come from an ISO8601 season which replaces @@ -5459,7 +5721,7 @@ \begingroup \blx@metadateinfo{#1}% \iffieldundef{#1year} - {} + {\blx@nounit} {\printtext[#1date]{% \datecircaprint % Such a season component can only come from an ISO8601 season which replaces @@ -5509,7 +5771,7 @@ \blx@imc@clearfield{#1endminute}% \blx@imc@clearfield{#1endsecond}% \blx@imc@clearfield{#1endtimezone}% - \iffieldsequal{#1year}{#1endyear} + \ifdateyearsequal{#1}{#1end} {\blx@imc@clearfield{#1endyear}} {}% \mkdaterangefullextra{short}{#1}} @@ -5521,8 +5783,8 @@ and not test {\iffieldundef{#1#2hour}}} {\blx@timepre{#1}{#2}% - \printtext{\bibdatetimesep}% - \printtext[#1time]{\csuse{mkbibtime\csuse{blx@timeformat@#1time}}{#1#2hour}{#1#2minute}{#1#2second}{#1#2timezone}}} + \printtext{\bibdatetimesep}% + \printtext[#1time]{\csuse{mkbibtime\csuse{blx@timeformat@#1time}}{#1#2hour}{#1#2minute}{#1#2second}{#1#2timezone}}} {}} \newrobustcmd*{\mkdaterangeiso}[1]{% @@ -5530,7 +5792,7 @@ \blx@metadateinfo{#1}% \def\bibdatetimesep{T}% \iffieldundef{#1year} - {} + {\blx@nounit} {\printtext[#1date]{% \blx@isodate{#1}{}% \ifboolexpr{% @@ -5562,7 +5824,7 @@ \blx@metadateinfo{#1}% \def\bibdatetimesep{T}% \iffieldundef{#1year} - {} + {\blx@nounit} {\printtext[#1date]{% \blx@isodate[extradate]{#1}{}% \ifboolexpr{% @@ -5601,10 +5863,10 @@ {\hyphen\blx@seasonmap{\thefield{#2#3season}}}} \def\blx@seasonmap#1{% - \blx@xifstrcmp{#1}{spring}{21} - {\blx@xifstrcmp{#1}{summer}{22} - {\blx@xifstrcmp{#1}{autumn}{23} - {\blx@xifstrcmp{#1}{winter}{24}{}}}}} + \blx@xifstrequal{#1}{spring}{21} + {\blx@xifstrequal{#1}{summer}{22} + {\blx@xifstrequal{#1}{autumn}{23} + {\blx@xifstrequal{#1}{winter}{24}{}}}}} \newrobustcmd*{\blx@isotime}[2]{% \blx@imc@forcezerosmdt{\thefield{#1#2hour}}% @@ -5614,6 +5876,11 @@ {\mkbibtimezone{\thefield{#1#2timezone}}} {}} +% some sane defaults for bibliography extras +% many of these should be redefined in the .lbx files +% all .lbx files should have date and time handling, so the fallback values +% issue a warning to make people aware of the deficiency in their file +% \mkbibordinal should also only be used if it is defined, so it warns as well % times \newrobustcmd*{\bibtimesep}{:} \newrobustcmd*{\bibtimerangesep}{\textendash} @@ -5633,19 +5900,132 @@ \newrobustcmd*{\bibrangedash}{\textendash} \newrobustcmd*{\bibrangessep}{,\space} % formatters -\newrobustcmd*{\mkbibtimezone}[1]{\blx@xifstrcmp{#1}{UTC}{\bibutctimezone}{#1}} -\newrobustcmd*{\mkbibdatelong}[3]{} -\newrobustcmd*{\mkbibdateshort}[3]{} -\newrobustcmd*{\mkbibseasondateshort}[2]{} -\newrobustcmd*{\mkbibseasondatelong}[2]{} -\expandafter\newrobustcmd\expandafter*\csname mkbibtime24h\endcsname[4]{} -\expandafter\newrobustcmd\expandafter*\csname mkbibtime12h\endcsname[4]{} +\newrobustcmd*{\mkbibtimezone}[1]{\blx@xifstrequal{#1}{Z}{\bibutctimezone}{#1}} +% you should never end up needing the next few definitions +% but it is safer to do something than just swallow the input +\newrobustcmd*{\mkbibdatelong}[3]{% + \blx@warning@noline{% + Using fallback definition for \string\mkbibdatelong.\MessageBreak + The command should be defined in the .lbx file.\MessageBreak + If you see this message, the .lbx file could not be\MessageBreak + loaded, is faulty or does not contain a definition\MessageBreak + for \string\mkbibdatelong + }% + \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}}}} + +\newrobustcmd*{\mkbibdateshort}[3]{% + \blx@warning@noline{% + Using fallback definition for \string\mkbibdateshort.\MessageBreak + The command should be defined in the .lbx file.\MessageBreak + If you see this message, the .lbx file could not be\MessageBreak + loaded, is faulty or does not contain a definition\MessageBreak + for \string\mkbibdateshort + }% + \iffieldundef{#3} + {} + {\mkdayzeros{\thefield{#3}}% + \iffieldundef{#2}{}{/}}% + \iffieldundef{#2} + {} + {\mkmonthzeros{\thefield{#2}}% + \iffieldundef{#1}{}{/}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}} + +\expandafter\newrobustcmd\expandafter*\csname mkbibtime24h\endcsname[4]{% + \blx@warning@noline{% + Using fallback definition for + \expandafter\string\csname mkbibtime24h\endcsname.\MessageBreak + The command should be defined in the .lbx file.\MessageBreak + If you see this message, the .lbx file could not be\MessageBreak + loaded, is faulty or does not contain a definition\MessageBreak + for \expandafter\string\csname mkbibtime24h\endcsname + }% + \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\newrobustcmd\expandafter*\csname mkbibtime12h\endcsname[4]{% + \blx@warning@noline{% + Using fallback definition for + \expandafter\string\csname mkbibtime12h\endcsname.\MessageBreak + The command should be defined in the .lbx file.\MessageBreak + If you see this message, the .lbx file could not be\MessageBreak + loaded, is faulty or does not contain a definition\MessageBreak + for \expandafter\string\csname mkbibtime12h\endcsname + }% + \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}}}}} + +\newrobustcmd*{\mkbibseasondateshort}[2]{% + \blx@warning@noline{% + Using fallback definition for \string\mkbibseasondateshort.\MessageBreak + The command should be defined in the .lbx file.\MessageBreak + If you see this message, the .lbx file could not be\MessageBreak + loaded, is faulty or does not contain a definition\MessageBreak + for \string\mkbibseasondateshort + }% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}} + +\newrobustcmd*{\mkbibseasondatelong}[2]{% + \blx@warning@noline{% + Using fallback definition for \string\mkbibseasondatelong.\MessageBreak + The command should be defined in the .lbx file.\MessageBreak + If you see this message, the .lbx file could not be\MessageBreak + loaded, is faulty or does not contain a definition\MessageBreak + for \string\mkbibseasondatelong + }% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}} + \newrobustcmd*{\finalandcomma}{} \newrobustcmd*{\finalandsemicolon}{} -\newrobustcmd*{\mkbibordinal}[1]{#1} +\newrobustcmd*{\mkbibordinal}[1]{% + \blx@warning@noline{% + Using fallback definition for \string\mkbibordinal.\MessageBreak + The command should be defined in the .lbx file.\MessageBreak + If you see this message, the .lbx file could not be\MessageBreak + loaded, is faulty or does not contain a definition\MessageBreak + for \string\mkbibordinal + }% + #1% +} \newrobustcmd*{\mkbibmascord}{\mkbibordinal} \newrobustcmd*{\mkbibfemord}{\mkbibordinal} \newrobustcmd*{\mkbibneutord}{\mkbibordinal} +% the following is usually not redefined in an .lbx \newrobustcmd*{\mkbibseason}[1]{\abx@bibseason{#1}} \newrobustcmd*{\mkbibmonth}[1]{% \ifcase0#1\relax @@ -5669,24 +6049,36 @@ % strip leading zeros and prepend zero for month/day/timeparts % Allow for non numeric labelyear values \protected\def\blx@imc@forcezerosmdt#1{% - \IfInteger{#1} - {\ifnumless{#1}{10} - {0\the\numexpr(#1)\relax} - {#1}} + \protected@edef\blx@tempa{#1}% + \expandafter\blx@imc@forcezerosmdt@i\expandafter{\blx@tempa}} + +\protected\def\blx@imc@forcezerosmdt@i#1{% + \notblank{#1} + {\blx@imc@ifinteger{#1} + {\ifnumless{#1}{10} + {0\the\numexpr(#1)\relax} + {#1}} + {#1}} {#1}} % strip leading zeros and prepend zero(s) for year % Allow for non numeric labelyear values \protected\def\blx@imc@forcezerosy#1{% - \IfInteger{#1} - {\ifnumless{#1}{10}% 1-digit year - {000\the\numexpr(#1)\relax} - {\ifnumless{#1}{100}% 2-digit year - {00\the\numexpr(#1)\relax} - {\ifnumless{#1}{1000}% 3-digit year - {0\the\numexpr(#1)\relax} - {#1}}}} - {#1}} + \protected@edef\blx@tempa{#1}% + \expandafter\blx@imc@forcezerosy@i\expandafter{\blx@tempa}} + +\protected\def\blx@imc@forcezerosy@i#1{% + \notblank{#1} + {\blx@imc@ifinteger{#1} + {\ifnumless{#1}{10}% 1-digit year + {000\the\numexpr(#1)\relax} + {\ifnumless{#1}{100}% 2-digit year + {00\the\numexpr(#1)\relax} + {\ifnumless{#1}{1000}% 3-digit year + {0\the\numexpr(#1)\relax} + {#1}}}} + {#1}} + {#1}}% \let\blx@imc@mkyearzeros\blx@imc@forcezerosy \let\blx@imc@mkmonthzeros\blx@imc@forcezerosmdt @@ -5711,7 +6103,9 @@ \let\blx@imc@printlabeltime\@empty \let\blx@imc@printlabeldateextra\@empty -\blx@regimcs{\printlabeldate \printlabeltime \printlabeldateextra \stripzeros \forcezerosy \forcezerosmdt \mkyearzeros \mkmonthzeros \mkdayzeros \mktimezeros} +\blx@regimcs{\printlabeldate \printlabeltime \printlabeldateextra + \stripzeros \forcezerosy \forcezerosmdt + \mkyearzeros \mkmonthzeros \mkdayzeros \mktimezeros} % User macro for retrieving currrent language \def\currentlang{\blx@languagename} @@ -6010,7 +6404,7 @@ % '', event, url, orig etc. \def\do#1{% - \StrCut{#1}{date}\blx@datetype\blx@tempnull + \blx@stripfromendinto{#1}{date}\blx@datetype \listxadd\blx@datetypes{\blx@datetype}} \abx@dodates % main date field has an empty prefix (''date) which can't be added to a list @@ -6058,7 +6452,7 @@ % to biblatex. For options which only biber needs to see, they can be % passed to the .bcf directly using \blx@collectopts % [<datatype>]{<key>}[<value>]{<code>} -\newrobustcmd*{\DeclareBibliographyOption}[2][]{ +\newrobustcmd*{\DeclareBibliographyOption}[2][]{% \ifblank{#1} {\def\blx@tempa{boolean}} {\ifcsundef{blx@globalopts@#1} @@ -6121,7 +6515,7 @@ % Sanity check on date field names - they *must* end in 'date' to make things easier/possible later \def\do#1{% - \IfEndWith{#1}{date} + \blx@ifstrendswith{#1}{date} {} {\blx@error {Invalid date field name '#1'} @@ -6207,6 +6601,7 @@ \do{entrysetcount}% \do{entrytype}% \do{extraalpha}% + \do{extraname}% \do{extratitle}% \do{extratitleyear}% \do{extradate}% @@ -6233,6 +6628,7 @@ \do{uniquebaretitle}% \do{uniquework}% \do{uniqueprimaryauthor}% + \do{nocite}% \dolistloop\blx@datemetabooleans} % Date datatype fields @@ -6298,10 +6694,10 @@ \iffieldnum{#1} {\begingroup \let\blx@tempa\@empty - \IfEndWith{#1}{endyear} - {\StrCut{#1}{endyear}\blx@datetype\blx@tempnull + \blx@ifstrendswith{#1}{endyear} + {\blx@stripfromendinto{#1}{endyear}\blx@datetype \def\blx@tempa{end}} - {\StrCut{#1}{year}\blx@datetype\blx@tempnull}% + {\blx@stripfromendinto{#1}{year}\blx@datetype}% \csuse{if\blx@datetype\blx@tempa dateera}{bce} {\ifnumless{0-\thefield{#1}}{0} {\printtext{\csuse{bibdateera\blx@tempa prefix}}} @@ -6313,10 +6709,10 @@ \iffieldnum{#1} {\begingroup \let\blx@tempa\@empty - \IfEndWith{#1}{endyear} - {\StrCut{#1}{endyear}\blx@datetype\blx@tempnull + \blx@ifstrendswith{#1}{endyear} + {\blx@stripfromendinto{#1}{endyear}\blx@datetype \def\blx@tempa{end}} - {\StrCut{#1}{year}\blx@datetype\blx@tempnull}% + {\blx@stripfromendinto{#1}{year}\blx@datetype}% \csuse{if\blx@datetype\blx@tempa dateera}{bce} {\ifnum\numexpr0-\thefield{#1}\relax<\blx@dateeraauto % \midsentence is to suppress automatic capitalisation @@ -6722,59 +7118,188 @@ \catcode\endlinechar=12\relax \blx@bbl@verbadd@i} -% {<scope>}{<field>}{<itemcount>}{<part>}{<value>} -\protected\def\blx@bbl@annotationdef#1#2#3#4#5{% +% {<scope>}{<field>}{<name>}{<itemcount>}{<part>}{<isliteral>}{<value>} +\protected\def\blx@bbl@annotationdef#1#2#3#4#5#6#7{% \ifstrequal{#1}{field} {\csxappto\blx@bbl@data{% - \listadd\noexpand\abx@annotation@defined{#1@#2}% - \def\do####1{\listcsadd{abx@annotation@#1@#2}{####1}}% - \docsvlist{#5}}} + \listadd\noexpand\abx@annotation@defined{field@#2@#3}}% + \ifstrequal{#6}{1} + {\csgappto\blx@bbl@data{% + \csdef{abx@annotation@literal@field@#2@#3}{#7}}} + {\csxappto\blx@bbl@data{% + \def\do####1{\listcsadd{abx@annotation@field@#2@#3}{####1}}% + \docsvlist{#7}}}} {}% \ifstrequal{#1}{item} {\csxappto\blx@bbl@data{% - \listadd\noexpand\abx@annotation@defined{#1@#2@#3}% - \def\do####1{\listcsadd{abx@annotation@#1@#2@#3}{####1}}% - \docsvlist{#5}}} + \listadd\noexpand\abx@annotation@defined{item@#2@#3@#4}}% + \ifstrequal{#6}{1} + {\csgappto\blx@bbl@data{% + \csdef{abx@annotation@literal@item@#2@#3@#4}{#7}}} + {\csxappto\blx@bbl@data{% + \def\do####1{\listcsadd{abx@annotation@item@#2@#3@#4}{####1}}% + \docsvlist{#7}}}} {}% \ifstrequal{#1}{part} {\csxappto\blx@bbl@data{% - \listadd\noexpand\abx@annotation@defined{#1@#2@#3@#4}% - \def\do####1{\listcsadd{abx@annotation@#1@#2@#3@#4}{####1}}% - \docsvlist{#5}}} + \listadd\noexpand\abx@annotation@defined{part@#2@#3@#4@#5}}% + \ifstrequal{#6}{1} + {\csgappto\blx@bbl@data{% + \csdef{abx@annotation@literal@part@#2@#3@#4@#5}{#7}}} + {\csxappto\blx@bbl@data{% + \def\do####1{\listcsadd{abx@annotation@part@#2@#3@#4@#5}{####1}}% + \docsvlist{#7}}}} {}} -% [<field>]{<annotation>} -\newcommand*{\blx@imc@iffieldannotation}[2][]{% - \ifblank{#1} - {\ifdefvoid\currentfield{}{\let\blx@tempa\currentfield}% - \ifdefvoid\currentlist{}{\let\blx@tempa\currentlist}% - \ifdefvoid\currentname{}{\let\blx@tempa\currentname}} - {\def\blx@tempa{#1}}% - \blx@resolve@annotation@label{\blx@tempa}% - \ifinlistcs{#2}{abx@annotation@field@\blx@tempa}} +% [<field>][<annotationname>] +\def\blx@imc@getfieldannotation{% + \let\blx@tempa\@empty + \ifdefvoid\currentfield{}{\let\blx@tempa\currentfield}% + \ifdefvoid\currentlist{}{\let\blx@tempa\currentlist}% + \ifdefvoid\currentname{}{\let\blx@tempa\currentname}% + \@ifnextchar[%] + {\blx@imc@getfieldannotation@i} + {\blx@imc@getfieldannotation@i[\blx@tempa]}} -% [<field>][<item>]{<annotation>} -\def\blx@imc@ifitemannotation{% +\def\blx@imc@getfieldannotation@i[#1]{% + \ifstrempty{#1} + {\blx@imc@getfieldannotation@i[\blx@tempa]} + {\@ifnextchar[%] + {\blx@imc@getfieldannotation@ii{#1}} + {\blx@imc@getfieldannotation@ii{#1}[default]}}} + +\def\blx@imc@getfieldannotation@ii#1[#2]{% + \def\blx@tempb{#1}% + \blx@resolve@annotation@label{\blx@tempb}% + \ifcsdef{abx@annotation@literal@field@\blx@tempb @#2} + {\csuse{abx@annotation@literal@field@\blx@tempb @#2}} + {}} + +% [<field>][<annotationname>][<item>] +\def\blx@imc@getitemannotation{% + \let\blx@tempa\@empty \ifdefvoid\currentfield{}{\let\blx@tempa\currentfield}% \ifdefvoid\currentlist{}{\let\blx@tempa\currentlist}% \ifdefvoid\currentname{}{\let\blx@tempa\currentname}% \@ifnextchar[%] + {\blx@imc@getitemannotation@i} + {\blx@imc@getitemannotation@i[\blx@tempa]}} + +\def\blx@imc@getitemannotation@i[#1]{% + \ifstrempty{#1} + {\blx@imc@getitemannotation@i[\blx@tempa]} + {\@ifnextchar[%] + {\blx@imc@getitemannotation@ii{#1}} + {\blx@imc@getitemannotation@ii{#1}[default]}}} + +\def\blx@imc@getitemannotation@ii#1[#2]{% + \ifstrempty{#2} + {\def\blx@tempb{default}} + {\def\blx@tempb{#2}}% + \@ifnextchar[%] + {\blx@imc@getitemannotation@iii{#1}{\blx@tempb}} + {\blx@imc@getitemannotation@iii{#1}{\blx@tempb}[\the\value{listcount}]}} + +\def\blx@imc@getitemannotation@iii#1#2[#3]{% + \def\blx@tempc{#1}% + \blx@resolve@annotation@label{\blx@tempc}% + \ifcsdef{abx@annotation@literal@item@\blx@tempc @#2@#3} + {\csuse{abx@annotation@literal@item@\blx@tempc @#2@#3}} + {}} + +% [<field>][<annotationname>][<item>]{<part>} +\def\blx@imc@getpartannotation{% + \let\blx@tempa\@empty + \ifdefvoid\currentfield{}{\let\blx@tempa\currentfield}% + \ifdefvoid\currentlist{}{\let\blx@tempa\currentlist}% + \ifdefvoid\currentname{}{\let\blx@tempa\currentname}% + \@ifnextchar[%] + {\blx@imc@getpartannotation@i} + {\blx@imc@getpartannotation@i[\blx@tempa]}} + +\def\blx@imc@getpartannotation@i[#1]{% + \ifstrempty{#1} + {\blx@imc@getpartannotation@i[\blx@tempa]} + {\@ifnextchar[%] + {\blx@imc@getpartannotation@ii{#1}} + {\blx@imc@getpartannotation@ii{#1}[default]}}} + +\def\blx@imc@getpartannotation@ii#1[#2]{% + \ifstrempty{#2} + {\def\blx@tempb{default}} + {\def\blx@tempb{#2}}% + \@ifnextchar[%] + {\blx@imc@getpartannotation@iii{#1}{\blx@tempb}} + {\blx@imc@getpartannotation@iii{#1}{\blx@tempb}[\the\value{listcount}]}} + +\def\blx@imc@getpartannotation@iii#1#2[#3]#4{% + \ifstrempty{#3} + {\def\blx@tempc{\the\value{listcount}}} + {\def\blx@tempc{#3}}% + \def\blx@tempd{#1}% + \blx@resolve@annotation@label{\blx@tempd}% + \ifcsdef{abx@annotation@literal@part@\blx@tempd @#2@\blx@tempc @#4} + {\csuse{abx@annotation@literal@part@\blx@tempd @#2@\blx@tempc @#4}} + {}} + +% [<field>][<annotationname>]{<annotation>} +\def\blx@imc@iffieldannotation{% + \let\blx@tempa\@empty + \ifdefvoid\currentfield{}{\let\blx@tempa\currentfield}% + \ifdefvoid\currentlist{}{\let\blx@tempa\currentlist}% + \ifdefvoid\currentname{}{\let\blx@tempa\currentname}% + \@ifnextchar[%] + {\blx@imc@iffieldannotation@i} + {\blx@imc@iffieldannotation@i[\blx@tempa]}} + +\def\blx@imc@iffieldannotation@i[#1]{% + \ifstrempty{#1} + {\blx@imc@iffieldannotation@i[\blx@tempa]} + {\@ifnextchar[%] + {\blx@imc@iffieldannotation@ii{#1}} + {\blx@imc@iffieldannotation@ii{#1}[default]}}} + +\def\blx@imc@iffieldannotation@ii#1[#2]#3{% + \ifstrempty{#2} + {\def\blx@tempb{default}} + {\def\blx@tempb{#2}}% + \def\blx@tempc{#1}% + \blx@resolve@annotation@label{\blx@tempc}% + \ifinlistcs{#3}{abx@annotation@field@\blx@tempc @\blx@tempb}} + +% [<field>][<annotationname>][<item>]{<annotation>} +\def\blx@imc@ifitemannotation{% + \let\blx@tempa\@empty + \ifdefvoid\currentfield{}{\let\blx@tempa\currentfield}% + \ifdefvoid\currentlist{}{\let\blx@tempa\currentlist}% + \ifdefvoid\currentname{}{\let\blx@tempa\currentname}% + \@ifnextchar[%] {\blx@imc@ifitemannotation@i} - {\blx@imc@ifitemannotation@i[\blx@tempa]} -} + {\blx@imc@ifitemannotation@i[\blx@tempa]}} \def\blx@imc@ifitemannotation@i[#1]{% + \ifstrempty{#1} + {\blx@imc@ifitemannotation@i[\blx@tempa]} + {\@ifnextchar[%] + {\blx@imc@ifitemannotation@ii{#1}} + {\blx@imc@ifitemannotation@ii{#1}[default]}}} + +\def\blx@imc@ifitemannotation@ii#1[#2]{% + \ifstrempty{#2} + {\def\blx@tempb{default}} + {\def\blx@tempb{#2}}% \@ifnextchar[%] - {\blx@imc@ifitemannotation@ii{#1}} - {\blx@imc@ifitemannotation@ii{#1}[\the\value{listcount}]}} + {\blx@imc@ifitemannotation@iii{#1}{\blx@tempb}} + {\blx@imc@ifitemannotation@iii{#1}{\blx@tempb}[\the\value{listcount}]}} -\def\blx@imc@ifitemannotation@ii#1[#2]#3{% - \def\blx@tempb{#1}% - \blx@resolve@annotation@label{\blx@tempb}% - \ifinlistcs{#3}{abx@annotation@item@\blx@tempb @#2}} +\def\blx@imc@ifitemannotation@iii#1#2[#3]#4{% + \def\blx@tempc{#1}% + \blx@resolve@annotation@label{\blx@tempc}% + \ifinlistcs{#4}{abx@annotation@item@\blx@tempc @#2@#3}} -% [<field>][<item>]{<part>}{<annotation>} +% [<field>][<annotationname>][<item>]{<part>}{<annotation>} \def\blx@imc@ifpartannotation{% + \let\blx@tempa\@empty \ifdefvoid\currentfield{}{\let\blx@tempa\currentfield}% \ifdefvoid\currentlist{}{\let\blx@tempa\currentlist}% \ifdefvoid\currentname{}{\let\blx@tempa\currentname}% @@ -6783,30 +7308,164 @@ {\blx@imc@ifpartannotation@i[\blx@tempa]}} \def\blx@imc@ifpartannotation@i[#1]{% + \ifstrempty{#1} + {\blx@imc@ifpartannotation@i[\blx@tempa]} + {\@ifnextchar[%] + {\blx@imc@ifpartannotation@ii{#1}} + {\blx@imc@ifpartannotation@ii{#1}[default]}}} + +\def\blx@imc@ifpartannotation@ii#1[#2]{% + \ifstrempty{#2} + {\def\blx@tempb{default}} + {\def\blx@tempb{#2}}% \@ifnextchar[%] - {\blx@imc@ifpartannotation@ii{#1}} - {\blx@imc@ifpartannotation@ii{#1}[\the\value{listcount}]}} + {\blx@imc@ifpartannotation@iii{#1}{\blx@tempb}} + {\blx@imc@ifpartannotation@iii{#1}{\blx@tempb}[\the\value{listcount}]}} -\def\blx@imc@ifpartannotation@ii#1[#2]#3#4{% - \def\blx@tempb{#1}% - \blx@resolve@annotation@label{\blx@tempb}% - \ifinlistcs{#4}{abx@annotation@part@\blx@tempb @#2@#3}} +\def\blx@imc@ifpartannotation@iii#1#2[#3]#4#5{% + \ifstrempty{#3} + {\def\blx@tempc{\the\value{listcount}}} + {\def\blx@tempc{#3}}% + \def\blx@tempd{#1}% + \blx@resolve@annotation@label{\blx@tempd}% + \ifinlistcs{#5}{abx@annotation@part@\blx@tempd @#2@\blx@tempc @#4}} + +% [<field>][<annotationname>] +\def\blx@imc@hasfieldannotation{% + \let\blx@tempa\@empty + \ifdefvoid\currentfield{}{\let\blx@tempa\currentfield}% + \ifdefvoid\currentlist{}{\let\blx@tempa\currentlist}% + \ifdefvoid\currentname{}{\let\blx@tempa\currentname}% + \@ifnextchar[%] + {\blx@imc@hasfieldannotation@i} + {\blx@imc@hasfieldannotation@i[\blx@tempa]}} + +\def\blx@imc@hasfieldannotation@i[#1]{% + \ifstrempty{#1} + {\blx@imc@hasfieldannotation@i[\blx@tempa]} + {\@ifnextchar[%] + {\blx@imc@hasfieldannotation@ii{#1}} + {\blx@imc@hasfieldannotation@ii{#1}[default]}}} + +\def\blx@imc@hasfieldannotation@ii#1[#2]{% + \ifstrempty{#2} + {\def\blx@tempb{default}} + {\def\blx@tempb{#2}}% + \def\blx@tempc{#1}% + \blx@resolve@annotation@label{\blx@tempc}% + \ifcsdef{abx@annotation@literal@field@\blx@tempc @\blx@tempb}} + +% [<field>][<annotationname>][<item>] +\def\blx@imc@hasitemannotation{% + \let\blx@tempa\@empty + \ifdefvoid\currentfield{}{\let\blx@tempa\currentfield}% + \ifdefvoid\currentlist{}{\let\blx@tempa\currentlist}% + \ifdefvoid\currentname{}{\let\blx@tempa\currentname}% + \@ifnextchar[%] + {\blx@imc@hasitemannotation@i} + {\blx@imc@hasitemannotation@i[\blx@tempa]}} + +\def\blx@imc@hasitemannotation@i[#1]{% + \ifstrempty{#1} + {\blx@imc@hasitemannotation@i[\blx@tempa]} + {\@ifnextchar[%] + {\blx@imc@hasitemannotation@ii{#1}} + {\blx@imc@hasitemannotation@ii{#1}[default]}}} + +\def\blx@imc@hasitemannotation@ii#1[#2]{% + \ifstrempty{#2} + {\def\blx@tempb{default}} + {\def\blx@tempb{#2}}% + \@ifnextchar[%] + {\blx@imc@hasitemannotation@iii{#1}{\blx@tempb}} + {\blx@imc@hasitemannotation@iii{#1}{\blx@tempb}[\the\value{listcount}]}} + +\def\blx@imc@hasitemannotation@iii#1#2[#3]{% + \def\blx@tempc{#1}% + \blx@resolve@annotation@label{\blx@tempc}% + \ifcsdef{abx@annotation@literal@item@\blx@tempc @#2@#3}} + +% [<field>][<annotationname>][<item>]{<part>} +\def\blx@imc@haspartannotation{% + \let\blx@tempa\@empty + \ifdefvoid\currentfield{}{\let\blx@tempa\currentfield}% + \ifdefvoid\currentlist{}{\let\blx@tempa\currentlist}% + \ifdefvoid\currentname{}{\let\blx@tempa\currentname}% + \@ifnextchar[%] + {\blx@imc@haspartannotation@i} + {\blx@imc@haspartannotation@i[\blx@tempa]}} + +\def\blx@imc@haspartannotation@i[#1]{% + \ifstrempty{#1} + {\blx@imc@haspartannotation@i[\blx@tempa]} + {\@ifnextchar[%] + {\blx@imc@haspartannotation@ii{#1}} + {\blx@imc@haspartannotation@ii{#1}[default]}}} + +\def\blx@imc@haspartannotation@ii#1[#2]{% + \ifstrempty{#2} + {\def\blx@tempb{default}} + {\def\blx@tempb{#2}}% + \@ifnextchar[%] + {\blx@imc@haspartannotation@iii{#1}{\blx@tempb}} + {\blx@imc@haspartannotation@iii{#1}{\blx@tempb}[\the\value{listcount}]}} + +\def\blx@imc@haspartannotation@iii#1#2[#3]#4{% + \ifstrempty{#3} + {\def\blx@tempc{\the\value{listcount}}} + {\def\blx@tempc{#3}}% + \def\blx@tempd{#1}% + \blx@resolve@annotation@label{\blx@tempd}% + \ifcsdef{abx@annotation@literal@part@\blx@tempd @#2@\blx@tempc @#4}} -% {<datetype>}{<annotation>} % labeldatesource has a slightly different format than other <field>sources % that's one reason for a dedicated command, the other being that this command % is probably only used in contexts where \currentfield is not defined, so % the <datetype> argument is always required -\newcommand*{\blx@imc@ifdateannotation}[2]{% - \def\blx@tempa{#1}% - \ifcsundef{abx@field@\blx@tempa source} +% [<annotationname>]{<datetype>}{<annotation>} +\newcommand*{\blx@imc@ifdateannotation}[3][]{% + \ifblank{#1} + {\def\blx@tempa{default}} + {\def\blx@tempa{#1}}% + \def\blx@tempb{#2}% + \ifcsundef{abx@field@\blx@tempb source} {}% - {\letcs\blx@tempa{abx@field@\blx@tempa source}% - \edef\blx@tempa{\blx@tempa date}}% - \ifinlistcs{#2}{abx@annotation@field@\blx@tempa}} + {\letcs\blx@tempa{abx@field@\blx@tempb source}% + \edef\blx@tempb{\blx@tempb date}}% + \ifinlistcs{#3}{abx@annotation@field@\blx@tempb @\blx@tempa}} + +% [<annotationname>]{<datetype>} +\newcommand*{\blx@imc@hasdateannotation}[2][]{% + \ifblank{#1} + {\def\blx@tempa{default}} + {\def\blx@tempa{#1}}% + \def\blx@tempb{#2}% + \ifcsundef{abx@field@\blx@tempb source} + {}% + {\letcs\blx@tempa{abx@field@\blx@tempb source}% + \edef\blx@tempb{\blx@tempb date}}% + \ifboolexpr { test {\ifcsdef{abx@annotation@field@\blx@tempb @\blx@tempa}} + or + test {\ifcsdef{abx@annotation@literal@field@\blx@tempb @\blx@tempa}} }} + +% [<annotationname>]{<datetype>} +\newcommand*{\blx@imc@getdateannotation}[2][]{% + \ifblank{#1} + {\def\blx@tempa{default}} + {\def\blx@tempa{#1}}% + \def\blx@tempb{#1}% + \ifcsundef{abx@field@\blx@tempb source} + {}% + {\letcs\blx@tempb{abx@field@\blx@tempb source}% + \edef\blx@tempb{\blx@tempb date}}% + \ifcsdef{abx@annotation@literal@field@\blx@tempb @\blx@tempa} + {\csuse{abx@annotation@literal@field@\blx@tempb @\blx@tempa}} + {}} \blx@regimcs{\iffieldannotation \ifitemannotation \ifpartannotation - \ifdateannotation} + \ifdateannotation \getfieldannotation \getitemannotation \getpartannotation + \getdateannotation \hasfieldannotation \hasitemannotation \haspartannotation + \hasdateannotation} % {<fieldname>} \def\blx@resolve@annotation@label#1{% @@ -6902,10 +7561,8 @@ % {<keyword>,...} \protected\def\blx@bbl@keyw#1{% - \iftoggle{blx@skipbib} - {} - {\forcsvlist{\blx@addkeyword{\abx@field@entrykey}}{#1}% - \blx@bbl@fielddef{keywords}{#1}}} + \forcsvlist{\blx@addkeyword{\abx@field@entrykey}}{#1}% + \blx@bbl@fielddef{keywords}{#1}} \def\blx@addkeyword#1#2{% \listcsxadd{blx@keyw@\the\c@refsection @\detokenize{#2}}{#1}} @@ -7269,20 +7926,21 @@ {}% \nottoggle{blx@skiplab} {\iftoggle{blx@labelnumber} - {\blx@bbl@labelnumber} - {}% - \iftoggle{blx@labelalpha} - {\blx@bbl@labelalpha} - {}% - \iftoggle{blx@labeltitle} - {\blx@bbl@labeltitle} - {}% - \iftoggle{blx@labeltitleyear} - {\blx@bbl@labeltitleyear} - {}% - \iftoggle{blx@labeldateparts} - {\blx@bbl@labeldate} - {}} + {\blx@bbl@labelnumber} + {}% + \iftoggle{blx@labelalpha} + {\blx@bbl@labelalpha} + {}% + \iftoggle{blx@labeltitle} + {\blx@bbl@labeltitle} + {}% + \iftoggle{blx@labeltitleyear} + {\blx@bbl@labeltitleyear} + {}% + \iftoggle{blx@labeldateparts} + {\blx@bbl@labeldate} + {}% + \blx@bbl@labelname} {}% \blx@bbl@titles \blx@bbl@hooks @@ -7301,7 +7959,7 @@ {\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}}% + {\blx@warning@noline{Sorting template has changed}}% \endgroup} \def\blx@addset@i#1{% @@ -7470,6 +8128,13 @@ \global\c@maxextratitleyear\abx@field@extratitleyear\relax \fi}} +\def\blx@bbl@labelname{% + \ifundef\abx@field@extraname + {} + {\ifnum\abx@field@extraname>\c@maxextraname + \global\c@maxextraname\abx@field@extraname\relax + \fi}} + \def\blx@bbl@labeldate{% \ifundef\abx@field@extradate {} @@ -7555,7 +8220,7 @@ % {<refcontext>} % Get the saved information on which refcontexts were mentioned last run \protected\def\abx@aux@refcontext#1{% - \listgadd\blx@lastrefcontexts{#1}} + \listxadd\blx@lastrefcontexts{\detokenize{#1}}} % {<sortingtemplatename>} % Get the saved information on which shorthand sorting templates were mentioned last run @@ -8202,7 +8867,7 @@ {} {\listxadd\blx@dlistnames{\blx@refcontext@context @\blx@tempe @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}}{}}}% + \blx@xml@dlist{\blx@refcontext@context}{entry}{\blx@tempe}{\blx@xml@dlist@refcontext{\blx@refcontext@sortingtemplatename}{\blx@refcontext@sortingnamekeytemplatename}{\blx@refcontext@labelprefix@real}{\blx@refcontext@uniquenametemplatename}{\blx@refcontext@labelalphanametemplatename}}{}}}% \ifdefvoid\blx@tempa {\blx@warn@bibempty\endgroup} {\blx@bibliography\blx@tempa}} @@ -8451,6 +9116,17 @@ \let\blx@bibcheck\relax +\def\blx@edef@refcontext#1{% + \edef\blx@refcontext@context{#1}% + \expandafter\edef\expandafter\blx@refcontext@context\expandafter{% + \expandafter\detokenize\expandafter{\blx@refcontext@context}}} + +\def\blx@xdef@refcontext#1{% + \edef\blx@refcontext@context{#1}% + \expandafter\xdef\expandafter\blx@refcontext@context\expandafter{% + \expandafter\detokenize\expandafter{\blx@refcontext@context}}} + + % This sets and saves to the .aux the default refcontext for an entry. The % default refcontext for an entry is the refcontext of the last % bibliography in the refsection in which it is actually printed. This @@ -8468,7 +9144,7 @@ % <refsection><key><refcontext> \def\abx@aux@defaultrefcontext#1#2#3{% \global\boolfalse{refcontextdefaults}% - \csxdef{blx@assignedrefcontextbib@#1@#2}{#3}} + \csxdef{blx@assignedrefcontextbib@#1@#2}{\detokenize{#3}}} \def\abx@aux@refcontextdefaultsdone{% \global\boolfalse{refcontextdefaults}} @@ -8609,9 +9285,12 @@ \ifcsdef{blx@sortingtemplate@#2} {#2} {\blx@refcontext@sortingtemplatename}}% - % locally define this since we want to fetch data from the datalist 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}% + % locally define this since we want to fetch data from the datalist named + % after the list we are printing rather than the data in refcontext list + % Note that the name must be unique so we prepend "#2:" because the combination of + % options might not generate a unique name since sortschemename has a fallback to the + % refcontext scheme if there is no sortscheme named after the list + \blx@edef@refcontext{#2:\blx@tempc/\blx@refcontext@sortingnamekeytemplatename/\blx@refcontext@labelprefix/\blx@refcontext@uniquenametemplatename/\blx@refcontext@labelalphanametemplatename}% \xifinlist\blx@tempc\blx@sortingtemplatenames {} {\listxadd\blx@sortingtemplatenames\blx@tempc}% @@ -8642,8 +9321,8 @@ \xifinlist{\blx@refcontext@context @\blx@tempe @list}\blx@dlistnames {} {\listxadd\blx@dlistnames{\blx@refcontext@context @\blx@tempe @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@\blx@thebiblistfilter}}}}% + \xappto\blx@dlists{% + \blx@xml@dlist{\blx@refcontext@context}{list}{\blx@tempe}{\blx@xml@dlist@refcontext{\blx@tempc}{\blx@refcontext@sortingnamekeytemplatename}{\blx@refcontext@labelprefix@real}{\blx@refcontext@uniquenametemplatename}{\blx@refcontext@labelalphanametemplatename}}{\csuse{blx@biblistfilters@\blx@thebiblistfilter}}}}% \ifdefvoid\blx@tempa {\blx@warn@biblistempty{#2}\endgroup} {\blx@biblist\blx@tempa}} @@ -8759,7 +9438,7 @@ \xifinlist\blx@refcontext@sortingtemplatename\blx@sortingtemplatenames {} {\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}% + \blx@xdef@refcontext{\blx@refcontext@sortingtemplatename/\blx@refcontext@sortingnamekeytemplatename/\blx@refcontext@labelprefix/\blx@refcontext@uniquenametemplatename/\blx@refcontext@labelalphanametemplatename}% % Add the refcontext to the list of refcontexts so we can compare on next run \xifinlist\blx@refcontext@context\blx@refcontexts {} @@ -8782,11 +9461,12 @@ \protected\def\endrefcontext{% \togglefalse{blx@refcontext}% \global\let\blx@refcontext@labelprefix\@empty + \global\let\blx@refcontext@labelprefix@real\@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}} + \blx@xdef@refcontext{\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}{% @@ -8798,8 +9478,16 @@ \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}} + +% labelprefix cannot be used as is because it is used to construct the internal +% refcontext name which is referenced/expanded a lot all over the place. So, +% we hash the given input and use the safe hash as internal name. +% But that is not enough since the MD5 hash function expands the argument all +% the way and so unexpandable content like \dag breaks. +% Unexpandable content should be protected with \detokenize. \define@key{blx@refcontext}{labelprefix}{% - \gdef\blx@refcontext@labelprefix{#1}% + \xdef\blx@refcontext@labelprefix{\blx@mdfivesum{#1}}% + \gdef\blx@refcontext@labelprefix@real{#1}% \iftoggle{blx@defernumbers} {}% {\iftoggle{blx@labelnumber} @@ -8823,7 +9511,8 @@ \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/\blx@tempd/\blx@tempe}}% \docsvlist{#3}} % [refcontext keys]{<category1>,<category2>,...} @@ -8841,7 +9530,8 @@ \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/\blx@tempd/\blx@tempe}}% \docsvlist{#3}} % [refcontext keys]{<entrykey1>,<entrykey2>,...} @@ -8858,7 +9548,8 @@ \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/\blx@tempd/\blx@tempe}}% \docsvlist{#3}} % Meta option to set all name template options @@ -8869,7 +9560,8 @@ \define@key{blx@assignrefcontext}{sorting}{\def\blx@tempa{#1}} \define@key{blx@assignrefcontext}{sortingnamekeytemplatename}{\def\blx@tempb{#1}} -\define@key{blx@assignrefcontext}{labelprefix}{\def\blx@tempc{#1}} +\define@key{blx@assignrefcontext}{labelprefix}{% + \edef\blx@tempc{\blx@mdfivesum{#1}}} \define@key{blx@assignrefcontext}{uniquenametemplatename}{\def\blx@tempd{#1}} \define@key{blx@assignrefcontext}{labelalphanametemplatename}{\def\blx@tempe{#1}} @@ -8955,6 +9647,7 @@ \endgroup} \protected\def\endrefsection{% + \endrefcontext \blx@endrefsection \blx@inf@refsec} @@ -8969,11 +9662,11 @@ % 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 - \ifcsname blx@sectionciteorder@\the\c@refsection\endcsname\else - \expandafter\newcount\csname blx@sectionciteorder@\the\c@refsection\endcsname - \fi + \ifcscounter{blx@sectionciteorder@\the\c@refsection} + {} + {\expandafter\newcount\csname blx@sectionciteorder@\the\c@refsection\endcsname}% \global\advance\csname blx@sectionciteorder@\the\c@refsection\endcsname\@ne - \blx@auxwrite\blx@bcfout{}{\blx@xml@citekey{##1}{\expandafter\the\csname blx@sectionciteorder@\the\c@refsection\endcsname}}}% + \blx@auxwrite\blx@bcfout{}{\blx@xml@citekey{##1}{}{\expandafter\the\csname blx@sectionciteorder@\the\c@refsection\endcsname}}}% \dolistcsloop{blx@keyaliases@\the\c@refsection}% \ifnum\c@refsection>\z@ \blx@auxwrite\blx@bcfout{}{% @@ -9047,22 +9740,36 @@ \def\blx@refpatch@chapter#1{% \ifundef\chapter {\blx@err@nodocdiv{chapter}} - {\pretocmd\@makechapterhead{#1} - {} - {\blx@err@patch{\string\@makechapterhead}} - \pretocmd\@makeschapterhead{#1} - {} - {\blx@err@patch{\string\@makeschapterhead}}}} + {% the \ifcsundef{KOMAClassName} should be redundant, but you never know + \ifboolexpr{test {\ifcsundef{KOMAClassName}} + or test {\ifcsundef{startsection@secnumdepth}}} + {\pretocmd\@makechapterhead{#1} + {} + {\blx@err@patch{\string\@makechapterhead}} + \pretocmd\@makeschapterhead{#1} + {} + {\blx@err@patch{\string\@makeschapterhead}}} + {% <- new KOMA >= 3.26 defines \startsection@secnumdepth + \At@startsection{\ifnumequal{\startsection@secnumdepth}{0}{#1}{}}}}} \def\blx@refpatch@sect#1{% \ifcsundef{#1} {\blx@err@nodocdiv{#1}\@gobbletwo} - {\blx@refpatch@sect@i}} + {% the \ifcsundef{KOMAClassName} should be redundant, but you never know + \ifboolexpr{test {\ifcsundef{KOMAClassName}} + or test {\ifcsundef{startsection@secnumdepth}}} + {\blx@refpatch@sect@i} + {\blx@refpatch@sect@koma}}} + +% KOMA >= 3.26 defines \startsection@secnumdepth to check the sectioning level, +% so we can now use \At@startsection +\def\blx@refpatch@sect@koma#1#2{% + \At@startsection{\ifnumequal{\startsection@secnumdepth}{#2}{#1}{}}} \edef\blx@refpatch@sect@i#1#2{% \def\noexpand\do##1{% - \pretocmd##1% - {\noexpand\blx@refpatch@sect@ii{#1}{#2}{\string#2}} + \pretocmd##1% + {\noexpand\blx@refpatch@sect@ii{#1}{#2}{\string#2}} {\togglefalse{blx@tempa}\noexpand\listbreak} {}}% \noexpand\blx@refpatch@sect@iii} @@ -9078,7 +9785,7 @@ \H@old@sect,% hyperref \NR@sect,% nameref \scr@sect,% koma-script 3.x - \scr@startsection,% bad hack for koma >= 3.15 + \scr@startsection,% bad hack for koma 3.15 <= v <= 3.25 \@startsection}% latex \iftoggle{blx@tempa} {\blx@err@patch{\string\@sect}} @@ -9137,6 +9844,8 @@ \def\blx@tempa{file}% \def\blx@tempb{bibtex}% \def\blx@tempc{local}% + \undef\blx@tempd + \let\blx@tempe\@empty \blx@xsanitizeafter{\forcsvlist\blx@addbib@legacy}{#1}% \endgroup} \@onlypreamble\bibliography @@ -9183,6 +9892,7 @@ \def\blx@tempb{bibtex}% \def\blx@tempc{local}% \undef\blx@tempd + \let\blx@tempe\@empty \setkeys{blx@addbib}{#2}% \blx@xsanitizeafter{#1}{#3}% \endgroup} @@ -9198,6 +9908,7 @@ \define@key{blx@addbib}{datatype}{\def\blx@tempb{#1}} \define@key{blx@addbib}{location}{\def\blx@tempc{#1}} \define@key{blx@addbib}{label}{\edef\blx@tempd{\detokenize{#1}}} +\define@key{blx@addbib}{bibencoding}{\def\blx@tempe{#1}} % \blx@res@type@<resource> resource -> type % \blx@res@data@<resource> resource -> datatype @@ -9208,6 +9919,7 @@ \csxdef{blx@res@type@#1}{\blx@tempa}% \csxdef{blx@res@data@#1}{\blx@tempb}% \csxdef{blx@res@loca@#1}{\blx@tempc}% + \csxdef{blx@res@bibencoding@#1}{\blx@tempe}% \ifdef\blx@tempd {\csxdef{blx@res@labl@\blx@tempd}{#1}} {}} @@ -9237,6 +9949,9 @@ {\ifcsdef{blx@res@data@#2} {\csuse{blx@res@data@#2}} {bibtex}} + {\ifcsvoid{blx@res@bibencoding@#2} + {} + { encoding="\csuse{blx@res@bibencoding@#2}"}} {#3}}} %% Citations @@ -9311,8 +10026,22 @@ \blx@loccitreset} % {<entrykey>}{<message>} +% Wrapper to track cite keys which are \nocited +\def\blx@nocitation#1#2{% + \ifinlist{#1}\blx@nocites + {} + {\listgadd\blx@nocites{#1}}% + \blx@citation@i{#1}{#2}} + +% {<entrykey>}{<message>} % Just a wrapper to suppress citation tracking in toc/lof etc. \def\blx@citation#1#2{% + \ifinlist{#1}\blx@directcites + {} + {\listgadd\blx@directcites{#1}}% + \blx@citation@i{#1}{#2}} + +\def\blx@citation@i#1#2{% \ifbool{citerequest} {\blx@citation@entry{#1}{#2}} {}} @@ -9338,6 +10067,12 @@ \protected\def\abx@aux@segm#1#2#3{% \listcsxadd{blx@segm@#1@#2}{\detokenize{#3}}} +\def\blx@nocitation@all{% + \ifinlist{*}\blx@nocites + {} + {\listgadd\blx@nocites{*}}% + \blx@citation@all} + \def\blx@citation@all{% \ifbool{citerequest} {\blx@bibreq{*}% @@ -9352,11 +10087,21 @@ \protected\def\blx@bibreq#1{% \begingroup \blx@xmlsanitizeafter{\def\blx@tempa}{#1}% + \let\blx@tempb\@empty + % Only output as \nocited if a key wasn't also directly \cite'd + % Since citekey output is sequential as cites are read, the .bcf might contain + % duplicate keys with differring nocite attributes if \nocite{X} and \cite{X} both occur + % but biber deals with this and priorities \cites + \ifboolexpr{test {\ifinlist{#1}\blx@nocites} + and + not test {\ifinlist{#1}\blx@directcites}} + {\def\blx@tempb{ nocite="1"}} + {}% % citeall is always order "0" - this makes no real difference as biber % ignores all other citekeys in the section if citeall is present \ifstrequal{*}{#1} - {\blx@auxwrite\blx@bcfout{}{\blx@xml@citekey{\blx@tempa}{0}}} - {\blx@auxwrite\blx@bcfout{}{\blx@xml@citekey{\blx@tempa}{\expandafter\the\csname blx@sectionciteorder@\the\c@refsection\endcsname}}}% + {\blx@auxwrite\blx@bcfout{}{\blx@xml@citekey{\blx@tempa}{\blx@tempb}{0}}} + {\blx@auxwrite\blx@bcfout{}{\blx@xml@citekey{\blx@tempa}{\blx@tempb}{\expandafter\the\csname blx@sectionciteorder@\the\c@refsection\endcsname}}}% \endgroup} % {<set>}{<key1,key2,key3>} @@ -9405,12 +10150,15 @@ \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}% + \ifundef\blx@tempb + {\let\blx@tempb\@empty} + {}% % 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 - \ifcsname blx@sectionciteorder@\the\c@refsection\endcsname\else - \expandafter\newcount\csname blx@sectionciteorder@\the\c@refsection\endcsname - \fi + \ifcscounter{blx@sectionciteorder@\the\c@refsection} + {} + {\expandafter\newcount\csname blx@sectionciteorder@\the\c@refsection\endcsname}% \global\advance\csname blx@sectionciteorder@\the\c@refsection\endcsname\@ne \blx@tempcnta\z@ \blx@tempcntb\z@ @@ -9450,6 +10198,9 @@ \def\blx@citenosort{% \let\blx@tempb\blx@tempa} +\def\abx@missing@entry#1{% + \abx@missing{#1}} + % {<entrykey>} \def\blx@citeadd#1{% \ifcsdef{blx@keyalias@\the\c@refsection @#1} @@ -9461,7 +10212,7 @@ {\advance\blx@tempcnta\@ne \listeadd\blx@tempa{\blx@realkey}} {\ifnum\blx@tempcntb>\z@\multicitedelim\fi - \expandafter\abx@missing\expandafter{\blx@realkey}% + \expandafter\abx@missing@entry\expandafter{\blx@realkey}% \advance\blx@tempcntb\@ne}} % set default refcontext for one citation key @@ -9478,7 +10229,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}}% + {\blx@edef@refcontext{\blx@sorting/global//global/global}}% % assignment via keyword list \ifdef\blx@assignedrefcontextkeywlist {\def\do##1{% @@ -9594,10 +10345,35 @@ {}} % {<refsection>}{<entrykey>} +% set maxcitecounter as well, note that we also define a maxcitecounter across +% all refsections, but that does not have a high-level interface \protected\def\blx@aux@count#1#2{% - \csnumgdef{blx@count@#1@\detokenize{#2}}{\csuse{blx@count@#1@\detokenize{#2}}+1}} + \csnumgdef{blx@count@#1@\detokenize{#2}}{% + \csuse{blx@count@#1@\detokenize{#2}}+1}% + \ifnumgreater{\csuse{blx@count@#1@\detokenize{#2}}}{% + 0\csuse{blx@maxcitecounter@#1}} + {\csnumgdef{blx@maxcitecounter@#1}{% + \csuse{blx@count@#1@\detokenize{#2}}}} + {}% + \ifnumgreater{\csuse{blx@count@#1@\detokenize{#2}}}{% + 0\csuse{blx@maxcitecounter}} + {\csnumgdef{blx@maxcitecounter}{% + \csuse{blx@count@#1@\detokenize{#2}}}} + {}} + \protected\def\blx@aux@fncount#1#2{% - \csnumgdef{blx@fncount@#1@\detokenize{#2}}{\csuse{blx@fncount@#1@\detokenize{#2}}+1}} + \csnumgdef{blx@fncount@#1@\detokenize{#2}}{% + \csuse{blx@fncount@#1@\detokenize{#2}}+1}% + \ifnumgreater{\csuse{blx@fncount@#1@\detokenize{#2}}}{% + 0\csuse{blx@maxfncitecounter@#1}} + {\csnumgdef{blx@maxfncitecounter@#1}{% + \csuse{blx@fncount@#1@\detokenize{#2}}}} + {}% + \ifnumgreater{\csuse{blx@fncount@#1@\detokenize{#2}}}{% + 0\csuse{blx@maxfncitecounter}} + {\csnumgdef{blx@maxfncitecounter}{% + \csuse{blx@fncount@#1@\detokenize{#2}}}} + {}} \let\abx@aux@count\@gobbletwo \let\abx@aux@fncount\@gobbletwo @@ -9608,14 +10384,22 @@ \protected\def\blx@setcitecounter@global{% \c@citecounter0% - \csuse{blx@count@\the\c@refsection @\abx@field@entrykey}% + \csuse{blx@count@\the\c@refsection @\abx@field@entrykey}% + \relax + \c@maxcitecounter0% + \csuse{blx@maxcitecounter@\the\c@refsection}% \relax} \protected\def\blx@setcitecounter@context{% \c@citecounter0% - \iftoggle{blx@footnote} - {\csuse{blx@fncount@\the\c@refsection @\abx@field@entrykey}} - {\csuse{blx@count@\the\c@refsection @\abx@field@entrykey}}% + \iftoggle{blx@footnote} + {\csuse{blx@fncount@\the\c@refsection @\abx@field@entrykey}} + {\csuse{blx@count@\the\c@refsection @\abx@field@entrykey}}% + \relax + \c@maxcitecounter0% + \iftoggle{blx@footnote} + {\csuse{blx@maxfncitecounter@\the\c@refsection}} + {\csuse{blx@maxcitecounter@\the\c@refsection}}% \relax} % cite tracker @@ -10069,7 +10853,7 @@ \iftoggle{blx@bibliography} {} {\ifstrequal{*}{#1} - {\blx@citation@all} + {\blx@nocitation@all} {\blx@xsanitizeafter{\forcsvlist\blx@nocite@do}{#1}}}}% \@esphack} @@ -10077,11 +10861,11 @@ % 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 - \ifcsname blx@sectionciteorder@\the\c@refsection\endcsname\else - \expandafter\newcount\csname blx@sectionciteorder@\the\c@refsection\endcsname - \fi + \ifcscounter{blx@sectionciteorder@\the\c@refsection} + {} + {\expandafter\newcount\csname blx@sectionciteorder@\the\c@refsection\endcsname}% \global\advance\csname blx@sectionciteorder@\the\c@refsection\endcsname\@ne - \blx@citation{#1}\blx@msg@cundef} + \blx@nocitation{#1}\blx@msg@cundef} % {<macro>}[<arg1>][<arg2>]{<arg3>} % => <macro>{<arg1>}{<arg2>}{<arg3>} @@ -10202,18 +10986,52 @@ {\blx@defcitecmd@ii{#2#1}}} \long\def\blx@defcitecmd@ii#1{% - \protected\csedef{blx@cite@#1}{\blxciteicmd{#1}}% - \blx@defcitecmd@iv{#1}} + \csundef{blx@defcite@wrapper@#1}% + \blx@defcitecmd@iv{#1}% + \blx@defcitecmd@v{#1}} \long\def\blx@defcitecmd@iii#1[#2]{% + \csdef{blx@defcite@wrapper@#1}{#2}% + \blx@defcitecmd@iv{#1}% + \blx@defcitecmd@v{#1}} + +\long\def\blx@defcitecmd@iv#1{% \protected\long\csedef{blx@cite@#1}##1##2##3##4{% - \begingroup - \blx@citeinit - \unexpanded{#2}{\blxciteicmd{#1}{##1}{##2}{##3}{}}% - ##4\endgroup}% - \blx@defcitecmd@iv{#1}} + \ifboolexpe{test {\ifcsundef{blx@defcite@wrapper@#1}} + and + (test {\ifcsundef{blx@citepunct@#1}} + or + test {\ifcsequal{blx@citepunct@#1}{blx@citepunctid@pos@c}})} + {} + {\begingroup + \blx@citeinit}% + \ifcsequal{blx@citepunct@#1}{blx@citepunctid@pos@l} + {\noexpand\unspace##4} + {}% + \ifcsequal{blx@citepunct@#1}{blx@citepunctid@pos@f} + {\noexpand\iftoggle{blx@footnote}{}{\unspace##4}} + {}% + \ifcsundef{blx@defcite@wrapper@#1} + {\blxciteicmd{#1}{##1}{##2}{##3}{% + \ifcsundef{blx@citepunct@#1}{##4}{}% + \ifcsequal{blx@citepunct@#1}{blx@citepunctid@pos@c}{##4}{}}} + {\csexpandonce{blx@defcite@wrapper@#1}{% + \blxciteicmd{#1}{##1}{##2}{##3}{% + \ifcsequal{blx@citepunct@#1}{blx@citepunctid@pos@c}{##4}{}}}% + \ifcsundef{blx@citepunct@#1}{##4}{}}% + \ifcsequal{blx@citepunct@#1}{blx@citepunctid@pos@r}{##4}{}% + \ifcsequal{blx@citepunct@#1}{blx@citepunctid@pos@f} + {\noexpand\iftoggle{blx@footnote}{##4}{}} + {}% + \ifboolexpe{test {\ifcsundef{blx@defcite@wrapper@#1}} + and + (test {\ifcsundef{blx@citepunct@#1}} + or + test {\ifcsequal{blx@citepunct@#1}{blx@citepunctid@pos@c}})} + {} + {\endgroup}}} -\long\def\blx@defcitecmd@iv#1#2#3#4#5{% +\long\def\blx@defcitecmd@v#1#2#3#4#5{% \protected\long\csdef{blx@citei@#1}##1##2##3##4{% \ifblank{##1} {} @@ -10436,14 +11254,15 @@ \blx@citecmdinit \noexpand\@ifstar {\expandafter\noexpand - \csname blx@mcite@#4\endcsname*% + \csname blx@macitei@#1\endcsname*% \expandafter\noexpand - \csname blx@macitei@#1\endcsname} + \csname blx@maciteii@#1\endcsname} {\expandafter\noexpand - \csname blx@mcite@#4\endcsname{}% + \csname blx@macitei@#1\endcsname{}% \expandafter\noexpand - \csname blx@macitei@#1\endcsname}}% - \protected\csedef{blx@macitei@#1}##1##2##3{% + \csname blx@maciteii@#1\endcsname}}% + \csedef{blx@macitei@#1}{\csname blx@mcite@#4\endcsname}% + \protected\csedef{blx@maciteii@#1}##1##2##3{% \if l#2\noexpand\unspace##3\fi \if f#2\noexpand\iftoggle{blx@footnote}{}{\unspace##3}\fi ##1{##2}% @@ -10458,6 +11277,36 @@ {\let\blx@thecheckpunct\blx@checkpunct \def\blx@autopunct{#1}}} +% {<command>}{<pos marker>} +% pos markers are: +% l: move punctuation before the command (i.e. left of it) +% r: leave punctuation after the command (i.e. to the right) +% f: like l in normal text, like r in footnotes +% c: pass on to the cite command, +% the punctuation will eventually end up as field 'postpunct' +% d: discard the punctuation +% o (or any other value): restores the old standard behaviour +% r for wrapped citation commands, +% c for unwrapped ones +\newrobustcmd*{\DeclareCitePunctuationPosition}[2]{% + \begingroup + \escapechar\m@ne + \edef\blx@tempa{\endgroup + \noexpand\blx@defcitepunctpos@i{\string#1}{#2}}% + \blx@tempa} + +\def\blx@citepunctid@pos@l{l} +\def\blx@citepunctid@pos@r{r} +\def\blx@citepunctid@pos@f{f} +\def\blx@citepunctid@pos@c{c} +\def\blx@citepunctid@pos@d{d} + +\def\blx@defcitepunctpos@i#1#2{% + \ifcsundef{blx@citepunctid@pos@#2} + {\csundef{blx@citepunct@#1}} + {\csletcs{blx@citepunct@#1}{blx@citepunctid@pos@#2}}% + \blx@defcitecmd@iv{#1}} + \AfterEndPreamble{% babel \begingroup \makeatletter @@ -10637,6 +11486,7 @@ \def\ifuseprefix{\blx@TE{\iftoggle{blx@useprefix}}}% \def\ifterseinits{\blx@TE{\iftoggle{blx@terseinits}}}% \def\ifsingletitle{\blx@TE{\iftoggle{abx@bool@singletitle}}}% + \def\ifnocite{\blx@TE{\iftoggle{abx@bool@nocite}}}% \def\ifuniquetitle{\blx@TE{\iftoggle{abx@bool@uniquetitle}}}% \def\ifuniquebaretitle{\blx@TE{\iftoggle{abx@bool@uniquebaretitle}}}% \def\ifuniquework{\blx@TE{\iftoggle{abx@bool@uniquework}}}% @@ -10647,7 +11497,9 @@ \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}}}}} + \blx@TE{\blx@imc@ifdateshavedifferentprecision{#1}{#2}}}% + \def\ifdateyearsequal#1#2{% + \blx@TE{\blx@imc@ifdateyearsequal{#1}{#2}}}}} % {<listmacro>}{<filtercsname>} => matches in <listmacro> \protected\def\blx@bibfilter#1#2{% @@ -10667,9 +11519,9 @@ \blx@tempa} %% Auxiliary macros -\newrobustcmd*{\mkbibquote}{\enquote} +\newrobustcmd*{\mkbibquote}{\blx@enquote} \protected\def\blx@imc@mkbibquote{% - \blx@ifuspunct\blx@usquote\enquote} + \blx@ifuspunct\blx@usquote\blx@enquote} \def\blx@usquote{% \ifnum\@quotelevel>\z@ @@ -10680,26 +11532,26 @@ \long\def\blx@usoquote#1{% \begingroup - \initoquote - \textooquote#1% + \blx@initoquote + \blx@textooquote#1% \futurelet\@let@token\blx@usoquote@i} \def\blx@usoquote@i{% \blx@usqcheck {\ifx\blx@postpunct\@empty\else\blx@dopostpunct\fi - \textcoquote\endgroup} - {\blx@setpostpunct\textcoquote\endgroup}} + \blx@textcoquote\endgroup} + {\blx@setpostpunct\blx@textcoquote\endgroup}} \long\def\blx@usiquote#1{% \begingroup - \initiquote - \textoiquote#1% + \blx@initiquote + \blx@textoiquote#1% \futurelet\@let@token\blx@usiquote@i} \def\blx@usiquote@i{% \blx@usqcheck - {\textciquote\endgroup} - {\blx@setpostpunct\textciquote\endgroup}} + {\blx@textciquote\endgroup} + {\blx@setpostpunct\blx@textciquote\endgroup}} \long\def\blx@usqcheck#1#2{% \def\blx@tempa{#1}% @@ -11041,8 +11893,8 @@ ~~<bcf:transliteration entrytype="#1">\blx@nl #2% ~~</bcf:transliteration>\blx@nl} -\xdef\blx@xml@translit#1#2#3{% - ~~~~<bcf:translit target="#1" from="#2" to="#3"/>\blx@nl} +\xdef\blx@xml@translit#1#2#3#4{% + ~~~~<bcf:translit #1target="#2" from="#3" to="#4"/>\blx@nl} \xdef\blx@xml@sourcemap#1{% ~~<bcf:sourcemap>\blx@nl @@ -11220,10 +12072,10 @@ ~~<bcf:bibdata section="#1">\blx@nl #2% ~~</bcf:bibdata>\blx@nl} -\xdef\blx@xml@datasource#1#2#3{% - ~~~~<bcf:datasource type="#1" datatype="#2">#3</bcf:datasource>\blx@nl} -\xdef\blx@xml@citekey#1#2{% - ~~~~<bcf:citekey order="#2">#1</bcf:citekey>} +\xdef\blx@xml@datasource#1#2#3#4{% + ~~~~<bcf:datasource type="#1" datatype="#2"#3>#4</bcf:datasource>\blx@nl} +\xdef\blx@xml@citekey#1#2#3{% + ~~~~<bcf:citekey order="#3"#2>#1</bcf:citekey>} \xdef\blx@xml@citeset#1#2{% ~~~~<bcf:citekey type="set" members="#2">#1</bcf:citekey>} \xdef\blx@xml@svalue#1#2{% @@ -11260,10 +12112,12 @@ \blx@xml@svalue{maxalphanames}{\blx@maxalphanames}% \blx@xml@svalue{maxbibnames}{\blx@maxbibnames}% \blx@xml@svalue{maxcitenames}{\blx@maxcitenames}% + \blx@xml@svalue{maxsortnames}{\blx@maxsortnames}% \blx@xml@svalue{maxitems}{\blx@maxitems}% \blx@xml@svalue{minalphanames}{\blx@minalphanames}% \blx@xml@svalue{minbibnames}{\blx@minbibnames}% \blx@xml@svalue{mincitenames}{\blx@mincitenames}% + \blx@xml@svalue{minsortnames}{\blx@minsortnames}% \blx@xml@svalue{minitems}{\blx@minitems}% \blx@xml@toggle{singletitle}% \blx@xml@svalue{sortalphaothers}{\sortalphaothers}% @@ -11303,10 +12157,12 @@ \blx@xml@svalue{maxalphanames}{\blx@maxalphanames}% \blx@xml@svalue{maxbibnames}{\blx@maxbibnames@type}% \blx@xml@svalue{maxcitenames}{\blx@maxcitenames@type}% + \blx@xml@svalue{maxsortnames}{\blx@maxsortnames@type}% \blx@xml@svalue{maxitems}{\blx@maxitems@type}% \blx@xml@svalue{minalphanames}{\blx@minalphanames}% \blx@xml@svalue{minbibnames}{\blx@minbibnames@type}% \blx@xml@svalue{mincitenames}{\blx@mincitenames@type}% + \blx@xml@svalue{minsortnames}{\blx@minsortnames@type}% \blx@xml@svalue{minitems}{\blx@minitems@type}% \blx@xml@toggle{singletitle}% \blx@xml@toggle{skipbib}% @@ -11354,15 +12210,13 @@ \ifdef\blx@opts@type {\def\do##1{% \begingroup + \let\protect\relax \blx@setoptions@type{##1}% % Expand the type use* name toggles \let\blx@xml@nametoggles\@empty \def\do####1{\eappto\blx@xml@nametoggles{\blx@xml@toggle{use####1}}}% \abx@donames - \begingroup - \let\protect\relax \blx@checkoptions@type - \endgroup \xappto\blx@tempa{\blx@bcf@options@type{##1}}% \endgroup}% \dolistloop\blx@opts@type} @@ -11849,8 +12703,12 @@ {}} \define@key{blx@sourcemap@step}{match}{% characters \appto\blx@tempf{ map\string_match="#1"}} +\define@key{blx@sourcemap@step}{matchi}{% characters + \appto\blx@tempf{ map\string_matchi="#1"}} \define@key{blx@sourcemap@step}{notmatch}{% characters \appto\blx@tempf{ map\string_notmatch="#1"}} +\define@key{blx@sourcemap@step}{notmatchi}{% characters + \appto\blx@tempf{ map\string_notmatchi="#1"}} \define@key{blx@sourcemap@step}{replace}{% characters \eappto\blx@tempf{ map\string_replace="#1"}} @@ -12143,15 +13001,15 @@ Use '\string\DeclareBiblistFilter' to define it}} {\def\blx@thebiblistfilter{#1}}} -% [<entrytype>] +% [<langids>][<entrytype>]{translitsource}{translittarget} \newrobustcmd*{\DeclareSortTranslit}[2][]{% \begingroup \ifblank{#1} {\def\blx@tempa{*}} {\def\blx@tempa{#1}}% - \let\translit\blx@translit@setup - \let\blx@tempb\@empty - #2% + \let\translit\blx@translit@setup + \let\blx@tempb\@empty + #2% \global\cslet{blx@translit@\blx@tempa}\blx@tempb \xifinlist\blx@tempa\blx@translits {} @@ -12161,9 +13019,11 @@ \blx@collectopts{xml}{blx@globalopts}{translit}% for passing to the .bcf \blx@collectopts{xml}{blx@typeopts}{translit}% for passing to the .bcf -\newcommand*{\blx@translit@setup}[3][*]{% +\newcommand*{\blx@translit@setup}[4][]{% \eappto\blx@tempb{% - \blx@xml@translit{#1}{#2}{#3}}} + \ifblank{#1} + {\blx@xml@translit{}{#2}{#3}{#4}} + {\blx@xml@translit{langids="#1" }{#2}{#3}{#4}}}} % [<specname>]{<spec>} \newrobustcmd*{\DeclareUniquenameTemplate}[2][]{% @@ -12598,9 +13458,14 @@ \define@key{blx@opt@ldt}{mcite}[true]{% \settoggle{blx@mcite}{#1}} -\newtoggle{blx@noerroretextools} \define@key{blx@opt@ldt}{noerroretextools}[true]{% - \settoggle{blx@noerroretextools}{#1}} + \blx@warning@noline{% + The option 'noerroretextools' is deprecated.\MessageBreak + Define the control sequence '\string\blx@noerroretextools'\MessageBreak + before loading biblatex instead}% + \ifstrequal{#1}{true} + {\global\cslet{blx@noerroretextools}\@empty} + {\csgundef{blx@noerroretextools}}} % load-time and preamble @@ -12667,9 +13532,10 @@ \listxadd\blx@sortingtemplatenames\blx@sorting \def\blx@refcontext@sortingnamekeytemplatename{global}% \let\blx@refcontext@labelprefix\@empty + \let\blx@refcontext@labelprefix@real\@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}% + \blx@xdef@refcontext{\blx@refcontext@sortingtemplatename/\blx@refcontext@sortingnamekeytemplatename/\blx@refcontext@labelprefix/\blx@refcontext@uniquenametemplatename/\blx@refcontext@labelalphanametemplatename}% \listxadd\blx@refcontexts\blx@refcontext@context} \DeclareBibliographyOption[boolean]{sortcase}[true]{% @@ -12680,17 +13546,21 @@ \DeclareBibliographyOption[integer]{maxnames}{% \numdef\blx@maxcitenames{#1}% - \numdef\blx@maxbibnames{#1}} + \numdef\blx@maxbibnames{#1}% + \numdef\blx@maxsortnames{#1}} \DeclareBibliographyOption[integer]{minnames}{% \numdef\blx@mincitenames{#1}% - \numdef\blx@minbibnames{#1}} + \numdef\blx@minbibnames{#1}% + \numdef\blx@minsortnames{#1}} \DeclareTypeOption[integer]{maxnames}{% \numdef\blx@maxcitenames@type{#1}% \numdef\blx@maxbibnames@type{#1}% + \numdef\blx@maxsortnames@type{#1}% \c@maxnames#1\relax} \DeclareTypeOption[integer]{minnames}{% \numdef\blx@mincitenames@type{#1}% \numdef\blx@minbibnames@type{#1}% + \numdef\blx@minsortnames@type{#1}% \c@minnames#1\relax} \DeclareEntryOption[integer]{maxnames}{% \c@maxnames#1\relax} @@ -12698,16 +13568,20 @@ \c@minnames#1\relax} \DeclareBibliographyOption[integer]{maxbibnames}{% - \numdef\blx@maxbibnames{#1}} + \numdef\blx@maxbibnames{#1}% + \numdef\blx@maxsortnames{#1}} \DeclareBibliographyOption[integer]{minbibnames}{% - \numdef\blx@minbibnames{#1}} + \numdef\blx@minbibnames{#1}% + \numdef\blx@minsortnames{#1}} \DeclareTypeOption[integer]{maxbibnames}{% \numdef\blx@maxbibnames@type{#1}% + \numdef\blx@maxsortnames@type{#1}% \iftoggle{blx@bibliography} {\c@maxnames#1\relax} {}} \DeclareTypeOption[integer]{minbibnames}{% \numdef\blx@minbibnames@type{#1}% + \numdef\blx@minsortnames@type{#1}% \iftoggle{blx@bibliography} {\c@minnames#1\relax} {}} @@ -12743,12 +13617,25 @@ {} {\c@minnames#1\relax}} +\DeclareBibliographyOption[integer]{maxsortnames}{% + \numdef\blx@maxsortnames{#1}} +\DeclareBibliographyOption[integer]{minsortnames}{% + \numdef\blx@minsortnames{#1}} +\DeclareTypeOption[integer]{maxsortnames}{% + \numdef\blx@maxsortnames@type{#1}} +\DeclareTypeOption[integer]{minsortnames}{% + \numdef\blx@minsortnames@type{#1}} +\DeclareEntryOption[integer]{maxsortnames}{} +\DeclareEntryOption[integer]{minsortnames}{} + \appto\blx@checkoptions@global{% \blx@maxmin@num{maxbibnames}{minbibnames}\blx@maxbibnames\blx@minbibnames - \blx@maxmin@num{maxcitenames}{mincitenames}\blx@maxcitenames\blx@mincitenames} + \blx@maxmin@num{maxcitenames}{mincitenames}\blx@maxcitenames\blx@mincitenames + \blx@maxmin@num{maxsortnames}{minsortnames}\blx@maxsortnames\blx@minsortnames} \appto\blx@checkoptions@type{% \blx@maxmin@num{maxbibnames}{minbibnames}\blx@maxbibnames@type\blx@minbibnames@type - \blx@maxmin@num{maxcitenames}{mincitenames}\blx@maxcitenames@type\blx@mincitenames@type} + \blx@maxmin@num{maxcitenames}{mincitenames}\blx@maxcitenames@type\blx@mincitenames@type + \blx@maxmin@num{maxsortnames}{minsortnames}\blx@maxsortnames@type\blx@minsortnames@type} \appto\blx@checkoptions@entry{% \blx@maxmin@cnt{maxnames}{minnames}\c@maxnames\c@minnames} @@ -13571,6 +14458,13 @@ \def\blx@opt@uniquename@mininit{5} \def\blx@opt@uniquename@minfull{6} +\DeclareBibliographyOption[boolean]{noroman}[true]{% + \settoggle{blx@noroman}{#1}} +\DeclareTypeOption[boolean]{noroman}[true]{% + \settoggle{blx@noroman}{#1}} +\DeclareEntryOption[boolean]{noroman}[true]{% + \settoggle{blx@noroman}{#1}} + \DeclareBibliographyOption[boolean]{singletitle}[true]{% \settoggle{blx@singletitle}{#1}} \DeclareTypeOption[boolean]{singletitle}[true]{% @@ -13606,81 +14500,96 @@ \DeclareBibliographyOption[boolean]{locallabelwidth}[true]{% \blx@key@locallabelwidth{#1}} +%{<switch>}{<patch>}{<pre>}{<post>} +\def\blx@patchsection@switch#1#2#3#4{% + \AtEndPreamble{% + #3% + \ifcase#1 + \or % 1: part + \blx@refpatch@part{#2}% + \or % 2: chapter + \blx@refpatch@chapter{#2}% + \or % 3: section + \blx@refpatch@sect{section}{#2}{1}% + \or % 4: subsection + \blx@refpatch@sect{subsection}{#2}{2}% + \or % 5: chapter+ = part, chapter + \blx@refpatch@part{#2}% + \blx@refpatch@chapter{#2}% + \or % 6: section+ = part, chapter, section + \blx@refpatch@part{#2}% + \ifundef\chapter + {} + {\blx@refpatch@chapter{#2}}% + \blx@refpatch@sect{section}{#2}{1}% + \or % 7: subsection+ = part, chapter, section, subsection + \blx@refpatch@part{#2}% + \ifundef\chapter + {} + {\blx@refpatch@chapter{#2}}% + \blx@refpatch@sect{section}{#2}{1}% + \blx@refpatch@sect{subsection}{#2}{2}% + \fi + #4% + }% +} + \DeclareBibliographyOption[string]{refsection}{% \ifcsdef{blx@opt@refsection@#1} {\letcs\blx@refsecreset@level{blx@opt@refsection@#1}} {\blx@err@invopt{refsection=#1}{}}} -\def\blx@opt@refsection@none{0} -\def\blx@opt@refsection@part{1} -\def\blx@opt@refsection@chapter{2} -\def\blx@opt@refsection@section{3} -\def\blx@opt@refsection@subsection{4} +\csdef{blx@opt@refsection@none}{0} +\csdef{blx@opt@refsection@part}{1} +\csdef{blx@opt@refsection@chapter}{2} +\csdef{blx@opt@refsection@section}{3} +\csdef{blx@opt@refsection@subsection}{4} +\csdef{blx@opt@refsection@chapter+}{5} +\csdef{blx@opt@refsection@section+}{6} +\csdef{blx@opt@refsection@subsection+}{7} -\AtEndPreamble{% - \ifcase\blx@refsecreset@level - \or % 1 - \blx@refpatch@part\newrefsection - \or % 2 - \blx@refpatch@chapter\newrefsection - \or % 3 - \blx@refpatch@sect{section}{\newrefsection}{1}% - \or % 4 - \blx@refpatch@sect{subsection}{\newrefsection}{2}% - \fi} +\blx@patchsection@switch{\blx@refsecreset@level}{\newrefsection}{}{} \DeclareBibliographyOption[string]{refsegment}{% \ifcsdef{blx@opt@refsegment@#1} {\letcs\blx@refsegreset@level{blx@opt@refsegment@#1}} {\blx@err@invopt{refsegment=#1}{}}} -\def\blx@opt@refsegment@none{0} -\def\blx@opt@refsegment@part{1} -\def\blx@opt@refsegment@chapter{2} -\def\blx@opt@refsegment@section{3} -\def\blx@opt@refsegment@subsection{4} - -\AtEndPreamble{% - \ifnumgreater\blx@refsegreset@level\z@ - {\ifnumgreater\blx@refsegreset@level\blx@refsecreset@level - {} - {\blx@err@confopt - {refsegment/refsection} - {The 'refsegment' option must point to a - lower-level\MessageBreak document division - than 'refsection'}% - \def\blx@refsegreset@level{0}}} - {}% - \ifcase\blx@refsegreset@level - \or % 1 - \blx@refpatch@part\newrefsegment - \or % 2 - \blx@refpatch@chapter\newrefsegment - \or % 3 - \blx@refpatch@sect{section}{\newrefsegment}{1}% - \or % 4 - \blx@refpatch@sect{subsection}{\newrefsegment}{2}% - \fi} +\csdef{blx@opt@refsegment@none}{0} +\csdef{blx@opt@refsegment@part}{1} +\csdef{blx@opt@refsegment@chapter}{2} +\csdef{blx@opt@refsegment@section}{3} +\csdef{blx@opt@refsegment@subsection}{4} +\csdef{blx@opt@refsegment@chapter+}{5} +\csdef{blx@opt@refsegment@section+}{6} +\csdef{blx@opt@refsegment@subsection+}{7} + +\blx@patchsection@switch{\blx@refsegreset@level} + {\newrefsegment} + {\ifnumgreater\blx@refsegreset@level\z@ + {\ifnumgreater\blx@refsegreset@level\blx@refsecreset@level + {} + {\blx@err@confopt + {refsegment/refsection} + {The 'refsegment' option must point to a + lower-level\MessageBreak document division + than 'refsection'}% + \def\blx@refsegreset@level{0}}} + {}} + {} \DeclareBibliographyOption[string]{citereset}{% \ifcsdef{blx@opt@citereset@#1} {\letcs\blx@citereset@level{blx@opt@citereset@#1}} {\blx@err@invopt{citereset=#1}{}}} -\def\blx@opt@citereset@none{0} -\def\blx@opt@citereset@part{1} -\def\blx@opt@citereset@chapter{2} -\def\blx@opt@citereset@section{3} -\def\blx@opt@citereset@subsection{4} +\csdef{blx@opt@citereset@none}{0} +\csdef{blx@opt@citereset@part}{1} +\csdef{blx@opt@citereset@chapter}{2} +\csdef{blx@opt@citereset@section}{3} +\csdef{blx@opt@citereset@subsection}{4} +\csdef{blx@opt@citereset@chapter+}{5} +\csdef{blx@opt@citereset@section+}{6} +\csdef{blx@opt@citereset@subsection+}{7} -\AtEndPreamble{% - \ifcase\blx@citereset@level - \or % 1 - \blx@refpatch@part{\citereset\blx@inf@creset}% - \or % 2 - \blx@refpatch@chapter{\citereset\blx@inf@creset}% - \or % 3 - \blx@refpatch@sect{section}{\citereset\blx@inf@creset}{1}% - \or % 4 - \blx@refpatch@sect{subsection}{\citereset\blx@inf@creset}{2}% - \fi} +\blx@patchsection@switch{\blx@citereset@level}{\citereset\blx@inf@creset}{}{} \DeclareBibliographyOption[boolean]{bibwarn}[true]{% \ifstrequal{#1}{true} @@ -13848,7 +14757,7 @@ {}% \def\do#1{% \ifcsstring{blx@dateformat@#1}{iso} - {\StrCut{#1}{date}\blx@datetype\blx@tempnull + {\blx@stripfromendinto{#1}{date}\blx@datetype \ifdefstring\blx@dateera{astronomical}{} {\blx@warn@conflopt{% '#1=iso' requires 'dateera=astronomical'.\MessageBreak @@ -13952,9 +14861,9 @@ \blx@checkencoding \if@filesw \blx@ctrlwrite - \blx@bblinput - \blx@maxsection\z@ \fi + \blx@bblinput + \blx@maxsection\z@ \csuse{abx@preamble}% \blx@inf@refsec \blx@inf@refseg} @@ -13976,4 +14885,6 @@ \blx@dopreamblecmds \let\do\noexpand}} +\def\BiblatexHungarianWarningOff{\global\let\lbx@hu@loadinfo\@empty} + \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def b/Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def index 13fcee24063..5e04996998e 100644 --- a/Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def +++ b/Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def @@ -53,31 +53,30 @@ \string\citation{biblatex-control}}} \def\blx@sig@bib{@Comment{$ biblatex control file $}} -\edef\blx@ver@bib{@Comment{$ biblatex version \blx@bblversion\space $}} +\edef\blx@ver@bib{% + @Comment{$ biblatex bbl format version \blx@bblversion\space $}} \let\blx@sig@aux\blx@sig@bbl \let\blx@ver@aux\blx@ver@bbl -\edef\blx@msg@aux{% - \blx@sig@aux\blx@nl - \blx@ver@aux\blx@nl +\edef\blx@msg@text{% \@percentchar\space Do not modify this file!\blx@nl \@percentchar\blx@nl \@percentchar\space This is an auxiliary file used by the 'biblatex' package.\blx@nl \@percentchar\space This file may safely be deleted. It will be recreated as\blx@nl - \@percentchar\space required.\blx@nl + \@percentchar\space required.\blx@nl} + +\edef\blx@msg@aux{% + \blx@sig@aux\blx@nl + \blx@ver@aux\blx@nl + \blx@msg@text \@percentchar\blx@nl\string\relax\blx@nl} \edef\blx@msg@bib{% \blx@sig@bib\blx@nl \blx@ver@bib\blx@nl - Do not modify this file!\blx@nl\blx@nl - This is an auxiliary file used - by the 'biblatex' package.\blx@nl - This file may safely be deleted. - It will be recreated as\blx@nl - required.\blx@nl\blx@nl} + \blx@msg@text\blx@nl} % User feedback @@ -416,14 +415,20 @@ \noexpand\csuse{blx@sorting@\noexpand\blx@sorting}:% \noexpand\blx@maxcitenames:% \noexpand\blx@mincitenames:% + \noexpand\blx@maxalphanames:% + \noexpand\blx@minalphanames:% \noexpand\blx@maxline:% \noexpand\detokenize\noexpand\expandafter{\noexpand\labelalphaothers}:% + \noexpand\detokenize\noexpand\expandafter{\noexpand\blx@sortalphaothers}:% \noexpand\detokenize\noexpand\expandafter{\noexpand\blx@sorting}% \string},\blx@nl \string}% } \def\blx@ctrlwrite{% + % \sortalphaothers should only contain safe characters, + % so we should be able to \edef it + \edef\blx@sortalphaothers{\sortalphaothers}% \immediate\openout\blx@write\blx@ctrlfile\blxauxsuffix.bib\relax \blx@auxwrite\blx@write{}{\blx@ctrl}% \immediate\closeout\blx@write} diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def index d62831b6ad9..cbac63571bf 100644 --- a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def +++ b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def @@ -224,7 +224,7 @@ \ifinlistcs{##1}{blx@datamodel@fields} {} {\listcsgadd{blx@datamodel@fields}{##1}}% - \StrCut{##1}{date}\blx@datetype\blx@tempnull + \blx@stripfromendinto{##1}{date}\blx@datetype % dateparts which are ok to be null (by default *endyear) \def\do####1{% \let\blx@tempa\@empty% reset setkeys buffer due to loop calls @@ -445,7 +445,7 @@ \DeclareDatamodelEntrytypes[skipout]{xdata} \DeclareDatamodelFields[type=field, datatype=integer]{ - number, + sortyear, volume, volumes} @@ -488,6 +488,7 @@ maintitleaddon, nameaddon, note, + number, origtitle, pagetotal, part, @@ -515,7 +516,6 @@ shorttitle} \DeclareDatamodelFields[type=field, datatype=literal, skipout]{ - sortyear, sorttitle, sortshorthand, sortkey, @@ -1087,8 +1087,12 @@ \DeclareDatamodelEntryfields[online]{ addendum, author, + doi, editor, editortype, + eprint, + eprintclass, + eprinttype, language, note, organization, diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def b/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def index c929febb9f1..4817f72e16c 100644 --- a/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def +++ b/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def @@ -1,7 +1,7 @@ \ProvidesFile{blx-natbib.def} [\abx@cptid] -\renewcommand*{\nameyeardelim}{\addcomma\space} +\DeclareDelimFormat{nameyeardelim}{\addcomma\space} \newrobustcmd*{\citet}{% \@ifstar @@ -16,13 +16,11 @@ {\parencite}} \newrobustcmd*{\citealt}{% + \AtNextCite{\DeclareDelimFormat{nameyeardelim}{\addspace}}% \@ifstar - {\AtNextCite{% - \def\nameyeardelim{\addspace}% - \AtEachCitekey{\defcounter{maxnames}{999}}}% + {\AtNextCite{\AtEachCitekey{\defcounter{maxnames}{999}}}% \cite} - {\AtNextCite{\def\nameyeardelim{\addspace}}% - \cite}} + {\cite}} \newrobustcmd*{\citealp}{% \@ifstar diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx index 947f131d05a..43fb19712cb 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx @@ -58,7 +58,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -458,6 +458,7 @@ langgalician = {{galego}{galego}}, langgerman = {{alem\~ao}{alem\~ao}}, langgreek = {{grego}{grego}}, + langhungarian = {{h\'ungaro}{h\'ungaro}}, langitalian = {{italiano}{italiano}}, langjapanese = {{japon\^es}{japon\^es}}, langlatin = {{latim}{latim}}, @@ -486,6 +487,7 @@ fromgalician = {{do galego}{do galego}}, fromgerman = {{do alem\~ao}{do alem\~ao}}, fromgreek = {{do grego}{do grego}}, + fromhungarian = {{do h\'ungaro}{do h\'ungaro}}, fromitalian = {{do italiano}{do italiano}}, fromjapanese = {{do japon\^es}{do japon\^es}}, fromlatin = {{do latim}{do latim}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx index 49f90393cc3..87411636e99 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx @@ -58,7 +58,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/bulgarian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/bulgarian.lbx index dd5dad6a49a..dcc8c695c19 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/bulgarian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/bulgarian.lbx @@ -48,7 +48,7 @@ {} {\iffieldundef{#3} {\mkbibmonth{\thefield{#2}}} - {\lbx@ru@mkbibdatemonth{\thefield{#2}}}% + {\lbx@bg@mkbibdatemonth{\thefield{#2}}}% \iffieldundef{#1}{}{\space}}% \iffieldbibstring{#1} {\bibstring{\thefield{#1}}} @@ -85,7 +85,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -502,6 +502,7 @@ langgalician = {{галисийски}{гал\adddot}}, langgerman = {{немски}{нем\adddot}}, langgreek = {{гръцки}{гр\adddot}}, + langhungarian = {{унгарски}{унг\adddot}}, langitalian = {{италиански}{итал\adddot}}, langjapanese = {{японски}{яп\adddot}}, langlatin = {{латински}{лат\adddot}}, @@ -528,7 +529,8 @@ fromfrench = {{от френски}{от\addabbrvspace фр\adddot}}, fromgalician = {{от галисийски}{от\addabbrvspace гал\adddot}}, fromgerman = {{от немски}{от\addabbrvspace нем\adddot}}, - fromgreek = {{от гръцки}{от\addabbrvspace греч\adddot}}, + fromgreek = {{от гръцки}{от\addabbrvspace гр\adddot}}, + fromhungarian = {{от унгарски}{от\addabbrvspace унг\adddot}}, fromitalian = {{от италиански}{от\addabbrvspace итал\adddot}}, fromjapanese = {{от японски}{от\addabbrvspace яп\adddot}}, fromlatin = {{от латински}{от\addabbrvspace лат\adddot}}, @@ -595,4 +597,4 @@ #1\BibliographyWarning{Month out of range}% \fi}% -\endinput
\ No newline at end of file +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx index 002418b9b53..973b91b597d 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx @@ -81,7 +81,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -135,7 +135,7 @@ annotations = {{notes}{n\adddot}}, introduction = {{introducci\'o}{intr\adddot}}, foreword = {{pr\`oleg}{pr\`ol\adddot}}, - afterword = {{ep{\'\i}leg}{ep\adddot}}, + afterword = {{ep\'{\i}leg}{ep\adddot}}, editortr = {{editor i traductor}{ed\adddotspace i trad\adddot}}, editorstr = {{editors i traductors}{ed\adddotspace i trad\adddot}}, editorco = {{editor i comentarista}{ed\adddotspace i com\adddot}}, @@ -150,9 +150,9 @@ {ed\adddotspace i aut\adddotspace del pr\`ol\adddot}}, editorsfo = {{editors i autors del pr\`oleg} {ed\adddotspace i aut\adddotspace del pr\`ol\adddot}}, - editoraf = {{editor i autor de l'ep{\'\i}leg} % + editoraf = {{editor i autor de l'ep\'{\i}leg} {ed\adddotspace i aut\adddotspace de l'ep\adddot}}, - editorsaf = {{editors i autors de l'ep{\'\i}leg} % + editorsaf = {{editors i autors de l'ep\'{\i}leg} {ed\adddotspace i aut\adddotspace de l'ep\adddot}}, editortrco = {{editor, traductor i comentarista} {ed.,\addabbrvspace trad\adddotspace i com\adddot}}, @@ -170,9 +170,9 @@ {ed.,\addabbrvspace trad\adddotspace i aut\adddotspace del pr\`ol\adddot}}, editorstrfo = {{editors, traductors i autors del pr\`oleg} {ed.,\addabbrvspace trad\adddotspace i aut\adddotspace del pr\`ol\adddot}}, - editortraf = {{editor, traductor i autor de l'ep{\'\i}leg} + editortraf = {{editor, traductor i autor de l'ep\'{\i}leg} {ed.,\addabbrvspace trad\adddotspace i aut\adddotspace de l'ep\adddot}}, - editorstraf = {{editors, traductors i autors de l'ep{\'\i}leg} + editorstraf = {{editors, traductors i autors de l'ep\'{\i}leg} {ed.,\addabbrvspace trad\adddotspace i aut\adddotspace de l'ep\adddot}}, editorcoin = {{editor, comentarista i autor de la introducci\'o} {ed.,\addabbrvspace com\adddotspace i aut\adddotspace de la intr\adddot}}, @@ -182,9 +182,9 @@ {ed.,\addabbrvspace com\adddotspace i aut\adddotspace del pr\`ol\adddot}}, editorscofo = {{editors, comentaristes i autors del pr\`oleg} {ed.,\addabbrvspace com\adddotspace i aut\adddotspace del pr\`ol\adddot}}, - editorcoaf = {{editor, comentarista i autor de l'ep{\'\i}leg} + editorcoaf = {{editor, comentarista i autor de l'ep\'{\i}leg} {ed.,\addabbrvspace com\adddotspace i aut\adddotspace de l'ep\adddot}}, - editorscoaf = {{editors, comentaristes i autors de l'ep{\'\i}leg} + editorscoaf = {{editors, comentaristes i autors de l'ep\'{\i}leg} {ed.,\addabbrvspace com\adddotspace i aut\adddotspace de l'ep\adddot}}, editoranin = {{editor, anotador i autor de la introducci\'o} {ed.,\addabbrvspace anot\adddotspace i aut\adddotspace de la intr\adddot}}, @@ -194,9 +194,9 @@ {ed.,\addabbrvspace anot\adddotspace i aut\adddotspace del pr\`ol\adddot}}, editorsanfo = {{editors, anotadors i autors del pr\`oleg} {ed.,\addabbrvspace anot\adddotspace i aut\adddotspace del pr\`ol\adddot}}, - editoranaf = {{editor, anotador i autor de l'ep{\'\i}leg} + editoranaf = {{editor, anotador i autor de l'ep\'{\i}leg} {ed.,\addabbrvspace anot\adddotspace i aut\adddotspace de l'ep\adddot}}, - editorsanaf = {{editors, anotadors i autors de l'ep{\'\i}leg} + editorsanaf = {{editors, anotadors i autors de l'ep\'{\i}leg} {ed.,\addabbrvspace anot\adddotspace i aut\adddotspace de l'ep\adddot}}, editortrcoin = {{editor, traductor, comentarista i autor de la introducci\'o} {ed.,\addabbrvspace trad.,\addabbrvspace com\adddotspace i aut\adddotspace de la intr\adddot}}, @@ -206,9 +206,9 @@ {ed.,\addabbrvspace trad.,\addabbrvspace com\adddotspace i aut\adddotspace del pr\`ol\adddot }}, editorstrcofo = {{editors, traductors, comentaristes i autors del pr\`oleg} {ed.,\addabbrvspace trad.,\addabbrvspace com\adddotspace i aut\adddotspace del pr\`ol\adddot }}, - editortrcoaf = {{editor, traductor, comentarista i autor de l'ep{\'\i}leg} + editortrcoaf = {{editor, traductor, comentarista i autor de l'ep\'{\i}leg} {ed.,\addabbrvspace trad.,\addabbrvspace com\adddotspace i aut\adddotspace de l'ep\adddot}}, - editorstrcoaf = {{editors, traductors, comentaristes i autors de l'ep{\'\i}leg} + editorstrcoaf = {{editors, traductors, comentaristes i autors de l'ep\'{\i}leg} {ed.,\addabbrvspace trad.,\addabbrvspace com\adddotspace i aut\adddotspace de l'ep\adddot}}, editortranin = {{editor, traductor, anotador i autor de la introducci\'o} {ed.,\addabbrvspace trad.,\addabbrvspace anot\adddotspace i aut\adddotspace de la intr\adddot}}, @@ -218,9 +218,9 @@ {ed.,\addabbrvspace trad.,\addabbrvspace anot\adddotspace i aut\adddotspace de pr\`ol\adddot}}, editorstranfo = {{editors, traductors, anotadors i autors del pr\`oleg} {ed.,\addabbrvspace trad.,\addabbrvspace anot\adddotspace i aut\adddotspace de pr\`ol\adddot}}, - editortranaf = {{editor, traductor, anotador i autor de l'ep{\'\i}leg} + editortranaf = {{editor, traductor, anotador i autor de l'ep\'{\i}leg} {ed.,\addabbrvspace trad.,\addabbrvspace anot\adddotspace i aut\adddotspace de l'ep\adddot}}, - editorstranaf = {{editors, traductors, anotadors i autors de l'ep{\'\i}leg} + editorstranaf = {{editors, traductors, anotadors i autors de l'ep\'{\i}leg} {ed.,\addabbrvspace trad.,\addabbrvspace anot\adddotspace i aut\adddotspace de l'ep\adddot}}, translatorco = {{traductor i comentarista} {trad\adddotspace i com\adddot}}, @@ -238,9 +238,9 @@ {trad\adddotspace i aut\adddotspace del pr\`ol\adddot}}, translatorsfo = {{traductors i autors del pr\`oleg} {trad\adddotspace i aut\adddotspace del pr\`ol\adddot}}, - translatoraf = {{traductor i autor de l'ep{\'\i}leg} + translatoraf = {{traductor i autor de l'ep\'{\i}leg} {trad\adddotspace i aut\adddotspace de l'ep\adddot}}, - translatorsaf = {{traductors i autors de l'ep{\'\i}leg} + translatorsaf = {{traductors i autors de l'ep\'{\i}leg} {trad\adddotspace i aut\adddotspace de l'ep\adddot}}, translatorcoin = {{traductor, comentarista i autor de la introducci\'o} {trad.,\addabbrvspace com\adddotspace i aut\adddotspace de la intr\adddotspace}}, @@ -250,9 +250,9 @@ {trad.,\addabbrvspace com\adddotspace i aut\adddotspace del pr\`ol\adddot}}, translatorscofo = {{traductors, comentaristes i autors del pr\`oleg} {trad.,\addabbrvspace com\adddotspace i aut\adddotspace del pr\`ol\adddot}}, - translatorcoaf = {{traductor, comentarista i autor de l'ep{\'\i}leg} + translatorcoaf = {{traductor, comentarista i autor de l'ep\'{\i}leg} {trad.,\addabbrvspace com\adddotspace i aut\adddotspace de l'ep\adddot}}, - translatorscoaf = {{traductors, comentaristes i autors de l'ep{\'\i}leg} + translatorscoaf = {{traductors, comentaristes i autors de l'ep\'{\i}leg} {trad.,\addabbrvspace com\adddotspace i aut\adddotspace de l'ep\adddot}}, translatoranin = {{traductor, anotador i autor de la introducci\'o} {trad.,\addabbrvspace anot\adddotspace i aut\adddotspace de la intr\adddot}}, @@ -262,13 +262,13 @@ {trad.,\addabbrvspace anot\adddotspace i aut\adddotspace del pr\`ol\adddot}}, translatorsanfo = {{traductors, anotadors i autors del pr\`oleg} {trad.,\addabbrvspace anot\adddotspace i aut\adddotspace del pr\`ol\adddot}}, - translatoranaf = {{traductor, anotador i autor de l'ep{\'\i}leg} + translatoranaf = {{traductor, anotador i autor de l'ep\'{\i}leg} {trad.,\addabbrvspace anot\adddotspace i aut\adddotspace de l'ep\adddot}}, - translatorsanaf = {{traductors, anotadors i autors de l'ep{\'\i}leg} + 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 + organizer = {{organitzador}{org\adddot}}, + organizers = {{organitzadors}{org\adddot}}, + byorganizer = {{organitzat per}{org\adddotspace per}}, byauthor = {{per}{per}}, byeditor = {{edici\'o a cura \smartof}{ed\adddotspace\smartof}}, bycompiler = {{compilaci\'o a cura \smartof}{comp\adddotspace\smartof}}, @@ -279,16 +279,16 @@ bycontinuator = {{continuat per}{cont\adddotspace per}}, bycollaborator = {{amb la co\l.laboraci\'o \smartof}{amb la co\l.l\adddotspace\smartof}}, bytranslator = {{traducci\'o \lbx@fromlang\ a cura \smartof}{trad\adddotspace\lbx@fromlang\ \smartof}}, - bycommentator = {{comentaris a cura \smartof}{com\adddotspace\smartof}}, + bycommentator = {{comentari a cura \smartof}{com\adddotspace\smartof}}, byannotator = {{notes a cura \smartof}{n\adddotspace\smartof}}, - withcommentator = {{amb comentaris a cura \smartof}{amb com\adddotspace\smartof}}, + withcommentator = {{amb un comentari a cura \smartof}{amb un com\adddotspace\smartof}}, withannotator = {{amb notes a cura \smartof}{amb n\adddotspace\smartof}}, - withintroduction = {{amb la introducci\'o a cura \smartof}{amb la intr\adddotspace\smartof}}, - withforeword = {{amb el pr\`oleg a cura \smartof}{amb el pr\`ol\adddotspace\smartof}}, - withafterword = {{amb l'ep{\'\i}leg a cura \smartof}{amb l'ep\adddotspace\smartof}}, + withintroduction = {{amb una introducci\'o a cura \smartof}{amb una intr\adddotspace\smartof}}, + withforeword = {{amb un pr\`oleg a cura \smartof}{amb un pr\`ol\adddotspace\smartof}}, + withafterword = {{amb un ep\'{\i}leg a cura \smartof}{amb un ep\adddotspace\smartof}}, byeditortr = {{edici\'o i traducci\'o \lbx@fromlang\ a cura \smartof}% {ed\adddotspace i trad\adddotspace\lbx@fromlang\ \smartof}}, - byeditorco = {{edici\'o i comentaris a cura \smartof}% + byeditorco = {{edici\'o i comentari a cura \smartof}% {ed\adddotspace i com\adddotspace\smartof}}, byeditoran = {{edici\'o i notes a cura \smartof}% {ed\adddotspace i n\adddotspace\smartof}}, @@ -296,9 +296,9 @@ {ed\adddotspace i intr\adddotspace\smartof}}, byeditorfo = {{edici\'o i pr\`oleg a cura \smartof}% {ed\adddotspace i pr\`ol\adddotspace\smartof}}, - byeditoraf = {{edici\'o i ep{\'\i}leg a cura \smartof}% + byeditoraf = {{edici\'o i ep\'{\i}leg a cura \smartof}% {ed\adddotspace i ep\adddotspace\smartof}}, - byeditortrco = {{edici\'o, traducci\'o \lbx@fromlang\ i comentaris a cura \smartof}% + byeditortrco = {{edici\'o, traducci\'o \lbx@fromlang\ i comentari a cura \smartof}% {ed.,\addabbrvspace trad\adddotspace\lbx@fromlang\ i com\adddotspace\smartof}}, byeditortran = {{edici\'o, traducci\'o \lbx@fromlang\ i notes a cura \smartof}% {ed.,\addabbrvspace trad\adddotspace\lbx@fromlang\ i n\adddotspace\smartof}}, @@ -306,33 +306,33 @@ {ed.,\addabbrvspace trad\adddotspace\lbx@fromlang\ i intr\adddotspace\smartof}}, byeditortrfo = {{edici\'o, traducci\'o \lbx@fromlang\ i pr\`oleg a cura \smartof}% {ed.,\addabbrvspace trad\adddotspace\lbx@fromlang\ i pr\`ol\adddotspace\smartof}}, - byeditortraf = {{edici\'o, traducci\'o \lbx@fromlang\ i ep{\'\i}leg a cura \smartof}% + byeditortraf = {{edici\'o, traducci\'o \lbx@fromlang\ i ep\'{\i}leg a cura \smartof}% {ed.,\addabbrvspace trad\adddotspace\lbx@fromlang\ i ep\adddotspace\smartof}}, - byeditorcoin = {{edici\'o, comentaris i introducci\'o a cura \smartof} + byeditorcoin = {{edici\'o, comentari i introducci\'o a cura \smartof} {ed.,\addabbrvspace com\adddotspace i intr\adddotspace\smartof}}, - byeditorcofo = {{edici\'o, comentaris i pr\`oleg a cura \smartof} + byeditorcofo = {{edici\'o, comentari i pr\`oleg a cura \smartof} {ed.,\addabbrvspace com\adddotspace i pr\`ol\adddotspace\smartof}}, - byeditorcoaf = {{edici\'o, comentaris i ep{\'\i}leg a cura \smartof}% + byeditorcoaf = {{edici\'o, comentari i ep\'{\i}leg a cura \smartof}% {ed.,\addabbrvspace com\adddotspace i ep\adddotspace\smartof}}, byeditoranin = {{edici\'o, notes i introducci\'o a cura \smartof}% {ed.,\addabbrvspace n\adddotspace i intr\adddotspace\smartof}}, byeditoranfo = {{edici\'o, notes i pr\`oleg a cura \smartof}% {ed.,\addabbrvspace n\adddotspace i pr\`ol\adddotspace\smartof}}, - byeditoranaf = {{edici\'o, notes i ep{\'\i}leg a cura \smartof}% + byeditoranaf = {{edici\'o, notes i ep\'{\i}leg a cura \smartof}% {ed.,\addabbrvspace n\adddotspace i ep\adddotspace\smartof}}, - byeditortrcoin = {{edici\'o, traducci\'o \lbx@fromlang, comentaris i introducci\'o a cura \smartof}% + byeditortrcoin = {{edici\'o, traducci\'o \lbx@fromlang, comentari i introducci\'o a cura \smartof}% {ed.,\addabbrvspace trad\adddotspace \lbx@fromlang, com\adddotspace i intr\adddotspace\smartof}}, - byeditortrcofo = {{edici\'o, traducci\'o \lbx@fromlang, comentaris i pr\`oleg a cura \smartof}% + byeditortrcofo = {{edici\'o, traducci\'o \lbx@fromlang, comentari i pr\`oleg a cura \smartof}% {ed.,\addabbrvspace trad\adddotspace \lbx@fromlang, com\adddotspace i pr\`ol\adddotspace\smartof}}, - byeditortrcoaf = {{edici\'o, traducci\'o \lbx@fromlang, comentaris i ep{\'\i}leg a cura \smartof}% + byeditortrcoaf = {{edici\'o, traducci\'o \lbx@fromlang, comentari i ep\'{\i}leg a cura \smartof}% {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, com\adddot\ i ep\adddot\ \smartof}}, byeditortranin = {{edici\'o, traducci\'o \lbx@fromlang, notes i introducci\'o a cura \smartof}% {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, n\adddot\ i intr\adddot\ \smartof}}, byeditortranfo = {{edici\'o, traducci\'o \lbx@fromlang, notes i pr\`oleg a cura \smartof}% {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, n\adddot\ i pr\`ol\adddot\ \smartof}}, - byeditortranaf = {{edici\'o, traducci\'o \lbx@fromlang, notes i ep{\'\i}leg a cura \smartof}% + byeditortranaf = {{edici\'o, traducci\'o \lbx@fromlang, notes i ep\'{\i}leg a cura \smartof}% {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, n\adddot\ i ep\adddot\ \smartof}}, - bytranslatorco = {{traducci\'o \lbx@fromlang\ i comentaris a cura \smartof}% + bytranslatorco = {{traducci\'o \lbx@fromlang\ i comentari a cura \smartof}% {trad\adddot\ \lbx@fromlang\ i com\adddot\ \smartof}}, bytranslatoran = {{traducci\'o \lbx@fromlang\ i notes a cura \smartof}% {trad\adddot\ \lbx@fromlang\ i n\adddot\ \smartof}}, @@ -340,19 +340,19 @@ {trad\adddot\ \lbx@fromlang\ i intr\adddot\ \smartof}}, bytranslatorfo = {{traducci\'o \lbx@fromlang\ i pr\`oleg a cura \smartof}% {trad\adddot\ \lbx@fromlang\ i pr\`ol\adddot\ \smartof}}, - bytranslatoraf = {{traducci\'o \lbx@fromlang\ i ep{\'\i}leg a cura \smartof}% + bytranslatoraf = {{traducci\'o \lbx@fromlang\ i ep\'{\i}leg a cura \smartof}% {trad\adddot\ \lbx@fromlang\ i ep\adddot\ \smartof}}, - bytranslatorcoin = {{traducci\'o \lbx@fromlang, comentaris i introducci\'o a cura \smartof}% + bytranslatorcoin = {{traducci\'o \lbx@fromlang, comentari i introducci\'o a cura \smartof}% {trad\adddot\ \lbx@fromlang, com\adddot\ i intr\adddot\ \smartof}}, - bytranslatorcofo = {{traducci\'o \lbx@fromlang, comentaris i pr\`oleg a cura \smartof}% + bytranslatorcofo = {{traducci\'o \lbx@fromlang, comentari i pr\`oleg a cura \smartof}% {trad\adddot\ \lbx@fromlang, com\adddot\ i pr\`ol\adddot\ \smartof}}, - bytranslatorcoaf = {{traducci\'o \lbx@fromlang, comentaris i ep{\'\i}leg a cura \smartof}% + bytranslatorcoaf = {{traducci\'o \lbx@fromlang, comentari i ep\'{\i}leg a cura \smartof}% {trad\adddot\ \lbx@fromlang, com\adddot\ i ep\adddot\ \smartof}}, bytranslatoranin = {{traducci\'o \lbx@fromlang, notes i introducci\'o a cura \smartof}% {trad\adddot\ \lbx@fromlang, n\adddot\ i intr\adddot\ \smartof}}, bytranslatoranfo = {{traducci\'o \lbx@fromlang, notes i pr\`oleg a cura \smartof}% {trad\adddot\ \lbx@fromlang, n\adddot\ i pr\`ol\adddot\ \smartof}}, - bytranslatoranaf = {{traducci\'o \lbx@fromlang, notes i ep{\'\i}leg a cura \smartof}% + bytranslatoranaf = {{traducci\'o \lbx@fromlang, notes i ep\'{\i}leg a cura \smartof}% {trad\adddot\ \lbx@fromlang, n\adddot\ i ep\adddot\ \smartof}}, and = {{i}{i}}, andothers = {{et al\adddot}{et al\adddot}}, @@ -374,18 +374,18 @@ reprintfrom = {{reimpr\`es \smartof}{reimpr\adddotspace\smartof}}, reviewof = {{ressenya \smartof}{ress\adddotspace\smartof}}, translationof = {{traducci\'o \smartof}{trad\adddotspace\smartof}}, - translationas = {{tradu{\"\i}t com}{trad\adddotspace com}}, - translationfrom = {{tradu{\"\i}t del}{trad\adddotspace del}}, % Unsure of 'del' - origpubas = {{publicat originalment com}{pub\adddotspace orig\adddotspace com}}, - origpubin = {{publicat originalment el}{pub\adddotspace orig\adddotspace el}}, + translationas = {{tradu\"{\i}t com}{trad\adddotspace com}}, + translationfrom = {{tradu\"{\i}t del}{trad\adddotspace del}}, % Unsure of 'del' + origpubas = {{publicat origin\`ariament com}{pub\adddotspace orig\adddotspace com}}, + origpubin = {{publicat origin\`ariament el}{pub\adddotspace orig\adddotspace el}}, astitle = {{com}{com}}, bypublisher = {{per}{per}}, page = {{p\`agina}{p\`ag\adddot}}, pages = {{p\`agines}{p\`ag\adddot}}, column = {{columna}{col\adddot}}, columns = {{columnes}{cols\adddot}}, - line = {{l{\'\i}nia}{l{\'\i}n\adddot}}, - lines = {{l{\'\i}nies}{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}}, verses = {{versos}{v\adddot}}, @@ -393,27 +393,27 @@ 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 + pagetotal = {{p\`agina}{p\`ag\adddot}}, + pagetotals = {{p\`agines}{p\`ag\adddot}}, + columntotal = {{columna}{col\adddot}}, + columntotals = {{columnes}{col\adddot}}, + linetotal = {{l\'{\i}nia}{l\'{\i}n\adddot}}, + linetotals = {{l\'{\i}nies}{l\'{\i}n\adddot}}, + versetotal = {{vers}{v\adddot}}, + versetotals = {{versos}{v\adddot}}, + sectiontotal = {{secci\'o}{\S}}, + sectiontotals = {{seccions}{\S}}, + paragraphtotal = {{par\`agrafs}{\P}}, + paragraphtotals = {{par\`agrafs}{\P}}, in = {{a}{a}}, - inseries = {{\smartof}{\smartof}}, + inseries = {{a}{a}}, ofseries = {{\smartof}{\smartof}}, number = {{n\'umero}{n\'um\adddot}}, - chapter = {{cap{\'\i}tol}{cap\adddot}}, -% bathesis = {{}{}},% FIXME: missing - mathesis = {{tesi de m\`aster}{tesi de m\`aster}}, + chapter = {{cap\'{\i}tol}{cap\adddot}}, + bathesis = {{treball final de grau}{treb\adddotspace fin\adddotspace de gr\adddot}}, + mathesis = {{treball final de m\`aster}{treb\adddotspace fin\adddotspace de m\`ast\adddot}}, phdthesis = {{tesi doctoral}{tesi doct\adddot}}, - candthesis = {{tesi de candidatura}{tesi de cand\adddotspace}}, + candthesis = {{tesi de candidatura}{tesi de cand\adddot}}, resreport = {{informe de recerca}{inf\adddotspace de rec\adddot}}, techreport = {{informe t\`ecnic}{inf\adddotspace t\`ec\adddot}}, software = {{programari}{prog\adddot}}, @@ -422,25 +422,25 @@ version = {{versi\'o}{vers\adddot}}, url = {{adre\c{c}a}{adr\adddot}}, urlfrom = {{disponible a}{disp\adddotspace a}}, - urlseen = {{consultat}{cons\adddotspace}}, + urlseen = {{consultat}{cons\adddotspace}}, % Possibly better «consultat \smartel», but \smartel unavailable inpreparation = {{en preparaci\'o}{en prep\adddot}}, inpress = {{a impremta}{a impr\adddot}},% Per revisar prepublished = {{pre-publicat}{pre-publicat}}, submitted = {{enviat a publicar}{env\adddotspace a pub\adddot}}, - forthcoming = {{acceptat per a publicar}{acc\adddotspace per a pub\adddot}}, + forthcoming = {{properament}{prop\adddot}}, citedas = {{d'ara endavant citat com}{d'ara end\adddotspace cit\adddotspace com}}, - thiscite = {{aquesta citaci\'o}{aqu\adddotspace cit\adddot}}, + thiscite = {{concretament}{concr\adddot}},% Check seenote = {{vegeu la nota}{v\adddotspace la n\adddot}}, quotedin = {{citat a}{cit\adddotspace a}}, - idem = {{{\'\i}dem}{{\'\i}d\adddot}}, - idemsf = {{{\'\i}dem}{{\'\i}d\adddot}}, - idemsm = {{{\'\i}dem}{{\'\i}d\adddot}}, - idemsn = {{{\'\i}dem}{{\'\i}d\adddot}}, - idempf = {{{\'\i}dem}{{\'\i}d\adddot}}, - idempm = {{{\'\i}dem}{{\'\i}d\adddot}}, - idempn = {{{\'\i}dem}{{\'\i}d\adddot}}, - idempp = {{{\'\i}dem}{{\'\i}d\adddot}}, - ibidem = {{ib{\'\i}dem}{ib\adddot}}, + idem = {{\'{\i}dem}{\'{\i}d\adddot}}, + idemsf = {{\'{\i}dem}{\'{\i}d\adddot}}, + idemsm = {{\'{\i}dem}{\'{\i}d\adddot}}, + idemsn = {{\'{\i}dem}{\'{\i}d\adddot}}, + idempf = {{\'{\i}dem}{\'{\i}d\adddot}}, + idempm = {{\'{\i}dem}{\'{\i}d\adddot}}, + idempn = {{\'{\i}dem}{\'{\i}d\adddot}}, + idempp = {{\'{\i}dem}{\'{\i}d\adddot}}, + ibidem = {{ib\'{\i}dem}{ib\adddot}}, opcit = {{\`op\adddotspace cit\adddot}{\`op\adddotspace cit\adddot}}, loccit = {{loc\adddotspace cit\adddot}{loc\adddotspace cit\adddot}}, confer = {{cf\adddot}{cf\adddot}}, @@ -465,56 +465,62 @@ december = {{desembre}{des\adddot}}, langamerican = {{angl\`es americ\`a}{ang\adddotspace amer\adddot}}, langbrazilian = {{portugu\`es brasiler}{port\adddotspace bras\adddot}}, -% langbulgarian = {{}{}},% FIXME: missing + langbulgarian = {{b\'ulgar}{b\'ulg\adddot}}, 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 = {{estoni\`a}{eston\adddot}}, langfinnish = {{fin\`es}{fin\adddot}}, langfrench = {{franc\`es}{fr\adddot}}, langgalician = {{gallec}{gal\adddot}}, langgerman = {{alemany}{al\adddot}}, langgreek = {{grec}{grec}}, +% langhungarian = {{}{}}, % FIXME: missing langitalian = {{itali\`a}{it\adddot}}, - langlatin = {{llat{\'\i}}{ll\adddot}}, -% langlatvian = {{}{}},% FIXME: missing + langjapanese = {{japon\`es}{jap\adddot}}, + langlatin = {{llat\'{\i}}{ll\adddot}}, + langlatvian = {{litu\`a}{lit\adddot}}, langnorwegian = {{noruec}{nor\adddot}}, langpolish = {{polon\`es}{pol\adddot}}, langportuguese = {{portugu\`es}{port\adddot}}, langrussian = {{rus}{rus}}, -% langslovak = {{}{}},% FIXME: missing - langslovene = {{eslov\`e}{esl\adddot}}, + langslovak = {{eslovac}{eslovac}}, + langslovene = {{eslov\`e}{eslov\`e}}, langspanish = {{castell\`a}{cast\adddot}}, langswedish = {{suec}{suec}}, + langukrainian = {{ucra\"{\i}n\`es}{ucr\adddot}}, 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 + frombulgarian = {{del b\'ulgar}{del bulg\adddot}}, 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 = {{de l'estoni\`a}{de l'eston\adddot}}, fromfinnish = {{del fin\`es}{del fin\adddot}}, fromfrench = {{del franc\`es}{del fr\adddot}}, - fromgalician = {{del gallec}{del gal\adddot}}, + fromgalician = {{del gallec}{del gall\adddot}}, fromgerman = {{de l'alemany}{de l'al\adddot}}, fromgreek = {{del grec}{del grec}}, +% fromhungarian = {{}{}}, % FIXME: missing fromitalian = {{de l'itali\`a}{de l'it\adddot}}, - fromlatin = {{del llat{\'\i}}{del ll\adddot}}, -% fromlatvian = {{}{}},% FIXME: missing + fromjapanese = {{del japon\`es}{del jap\adddot}}, + fromlatin = {{del llat\'{\i}}{del ll\adddot}}, + fromlatvian = {{del litu\`a}{del lit\adddot}}, fromnorwegian = {{del noruec}{del nor\adddot}}, frompolish = {{del polon\`es}{del pol\adddot}}, fromportuguese = {{del portugu\`es}{del port\adddot}}, fromrussian = {{del rus}{del rus}}, -% fromslovak = {{}{}},% FIXME: missing - fromslovene = {{de l'eslov\`e}{de l'esl\adddot}}, + fromslovak = {{de l'eslovac}{de l'eslovac}}, + fromslovene = {{de l'eslov\`e}{de l'eslov\`e}}, fromspanish = {{del castell\`a}{del cast\adddot}}, fromswedish = {{del suec}{del suec}}, + fromukrainian = {{de l'ucra\"{\i}n\`es}{de l'ucr\adddot}}, countryde = {{Alemanya}{DE}}, countryeu = {{Uni\'o Europea}{UE}}, countryep = {{Uni\'o Europea}{UE}}, @@ -541,11 +547,11 @@ beforecommonera = {{abans de l'Era Comuna}{AEC}}, annodomini = {{despr\'es de Crist}{dC}}, beforechrist = {{abans de Crist}{aC}}, -% circa = {{}{}},% FIXME: missing -% spring = {{}{}},% FIXME: missing -% summer = {{}{}},% FIXME: missing -% autumn = {{}{}},% FIXME: missing -% winter = {{}{}},% FIXME: missing + circa = {{circa}{c\adddot}}, + spring = {{primavera}{prim\adddot}}, + summer = {{estiu}{est\adddot}}, + autumn = {{tardor}{tard\adddot}}, + winter = {{hivern}{hiv\adddot}}, am = {{a\adddotspace m\adddot}{a\adddotspace m\adddot}}, pm = {{p\adddotspace m\adddot}{p\adddotspace m\adddot}}, } @@ -561,7 +567,7 @@ \begingroup \def\forceD##1{a\relax}% \def\forceDE##1{x\relax}% - \def\do##1{\let##1\@empty}% + \def\do##1{\let##1\@firstofone}% \abx@dosingleaccents \abx@dodoubleaccents \def\i{i}\def\j{j}% @@ -578,7 +584,7 @@ \let~\@empty \fi \let\protect\noexpand - \lowercase{\edef\lbx@tempa{#1}}% + \edef\lbx@tempa{#1}% \expandafter\futurelet \expandafter\lbx@tempa \expandafter\lbx@ca@smartof@ii @@ -589,23 +595,31 @@ \def\lbx@tempa##1{\futurelet\lbx@tempa\lbx@ca@smartof@ii##1}% \else\ifcat\noexpand~\noexpand\lbx@tempa \def\lbx@tempa##1{\futurelet\lbx@tempa\lbx@ca@smartof@ii}% - \else\if a\noexpand\lbx@tempa - \let\lbx@tempa\lbx@ca@smartof@d - \else\if e\noexpand\lbx@tempa - \let\lbx@tempa\lbx@ca@smartof@d - \else\if i\noexpand\lbx@tempa - \let\lbx@tempa\lbx@ca@smartof@d - \else\if o\noexpand\lbx@tempa - \let\lbx@tempa\lbx@ca@smartof@d - \else\if u\noexpand\lbx@tempa - \let\lbx@tempa\lbx@ca@smartof@d - \else\if y\noexpand\lbx@tempa + \else + \ifnum 0% + \if a\noexpand\lbx@tempa 1\fi + \if e\noexpand\lbx@tempa 1\fi + \if i\noexpand\lbx@tempa 1\fi + \if o\noexpand\lbx@tempa 1\fi + \if u\noexpand\lbx@tempa 1\fi + \if y\noexpand\lbx@tempa 1\fi + \if A\noexpand\lbx@tempa 1\fi + \if E\noexpand\lbx@tempa 1\fi + \if I\noexpand\lbx@tempa 1\fi + \if O\noexpand\lbx@tempa 1\fi + \if U\noexpand\lbx@tempa 1\fi + \if Y\noexpand\lbx@tempa 1\fi + >0 % \let\lbx@tempa\lbx@ca@smartof@d - \else\if h\noexpand\lbx@tempa + \else + \ifnum 0% + \if h\noexpand\lbx@tempa 1\fi + \if H\noexpand\lbx@tempa 1\fi + >0 % \def\lbx@tempa##1{\futurelet\lbx@tempa\lbx@ca@smartof@ii}% \else \let\lbx@tempa\lbx@ca@smartof@de - \fi\fi\fi\fi\fi\fi\fi\fi\fi + \fi\fi\fi\fi \lbx@tempa} \gdef\lbx@ca@smartof@d#1&{\endgroup d'} diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx index 83547e50d74..597c80bf219 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx @@ -61,7 +61,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -487,6 +487,7 @@ langgalician = {{galicijski}{galicijski}}, langgerman = {{njema\v{c}ki}{njema\v{c}ki}}, langgreek = {{gr\v{c}ki}{gr\v{c}ki}}, + langhungarian = {{ma\dj arski}{ma\dj arski}}, langitalian = {{talijanski}{talijanski}}, langlatin = {{latinski}{latinski}}, % langlatvian = {{}{}},% FIXME: missing @@ -513,6 +514,7 @@ 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}}, + fromhungarian = {{s ma\dj arskog}{s ma\dj arskog}}, fromitalian = {{s talijanskog}{s talijanskog}}, fromlatin = {{s latinskog}{s latinskog}}, % fromlatvian = {{}{}},% FIXME: missing diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx index ee31cd2c658..716b3a1ee85 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx @@ -53,7 +53,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -399,6 +399,7 @@ 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}}, +% langhungarian = {{}{}}, % FIXME: missing langitalian = {{ital\v{s}tina}{ital\adddot}}, langlatin = {{latina}{lat\adddot}}, % langlatvian = {{}{}},% FIXME: missing @@ -424,6 +425,7 @@ 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}}, +% fromhungarian = {{}{}}, % FIXME: missing fromitalian = {{z ital\v{s}tiny}{z ital\adddot}}, fromlatin = {{z latiny}{z lat\adddot}}, % fromlatvian = {{}{}},% FIXME: missing diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx index 9d5801a91a2..aff486227e3 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx @@ -51,7 +51,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -71,374 +71,360 @@ \DeclareBibliographyStrings{% bibliography = {{Bibliografi}{Bibliografi}}, - references = {{Referencer}{Referencer}}, - shorthands = {{Fortegnelse over forkortelser}{Forkortelsesfortegnelse}}, + references = {{Litteraturhenvisninger}{Litteratur}}, + shorthands = {{Forkortelser}{Forkortelser}}, editor = {{redakt\o r}{red\adddot}}, - editors = {{redakt\o rer}{red\adddot}}, + editors = {{redakt\o rer}{redd\adddot}}, compiler = {{kompilator}{kompilator}}, compilers = {{kompilatorer}{kompilatorer}}, -% alternative translation: -% compiler = {{redakt\o r}{red\adddot}}, -% compilers = {{redakt\o rer}{red\adddot}}, - redactor = {{redakt\o r}{red\adddot}},% FIXME: redactor and editor are the same string; need to find a noun corresponding to "bearbejdet af" - redactors = {{redakt\o rer}{red\adddot}}, -% reviser = {{}{}},% FIXME: missing -% revisers = {{}{}},% FIXME: missing - founder = {{grundl\ae gger}{grundl\adddot}}, - founders = {{grundl\ae ggere}{grundl\adddot}}, -% continuator = {{}{}},% FIXME: missing -% continuators = {{}{}},% FIXME: missing -% collaborator = {{}{}},% FIXME: missing -% collaborators = {{}{}},% FIXME: missing + redactor = {{medredakt\o r}{medred\adddot}}, + redactors = {{medredakt\o rer}{medredd\adddot}}, + reviser = {{revision}{rev\adddot}}, + revisers = {{revision}{revv\adddot}}, + founder = {{stifter}{stifter}}, + founders = {{stiftere}{stiftere}}, + continuator = {{videref{\o}rer}{videref\adddot}}, + continuators = {{videref{\o}rere}{videreff\adddot}}, + collaborator = {{medarbejder}{medarb\adddot}}, + collaborators = {{medarbejdere}{medarbb\adddot}}, translator = {{overs\ae tter}{overs\adddot}}, - translators = {{overs\ae ttere}{overs\adddot}}, + translators = {{overs\ae ttere}{overss\adddot}}, commentator = {{kommentator}{komm\adddot}}, commentators = {{kommentatorer}{komm\adddot}}, - annotator = {{fortolker}{fortolker}}, - annotators = {{fortolkere}{fortolkere}}, -% alternative translations: -% annotator = {{kommentator}{kommentator}}, -% annotators = {{kommentatorer}{kommentatorer}}, + annotator = {{kommentator}{komm\adddot}}, + annotators = {{kommentatorer}{komm\adddot}}, commentary = {{kommentar}{komm\adddot}}, - annotations = {{forklaringer}{forkl\adddot}}, -% alternative translation: -% annotations = {{fortolkning}{fortolkning}}, + annotations = {{annoteringer}{ann.\adddot}}, introduction = {{indledning}{indl\adddot}}, foreword = {{forord}{forord}}, afterword = {{efterord}{efterord}}, editortr = {{redakt\o r og overs\ae tter}% {red\adddotspace og overs\adddot}}, editorstr = {{redakt\o rer og overs\ae ttere}% - {red\adddotspace og overs\adddot}}, + {redd\adddotspace og overss\adddot}}, editorco = {{redakt\o r og kommentator} {red\adddotspace og komm\adddot}}, editorsco = {{redakt\o rer og kommentatorer} + {redd\adddotspace og komm\adddot}}, + editoran = {{redakt\o r og kommentator}% {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 indledning}% - {red\adddotspace og indl\adddot}}, - editorsin = {{redakt\o rer og indledning}% + editorsan = {{redakt\o rer og kommentatorer}% + {redd\adddotspace og komm\adddot}}, + editorin = {{redaktion og indledning}% {red\adddotspace og indl\adddot}}, - editorfo = {{redakt\o r og forord}% + editorsin = {{redaktion og indledning}% + {redd\adddotspace og indl\adddot}}, + editorfo = {{redaktion og forord}% {red\adddotspace og forord}}, - editorsfo = {{redakt\o rer og forord}% - {red\adddotspace og forord}}, - editoraf = {{redakt\o r og efterord}% - {red\adddotspace og efterord}}, - editorsaf = {{redakt\o rer og efterord}% + editorsfo = {{redaktion og forord}% + {redd\adddotspace og forord}}, + editoraf = {{redaktion og efterord}% {red\adddotspace og efterord}}, + editorsaf = {{redaktion og efterord}% + {redd\adddotspace og efterord}}, editortrco = {{redakt\o r, overs\ae tter og kommentator}% {red.,\addabbrvspace overs\adddotspace og komm\adddot}}, editorstrco = {{redakt\o rer, overs\ae ttere og kommentatorer}% + {redd.,\addabbrvspace overss\adddotspace og komm\adddot}}, + editortran = {{redakt\o r, overs\ae tter og kommentator}% {red.,\addabbrvspace overs\adddotspace og komm\adddot}}, - editortran = {{redakt\o r, overs\ae tter og forklaringer}% - {red.,\addabbrvspace overs\adddotspace og forkl\adddot}}, - editorstran = {{redakt\o rer, overs\ae ttere og forklaringer}% - {red.,\addabbrvspace overs\adddotspace og forkl\adddot}}, - editortrin = {{redakt\o r, overs\ae tter og indledning}% + editorstran = {{redakt\o rer, overs\ae ttere og kommentatorer}% + {redd.,\addabbrvspace overss\adddotspace og komm\adddot}}, + editortrin = {{redaktion, overs\ae ttelse og indledning}% {red.,\addabbrvspace overs\adddotspace og indl\adddot}}, - editorstrin = {{redakt\o rer, overs\ae ttere og indledning}% - {red.,\addabbrvspace overs\adddotspace og indl\adddot}}, - editortrfo = {{redakt\o r, overs\ae tter og forord}% - {red.,\addabbrvspace overs\adddotspace og forord}}, - editorstrfo = {{redakt\o rer, overs\ae ttere og forord}% + editorstrin = {{redaktion, overs\ae ttelse og indledning}% + {redd.,\addabbrvspace overs\adddotspace og indl\adddot}}, + editortrfo = {{redaktion, overs\ae ttelse og forord}% {red.,\addabbrvspace overs\adddotspace og forord}}, - editortraf = {{redakt\o r, overs\ae tter og efterord}% + editorstrfo = {{redaktion, overs\ae ttelse og forord}% + {redd.,\addabbrvspace overs\adddotspace og forord}}, + editortraf = {{redaktion, overs\ae ttelse og efterord}% {red.,\addabbrvspace overs\adddotspace og efterord}}, - editorstraf = {{redakt\o rer, overs\ae ttere og efterord}% - {red.,\addabbrvspace overs\adddotspace og efterord}}, - editorcoin = {{redakt\o r, kommentator og indledning}% - {red.,\addabbrvspace komm\adddotspace og indl\adddot}}, - editorscoin = {{redakt\o rer, kommentatorer og indledning}% + editorstraf = {{redaktion, overs\ae ttelse og efterord}% + {redd.,\addabbrvspace overs\adddotspace og efterord}}, + editorcoin = {{redaktion, kommentarer og indledning}% {red.,\addabbrvspace komm\adddotspace og indl\adddot}}, - editorcofo = {{redakt\o r, kommentator og forord}% + editorscoin = {{redaktion, kommentarer og indledning}% + {redd.,\addabbrvspace komm\adddotspace og indl\adddot}}, + editorcofo = {{redaktion, kommentarer og forord}% {red.,\addabbrvspace komm\adddotspace og forord}}, - editorscofo = {{redakt\o rer, kommentatorer og forord}% - {red.,\addabbrvspace komm\adddotspace og forord}}, - editorcoaf = {{redakt\o r, kommentator og efterord}% - {red.,\addabbrvspace komm\adddotspace og efterord}}, - editorscoaf = {{redakt\o rer, kommentatorer og efterord}% + editorscofo = {{redaktion, kommentarer og forord}% + {redd.,\addabbrvspace komm\adddotspace og forord}}, + editorcoaf = {{redaktion, kommentarer og efterord}% {red.,\addabbrvspace komm\adddotspace og efterord}}, - editoranin = {{redakt\o r, forklaringer og indledning}% - {red.,\addabbrvspace forkl\adddotspace og indl\adddot}}, - editorsanin = {{redakt\o rer, forklaringer og indledning}% - {red.,\addabbrvspace forkl\adddotspace og indl\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 efterord}% - {red.,\addabbrvspace forkl\adddotspace og efterord}}, - editorsanaf = {{redakt\o rer, forklaringer og efterord}% - {red.,\addabbrvspace forkl\adddotspace og efterord}}, - editortrcoin = {{redakt\o r, overs\ae tter, kommentator og indledning}% + editorscoaf = {{redaktion, kommentarer og efterord}% + {redd.,\addabbrvspace komm\adddotspace og efterord}}, + editoranin = {{redaktion, annoteringer og indledning}% + {red.,\addabbrvspace ann\adddotspace og indl\adddot}}, + editorsanin = {{redaktion, \adddotspace og indledning}% + {redd.,\addabbrvspace ann\adddotspace og indl\adddot}}, + editoranfo = {{redaktion, \adddotspace og forord}% + {red.,\addabbrvspace ann\adddotspace og forord}}, + editorsanfo = {{redaktion, annoteringer og forord}% + {redd.,\addabbrvspace ann\adddotspace og forord}}, + editoranaf = {{redaktion, annoteringer og efterord}% + {red.,\addabbrvspace ann\adddotspace og efterord}}, + editorsanaf = {{redaktion, annoteringer og efterord}% + {redd.,\addabbrvspace ann\adddotspace og efterord}}, + editortrcoin = {{redaktion, overs\ae ttelse, kommentarer og indledning}% {red.,\addabbrvspace overs., komm\adddotspace og indl\adddot}}, - editorstrcoin = {{redakt\o rer, overs\ae ttere, kommentatorer og indledning}% - {red.,\addabbrvspace overs., komm\adddotspace og indl\adddot}}, - editortrcofo = {{redakt\o r, overs\ae tter, kommentator og forord}% - {red.,\addabbrvspace overs., komm\adddotspace og forord}}, - editorstrcofo = {{redakt\o rer, overs\ae ttere, kommentatorer og forord}% + editorstrcoin = {{redaktion, overs\ae ttelse, kommentarer og indledning}% + {redd.,\addabbrvspace overs., komm\adddotspace og indl\adddot}}, + editortrcofo = {{redaktion, overs\ae ttelse, kommentarer og forord}% {red.,\addabbrvspace overs., komm\adddotspace og forord}}, - editortrcoaf = {{redakt\o r, overs\ae tter, kommentator og efterord}% + editorstrcofo = {{redaktion, overs\ae ttelse, kommentarer og forord}% + {redd.,\addabbrvspace overs., komm\adddotspace og forord}}, + editortrcoaf = {{redaktion, overs\ae ttelse, kommentarer og efterord}% {red.,\addabbrvspace overs., komm\adddotspace og efterord}}, - editorstrcoaf = {{redakt\o rer, overs\ae ttere, kommentatorer og efterord}% - {red.,\addabbrvspace overs., komm\adddotspace og efterord}}, - editortranin = {{redakt\o r, overs\ae tter, forklaringer og indledning}% - {red.,\addabbrvspace overs., forkl\adddotspace og indl\adddot}}, - editorstranin = {{redakt\o rer, overs\ae ttere, forklaringer og indledning}% - {red.,\addabbrvspace overs., forkl\adddotspace og indl\adddot}}, - editortranfo = {{redakt\o r, overs\ae tter, forklaringer og forord}% - {red.,\addabbrvspace overs., forkl\adddotspace og forord}}, - editorstranfo = {{redakt\o rer, overs\ae ttere, forklaringer og forord}% - {red.,\addabbrvspace overs., forkl\adddotspace og forord}}, - editortranaf = {{redakt\o r, overs\ae tter, forklaringer og efterord}% - {red.,\addabbrvspace overs., forkl\adddotspace og efterord}}, - editorstranaf = {{redakt\o rer, overs\ae ttere, forklaringer og efterord}% - {red.,\addabbrvspace overs., forkl\adddotspace og efterord}}, - translatorco = {{overs\ae tter og kommentator}% + editorstrcoaf = {{redaktion, overs\ae ttelse, kommentarer og efterord}% + {redd.,\addabbrvspace overs., komm\adddotspace og efterord}}, + editortranin = {{redaktion, overs\ae ttelse, annoteringer og indledning}% + {red.,\addabbrvspace overs., ann\adddotspace og indl\adddot}}, + editorstranin = {{redaktion, overs\ae ttelse, annoteringer og indledning}% + {redd.,\addabbrvspace overs., ann\adddotspace og indl\adddot}}, + editortranfo = {{redaktion, overs\ae ttelse, annoteringer og forord}% + {red.,\addabbrvspace overs., ann\adddotspace og forord}}, + editorstranfo = {{redaktion, overs\ae ttelse, annoteringer og forord}% + {redd.,\addabbrvspace overs., ann\adddotspace og forord}}, + editortranaf = {{redaktion, overs\ae ttelse, annoteringer og efterord}% + {red.,\addabbrvspace overs., ann\adddotspace og efterord}}, + editorstranaf = {{redaktion, overs\ae ttelse, annoteringer og efterord}% + {redd.,\addabbrvspace overs., ann\adddotspace og efterord}}, + translatorco = {{overs\ae ttelse og kommentarer}% {overs\adddotspace og komm\adddot}}, - translatorsco = {{overs\ae ttere og kommentatorer}% + translatorsco = {{overs\ae ttelse og kommentarer}% {overs\adddotspace og komm\adddot}}, - translatoran = {{overs\ae tter og forklaringer}% - {overs\adddotspace og forkl\adddot}}, - translatorsan = {{overs\ae ttere og forklaringer}% - {overs\adddotspace og forkl\adddot}}, - translatorin = {{overs\ae tter og indledning}% + translatoran = {{overs\ae ttelse og annoteringer}% + {overs\adddotspace og ann\adddot}}, + translatorsan = {{overs\ae ttelse og annoteringer}% + {overs\adddotspace og ann\adddot}}, + translatorin = {{overs\ae ttelse og indledning}% {overs\adddotspace og indl\adddot}}, - translatorsin = {{overs\ae ttere og indledning}% + translatorsin = {{overs\ae ttelse og indledning}% {overs\adddotspace og indl\adddot}}, - translatorfo = {{overs\ae tter og forord}% + translatorfo = {{overs\ae ttelse og forord}% {overs\adddotspace og forord}}, - translatorsfo = {{overs\ae ttere og forord}% + translatorsfo = {{overs\ae ttelse og forord}% {overs\adddotspace og forord}}, - translatoraf = {{overs\ae tter og efterord}% + translatoraf = {{overs\ae ttelse og efterord}% {overs\adddotspace og efterord}}, - translatorsaf = {{overs\ae ttere og efterord}% + translatorsaf = {{overs\ae ttelse og efterord}% {overs\adddotspace og efterord}}, - translatorcoin = {{overs\ae tter, kommentarer og indledning}% + translatorcoin = {{overs\ae ttelse, kommentarer og indledning}% {overs., komm\adddotspace og indl\adddot}}, - translatorscoin = {{overs\ae ttere, kommentarer og indledning}% + translatorscoin = {{overs\ae ttelse, kommentarer og indledning}% {overs., komm\adddotspace og indl\adddot}}, - translatorcofo = {{overs\ae tter, kommentarer og forord}% + translatorcofo = {{overs\ae ttelse, kommentarer og forord}% {overs., komm\adddotspace og forord}}, - translatorscofo = {{overs\ae ttere, kommentarer og forord}% + translatorscofo = {{overs\ae ttelse, kommentarer og forord}% {overs., komm\adddotspace og forord}}, - translatorcoaf = {{overs\ae tter, kommentarer og efterord}% + translatorcoaf = {{overs\ae ttelse, kommentarer og efterord}% {overs., komm\adddotspace og efterord}}, - translatorscoaf = {{overs\ae ttere, kommentarer og efterord}% + translatorscoaf = {{overs\ae ttelse, kommentarer og efterord}% {overs., komm\adddotspace og efterord}}, - translatoranin = {{overs\ae tter, forklaringer og indledning}% - {overs., forkl\adddotspace og indl\adddot}}, - translatorsanin = {{overs\ae ttere, forklaringer og indledning}% - {overs., forkl\adddotspace og indl\adddot}}, - translatoranfo = {{overs\ae tter, forklaringer og forord}% - {overs., forkl\adddotspace og forord}}, - translatorsanfo = {{overs\ae ttere, forklaringer og forord}% - {overs., forkl\adddotspace og forord}}, - translatoranaf = {{overs\ae tter, forklaringer og efterord}% - {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 + translatoranin = {{overs\ae ttelse, annoteringer og indledning}% + {overs., ann\adddotspace og indl\adddot}}, + translatorsanin = {{overs\ae ttelse, annoteringer og indledning}% + {overs., ann\adddotspace og indl\adddot}}, + translatoranfo = {{overs\ae ttelse, annoteringer og forord}% + {overs., ann\adddotspace og forord}}, + translatorsanfo = {{overs\ae ttelse, annoteringer og forord}% + {overs., ann\adddotspace og forord}}, + translatoranaf = {{overs\ae ttelse, annoteringer og efterord}% + {overs., ann\adddotspace og efterord}}, + translatorsanaf = {{overs\ae ttelse, annoteringer og efterord}% + {overs., ann\adddotspace og efterord}}, + organizer = {{organisator}{org\adddot}}, + organizers = {{organisatorer}{orgg\adddot}}, + byorganizer = {{organiseret af}{org\adddotspace av}}, byauthor = {{af}{af}}, byeditor = {{udgivet af}{udg\adddotspace af}}, bycompiler = {{kompileret af}{komp\adddotspace af}}, byredactor = {{bearbejdet af}{bearb\adddotspace af}}, byreviser = {{revideret af}{rev\adddotspace af}}, - byreviewer = {{bed\o mt af}{bed\adddotspace af}}, - byfounder = {{grundlagt af}{grundl\adddotspace af}}, + byreviewer = {{bed\o mt af}{bed\o mt af}}, + byfounder = {{stiftet af}{stiftet af}}, bycontinuator = {{videref\o rt af}{videref\adddotspace af}}, - bycollaborator = {{i samarbejde med}{i samarb\adddotspace med}}, - bytranslator = {{oversat \lbx@lfromlang\ af}{oversat \lbx@sfromlang\ af}}, + bycollaborator = {{i samarbejde med}{i samarb\adddotspace m\adddotspace}}, + bytranslator = {{oversat \lbx@lfromlang\ af}% + {overs\adddot \lbx@sfromlang\ af}}, bycommentator = {{kommenteret af}{komm\adddot\ af}}, - byannotator = {{forklaret af}{forkl\adddot\ af}}, -% alternative translation -% byannotator = {{fortolket af}{fortolket af}}, - withcommentator = {{med en kommentar af}{med en komm\adddot\ af}}, - withannotator = {{med forklaringer af}{med forkl\adddot\ af}}, - withintroduction = {{med en indledning af}{med en indl\adddot\ af}}, - withforeword = {{med et forord af}{med et forord af}}, - withafterword = {{med et efterord af}{med et efterord af}}, + byannotator = {{annoteret af}{ann\adddot\ af}}, + withcommentator = {{med kommentarer af}{m\adddotspace komm\adddot\ af}}, + withannotator = {{med annoteringer af}{m\adddotspace ann\adddot\ af}}, + withintroduction = {{med indledning af}{m\adddotspace indl\adddot\ af}}, + withforeword = {{med forord af}{m\adddotspace forord af}}, + withafterword = {{med efterord af}{m\adddotspace efterord af}}, byeditortr = {{udgivet og oversat \lbx@lfromlang\ af}% - {udg\adddotspace og oversat \lbx@sfromlang\ af}}, + {udg\adddotspace og overs\adddot \lbx@sfromlang\ af}}, byeditorco = {{udgivet og kommenteret af}% {udg\adddotspace og komm\adddot\ af}}, - byeditoran = {{udgivet og forklaret af}% - {udg\adddotspace og forkl\adddot\ af}}, - byeditorin = {{udgivet og med en indledning skrevet af}% - {udg\adddotspace og med en indledning skrev\adddot\ af}}, - byeditorfo = {{udgivet og med et forord skrevet af}% - {udg\adddotspace og med et forord skrev\adddot\ af}}, - byeditoraf = {{udgivet og med et efterord skrevet af}% - {udg\adddotspace og med et efterord skrev\adddot\ af}}, + byeditoran = {{udgivet med annoteringer af}% + {udg\adddotspace m\adddotspace ann\adddotspace af}}, + byeditorin = {{udgivet med indledning af}% + {udg\adddotspace med indl\adddot\ af}}, + byeditorfo = {{udgivet med forord af}% + {udg\adddotspace med forord af}}, + byeditoraf = {{udgivet med efterord af}% + {udg\adddotspace med efterord af}}, byeditortrco = {{udgivet, oversat \lbx@lfromlang\ og kommenteret af}% - {udg.,\addabbrvspace oversat \lbx@sfromlang\ og komm\adddot\ af}}, - byeditortran = {{udgivet, oversat \lbx@lfromlang\ og forklaret af}% - {udg.,\addabbrvspace oversat \lbx@sfromlang\ og forkl\adddot\ af}}, - byeditortrin = {{udgivet, oversat \lbx@lfromlang\ og med en indledning skrevet af}% - {udg.,\addabbrvspace oversat \lbx@sfromlang\ og med en indl\adddot\ skrev\adddot\ af}}, - byeditortrfo = {{udgivet, oversat \lbx@lfromlang\ og med et forord skrevet af}% - {wnoversat \lbx@sfromlang\ og med et forord skrev\adddot\ af}}, - byeditortraf = {{udgivet, oversat \lbx@lfromlang\ og med et efterord skrevet af}% - {udg.,\addabbrvspace oversat \lbx@sfromlang\ og med et efterord skrev\adddot\ af}}, - byeditorcoin = {{udgivet, kommenteret og med en indledning skrevet af}% - {udg.,\addabbrvspace komm\adddot\ og med en indl\adddot\ skrev\adddot\ af}}, - byeditorcofo = {{udgivet, kommenteret og med et forord skrevet af}% - {udg.,\addabbrvspace komm\adddot\ og med et forord skrev\adddot\ af}}, - byeditorcoaf = {{udgivet, kommenteret og med et efterord skrevet af}% - {udg.,\addabbrvspace komm\adddot\ og med et efterord skrev\adddot\ af}}, - byeditoranin = {{udgivet, forklaret og med en indledning skrevet af}% - {udg.,\addabbrvspace forkl\adddot\ og med en indl\adddot\ skrev\adddot\ af}}, - byeditoranfo = {{udgivet, forklaret og med et forord skrevet af}% - {udg.,\addabbrvspace forkl\adddot\ og med et forord skrev\adddot\ af}}, - byeditoranaf = {{udgivet, forklaret og med et efterord skrevet af}% - {udg.,\addabbrvspace forkl\adddot\ og med et efterord skrev\adddot\ af}}, - byeditortrcoin = {{udgivet, oversat \lbx@lfromlang, kommenteret og med en indledning skrevet af}% - {udg.,\addabbrvspace oversat \lbx@sfromlang, komm\adddot\ og med en indl\adddot\ skrev\adddot\ af}}, - byeditortrcofo = {{udgivet, oversat \lbx@lfromlang, kommenteret og med et forord skrevet af}% - {udg.,\addabbrvspace oversat \lbx@sfromlang, komm\adddot\ og med et forord skrev\adddot\ af}}, - byeditortrcoaf = {{udgivet, oversat \lbx@lfromlang, kommenteret og med et efterord skrevet af}% - {udg.,\addabbrvspace oversat \lbx@sfromlang, komm\adddot\ og med et efterord skrev\adddot\ af}}, - byeditortranin = {{udgivet, oversat \lbx@lfromlang, forklaret og med en indledning skrevet af}% - {udg.,\addabbrvspace oversat \lbx@sfromlang, forkl\adddot\ og med en indl\adddot\ skrev\adddot\ af}}, - byeditortranfo = {{udgivet, oversat \lbx@lfromlang, forklaret og med et forord skrevet af}% - {udg.,\addabbrvspace oversat \lbx@sfromlang, forkl\adddot\ og med et forord skrev\adddot\ af}}, - byeditortranaf = {{udgivet, oversat \lbx@lfromlang, forklaret og med et efterord skrevet af}% - {udg.,\addabbrvspace oversat \lbx@sfromlang, forkl\adddot\ og med et efterord skrev\adddot\ af}}, - bytranslatorco = {{oversat \lbx@lfromlang\ og kommenteret af}% - {oversat \lbx@sfromlang\ og komm\adddot\ af}}, - bytranslatoran = {{oversat \lbx@lfromlang\ og forklaret af}% - {oversat \lbx@sfromlang\ og forkl\adddot\ af}}, - bytranslatorin = {{oversat \lbx@lfromlang\ og med en indledning skrevet af}% - {oversat \lbx@sfromlang\ og med en indl\adddot\ skrev\adddot\ af}}, - bytranslatorfo = {{oversat \lbx@lfromlang\ og med et forord skrevet af}% - {oversat \lbx@sfromlang\ og med et forord skrev\adddot\ af}}, - bytranslatoraf = {{oversat \lbx@lfromlang\ og med et efterord skrevet af}% - {oversat \lbx@sfromlang\ og med et efterord skrev\adddot\ af}}, - bytranslatorcoin = {{oversat \lbx@lfromlang, kommenteret og med en indledning skrevet af}% - {oversat \lbx@sfromlang, komm\adddot\ og med en indl\adddot\ skrev\adddot\ af}}, - bytranslatorcofo = {{oversat \lbx@lfromlang, kommenteret og med et forord skrevet af}% - {oversat \lbx@sfromlang, komm\adddot\ og med et forord skrev\adddot\ af}}, - bytranslatorcoaf = {{oversat \lbx@lfromlang, kommenteret og med et efterord skrevet af}% - {oversat \lbx@sfromlang, komm\adddot\ og med et efterord skrev\adddot\ af}}, - bytranslatoranin = {{oversat \lbx@lfromlang, forklaret og med en indledning skrevet af}% - {oversat \lbx@sfromlang, forkl\adddot\ og med en indl\adddot\ skrev\adddot\ af}}, - bytranslatoranfo = {{oversat \lbx@lfromlang, forklaret og med et forord skrevet af}% - {oversat \lbx@sfromlang, forkl\adddot\ og med et forord skrev\adddot\ af}}, - bytranslatoranaf = {{oversat \lbx@lfromlang, forklaret og med et efterord skrevet af}% - {oversat \lbx@sfromlang, forkl\adddot\ og med et efterord skrev\adddot\ af}}, + {udg.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og komm\adddot\ af}}, + byeditortran = {{udgivet, oversat \lbx@lfromlang\ og annoteret af}% + {udg.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og ann\adddot\ af}}, + byeditortrin = {{udgivet, oversat \lbx@lfromlang\ og med indledning af}% + {udg.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og indl\adddot\ af}}, + byeditortrfo = {{udgivet, oversat \lbx@lfromlang\ og med forord af}% + {udg.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og forord af}}, + byeditortraf = {{udgivet, oversat \lbx@lfromlang\ og med efterord af}% + {udg.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og efterord af}}, + byeditorcoin = {{udgivet, kommenteret og med indledning af}% + {udg.,\addabbrvspace komm\adddot\ og indl\adddotspace af}}, + byeditorcofo = {{udgivet, kommenteret og med forord af}% + {udg.,\addabbrvspace komm\adddot\ og forord af}}, + byeditorcoaf = {{udgivet, kommenteret og med efterord af}% + {udg.,\addabbrvspace komm\adddot\ og efterord af}}, + byeditoranin = {{udgivet, annoteret og med indledning af}% + {udg.,\addabbrvspace ann\adddot\ og indl\adddot\ af}}, + byeditoranfo = {{udgivet, annoteret og med forord af}% + {udg.,\addabbrvspace ann\adddot\ og forord af}}, + byeditoranaf = {{udgivet, annoteret og med efterord af}% + {udg.,\addabbrvspace ann\adddot\ og efterord af}}, + byeditortrcoin = {{udgivet, oversat \lbx@lfromlang, kommenteret og med indledning af}% + {udg.,\addabbrvspace overs\adddot\ \lbx@sfromlang, komm\adddot\ og indl\adddot\ af}}, + byeditortrcofo = {{udgivet, oversat \lbx@lfromlang, kommenteret og med forord af}% + {udg.,\addabbrvspace overs\adddot\ \lbx@sfromlang, komm\adddot\ og forord af}}, + byeditortrcoaf = {{udgivet, oversat \lbx@lfromlang, kommenteret og med efterord af}% + {udg.,\addabbrvspace overs\adddot\ \lbx@sfromlang, komm\adddot\ og efterord af}}, + byeditortranin = {{udgivet, oversat \lbx@lfromlang, med annoteringer og indledning af}% + {udg.,\addabbrvspace overs\adddot\ \lbx@sfromlang, ann\adddot\ og indl\adddot\ af}}, + byeditortranfo = {{udgivet, oversat \lbx@lfromlang, med annoteringer og forord af}% + {udg.,\addabbrvspace overs\adddot\ \lbx@sfromlang, ann\adddot\ og forord af}}, + byeditortranaf = {{udgivet, oversat \lbx@lfromlang, med annoteringer og efterord af}% + {udg.,\addabbrvspace overs\adddot\ \lbx@sfromlang, ann\adddot\ og efterord af}}, + bytranslatorco = {{oversat \lbx@lfromlang\ med kommentarer af}% + {overs\adddot\ \lbx@sfromlang\ m\adddotspace komm\adddot\ af}}, + bytranslatoran = {{oversat \lbx@lfromlang\ og annoteret af}% + {overs\adddot\ \lbx@sfromlang\ og ann\adddot\ af}}, + bytranslatorin = {{oversat \lbx@lfromlang\ med indledning af}% + {overs\adddot\ \lbx@sfromlang\ m\adddotspace indl\adddot\ af}}, + bytranslatorfo = {{oversat \lbx@lfromlang\ med forord af}% + {overs\adddot\ \lbx@sfromlang\ m\adddotspace forord af}}, + bytranslatoraf = {{oversat \lbx@lfromlang\ med efterord af}% + {overs\adddot\ \lbx@sfromlang\ m\adddotspace efterord af}}, + bytranslatorcoin = {{oversat \lbx@lfromlang\addspace med kommentarer og indledning af}% + {overs\adddot\ \lbx@sfromlang\addspace m\adddotspace komm\adddotspace og indl\adddotspace af}}, + bytranslatorcofo = {{oversat \lbx@lfromlang\addspace med kommentarer og forord af}% + {overs\adddot\ \lbx@sfromlang\addspace m\adddotspace komm\adddot\ og forord af}}, + bytranslatorcoaf = {{oversat \lbx@lfromlang\addspace med kommentarer og efterord af}% + {overs\adddot\ \lbx@sfromlang\addspace m\adddotspace komm\adddot\ og efterord af}}, + bytranslatoranin = {{oversat \lbx@lfromlang\addspace med annoteringer og indledning af}% + {overs\adddot\ \lbx@sfromlang\addspace m\adddotspace ann\adddot\ og indl\adddot\ af}}, + bytranslatoranfo = {{oversat \lbx@lfromlang\addspace med annoteringer og forord af}% + {overs\adddot\ \lbx@sfromlang\addspace m\adddotspace ann\adddot\ og forord af}}, + bytranslatoranaf = {{oversat \lbx@lfromlang\addspace med annoteringer og efterord af}% + {overs\adddot\ \lbx@sfromlang\addspace m\adddotspace ann\adddot\ og efterord af}}, and = {{og}{og}}, - andothers = {{med flere}{m.fl\adddot}},% FIXME: spacing after abbreviation dot? - andmore = {{med flere}{m.fl\adddot}},% FIXME: spacing after abbreviation dot? + andothers = {{med flere}{m.fl\adddot}}, + andmore = {{med mere}{m.m\adddot}}, volume = {{bind}{bd\adddot}}, - volumes = {{bind}{bd\adddot}}, + volumes = {{bind}{bdd\adddot}}, involumes = {{i}{i}}, - jourvol = {{\aa rgang}{\aa g\adddot}}, - jourser = {{serie}{ser\adddot}}, + jourvol = {{\aa rgang}{\aa rg\adddot}}, + jourser = {{r\ae kke}{rk\adddot}}, book = {{bog}{bog}}, part = {{del}{del}}, - issue = {{oplag}{opl\adddot}}, - newseries = {{ny serie}{n.s\adddot}},% FIXME: spacing after abbreviation dot? - oldseries = {{gammel serie}{g.s\adddot}},% FIXME: spacing after abbreviation dot? + issue = {{nummer}{nr\adddot}}, + newseries = {{ny r\ae kke}{ny rk\adddot}}, + oldseries = {{gammel r\ae kke}{gl. rk\adddot}}, edition = {{udgave}{udg\adddot}}, - reprint = {{eftertryk}{eftertryk}}, - reprintof = {{eftertryk af}{eftertryk af}}, - reprintas = {{eftertryk i}{eftertryk i}}, - reprintfrom = {{eftertryk fra}{eftertryk fra}},% FIXME: check -% alternative translations: -% reprint = {{genoptryk}{genoptryk}}, -% reprintof = {{genoptryk af}{genoptryk af}}, -% reprintas = {{genoptrykt i}{genoptrykt i}}, -% reprintas = {{genoptrykt som}{genoptrykt som}}, - translationof = {{overs\ae ttelse af}{overs\ae ttelse af}},% FIXME: check - translationas = {{oversat som}{oversat som}},% FIXME: check - translationfrom = {{oversat fra}{oversat fra}},% FIXME: check + reprint = {{genoptryk}{genoptr\adddot}}, + reprintof = {{genoptryk af}{genoptr\adddot\ af}}, + reprintas = {{genoptryk under titlen}{genoptr\adddot\ under titlen}}, + reprintfrom = {{genoptryk fra}{genoptr\adddot\ fra}}, + translationof = {{overs\ae ttelse af}{overs\adddot\ af}}, + translationas = {{oversat under titlen}{overs\adddotspace\ under titlen}}, + translationfrom = {{oversat fra}{overs\adddotspace\ fra}}, reviewof = {{bed\o mmelse af}{bed\adddotspace af}}, - origpubas = {{oprindeligt udgivet som}{oprindelig udgivet som}},% FIXME: check - 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 + origpubas = {{oprindeligt udgivet som}{opr\adddot\ udg\adddot\ som}}, + origpubin = {{oprindeligt udgivet i}{opr\adddot\ udg\adddot\ i}}, + astitle = {{under titlen}{under titlen}}, + bypublisher = {{af}{af}}, + nodate = {{udateret}{udat\adddot}}, page = {{side}{s\adddot}}, - pages = {{sider}{s\adddot}}, + pages = {{sider}{ss\adddot}}, column = {{spalte}{sp\adddot}}, - columns = {{spalter}{sp\adddot}}, + columns = {{spalter}{spp\adddot}}, line = {{linje}{l\adddot}}, lines = {{linjer}{l\adddot}}, verse = {{vers}{v\adddot}}, - verses = {{vers}{v\adddot}}, - section = {{afsnit}{\S}},% FIXME: check - sections = {{afsnit}{\S\S}},% FIXME: check -% alternative translations: -% section = {{paragraf}{\S}}, -% 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 + verses = {{vers}{vv\adddot}}, + section = {{paragraf}{par\adddot}}, + sections = {{paragraffer}{parr\adddot}}, + paragraph = {{afsnit}{afsn\adddot}}, + paragraphs = {{afsnit}{afsnn\adddot}}, + pagetotal = {{side}{s\adddot}}, + pagetotals = {{sider}{ss\adddot}}, + columntotal = {{spalte}{sp\adddot}}, + columntotals = {{spalter}{spp\adddot}}, + line = {{linje}{l\adddot}}, + lines = {{linjer}{ll\adddot}}, + verse = {{vers}{v\adddot}}, + verses = {{vers}{vv\adddot}}, + linetotal = {{linje}{l\adddot}}, + linetotals = {{linje}{ll\adddot}}, + versetotal = {{vers}{v\adddot}}, + versetotals = {{vers}{vv\adddot}}, + sectiontotal = {{paragraf}{par\adddot}}, + sectiontotals = {{paragraffer}{parr\adddot}}, + paragraphtotal = {{afsnit}{afsn\adddot}}, + paragraphtotals = {{afsnit}{afsnn\adddot}},% in = {{i}{i}}, - inseries = {{r\ae kken}{r\ae kken}}, - ofseries = {{af r\ae kken}{af r\ae kken}}, + inseries = {{i r\ae kken}{i rk\adddot}}, + ofseries = {{fra r\ae kken}{fra rk\adddot}}, number = {{nummer}{nr\adddot}}, +% numbers = {{numre}{nrr\adddot}}, chapter = {{kapitel}{kap\adddot}}, -% bathesis = {{}{}},% FIXME: missing - mathesis = {{speciale}{speciale}},% FIXME: check - phdthesis = {{ph.d.-afhandling}{ph.d.-afh\adddot}}, - candthesis = {{kandidatafhandling}{kandidatafh\adddot}},% FIXME: check + bathesis = {{bachelorafhandling}{bachelorafh\adddot}}, + mathesis = {{masterafhandling}{masterafh\adddot}}, + phdthesis = {{PhD afhandling}{PhD afh\adddot}}, + candthesis = {{specialeafhandling}{specialeafh\adddot}}, resreport = {{forskningsrapport}{forskningsrap\adddot}}, - techreport = {{teknisk rapport}{tek\adddot\ rap\adddot}}, + techreport = {{teknisk rapport}{tekn\adddot\ rap\adddot}}, software = {{software}{software}}, datacd = {{data-cd}{data-cd}}, audiocd = {{lyd-cd}{lyd-cd}}, version = {{version}{vers\adddot}}, - url = {{side}{side}}, + url = {{webadresse}{webadr\adddot}}, urlfrom = {{tilg\ae ngelig fra}{tilg\adddotspace fra}}, - urlseen = {{sidst set}{sidst set}}, + urlseen = {{senest bes\o gt}{senest bes\adddot}}, inpreparation = {{under udarbejdelse}{under udarb\adddot}}, - submitted = {{indsendt}{indsendt}}, + submitted = {{indleveret}{indlev\adddot}}, forthcoming = {{under udgivelse}{under udgiv\adddot}}, inpress = {{i trykken}{i trykken}}, - prepublished = {{pre-publiceret}{pre-publ\adddot}}, + prepublished = {{pr\ae publiceret}{pr\ae publ\adddot}}, citedas = {{herefter citeret som}{herefter cit\adddot\ som}}, thiscite = {{her}{her}}, - seenote = {{se note}{se note}}, -% alternative translation: -% seenote = {{se anm\ae rkning}{se anm\adddot}}, - quotedin = {{citeret efter}{citeret efter}}, - idem = {{den samme}{den~s\adddot}}, - idemsf = {{den samme}{den~s\adddot}}, - idemsm = {{den samme}{den~s\adddot}}, - idemsn = {{det samme}{det~s\adddot}}, - idempf = {{de samme}{de~s\adddot}}, - idempm = {{de samme}{de~s\adddot}}, - idempn = {{de samme}{de~s\adddot}}, - idempp = {{de samme}{de~s\adddot}}, + seenote = {{se note}{se nt\adddot}}, + quotedin = {{citeret efter}{cit\adddot\ efter}}, + idem = {{den samme}{d\adddot s\adddot}}, + idemsf = {{den samme}{d\adddot s\adddot}}, + idemsm = {{den samme}{d\adddot s\adddot}}, + idemsn = {{det samme}{d\adddot s\adddot}}, + idempf = {{de samme}{d\adddot s\adddot}}, + idempm = {{de samme}{d\adddot s\adddot}}, + idempn = {{de samme}{d\adddot s\adddot}}, + idempp = {{de samme}{d\adddot s\adddot}}, ibidem = {{ibidem}{ibid\adddot}}, - opcit = {{op.\adddotspace cit\adddot}{op.\adddotspace cit\adddot}},% FIXME: spacing after abbreviation dot? - loccit = {{loc.\adddotspace cit\adddot}{loc.\adddotspace cit\adddot}},% FIXME: spacing after abbreviation dot? - confer = {{j\ae vnf\o r}{jf\adddot}}, - sequens = {{sq\adddot}{sq\adddot}}, - sequentes = {{sqq\adddot}{sqq\adddot}}, + opcit = {{op.\adddotspace cit\adddot}{op.\adddotspace cit\adddot}}, + loccit = {{loc.\adddotspace cit\adddot}{loc.\adddotspace cit\adddot}}, + confer = {{j\ae vnf\o r}{jvf\adddot}}, + sequens = {{f\adddot}{f\adddot}}, + sequentes = {{ff\adddot}{ff\adddot}}, passim = {{passim}{pass\adddot}}, see = {{se}{s\adddot}}, - seealso = {{se ogs\aa}{s.\aa\adddot}},% FIXME: spacing after abbreviation dot? + seealso = {{se ogs\aa}{se ogs\aa}}, backrefpage = {{se side}{se s\adddot}}, - backrefpages = {{se sider}{se s\adddot}}, + backrefpages = {{se siderne}{se ss\adddot}}, january = {{januar}{jan\adddot}}, february = {{februar}{feb\adddot}}, march = {{marts}{mar\adddot}}, @@ -453,91 +439,95 @@ december = {{december}{dec\adddot}}, langamerican = {{amerikansk-engelsk}{amerikansk-engelsk}}, langbrazilian = {{brasiliansk-portugisisk}{brasiliansk-portugisisk}}, -% langbulgarian = {{}{}},% FIXME: missing - langcatalan = {{catalansk}{catalansk}}, + langbulgarian = {{bulgarsk}{bulgarsk}}, + langcatalan = {{katalansk}{katalansk}}, langcroatian = {{kroatisk}{kroatisk}}, langczech = {{tjekkisk}{tjekkisk}}, langdanish = {{dansk}{dansk}}, langdutch = {{nederlandsk}{nederlandsk}}, langenglish = {{engelsk}{engelsk}}, -% langestonian = {{}{}},% FIXME: missing + langestonian = {{estisk}{estisk}}, langfinnish = {{finsk}{finsk}}, langfrench = {{fransk}{fransk}}, langgalician = {{galicisk}{galicisk}}, langgerman = {{tysk}{tysk}}, langgreek = {{gr\ae sk}{gr\ae sk}}, + langhungarian = {{ungarsk}{ungarsk}}, langitalian = {{italiensk}{italiensk}}, + langjapanese = {{japansk}{japansk}}, langlatin = {{latin}{latin}}, -% langlatvian = {{}{}},% FIXME: missing + langlatvian = {{lettisk}{lettisk}}, langnorwegian = {{norsk}{norsk}}, langpolish = {{polsk}{polsk}}, langportuguese = {{portugisisk}{portugisisk}}, langrussian = {{russisk}{russisk}}, -% langslovak = {{}{}},% FIXME: missing + 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 = {{}{}},% FIXME: missing - fromcatalan = {{fra catalansk}{fra catalansk}}, + frombulgarian = {{fra bulgarsk}{fra bulgarsk}}, + fromcatalan = {{fra katalansk}{fra katalansk}}, 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 = {{fra estisk}{fra estisk}}, 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}}, + fromhungarian = {{fra ungarsk}{fra ungarsk}}, fromitalian = {{fra italiensk}{fra italiensk}}, + fromjapanese = {{fra japansk}{fra japansk}}, fromlatin = {{fra latin}{fra latin}}, -% fromlatvian = {{}{}},% FIXME: missing + fromlatvian = {{fra lettisk}{fra lettisk}}, fromnorwegian = {{fra norsk}{fra norsk}}, frompolish = {{fra polsk}{fra polsk}}, fromportuguese = {{fra portugisisk}{fra portugisisk}}, fromrussian = {{fra russisk}{fra russisk}}, -% fromslovak = {{}{}},% FIXME: missing + 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 = {{Europ\ae iske Union}{EU}}, countryep = {{Europ\ae iske Union}{EP}}, countryfr = {{Frankrig}{FR}}, - countryuk = {{Storbritanien}{GB}}, + countryuk = {{Storbritannien}{GB}}, countryus = {{USA}{US}}, - patent = {{patent}{patent}}, - patentde = {{tysk patent}{tys\adddot\ pat\adddot}}, + patent = {{patent}{pat\adddot}}, + patentde = {{tysk patent}{tysk pat\adddot}}, patenteu = {{europ\ae isk patent}{eur\adddot\ pat\adddot}}, - patentfr = {{fransk patent}{fra\adddot\ pat\adddot}}, - patentuk = {{britisk patent}{brit\adddot pat\adddot}}, - patentus = {{amerikansk patent}{amerikansk pat\adddot}}, - patreq = {{ans\o gning om patent}{pat\adddot\ ans\o gn\adddot}}, - patreqde = {{ans\o gning om tysk patent}{tys\adddot\ pat\adddot\ ans\o gn\adddot}}, - patreqeu = {{ans\o gning om europ\ae isk patent}{eur\adddot\ pat\adddot\ ans\o gn\adddot}}, - patreqfr = {{ans\o gning om fransk patent}{fra\adddot\ pat\adddot\ ans\o gn\adddot}}, - patrequk = {{ans\o gning om britisk patent}{britisk pat\adddot\ ans\o gn\adddot}}, - patrequs = {{ans\o gning om amerikansk patent}{am\adddot pat\adddot\ ans\o gn\adddot}}, + patentfr = {{fransk patent}{fransk pat\adddot}}, + patentuk = {{britisk patent}{brit\adddot\ pat\adddot}}, + patentus = {{amerikansk patent}{am\adddot\ pat\adddot}}, + patreq = {{patentans\o gning}{pat\adddot\ ans\o gn\adddot}}, + patreqde = {{tysk patentans\o gning}{tysk pat\adddot\ ans\o gn\adddot}}, + patreqeu = {{europ\ae isk patentans\o gning}{eur\adddot\ pat\adddot\ ans\o gn\adddot}}, + patreqfr = {{fransk patentans\o gning}{fransk pat\adddot\ ans\o gn\adddot}}, + patrequk = {{britisk patentans\o gning}{brit\adddot\ pat\adddot\ ans\o gn\adddot}}, + patrequs = {{amerikansk patentans\o gning}{am\adddot\ pat\adddot\ ans\o gn\adddot}}, file = {{fil}{fil}}, library = {{bibliotek}{bibliotek}}, abstract = {{resum\'{e}}{resum\'{e}}}, -% alternative translation: -% abstract = {{abstract}{abstract}}, - annotation = {{forklaring}{forklaring}}, - commonera = {{vesterlandsk tidsregning}{v\adddot t\adddot}}, - beforecommonera = {{f\o r vesterlandsk tidsregning}{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 = {{}{}},% FIXME: missing -% spring = {{}{}},% FIXME: missing -% summer = {{}{}},% FIXME: missing -% autumn = {{}{}},% FIXME: missing -% winter = {{}{}},% FIXME: missing - am = {{AM}{AM}}, - pm = {{PM}{PM}}, + annotation = {{kommentarer}{komm\adddot}}, + commonera = {{efter vor tidsregning}{e\adddot v\adddot t\adddot}}, + beforecommonera = {{f\o r vor tidsregning}{f\adddot v\adddot t\adddot}}, + annodomini = {{efter Kristi f\o dsel}{e\adddot Kr\adddot}}, + beforechrist = {{f\o r Kristi f\o dsel}{f\adddot Kr\adddot}}, + circa = {{cirka}{ca\adddot}}, + spring = {{for\aa r}{for\aa r}}, + summer = {{sommer}{sommer}}, + autumn = {{efter\aa r}{efter\aa r}}, + winter = {{vinter}{vinter}}, + am = {{formiddag}{form\adddot}}, + pm = {{eftermiddag}{efterm\adddot}}, } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx index acc600377cf..6d6822fd729 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx @@ -72,7 +72,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -469,6 +469,7 @@ langgalician = {{Galicisch}{Galicisch}}, langgerman = {{Duits}{Duits}}, langgreek = {{Grieks}{Grieks}}, + langhungarian = {{Hongaars}{Hongaars}}, langitalian = {{Italiaans}{Italiaans}}, langjapanese = {{Japaans}{Japaans}}, langlatin = {{Latijn}{Latijn}}, @@ -497,6 +498,7 @@ fromgalician = {{uit het Galicisch}{uit het Galicisch}}, fromgerman = {{uit het Duits}{uit het Duits}}, fromgreek = {{uit het Grieks}{uit het Grieks}}, + fromhungarian = {{uit het Hongaars}{uit het Hongaars}}, fromitalian = {{uit het Italiaans}{uit het Italiaans}}, fromjapanese = {{uit het Japaans}{uit het Japaans}}, fromlatin = {{uit het Latijn}{uit het Latijn}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx index a0017682979..d8d9c73d80e 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx @@ -66,7 +66,7 @@ canadian,australian,newzealand,USenglish,UKenglish} \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -480,6 +480,7 @@ canadian,australian,newzealand,USenglish,UKenglish} langgalician = {{Galician}{Galician}}, langgerman = {{German}{German}}, langgreek = {{Greek}{Greek}}, + langhungarian = {{Hungarian}{Hungarian}}, langitalian = {{Italian}{Italian}}, langjapanese = {{Japanese}{Japanese}}, langlatin = {{Latin}{Latin}}, @@ -508,6 +509,7 @@ canadian,australian,newzealand,USenglish,UKenglish} fromgalician = {{from the Galician}{from the Galician}}, fromgerman = {{from the German}{from the German}}, fromgreek = {{from the Greek}{from the Greek}}, + fromhungarian = {{from the Hungarian}{from the Hungarian}}, fromitalian = {{from the Italian}{from the Italian}}, fromjapanese = {{from the Japanese}{from the Japanese}}, fromlatin = {{from the Latin}{from the Latin}}, @@ -560,17 +562,18 @@ canadian,australian,newzealand,USenglish,UKenglish} \begingroup \blx@metadateinfo{#2}% \iffieldundef{#2year} - {} + {\blx@nounit} {\printtext[#2date]{% \datecircaprint \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} + {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibdate#1}{}{#2month}{#2day}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}}% - {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \dateeraprint{#2year}}} + {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}}}% - \dateeraprint{#2year}% + {\csuse{mkbibseasondate#1}{#2year}{#2season}% + \dateeraprint{#2year}}}% \dateuncertainprint \iffieldundef{#2endyear} {} @@ -579,7 +582,7 @@ canadian,australian,newzealand,USenglish,UKenglish} {\bibdaterangesep \enddatecircaprint \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} + {\ifdateyearsequal{#2}{#2end} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} @@ -593,17 +596,18 @@ canadian,australian,newzealand,USenglish,UKenglish} \begingroup \blx@metadateinfo{#2}% \iffieldundef{#2year} - {} + {\blx@nounit} {\printtext[#2date]{% \datecircaprint \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} + {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibdate#1}{}{#2month}{#2day}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} - {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \dateeraprint{#2year}}} + {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}}}% - \dateeraprint{#2year}% + {\csuse{mkbibseasondate#1}{#2year}{#2season}% + \dateeraprint{#2year}}}% \dateuncertainprint \iffieldundef{#2endyear} {} @@ -622,17 +626,18 @@ canadian,australian,newzealand,USenglish,UKenglish} \begingroup \blx@metadateinfo{#2}% \iffieldundef{#2year} - {} + {\blx@nounit} {\printtext[#2date]{% \datecircaprint \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} + {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibdate#1}{}{#2month}{#2day}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} - {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \dateeraprint{#2year}}} + {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}}}% - \dateeraprint{#2year}% + {\csuse{mkbibseasondate#1}{#2year}{#2season}% + \dateeraprint{#2year}}}% \dateuncertainprint \iffieldundef{#2endyear} {\printfield{extradate}} @@ -642,7 +647,7 @@ canadian,australian,newzealand,USenglish,UKenglish} {\bibdaterangesep \enddatecircaprint \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} + {\ifdateyearsequal{#2}{#2end} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} @@ -657,17 +662,18 @@ canadian,australian,newzealand,USenglish,UKenglish} \begingroup \blx@metadateinfo{#2}% \iffieldundef{#2year} - {} + {\blx@nounit} {\printtext[#2date]{% \datecircaprint \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} + {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibdate#1}{}{#2month}{#2day}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} - {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \dateeraprint{#2year}}} + {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}}}% - \dateeraprint{#2year}% + {\csuse{mkbibseasondate#1}{#2year}{#2season}% + \dateeraprint{#2year}}}% \dateuncertainprint \iffieldundef{#2endyear} {\printfield{extradate}} diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/estonian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/estonian.lbx index 0a8baeda5b6..2b0b32f1152 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/estonian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/estonian.lbx @@ -10,20 +10,6 @@ \DeclareRedundantLanguages{estonian}{estonian} -\NewBibliographyString{% - basicjanuary, - basicfebruary, - basicmarch, - basicapril, - basicmay, - basicjune, - basicjuly, - basicaugust, - basicseptember, - basicoctober, - basicnovember, - basicdecember% -} \DeclareBibliographyExtras{% % dashes: may be either \textendash or \textemdash @@ -42,25 +28,19 @@ \iffieldundef{#2}{}{\nobreakspace}}% \iffieldundef{#2} {} - {\iffieldundef{#3} - {\lbx@fi@mkbibmonthbasic{\thefield{#2}}% - \iffieldundef{#1}{}{\space}}% - {\mkbibmonth{\thefield{#2}}% - \iffieldundef{#1}{}{\space}}}% + {\protected\def\bibdaterangesep{\addnbspace\textendash\space}% + \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}{}{\thinspace}}% + {\mkdayzeros{\thefield{#3}}\adddot}% \iffieldundef{#2} {} - {\mkmonthzeros{\thefield{#2}}% - \iffieldundef{#1} - {} - {\iffieldundef{#3}{/}{\adddot\thinspace}}}% + {\mkmonthzeros{\thefield{#2}}\adddot}% \iffieldbibstring{#1} {\bibstring{\thefield{#1}}} {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% @@ -95,7 +75,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -122,44 +102,44 @@ \DeclareBibliographyStrings{% bibliography = {{bibliograafia}{bibliograafia}}, references = {{viited}{viited}}, - shorthands = {{nimekirja ning l\"{u}hendid}{l\"{u}hendid}}, + shorthands = {{l\"{u}hendid}{l\"{u}hendid}}, editor = {{toimetaja}{toim\adddot}}, editors = {{toimetajad}{toim\adddot}}, - compiler = {{kompilaator}{koompilaator}}, - compilers = {{kompilaatorid}{kompilaatorid}}, - redactor = {{toimittanut}{toim\adddot}}, - redactors = {{toimittaneet}{toim\adddot}}, - reviser = {{L\"{a}bi vaadataja}{L\"{a}bi vaadataja}}, - revisers = {{L\"{a}bi vaadatajad}{L\"{a}bi vaadatajad}}, + compiler = {{koostaja}{koost\adddot}}, + compilers = {{koostajad}{koost\adddot}}, + redactor = {{toimetaja}{toim\adddot}}, + redactors = {{toimetajad}{toim\adddot}}, + reviser = {{toimetaja}{toim\adddot}}, + revisers = {{toimetajad}{toim\adddot}}, founder = {{asutaja}{asutaja}}, founders = {{asutajad}{asutajad}}, - continuator = {{jatkaja}{jatkaja}}, - continuators = {{jatkajad}{jatkajad}}, - collaborator = {{kaast\"{o}\"{o}line}{kaast\"{o}\"{o}line}}, - collaborators = {{kaast\"{o}\"{o}tajate}{kaast\"{o}\"{o}tajate}}, - translator = {{t\~{o}lkija}{t\~{o}lkija}}, - translators = {{t\~{o}lkijad}{t\~{o}lkijad}}, - commentator = {{kommentaator}{kommentaator}}, - commentators = {{kommentaatorid}{kommentaatorid}}, - annotator = {{selityksin varustanut}{selityksin varustanut}}, - annotators = {{selityksin varustaneet}{selityksin varustaneet}}, - commentary = {{kommentaaris}{kommentaaris}}, - annotations = {{annotatsioonide}{annotatsioonide}}, + continuator = {{j\"{a}tkaja}{j\"{a}tkaja}}, + continuators = {{j\"{a}tkajad}{j\"{a}tkajad}}, + collaborator = {{kaast\"{o}\"{o}line}{kaast\adddot}}, + collaborators = {{kaast\"{o}\"{o}lised}{kaast\adddot}}, + translator = {{t\~{o}lkija}{t\~{o}lk\adddot}}, + translators = {{t\~{o}lkijad}{t\~{o}lk\adddot}}, + commentator = {{kommenteerija}{kommenteerija}}, + commentators = {{kommenteerijad}{kommenteerijad}}, + annotator = {{kommenteerija}{kommenteerija}}, + annotators = {{kommenteerijad}{kommenteerijad}}, + commentary = {{kommentaarid}{kommentaarid}}, + annotations = {{kommentaarid}{kommentaarid}}, introduction = {{sissejuhatus}{sissejuhatus}}, - foreword = {{eess\~{o}na}{eess\~{o}na}}, - afterword = {{j\"{a}rels\~{o}na}{j\"{a}rels\~{o}na}}, + foreword = {{eess\~{o}na autor}{eess\~{o}na}}, + afterword = {{j\"{a}rels\~{o}na autor}{j\"{a}rels\~{o}na}}, editortr = {{toimetaja ja t\~{o}lkija}% {toim\adddotspace ja t\~{o}lk\adddot}}, - editorstr = {{toimetajad ja t\~{o}lkijate}% + editorstr = {{toimetajad ja t\~{o}lkijad}% {toim\adddotspace ja t\~{o}lk\adddot}}, - editorco = {{toimetaja ja kommentaator}% - {toimetaja ja kommentaator}}, - editorsco = {{toimetajad ja kommentaatorid}% - {toimetajad ja kommentaatorid}}, - editoran = {{toimetaja ja annotator}% - {toimetaja ja annotator}}, - editorsan = {{toimetajad ja annotators}% - {toimetajad ja annotators}}, + editorco = {{toimetaja ja kommenteerija}% + {toimetaja ja kommenteerija}}, + editorsco = {{toimetajad ja kommenteerijad}% + {toimetajad ja kommenteerijad}}, + editoran = {{toimetaja ja kommenteerija}% + {toimetaja ja kommenteerija}}, + editorsan = {{toimetajad ja kommenteerijad}% + {toimetajad ja kommenteerijad}}, editorin = {{toimetaja ja sissejuhatus}% {toimetaja ja sissejuhatus}}, editorsin = {{toimetajad ja sissejuhatus}% @@ -172,301 +152,303 @@ {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}}, - editorstrco = {{toimetajad, translators\finalandcomma\ ja kommentaatorid} % - {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}}, - 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}}, - 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}}, - editortraf = {{toimetaja, translator\finalandcomma\ ja J\"{a}rels\~{o}na} % - {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}}, - 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}}, - 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}}, - 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}}, - 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}}, - 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}}, - 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}}, - 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}}, - 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}}, - 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}}, - translatorco = {{t\~{o}lkija ja kommentaator} % - {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}}, - translatorin = {{t\~{o}lkimine ja Sissejuhatus} % - {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}}, - translatorsfo = {{t\~{o}lkimine ja eess\~{o}na} % - {trans\adddot\ ja forew\adddot}}, - translatoraf = {{t\~{o}lkimine ja J\"{a}rels\~{o}na} % - {trans\adddot\ ja afterw\adddot}}, - translatorsaf = {{t\~{o}lkimine ja J\"{a}rels\~{o}na} % - {trans\adddot\ ja afterw\adddot}}, - translatorcoin = {{t\~{o}lkimine, commentary\finalandcomma\ ja Sissejuhatus} % - {trans., comm\adddot\finalandcomma\ ja introd\adddot}}, - translatorscoin = {{t\~{o}lkimine, commentary\finalandcomma\ ja Sissejuhatus} % - {trans., comm\adddot\finalandcomma\ ja introd\adddot}}, - translatorcofo = {{t\~{o}lkimine, commentary\finalandcomma\ ja eess\~{o}na} % - {trans., comm\adddot\finalandcomma\ ja forew\adddot}}, - translatorscofo = {{t\~{o}lkimine, commentary\finalandcomma\ ja eess\~{o}na} % - {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}}, - translatorscoaf = {{t\~{o}lkimine, commentary\finalandcomma\ ja J\"{a}rels\~{o}na} % - {trans., comm\adddot\finalandcomma\ ja afterw\adddot}}, - translatoranin = {{t\~{o}lkimine, annotations\finalandcomma\ ja Sissejuhatus} % - {trans., annot\adddot\finalandcomma\ ja introd\adddot}}, - translatorsanin = {{t\~{o}lkimine, annotations\finalandcomma\ ja Sissejuhatus} % - {trans., annot\adddot\finalandcomma\ ja introd\adddot}}, - translatoranfo = {{t\~{o}lkimine, annotations\finalandcomma\ ja eess\~{o}na} % - {trans., annot\adddot\finalandcomma\ ja forew\adddot}}, - translatorsanfo = {{t\~{o}lkimine, annotations\finalandcomma\ ja eess\~{o}na} % - {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}}, - 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 - byauthor = {{kirjuttanud}{kirj\adddot}}, - byeditor = {{toimittanud}{toim\adddot}}, - bycompiler = {{koontanud}{koontanud}}, - byredactor = {{redigeeritud poolt}{red\adddotspace poolt}}, - byreviser = {{l\"{a}bivaadatud poolt}{rev\adddotspace poolt}}, - 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}}, - 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}}, - withcommentator = {{koos kommentaariga}{koos comment\adddot\ poolt}}, - withannotator = {{koos annotations poolt}{koos annots\adddot\ poolt}}, - 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} - {toim\adddotspace ja \lbx@sfromlang k\"a\"ant\adddot}}, - byeditorco = {{toimetatud ja kommenteeritud} % - {ed\adddotspace ja comm\adddot\ poolt}}, - byeditoran = {{redigeerida ja kanda} % - {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}}, - byeditoraf = {{redigeerida, j\"{a}rels\~{o}na, Autor} % - {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}}, - byeditortran = {{redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja kanda} % - {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}}, - byeditortrfo = {{edited and translated \lbx@lfromlang, with a foreword, by} % - {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}}, - byeditorcoin = {{toimetanud ja kommenteerinud koos tutvustus,} % - {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}}, - byeditoranin = {{redigeerida ja selgitustega koos tutvustus,} % - {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}}, - byeditortrcoin = {{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,}}, - byeditortranin = {{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,}}, - bytranslatorco = {{\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}}, - bytranslatorin = {{translated \lbx@lfromlang, with an introduction, 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}}, - 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,}}, - bytranslatorcofo = {{\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,} % - {t\~{o}lgitud \lbx@lfromlang\ ja selgitustega koos tutvustus,}}, - bytranslatoranfo = {{t\~{o}lgitud \lbx@lfromlang\ ja selgitustega mis eess\~{o}na,} % - {t\~{o}lgitud \lbx@lfromlang\ ja selgitustega mis eess\~{o}na,}}, - bytranslatoranaf = {{t\~{o}lgitud \lbx@lfromlang\ ja selgitustega koos J\"{a}rels\~{o}na,} % - {t\~{o}lgitud \lbx@lfromlang\ ja selgitustega koos J\"{a}rels\~{o}na,}}, + editortrco = {{toimetaja, t\~{o}lkija ja kommenteerija} % + {toim., t\~{o}lk\adddotspace ja komm\adddot}}, + editorstrco = {{toimetajad, t\~{o}lkijad ja kommenteerijad} % + {toim., t\~{o}lk\adddotspace ja komm\adddot}}, + editortran = {{toimetaja, t\~{o}lkija ja kommenteerija} % + {toim., t\~{o}lk\adddotspace ja annot\adddot}}, + editorstran = {{toimetajad, t\~{o}lkijad ja kommenteerijad} % + {toim., t\~{o}lk\adddotspace ja annot\adddot}}, + editortrin = {{toimetaja, t\~{o}lkija ja sissejuhatus} % + {toim., t\~{o}lk\adddotspace ja sissej\adddot}}, + editorstrin = {{toimetajad, t\~{o}lkijad ja sissejuhatus} % + {toim., t\~{o}lk\adddotspace ja sissej\adddot}}, + editortrfo = {{toimetaja, t\~{o}lkija ja eess\~{o}na} % + {toim., t\~{o}lk\adddotspace ja eess\adddot}}, + editorstrfo = {{toimetajad, t\~{o}lkijad ja eess\~{o}na} % + {toim., t\~{o}lk\adddotspace ja forew\adddot}}, + editortraf = {{toimetaja, t\~{o}lkija ja j\"{a}rels\~{o}na} % + {toim., t\~{o}lk\adddotspace ja j\"{a}rels\adddot}}, + editorstraf = {{toimetajad, t\~{o}lkijad ja j\"{a}rels} % + {toim., t\~{o}lk\adddotspace ja j\"{a}rels\adddot}}, + editorcoin = {{toimetaja, kommenteerija ja sissejuhatus} % + {toim., komm\adddotspace ja sissej\adddot}}, + editorscoin = {{toimetajad, kommenteerijad ja sissejuhatus} % + {toim., komm\adddotspace ja sissej\adddot}}, + editorcofo = {{toimetaja, kommenteerija ja eess\~{o}na} % + {toim., komm\adddotspace ja forew\adddot}}, + editorscofo = {{toimetajad, kommenteerija ja eess\~{o}na} % + {toim., komm\adddotspace ja eess\adddot}}, + editorcoaf = {{toimetaja, kommenteerija ja j\"{a}rels\~{o}na} % + {toim., komm\adddotspace ja j\"{a}rels\adddot}}, + editorscoaf = {{toimetajad, kommenteerijad ja j\"{a}rels\~{o}na} % + {toim., komm\adddotspace ja j\"{a}rels\adddot}}, + editoranin = {{toimetaja, kommenteerija ja sissejuhatus} % + {toim., annot\adddotspace ja sissej\adddot}}, + editorsanin = {{toimetajad, kommenteerijad ja sissejuhatus} % + {toim., annot\adddotspace ja sissej\adddot}}, + editoranfo = {{toimetaja, annoteerja ja eess\~{o}na} % + {toim., annot\adddotspace ja eess\adddot}}, + editorsanfo = {{toimetajad, kommenteerijad ja eess\~{o}na} % + {toim., annot\adddotspace ja eess\adddot}}, + editoranaf = {{toimetaja, kommenteerija ja j\"{a}rels\~{o}na} % + {toim., annot\adddotspace ja j\"{a}rels\adddot}}, + editorsanaf = {{toimetajad, kommenteerijad ja j\"{a}rels\~{o}na} % + {toim., annot\adddotspace ja j\"{a}rels\adddot}}, + editortrcoin = {{toimetaja, t\~{o}lkija, kommenteerija ja sissejuhatus} % + {toim., t\~{o}lk., komm\adddotspace ja sissej\adddot}}, + editorstrcoin = {{toimetajad, t\~{o}lkijad, kommenteerijad ja sissejuhatus} % + {toim., t\~{o}lk., komm\adddotspace ja sissej\adddot}}, + editortrcofo = {{toimetaja, t\~{o}lkija, kommenteerija ja eess\~{o}na} % + {toim., t\~{o}lk., komm\adddotspace ja eess\adddot}}, + editorstrcofo = {{toimetajad, t\~{o}lkijad, kommenteerijad ja eess\~{o}na} % + {toim., t\~{o}lk., komm\adddotspace ja eess\adddot}}, + editortrcoaf = {{toimetaja, t\~{o}lkija, kommentator ja j\"{a}rels\~{o}na} % + {toim., t\~{o}lk., komm\adddotspace ja j\"{a}rels\adddot}}, + editorstrcoaf = {{toimetajad, t\~{o}lkijad, kommenteerijad ja j\"{a}rels\~{o}na} % + {toim., t\~{o}lk., komm\adddotspace ja j\"{a}rels\adddot}}, + editortranin = {{toimetaja, t\~{o}lkija, kommenteerija ja sissejuhatus} % + {toim., t\~{o}lk., annot\adddotspace ja sissej\adddot}}, + editorstranin = {{toimetajad, t\~{o}lkijad, kommenteerijad ja sissejuhatus} % + {toim., t\~{o}lk., annot\adddotspace ja sissej\adddot}}, + editortranfo = {{toimetaja, t\~{o}lkija, kommenteerija ja eess\~{o}na} % + {toim., t\~{o}lk., annot\adddotspace ja eess\adddot}}, + editorstranfo = {{toimetajad, t\~{o}lkijad, kommenteerijad ja eess\~{o}na} % + {toim., t\~{o}lk., annot\adddotspace ja eess\adddot}}, + editortranaf = {{toimetaja, t\~{o}lkija, kommenteerija ja j\"{a}rels\~{o}na} % + {toim., t\~{o}lk., annot\adddotspace ja j\"{a}rels\adddot}}, + editorstranaf = {{toimetajad, t\~{o}lkijad, kommenteerijad ja j\"{a}rels\~{o}na} % + {toim., t\~{o}lk., annot\adddotspace ja j\"{a}rels\adddot}}, + translatorco = {{t\~{o}lkija ja kommenteerija} % + {t\~{o}lk\adddotspace ja komm\adddot}}, + translatorsco = {{t\~{o}lkijad ja kommenteerijad} % + {t\~{o}lk\adddotspace ja komm\adddot}}, + translatoran = {{t\~{o}lkija ja kommenteerija} % + {t\~{o}lk\adddotspace ja annot\adddot}}, + translatorsan = {{t\~{o}lkijad ja kommenteerijad} % + {t\~{o}lk\adddotspace ja annot\adddot}}, + translatorin = {{t\~{o}lkija ja sissejuhatus} % + {t\~{o}lk\adddotspace ja sissej\adddot}}, + translatorsin = {{t\~{o}lkijad ja sissejuhatus} % + {t\~{o}lk\adddotspace ja sissej\adddot}}, + translatorfo = {{t\~{o}lkija ja eess\~{o}na} % + {t\~{o}lk\adddotspace ja eess\adddot}}, + translatorsfo = {{t\~{o}lkijad ja eess\~{o}na} % + {t\~{o}lk\adddotspace ja eess\adddot}}, + translatoraf = {{t\~{o}lkija ja j\"{a}rels\~{o}na} % + {t\~{o}lk\adddotspace ja j\"{a}rels\adddot}}, + translatorsaf = {{t\~{o}lkijad ja j\"{a}rels\~{o}na} % + {t\~{o}lk\adddotspace ja j\"{a}rels\adddot}}, + translatorcoin = {{t\~{o}lkija, kommenteerija ja sissejuhatus} % + {t\~{o}lk., komm\adddotspace ja sissej\adddot}}, + translatorscoin = {{t\~{o}lkijad, kommenteerijad ja sissejuhatus} % + {t\~{o}lk., komm\adddotspace ja sissej\adddot}}, + translatorcofo = {{t\~{o}lkija, kommenteerija ja eess\~{o}na} % + {t\~{o}lk., komm\adddotspace ja eess\adddot}}, + translatorscofo = {{t\~{o}lkijad, kommenteerijad ja eess\~{o}na} % + {t\~{o}lk., komm\adddotspace ja eess\adddot}}, + translatorcoaf = {{t\~{o}lkija, kommenteerija ja j\"{a}rels\~{o}na} % + {t\~{o}lk., komm\adddotspace ja j\"{a}rels\adddot}}, + translatorscoaf = {{t\~{o}lkijad, kommenteerijad ja j\"{a}rels\~{o}na} % + {t\~{o}lk., komm\adddotspace ja j\"{a}rels\adddot}}, + translatoranin = {{t\~{o}lkija, kommenteerija ja sissejuhatus} % + {t\~{o}lk., annot\adddotspace ja sissej\adddot}}, + translatorsanin = {{t\~{o}lkijad, kommenteerijad ja sissejuhatus} % + {t\~{o}lk., annot\adddotspace ja sissej\adddot}}, + translatoranfo = {{t\~{o}lkija, kommenteerija ja eess\~{o}na} % + {t\~{o}lk., annot\adddotspace ja eess\adddot}}, + translatorsanfo = {{t\~{o}lkijad, kommenteerijad ja eess\~{o}na} % + {t\~{o}lk., annot\adddotspace ja eess\adddot}}, + translatoranaf = {{t\~{o}lkija, kommenteerija ja j\"{a}rels\~{o}na} % + {t\~{o}lk., annot\adddotspace ja j\"{a}rels\adddot}}, + translatorsanaf = {{t\~{o}lkijad, kommenteerijad ja j\"{a}rels\~{o}na} % + {t\~{o}lk., annot\adddotspace ja j\"{a}rels\adddot}}, + organizer = {{korraldaja}{korraldaja}}, + organizers = {{korraldajad}{korraldajad}}, + byorganizer = {{korraldanud}{korraldanud}}, + byauthor = {{kirjutanud}{kirj\adddot}}, + byeditor = {{toimetanud}{toim\adddot}}, + bycompiler = {{koostanud}{koost\adddot}}, + byredactor = {{toimetanud}{toim\adddot}}, + byreviser = {{l\"{a}bivaadanud}{l\"{a}bivaadanud}}, + byreviewer = {{vaadanud}{vaadanud}}, + byfounder = {{asutanud}{asutanud}}, + bycontinuator = {{j\"{a}tkanud}{j\"{a}tkanud}}, + bycollaborator = {{koost\"{o}\"{o}s}{koost\"{o}\"{o}s}}, + bytranslator = {{\lbx@lfromlang t\~{o}lkinud}{\lbx@sfromlang t\~{o}lk\adddotspace}}, + bycommentator = {{kommenteerinud}{kommenteerinud}}, + byannotator = {{kommenteerinud}{kommenteerinud}},% FIXME: unsure + withcommentator = {{koos kommentaaridega}{koos kommentaaridega}},% FIXME: commentator name should be in the middle + withannotator = {{koos kommentaaridega}{koos kommentaaridega}}, + withintroduction = {{koos tutvustusega}{koos tutvustusega}},% FIXME: unsure + withforeword = {{koos eess\~{o}naga}{koos eess\adddot}}, + withafterword = {{koos j\"{a}rels\~{o}naga}{koos j\"{a}rels\adddot}}, + byeditortr = {{toimetanud ja \lbx@lfromlang t\~{o}lkinud} % + {toim\adddotspace ja \lbx@sfromlang t\~{o}lk\adddot}}, + byeditorco = {{toimetanud ja kommenteerinud} % + {toim\adddotspace ja komment\adddot}}, + byeditoran = {{toimetanud ja kommenteerinud} % + {toim\adddotspace ja komment\adddot}}, + byeditorin = {{toimetanud ja sissejuhatuse kirjutanud} % + {toim\adddotspace ja sissej\adddot}}, + byeditorfo = {{toimetanud ja eess\~{o}na kirjutanud} % + {toim\adddotspace ja eess\adddot}}, + byeditoraf = {{toimetanud ja j\"{a}rels\~{o}na kirjutanud} % + {toim\adddotspace ja j\"{a}rels\adddot}}, + byeditortrco = {{toimetanud, \lbx@lfromlang t\~{o}lkinud ja kommenteerinud} % + {toim., \lbx@sfromlang t\~{o}lk\adddotspace ja komm\adddot}}, + byeditortran = {{toimetanud, \lbx@lfromlang t\~{o}lkinud ja kommenteerinud} % + {toim., \lbx@sfromlang t\~{o}lk\adddotspace ja komment\adddot}}, + byeditortrin = {{toimetanud, \lbx@lfromlang t\~{o}lkinud ja sissejuhatuse kirjutanud} % + {toim., \lbx@sfromlang t\~{o}lk\adddotspace ja sissej\adddot}}, + byeditortrfo = {{toimetanud, \lbx@lfromlang t\~{o}lkinud ja eess\~{o}na kirjutanud} % + {toim., \lbx@sfromlang t\~{o}lk\adddotspace ja eess\adddot}}, + byeditortraf = {{toimetanud, \lbx@lfromlang t\~{o}lkinud ja j\"{a}rels\~{o}na kirjutanud} % + {toim., \lbx@sfromlang t\~{o}lk\adddotspace ja j\"{a}rels\adddot}}, + byeditorcoin = {{toimetanud, kommenteerinud ja sissejuhatuse kirjutanud} % + {toim., komm\adddotspace ja sissej\adddot}}, + byeditorcofo = {{toimetanud, kommenteerinud ja eess\~{o}na kirjutanud} % + {toim., komm\adddotspace ja eess\adddot}}, + byeditorcoaf = {{toimetanud, kommenteerinud ja j\"{a}rels\~{o}na kirjutanud} % + {toim., komm\adddotspace ja j\"{a}rels\adddot}}, + byeditoranin = {{toimetanud, kommenteerinud ja sissejuhatuse kirjutanud} % + {toim., komment\adddotspace ja sissej\adddot}}, + byeditoranfo = {{toimetanud, kommenteerinud ja eess\~{o}na kirjutanud} % + {toim., komment\adddotspace ja eess\adddot}}, + byeditoranaf = {{toimetanud, kommenteerinud ja j\"{a}rels\~{o}na kirjutanud} % + {toim., komment\adddotspace ja j\"{a}rels\adddot}}, + byeditortrcoin = {{toimetanud, \lbx@lfromlang t\~{o}lkinud, kommenteerinud ja sissejuhatuse kirjutanud} % + {toim., \lbx@sfromlang t\~{o}lk., komm\adddotspace ja sissej\adddot}}, + byeditortrcofo = {{toimetanud, \lbx@lfromlang t\~{o}lkinud, kommenteerinud ja eess\~{o}na kirjutanud} % + {toim., \lbx@sfromlang t\~{o}lk., komm\adddotspace ja eess\adddot}}, + byeditortrcoaf = {{toimetatud, \lbx@lfromlang t\~{o}lkinud, kommenteerinud ja j\"{a}rels\~{o}na kirjutanud} % + {toim., \lbx@sfromlang t\~{o}lk., komm\adddotspace ja j\"{a}rels\adddot}}, + byeditortranin = {{toimetanud, \lbx@lfromlang t\~{o}lkinud, kommenteerinud ja sissejuhatuse kirjutanud} % + {toim., \lbx@sfromlang t\~{o}lk., komment\adddotspace ja sissej\adddot}}, + byeditortranfo = {{toimetanud, \lbx@lfromlang t\~{o}lkinud, kommenteerinud ja eess\~{o}na kirjutanud} % + {toim., \lbx@sfromlang t\~{o}lk., komment\adddotspace ja eess\adddot}}, + byeditortranaf = {{toimetanud, \lbx@lfromlang t\~{o}lkinud, kommenteerinud ja j\"{a}rels\~{o}na kirjutanud} % + {toim., \lbx@sfromlang t\~{o}lk., komment\adddotspace ja j\"{a}rels\adddot}}, + bytranslatorco = {{\lbx@lfromlang t\~{o}lkinud ja kommenteerinud} % + {\lbx@sfromlang t\~{o}lk\adddotspace ja komm\adddot}}, + bytranslatoran = {{\lbx@lfromlang t\~{o}lkinud ja kommenteerinud} % + {\lbx@sfromlang t\~{o}lk\adddotspace ja komment\adddot}}, + bytranslatorin = {{\lbx@lfromlang t\~{o}lkinud ja sissejuhatuse kirjutanud} % + {\lbx@sfromlang t\~{o}lk\adddotspace ja sissej\adddot}}, + bytranslatorfo = {{\lbx@lfromlang t\~{o}lkinud ja eess\~{o}na kirjutanud} % + {\lbx@sfromlang t\~{o}lk\adddotspace ja eess\adddot}}, + bytranslatoraf = {{\lbx@lfromlang t\~{o}lkinud ja j\"{a}rels\~{o}na kirjutanud} % + {\lbx@sfromlang t\~{o}lk\adddotspace ja j\"{a}rels\adddot}}, + bytranslatorcoin = {{\lbx@lfromlang t\~{o}lkinud, kommenteerinud ja sissejuhatuse kirjutanud} % + {\lbx@sfromlang t\~{o}lk., komm\adddotspace ja sissej\adddot}}, + bytranslatorcofo = {{\lbx@lfromlang t\~{o}lkinud, kommenteerinud ja eess\~{o}na kirjutanud} % + {\lbx@sfromlang t\~{o}lk., komm\adddotspace ja eess\adddot}}, + bytranslatorcoaf = {{\lbx@lfromlang t\~{o}lkinud, kommenteerinud ja j\"{a}rels\~{o}na kirjutanud} % + {\lbx@sfromlang t\~{o}lk., komm\adddotspace ja j\"{a}rels\adddot}}, + bytranslatoranin = {{\lbx@lfromlang t\~{o}lkinud, kommenteerinud ja sissejuhatuse kirjutanud} % + {\lbx@sfromlang t\~{o}lk., komment\adddotspace ja sissej\adddot}}, + bytranslatoranfo = {{\lbx@lfromlang t\~{o}lkinud, kommenteerinud ja eess\~{o}na kirjutanud} % + {\lbx@sfromlang t\~{o}lk., komment\adddotspace ja eess\adddot}}, + bytranslatoranaf = {{\lbx@lfromlang t\~{o}lkinud, kommenteerinud ja j\"{a}rels\~{o}na kirjutanud} % + {\lbx@sfromlang t\~{o}lk., komment\adddotspace ja j\"{a}rels\adddot}}, and = {{ja}{ja}}, - andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, - andmore = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + andothers = {{\mkbibemph{\autocap{e}t\addabbrvspace al\adddot}} % + {\mkbibemph{\autocap{e}t\addabbrvspace al\adddot}}}, + andmore = {{\mkbibemph{\autocap{e}t\addabbrvspace al\adddot}} % + {\mkbibemph{\autocap{e}t\addabbrvspace al\adddot}}}, volume = {{k\"{o}ide}{k\"{o}ide}}, - volumes = {{k\"{o}ided}{k\"{o}idef}}, -% involumes = {{}{}},% FIXME: missing. Finnish translation of "in 5 volumes" is "5 osassa". + volumes = {{k\"{o}ited}{k\"{o}ited}}, + involumes = {{osas}{osas}}, jourvol = {{k\"{o}ide}{k\"{o}ide}}, jourser = {{seeria}{seeria}}, book = {{raamat}{raamat}}, part = {{osa}{osa}}, - issue = {{numero}{numero}}, - newseries = {{uues series}{uue ser\adddot}}, - oldseries = {{vana seeria}{vana ser\adddot}}, + issue = {{number}{nr\adddot}}, + newseries = {{uus seerias}{uus seer\adddot}}, + oldseries = {{vana seeria}{vana seer\adddot}}, edition = {{v\"{a}ljaanne}{v\"{a}ljaanne}}, reprint = {{kordustr\"{u}kk}{kordustr\"{u}kk}}, - reprintof = {{kordustr\"{u}kk ning}{kordustr\"{u}kk ning}}, - reprintas = {{kordustr\"{u}kk nagu}{kordustr\"{u}kk nagu}}, - reprintfrom = {{kordustr\"{u}kk alates}{kordustr\"{u}kk alates}}, - reviewof = {{vahekokkuv\~{o}tte}{vahekokkuv\~{o}tte}}, - translationof = {{t\~{o}lkimine}{t\~{o}lkimine}}, - translationas = {{t\~{o}lkida kui}{t\~{o}lkida kui}}, + reprintof = {{kordustr\"{u}kk teosest}{kordustr\"{u}kk teosest}}, + reprintas = {{kordustr\"{u}kitud kui}{kordustr\"{u}kitud kui}}, + reprintfrom = {{kordustr\"{u}kitud teosest}{kordustr\"{u}kitud teosest}}, + reviewof = {{arvustus teosest}{arvustus teosest}}, + translationof = {{t\~{o}lge}{t\~{o}lge}}, + translationas = {{t\~{o}lgitud kui}{t\~{o}lgitud kui}}, translationfrom = {{t\~{o}lgitud}{t\~{o}lgitud}}, - origpubas = {{algselt avaldatud nagu}{algselt avaldatud nagu}}, - origpubin = {{algselt avaldatud}{algselt avaldatud}}, - astitle = {{j\"{a}rgnevatest}{j\"{a}rgnevatest}}, - bypublisher = {{julkaissut}{julkaissut}}, - page = {{lehek\"{u}lja}{l\adddot}}, - pages = {{lehek\"{u}ljed}{l\adddot}}, + origpubas = {{algselt avaldatud kui}{algselt avaldatud kui}}, % FIXME: unsure, could also be 'esmatrükitud kui' + origpubin = {{algselt avaldatud aastal}{algselt avaldatud aastal}}, % FIXME: unsure, could also be 'esmatrükitud aastal' + astitle = {{pealkirjaga}{pealkirjaga}}, + bypublisher = {{v\"{a}lja andnud}{v\"{a}lja andnud}}, + page = {{lehek\"{u}lg}{lk\adddot}}, + pages = {{lehek\"{u}ljed}{lk\adddot}}, column = {{veerg}{veerg}}, columns = {{veerud}{veerud}}, line = {{rida}{rida}}, - lines = {{ridad}{ridad}}, - nodate = {{kuup\"{a}ev puudub}}, + lines = {{read}{read}}, + nodate = {{kuup\"{a}ev puudub}{kuup\"{a}ev puudub}}, verse = {{salm}{salm}}, verses = {{salmid}{salmid}}, section = {{jagu}{jagu}}, - 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}}, - number = {{arv}{arv}}, - chapter = {{peat\"{u}kk}{peat\"{u}kk}}, -% bathesis = {{}{}},% FIXME: missing + sections = {{jaod}{jaod}}, + paragraph = {{l\~{o}ik}{l\~{o}ik}}, + paragraphs = {{l\~{o}igud}{l\~{o}igud}}, + pagetotal = {{lehek\"{u}lgi kokku}{lk\adddotspace kokku}},% FIXME: unsure + pagetotals = {{lehek\"{u}lgesid kokku}{lk\adddotspace kokku}},% FIXME: unsure + columntotal = {{veerge kokku}{veerge kokku}},% FIXME: unsure + columntotals = {{veergusid kokku}{veergusid kokku}},% FIXME: unsure + linetotal = {{ridu kokku}{ridu kokku}},% FIXME: unsure + linetotals = {{ridasid kokku}{ridasid kokku}},% FIXME: unsure + versetotal = {{salmi kokku}{salmi kokku}},% FIXME: unsure + versetotals = {{salmesid kokku}{salmesid kokku}},% FIXME: unsure + sectiontotal = {{jagusid kokku}{jagusid kokku}},% FIXME: unsure + sectiontotals = {{jagusid kokku}{jagusid kokku}},% FIXME: unsure + paragraphtotal = {{l\~{o}ike kokku}{l\~{o}ike kokku}},% FIXME: unsure + paragraphtotals = {{l\~{o}ikusid kokku}{l\~{o}ikusid kokku}},% FIXME: unsure + in = {{teoses}{teoses}}, + inseries = {{sarjas}{sarjas}}, + ofseries = {{sarjast}{sarjast}}, + number = {{number}{nr}}, + chapter = {{peat\"{u}kk}{ptk}}, + bathesis = {{bakalaureuse t\"{o}\"{o}}{bakalaureuse t\"{o}\"{o}}}, mathesis = {{magistrit\"{o}\"{o}}{magistrit\"{o}\"{o}}}, phdthesis = {{doktorit\"{o}\"{o}}{doktorit\"{o}\"{o}}}, - candthesis = {{kandidaadi v\"{a}itekirja}{kandidaadi v\"{a}itekirja}},% Literal translation of "Candidate thesis". - resreport = {{tutkimusraportti}{tutkimusraportti}}, - techreport = {{uuringute raport}{uuringute raport}}, + candthesis = {{kandidaadi v\"{a}itekiri}{kandidaadi v\"{a}itekiri}},% Literal translation of "Candidate thesis". + resreport = {{uuringuraport}{uuringuraport}}, + techreport = {{tehniline raport}{tehniline raport}}, software = {{tarkvara}{tarkvara}}, datacd = {{CD-ROM}{CD-ROM}}, - audiocd = {{audio CD}{audio CD}}, + audiocd = {{audioplaat}{audioplaat}}, version = {{versioon}{versioon}}, url = {{aadress}{aadress}}, urlfrom = {{saadaval}{saadaval}}, - urlseen = {{k\"{u}lastas}{k\"{u}lastas}}, - inpreparation = {{ettevalmistamisel}{ettevalmistamisel}}, + urlseen = {{vaadatud}{vaadatud}}, + inpreparation = {{koostamisel}{koostamisel}}, submitted = {{esitatud}{esitatud}}, forthcoming = {{tulevases}{tulevases}}, - inpress = {{ajakirjanduses}{ajakirjanduses}}, + inpress = {{tr\"{u}kis}{tr\"{u}kis}}, prepublished = {{eelnevalt avaldatud} {eelnevalt avaldatud}}, 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}}, - idemsf = {{eadem}{eadem}}, - idemsn = {{idem}{idem}}, - idempm = {{eidem}{eidem}}, - idempf = {{eaedem}{eaedem}}, - idempn = {{eadem}{eadem}}, - idempp = {{eidem}{eidem}}, - ibidem = {{ibidem}{ibid\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 = {{passim}{pass\adddot}}, - see = {{vaata}{vaata}}, - seealso = {{allikad}{allikad}}, + seenote = {{vaata m\"{a}rkus}{vt m\"{a}rkus}}, + quotedin = {{noteeritud}{noteeritud}}, % FIXME: unsure + idem = {{\mkbibemph{\autocap{i}dem}}{\mkbibemph{\autocap{i}dem}}}, % It its not necessary to translate Latin phrases. + idemsm = {{\mkbibemph{\autocap{i}dem}}{\mkbibemph{\autocap{i}dem}}}, + idemsf = {{\mkbibemph{\autocap{e}adem}}{\mkbibemph{\autocap{e}adem}}}, + idemsn = {{\mkbibemph{\autocap{i}dem}}{\mkbibemph{\autocap{i}dem}}}, + idempm = {{\mkbibemph{\autocap{e}idem}}{\mkbibemph{\autocap{e}idem}}}, + idempf = {{\mkbibemph{\autocap{e}aedem}}{\mkbibemph{\autocap{e}aedem}}}, + idempn = {{\mkbibemph{\autocap{e}adem}}{\mkbibemph{\autocap{e}adem}}}, + idempp = {{\mkbibemph{\autocap{e}idem}}{\mkbibemph{\autocap{e}idem}}}, + ibidem = {{\mkbibemph{\autocap{i}bidem}}{\mkbibemph{\autocap{i}bid\adddot}}}, + opcit = {{\mkbibemph{\autocap{o}p\adddotspace cit\adddot}}{\mkbibemph{\autocap{o}p\adddotspace cit\adddot}}}, + loccit = {{\mkbibemph{\autocap{l}oc\adddotspace cit\adddot}}{\mkbibemph{\autocap{l}oc\adddotspace cit\adddot}}}, + confer = {{\mkbibemph{\autocap{c}f\adddot}}{\mkbibemph{\autocap{c}f\adddot}}}, + sequens = {{\mkbibemph{\autocap{s}q\adddot}}{\mkbibemph{\autocap{s}q\adddot}}}, + sequentes = {{\mkbibemph{\autocap{s}qq\adddot}}{\mkbibemph{\autocap{s}qq\adddot}}}, + passim = {{\mkbibemph{\autocap{p}assim}}{\mkbibemph{\autocap{p}ass\adddot}}}, + see = {{vaata}{vt}}, + seealso = {{vaata ka}{vt ka}}, backrefpage = {{viidatud lehel}{viidatud lehel}}, backrefpages = {{viidatud lehek\"{u}ljed}{viidatud lehek\"{u}ljed}}, january = {{jaanuar}{jaanuar}}, @@ -481,122 +463,98 @@ october = {{oktoober}{oktoober}}, november = {{november}{november}}, december = {{detsember}{detsember}}, - basicjanuary = {{jaanuar}{jaanuar}}, - basicfebruary = {{veebruar}{veebruar}}, - basicmarch = {{m\"{a}rts}{m\"{a}rts}}, - basicapril = {{aprill}{aprill}}, - basicmay = {{mai}{mai}}, - basicjune = {{juuni}{juuni}}, - basicjuly = {{juuli}{juuli}}, - basicaugust = {{august}{august}}, - basicseptember = {{september}{september}}, - basicoctober = {{oktoober}{oktoober}}, - basicnovember = {{november}{november}}, - 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}}, - langdanish = {{taani}{taani}}, - langdutch = {{hollandi}{hollandi}}, - langenglish = {{inglise}{inglise}}, - langestonian = {{eesti}{eesti}}, - langfinnish = {{soome}{soome}}, - langfrench = {{prantsuse}{prantsuse}}, - langgalician = {{galeegi}{galeegi}}, - langgerman = {{saksa}{saksa}}, - langgreek = {{kreeka}{kreeka}}, - langitalian = {{itaalia}{itaalia}}, - langlatin = {{ladina}{ladina}}, -% langlatvian = {{}{}},% FIXME: missing - langnorwegian = {{norra}{norra}}, - langpolish = {{poola}{poola}}, - langportuguese = {{portugali}{portugali}}, - langrussian = {{vene}{vene}}, -% langslovak = {{}{}},% FIXME: missing - langslovene = {{sloveeni}{sloveeni}}, - langspanish = {{hispaania}{hispaania}}, - 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}}, - fromdanish = {{Taani}{alates Taani}}, - fromdutch = {{alates Hollandi}{: Hollandi}}, - fromenglish = {{ingliskeelsest}{ingliskeelsest}}, - 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}}, - fromlatin = {{alates Ladina}{: Ladina}}, -% fromlatvian = {{}{}},% FIXME: missing - fromnorwegian = {{alates Norra}{: Norra}}, - frompolish = {{alates Poola} {alates Poola}}, - fromportuguese = {{alates Portugali}{: Portugali}}, - fromrussian = {{alates Vene}{: vene}}, -% fromslovak = {{}{}},% FIXME: missing - fromslovene = {{alates sloveeni}{: sloveeni}}, - fromspanish = {{alates Hispaania}{alates Hispaania}}, - fromswedish = {{alates Rootsi}{: Rootsi}}, + langamerican = {{Ameerika inglise keel}{Ameerika inglise keel}}, + langbrazilian = {{brasiilia keel}{brasiilia keel}}, + langbulgarian = {{bulgaaria keel}{bulgaaria keel}}, + langcatalan = {{katalaani keel}{katalaani keel}}, + langcroatian = {{horvaadi keel}{horvaadi keel}}, + langczech = {{t\v{s}ehhi keel}{t\v{s}ehhi keel}}, + langdanish = {{taani keel}{taani keel}}, + langdutch = {{hollandi keel}{hollandi keel}}, + langenglish = {{inglise keel}{inglise keel}}, + langestonian = {{eesti keel}{eesti keel}}, + langfinnish = {{soome keel}{soome keel}}, + langfrench = {{prantsuse keel}{prantsuse keel}}, + langgalician = {{galeegi keel}{galeegi keel}}, + langgerman = {{saksa keel}{saksa keel}}, + langgreek = {{kreeka keel}{kreeka keel}}, + langhungarian = {{ungari keel}{ungari keel}}, + langitalian = {{itaalia keel}{itaalia keel}}, + langjapanese = {{jaapani keel}{jaapani keel}}, + langlatin = {{ladina keel}{ladina keel}}, + langlatvian = {{l\"{a}ti keel}{l\"{a}ti keel}}, + langnorwegian = {{norra keel}{norra keel}}, + langpolish = {{poola keel}{poola keel}}, + langportuguese = {{portugali keel}{portugali keel}}, + langrussian = {{vene keel}{vene keel}}, + langslovak = {{slovakia keel}{slovakia keel}}, + langslovene = {{sloveeni keel}{sloveeni keel}}, + langspanish = {{hispaania keel}{hispaania keel}}, + langswedish = {{rootsi keel}{rootsi keel}}, + langukrainian = {{ukraina keel}{ukraina keel}}, + fromamerican = {{Ameerika inglise keelest}{Ameerika inglise keelest}}, + frombrazilian = {{brasiilia keelest}{brasiilia keelest}}, + frombulgarian = {{bulgaaria keelest}{bulgaaria keelest}}, + fromcatalan = {{katalani keelest}{kalatalani keelest}}, + fromcroatian = {{horvaadi keelest}{horvaadi keelest}}, + fromczech = {{t\v{s}ehhi keelest}{t\v{s}ehhi keelest}}, + fromdanish = {{taani keelest}{taani keelest}}, + fromdutch = {{hollandi keelest}{hollandi keelest}}, + fromenglish = {{inglise keelest}{inglise keelest}}, + fromestonian = {{eesti keelest}{eesti keelest}}, + fromfinnish = {{soome keelest}{soome keelest}}, + fromfrench = {{prantsuse keelest}{prantsuse keelest}}, + fromgalician = {{galeegi keelest}{galeegi keelest}}, + fromgerman = {{saksa keelest}{saksa keelest}}, + fromgreek = {{kreeka keelest}{kreeka keelest}}, + fromhungarian = {{ungari keelest}{ungari keelest}}, + fromitalian = {{itaalia keelest}{itaalia keelest}}, + fromjapanese = {{jaapani keelest}{jaapani keelest}}, + fromlatin = {{ladina keelest}{ladina keelest}}, + fromlatvian = {{l\"{a}ti keelest}{l\"{a}ti keelest}}, + fromnorwegian = {{norra keelest}{norra keelest}}, + frompolish = {{poola keelest} {poola keelest}}, + fromportuguese = {{portugali keelest}{portugali keelest}}, + fromrussian = {{vene keelest}{vene keelest}}, + fromslovak = {{slovakia keelest}{slovakia keelest}}, + fromslovene = {{sloveenia keelest}{sloveenia keelest}}, + fromspanish = {{hispaania keelest}{hispaania keelest}}, + fromswedish = {{rootsi keelest}{rootsi keelest}}, + fromukrainian = {{ukraina keelest}{ukraina keelest}}, countryde = {{Saksamaa}{DE}}, countryeu = {{Euroopa Liit}{EL}}, - countryep = {{Euroopa Liidu}{EP}}, + countryep = {{Euroopa Parlament}{EP}}, countryfr = {{Prantsusmaa}{FR}}, countryuk = {{Suurbritannia}{GB}}, countryus = {{Ameerika}{US}}, - patent = {{patendi}{pat\adddot}}, - patentde = {{Saksa patendi}{Saksa pat\adddot}}, - patenteu = {{Euroopa patendi}{Euroopa pat\adddot}}, + patent = {{patent}{pat\adddot}}, + patentde = {{Saksa patent}{Saksa pat\adddot}}, + patenteu = {{Euroopa patent}{Euroopa pat\adddot}}, patentfr = {{Prantsuse patent}{Prantsuse pat\adddot}}, - patentuk = {{Briti patendi}{Briti pat\adddot}}, + patentuk = {{Briti patent}{Briti pat\adddot}}, patentus = {{U.S\adddotspace patent}{U.S\adddotspace pat\adddot}}, - patreq = {{patendi taotluse}{pat\adddot\ req\adddot}}, - patreqde = {{Saksa patendi taotluse}{Saksa pat\adddot\ req\adddot}}, - 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}}, - file = {{faili}{faili}}, + patreq = {{patendi taotlus}{pat\adddotspace taotl\adddot}}, + patreqde = {{Saksa patendi taotlus}{Saksa pat\adddotspace taotl\adddot}}, + patreqeu = {{Euroopa patendi taotlus}{Euroopa pat\adddotspace taotl\adddot}}, + patreqfr = {{Prantsuse patendi taotlus}{Prantsuse pat\adddotspace taotl\adddot}}, + patrequk = {{Briti patendi taotlus}{Briti pat\adddotspace taotl\adddot}}, + patrequs = {{U.S\adddotspace patendi taotlus.}{U.S\adddotspace pat\adddotspace taotl\adddot}}, + file = {{fail}{fail}}, library = {{raamatukogu}{raamatukogu}}, - abstract = {{abstraktne}{abstraktne}}, - annotation = {{annotatsioon}{annotatsioon}}, + abstract = {{teesid}{teesid}}, + annotation = {{kommentaarid}{kommentaarid}}, commonera = {{meie ajaarvamise j\"argi}{m\adddot a\adddot j}}, beforecommonera = {{enne meie ajaarvamist}{e\adddot m\adddot a}}, annodomini = {{p\"arast Kristust}{pKr}}, beforechrist = {{enne Kristust}{eKr}}, -% circa = {{}{}},% FIXME: missing -% spring = {{}{}},% FIXME: missing -% summer = {{}{}},% FIXME: missing -% autumn = {{}{}},% FIXME: missing -% winter = {{}{}},% FIXME: missing + circa = {{\mkbibemph{\autocap{c}a}}{\mkbibemph{\autocap{c}a}}}, + spring = {{kevadel}{kevadel}}, + summer = {{suvel}{suvel}}, + autumn = {{s\"{u}gisel}{s\"{u}gisel}}, + winter = {{talvel}{talvel}}, am = {{AM}{AM}}, pm = {{PM}{PM}}, } -\protected\gdef\lbx@fi@mkbibmonthbasic#1{% - \ifcase0#1\relax - #1\BibliographyWarning{Month out of range}% - \or\abx@bibmonth{basicjanuary}% - \or\abx@bibmonth{basicfebruary}% - \or\abx@bibmonth{basicmarch}% - \or\abx@bibmonth{basicapril}% - \or\abx@bibmonth{basicmay}% - \or\abx@bibmonth{basicjune}% - \or\abx@bibmonth{basicjuly}% - \or\abx@bibmonth{basicaugust}% - \or\abx@bibmonth{basicseptember}% - \or\abx@bibmonth{basicoctober}% - \or\abx@bibmonth{basicnovember}% - \or\abx@bibmonth{basicdecember}% - \else - #1\BibliographyWarning{Month out of range}% - \fi}% \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx index 9459598c1d4..372b537d97d 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx @@ -94,7 +94,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -283,9 +283,9 @@ {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 + organizer = {{toimittanut}{toim\adddot}},% FIXME: unsure + organizers = {{toimittaneet}{toim\adddot}},% FIXME: unsure + byorganizer = {{toimittanut}{toim\adddot}},% FIXME: unsure byauthor = {{kirjoittanut}{kirj\adddot}}, byeditor = {{toimittanut}{toim\adddot}}, bycompiler = {{koontanut}{koontanut}}, @@ -373,15 +373,15 @@ {\lbx@sfromlang k\"a\"ant\"anyt, selityksin varustanut ja j\"alkisanat kirjoittanut}}, and = {{ja}{ja}}, andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, - andmore = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + andmore = {{jne\adddot}{jne\adddot}}, volume = {{volyymi}{vol\adddot}},% FIXME: Is {{osa}{osa}} a better translation? volumes = {{volyymit}{vol\adddot}},% Incorrect. Correct translation of "volumes" depends on context. -% involumes = {{}{}},% FIXME: missing. Finnish translation of "in 5 volumes" is "5 osassa". + involumes = {{}{}},% Finnish translation of "in 5 volumes" is "5 osassa", so translation of "in" is an empty string. jourvol = {{volyymi}{vol\adddot}}, jourser = {{sarja}{sarja}}, book = {{kirja}{kirja}},% FIXME: Literal translation of "book". Correct translation depends on context. - part = {{osa}{osa}},% FIXME: unsure - issue = {{numero}{numero}},% FIXME: unsure + part = {{osa}{osa}}, + issue = {{numero}{numero}}, newseries = {{uusi sarja}{uusi sarja}}, oldseries = {{vanha sarja}{vanha sarja}}, edition = {{painos}{painos}}, @@ -410,31 +410,31 @@ 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 + pagetotal = {{sivu}{s\adddot}}, + pagetotals = {{sivut}{s\adddot}}, + columntotal = {{palsta}{palsta}},% Here "sarake" is wrong! + columntotals = {{palstat}{palstat}},% Here "sarakkeet" is wrong! + linetotal = {{rivi}{rivi}}, + linetotals = {{rivit}{rivit}}, + versetotal = {{s\"ae}{s\"ae}}, + versetotals = {{s\"akeet}{s\"akeet}}, + sectiontotal = {{kohta}{kohta}},% Bad translation, but "pyk\"al\"a" is no better. + sectiontotals = {{kohdat}{kohdat}},% Bad translation, but "pyk\"al\"at" is no better. + paragraphtotal = {{kappale}{kappale}}, + paragraphtotals = {{kappaleet}{kappaleet}}, in = {{teoksessa}{teoksessa}}, inseries = {{sarjassa}{sarjassa}}, ofseries = {{sarjassa}{sarjassa}}, number = {{numero}{nro}}, chapter = {{luku}{luku}}, -% bathesis = {{}{}},% FIXME: missing + bathesis = {{tutkielma}{tutkielma}},% FIXME: unsure mathesis = {{tutkielma}{tutkielma}},% FIXME: unsure phdthesis = {{tohtorinv\"ait\"oskirja}{tohtorinv\"ait\"oskirja}}, candthesis = {{kanditaatintutkielma}{kanditaatintutkielma}},% Literal translation of "Candidate thesis". resreport = {{tutkimusraportti}{tutkimusraportti}}, - techreport = {{tekninen raportti}{tekninen raportti}}, + techreport = {{tekninen raportti}{tekninen raportti}},% Literal translation of "technical report". software = {{ohjelmisto}{ohjelmisto}}, - datacd = {{data-CD}{data-CD}},% Is {CD-ROM}{CD-ROM}} better? + datacd = {{data-CD}{data-CD}},% Is {{CD-ROM}{CD-ROM}} better? audiocd = {{\"a\"ani-CD}{\"a\"ani-CD}}, version = {{versio}{versio}}, url = {{url}{url}}, @@ -446,7 +446,7 @@ inpress = {{painossa}{painossa}},% FIXME: unsure prepublished = {{esijulkaistu}{esijulkaistu}},% FIXME: unsure citedas = {{jatkossa}{jatkossa}}, - thiscite = {{t\"am\"a lainaus}{t\"am\"a lainaus}},% FIXME: unsure + thiscite = {{sama}{sama}},% FIXME: unsure seenote = {{katso viite}{katso viite}}, quotedin = {{lainattu teoksessa}{lainattu teoksessa}}, idem = {{idem}{id\adddot}},% It its not necessary to translate Latin phrases. @@ -494,54 +494,56 @@ basicdecember = {{joulukuu}{joulukuu}}, langamerican = {{amerikanenglanti}{amerikanenglanti}}, langbrazilian = {{brasilianportugali}{brasilianportugali}}, -% langbulgarian = {{}{}},% FIXME: missing + langbulgarian = {{bulgaria}{bulgaria}}, langcatalan = {{katalonia}{katalonia}}, - langcroatian = {{kroataia}{kroatia}}, + langcroatian = {{kroatia}{kroatia}}, langczech = {{t\v{s}ekki}{t\v{s}ekki}}, langdanish = {{tanska}{tanska}}, langdutch = {{hollanti}{hollanti}}, langenglish = {{englanti}{englanti}}, -% langestonian = {{}{}},% FIXME: missing + langestonian = {{viro}{viro}}, langfinnish = {{suomi}{suomi}}, langfrench = {{ranska}{ranska}}, - langgalician = {{galician}{galician}}, + langgalician = {{galicia}{galicia}}, langgerman = {{saksa}{saksa}}, langgreek = {{kreikka}{kreikka}}, + langhungarian = {{unkari}{unkari}}, langitalian = {{italia}{italia}}, langlatin = {{latina}{latina}}, -% langlatvian = {{}{}},% FIXME: missing + langlatvian = {{latvia}{latvia}}, langnorwegian = {{norja}{norja}}, langpolish = {{puola}{puola}}, langportuguese = {{portugali}{portugali}}, langrussian = {{ven\"aj\"a}{ven\"aj\"a}}, -% langslovak = {{}{}},% FIXME: missing -% langslovene = {{}{}},% FIXME: missing + langslovak = {{slovakia}{slovakia}}, + langslovene = {{slovenia}{slovenia}}, langspanish = {{espanja}{espanja}}, langswedish = {{ruotsi}{ruotsi}}, fromamerican = {{englannin kielest\"a}{englannin kielest\"a}}, frombrazilian = {{portugalin kielest\"a}{portugalin kielest\"a}}, -% frombulgarian = {{}{}},% FIXME: missing + frombulgarian = {{bulgarian kielest\"a}{bulgarian kielest\"a}}, 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 = {{viron kielest\"a}{viron kielest\"a}}, 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}}, + fromhungarian = {{unkarin kielest\"a}{unkarin kielest\"a}}, fromitalian = {{italian kielest\"a}{italian kielest\"a}}, fromlatin = {{latinan kielest\"a}{latinan kielest\"a}}, -% fromlatvian = {{}{}},% FIXME: missing + fromlatvian = {{latvian kielest\"a}{latvian kielest\"a}}, fromnorwegian = {{norjan kielest\"a}{norjan kielest\"a}}, frompolish = {{puolan kielest\"a}{puolan kielest\"a}}, fromportuguese = {{portugalin kielest\"a}{portugalin kielest\"a}}, fromrussian = {{ven\"aj\"an kielest\"a}{ven\"aj\"an kielest\"a}}, -% fromslovak = {{}{}},% FIXME: missing -% fromslovene = {{}{}},% FIXME: missing + fromslovak = {{slovakian kielest\"a}{slovakian kielest\"a}}, + fromslovene = {{slovenian kielest\"a}{slovenian kielest\"a}}, fromspanish = {{espanjan kielest\"a}{espanjan kielest\"a}}, fromswedish = {{ruotsin kielest\"a}{ruotsin kielest\"a}}, countryde = {{Saksa}{DE}}, @@ -554,13 +556,13 @@ patentde = {{saksalainen patentti}{saksalainen pat\adddot}}, patenteu = {{Euroopan Unionin patentti}{Euroopan Unionin pat\adddot}}, patentfr = {{ranskalainen patentti}{ranskalainen pat\adddot}}, - patentuk = {{englantilainen patentti}{englantilainen pat\adddot}}, + patentuk = {{isobritannialainen patentti}{isobritannialainen pat\adddot}}, patentus = {{yhdysvaltalainen patentti}{yhdysvaltalainen pat\adddot}}, patreq = {{patenttihakemus}{pat\adddot\ hak\adddot}}, patreqde = {{saksalainen patenttihakemus}{saksalainen pat\adddot\ hak\adddot}}, patreqeu = {{Euroopan Unionin patenttihakemus}{Euroopan Unionin pat\adddot\ hak\adddot}}, patreqfr = {{ranskalainen patenttihakemus}{ranskalainen pat\adddot\ hak\adddot}}, - patrequk = {{englantilainen patenttihakemus}{englantilainen pat\adddot\ hak\adddot}}, + patrequk = {{isobritannialainen patenttihakemus}{isobritannialainen pat\adddot\ hak\adddot}}, patrequs = {{yhdysvaltalainen patenttihakemus}{yhdysvaltalainen pat\adddot\ hak\adddot}}, file = {{tiedosto}{tiedosto}}, library = {{kirjasto}{kirjasto}}, @@ -570,13 +572,13 @@ beforecommonera = {{ennen ajanlaskun alkua}{eaa\adddot}}, annodomini = {{j\"alkeen Kristuksen syntym\"an}{jKr\adddot}}, beforechrist = {{ennen Kristuksen syntym\"a\"a}{eKr\adddot}}, -% circa = {{}{}},% FIXME: missing -% spring = {{}{}},% FIXME: missing -% summer = {{}{}},% FIXME: missing -% autumn = {{}{}},% FIXME: missing -% winter = {{}{}},% FIXME: missing + circa = {{noin}{n\adddot}}, + spring = {{kev\"at}{kev\"at}},% Or kev\"a\"all\"a ? + summer = {{kes\"a}{kes\"a}},% Or kes\"all\"a ? + autumn = {{syksy}{syksy}},% Or syksyll\"a ? + winter = {{talvi}{talvi}},% Or talvella ? am = {{ap\adddot}{ip\adddot}}, - pm = {{ap\adddot}{ip\adddot}}, + pm = {{ip\adddot}{ip\adddot}}, } \protected\gdef\lbx@fi@mkbibmonthbasic#1{% diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx index 1f62e348e46..31f436e1dfb 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx @@ -81,7 +81,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -483,10 +483,11 @@ langgalician = {{galicien}{galicien}}, langgerman = {{allemand}{allemand}}, langgreek = {{grec}{grec}}, + langhungarian = {{hongrois}{hongrois}}, langitalian = {{italien}{italien}}, langjapanese = {{japonais}{japonais}}, langlatin = {{latin}{latin}}, -% langlatvian = {{}{}},% FIXME: missing + langlatvian = {{letton}{letton}}, langnorwegian = {{norv\'egien}{norv\'egien}}, langpolish = {{polonais}{polonais}}, langportuguese = {{portugais}{portugais}}, @@ -511,10 +512,11 @@ fromgalician = {{du galicien}{du galicien}}, fromgerman = {{de l'allemand}{de l'allemand}}, fromgreek = {{du grec}{du grec}}, + fromhungarian = {{du hongrois}{du hongrois}}, fromitalian = {{de l'italien}{de l'italien}}, fromjapanese = {{du japonais}{du japonais}}, fromlatin = {{du latin}{du latin}}, -% fromlatvian = {{}{}},% FIXME: missing + fromlatvian = {{du letton}{du letton}}, fromnorwegian = {{du norv\'egien}{du norv\'egien}}, frompolish = {{du polonais}{du polonais}}, fromportuguese = {{du portugais}{du portugais}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/galician.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/galician.lbx index 4d0e723263d..5cd3085e00f 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/galician.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/galician.lbx @@ -58,7 +58,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -443,7 +443,7 @@ nodate = {{sen data}{s\adddot d\adddot}}, november = {{novembro}{nov\adddot}}, december = {{decembro}{dec\adddot}}, langamerican = {{ingl\'es americano}{ing\adddotspace am\adddot}}, - langbulgarian = {{b\'ulgaro}{b\'ulg\adddot}} + langbulgarian = {{b\'ulgaro}{b\'ulg\adddot}}, langbrazilian = {{portugu\'es brasileiro}{port\adddotspace br\adddot}}, langcatalan = {{catal\'an}{cat\adddot}}, langcroatian = {{croata}{croata}}, @@ -457,6 +457,7 @@ nodate = {{sen data}{s\adddot d\adddot}}, langgalician = {{galego}{gal\adddot}}, langgerman = {{alem\'an}{al\adddot}}, langgreek = {{grego}{grego}}, + langhungarian = {{h\'ungaro}{h\'ungaro}}, langitalian = {{italiano}{ital\adddot}}, langlatin = {{lat\'in}{lat\adddot}}, % langlatvian = {{}{}},% FIXME: missing @@ -476,13 +477,14 @@ nodate = {{sen data}{s\adddot d\adddot}}, 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}}, + fromenglish = {{do ingl\'es}{do ing\adddot}}, 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}}, + fromhungarian = {{do h\'ungaro}{do h\'ungaro}}, fromitalian = {{do italiano}{do ital\adddot}}, fromlatin = {{do lat\'in'}{do lat\adddot}}, % fromlatvian = {{}{}},% FIXME: missing diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx index 1898df60106..d133f04c530 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx @@ -65,7 +65,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -465,6 +465,7 @@ langgalician = {{Galicisch}{Galicisch}}, langgerman = {{Deutsch}{Deutsch}}, langgreek = {{Griechisch}{Griechisch}}, + langhungarian = {{Ungarisch}{Ungarisch}}, langitalian = {{Italienisch}{Italienisch}}, langjapanese = {{Japanisch}{Japanisch}}, langlatin = {{Lateinisch}{Lateinisch}}, @@ -493,6 +494,7 @@ fromgalician = {{aus dem Galicischen}{aus dem Galicischen}}, fromgerman = {{aus dem Deutschen}{aus dem Deutschen}}, fromgreek = {{aus dem Griechischen}{aus dem Griechischen}}, + fromhungarian = {{aus dem Ungarischen}{aus dem Ungarischen}}, fromitalian = {{aus dem Italienischen}{aus dem Italienischen}}, fromjapanese = {{aus dem Japanischen}{aus dem Japanischen}}, fromlatin = {{aus dem Lateinischen}{aus dem Lateinischen}}, @@ -532,7 +534,7 @@ beforecommonera = {{vor unserer Zeitrechnung}{v\adddotspace u\adddotspace Z\adddot}}, annodomini = {{n\adddotspace Chr\adddot}{n\adddotspace Chr\adddot}}, beforechrist = {{v\adddotspace Chr\adddot}{v\adddotspace Chr\adddot}}, - circa = {{circa}{ca.}}, + circa = {{circa}{ca\adddot}}, spring = {{Fr\"uhling}{Fr\adddot}}, summer = {{Sommer}{So\adddot}}, autumn = {{Herbst}{He\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx index 442def75ebc..69f2fd708b5 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx @@ -93,7 +93,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -484,6 +484,7 @@ langgalician = {{Γαλικιανή}{Γαλικιανή}}, langgerman = {{Γερμανικά}{Γερμανικά}}, langgreek = {{Ελληνικά}{Ελληνικά}}, +% langhungarian = {{}{}}, % FIXME: missing langitalian = {{Ιταλικά}{Ιταλικά}}, langlatin = {{Λατινικά}{Λατινικά}}, % langlatvian = {{}{}},% FIXME: missing @@ -510,6 +511,7 @@ fromgalician = {{από τα Γαλικιανή}{από τα Γαλικιανή}}, fromgerman = {{από τα Γερμανικά}{από τα Γερμανικά}}, fromgreek = {{από τα Ελληνικά}{από τα Ελληνικά}}, +% fromhungarian = {{}{}}, % FIXME: missing fromitalian = {{από τα Ιταλικά}{από τα Ιταλικά}}, fromlatin = {{από τα Λατινικά}{από τα Λατινικά}}, % fromlatvian = {{}{}},% FIXME: missing diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/hungarian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/hungarian.lbx new file mode 100644 index 00000000000..8d910389d5a --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/hungarian.lbx @@ -0,0 +1,7 @@ +\ProvidesFile{hungarian.lbx} +[\abx@lbxid] + +\InheritBibliographyExtras{magyar} +\InheritBibliographyStrings{magyar} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx index 08c4305bd49..0429de4e136 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx @@ -71,7 +71,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -407,6 +407,7 @@ langgalician = {{galis\'iska}{galis\'iska}}, langgerman = {{\th\'yska}{\th\'yska}}, langgreek = {{gr\'{\i}ska}{gr\'{\i}ska}}, + langhungarian = {{ungverska}{ungverska}}, langitalian = {{\'{\i}talska}{\'{\i}talska}}, langlatin = {{lat\'{\i}na}{lat\'{\i}na}}, % langlatvian = {{}{}},% FIXME: missing @@ -433,6 +434,7 @@ fromgalician = {{\'ur galis\'isku}{\'ur galis\'isku}}, fromgerman = {{\'ur \th\'ysku}{\'ur \th\'ysku}}, fromgreek = {{\'ur gr\'{\i}sku}{\'ur gr\'{\i}sku}}, + fromhungarian = {{\'ur ungversku}{\'ur ungversku}}, fromitalian = {{\'ur \'{\i}t\"olsku}{\'ur \'{\i}t\"olsku}}, fromlatin = {{\'ur lat\'{\i}nu}{\'ur lat\'{\i}nu}}, % fromlatvian = {{}{}},% FIXME: missing diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx index 763ec856acf..07339b26537 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx @@ -58,7 +58,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -390,6 +390,7 @@ langgalician = {{galiziano}{galiziano}}, langgerman = {{tedesco}{tedesco}}, langgreek = {{greco}{greco}}, + langhungarian = {{ungherese}{ungherese}}, langitalian = {{italiano}{italiano}}, langlatin = {{latino}{latino}}, % langlatvian = {{}{}},% FIXME: missing @@ -416,6 +417,7 @@ fromgalician = {{dal galiziano}{dal galiziano}}, fromgerman = {{dal tedesco}{dal tedesco}}, fromgreek = {{dal greco}{dal greco}}, + fromhungarian = {{dall'ungherese}{dall'ungherese}}, fromitalian = {{dall'italiano}{dall'italiano}}, fromlatin = {{dal latino}{dal latino}}, % fromlatvian = {{}{}},% FIXME: missing diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/latvian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/latvian.lbx index d24cbce2627..7a86097a8d6 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/latvian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/latvian.lbx @@ -53,7 +53,7 @@ \iffieldundef{#2} {} {\iftoggle{lbx@lv@datewhen} - {\lbx@ru@mkbibdatemonthwhen{\thefield{#2}}} + {\lbx@lv@mkbibdatemonthwhen{\thefield{#2}}} {\mkbibmonth{\thefield{#2}}}}}% \protected\def\mkbibdateshort#1#2#3{% \iffieldundef{#3} @@ -84,7 +84,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -518,6 +518,7 @@ langgalician = {{galsie\v{s}u}{galsie\v{s}u}}, langgerman = {{v\={a}cu}{v\={a}cu}}, langgreek = {{grie\c{k}u}{grie\c{k}u}}, +% langhungarian = {{}{}}, % FIXME: missing langitalian = {{it\={a}\c{l}u}{it\={a}\c{l}u}}, langjapanese = {{jap\={a}\c{n}u}{jap\={a}\c{n}u}}, langlatin = {{lat\={\i}\c{n}u}{lat\={\i}\c{n}u}}, @@ -546,6 +547,7 @@ fromgalician = {{no galsie\v{s}u}{no galsie\v{s}u}}, fromgerman = {{no v\={a}cu}{no v\={a}cu}}, fromgreek = {{no grie\c{k}u}{no grie\c{k}u}}, +% fromhungarian = {{}{}}, % FIXME: missing fromitalian = {{no it\={a}\c{l}u}{no it\={a}\c{l}u}}, fromjapanese = {{no jap\={a}\c{n}u}{no jap\={a}\c{n}u}}, fromlatin = {{no lat\={\i}\c{n}u}{no lat\={\i}\c{n}u}}, @@ -600,7 +602,7 @@ locdateyear = {{gad\={a}}{g\adddot}}, } -\protected\gdef\lbx@ru@mkbibdatemonthwhen#1{% +\protected\gdef\lbx@lv@mkbibdatemonthwhen#1{% \ifcase0#1\relax #1\BibliographyWarning{Month out of range}% \or\abx@bibmonth{locjanuary}% @@ -623,11 +625,11 @@ \begingroup \blx@metadateinfo{#2}% \iffieldundef{#2year} - {} + {\blx@nounit} {\printtext[#2date]{% \datecircaprint \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} + {\ifdateyearsequal{#2}{#2end} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{#2year}{}{#2day}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} @@ -642,10 +644,10 @@ {\bibdaterangesep \enddatecircaprint \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} + {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibdate#1}{}{#2endmonth}{#2endday}} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} - {\iffieldsequal{#2year}{#2endyear} + {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibseasondate#1}{}{#2endseason}} {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% \enddateuncertainprint @@ -656,11 +658,11 @@ \begingroup \blx@metadateinfo{#2}% \iffieldundef{#2year} - {} + {\blx@nounit} {\printtext[#2date]{% \datecircaprint \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} + {\ifdateyearsequal{#2}{#2end} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{#2year}{}{#2day}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} @@ -676,10 +678,10 @@ {\bibdaterangesep \enddatecircaprint \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} + {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibdate#1}{}{#2endmonth}{#2endday}} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} - {\iffieldsequal{#2year}{#2endyear} + {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibseasondate#1}{}{#2endseason}} {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% \printfield{extradate}% diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/magyar.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/magyar.lbx new file mode 100644 index 00000000000..c4d102ce63f --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/magyar.lbx @@ -0,0 +1,721 @@ +\ProvidesFile{magyar.lbx} +[\abx@lbxid] + +\ifundef{\lbx@hu@loadinfo} + {\blx@warning@noline{% + Hungarian localisation module for biblatex loaded.\MessageBreak + This module changes more definitions than usual.\MessageBreak + Please refer to the documentation for hints and\MessageBreak + check the output, especially with non-standard\MessageBreak + styles or customisations to field formats.\MessageBreak + This warning can be disabled with\MessageBreak + '\string\BiblatexHungarianWarningOff'}% + \global\let\lbx@hu@loadinfo\@empty} + {} + +\DeclareRedundantLanguages{magyar}{magyar,hungarian} + +\DeclareBibliographyExtras{% + \DeclareCapitalPunctuation{.!?}% + \protected\def\bibrangedash{% + \textendash\penalty\hyphenpenalty}% breakable dash + \savecommand\bibdaterangesep + \protected\def\bibdaterangesep{\space\textendash\space}% + \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}% + \let\lbx@hu@dayrange\@secondoftwo + \protected\def\mkbibdatelong#1#2#3{% + \iffieldundef{#1} + {} + {\iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}% + \iffieldundef{#2}{\thefield{#1}} + {\mkbibordinal{\thefield{#1}}}}% + \iffieldundef{#2}{}{\nobreakspace}}% + \iffieldundef{#2} + {} + {\mkbibmonth{\thefield{#2}}% + \iffieldundef{#3}{}{\nobreakspace}}% + \iffieldundef{#3} + {} + {\lbx@hu@dayrange{\thefield{#3}}{\mkbibordinal{\thefield{#3}}}}% + }% + \protected\def\mkbibdateshort#1#2#3{% + \iffieldundef{#1} + {} + {\iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}% + \iffieldundef{#2}{\thefield{#1}} + {\mkbibordinal{\thefield{#1}}}}% + \iffieldundef{#2}{}{\nobreakspace}}% + \iffieldundef{#2} + {} + {\mkmonthzeros{\thefield{#2}}\adddot + \iffieldundef{#3}{}{\nobreakspace}}% + \iffieldundef{#3} + {} + {\mkdayzeros{\thefield{#3}}\lbx@hu@dayrange{}{\adddot}}% + }% + \let\mkbibseasondatelong\mkbibseasondateshort + \savecommand\mkdaterangecomp + \savecommand\mkdaterangecompextra + \savecommand\mkdaterangeterse + \savecommand\mkdaterangeterseextra + \protected\def\mkdaterangecomp{% + \lbx@hu@mkdaterangetrunc{long}}% + \protected\def\mkdaterangeterse{% + \lbx@hu@mkdaterangetrunc{short}}% + \protected\def\mkdaterangecompextra{% + \lbx@hu@mkdaterangetruncextra{long}}% + \protected\def\mkdaterangeterseextra{% + \lbx@hu@mkdaterangetruncextra{short}}% +\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}}}}% + \csletcs{mkbibtime12h}{mkbibtime24h}% + \protected\def\mkbibseasondateshort#1#2{% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}% + \iffieldundef{#1}{}{\adddot\space} + \mkbibseason{\thefield{#2}}% + }% + \let\mkbibseasondatelong\mkbibseasondateshort + \savecommand\lbx@lfromlang + \savecommand\lbx@sfromlang + \def\lbx@lfromlang{% + \iflistundef{origlanguage} + {} + {\printlist[lfromoriglanguage]{origlanguage}\space}}% + \def\lbx@sfromlang{% + \iflistundef{origlanguage} + {} + {\printlist[sfromoriglanguage]{origlanguage}\space}}% + % Page numbers and ranges + % convenient shorthand for page range normalisation + \protected\def\lbx@hu@mkdottednormrange{\mknormrange*[\mkbibordinal]}% + % this redefines \mkpageprefix to put the page number as suffix + \savecommand\blx@mkpageprefix + \protected\long\def\blx@mkpageprefix#1[#2]#3{% + \blx@mkpageprefix@i[#2]{#3}% + \ifnumeral{#3} + {\ppspace\bibstring{#1}} + {\ifnumerals{#3} + {\ppspace\bibstring{#1s}} + {\def\pno{\bibstring{#1}}% + \def\ppno{\bibstring{#1s}}}}}% + % NOTE: a few field formats are redefined here, this overrides corresponding + % style and preamble definitions. + % If you want to overwrite the changes made here, use + % \DefineBibliographyExtras{magyar}{...} + % Do not forget to make these changes undone with + % \UndefineBibliographyExtras{magyar}{...} + % to avoid them spilling out later. + \savefieldformat{pages}% + \DeclareFieldFormat{pages}{% + \mkpageprefix[bookpagination][\lbx@hu@mkdottednormrange]{#1}}% + \savefieldformat{postnote}% + \DeclareFieldFormat{postnote}{% + \mkpageprefix[pagination][\lbx@hu@mkdottednormrange]{#1}}% + \savefieldformat{volcitepages}% + \DeclareFieldFormat{volcitepages}{% + \mkpageprefix[pagination][\lbx@hu@mkdottednormrange]{#1}}% + \savefieldformat{multipostnote}% + \DeclareFieldFormat{multipostnote}{% + \mkpageprefix[pagination][\lbx@hu@mkdottednormrange]{#1}}% + \savefieldformat{chapter}% + \DeclareFieldFormat{chapter}{% + \ifnumerals{#1}{\mkbibordinal{#1}}{#1} + \addnbspace + \bibstring{chapter}}% + \savefieldformat{volume}% + \DeclareFieldFormat{volume}{% + \ifnumerals{#1}{\mkbibordinal{#1}}{#1} + \addnbspace + \bibstring{volume}}% + \savefieldformat{part}% + \DeclareFieldFormat{part}{% + \addcomma\space% <- this is *really* bad, don't try this at home + % In general leading or trailing punctuation in field formats should be + % avoided and should instead be dealt with in the appropriate bibmacros. + % The part field is special because its standard definition is '.#1'. + % Additionally, \printfield{part} is called all over the place, so we + % can't simply redefine a macro here. + \ifnumerals{#1}{\mkbibordinal{#1}}{#1}% + \addnbspace + \bibstring{part}}% + \savefieldformat{version}% + \DeclareFieldFormat{version}{% + \ifnumerals{#1}{\mkbibordinal{#1}}{#1} + \addnbspace + \bibstring{version}}% +} + + +\UndeclareBibliographyExtras{% + \restorecommand\bibdaterangesep + \restorecommand\mkdaterangecomp + \restorecommand\mkdaterangecompextra + \restorecommand\mkdaterangeterse + \restorecommand\mkdaterangeterseextra + \restorecommand\lbx@lfromlang + \restorecommand\lbx@sfromlang + \restorecommand\mknormrange + \restorecommand\blx@mkpageprefix + \restorefieldformat{pages}% + \restorefieldformat{postnote}% + \restorefieldformat{volcitepages}% + \restorefieldformat{multipostnote}% + \restorefieldformat{chapter}% + \restorefieldformat{volume}% + \restorefieldformat{part}% + \restorefieldformat{version}% +} + +\DeclareBibliographyStrings{% + bibliography = {{Irodalomjegyz\'ek}{Irodalom}}, + references = {{Hivatkoz\'asok}{Hivatkoz\'asok}}, + shorthands = {{R\"ovid\'it\'esek jegyz\'eke}{R\"ovid\'it\'esek}}, + editor = {{szerkeszt\H{o}}{szerk\adddot}}, + editors = {{szerkeszt\H{o}k}{szerk\adddot}}, + compiler = {{\"ossze\'all\'it\'o}{\"ossze\'all\adddot}}, + compilers = {{\"ossze\'all\'it\'ok}{\"ossze\'all\adddot}}, + redactor = {{sajt\'o al\'a rendez\H{o}}{kiad\adddot}}, + redactors = {{sajt\'o al\'a rendez\H{o}k}{kiad\adddot}}, + reviser = {{korrektor}{korr\adddot}}, + revisers = {{korrektorok}{korr\adddot}}, + founder = {{alap\'it\'o}{alap\adddot}}, + founders = {{alap\'it\'ok}{alap\adddot}}, + %continuator = {{}{}},% FIXME missing + %continuators = {{}{}},% FIXME missing + collaborator = {{k\"ozrem\H{u}k\"od\H{o}}{km\adddot}}, + collaborators = {{k\"ozrem\H{u}k\"od\H{o}k}{km\adddot}}, + translator = {{ford\'it\'o}{ford\adddot}}, + translators = {{ford\'it\'ok}{ford\adddot}}, + commentator = {{komment\'ator}{komm\adddot}}, + commentators = {{komment\'atorok}{komm\adddot}}, + annotator = {{jegyzetek \'ir\'oja}{jegyz\adddot}}, + annotators = {{jegyzetek \'ir\'oi}{jegyz\adddot}}, + commentary = {{komment\'ar}{komm\adddot}}, + annotations = {{jegyzetek}{jegyz\adddot}}, + introduction = {{bevezet\'es}{bev\adddot}}, + foreword = {{el\H{o}sz\'o}{el\H{o}sz\'o}}, + afterword = {{ut\'osz\'o}{ut\'osz\'o}}, + editortr = {{szerkeszt\H{o} \'es ford\'it\'o}% + {szerk\adddotspace \'es ford\adddot}}, + editorstr = {{szerkeszt\H{o}k \'es ford\'it\'ok}% + {szerk\adddotspace \'es ford\adddot}},, + editorco = {{szerkeszt\H{o} \'es komment\'ar}% + {szerk\adddotspace \'es komm\adddot}}, + editorsco = {{szerkeszt\H{o} \'es komment\'ar}% + {szerk\adddotspace \'es komm\adddot}}, + editoran = {{szerkeszt\H{o} \'es jegyzet}% + {szerk\adddotspace \'es jegyz\adddot}}, + editorsan = {{szerkeszt\H{o} \'es jegyzet}% + {szerk\adddotspace \'es jegyz\adddot}}, + editorin = {{szerkeszt\H{o} \'es bevezet\H{o}}% + {szerk\adddotspace \'es bev\adddot}}, + editorsin = {{szerkeszt\H{o}k \'es bevezet\H{o}}% + {szerk\adddotspace \'es bev\adddot}}, + editorfo = {{szerkeszt\H{o} \'es el\H{o}sz\'o}% + {szerk\adddotspace \'es el\H{o}sz\'o}}, + editorsfo = {{szerkeszt\H{o}k \'es el\H{o}sz\'o}% + {szerk\adddotspace \'es el\H{o}sz\'o}}, + editoraf = {{szerkeszt\H{o} \'es ut\'osz\'o} + {szerk\adddotspace \'es ut\'osz\'o}}, + editorsaf = {{szerkeszt\H{o}k \'es ut\'osz\'o}% + {szerk\adddotspace \'es ut\'osz\'o}}, + editortrco = {{szerkeszt\H{o}, ford\'it\'o \'es komment\'ar}% + {szerk\adddot, ford\adddotspace \'es komm\adddot}}, + editorstrco = {{szerkeszt\H{o}, ford\'it\'o \'es komment\'ar}% + {szerk\adddot, ford\adddotspace \'es komm\adddot}}, + editortran = {{szerkeszt\H{o}, ford\'it\'o \'es jegyzet}% + {szerk\adddot, ford\adddotspace \'es jegyz\adddot}}, + editorstran = {{szerkeszt\H{o}, ford\'it\'o \'es jegyzet}% + {szerk\adddot, ford\adddotspace \'es jegyz\adddot}}, + editortrin = {{szerkeszt\H{o}, ford\'it\'o \'es bevezet\H{o}}% + {szerk\adddot, ford\adddotspace \'es bev\adddot}}, + editorstrin = {{szerkeszt\H{o}, ford\'it\'o \'es bevezet\H{o}}% + {szerk\adddot, ford\adddotspace \'es bev\adddot}}, + editortrfo = {{szerkeszt\H{o}, ford\'it\'o \'es el\H{o}sz\'o}% + {szerk\adddot, ford\adddotspace \'es el\H{o}sz\'o}}, + editorstrfo = {{szerkeszt\H{o}, ford\'it\'o \'es el\H{o}sz\'o}% + {szerk\adddot, ford\adddotspace \'es el\H{o}sz\'o}}, + editortraf = {{szerkeszt\H{o}, ford\'it\'o \'es ut\'osz\'o}% + {szerk\adddot, ford\adddotspace \'es ut\'osz\'o}}, + editorstraf = {{szerkeszt\H{o}, ford\'it\'o \'es ut\'osz\'o}% + {szerk\adddot, ford\adddotspace \'es ut\'osz\'o}}, + editorcoin = {{szerkeszt\H{o}, komment\'ar \'es bevezet\H{o}}% + {szerk\adddot, komm\adddotspace \'es bev\adddot}}, + editorscoin = {{szerkeszt\H{o}, komment\'ar \'es bevezet\H{o}}% + {szerk\adddot, komm\adddotspace \'es bev\adddot}}, + editorcofo = {{szerkeszt\H{o}, komment\'ar \'es el\H{o}sz\'o}% + {szerk\adddot, komm\adddotspace \'es el\H{o}sz\'o}}, + editorscofo = {{szerkeszt\H{o}, komment\'ar \'es el\H{o}sz\'o}% + {szerk\adddot, komm\adddotspace \'es el\H{o}sz\'o}}, + editorcoaf = {{szerkeszt\H{o}, komment\'ar \'es ut\'osz\'o}% + {szerk\adddot, komm\adddotspace \'es ut\'osz\'o}}, + editorscoaf = {{szerkeszt\H{o}, komment\'ar \'es ut\'osz\'o}% + {szerk\adddot, komm\adddotspace \'es ut\'osz\'o}}, + editoranin = {{szerkeszt\H{o}, jegyzetek \'es bevezet\H{o}}% + {szerk\adddot, jegyz\adddotspace \'es bev\adddot}}, + editorsanin = {{szerkeszt\H{o}, jegyzetek \'es bevezet\H{o}}% + {szerk\adddot, jegyz\adddotspace \'es bev\adddot}}, + editoranfo = {{szerkeszt\H{o}, jegyzetek \'es el\H{o}sz\'o}% + {szerk\adddot, jegyz\adddotspace \'es el\H{o}sz\'o}}, + editorsanfo = {{szerkeszt\H{o}, jegyzetek \'es el\H{o}sz\'o}% + {szerk\adddot, jegyz\adddotspace \'es el\H{o}sz\'o}}, + editoranaf = {{szerkeszt\H{o}, jegyzetek \'es ut\'osz\'o}% + {szerk\adddot, jegyz\adddotspace \'es ut\'osz\'o}}, + editorsanaf = {{szerkeszt\H{o}, jegyzetek \'es ut\'osz\'o}% + {szerk\adddot, jegyz\adddotspace \'es ut\'osz\'o}}, + editortrcoin = {{szerkeszt\H{o}, ford\'it\'o, komment\'ar \'es bevezet\H{o}}% + {szerk\adddot, ford\adddot, komm\adddotspace \'es bev\adddot}}, + editorstrcoin = {{szerkeszt\H{o}, ford\'it\'o, komment\'ar \'es bevezet\H{o}}% + {szerk\adddot, ford\adddot, komm\adddotspace \'es bev\adddot}}, + editortrcofo = {{szerkeszt\H{o}, ford\'it\'o, komment\'ar \'es el\H{o}sz\'o}% + {szerk\adddot, ford\adddot, komm\adddotspace \'es el\H{o}sz\'o}}, + editorstrcofo = {{szerkeszt\H{o}, ford\'it\'o, komment\'ar \'es el\H{o}sz\'o}% + {szerk\adddot, ford\adddot, komm\adddotspace \'es el\H{o}sz\'o}}, + editortrcoaf = {{szerkeszt\H{o}, ford\'it\'o, komment\'ar \'es ut\'osz\'o}% + {szerk\adddot, ford\adddot, komm\adddotspace \'es ut\'osz\'o}}, + editorstrcoaf = {{szerkeszt\H{o}, ford\'it\'o, komment\'ar \'es ut\'osz\'o}% + {szerk\adddot, ford\adddot, komm\adddotspace \'es ut\'osz\'o}}, + editortranin = {{szerkeszt\H{o}, ford\'it\'o, jegyzetek \'es bevezet\H{o}}% + {szerk\adddot, ford\adddot, jegyz\adddotspace \'es bev\adddot}}, + editorstranin = {{szerkeszt\H{o}, ford\'it\'o, jegyzetek \'es bevezet\H{o}}% + {szerk\adddot, ford\adddot, jegyz\adddotspace \'es bev\adddot}}, + editortranfo = {{szerkeszt\H{o}, ford\'it\'o, jegyzetek \'es el\H{o}sz\'o}% + {szerk\adddot, ford\adddot, jegyz\adddotspace \'es el\H{o}sz\'o}}, + editorstranfo = {{szerkeszt\H{o}, ford\'it\'o, jegyzetek \'es el\H{o}sz\'o}% + {szerk\adddot, ford\adddot, jegyz\adddotspace \'es el\H{o}sz\'o}}, + editortranaf = {{szerkeszt\H{o}, ford\'it\'o, jegyzetek \'es ut\'osz\'o}% + {szerk\adddot, ford\adddot, jegyz\adddotspace \'es ut\'osz\'o}}, + editorstranaf = {{szerkeszt\H{o}, ford\'it\'o, jegyzetek \'es ut\'osz\'o}% + {szerk\adddot, ford\adddot, jegyz\adddotspace \'es ut\'osz\'o}}, + translatorco = {{ford\'it\'o \'es komment\'ar}% + {ford\adddotspace \'es komm\adddot}}, + translatorsco = {{ford\'it\'o \'es komment\'ar}% + {ford\adddotspace \'es komm\adddot}}, + translatoran = {{ford\'it\'o \'es jegyzetek}% + {ford\adddotspace \'es jegyz\adddot}}, + translatorsan = {{ford\'it\'o \'es jegyzetek}% + {ford\adddotspace \'es jegyz\adddot}}, + translatorin = {{ford\'it\'o \'es bevezet\H{o}}% + {ford\adddotspace \'es bev\adddot}}, + translatorsin = {{ford\'it\'o \'es bevezet\H{o}}% + {ford\adddotspace \'es bev\adddot}}, + translatorfo = {{ford\'it\'o \'es el\H{o}sz\'o}% + {ford\adddotspace \'es el\H{o}sz\'o}}, + translatorsfo = {{ford\'it\'o \'es el\H{o}sz\'o}% + {ford\adddotspace \'es el\H{o}sz\'o}}, + translatoraf = {{ford\'it\'o \'es ut\'osz\'o}% + {ford\adddotspace \'es ut\'osz\'o}}, + translatorsaf = {{ford\'it\'o \'es ut\'osz\'o}% + {ford\adddotspace \'es ut\'osz\'o}}, + translatorcoin = {{ford\'it\'o, komment\'ar \'es bevezet\H{o}}% + {ford\adddot, komm\adddotspace \'es bev\adddot}}, + translatorscoin = {{ford\'it\'o, komment\'ar \'es bevezet\H{o}}% + {ford\adddot, komm\adddotspace \'es bev\adddot}}, + translatorcofo = {{ford\'it\'o, komment\'ar \'es el\H{o}sz\'o}% + {ford\adddot, komm\adddotspace \'es el\H{o}sz\'o}}, + translatorscofo = {{ford\'it\'o, komment\'ar \'es el\H{o}sz\'o}% + {ford\adddot, komm\adddotspace \'es el\H{o}sz\'o}}, + translatorcoaf = {{ford\'it\'o, komment\'ar \'es ut\'osz\'o}% + {ford\adddot, komm\adddotspace \'es ut\'osz\'o}}, + translatorscoaf = {{ford\'it\'o, komment\'ar \'es ut\'osz\'o}% + {ford\adddot, komm\adddotspace \'es ut\'osz\'o}}, + translatoranin = {{ford\'it\'o, jegyzetek \'es bevezet\H{o}}% + {ford\adddot, jegyz\adddotspace \'es bev\adddot}}, + translatorsanin = {{ford\'it\'o, jegyzetek \'es bevezet\H{o}}% + {ford\adddot, jegyz\adddotspace \'es bev\adddot}}, + translatoranfo = {{ford\'it\'o, jegyzetek \'es el\H{o}sz\'o}% + {ford\adddot, jegyz\adddotspace \'es el\H{o}sz\'o}}, + translatorsanfo = {{ford\'it\'o, jegyzetek \'es el\H{o}sz\'o}% + {ford\adddot, jegyz\adddotspace \'es el\H{o}sz\'o}}, + translatoranaf = {{ford\'it\'o, jegyzetek \'es ut\'osz\'o}% + {ford\adddot, jegyz\adddotspace \'es ut\'osz\'o}}, + translatorsanaf = {{ford\'it\'o, jegyzetek \'es ut\'osz\'o}% + {ford\adddot, jegyz\adddotspace \'es ut\'osz\'o}}, + organizer = {{szervez\H{o}}{szerv\adddot}}, + organizers = {{szervez\H{o}k}{szerv\adddot}}, + byorganizer = {{szervezte}{szerv\adddot}}, + byauthor = {{\'irta}{\'irta}}, + byeditor = {{szerkesztette}{szerk\adddot}}, + bycompiler = {{\"ossze\'all\'itotta}{\"ossze\'all\adddot}}, + byredactor = {{sajt\'o al\'a rendezte}{kiad\adddot}}, + byreviser = {{jav\'itotta}{jav\adddot}}, + byreviewer = {{b\'ir\'alta}{b\'ir\adddot}}, + byfounder = {{alap\'itotta}{alap\adddot}}, +% bycontinuator = {{}{}},% FIXME missing + bycollaborator = {{k\"ozrem\H{u}k\"od\"ott}{km\adddot}}, + bytranslator = {{\lbx@lfromlang ford\'itotta}{\lbx@sfromlang ford\adddot}}, + bycommentator = {{komment\'alta}{komm\adddot}}, + byannotator = {{jegyzetekkel ell\'atta}{jegyz\adddot}}, + withcommentator = {{komment\'arral ell\'atta}{komm\adddot}}, + withannotator = {{jegyzetekkel ell\'atta}{jegyz\adddot}}, + withintroduction = {{bevezet\H{o}vel ell\'atta}{bev\adddot}}, + withforeword = {{el\H{o}sz\'oval ell\'atta}{el\H{o}sz\'o:}}, + withafterword = {{ut\'osz\'oval ell\'atta}{ut\'osz\'o:}}, + byeditortr = {{szerkesztette \'es \lbx@lfromlang ford\'itotta}% + {szerk\adddotspace \'es \lbx@sfromlang ford\adddot}}, + byeditorco = {{szerkesztette \'es komment\'alta}% + {szerk\adddotspace \'es komm\adddot}}, + byeditoran = {{szerkesztette \'es jegyzetekkel ell\'atta}% + {szerk\adddotspace \'es jegyz\adddot}}, + byeditorin = {{szerkesztette \'es bevezet\H{o}vel ell\'atta}% + {szerk\adddotspace \'es jegyz\adddot}}, + byeditorfo = {{szerkesztette \'es el\H{o}sz\'oval ell\'atta}% + {szerk\adddotspace \'es el\H{o}sz\'o}}, + byeditoraf = {{szerkesztette \'es ut\'osz\'oval ell\'atta}% + {szerk\adddotspace \'es ut\'osz\'o}}, + byeditortrco = {{szerkesztette, \lbx@lfromlang ford\'itotta \'es komment\'alta}% + {szerk\adddot, \lbx@sfromlang ford\adddotspace \'es komm\adddot}}, + byeditortran = {{szerkesztette, \lbx@lfromlang ford\'itotta \'es jegyzetekkel ell\'atta}% + {szerk\adddot, \lbx@sfromlang ford\adddotspace \'es jegyz\adddot}}, + byeditortrin = {{szerkesztette, \lbx@lfromlang ford\'itotta \'es bevezet\H{o}vel ell\'atta}% + {szerk\adddot, \lbx@sfromlang ford\adddotspace \'es bev\adddot}}, + byeditortrfo = {{szerkesztette, \lbx@lfromlang ford\'itotta \'es el\H{o}sz\'oval ell\'atta}% + {szerk\adddot, \lbx@sfromlang ford\adddotspace \'es el\H{o}sz\'o}}, + byeditortraf = {{szerkesztette, \lbx@lfromlang ford\'itotta \'es ut\'osz\'oval ell\'atta}% + {szerk\adddot, \lbx@sfromlang ford\adddotspace \'es ut\'osz\'o}}, + byeditorcoin = {{szerkesztette, komment\'alta \'es bevezet\H{o}vel ell\'atta}% + {szerk\adddot, komm\adddotspace \'es bev\adddot}}, + byeditorcofo = {{szerkesztette, komment\'alta \'es el\H{o}sz\'oval ell\'atta}% + {szerk\adddot, komm\adddotspace \'es el\H{o}sz\'o}}, + byeditorcoaf = {{szerkesztette, komment\'alta \'es ut\'osz\'oval ell\'atta}% + {szerk\adddot, komm\adddotspace \'es ut\'osz\'o}}, + byeditoranin = {{szerkesztette, jegyzetekkel \'es bevezet\H{o}vel ell\'atta}% + {szerk\adddot, jegyz\adddotspace \'es bev\adddot}}, + byeditoranfo = {{szerkesztette, jegyzetekkel \'es el\H{o}sz\'oval ell\'atta}% + {szerk\adddot, jegyz\adddotspace \'es el\H{o}sz\'o}}, + byeditoranaf = {{szerkesztette, jegyzetekkel \'es ut\'osz\'oval ell\'atta}% + {szerk\adddot, jegyz\adddotspace \'es ut\'osz\'o}}, + byeditortrcoin = {{szerkesztette, \lbx@lfromlang ford\'itotta, komment\'alta \'es bevezet\H{o}vel ell\'atta}% + {szerk\adddot, \lbx@sfromlang ford\adddot, komm\adddotspace \'es bev\adddot}}, + byeditortrcofo = {{szerkesztette, \lbx@lfromlang ford\'itotta, komment\'alta \'es el\H{o}sz\'oval ell\'atta}% + {szerk\adddot, \lbx@sfromlang ford\adddot, komm\adddotspace \'es el\H{o}sz\'o}}, + byeditortrcoaf = {{szerkesztette, \lbx@lfromlang ford\'itotta, komment\'alta \'es ut\'osz\'oval ell\'atta}% + {szerk\adddot, \lbx@sfromlang ford\adddot, komm\adddotspace \'es ut\'osz\'o}}, + byeditortranin = {{szerkesztette, \lbx@lfromlang ford\'itotta, jegyzetekkel \'es bevezet\H{o}vel ell\'atta}% + {szerk\adddot, \lbx@sfromlang ford\adddot, jegyz\adddotspace \'es bev\adddot}}, + byeditortranfo = {{szerkesztette, \lbx@lfromlang ford\'itotta, jegyzetekkel \'es el\H{o}sz\'oval ell\'atta}% + {szerk\adddot, \lbx@sfromlang ford\adddot, jegyz\adddotspace \'es el\H{o}sz\'o}}, + byeditortranaf = {{szerkesztette, \lbx@lfromlang ford\'itotta, jegyzetekkel \'es ut\'osz\'oval ell\'atta}% + {szerk\adddot, \lbx@sfromlang ford\adddot, jegyz\adddotspace \'es ut\'osz\'o}}, + bytranslatorco = {{\lbx@lfromlang ford\'itotta \'es komment\'alta}% + {\lbx@sfromlang ford\adddotspace \'es komm\adddot}}, + bytranslatoran = {{\lbx@lfromlang ford\'itotta \'es jegyzetekkel ell\'atta}% + {\lbx@sfromlang ford\adddotspace \'es jegyz\adddot}}, + bytranslatorin = {{\lbx@lfromlang ford\'itotta \'es bevezet\H{o}vel ell\'atta}% + {\lbx@sfromlang ford\adddotspace \'es bev\adddot}}, + bytranslatorfo = {{\lbx@lfromlang ford\'itotta \'es el\H{o}sz\'oval ell\'atta}% + {\lbx@sfromlang ford\adddotspace \'es el\H{o}sz\'o}}, + bytranslatoraf = {{\lbx@lfromlang ford\'itotta \'es ut\'osz\'oval ell\'atta}% + {\lbx@sfromlang ford\adddotspace \'es ut\'osz\'o}}, + bytranslatorcoin = {{\lbx@lfromlang ford\'itotta, komment\'alta \'es bevezet\H{o}vel ell\'atta}% + {\lbx@sfromlang ford\adddot, komm\adddotspace \'es bev\adddot}}, + bytranslatorcofo = {{\lbx@lfromlang ford\'itotta, komment\'alta \'es el\H{o}sz\'oval ell\'atta}% + {\lbx@sfromlang ford\adddot, komm\adddotspace \'es el\H{o}sz\'o}}, + bytranslatorcoaf = {{\lbx@lfromlang ford\'itotta, komment\'alta \'es ut\'osz\'oval ell\'atta}% + {\lbx@sfromlang ford\adddot, komm\adddotspace \'es ut\'osz\'o}}, + bytranslatoranin = {{\lbx@lfromlang ford\'itotta, jegyzetekkel \'es bevezet\H{o}vel ell\'atta}% + {\lbx@sfromlang ford\adddot, jegyz\adddotspace \'es bev\adddot}}, + bytranslatoranfo = {{\lbx@lfromlang ford\'itotta, jegyzetekkel \'es el\H{o}sz\'oval ell\'atta}% + {\lbx@sfromlang ford\adddot, jegyz\adddotspace \'es el\H{o}sz\'o}}, + bytranslatoranaf = {{\lbx@lfromlang ford\'itotta, jegyzetekkel \'es ut\'osz\'oval ell\'atta}% + {\lbx@sfromlang ford\adddot, jegyz\adddotspace \'es ut\'osz\'o}}, + and = {{\'es}{\'es}}, + andothers = {{\'es m\'asok}{\'es tsai\adddot}}, + andmore = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + volume = {{k\"otet}{k\"ot\adddot}}, + volumes = {{k\"otetek}{k\"ot\adddot}}, + involumes = {{}{}}, + jourvol = {{\'evfolyam}{\'evf\adddot}}, + jourser = {{sorozat}{sor\adddot}}, + book = {{k\"onyv}{k\"onyv}}, + part = {{r\'esz}{r\'esz}}, + issue = {{sz\'am}{sz\adddot}}, + newseries = {{\'uj sorozat}{\'uj sor\adddot}}, + oldseries = {{r\'egi sorozat}{r\'egi sor\adddot}}, + edition = {{kiad\'as}{kiad\adddot}}, + reprint = {{ut\'annyom\'as}{ut\'anny\adddot}}, + reprintof = {{ut\'annyom\'asa}{ut\'anny\adddot}},% FIXME swap word order + reprintas = {{ut\'annyom\'as c\'ime}{ut\'anny\adddotspace c\'ime}}, +% reprintfrom = {{}{}},% FIXME need example + translationof = {{ford\'it\'asa}{ford\adddot}},% FIXME swap word order + translationas = {{ford\'it\'as c\'ime}{ford\adddotspace c\'ime}}, +% translationfrom = {{}{}},% FIXME need example + reviewof = {{recenzi\'oja}{rec\adddot}},% FIXME swap word order + origpubas = {{eredeti c\'ime}{ered\adddotspace c\'im}}, + origpubin = {{eredeti kiad\'as}{ered\adddotspace kiad\adddotspace}}, +% astitle = {{}{}},% FIXME need example +% bypublisher = {{\addcomma}{\addcomma}},% FIXME: this is a cludge that can not be guaranteed to work in most situations, so it stays commented out + nodate = {{\'ev n\'elk\"ul}{\'e\adddotspace n\adddot}}, + page = {{oldal}{old\adddot}}, + pages = {{oldal}{old\adddot}}, + column = {{has\'ab}{has\adddot}}, + columns = {{has\'ab}{has\adddot}}, + line = {{sor}{sor}}, + lines = {{sor}{sor}}, + verse = {{versszak}{vsz\adddot}}, + verses = {{versszak}{vsz\adddot}}, + section = {{paragrafus}{\S}}, + sections = {{paragrafus}{\S\S}}, + paragraph = {{bekezd\'es}{bek\adddot}}, + paragraphs = {{bekezd\'es}{bek\adddot}}, + pagetotal = {{oldal}{old\adddot}}, + pagetotals = {{oldal}{old\adddot}}, + columntotal = {{has\'ab}{has\adddot}}, + columntotals = {{has\'ab}{has\adddot}}, + linetotal = {{sor}{sor}}, + linetotals = {{sor}{sor}}, + versetotal = {{versszak}{vsz\adddot}}, + versetotals = {{versszak}{vsz\adddot}}, + sectiontotal = {{paragrafus}{\S}}, + sectiontotals = {{paragrafus}{\S}}, + paragraphtotal = {{bekezd\'es}{bek\adddot}}, + paragraphtotals = {{bekezd\'es}{bek\adddot}}, + in = {{}{}}, +% inseries = {{}{}},% FIXME need example +% ofseries = {{}{}},% FIXME need example + number = {{sz\'am}{sz\adddot}}, + chapter = {{fejezet}{fej\adddot}}, + bathesis = {{szakdolgozat}{szakd\adddot}}, + mathesis = {{diplomaterv}{dipl\adddot}}, + phdthesis = {{disszert\'aci\'o}{dissz\adddot}}, + candthesis = {{disszert\'aci\'o}{dissz\adddot}}, + resreport = {{kutat\'asi jelent\'es}{kut\adddotspace jel\adddot}}, + techreport = {{technikai jelent\'es}{techn\adddotspace jel\adddot}}, + software = {{szoftver}{szoftver}}, + datacd = {{CD-ROM}{CD-ROM}}, + audiocd = {{audio CD}{CD}}, + version = {{verzi\'o}{verzi\'o}}, + url = {{c\'im}{c\'im}}, + urlfrom = {{el\'erhet\H{o}}{el\'erh\adddot}}, + urlseen = {{el\'er\'es d\'atuma}{el\'er\'es d\'atuma}}, + inpreparation = {{el\H{o}k\'esz\'it\'es alatt}{el\H{o}k\adddotspace alatt}}, + submitted = {{bek\"uld\"ott}{bek\"uld\"ott}}, + forthcoming = {{elfogadott}{elfogadott}}, + inpress = {{nyomd\'aban}{nyomd\adddot}}, + prepublished = {{preprint}{preprint}}, + citedas = {{tov\'abbiakban}{tov\'abbiakban}}, + thiscite = {{itt}{itt}}, + seenote = {{l\'asd}{ld\adddot}}, + quotedin = {{id\'ezte}{id\'ezte}}, + idem = {{ugyan\H{o}}{u\H{o}}}, + idemsf = {{ugyan\H{o}}{u\H{o}}}, + idemsm = {{ugyan\H{o}}{u\H{o}}}, + idemsn = {{ugyan\H{o}}{u\H{o}}}, + idempf = {{ugyan\H{o}k}{u\H{o}k}}, + idempm = {{ugyan\H{o}k}{u\H{o}k}}, + idempn = {{ugyan\H{o}k}{u\H{o}k}}, + idempp = {{ugyan\H{o}k}{u\H{o}k}}, + ibidem = {{ugyanitt}{uitt}}, + opcit = {{id\'ezett m\H{u}}{i\adddotspace m\adddot}}, + loccit = {{id\'ezett hely}{i\adddotspace h\adddot}}, + confer = {{v\"o\adddot}{v\"o\adddot}}, + sequens = {{sk\adddot}{sk\adddot}}, + sequentes = {{skk\adddot}{skk\adddot}}, + passim = {{passim}{pass\adddot}}, + see = {{l\'asd}{ld\adddot}}, + seealso = {{l\'asd m\'eg}{ld\adddotspace m\'eg}}, + backrefpage = {{hivatkoz\'asi oldal}{hiv\adddotspace old\adddot}}, + backrefpages = {{hivatkoz\'asi oldalak}{hiv\adddotspace old\adddot}}, + january = {{janu\'ar}{jan\adddot}}, + february = {{febru\'ar}{febr\adddot}}, + march = {{m\'arcius}{m\'arc\adddot}}, + april = {{\'aprilis}{\'apr\adddot}}, + may = {{m\'ajus}{m\'aj\adddot}}, + june = {{j\'unius}{j\'un\adddot}}, + july = {{j\'ulius}{j\'ul\adddot}}, + august = {{augusztus}{aug\adddot}}, + september = {{szeptember}{szept\adddot}}, + october = {{okt\'ober}{okt\adddot}}, + november = {{november}{nov\adddot}}, + december = {{december}{dec\adddot}}, + langamerican = {{angol}{angol}}, + langbrazilian = {{brazil}{brazil}}, + langbulgarian = {{bolg\'ar}{bolg\'ar}}, + langcatalan = {{katal\'an}{katal\'an}}, + langcroatian = {{horv\'at}{horv\'at}}, + langczech = {{cseh}{cseh}}, + langdanish = {{d\'an}{d\'an}}, + langdutch = {{holland}{holland}}, + langenglish = {{angol}{angol}}, + langestonian = {{\'eszt}{\'eszt}}, + langfinnish = {{finn}{finn}}, + langfrench = {{francia}{francia}}, + langgalician = {{gal\'iciai}{gal\'iciai}}, + langgerman = {{n\'emet}{n\'emet}}, + langgreek = {{g\"or\"og}{g\"or\"og}}, + langhungarian = {{magyar}{magyar}}, + langitalian = {{olasz}{olasz}}, + langjapanese = {{jap\'an}{jap\'an}}, + langlatin = {{latin}{latin}}, + langlatvian = {{lett}{lett}}, + langnorwegian = {{norv\'eg}{norv\'eg}}, + langpolish = {{lengyel}{lengyel}}, + langportuguese = {{portug\'al}{portug\'al}}, + langrussian = {{orosz}{orosz}}, + langslovak = {{szlov\'ak}{szlov\'ak}}, + langslovene = {{szlov\'en}{szlov\'en}}, + langspanish = {{spanyol}{spanyol}}, + langswedish = {{sv\'ed}{sv\'ed}}, + langukrainian = {{ukr\'an}{ukr\'an}}, + fromamerican = {{angolb\'ol}{angolb\'ol}}, + frombrazilian = {{brazilb\'ol}{brazilb\'ol}}, + frombulgarian = {{brazilb\'ol}{brazilb\'ol}}, + fromcatalan = {{katal\'anb\'ol}{katal\'anb\'ol}}, + fromcroatian = {{horv\'atb\'ol}{horv\'atb\'ol}}, + fromczech = {{csehb\H{o}l}{csehb\H{o}l}}, + fromdanish = {{d\'anb\'ol}{d\'anb\'ol}}, + fromdutch = {{hollandb\'ol}{hollandb\'ol}}, + fromenglish = {{angolb\'ol}{angolb\'ol}}, + fromestonian = {{\'esztb\H{o}l}{\'esztb\H{o}l}}, + fromfinnish = {{finnb\H{o}l}{finnb\H{o}l}}, + fromfrench = {{franci\'ab\'ol}{franci\'ab\'ol}}, + fromgalician = {{gal\'iciaib\'ol}{gal\'iciaib\'ol}}, + fromgerman = {{n\'emetb\H{o}l}{n\'emetb\H{o}l}}, + fromgreek = {{g\"or\"ogb\H{o}l}{g\"or\"ogb\H{o}l}}, + fromhungarian = {{magyarb\'ol}{magyarb\'ol}}, + fromitalian = {{olaszb\'ol}{olaszb\'ol}}, + fromjapanese = {{jap\'anb\'ol}{jap\'anb\'ol}}, + fromlatin = {{latinb\'ol}{latinb\'ol}}, + fromlatvian = {{lettb\H{o}l}{lettb\H{o}l}}, + fromnorwegian = {{norv\'egb\'ol}{norv\'egb\'ol}}, + frompolish = {{lengyelb\H{o}l}{lengyelb\H{o}l}}, + fromportuguese = {{portug\'alb\'ol}{portug\'alb\'ol}}, + fromrussian = {{oroszb\'ol}{oroszb\'ol}}, + fromslovak = {{szlov\'akb\'ol}{szlov\'akb\'ol}}, + fromslovene = {{szlov\'enb\'ol}{szlov\'enb\'ol}}, + fromspanish = {{spanyolb\'ol}{spanyolb\'ol}}, + fromswedish = {{sv\'edb\H{o}l}{sv\'edb\H{o}l}}, + fromukrainian = {{ukr\'anb\'ol}{ukr\'anb\'ol}}, + countryde = {{N\'emetorsz\'ag}{DE}}, + countryep = {{Eur\'opai Uni\'o}{EP}}, + countryeu = {{Eur\'opai Uni\'o}{EU}}, + countryfr = {{Franciaorsz\'ag}{FR}}, + countryuk = {{Egyes\"ult Kir\'alys\'ag}{GB}}, + countryus = {{Amerikai Egyes\"ult \'Allamok}{US}}, + patent = {{szabadalom}{szabadalom}}, + patentde = {{n\'emet szabadalom}{n\'em\adddotspace szabadalom}}, + patenteu = {{eur\'opai szabadalom}{eur\adddotspace szabadalom}}, + patentfr = {{francia szabadalom}{fr\adddotspace szabadalom}}, + patentuk = {{brit szabadalom}{brit szabadalom}}, + patentus = {{amerikai szabadalom}{USA szabadalom}}, + patreq = {{szabadalmi k\'erelem}{szabad\adddotspace k\'erelem}}, + patreqde = {{n\'emet szabadalmi k\'erelem}{n\'em\adddotspace szabad\adddotspace k\'erelem}}, + patreqeu = {{eur\'opai szabadalmi k\'erelem}{eur\adddotspace szabad\adddotspace k\'erelem}}, + patreqfr = {{francia szabadalmi k\'erelem}{fr\adddotspace szabad\adddotspace k\'erelem}}, + patrequk = {{brit szabadalmi k\'erelem}{brit szabad\adddotspace k\'erelem}}, + patrequs = {{amerikai szabadalmi k\'erelem}{amerikai szabad\adddotspace k\'erelem}}, + file = {{f\'ajl}{f\'ajl}}, + library = {{k\"onyvt\'ar}{k\"onyvt\'ar}}, + abstract = {{kivonat}{kivonat}}, + annotation = {{jegyzet}{jegyzet}}, + commonera = {{id\H{o}sz\'am\'it\'asunk szerint}{i\adddotspace sz\adddot}}, + beforecommonera = {{id\H{o}sz\'am\'it\'asunk el\H{o}tt}{i\adddotspace e\adddot}}, + annodomini = {{Krisztus ut\'an}{Kr\adddotspace u\adddot}}, + beforechrist = {{Krisztus el\H{o}tt}{Kr\adddotspace e\adddot}}, + circa = {{k\"or\"ulbel\"ul}{kb\adddot}}, + spring = {{tavasz}{tavasz}}, + summer = {{ny\'ar}{ny\'ar}}, + autumn = {{\H{o}sz}{\H{o}sz}}, + winter = {{t\'el}{t\'el}}, + am = {{d\'elel\H{o}tt}{de\adddot}}, + pm = {{d\'elut\'an}{du\adddot}}, +} + +\protected\gdef\lbx@hu@dayrange@i#1{% + \ifboolexpr{not test {\iffieldundef{#1endyear}} + and test {\iffieldsequal{#1year}{#1endyear}} + and test {\iffieldsequal{#1month}{#1endmonth}} + and (test {\iffieldundef{#1hour}} + or not togl {blx@#1dateusetime})}} + +\protected\gdef\lbx@hu@mkdaterangetrunc#1#2{% + \begingroup + \blx@metadateinfo{#2}% + \edef\lbx@hu@dayrange{\lbx@hu@dayrange@i{#2}}% + \iffieldundef{#2year} + {} + {\printtext[#2date]{% + \datecircaprint + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \blx@printtime{#2}{}}% + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateeraprint{#2year}% + \dateuncertainprint + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdaterangesep}} + {\lbx@hu@dayrange{\bibrangedash}{\bibdaterangesep}% + \let\lbx@hu@dayrange\@secondoftwo + \enddatecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{}{}{#2endday}} + {\csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}% + \blx@printtime{#2}{end}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2endseason}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% + \enddateuncertainprint + \dateeraprint{#2endyear}}}}}% + \endgroup} + +\protected\gdef\lbx@hu@mkdaterangetruncextra#1#2{% + \begingroup + \blx@metadateinfo{#2}% + \edef\lbx@hu@dayrange{\lbx@hu@dayrange@i{#2}}% + \iffieldundef{#2year} + {} + {\printtext[#2date]{% + \datecircaprint + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \blx@printtime{#2}{}}% + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateeraprint{#2year}% + \dateuncertainprint + \iffieldundef{#2endyear} + {\printfield{extradate}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extradate}% + \mbox{\bibdaterangesep}} + {\lbx@hu@dayrange{\bibrangedash}{\bibdaterangesep}% + \let\lbx@hu@dayrange\@secondoftwo + \enddatecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{}{}{#2endday}} + {\csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}% + \blx@printtime{#2}{end}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2endseason}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% + \printfield{extradate}% + \enddateuncertainprint + \dateeraprint{#2endyear}}}}}% + \endgroup} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx index da7e0d6fa9f..c03ddca2daf 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx @@ -51,7 +51,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -446,6 +446,7 @@ langgalician = {{galisisk}{galisisk}}, langgerman = {{tysk}{tysk}}, langgreek = {{gresk}{gresk}}, +% langhungarian = {{}{}}, % FIXME: missing langitalian = {{italiensk}{italiensk}}, langjapanese = {{japansk}{japansk}}, langlatin = {{latin}{latin}}, @@ -474,6 +475,7 @@ fromgalician = {{fra galisisk}{fra galisisk}}, fromgerman = {{fra tysk}{fra tysk}}, fromgreek = {{fra gresk}{fra gresk}}, +% fromhungarian = {{}{}}, % FIXME: missing fromitalian = {{fra italiensk}{fra italiensk}}, fromjapanese = {{fra japansk}{fra japansk}}, fromlatin = {{fra latin}{fra latin}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx index a17c60552a7..39ebe59e36a 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx @@ -284,6 +284,7 @@ fromgalician = {{fr{\aa} galisisk}{fr{\aa} galisisk}}, fromgerman = {{fr{\aa} tysk}{fr{\aa} tysk}}, fromgreek = {{fr{\aa} gresk}{fr{\aa} gresk}}, +% fromhungarian = {{}{}}, % FIXME: missing fromitalian = {{fr{\aa} italiensk}{fr{\aa} italiensk}}, fromjapanese = {{fr{\aa} japansk}{fr{\aa} japansk}}, fromlatin = {{fr{\aa} latin}{fr{\aa} latin}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx index 41ec716dca2..7618a69ec5a 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx @@ -59,7 +59,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -473,6 +473,7 @@ langgalician = {{galicyjski}{galicyjski}}, langgerman = {{niemiecki}{niemiecki}}, langgreek = {{grecki}{grecki}}, + langhungarian = {{w\c{e}gierski}{w\c{e}gierski}}, langitalian = {{w\l oski}{w\l oski}}, langlatin = {{\l acina}{\l acina}}, % langlatvian = {{}{}},% FIXME: missing @@ -499,6 +500,7 @@ fromgalician = {{z galicyjzkiego}{z gal\adddot}}, fromgerman = {{z niemieckiego}{z niem\adddot}}, fromgreek = {{z greckiego}{z grec\adddot}}, + fromhungarian = {{z w\c{e}gierskiego}{z w\c{e}gierskiego}}, fromitalian = {{z w\l oskiego}{z w\l os\adddot}}, fromlatin = {{z \l aciny}{z \l at\adddot}}, % fromlatvian = {{}{}},% FIXME: missing diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx index d4f6c2d6fc4..3526b7968fc 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx @@ -58,7 +58,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -458,6 +458,7 @@ langgalician = {{galego}{galego}}, langgerman = {{alem\~ao}{alem\~ao}}, langgreek = {{grego}{grego}}, +% langhungarian = {{}{}}, % FIXME: missing langitalian = {{italiano}{italiano}}, langjapanese = {{japon\^es}{japon\^es}}, langlatin = {{latim}{latim}}, @@ -485,6 +486,7 @@ fromgalician = {{do galego}{do galego}}, fromgerman = {{do alem\~ao}{do alem\~ao}}, fromgreek = {{do grego}{do grego}}, +% fromhungarian = {{}{}}, % FIXME: missing fromitalian = {{do italiano}{do italiano}}, fromjapanese = {{do japon\^es}{do japon\^es}}, fromlatin = {{do latim}{do latim}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx index 66e2a5460db..bc7817c5461 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx @@ -85,7 +85,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -502,6 +502,7 @@ langgalician = {{галисийский}{гал\adddot}}, langgerman = {{немецкий}{нем\adddot}}, langgreek = {{греческий}{греч\adddot}}, + langhungarian = {{венгерский}{венг\adddot}}, langitalian = {{итальянский}{итал\adddot}}, langjapanese = {{японский}{яп\adddot}}, langlatin = {{латинский}{лат\adddot}}, @@ -530,6 +531,7 @@ fromgalician = {{c галисийского}{c\addabbrvspace гал\adddot}}, fromgerman = {{с немецкого}{с\addabbrvspace нем\adddot}}, fromgreek = {{с греческого}{с\addabbrvspace греч\adddot}}, + fromhungarian = {{с венгерского}{с\addabbrvspace венг\adddot}}, fromitalian = {{с итальянского}{с\addabbrvspace итал\adddot}}, fromjapanese = {{с японского}{с\addabbrvspace яп\adddot}}, fromlatin = {{с латинского}{с\addabbrvspace лат\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/slovak.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/slovak.lbx index 817716ac143..4548ff67df7 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/slovak.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/slovak.lbx @@ -55,7 +55,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -588,6 +588,7 @@ {nem\adddot}}, langgreek = {{gr\'{e}\v{c}tina}% {gr\'{e}\v{c}tina}}, +% langhungarian = {{}{}}, % FIXME: missing langitalian = {{talian\v{c}ina}% {tal\adddot}}, langjapanese = {{japon\v{c}ina}% @@ -639,6 +640,7 @@ {z\addnbspace nem\adddot}}, fromgreek = {{z\addnbspace gr\'{e}\v{c}tiny}% {z\addnbspace gr\'{e}\v{c}tiny}}, +% fromhungarian = {{}{}}, % FIXME: missing fromitalian = {{z\addnbspace talian\v{c}iny}% {z\addnbspace tal\adddot}}, fromjapanese = {{z\addnbspace japon\v{c}iny}% diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/slovene.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/slovene.lbx index 1a78591820f..225361ed45e 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/slovene.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/slovene.lbx @@ -55,7 +55,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -455,6 +455,7 @@ 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}}, +% langhungarian = {{}{}}, % FIXME: missing langitalian = {{italijan\v{s}\v{c}ina}{it\adddot}}, langlatin = {{latin\v{s}\v{c}ina}{lat\adddot}}, % langlatvian = {{}{}},% FIXME: missing @@ -478,9 +479,10 @@ % 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}} + 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}}, +% fromhungarian = {{}{}}, % FIXME: missing fromitalian = {{iz italijan\v{s}\v{c}ine}{iz it\adddot}}, fromlatin = {{iz latin\v{s}\v{c}ine}{iz lat\adddot}}, % fromlatvian = {{}{}},% FIXME: missing diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx index a01029ffc9e..3326fe55d20 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx @@ -68,7 +68,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -98,8 +98,8 @@ bibliography = {{Bibliograf\'{\i}a}{Bibliograf\'{\i}a}}, references = {{Referencias}{Referencias}}, shorthands = {{Lista de abreviaturas}{Abreviaturas}}, - editor = {{edic\'{\i}on}{ed\adddot}}, %% {edic'{\i}on} instead of {editor} or {editora} - editors = {{edic\'{\i}on}{eds\adddot}}, %% {edic'{\i}on} instead of {editores} or {editoras} + editor = {{edici\'on}{ed\adddot}}, %% {edic'{\i}on} instead of {editor} or {editora} + editors = {{edici\'on}{eds\adddot}}, %% {edic'{\i}on} instead of {editores} or {editoras} compiler = {{compilaci\'{o}n}{comp\adddot}}, %% {compilac\'{\i}on} instead of {compilador} or {compiladora} compilers = {{compilaci\'{o}n}{comps\adddot}}, %% {compilac\'{\i}on} instead of {compiladores} or {compiladoras} redactor = {{redacci\'{o}n}{red\adddot}}, %% {redacc\'{\i}on} instead of {redactor} or {redactora} @@ -120,11 +120,11 @@ annotators = {{anotaciones}{anots\adddot}}, %% {anotaciones} instead of {anotadores} or {anotadoras} commentary = {{comentario}{com\adddot}}, annotations = {{notas}{notas}}, - introduction = {{introduci\'on}{intr\adddot}}, + introduction = {{introducci\'on}{intr\adddot}}, foreword = {{pr\'ologo}{pr\'ol\adddot}}, - afterword = {{ep\'{\i}logo}{ep\'{\i}l\adddot}}, - editortr = {{edici\'{o}n y traducc'{\i}on \lbx@sfromlang}{ed\adddotspace y trad\adddotspace \lbx@sfromlang}}, %% {{edici\'{o}n y traducc'{\i}on} instead of {editor y traductor} or {editora y traductora} - editorstr = {{edici\'{o}n y traducc'{\i}on \lbx@sfromlang}{eds\adddotspace y trads\adddotspace \lbx@sfromlang}}, %% {{edici\'{o}n y traducc'{\i}on} instead of {editores y traductores} or {editoras y traductoras} + afterword = {{ep\'{i}logo}{ep\'{\i}l\adddot}}, + editortr = {{edici\'{o}n y traducci\'{o}n \lbx@sfromlang}{ed\adddotspace y trad\adddotspace \lbx@sfromlang}}, %% {{edici\'{o}n y traducci\'{o}n} instead of {editor y traductor} or {editora y traductora} + editorstr = {{edici\'{o}n y traducci\'{o}n \lbx@sfromlang}{eds\adddotspace y trads\adddotspace \lbx@sfromlang}}, %% {{edici\'{o}n y traducci\'{o}n} instead of {editores y traductores} or {editoras y traductoras} editorco = {{edici\'{o}n y comentario}{ed\adddotspace y com\adddot}}, %% {edici\'{o}n y comentario} instead of {editor y comentador} or {editora y comentadora} editorsco = {{edici\'{o}n y comentarios}{eds\adddotspace y coms\adddot}}, %% {edici\'{o}n y comentarios} instead of {editores y comentadores} or {editoras y comentadoras} editoran = {{edici\'{o}n y notas}{ed\adddotspace y anot\adddot}}, %% {edici\'{o}n y notas} instead of {editor y notas} or {editora y notas} @@ -133,152 +133,152 @@ editorsin = {{edici\'{o}n e introducci\'{o}n}{eds\adddotspace e intr\adddot}}, %% {edici\'{o}n e introducci\'{o}n} instead of {editores e introducci\'{o}n} or {editoras e introducci\'{o}n} editorfo = {{edici\'{o}n y pr\'{o}logo}{ed\adddotspace y pr\'{o}l\adddot}}, %% {edici\'{o}n y pr\'{o}logo} instead of {editor y pr\'{o}logo} or {editora y pr\'{o}logo} editorsfo = {{edici\'{o}n y pr\'{o}logo}{eds\adddotspace y pr\'{o}l\adddot}}, %% {edici\'{o}n y pr\'{o}logo} instead of {editores y pr\'{o}logo} or {editoras y pr\'{o}logo} - editoraf = {{edici\'{o}n y ep\'{\i}logo}{ed\adddotspace y ep\'{\i}l\adddot}}, %% {edici\'{o}n y ep\'{\i}l\ogo} instead of {editor y ep\'{\i}l\ogo} or {editora y ep\'{\i}l\ogo} - editorsaf = {{edici\'{o}n y ep\'{\i}logo}{eds\adddotspace y ep\'{\i}l\adddot}}, %% {edici\'{o}n y ep\'{\i}l\ogo} instead of {editores y ep\'{\i}l\ogo} or {editoras y ep\'{\i}l\ogo} - editortrco = {{edici\'{o}n, traducc\'{\i}on \lbx@sfromlang y comentario}{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang y com\adddot}}, %% {edici\'{o}n, traducc'{\i}on \lbx@sfromlang y comentarios} instead of {editor, traductor y comentarios} or {editora, traductora y comentarios} - editorstrco = {{edici\'{o}n, traducc\'{\i}on \lbx@sfromlang y comentarios}{eds.,\addabbrvspace trads\adddotspace \lbx@sfromlang y coms\adddot}}, %% {edici\'{o}n, traducc'{\i}on \lbx@sfromlang y comentarios} instead of {editores, traductores y comentarios} or {editoras, traductoras y comentarios} - editortran = {{edici\'{o}n, traducc\'{\i}on \lbx@sfromlang y notas}{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang y anot\adddot}}, %% {edici\'{o}n, traducc'{\i}on \lbx@sfromlang y notas} instead of {editor, traductor y notas} or {editora, traductora y notas} - editorstran = {{edici\'{o}n, traducc\'{\i}on \lbx@sfromlang y notas}{eds.,\addabbrvspace trads\adddotspace \lbx@sfromlang y anot\adddot}}, %% {edici\'{o}n, traducc'{\i}on \lbx@sfromlang y notas} instead of {editores, traductores y notas} or {editoras, traductoras y notas} - editortrin = {{edici\'{o}n, traducc\'{\i}on \lbx@sfromlang e introducci\'{o}n}{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang e intr\adddot}}, %% {edici\'{o}n, traducc'{\i}on \lbx@sfromlang e introducci\'{o}n} instead of {editor, traductor e introducci\'{o}n} or {editora, traductora e introducci\'{o}n} - editorstrin = {{edici\'{o}n, traducc\'{\i}on \lbx@sfromlang e introducci\'{o}n}{eds.,\addabbrvspace trads\adddotspace \lbx@sfromlang e intr\adddot}}, %% {edici\'{o}n, traducc'{\i}on \lbx@sfromlang e introducci\'{o}n} instead of {editores, traductores e introducci\'{o}n} or {editoras, traductoras e introducci\'{o}n} - editortrfo = {{edici\'{o}n, traducc\'{\i}on \lbx@sfromlang y pr\'{o}logo}{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang y pr\'{o}l\adddot}}, %% {edici\'{o}n, traducc'{\i}on \lbx@sfromlang y pr\'{o}logo} instead of {editor, traductor y prologuista} or {editora, traductora y prologuista} - editorstrfo = {{edici\'{o}n, traducc\'{\i}on \lbx@sfromlang y pr\'{o}logo}{eds.,\addabbrvspace trads\adddotspace \lbx@sfromlang y pr\'{o}l\adddot}}, %% {edici\'{o}n, traducc'{\i}on \lbx@sfromlang y pr\'{o}logo} instead of {editores, traductores y prologuista} or {editoras, traductoras y prologuistas} - editortraf = {{edici\'{o}n, traducc\'{\i}on \lbx@sfromlang y ep\'{\i}logo}{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang y ep\'{\i}l\adddot}}, %% {edici\'{o}n, traducc'{\i}on \lbx@sfromlang y ep\'{\i}logo} instead of {editor, traductor y ep\'{\i}logo} or {editora, traductora y ep\'{\i}logo} - editorstraf = {{edici\'{o}n, traducc\'{\i}on \lbx@sfromlang y ep\'{\i}logo}{eds.,\addabbrvspace trads\adddotspace \lbx@sfromlang y ep\'{\i}l\adddot}}, %% {edici\'{o}n, traducc'{\i}on \lbx@sfromlang y ep\'{\i}logo} instead of {editores, traductores y ep\'{\i}logo} or {editoras, traductoras y ep\'{\i}logo} - editorcoin = {{edici\'{o}n, comentarios e introducci\'{o}n}{ed.,\addabbrvspace com\adddot e intr\adddot}}, %% {edici\'{o}n, comentarios e introducci\'{o}n} instead of {editor, comentador e introducci\'{o}n} or {editora, comentadora e introducci\'{o}n} - editorscoin = {{edici\'{o}n, comentarios e introducci\'{o}n}{eds.,\addabbrvspace coms\adddot e intr\adddot}}, %% {edici\'{o}n, comentarios e introducci\'{o}n} instead of {editores, comentadores e introducci\'{o}n} or {editoras, comentadoras e introducci\'{o}n} - editorcofo = {{edici\'{o}n, comentarios y pr\'{o}logo}{ed.,\addabbrvspace com\adddot y pr\'{o}l\adddot}}, %% {edici\'{o}n, comentarios y pr\'{o}logo} instead of {editor, comentador y pr\'{o}logo} or {editora, comentadora y pr\'{o}logo} - editorscofo = {{edici\'{o}n, comentarios y pr\'{o}logo}{eds.,\addabbrvspace coms\adddot y pr\'{o}l\adddot}}, %% {edici\'{o}n, comentarios y pr\'{o}logo} instead of {editores, comentadores y pr\'{o}logo} or {editoras, comentadoras y pr\'{o}logo} - editorcoaf = {{edici\'{o}n, comentarios y ep\'{\i}logo}{eds.,\addabbrvspace com\adddot y ep\'{\i}l\adddot}}, %% {edici\'{o}n, comentarios y ep\'{\i}logo} instead of {editor, comentador y ep\'{\i}logo} or {editora, comentadora y ep\'{\i}logo} - editorscoaf = {{edici\'{o}n, comentarios y ep\'{\i}logo}{eds.,\addabbrvspace coms\adddot y ep\'{\i}l\adddot}}, %% {edici\'{o}n, comentarios y ep\'{\i}logo} instead of {editores, comentadores y ep\'{\i}logo} or {editoras, comentadoras y ep\'{\i}logo} - editoranin = {{edici\'{o}n, notas e introducci\'{o}n}{ed.,\addabbrvspace anot\adddot e intr\adddot}}, %% {{edici\'{o}n, notas e introducci\'{o}n} instead of {editor, notas e introducci\'{o}n} or {editora, notas e introducci\'{o}n} - editorsanin = {{edici\'{o}n, notas e introducci\'{o}n}{eds.,\addabbrvspace anot\adddot e intr\adddot}}, %% {{edici\'{o}n, notas e introducci\'{o}n} instead of {editor, notas e introducci\'{o}n} or {editora, notas e introducci\'{o}n} - editoranfo = {{edici\'{o}n, notas y pr\'{o}logo}{ed.,\addabbrvspace anot\adddot y ep\'{\i}l\adddot}}, %% {{edici\'{o}n, notas y pr\'{o}logo} instead of {editor, notas y pr\'{o}logo} or {editora, notas y pr\'{o}logo} - editorsanfo = {{edici\'{o}n, notas y pr\'{o}logo}{eds.,\addabbrvspace anot\adddot y ep\'{\i}l\adddot}}, %% {{edici\'{o}n, notas y pr\'{o}logo} instead of {editores, notas y pr\'{o}logo} or {editoras, notas y pr\'{o}logo} - editoranaf = {{edici\'{o}n, notas y ep\'{\i}logo}{ed.,\addabbrvspace anot\adddot y ep\'{\i}l\adddot}}, %% {{edici\'{o}n, notas y ep\'{\i}logo} instead of {editor, notas y ep\'{\i}logo} or {editora, notas y ep\'{\i}logo} - editorsanaf = {{edici\'{o}n, notas y ep\'{\i}logo}{eds.,\addabbrvspace anot\adddot y ep\'{\i}l\adddot}}, %% {{edici\'{o}n, notas y ep\'{\i}logo} instead of {editores, notas y ep\'{\i}logo} or {editoras, notas y ep\'{\i}logo} - editortrcoin = {{edici\'{o}n, traducc\'{\i}on \lbx@sfromlang, comentarios e introducci\'{o}n}{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, com\adddot e intr\adddot}}, %% {edici\'{o}n, traducc\'{\i}on \lbx@sfromlang, comentarios e introducci\'{o}n} instead of {editor, traducc\'{\i}on \lbx@sfromlang, comentarios e introducci\'{o}n} or {editora, traducc\'{\i}on \lbx@sfromlang, comentarios e introducci\'{o}n} - editorstrcoin = {{edici\'{o}n, traducc\'{\i}on \lbx@sfromlang, comentarios e introducci\'{o}n}{eds.,\addabbrvspace trads\adddotspace \lbx@sfromlang, coms\adddot e intr\adddot}}, %% {edici\'{o}n, traducc\'{\i}on \lbx@sfromlang, comentarios e introducci\'{o}n} instead of {editores, traducc\'{\i}on \lbx@sfromlang, comentarios e introducci\'{o}n} or {editoras, traducc\'{\i}on \lbx@sfromlang, comentarios e introducci\'{o}n} - editortrcofo = {{edici\'{o}n, traducc\'{\i}on \lbx@sfromlang, comentarios y pr\'{o}logo}{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, com\adddot y pr\'{o}l\adddot}}, %% {edici\'{o}n, traducc\'{\i}on \lbx@sfromlang, comentarios y pr\'{o}logo} instead of {editor, traducc\'{\i}on \lbx@sfromlang, comentarios y pr\'{o}logo} or {editora, traducc\'{\i}on \lbx@sfromlang, comentarios y pr\'{o}logo} - editorstrcofo = {{edici\'{o}n, traducc\'{\i}on \lbx@sfromlang, comentarios y pr\'{o}logo}{eds.,\addabbrvspace trads\adddotspace \lbx@sfromlang, coms\adddot y pr\'{o}l\adddot}}, %% {edici\'{o}n, traducc\'{\i}on \lbx@sfromlang, comentarios y pr\'{o}logo} instead of {editores, traducc\'{\i}on \lbx@sfromlang, comentarios y pr\'{o}logo} or {editoras, traducc\'{\i}on \lbx@sfromlang, comentarios y pr\'{o}logo} - editortrcoaf = {{edici\'{o}n, traducc\'{\i}on \lbx@sfromlang, comentarios y ep\'{\i}logo}{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, com\adddot y ep\'{\i}l\adddot}}, %% {edici\'{o}n, traducc\'{\i}on \lbx@sfromlang, comentarios y ep\'{\i}logo} instead of {editor, traducc\'{\i}on \lbx@sfromlang, comentarios y ep\'{\i}logo} or {editora, traducc\'{\i}on \lbx@sfromlang, comentarios y ep\'{\i}logo} - editorstrcoaf = {{edici\'{o}n, traducc\'{\i}on \lbx@sfromlang, comentarios y ep\'{\i}logo}{eds.,\addabbrvspace trads\adddotspace \lbx@sfromlang, coms\adddot y ep\'{\i}l\adddot}}, %% {edici\'{o}n, traducc\'{\i}on \lbx@sfromlang, comentarios y ep\'{\i}logo} instead of {editor, traducc\'{\i}on \lbx@sfromlang, comentarios y ep\'{\i}logo} or {editora, traducc\'{\i}on \lbx@sfromlang, comentarios y ep\'{\i}logo} - editortranin = {{edici\'{o}n, traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y notas}{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, intr\adddot y anot\adddot}}, %% {edici\'{o}n, traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y notas} instead of {{editor, traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y notas} or {{editora, traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y notas} - editorstranin = {{edici\'{o}n, traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y notas}{eds.,\addabbrvspace trads\adddotspace \lbx@sfromlang, intr\adddot y anot\adddot}}, %% {edici\'{o}n, traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y notas} instead of {{editores, traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y notas} or {{editoras, traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y notas} - editortranfo = {{edici\'{o}n, traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y notas}{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, pr\'{o}l\adddot y anot\adddot}}, %% {edici\'{o}n, traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y notas} instead of {editor, traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y notas} or {editora, traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y notas} - editorstranfo = {{edici\'{o}n, traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y notas}{eds.,\addabbrvspace trads\adddotspace \lbx@sfromlang, pr\'{o}l\adddot y anot\adddot}}, %% {edici\'{o}n, traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y notas} instead of {editores, traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y notas} or {editoras, traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y notas} - editortranaf = {{edici\'{o}n, traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y notas}{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, ep\'{\i}l\adddot y anot\adddot}}, %% {edici\'{o}n, traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y notas} instead of {editor, traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y notas} or {editora, traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y notas} - editorstranaf = {{edici\'{o}n, traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y notas}{eds.,\addabbrvspace trads\adddotspace \lbx@sfromlang, ep\'{\i}l\adddot y anot\adddot}}, %% {edici\'{o}n, traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y notas} instead of {editores, traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y notas} or {editoras, traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y notas} - translatorco = {{traducc\'{\i}on \lbx@sfromlang y comentario}{trad\adddotspace \lbx@sfromlang\ y com\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang y comentario} instead of {traductor y comentador} or {traductora y comentadora} - translatorsco = {{traducc\'{\i}on \lbx@sfromlang y comentario}{trads\adddotspace \lbx@sfromlang\ y coms\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang y comentario} instead of {traductores y comentadores} or {traductoras y comentadoras} - translatoran = {{traducc\'{\i}on \lbx@sfromlang y notas}{trad\adddotspace \lbx@sfromlang\ y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang y notas} instead of {traductor y anotador} or {traductora y anotadora} - translatorsan = {{traducc\'{\i}on \lbx@sfromlang y notas}{trads\adddotspace \lbx@sfromlang\ y anots\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang y notas} instead of {traductores y anotadores} or {traductoras y anotadoras} - translatorin = {{traducc\'{\i}on \lbx@sfromlang e introducci\'{o}n}{trad\adddotspace \lbx@sfromlang\ e intr\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang e introducci\'{o}n} instead of {traductor \lbx@sfromlang e introducci\'{o}n} {traductora \lbx@sfromlang e introducci\'{o}n} - translatorsin = {{traducc\'{\i}on \lbx@sfromlang e introducci\'{o}n}{trads\adddotspace \lbx@sfromlang\ e intr\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang e introducci\'{o}n} instead of {traductores \lbx@sfromlang e introducci\'{o}n} {traductoras \lbx@sfromlang e introducci\'{o}n} - translatorfo = {{traducc\'{\i}on \lbx@sfromlang y pr\'{o}logo}{trad\adddotspace \lbx@sfromlang\ y pr\'{o}l\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang y pr\'{o}logo} instead of {traductor \lbx@sfromlang y prologuista} or {traductora \lbx@sfromlang y prologuista} - 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 + editoraf = {{edici\'{o}n y ep\'{i}logo}{ed\adddotspace y ep\'{\i}l\adddot}}, %% {edici\'{o}n y ep\'{\i}l\ogo} instead of {editor y ep\'{\i}l\ogo} or {editora y ep\'{\i}l\ogo} + editorsaf = {{edici\'{o}n y ep\'{i}logo}{eds\adddotspace y ep\'{\i}l\adddot}}, %% {edici\'{o}n y ep\'{\i}l\ogo} instead of {editores y ep\'{\i}l\ogo} or {editoras y ep\'{\i}l\ogo} + editortrco = {{edici\'{o}n, traducci\'{o}n \lbx@sfromlang\ y comentario}{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y com\adddot}}, %% {edici\'{o}n, traducci\'{o}n \lbx@sfromlang y comentarios} instead of {editor, traductor y comentarios} or {editora, traductora y comentarios} + editorstrco = {{edici\'{o}n, traducci\'{o}n \lbx@sfromlang\ y comentarios}{eds.,\addabbrvspace trads\adddotspace \lbx@sfromlang\ y coms\adddot}}, %% {edici\'{o}n, traducci\'{o}n \lbx@sfromlang y comentarios} instead of {editores, traductores y comentarios} or {editoras, traductoras y comentarios} + editortran = {{edici\'{o}n, traducci\'{o}n \lbx@sfromlang\ y notas}{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y anot\adddot}}, %% {edici\'{o}n, traducci\'{o}n \lbx@sfromlang y notas} instead of {editor, traductor y notas} or {editora, traductora y notas} + editorstran = {{edici\'{o}n, traducci\'{o}n \lbx@sfromlang\ y notas}{eds.,\addabbrvspace trads\adddotspace \lbx@sfromlang\ y anot\adddot}}, %% {edici\'{o}n, traducci\'{o}n \lbx@sfromlang y notas} instead of {editores, traductores y notas} or {editoras, traductoras y notas} + editortrin = {{edici\'{o}n, traducci\'{o}n \lbx@sfromlang\ e introducci\'{o}n}{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ e intr\adddot}}, %% {edici\'{o}n, traducci\'{o}n \lbx@sfromlang e introducci\'{o}n} instead of {editor, traductor e introducci\'{o}n} or {editora, traductora e introducci\'{o}n} + editorstrin = {{edici\'{o}n, traducci\'{o}n \lbx@sfromlang\ e introducci\'{o}n}{eds.,\addabbrvspace trads\adddotspace \lbx@sfromlang\ e intr\adddot}}, %% {edici\'{o}n, traducci\'{o}n \lbx@sfromlang e introducci\'{o}n} instead of {editores, traductores e introducci\'{o}n} or {editoras, traductoras e introducci\'{o}n} + editortrfo = {{edici\'{o}n, traducci\'{o}n \lbx@sfromlang\ y pr\'{o}logo}{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y pr\'{o}l\adddot}}, %% {edici\'{o}n, traducci\'{o}n \lbx@sfromlang y pr\'{o}logo} instead of {editor, traductor y prologuista} or {editora, traductora y prologuista} + editorstrfo = {{edici\'{o}n, traducci\'{o}n \lbx@sfromlang\ y pr\'{o}logo}{eds.,\addabbrvspace trads\adddotspace \lbx@sfromlang\ y pr\'{o}l\adddot}}, %% {edici\'{o}n, traducci\'{o}n \lbx@sfromlang y pr\'{o}logo} instead of {editores, traductores y prologuista} or {editoras, traductoras y prologuistas} + editortraf = {{edici\'{o}n, traducci\'{o}n \lbx@sfromlang\ y ep\'{i}logo}{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y ep\'{\i}l\adddot}}, %% {edici\'{o}n, traducci\'{o}n \lbx@sfromlang y ep\'{i}logo} instead of {editor, traductor y ep\'{i}logo} or {editora, traductora y ep\'{i}logo} + editorstraf = {{edici\'{o}n, traducci\'{o}n \lbx@sfromlang\ y ep\'{i}logo}{eds.,\addabbrvspace trads\adddotspace \lbx@sfromlang\ y ep\'{\i}l\adddot}}, %% {edici\'{o}n, traducci\'{o}n \lbx@sfromlang y ep\'{i}logo} instead of {editores, traductores y ep\'{i}logo} or {editoras, traductoras y ep\'{i}logo} + editorcoin = {{edici\'{o}n, comentarios e introducci\'{o}n}{ed.,\addabbrvspace com\adddotspace e intr\adddot}}, %% {edici\'{o}n, comentarios e introducci\'{o}n} instead of {editor, comentador e introducci\'{o}n} or {editora, comentadora e introducci\'{o}n} + editorscoin = {{edici\'{o}n, comentarios e introducci\'{o}n}{eds.,\addabbrvspace coms\adddotspace e intr\adddot}}, %% {edici\'{o}n, comentarios e introducci\'{o}n} instead of {editores, comentadores e introducci\'{o}n} or {editoras, comentadoras e introducci\'{o}n} + editorcofo = {{edici\'{o}n, comentarios y pr\'{o}logo}{ed.,\addabbrvspace com\adddotspace y pr\'{o}l\adddot}}, %% {edici\'{o}n, comentarios y pr\'{o}logo} instead of {editor, comentador y pr\'{o}logo} or {editora, comentadora y pr\'{o}logo} + editorscofo = {{edici\'{o}n, comentarios y pr\'{o}logo}{eds.,\addabbrvspace coms\adddotspace y pr\'{o}l\adddot}}, %% {edici\'{o}n, comentarios y pr\'{o}logo} instead of {editores, comentadores y pr\'{o}logo} or {editoras, comentadoras y pr\'{o}logo} + editorcoaf = {{edici\'{o}n, comentarios y ep\'{i}logo}{eds.,\addabbrvspace com\adddotspace y ep\'{\i}l\adddot}}, %% {edici\'{o}n, comentarios y ep\'{i}logo} instead of {editor, comentador y ep\'{i}logo} or {editora, comentadora y ep\'{i}logo} + editorscoaf = {{edici\'{o}n, comentarios y ep\'{i}logo}{eds.,\addabbrvspace coms\adddotspace y ep\'{\i}l\adddot}}, %% {edici\'{o}n, comentarios y ep\'{i}logo} instead of {editores, comentadores y ep\'{i}logo} or {editoras, comentadoras y ep\'{i}logo} + editoranin = {{edici\'{o}n, notas e introducci\'{o}n}{ed.,\addabbrvspace anot\adddotspace e intr\adddot}}, %% {{edici\'{o}n, notas e introducci\'{o}n} instead of {editor, notas e introducci\'{o}n} or {editora, notas e introducci\'{o}n} + editorsanin = {{edici\'{o}n, notas e introducci\'{o}n}{eds.,\addabbrvspace anot\adddotspace e intr\adddot}}, %% {{edici\'{o}n, notas e introducci\'{o}n} instead of {editor, notas e introducci\'{o}n} or {editora, notas e introducci\'{o}n} + editoranfo = {{edici\'{o}n, notas y pr\'{o}logo}{ed.,\addabbrvspace anot\adddotspace y ep\'{\i}l\adddot}}, %% {{edici\'{o}n, notas y pr\'{o}logo} instead of {editor, notas y pr\'{o}logo} or {editora, notas y pr\'{o}logo} + editorsanfo = {{edici\'{o}n, notas y pr\'{o}logo}{eds.,\addabbrvspace anot\adddotspace y ep\'{\i}l\adddot}}, %% {{edici\'{o}n, notas y pr\'{o}logo} instead of {editores, notas y pr\'{o}logo} or {editoras, notas y pr\'{o}logo} + editoranaf = {{edici\'{o}n, notas y ep\'{i}logo}{ed.,\addabbrvspace anot\adddotspace y ep\'{\i}l\adddot}}, %% {{edici\'{o}n, notas y ep\'{i}logo} instead of {editor, notas y ep\'{i}logo} or {editora, notas y ep\'{i}logo} + editorsanaf = {{edici\'{o}n, notas y ep\'{i}logo}{eds.,\addabbrvspace anot\adddotspace y ep\'{\i}l\adddot}}, %% {{edici\'{o}n, notas y ep\'{i}logo} instead of {editores, notas y ep\'{i}logo} or {editoras, notas y ep\'{i}logo} + editortrcoin = {{edici\'{o}n, traducci\'{o}n \lbx@sfromlang, comentarios e introducci\'{o}n}{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang,\addabbrvspace com\adddotspace e intr\adddot}}, %% {edici\'{o}n, traducci\'{o}n \lbx@sfromlang, comentarios e introducci\'{o}n} instead of {editor, traducci\'{o}n \lbx@sfromlang, comentarios e introducci\'{o}n} or {editora, traducci\'{o}n \lbx@sfromlang, comentarios e introducci\'{o}n} + editorstrcoin = {{edici\'{o}n, traducci\'{o}n \lbx@sfromlang, comentarios e introducci\'{o}n}{eds.,\addabbrvspace trads\adddotspace \lbx@sfromlang,\addabbrvspace coms\adddotspace e intr\adddot}}, %% {edici\'{o}n, traducci\'{o}n \lbx@sfromlang, comentarios e introducci\'{o}n} instead of {editores, traducci\'{o}n \lbx@sfromlang, comentarios e introducci\'{o}n} or {editoras, traducci\'{o}n \lbx@sfromlang, comentarios e introducci\'{o}n} + editortrcofo = {{edici\'{o}n, traducci\'{o}n \lbx@sfromlang, comentarios y pr\'{o}logo}{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang,\addabbrvspace com\adddotspace y pr\'{o}l\adddot}}, %% {edici\'{o}n, traducci\'{o}n \lbx@sfromlang, comentarios y pr\'{o}logo} instead of {editor, traducci\'{o}n \lbx@sfromlang, comentarios y pr\'{o}logo} or {editora, traducci\'{o}n \lbx@sfromlang, comentarios y pr\'{o}logo} + editorstrcofo = {{edici\'{o}n, traducci\'{o}n \lbx@sfromlang, comentarios y pr\'{o}logo}{eds.,\addabbrvspace trads\adddotspace \lbx@sfromlang,\addabbrvspace coms\adddotspace y pr\'{o}l\adddot}}, %% {edici\'{o}n, traducci\'{o}n \lbx@sfromlang, comentarios y pr\'{o}logo} instead of {editores, traducci\'{o}n \lbx@sfromlang, comentarios y pr\'{o}logo} or {editoras, traducci\'{o}n \lbx@sfromlang, comentarios y pr\'{o}logo} + editortrcoaf = {{edici\'{o}n, traducci\'{o}n \lbx@sfromlang, comentarios y ep\'{i}logo}{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang,\addabbrvspace com\adddotspace y ep\'{\i}l\adddot}}, %% {edici\'{o}n, traducci\'{o}n \lbx@sfromlang, comentarios y ep\'{i}logo} instead of {editor, traducci\'{o}n \lbx@sfromlang, comentarios y ep\'{i}logo} or {editora, traducci\'{o}n \lbx@sfromlang, comentarios y ep\'{i}logo} + editorstrcoaf = {{edici\'{o}n, traducci\'{o}n \lbx@sfromlang, comentarios y ep\'{i}logo}{eds.,\addabbrvspace trads\adddotspace \lbx@sfromlang,\addabbrvspace coms\adddotspace y ep\'{\i}l\adddot}}, %% {edici\'{o}n, traducci\'{o}n \lbx@sfromlang, comentarios y ep\'{i}logo} instead of {editor, traducci\'{o}n \lbx@sfromlang, comentarios y ep\'{i}logo} or {editora, traducci\'{o}n \lbx@sfromlang, comentarios y ep\'{i}logo} + editortranin = {{edici\'{o}n, traducci\'{o}n \lbx@sfromlang, introducci\'{o}n y notas}{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang,\addabbrvspace intr\adddotspace y anot\adddot}}, %% {edici\'{o}n, traducci\'{o}n \lbx@sfromlang, introducci\'{o}n y notas} instead of {{editor, traducci\'{o}n \lbx@sfromlang, introducci\'{o}n y notas} or {{editora, traducci\'{o}n \lbx@sfromlang, introducci\'{o}n y notas} + editorstranin = {{edici\'{o}n, traducci\'{o}n \lbx@sfromlang, introducci\'{o}n y notas}{eds.,\addabbrvspace trads\adddotspace \lbx@sfromlang,\addabbrvspace intr\adddotspace y anot\adddot}}, %% {edici\'{o}n, traducci\'{o}n \lbx@sfromlang, introducci\'{o}n y notas} instead of {{editores, traducci\'{o}n \lbx@sfromlang, introducci\'{o}n y notas} or {{editoras, traducci\'{o}n \lbx@sfromlang, introducci\'{o}n y notas} + editortranfo = {{edici\'{o}n, traducci\'{o}n \lbx@sfromlang, pr\'{o}logo y notas}{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang,\addabbrvspace pr\'{o}l\adddotspace y anot\adddot}}, %% {edici\'{o}n, traducci\'{o}n \lbx@sfromlang, pr\'{o}logo y notas} instead of {editor, traducci\'{o}n \lbx@sfromlang, pr\'{o}logo y notas} or {editora, traducci\'{o}n \lbx@sfromlang, pr\'{o}logo y notas} + editorstranfo = {{edici\'{o}n, traducci\'{o}n \lbx@sfromlang, pr\'{o}logo y notas}{eds.,\addabbrvspace trads\adddotspace \lbx@sfromlang,\addabbrvspace pr\'{o}l\adddotspace y anot\adddot}}, %% {edici\'{o}n, traducci\'{o}n \lbx@sfromlang, pr\'{o}logo y notas} instead of {editores, traducci\'{o}n \lbx@sfromlang, pr\'{o}logo y notas} or {editoras, traducci\'{o}n \lbx@sfromlang, pr\'{o}logo y notas} + editortranaf = {{edici\'{o}n, traducci\'{o}n \lbx@sfromlang, ep\'{i}logo y notas}{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang,\addabbrvspace ep\'{\i}l\adddotspace y anot\adddot}}, %% {edici\'{o}n, traducci\'{o}n \lbx@sfromlang, ep\'{i}logo y notas} instead of {editor, traducci\'{o}n \lbx@sfromlang, ep\'{i}logo y notas} or {editora, traducci\'{o}n \lbx@sfromlang, ep\'{i}logo y notas} + editorstranaf = {{edici\'{o}n, traducci\'{o}n \lbx@sfromlang, ep\'{i}logo y notas}{eds.,\addabbrvspace trads\adddotspace \lbx@sfromlang,\addabbrvspace ep\'{\i}l\adddotspace y anot\adddot}}, %% {edici\'{o}n, traducci\'{o}n \lbx@sfromlang, ep\'{i}logo y notas} instead of {editores, traducci\'{o}n \lbx@sfromlang, ep\'{i}logo y notas} or {editoras, traducci\'{o}n \lbx@sfromlang, ep\'{i}logo y notas} + translatorco = {{traducci\'{o}n \lbx@sfromlang\ y comentario}{trad\adddotspace \lbx@sfromlang\ y com\adddot}}, %% {traducci\'{o}n \lbx@sfromlang y comentario} instead of {traductor y comentador} or {traductora y comentadora} + translatorsco = {{traducci\'{o}n \lbx@sfromlang\ y comentario}{trads\adddotspace \lbx@sfromlang\ y coms\adddot}}, %% {traducci\'{o}n \lbx@sfromlang y comentario} instead of {traductores y comentadores} or {traductoras y comentadoras} + translatoran = {{traducci\'{o}n \lbx@sfromlang\ y notas}{trad\adddotspace \lbx@sfromlang\ y anot\adddot}}, %% {traducci\'{o}n \lbx@sfromlang y notas} instead of {traductor y anotador} or {traductora y anotadora} + translatorsan = {{traducci\'{o}n \lbx@sfromlang\ y notas}{trads\adddotspace \lbx@sfromlang\ y anots\adddot}}, %% {traducci\'{o}n \lbx@sfromlang y notas} instead of {traductores y anotadores} or {traductoras y anotadoras} + translatorin = {{traducci\'{o}n \lbx@sfromlang\ e introducci\'{o}n}{trad\adddotspace \lbx@sfromlang\ e intr\adddot}}, %% {traducci\'{o}n \lbx@sfromlang e introducci\'{o}n} instead of {traductor \lbx@sfromlang e introducci\'{o}n} {traductora \lbx@sfromlang e introducci\'{o}n} + translatorsin = {{traducci\'{o}n \lbx@sfromlang\ e introducci\'{o}n}{trads\adddotspace \lbx@sfromlang\ e intr\adddot}}, %% {traducci\'{o}n \lbx@sfromlang e introducci\'{o}n} instead of {traductores \lbx@sfromlang e introducci\'{o}n} {traductoras \lbx@sfromlang e introducci\'{o}n} + translatorfo = {{traducci\'{o}n \lbx@sfromlang\ y pr\'{o}logo}{trad\adddotspace \lbx@sfromlang\ y pr\'{o}l\adddot}}, %% {traducci\'{o}n \lbx@sfromlang y pr\'{o}logo} instead of {traductor \lbx@sfromlang y prologuista} or {traductora \lbx@sfromlang y prologuista} + translatorsfo = {{traducci\'{o}n \lbx@sfromlang\ y pr\'{o}logo}{trads\adddotspace \lbx@sfromlang\ y pr\'{o}l\adddot}}, %% {traducci\'{o}n \lbx@sfromlang y pr\'{o}logo} instead of {traductores \lbx@sfromlang y prologuistas} or {traductoras \lbx@sfromlang y prologuistas} + translatoraf = {{traducci\'{o}n \lbx@sfromlang\ y ep\'{i}logo}{trad\adddotspace \lbx@sfromlang\ y ep\'{\i}l\adddot}}, %% {traducci\'{o}n \lbx@sfromlang y ep\'{i}logo} instead of {traductor \lbx@sfromlang y epiloguista} or {traductora \lbx@sfromlang y epiloguista} + translatorsaf = {{traducci\'{o}n \lbx@sfromlang\ y ep\'{i}logo}{trads\adddotspace \lbx@sfromlang\ y ep\'{\i}l\adddot}}, %% {traducci\'{o}n \lbx@sfromlang y ep\'{i}logo} instead of {traductores \lbx@sfromlang y epiloguistas} or {traductoras \lbx@sfromlang y epiloguistas} + translatorcoin = {{traducci\'{o}n \lbx@sfromlang, introducci\'{o}n y comentario}{trad\adddotspace \lbx@sfromlang, intr\adddotspace y com\adddot}}, %% {traducci\'{o}n \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 = {{traducci\'{o}n \lbx@sfromlang, introducci\'{o}n y comentarios}{trads\adddotspace \lbx@sfromlang, intr\adddotspace y coms\adddot}}, %% {traducci\'{o}n \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 = {{traducci\'{o}n \lbx@sfromlang, pr\'{o}logo y comentario}{trad\adddotspace \lbx@sfromlang, pr\'{o}l\adddotspace y com\adddot}}, %% {traducci\'{o}n \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 = {{traducci\'{o}n \lbx@sfromlang, pr\'{o}logo y comentarios}{trads\adddotspace \lbx@sfromlang, pr\'{o}l\adddotspace y coms\adddot}}, %% {traducci\'{o}n \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 = {{traducci\'{o}n \lbx@sfromlang, ep\'{i}logo y comentario}{trad\adddotspace \lbx@sfromlang, ep\'{\i}l\adddotspace y com\adddot}}, %% {traducci\'{o}n \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 = {{traducci\'{o}n \lbx@sfromlang, ep\'{i}logo y comentarios}{trads\adddotspace \lbx@sfromlang, ep\'{\i}l\adddotspace y coms\adddot}}, %% {traducci\'{o}n \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 = {{traducci\'{o}n \lbx@sfromlang, introducci\'{o}n y notas}{trad\adddotspace \lbx@sfromlang, intr\adddotspace y anot\adddot}}, %% {traducci\'{o}n \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 = {{traducci\'{o}n \lbx@sfromlang, introducci\'{o}n y notas}{trads\adddotspace \lbx@sfromlang, intr\adddotspace y anot\adddot}}, %% {traducci\'{o}n \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 = {{traducci\'{o}n \lbx@sfromlang, pr\'{o}logo y notas}{trad\adddotspace \lbx@sfromlang, pr\'{o}l\adddotspace y anot\adddot}}, %% {traducci\'{o}n \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 = {{traducci\'{o}n \lbx@sfromlang, pr\'{o}logo y notas}{trads\adddotspace \lbx@sfromlang, pr\'{o}l\adddotspace y anot\adddot}}, %% {traducci\'{o}n \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 = {{traducci\'{o}n \lbx@sfromlang, ep\'{i}logo y notas}{trad\adddotspace \lbx@sfromlang, ep\'{\i}l\adddotspace y anot\adddot}}, %% {traducci\'{o}n \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 = {{traducci\'{o}n \lbx@sfromlang, ep\'{i}logo y notas}{trads\adddotspace \lbx@sfromlang, ep\'{\i}l\adddotspace y anot\adddot}}, %% {traducci\'{o}n \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 = {{organizaci\'on}{org\adddot}}, %% {organizaci\'on} instead of {organizador} or {organizadora} + organizers = {{organizaci\'on}{orgs\adddot}}, %% {organizaci\'on} instead of {organizadores} or {organizadoras} + byorganizer = {{organizado por}{org\adddotspace por}}, byauthor = {{de}{de}}, byeditor = {{editado por}{ed\adddotspace por}}, bycompiler = {{compilado por}{comp\adddotspace por}}, byredactor = {{redacci\'on de}{red\adddotspace de}}, byreviser = {{revisado por}{rev\adddotspace por}},% FIXME: unsure - byreviewer = {{rese\~{nado por}}{res\adddotspace por}},% FIXME: unsure + byreviewer = {{rese\~{n}ado por}{res\adddotspace por}},% FIXME: unsure byfounder = {{fundado por}{fund\adddotspace por}}, bycontinuator = {{continuado por}{cont\adddotspace por}}, bycollaborator = {{colaboraci\'{o}n de}{col\adddotspace de}},% FIXME: unsure bytranslator = {{traducido \lbx@lfromlang\ por}{trad\adddot \lbx@sfromlang\ por}}, - bycommentator = {{comentado por}{com\adddot por}}, - byannotator = {{anotado por}{anot\adddot por}}, - withcommentator = {{con comentario de}{con com\adddot de}}, + bycommentator = {{comentado por}{com\adddotspace por}}, + byannotator = {{anotado por}{anot\adddotspace por}}, + withcommentator = {{con comentario de}{con com\adddotspace de}}, withannotator = {{con notas de}{con notas de}}, - withintroduction = {{con introduci\'on de}{con intr\adddot de}}, - withforeword = {{con pr\'ologo de}{con pr\'ol\adddot de}}, - withafterword = {{con ep\'{\i}logo de}{con ep\'{\i}l\adddot de}}, + withintroduction = {{con introduci\'on de}{con intr\adddotspace de}}, + withforeword = {{con pr\'ologo de}{con pr\'ol\adddotspace de}}, + withafterword = {{con ep\'{i}logo de}{con ep\'{\i}l\adddotspace de}}, byeditortr = {{editado y traducido \lbx@lfromlang\ por}% {ed\adddotspace y trad\adddot \lbx@sfromlang\ por}}, byeditorco = {{editado y comentado por}% - {ed\adddotspace y com\adddot por}}, + {ed\adddotspace y com\adddotspace por}}, byeditoran = {{editado y anotado por}% - {ed\adddotspace y anot\adddot por}}, + {ed\adddotspace y anot\adddotspace por}}, byeditorin = {{editado e introducido por}% - {ed\adddotspace e intr\adddot por}}, + {ed\adddotspace e intr\adddotspace por}}, byeditorfo = {{editado y prologado por}% - {ed\adddotspace y pr\'ol\adddot por}}, + {ed\adddotspace y pr\'ol\adddotspace por}}, byeditoraf = {{editado y epilogado por}% - {ed\adddotspace y ep\'{\i}l\adddot por}}, + {ed\adddotspace y ep\'{\i}l\adddotspace por}}, byeditortrco = {{editado, traducido \lbx@lfromlang\ y comentado por}% - {ed.,\addabbrvspace trad\adddot \lbx@sfromlang\ y com\adddot por}}, + {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y com\adddotspace por}}, byeditortran = {{editado, traducido \lbx@lfromlang\ y anotado por}% - {ed.,\addabbrvspace trad\adddot \lbx@sfromlang\ y anot\adddot por}}, + {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y anot\adddotspace por}}, byeditortrin = {{editado, traducido \lbx@lfromlang\ e introducido por}% - {ed.,\addabbrvspace trad\adddot \lbx@sfromlang\ e intr\adddot por}}, + {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ e intr\adddotspace por}}, byeditortrfo = {{editado, traducido \lbx@lfromlang\ y prologado por}% - {ed.,\addabbrvspace trad\adddot \lbx@sfromlang\ y pr\'ol\adddot por}}, + {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y pr\'ol\adddotspace por}}, byeditortraf = {{editado, traducido \lbx@lfromlang\ y epilogado por}% - {ed.,\addabbrvspace trad\adddot \lbx@sfromlang\ y ep\'{\i}l\adddot por}}, + {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y ep\'{\i}l\adddotspace por}}, byeditorcoin = {{editado, comentado e introducido por}% - {ed.,\addabbrvspace com\adddot e intr\adddot por}}, + {ed.,\addabbrvspace com\adddotspace e intr\adddotspace por}}, byeditorcofo = {{editado, comentado y prologado por}% - {ed.,\addabbrvspace com\adddot y pr\'ol\adddot por}}, + {ed.,\addabbrvspace com\adddotspace y pr\'ol\adddotspace por}}, byeditorcoaf = {{editado, comentado y epilogado por}% - {ed.,\addabbrvspace com\adddot y ep\'{\i}l\adddot por}}, + {ed.,\addabbrvspace com\adddotspace y ep\'{\i}l\adddotspace por}}, byeditoranin = {{editado, anotado e introducido por}% - {ed.,\addabbrvspace anot\adddot e intr\adddot por}}, + {ed.,\addabbrvspace anot\adddotspace e intr\adddotspace por}}, byeditoranfo = {{editado, anotado y prologado por}% - {ed.,\addabbrvspace anot\adddot y pr\'ol\adddot por}}, + {ed.,\addabbrvspace anot\adddotspace y pr\'ol\adddotspace por}}, byeditoranaf = {{editado, anotado y epilogado por}% - {ed.,\addabbrvspace anot\adddot y ep\'{\i}l\adddot por}}, + {ed.,\addabbrvspace anot\adddotspace y ep\'{\i}l\adddotspace por}}, byeditortrcoin = {{editado, traducido \lbx@lfromlang, comentado e introducido por}% - {ed.,\addabbrvspace trad\adddot \lbx@sfromlang, com\adddot e intr\adddot por}}, + {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, com\adddotspace e intr\adddotspace por}}, byeditortrcofo = {{editado, traducido \lbx@lfromlang, comentado y prologado por}% - {ed.,\addabbrvspace trad\adddot \lbx@sfromlang, com\adddot y pr\'ol\adddot por}}, + {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, com\adddotspace y pr\'ol\adddotspace por}}, byeditortrcoaf = {{editado, traducido \lbx@lfromlang, comentado y epilogado por}% - {ed.,\addabbrvspace trad\adddot \lbx@sfromlang, com\adddot y ep\'{\i}l\adddot por}}, + {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, com\adddotspace y ep\'{\i}l\adddotspace por}}, byeditortranin = {{editado, traducido \lbx@lfromlang, anotado e introducido por}% - {ed.,\addabbrvspace trad\adddot \lbx@sfromlang, anot\adddot e intr\adddot por}}, + {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, anot\adddotspace e intr\adddotspace por}}, byeditortranfo = {{editado, traducido \lbx@lfromlang, anotado y prologado por}% - {ed.,\addabbrvspace trad\adddot \lbx@sfromlang, anot\adddot y pr\'ol\adddot por}}, + {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, anot\adddotspace y pr\'ol\adddotspace por}}, byeditortranaf = {{editado, traducido \lbx@lfromlang, anotado y epilogado por}% - {ed.,\addabbrvspace trad\adddot \lbx@sfromlang, anot\adddot y ep\'{\i}l\adddot por}}, + {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, anot\adddotspace y ep\'{\i}l\adddotspace por}}, bytranslatorco = {{traducido \lbx@lfromlang\ y comentado por}% - {trad\adddot \lbx@sfromlang\ y com\adddot por}}, + {trad\adddotspace \lbx@sfromlang\ y com\adddotspace por}}, bytranslatoran = {{traducido \lbx@lfromlang\ y anotado por}% - {trad\adddot \lbx@sfromlang\ y anot\adddot por}}, + {trad\adddotspace \lbx@sfromlang\ y anot\adddotspace por}}, bytranslatorin = {{traducido \lbx@lfromlang\ e introducido por}% - {trad\adddot \lbx@sfromlang\ e introd\adddot por}}, + {trad\adddotspace \lbx@sfromlang\ e introd\adddotspace por}}, bytranslatorfo = {{traducido \lbx@lfromlang\ y prologado por}% - {trad\adddot \lbx@sfromlang\ y pr\'ol\adddot por}}, + {trad\adddotspace \lbx@sfromlang\ y pr\'ol\adddotspace por}}, bytranslatoraf = {{traducido \lbx@lfromlang\ y epilogado por}% - {trad\adddot \lbx@sfromlang\ y ep\'{\i}l\adddot por}}, + {trad\adddotspace \lbx@sfromlang\ y ep\'{\i}l\adddotspace por}}, bytranslatorcoin = {{traducido \lbx@lfromlang, comentado e introducido por}% - {trad\adddot \lbx@sfromlang, com\adddot e intr\adddot por}}, + {trad\adddot \lbx@sfromlang, com\adddotspace e intr\adddotspace por}}, bytranslatorcofo = {{traducido \lbx@lfromlang, comentado y prologado por}% - {trad\adddot \lbx@sfromlang, com\adddot y pr\'ol\adddot por}}, + {trad\adddot \lbx@sfromlang, com\adddotspace y pr\'ol\adddotspace por}}, bytranslatorcoaf = {{traducido \lbx@lfromlang, comentado y epilogado por}% - {trad\adddot \lbx@sfromlang, com\adddot y ep\'{\i}l\adddot por}}, + {trad\adddot \lbx@sfromlang, com\adddotspace y ep\'{\i}l\adddotspace por}}, bytranslatoranin = {{traducido \lbx@lfromlang, anotado e introducido por}% - {trad\adddot \lbx@sfromlang, anot\adddot e intr\adddot por}}, + {trad\adddot \lbx@sfromlang, anot\adddotspace e intr\adddotspace por}}, bytranslatoranfo = {{traducido \lbx@lfromlang, anotado y prologado por}% - {trad\adddot \lbx@sfromlang, anot\adddot y pr\'ol\adddot por}}, + {trad\adddot \lbx@sfromlang, anot\adddotspace y pr\'ol\adddotspace por}}, bytranslatoranaf = {{traducido \lbx@lfromlang, anotado y epilogado por}% - {trad\adddot \lbx@sfromlang, anot\adddot y ep\'{\i}l\adddot por}}, + {trad\adddot \lbx@sfromlang, anot\adddotspace y ep\'{\i}l\adddotspace por}}, and = {{y}{y}}, andothers = {{y~col\adddot}{y~col\adddot}}, andmore = {{et\adddotspace al\adddot}{et\adddotspace al\adddot}}, @@ -290,12 +290,12 @@ book = {{libro}{libro}}, part = {{parte}{parte}}, issue = {{n\'umero}{n\'um\adddot}},% FIXME: unsure - newseries = {{nueva \'epoca}{n\adddotspace 'ep\adddot}}, - oldseries = {{antigua \'epoca}{ant\adddotspace 'ep\adddot}}, + newseries = {{nueva \'epoca}{n\adddotspace \'ep\adddot}}, + oldseries = {{antigua \'epoca}{ant\adddotspace \'ep\adddot}}, edition = {{edici\'on}{ed\adddot}}, - reprint = {{reimpresi\'{o}}{reimp\adddot}}, - reprintof = {{reimpresi\'{o} de}{reimp\adddot de}}, - reprintas = {{reimpreso como}{reimp\adddot como}}, + reprint = {{reimpresi\'{o}n}{reimp\adddot}}, + reprintof = {{reimpresi\'{o}n de}{reimp\adddotspace de}}, + reprintas = {{reimpreso como}{reimp\adddotspace como}}, reprintfrom = {{reimpresi\'{o} de}{reimp\adddotspace de}},% FIXME: unsure. What's the difference between reprintof and reprintfrom? reviewof = {{rese\~{n}a de}{rese\~{n}a de}}, translationof = {{traducci\'{o}n de}{trad\adddotspace de}}, @@ -314,28 +314,28 @@ lines = {{l\'{\i}neas}{ll\adddot}},% FIXME: abbrev. unsure. There is no standard verse = {{verso}{v\adddot}}, verses = {{versos}{vv\adddot}}, - section = {{secci\'{o}}{sec\adddot}}, + section = {{secci\'{o}n}{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 + pagetotal = {{p\'agina}{p\'ag\adddot}}, + pagetotals = {{p\'aginas}{p\'ags\adddot}}, + columntotal = {{columna}{col\adddot}}, + columntotals = {{columnas}{cols\adddot}}, + linetotal = {{l\'{\i}nea}{l\adddot}},% FIXME: abbrev. unsure. There is no standard + linetotals = {{l\'{\i}neas}{ll\adddot}},% FIXME: abbrev. unsure. There is no standard + versetotal = {{verso}{v\adddot}}, + versetotals = {{versos}{vv\adddot}}, + sectiontotal = {{secci\'{o}n}{sec\adddot}}, + sectiontotals = {{secciones}{secs\adddot}}, + paragraphtotal = {{p\'{a}rrafo}{p\'{a}rr\adddot}}, + paragraphtotals = {{p\'{a}rrafos}{p\'{a}rrs\adddot}}, in = {{en}{en}}, inseries = {{en}{en}}, ofseries = {{de}{de}}, number = {{n\'umero}{n\sptext{o}}}, chapter = {{cap\'itulo}{cap\adddot}}, -% bathesis = {{}{}},% FIXME: missing + bathesis = {{Tesis de licenciatura}{Tesis de lic\adddot}},% FIXME: unsure. mathesis = {{Tesis de maestr\'{\i}a}{Tesis de mtr\'{\i}a\adddot}}, phdthesis = {{Tesis doctoral}{Tesis doct\adddot}}, candthesis = {{Tesis de candidatura doctoral}{Tesis de cand\adddotspace doct\adddot}},% FIXME: unsure @@ -346,9 +346,9 @@ audiocd = {{disco de audio}{CD de audio}},% FIXME: abbrev. unsure version = {{versi\'on}{ver\adddot}}, url = {{direcci\'on}{direcci\'on}}, - urlfrom = {{disponible desde}{disp\adddot desde}},% FIXME: unsure + urlfrom = {{disponible desde}{disp\adddotspace desde}},% FIXME: unsure urlseen = {{visitado}{visitado}}, - inpreparation = {{en preparaci\'{o}}{en prep\adddot}}, + inpreparation = {{en preparaci\'{o}n}{en prep\adddot}}, submitted = {{enviado}{enviado}}, forthcoming = {{pr\'oximamente}{prox\adddot}}, inpress = {{en prensa}{en prensa}}, @@ -390,56 +390,62 @@ december = {{diciembre}{dic\adddot}}, langamerican = {{ingl\'{e}s americano}{ingl\'{e}s americano}}, langbrazilian = {{brasile\~no}{brasile\~no}}, -% langbulgarian = {{}{}},% FIXME: missing + langbulgarian = {{b\'ulgaro}{b\'ulgaro}}, 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 = {{estonio}{estonio}}, langfinnish = {{fin\'{e}s}{fin\'{e}s}}, langfrench = {{franc\'es}{franc\'es}}, langgalician = {{gallego}{gallego}}, langgerman = {{alem\'an}{alem\'an}}, langgreek = {{griego}{griego}}, + langhungarian = {{h\'ungaro}{h\'ungaro}}, langitalian = {{italiano}{italiano}}, + langjapanese = {{japon\'es}{japon\'es}}, langlatin = {{lat\'{\i}n}{lat\'{\i}n}}, -% langlatvian = {{}{}},% FIXME: missing + langlatvian = {{lituano}{lituano}}, langnorwegian = {{noruego}{noruego}}, langpolish = {{polaco}{polaco}}, langportuguese = {{portugu\'es}{portugu\'es}}, langrussian = {{ruso}{ruso}}, -% langslovak = {{}{}},% FIXME: missing -% langslovene = {{esloveno}{esloveno}}, %%FIXME: not defined? + langslovak = {{eslovaco}{eslovaco}}, + langslovene = {{esloveno}{esloveno}}, langspanish = {{espa\~nol}{espa\~nol}}, langswedish = {{sueco}{sueco}}, + langukrainian = {{ucraniano}{ucraniano}}, fromamerican = {{del ingl\'{e}s americano}{del ingl\'{e}s americano}}, frombrazilian = {{del brasile\~no}{del brasile\~no}}, -% frombulgarian = {{}{}},% FIXME: missing + frombulgarian = {{del b\'ulgaro}{del b\'ulgaro}}, 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 = {{del estonio}{del estonio}}, 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}}, + fromhungarian = {{del h\'ungaro}{del h\'ungaro}}, fromitalian = {{del italiano}{del italiano}}, + fromjapanese = {{del japon\'es}{del japon\'es}}, fromlatin = {{del lat\'{\i}n}{del lat\'{\i}n}}, -% fromlatvian = {{}{}},% FIXME: missing + fromlatvian = {{del lituano}{del lituano}}, fromnorwegian = {{del noruego}{del noruego}}, frompolish = {{del polaco}{del polaco}}, fromportuguese = {{del portugu\'es}{del portugu\'es}}, fromrussian = {{del ruso}{del ruso}}, -% fromslovak = {{}{}},% FIXME: missing -% fromslovene = {{del esloveno}{del esloveno}}, %%FIXME: not defined? + fromslovak = {{del eslovaco}{del eslovaco}}, + fromslovene = {{del esloveno}{del esloveno}}, fromspanish = {{del espa\~nol}{del espa\~nol}}, fromswedish = {{del sueco}{del sueco}}, + fromukrainian = {{del ucraniano}{del ucraniano}}, countryde = {{Alemania}{DE}}, countryeu = {{Uni\'on Europea}{EU}}, countryep = {{Uni\'on Europea}{EP}}, @@ -447,17 +453,17 @@ countryuk = {{Reino Unido}{GB}},% FIXME: "Reino Unido" or "Gran Breta\~na"? countryus = {{Estados Unidos}{US}},% FIXME: "Estados Unidos de Am\'erica"? patent = {{patente}{pat\adddot}}, - patentde = {{patente alemana}{pat\adddot alemana}}, - patenteu = {{patente europea}{pat\adddot europea}}, - patentfr = {{patente francesa}{pat\adddot francesa}}, - patentuk = {{patente brit\'anica}{pat\adddot brit\'anica}}, - patentus = {{patente estadounidense}{pat\adddot estadounidense}}, - patreq = {{solicitud de patente}{sol\adddot de pat\adddot}}, - patreqde = {{solicitud de patente alemana}{sol\adddot de pat\adddot alemana}}, - patreqeu = {{solicitud de patente europea}{sol\adddot de pat\adddot europea}}, - patreqfr = {{solicitud de patente francesa}{sol\adddot de pat\adddot francesa}}, - patrequk = {{solicitud de patente brit\'anica}{sol\adddot de pat\adddot brit\'anica}}, - patrequs = {{solicitud de patente estadounidense}{sol\adddot de pat\adddot estadounidense}}, + patentde = {{patente alemana}{pat\adddotspace alemana}}, + patenteu = {{patente europea}{pat\adddotspace europea}}, + patentfr = {{patente francesa}{pat\adddotspace francesa}}, + patentuk = {{patente brit\'anica}{pat\adddotspace brit\'anica}}, + patentus = {{patente estadounidense}{pat\adddotspace estadounidense}}, + patreq = {{solicitud de patente}{sol\adddotspace de pat\adddot}}, + patreqde = {{solicitud de patente alemana}{sol\adddotspace de pat\adddot alemana}}, + patreqeu = {{solicitud de patente europea}{sol\adddotspace de pat\adddot europea}}, + patreqfr = {{solicitud de patente francesa}{sol\adddotspace de pat\adddot francesa}}, + patrequk = {{solicitud de patente brit\'anica}{sol\adddotspace de pat\adddot brit\'anica}}, + patrequs = {{solicitud de patente estadounidense}{sol\adddotspace de pat\adddot estadounidense}}, file = {{archivo}{archivo}}, library = {{biblioteca}{bibl\adddot}}, abstract = {{resumen}{resumen}}, @@ -466,11 +472,11 @@ beforecommonera = {{antes de la era com\'un}{a\adddotspace e\adddotspace c\adddot}}, annodomini = {{despu\'es de Cristo}{d\adddotspace C\adddot}}, beforechrist = {{antes de Cristo}{a\adddotspace C\adddot}}, -% circa = {{}{}},% FIXME: missing -% spring = {{}{}},% FIXME: missing -% summer = {{}{}},% FIXME: missing -% autumn = {{}{}},% FIXME: missing -% winter = {{}{}},% FIXME: missing + circa = {{circa}{ca\adddot}}, + spring = {{primavera}{prim\adddot}}, + summer = {{verano}{ver\adddot}}, + autumn = {{oto\~no}{ot\adddot}}, + winter = {{invierno}{inv\adddot}}, am = {{a\adddotspace m\adddot}{a\adddot m\adddot}}, pm = {{p\adddotspace m\adddot}{p\adddot m\adddot}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx index e8394cf9b29..d0b3cf17473 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx @@ -92,7 +92,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -434,6 +434,7 @@ langgalician = {{galiciska}{galiciska}}, langgerman = {{tyska}{tyska}}, langgreek = {{grekiska}{grekiska}}, +% langhungarian = {{}{}}, % FIXME: missing langitalian = {{italienska}{italienska}}, langlatin = {{latin}{latin}}, % langlatvian = {{}{}},% FIXME: missing @@ -459,6 +460,7 @@ 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}}, +% fromhungarian = {{}{}}, % FIXME: missing fromitalian = {{fr\aa n italienska}{fr\aa n italienska}}, fromlatin = {{fr\aa n latin}{fr\aa n latin}}, % fromlatvian = {{}{}},% FIXME: missing diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/ukrainian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/ukrainian.lbx index 4a087a4ca11..b5be8984c5c 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/ukrainian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/ukrainian.lbx @@ -85,7 +85,7 @@ \forcezerosmdt{\thefield{#2}}% \iffieldundef{#3}{} {\bibtimesep - \forcezeros{\thefield{#3}}}% + \forcezerosmdt{\thefield{#3}}}% \space \ifnumless{\thefield{#1}}{12} {\bibstring{am}} @@ -502,6 +502,7 @@ langgalician = {{галісійський}{гал\adddot}}, langgerman = {{німецька}{нім\adddot}}, langgreek = {{грецька}{грець\adddot}}, + langhungarian = {{угорська}{угор\adddot}}, langitalian = {{італійська}{італ\adddot}}, langjapanese = {{японська}{яп\adddot}}, langlatin = {{латинська}{лат\adddot}}, @@ -530,6 +531,7 @@ fromgalician = {{з галісійської}{з\addabbrvspace гал\adddot}}, fromgerman = {{з німецької}{з\addabbrvspace нім\adddot}}, fromgreek = {{з грецької}{з\addabbrvspace грец\adddot}}, + fromhungarian = {{з угорської}{з\addabbrvspace угор\adddot}}, fromitalian = {{з італійської}{з\addabbrvspace італ\adddot}}, fromjapanese = {{з японської}{з\addabbrvspace яп\adddot}}, fromlatin = {{з латинської}{з\addabbrvspace лат\adddot}}, |