diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex')
43 files changed, 2817 insertions, 650 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def index c4ac8d0169c..58c7414182f 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def @@ -210,6 +210,11 @@ % \bibsetup is a generic hook controlling the (low-level) layout of % the bibliography and bibliography lists. The default % definition should work fine in most cases. +% There are a few other penalties and parameters that could be adjusted +% here, but we don't do that by default for backwards compatibility +% reasons. +% * \finalhyphendemerits can be set to 0 to allow hyphenation +% in the penultimate line \newcommand*{\bibsetup}{% \interlinepenalty=5000\relax @@ -1469,6 +1474,10 @@ \sort{\citeorder} } +\DeclareSortingTemplate{count}{ + \sort[direction=descending]{\citecount} +} + \DeclareSortingTemplate{debug}{ \sort{ \field{entrykey} @@ -2247,21 +2256,21 @@ \DeclareCiteCommand{\notecite} {\printfield{prenote}% \setunit*{\printdelim{prenotedelim}}} - {\nocite{\thefield{entrykey}}} + {} {} {\printfield{postnote}} \DeclareCiteCommand{\pnotecite}[\mkbibparens] {\printfield{prenote}% \setunit*{\printdelim{prenotedelim}}} - {\nocite{\thefield{entrykey}}} + {} {} {\printfield{postnote}} \DeclareCiteCommand{\fnotecite}[\mkbibfootnote] {\printfield{prenote}% \setunit*{\printdelim{prenotedelim}}} - {\nocite{\thefield{entrykey}}} + {} {} {\printfield{postnote}} @@ -2979,13 +2988,21 @@ {\ifnamesequal{author}{savedauthor} {\clearname{author}} {}}% - \renewbibmacro*{related:init}{}% \DeclareNameAlias{sortname}{default}% + % from authortitle and authoryear + \ifbibmacroundef{bbx:dashcheck} + {} + {\renewbibmacro*{bbx:dashcheck}[2]{##2}}% + % authoryear + \ifbibmacroundef{labeltitle} + {} + {\renewbibmacro*{labeltitle}{}}% \ifbibmacroundef{date+extradate} {} {\renewbibmacro*{date+extradate}{}% \renewbibmacro*{bbx:ifmergeddate}{\@secondoftwo}}% - \renewbibmacro*{pageref}{}} + \renewbibmacro*{pageref}{}% + \renewbibmacro*{related:init}{}} {\thefield{entrytype}}}} \newbibmacro*{related:bytranslator}[1]{% diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty index e24c735007f..afafd191342 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{2020/12/31} -\def\abx@version{3.16} +\def\abx@date{2022/02/02} +\def\abx@version{3.17} \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,12 +22,12 @@ % This is not updated by build script as the control file version % does not necessarily change with the package version. % This is used when writing the .bcf -\def\blx@bcfversion{3.7} +\def\blx@bcfversion{3.8} % 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{3.1} +\def\blx@bblversion{3.2} \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{biblatex} @@ -64,8 +64,10 @@ \providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} \IfFormatAtLeastTF{2020/10/01} {\def\blx@AfterPreamble{\AddToHook{begindocument}[biblatex/afterpreamble]}% - \DeclareHookRule{begindocument}{biblatex/afterpreamble}{after}{biblatex}} - {\def\blx@AfterPreamble{\AfterPreamble}} + \DeclareHookRule{begindocument}{biblatex/afterpreamble}{after}{biblatex}% + \def\blx@AtEndDocument{\AddToHook{enddocument/afterlastpage}}} + {\def\blx@AfterPreamble{\AfterPreamble}% + \def\blx@AtEndDocument{\AtEndDocument}} % generalised keyval interface % define a new key (possibly with a default value) @@ -206,6 +208,14 @@ {\global\cslet{blx@pkgloaded@polyglossia}\@empty} {} +\@ifpackageloaded{inputenc} + {\global\cslet{blx@pkgloaded@inputenc}\@empty} + {} + +\@ifpackageloaded{inputenx} + {\global\cslet{blx@pkgloaded@inputenx}\@empty} + {} + % this part is deferred to \AtEndPreamble \def\blx@packageincompatibility@endpreambleonly{% % people should not be abusing noerroretextools, @@ -219,6 +229,17 @@ Please do not define '\string\blx@noerroretextools'\MessageBreak unless you really need it}}} {}% + \@ifpackageloaded{inputenc} + {\ifcsundef{blx@pkgloaded@inputenc} + {\blx@warning@noline{Load 'inputenc' before biblatex}} + {}} + {}% + \@ifpackageloaded{inputenx} + {\ifcsundef{blx@pkgloaded@inputenx} + {} + {\blx@warning@noline{Load 'inputenx' before biblatex}} + {}} + {}% % polyglossia pretends to be babel, so the nested structure helps % to make sure that babel really is babel \@ifpackageloaded{polyglossia} @@ -582,43 +603,38 @@ {}% } -% our copy of \addtocontents with \immediate (not @protected, -% so a bit different, but we are only going to use it for very -% specific input, so that doesn't matter) -\def\blx@immediate@addtocontents#1#2{% - \blx@auxwrite\@auxout - {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble}% - {\string\@writefile{#1}{#2}}} -\AtBeginDocument{% - \blx@immediate@addtocontents{toc}{% - \boolfalse{citerequest}% - \boolfalse{citetracker}% - \boolfalse{pagetracker}% - \boolfalse{backtracker}\relax}% - \blx@immediate@addtocontents{lof}{% - \boolfalse{citerequest}% - \boolfalse{citetracker}% - \boolfalse{pagetracker}% - \boolfalse{backtracker}\relax}% - \blx@immediate@addtocontents{lot}{% - \boolfalse{citerequest}% - \boolfalse{citetracker}% - \boolfalse{pagetracker}% - \boolfalse{backtracker}\relax}} - -\begingroup -\@makeother\# -% \relax: gobble newline -> titletoc.sty -\AtEndPreamble{% - \patchcmd\addtocontents - {\string\@writefile} - {\string\@writefile{#1}{\defcounter{refsection}{\the\c@refsection}\relax}% - \string\@writefile} +\protected\def\blx@providecounter#1{% + \ifltxcounter{#1} {} - {\blx@err@patch{\string\addtocontents}}} -\endgroup + {\newcounter{#1}}} + +\def\blx@citecmds{} +% \autocite and \autocites are not defined via \DeclareCiteCommand +\listadd\blx@citecmds{autocite} +\listadd\blx@citecmds{autocites} +\newcommand*{\blx@contentssafe@citecommands}{% + \forlistloop{\blx@mkcitecmd@contentssafe}{\blx@citecmds}} + +\def\blx@mkcitecmd@contentssafe#1{% + \csdef{#1}{% + \blx@tocontentsinit{\the\c@refsection}% + \noexpand\csuse{#1}}} + +\protected\def\blx@tocontentsinit#1{% + \boolfalse{citerequest}% + \boolfalse{citetracker}% + \boolfalse{pagetracker}% + \boolfalse{backtracker}% + \defcounter{refsection}{#1}} + +\patchcmd\addtocontents + {\let\glossary\@gobble} + {\let\glossary\@gobble + \blx@contentssafe@citecommands} + {} + {\blx@err@patch{\addtocontents}} % trick hyperref into believing we're natbib \let\NAT@parse\@empty @@ -637,7 +653,7 @@ \begingroup \def\blx@tempa{\endgroup \@secondoftwo}% - \renewcommand*{\do}[1]{% + \def\do##1{% \ifstrequal{##1}{#1} {\def\blx@tempa{\endgroup \@firstoftwo}% @@ -835,12 +851,13 @@ \newcount\blx@tempcnta \newcount\blx@tempcntb \newcount\blx@tempcntc -\newcount\blx@maxsection -\expandafter\newcount\csname blx@maxsegment@0\endcsname +\newcounter{blx@maxsection} +\def\theblx@maxsection{\the\c@blx@maxsection} +\newcounter{blx@maxsegment@0} \newcount\blx@notetype \newcount\blx@parenlevel@text \newcount\blx@parenlevel@foot -\expandafter\newcount\csname blx@sectionciteorder@0\endcsname +\newcounter{blx@sectionciteorder@0} \newcount\blx@entrysetcounter \newcount\blx@biblioinstance @@ -868,8 +885,6 @@ \newlength{\bibparsep} \newlength{\bibhang} -\newbool{refcontextdefaults} -\booltrue{refcontextdefaults}% \newbool{sourcemap} \newbool{citetracker} \newbool{pagetracker} @@ -954,6 +969,7 @@ % Used to track default refcontexts for citations \cslet{blx@defaultrefcontexts@0}\@empty \listadd\blx@allrefsections{0} +\listadd\blx@alllastrefsections{0} % Used to track defernumbers from .aux \global\let\blx@localnumbers\@empty @@ -970,14 +986,8 @@ % Used to track transliterations \global\let\blx@translits\@empty -% Use to track every entry found in .bbl -% Used to issue defernumbers warning about missing keys because this causes -% defernumbers labelling to fail. -\global\let\blx@entries\@empty - % Initialise some lists which track changing citations/sortingtemplates % etc. between runs -\global\let\blx@cites\@empty \global\let\blx@nocites\@empty \global\let\blx@directcites\@empty \global\let\blx@refcontexts\@empty @@ -986,8 +996,8 @@ \global\let\blx@dlistnames\@empty \global\let\blx@biblists\@empty \global\let\blx@lastbiblists\@empty -\global\let\blx@lastcites\@empty \global\let\blx@localnumaux\@empty +\global\cslet{blx@cites@0}\@empty \newread\blx@bcfin \newwrite\blx@bcfout @@ -1618,7 +1628,7 @@ \def\blx@addchecksum{\blx@checksum\blx@checksum@old} \def\blx@addpagesum{\blx@checksum\blx@pagesum@old} -\AtEndDocument{% +\blx@AtEndDocument{% \def\blx@addchecksum{\blx@checksum\blx@checksum@new}% \def\blx@addpagesum{\blx@checksum\blx@pagesum@new}} @@ -2233,9 +2243,13 @@ % {<entry type>}{<driverdef>} \newrobustcmd*{\DeclareBibliographyDriver}[1]{% - \long\csdef{blx@bbx@#1}} + \blx@declarebibdriver{#1}} \@onlypreamble\DeclareBibliographyDriver +\long\def\blx@declarebibdriver#1#2{\long\csdef{blx@bbx@#1}{#2}} + + + % {<entry type>} \def\blx@driver#1{% \ifcsdef{blx@bbx@#1} @@ -3145,6 +3159,44 @@ \fi \endgroup} +% {\<non-ASCII numeral>}{\<ASCII number>} +\protected\def\blx@defcomputableequivalent#1#2{% + \appto\blx@dononasciicomputablenumerals{\do#1}% + \appto\blx@initcomputableequivs{\uccode`#1=`#2}} + +% {<string>}{<true>}{<false>} +\protected\long\def\blx@imc@hascomputableequivalent#1{% + \begingroup + \def\do##1{\uccode`##1=`\%}% + \blx@dononasciicomputablenumerals + \catcode`\@=11 + \catcode`\%=9 + \endlinechar\m@ne + \uppercase{\scantokens{\def\blx@tempa{#1}}}% + \ifx\blx@tempa\@empty + \aftergroup\@firstoftwo + \else + \aftergroup\@secondoftwo + \fi + \endgroup} + +% {<string>}{<true>}{<false>} +\protected\long\def\blx@imc@ifiscomputable#1{% + \blx@imc@ifinteger{#1} + {\@firstofone} + {\blx@imc@hascomputableequivalent{#1}}} + +% {<string>}{<macro>} +\protected\long\def\blx@imc@getcomputableequivalent#1#2{% + \blx@imc@hascomputableequivalent{#1} + {\begingroup + \blx@initcomputableequivs + \uppercase{\def\blx@tempa{#1}}% + \edef\blx@tempb{\endgroup + \noexpand\def\noexpand#2{\expandonce{\blx@tempa}}}% + \blx@tempb} + {\def#2{#1}}} + % {<field>}{<true>}{<false>} \protected\def\blx@imc@iffieldint#1{% \blx@imc@iffieldundef{#1} @@ -3154,6 +3206,24 @@ \expandafter\expandafter \expandafter{\csname abx@field@#1\endcsname}}} +% {<field>}{<true>}{<false>} +\protected\def\blx@imc@fieldhascomputableequivalent#1{% + \blx@imc@iffieldundef{#1} + {\@secondoftwo} + {\expandafter\expandafter + \expandafter\blx@imc@hascomputableequivalent + \expandafter\expandafter + \expandafter{\csname abx@field@#1\endcsname}}} + +% {<field>}{<true>}{<false>} +\protected\def\blx@imc@iffieldiscomputable#1{% + \blx@imc@iffieldundef{#1} + {\@secondoftwo} + {\expandafter\expandafter + \expandafter\blx@imc@ifiscomputable + \expandafter\expandafter + \expandafter{\csname abx@field@#1\endcsname}}} + % {<string>}{<true>}{<false>} \protected\def\blx@imc@ifnumeral{% \blx@ifnum\blx@hook@ifnum} @@ -3184,11 +3254,15 @@ \fi \endgroup} +% valid numerals set by the lbx file +\let\lbx@dononasciinumerals\relax + \def\blx@hook@ifnum{% \def\do##1{\uccode`##1=`\%}% \do\ \do\0\do\1\do\2\do\3\do\4\do\5\do\6\do\7\do\8\do\9% \do\i\do\v\do\x\do\l\do\c\do\d\do\m \do\I\do\V\do\X\do\L\do\C\do\D\do\M + \lbx@dononasciinumerals \blx@donumchars \let\RN\@firstofone \let\Rn\@firstofone} @@ -3750,7 +3824,7 @@ % Delimiter interface -% [<contextname, ...>]{<name, ...>}{<code>} +% [<contextname, ...>]{<name>}{<code>} \newrobustcmd*{\DeclareDelimFormat}{% \@ifstar {\blx@declaredelimclear} @@ -3778,12 +3852,10 @@ \docsvlist{#1}}}% \def\blx@declaredelim@i#1#2#3#4{% - \def\do@i##1{% - \ifcsdef{#1##1} - {\blx@inf@delimdeclare{##1}{#2}} - {}% - \csdef{#1##1}{#4}}% - \forcsvlist{\do@i}{#3}} + \ifcsdef{#1#3} + {\blx@inf@delimdeclare{#3}{#2}} + {}% + \csdef{#1#3}{#4}} % [<alias context, ...>]{<alias>}[<delim context>]{<delim>} % deprecated: *[<alias context, ...>]{<alias>}[<delim context>]{<delim>} @@ -3851,34 +3923,40 @@ % {<alias>}{<source>} \def\blx@declaredelimalias@auto#1#2{% \blx@cleardelim{#1}% - \blx@declaredelimalias@def{}{#1}{}{#2}% + \blx@declaredelimalias@manual{}{#1}{}{#2}% \ifcsvoid{blx@declaredelimcontexts@#2} {} {\def\do##1{% - \blx@declaredelimalias@def - {blx@printdelim@##1@}{#1}{blx@printdelim@##1@}{#2}}% + \blx@declaredelimalias@manual{##1}{#1}{##1}{#2}}% \dolistcsloop{blx@declaredelimcontexts@#2}}} % {<alias context>}{<alias>}{<source context>}{<source>} \def\blx@declaredelimalias@manual#1#2#3#4{% + \begingroup \ifblank{#1} - {\ifblank{#3} - {\blx@declaredelimalias@def{}{#2}{}{#4}} - {\blx@declaredelimalias@def{}{#2}{blx@printdelim@#3@}{#4}}} - {\ifblank{#3} - {\blx@declaredelimalias@def{blx@printdelim@#1@}{#2}{}{#4}}} - {\blx@declaredelimalias@def{blx@printdelim@#1@}{#2}{blx@printdelim@#3@}{#4}}} + {\def\blx@tempa{{}{}}} + {\def\blx@tempa{{blx@printdelim@#1@}{#1}}}% + \ifblank{#3} + {\def\blx@tempb{{}{}}} + {\def\blx@tempb{{blx@printdelim@#3@}{#3}}}% + \edef\blx@tempc{\endgroup + \noexpand\blx@declaredelimalias@def% + \expandonce\blx@tempa {\unexpanded{#2}}% + \expandonce\blx@tempb {\unexpanded{#4}}}% + \blx@tempc} -\def\blx@declaredelimalias@def#1#2#3#4{% - \ifcsdef{#1#2} - {\blx@inf@delimdeclare{#2}{#1}} +% {<alias context internal id>}{<alias context name>}{<alias>} +% {<source context internal id>}{<source context name>}{<source>} +\def\blx@declaredelimalias@def#1#2#3#4#5#6{% + \ifcsdef{#1#3} + {\blx@inf@delimdeclare{#3}{#2}} {}% - \ifblank{#1} + \ifblank{#2} {} - {\ifinlistcs{#1}{blx@declaredelimcontexts@#2} + {\ifinlistcs{#2}{blx@declaredelimcontexts@#3} {} - {\listcsadd{blx@declaredelimcontexts@#2}{#1}}}% - \csdef{#1#2}{\ifcsundef{#3#4}{\csuse{#4}}{\csuse{#3#4}}}} + {\listcsadd{blx@declaredelimcontexts@#3}{#2}}}% + \csdef{#1#3}{\ifcsundef{#4#6}{\csuse{#6}}{\csuse{#4#6}}}} \def\blx@delimcontext{none} \newcommand*{\printdelim}[2][]{% @@ -3903,6 +3981,9 @@ \newcommand*{\DeclareDelimcontextAlias}[2]{% \csdef{blx@delimcontextalias@#1}{#2}} +\newcommand*{\UndeclareDelimcontextAlias}[1]{% + \csundef{blx@delimcontextalias@#1}} + \newrobustcmd*{\AtUsedriver}{% \@ifstar {\global\undef\blx@hook@usedriver @@ -4053,7 +4134,7 @@ {\ifcsstring{blx@dateformat@#1date}{year} {\@firstoftwo} {\iffieldundef{#1month} - {\iffieldundef{#1season}} + {\iffieldundef{#1yeardivision}} {\@secondoftwo}}}} \def\blx@imc@ifdatehastime#1{% @@ -4081,7 +4162,7 @@ {\@secondoftwo}} \def\blx@reconstruct@comparabledate#1{% - \thefield{#1year}-\thefield{#1month}(\thefield{#1season})-% + \thefield{#1year}-\thefield{#1month}(\thefield{#1yeardivision})-% \thefield{#1day}T% \thefield{#1hour}:\thefield{#1minute}:\thefield{#1second}Z% \thefield{#1timezone}//% @@ -4121,8 +4202,10 @@ \ifnameequalcs \ifnameequals \ifnamesequal \ifnameundef \ifnamexref \iffirstonpage \ifsamepage \savefield \savefieldcs \savelist \savelistcs \savename \savenamecs \usedriver - \ifinteger \ifnumeral \ifnumerals \ifpages - \iffieldint \iffieldnum \iffieldnums \iffieldpages + \ifinteger \hascomputableequivalent \ifiscomputable \getcomputableequivalent + \ifnumeral \ifnumerals \ifpages + \iffieldint \fieldhascomputableequivalent \iffieldiscomputable + \iffieldnum \iffieldnums \iffieldpages \iflabeldateisdate \ifdatehasyearonlyprecision \ifdatehastime \ifdateshavedifferentprecision \ifdateyearsequal \ifdatesequal \ifdaterangesequal @@ -4527,7 +4610,7 @@ \newrobustcmd*{\bibnamedelimb}{\addlowpenspace} \newrobustcmd*{\bibnamedelimc}{\addhighpenspace} \newrobustcmd*{\bibnamedelimd}{\addlowpenspace} -\newrobustcmd*{\bibnamedelimi}{\addnbspace} +\newrobustcmd*{\bibnamedelimi}{\isdot\addnbspace} % [<format>][<start>-<stop>]{<namelist>} \protected\def\blx@imc@indexnames{% @@ -4750,6 +4833,44 @@ \printtext \printfield \printlist \printnames \printfile \indexfield \indexlist \indexnames \entrydata \entryset} +\let\blx@bibstringsets\@empty + +% {<set>}{<bibstring_1>,...,<bibstring_n>} +\newrobustcmd*{\DeclareBibstringSet}[1]{% + \listadd\blx@bibstringsets{#1}% + \def\do##1{% + \csdef{blx@bibstringset@string@##1}{#1}% + \listcsadd{blx@bibstringset@set@#1}{##1}}% + \docsvlist} + +% {<set>} +\newrobustcmd*{\UndeclareBibstringSet}[1]{% + \def\do##1{\csundef{blx@bibstringset@string@##1}}% + \dolistcsloop{blx@bibstringset@set@#1}% + \csundef{blx@bibstringset@set@#1}% + \UndeclareBibstringSetFormat{#1}} + +\newrobustcmd*{\UndeclareBibstringSets}{% + \forlistloop{\UndeclareBibstringSet}{\blx@bibstringsets}% + \let\blx@bibstringsets\@empty} + +% {<set>}{<code>} +\newrobustcmd*{\DeclareBibstringSetFormat}[1]{% + \csdef{blx@bibstringsetformat@#1}##1} + +% {<set>} +\newrobustcmd*{\UndeclareBibstringSetFormat}[1]{% + \csundef{blx@bibstringsetformat@#1}} + +% {<wrapper>}{<string (name)>}{<text (derived from string)>} +\def\blx@wrapbibstring#1#2#3{% + \ifcsundef{blx@bibstringset@string@#2} + {#1{#3}} + {\ifcsundef{blx@bibstringsetformat@\csuse{blx@bibstringset@string@#2}} + {#1{#3}} + {#1{\csuse{blx@bibstringsetformat@\csuse{blx@bibstringset@string@#2}} + {#3}}}}} + %% Localization % {<wrapper>}{<long/short>}{<string>}{<print code>} @@ -4789,8 +4910,8 @@ \protected\def\blx@bibstring#1#2#3{% \blx@met@bibstring{#1}{#2}{#3} {\blx@imc@ifcapital - {#1{\MakeCapital{\csuse{#2@\blx@tempa}}}} - {#1{\csuse{#2@\blx@tempa}}}% + {\blx@wrapbibstring{#1}{\blx@tempa}{\MakeCapital{\csuse{#2@\blx@tempa}}}} + {\blx@wrapbibstring{#1}{\blx@tempa}{\csuse{#2@\blx@tempa}}}% \blx@endunit}} % [<wrapper>]{<string>} @@ -4805,7 +4926,7 @@ \protected\def\blx@bibncpstring#1#2#3{% \blx@met@bibstring{#1}{#2}{#3} - {#1{\csuse{#2@\blx@tempa}}% + {\blx@wrapbibstring{#1}{\blx@tempa}{\csuse{#2@\blx@tempa}}% \blx@endunit}} % [<wrapper>]{<string>} @@ -4820,7 +4941,7 @@ \protected\def\blx@bibcpstring#1#2#3{% \blx@met@bibstring{#1}{#2}{#3} - {#1{\MakeCapital{\csuse{#2@\blx@tempa}}}% + {\blx@wrapbibstring{#1}{\blx@tempa}{\MakeCapital{\csuse{#2@\blx@tempa}}}% \blx@endunit}} % [<wrapper>]{<string>} @@ -4835,7 +4956,7 @@ \protected\def\blx@biblcstring#1#2#3{% \blx@met@bibstring{#1}{#2}{#3} - {#1{\blx@maketext@lowercase{\csuse{#2@\blx@tempa}}}% + {\blx@wrapbibstring{#1}{\blx@tempa}{\blx@maketext@lowercase{\csuse{#2@\blx@tempa}}}% \blx@endunit}} % [<wrapper>]{<string>} @@ -4850,7 +4971,7 @@ \protected\def\blx@bibucstring#1#2#3{% \blx@met@bibstring{#1}{#2}{#3} - {#1{\blx@maketext@uppercase{\csuse{#2@\blx@tempa}}}% + {\blx@wrapbibstring{#1}{\blx@tempa}{\blx@maketext@uppercase{\csuse{#2@\blx@tempa}}}% \blx@endunit}} % {<string>} @@ -5259,10 +5380,12 @@ \do{langlatin}% \do{langlatvian}% \do{langlithuanian}% + \do{langmarathi}% \do{langnorwegian}% \do{langpolish}% \do{langportuguese}% \do{langserbian}% + \do{langromanian}% \do{langrussian}% \do{langslovak}% \do{langslovene}% @@ -5292,9 +5415,11 @@ \do{fromlatin}% \do{fromlithuanian}% \do{fromlatvian}% + \do{frommarathi}% \do{fromnorwegian}% \do{frompolish}% \do{fromportuguese}% + \do{fromromanian}% \do{fromrussian}% \do{fromserbian}% \do{fromslovak}% @@ -5330,6 +5455,23 @@ \do{summer}% \do{autumn}% \do{winter}% + \do{springN}% + \do{summerN}% + \do{autumnN}% + \do{winterN}% + \do{springS}% + \do{summerS}% + \do{autumnS}% + \do{winterS}% + \do{Q1}% + \do{Q2}% + \do{Q3}% + \do{Q4}% + \do{QD1}% + \do{QD2}% + \do{QD3}% + \do{S1}% + \do{S2}% \do{am}% \do{pm}% } @@ -5800,13 +5942,13 @@ {\blx@nounit} {\printtext[{#2date}]{% \datecircaprint - % Such a season component can only come from an ISO8601 season which replaces + % Such a year division component can only come from an ISO8601 year division which replaces % a normal month so if it exists, we know that a normal date print is ruled out - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% % Optionally print the time after the date \blx@printtime{#2}{}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}}% \dateuncertainprint \dateeraprint{#2year}% \iffieldundef{#2endyear} @@ -5815,11 +5957,11 @@ {\mbox{\bibdaterangesep}} {\bibdaterangesep \enddatecircaprint - \iffieldundef{#2endseason} + \iffieldundef{#2endyeardivision} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% % Optionally print the time after the date \blx@printtime{#2}{end}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + {\csuse{mkbibyeardivisiondate#1}{#2endyear}{#2endyeardivision}}% \enddateuncertainprint \dateeraprint{#2endyear}}}}}% \endgroup} @@ -5831,13 +5973,13 @@ {\blx@nounit} {\printtext[{#2date}]{% \datecircaprint - % Such a season component can only come from an ISO8601 season which replaces + % Such a year division component can only come from an ISO8601 year division which replaces % a normal month so if it exists, we know that a normal date print is ruled out - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% % Optionally print the time after the date \blx@printtime{#2}{}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}}% \dateuncertainprint \dateeraprint{#2year}% \iffieldundef{#2endyear} @@ -5847,11 +5989,11 @@ \mbox{\bibdaterangesep}} {\bibdaterangesep \enddatecircaprint - \iffieldundef{#2endseason} + \iffieldundef{#2endyeardivision} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% % Optionally print the time after the date \blx@printtime{#2}{end}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% + {\csuse{mkbibyeardivisiondate#1}{#2endyear}{#2endyeardivision}}}% \printfield{extradate}% \enddateuncertainprint \dateeraprint{#2endyear}}}}% @@ -5869,9 +6011,9 @@ {\blx@nounit} {\printtext[{#2date}]{% \datecircaprint - % Such a season component can only come from an ISO8601 season which replaces + % Such a year division component can only come from an ISO8601 year division which replaces % a normal month so if it exists, we know that a normal date print is ruled out - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\ifdateyearsequal{#2}{#2end} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{}{}{#2day}} @@ -5880,8 +6022,8 @@ \iffieldsequal{#2dateera}{#2enddateera}{} {\dateeraprint{#2year}}}} {\ifdateyearsequal{#2}{#2end} - {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}% + {\csuse{mkbibyeardivisiondate#1}{}{#2yeardivision}} + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}% \iffieldsequal{#2dateera}{#2enddateera}{} {\dateeraprint{#2year}}}}% \dateuncertainprint @@ -5891,9 +6033,9 @@ {\mbox{\bibdaterangesep}} {\bibdaterangesep \enddatecircaprint - \iffieldundef{#2endseason} + \iffieldundef{#2endyeardivision} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + {\csuse{mkbibyeardivisiondate#1}{#2endyear}{#2endyeardivision}}% \enddateuncertainprint \dateeraprint{#2endyear}}}}}% \endgroup} @@ -5910,9 +6052,9 @@ {\blx@nounit} {\printtext[{#2date}]{% \datecircaprint - % Such a season component can only come from an ISO8601 season which replaces + % Such a year division component can only come from an ISO8601 year division which replaces % a normal month so if it exists, we know that a normal date print is ruled out - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\ifdateyearsequal{#2}{#2end} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{}{}{#2day}} @@ -5921,8 +6063,8 @@ \iffieldsequal{#2dateera}{#2enddateera}{} {\dateeraprint{#2year}}}} {\ifdateyearsequal{#2}{#2end} - {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}% + {\csuse{mkbibyeardivisiondate#1}{}{#2yeardivision}} + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}% \iffieldsequal{#2dateera}{#2enddateera}{} {\dateeraprint{#2year}}}}% \dateuncertainprint @@ -5933,9 +6075,9 @@ \mbox{\bibdaterangesep}} {\bibdaterangesep \enddatecircaprint - \iffieldundef{#2endseason} + \iffieldundef{#2endyeardivision} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% + {\csuse{mkbibyeardivisiondate#1}{#2endyear}{#2endyeardivision}}}% \printfield{extradate}% \enddateuncertainprint \dateeraprint{#2endyear}}}}% @@ -5943,14 +6085,14 @@ \newrobustcmd*{\mkdaterangeyear}[1]{% \begingroup - \blx@imc@clearfield{#1season}% + \blx@imc@clearfield{#1yeardivision}% \blx@imc@clearfield{#1month}% \blx@imc@clearfield{#1day}% \blx@imc@clearfield{#1hour}% \blx@imc@clearfield{#1minute}% \blx@imc@clearfield{#1second}% \blx@imc@clearfield{#1timezone}% - \blx@imc@clearfield{#1endseason}% + \blx@imc@clearfield{#1endyeardivision}% \blx@imc@clearfield{#1endmonth}% \blx@imc@clearfield{#1endday}% \blx@imc@clearfield{#1endhour}% @@ -5971,13 +6113,13 @@ {\blx@nounit} {\printtext[{#1date}]{% \datecircaprint - % Such a season component can only come from an ISO8601 season which replaces + % Such a year division component can only come from an ISO8601 year division which replaces % a normal month so if it exists, we know that a normal date print is ruled out - \iffieldundef{#1season} + \iffieldundef{#1yeardivision} {\blx@ymddate{#1}{}% % Optionally print the time after the date \blx@printtime{#1}{}} - {\csuse{mkbibseasondateshort}{#1year}{#1season}}% + {\csuse{mkbibyeardivisiondateshort}{#1year}{#1yeardivision}}% \dateuncertainprint \dateeraprint{#1year}% \iffieldundef{#1endyear} @@ -5986,11 +6128,11 @@ {\mbox{\bibdaterangesep}} {\bibdaterangesep \enddatecircaprint - \iffieldundef{#1season} + \iffieldundef{#1yeardivision} {\blx@ymddate{#1}{end}% % Optionally print the time after the date \blx@printtime{#1}{end}} - {\csuse{mkbibseasondateshort}{#1endyear}{#1endseason}}% + {\csuse{mkbibyeardivisiondateshort}{#1endyear}{#1endyeardivision}}% \enddateuncertainprint \dateeraprint{#1endyear}}}}}% \endgroup} @@ -6003,13 +6145,13 @@ {\blx@nounit} {\printtext[{#1date}]{% \datecircaprint - % Such a season component can only come from an ISO8601 season which replaces + % Such a year division component can only come from an ISO8601 year division which replaces % a normal month so if it exists, we know that a normal date print is ruled out - \iffieldundef{#1season} + \iffieldundef{#1yeardivision} {\blx@ymddate[extradate]{#1}{}% % Optionally print the time after the date \blx@printtime{#1}{}} - {\csuse{mkbibseasondateshort}{#1year}{#1season}}% + {\csuse{mkbibyeardivisiondateshort}{#1year}{#1yeardivision}}% \dateuncertainprint \dateeraprint{#1year}% \iffieldundef{#1endyear} @@ -6018,11 +6160,11 @@ {\mbox{\bibdaterangesep}} {\bibdaterangesep \enddatecircaprint - \iffieldundef{#1season} + \iffieldundef{#1yeardivision} {\blx@ymddate{#1}{end}% % Optionally print the time after the date \blx@printtime{#1}{end}} - {\csuse{mkbibseasondateshort}{#1endyear}{#1endseason}}}% + {\csuse{mkbibyeardivisiondateshort}{#1endyear}{#1endyeardivision}}}% \enddateuncertainprint \dateeraprint{#1endyear}}}}% \endgroup} @@ -6036,14 +6178,14 @@ \newrobustcmd*{\mkdaterangeyearextra}[1]{% \begingroup - \blx@imc@clearfield{#1season}% + \blx@imc@clearfield{#1yeardivision}% \blx@imc@clearfield{#1month}% \blx@imc@clearfield{#1day}% \blx@imc@clearfield{#1hour}% \blx@imc@clearfield{#1minute}% \blx@imc@clearfield{#1second}% \blx@imc@clearfield{#1timezone}% - \blx@imc@clearfield{#1endseason}% + \blx@imc@clearfield{#1endyeardivision}% \blx@imc@clearfield{#1endmonth}% \blx@imc@clearfield{#1endday}% \blx@imc@clearfield{#1endhour}% @@ -6124,14 +6266,14 @@ \newrobustcmd*{\blx@isodate}[3][]{% \dateeraprintpre{#2#3year}% \blx@imc@forcezerosy{\thefield{#2#3year}}\ifblank{#1}{}{\printfield{#1}}% - % Such a season component can only come from an ISO8601 season which replaces + % Such a year division component can only come from an ISO8601 year division which replaces % a normal month so if it exists, we know that a normal date print is ruled out - \iffieldundef{#2#3season} + \iffieldundef{#2#3yeardivision} {\iffieldundef{#2#3month}{}{\hyphen\blx@imc@forcezerosmdt{\thefield{#2#3month}}}% \iffieldundef{#2#3day}{}{\hyphen\blx@imc@forcezerosmdt{\thefield{#2#3day}}}} - {\hyphen\blx@seasonmap{\thefield{#2#3season}}}} + {\hyphen\blx@yeardivisionmap{\thefield{#2#3yeardivision}}}} -\def\blx@seasonmap#1{% +\def\blx@yeardivisionmap#1{% \blx@xifstrequal{#1}{spring}{21} {\blx@xifstrequal{#1}{summer}{22} {\blx@xifstrequal{#1}{autumn}{23} @@ -6259,29 +6401,39 @@ {\space\bibtimezonesep \mkbibparens{\mkbibtimezone{\thefield{#4}}}}} -\newrobustcmd*{\mkbibseasondateshort}[2]{% +\newrobustcmd*{\mkbibyeardivisiondateshort}[2]{% \blx@warning@noline{% - Using fallback definition for \string\mkbibseasondateshort.\MessageBreak + Using fallback definition for \string\mkbibyeardivisiondateshort.\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 + for \string\mkbibyeardivisiondateshort }% - \mkbibseason{\thefield{#2}}% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}} +\def\mkbibseasondateshort{% LEGACY + \blx@warning@noline{% + '\string\mkbibseasondateshort' is deprecated in favour of\MessageBreak + '\string\mkbibyeardivisiondateshort'}% + \mkbibyeardivisiondateshort} -\newrobustcmd*{\mkbibseasondatelong}[2]{% +\newrobustcmd*{\mkbibyeardivisiondatelong}[2]{% \blx@warning@noline{% - Using fallback definition for \string\mkbibseasondatelong.\MessageBreak + Using fallback definition for \string\mkbibyeardivisiondatelong.\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 + for \string\mkbibyeardivisiondatelong }% - \mkbibseason{\thefield{#2}}% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}} +\def\mkbibseasondatelong{% LEGACY + \blx@warning@noline{% + '\string\mkbibseasondatelong' is deprecated in favour of\MessageBreak + '\string\mkbibyeardivisiondatelong'}% + \mkbibyeardivisiondatelong} \newrobustcmd*{\bibdatedash}{\bibrangedash} \newrobustcmd*{\finalandcomma}{} @@ -6300,7 +6452,12 @@ \newrobustcmd*{\mkbibfemord}{\mkbibordinal} \newrobustcmd*{\mkbibneutord}{\mkbibordinal} % the following is usually not redefined in an .lbx -\newrobustcmd*{\mkbibseason}[1]{\abx@bibseason{#1}} +\newrobustcmd*{\mkbibyeardivision}[1]{\abx@bibyeardivision{#1}} +\newrobustcmd*\mkbibseason{% LEGACY + \blx@warning@noline{% + '\string\mkbibseason' is deprecated in favour of\MessageBreak + '\string\mkbibyeardivision'}% + \mkbibyeardivision} \newrobustcmd*{\mkbibmonth}[1]{% \ifcase0#1\relax \blx@warning@entry{Month out of range or not an integer}% @@ -6455,6 +6612,7 @@ \let\blx@hook@initlang\@empty \let\blx@imc@mainlang\@empty \let\blx@imc@textmainlang\@firstofone +\let\blx@imc@textouterlang\@firstofone \def\blx@hyphenreset{% \blx@ifhyphenationundef{\blx@languagename} {} @@ -6475,6 +6633,7 @@ {No default 'babel' language defined} {You must define a default language for 'babel'}} {\let\blx@main@language\bbl@main@language}% + \let\blx@outer@language\blx@main@language % use afterreset to get in a bit earlier % we want to be there before \captions... is issued % beforeextras is before extras, but captions come before extras @@ -6486,6 +6645,11 @@ {\def\blx@beglang{% \blx@clearlang \begingroup + % track outer language (i.e. language not selected by biblatex) + \ifundef\blx@outer@language@set + {\let\blx@outer@language\blx@languagename + \let\blx@outer@language@set\@empty} + {}% % Need to override all entries, regardless of if there is a % langid if language=<language> option is given \ifboolexpr { test {\ifdef\abx@field@langid } @@ -6528,6 +6692,8 @@ \expandafter\selectlanguage\expandafter{\blx@main@language}}% \def\blx@imc@textmainlang##1{% {{\expandafter\selectlanguage\expandafter{\blx@main@language}##1}}}% + \def\blx@imc@textouterlang##1{% + {{\expandafter\selectlanguage\expandafter{\blx@outer@language}##1}}}% \expandafter\blx@langsetup@from@pkglist\expandafter{\blx@main@language}% } @@ -6541,6 +6707,7 @@ {You must define a default language for 'polyglossia'}} {\let\blx@main@language\bbl@main@language}} {\let\blx@main@language\mainbabelname}% + \let\blx@outer@language\blx@main@language \ifundef\polyglossia@language@switched {\apptocmd\select@language {\expandafter\blx@langsetup@indoc\expandafter{\babelname}} @@ -6553,6 +6720,11 @@ {\def\blx@beglang{% \blx@clearlang \begingroup + % track outer language (i.e. language not selected by biblatex) + \ifundef\blx@outer@language@set + {\let\blx@outer@language\blx@languagename + \let\blx@outer@language@set\@empty} + {}% % Need to override all entries, regardless of if there is a % langid if language=<language> option is given \ifboolexpr { test {\ifdef\abx@field@langid } @@ -6603,6 +6775,7 @@ {}% \select@language{\blx@main@language}}% \def\blx@imc@textmainlang##1{{{\select@language{\blx@main@language}##1}}}% + \def\blx@imc@textouterlang##1{{{\select@language{\blx@outer@language}##1}}}% \expandafter\blx@langsetup@from@pkglist\expandafter{\blx@main@language}} \def\blx@mknoautolang{% @@ -6610,7 +6783,7 @@ {} {\blx@err@nolang{\blx@languagename}}} -\blx@regimcs{\mainlang \textmainlang} +\blx@regimcs{\mainlang \textmainlang \textouterlang} \newrobustcmd*{\DeclareRedundantLanguages}[2]{% \begingroup @@ -6962,6 +7135,7 @@ \listxadd\blx@datemetafields{#1dateunspecified}} \abx@dodatetypes + \def\do#1{% \listxadd\blx@datemetabooleans{#1datecirca}% \listxadd\blx@datemetabooleans{#1enddatecirca}% @@ -7003,8 +7177,8 @@ \do{labelendsecond}% \do{labeltimezone}% \do{labelendtimezone}% - \do{labelseason}% - \do{labelendseason}% + \do{labelyeardivision}% + \do{labelendyeardivision}% \do{entrykey}% \do{entryset}% \do{entrysetcount}% @@ -8120,8 +8294,8 @@ \letcs\abx@field@labelendsecond{abx@field@\abx@field@labeldatesource endsecond}% \letcs\abx@field@labeltimezone{abx@field@\abx@field@labeldatesource timezone}% \letcs\abx@field@labelendtimezone{abx@field@\abx@field@labeldatesource endtimezone}% - \letcs\abx@field@labelseason{abx@field@\abx@field@labeldatesource season}% - \letcs\abx@field@labelendseason{abx@field@\abx@field@labeldatesource endseason}% + \letcs\abx@field@labelyeardivision{abx@field@\abx@field@labeldatesource yeardivision}% + \letcs\abx@field@labelendyeardivision{abx@field@\abx@field@labeldatesource endyeardivision}% \letcs\abx@field@labeldateunspecified{abx@field@\abx@field@labeldatesource dateunspecified}% \letcs\etb@tgl@abx@bool@labeldatecirca{etb@tgl@abx@bool@\abx@field@labeldatesource datecirca}% \letcs\etb@tgl@abx@bool@labelenddatecirca{etb@tgl@abx@bool@\abx@field@labeldatesource enddatecirca}% @@ -8244,7 +8418,7 @@ % so that biber can correctly use and resolve them too. \protected\def\blx@bbl@keyalias#1#2{% \csxdef{blx@keyalias@\the\c@refsection @#1}{\detokenize{#2}}% - \listcsgadd{blx@keyaliases@\the\c@refsection}{#1}} + \listcsxadd{blx@keyaliases@\the\c@refsection}{\detokenize{#1}}} % blx@dlist@list@<section>@<refcontext> - a list of list items in a refcontext in a % section (for tracking bibliography lists, @@ -8266,7 +8440,7 @@ \blx@setoptions@entry \edef\blx@bbl@data{blx@data@\the\c@refsection @\blx@dlist@name @\abx@field@entrykey}% \blx@bbl@addfield{entrykey}{\abx@field@entrykey}% - \listxadd\blx@entries{\abx@field@entrykey}% + \listcsxadd{blx@entries@\the\c@refsection}{\abx@field@entrykey}% \blx@bbl@addfield{entrytype}{#2}% \csuse\blx@bbl@data \blx@imc@iffieldundef{options} @@ -8284,14 +8458,14 @@ \toggletrue{blx@skipbib}% \toggletrue{blx@skipbiblist}% \toggletrue{blx@skiplab}}% - \nottoggle{blx@skipbib} - {\expandafter\ifstrequal\expandafter{\blx@dlist@type}{entry} + \expandafter\ifstrequal\expandafter{\blx@dlist@type}{entry} + {\listcsxadd{blx@type@\the\c@refsection @\abx@field@entrytype}{\abx@field@entrykey}% + \ifdef\abx@field@entrysubtype + {\listcsxadd{blx@subt@\the\c@refsection @\abx@field@entrysubtype}{\abx@field@entrykey}} + {}% + \nottoggle{blx@skipbib} {\listcsxadd{blx@dlist@entry@\the\c@refsection @\blx@dlist@name}{\abx@field@entrykey}% - \listcsxadd{blx@dlist@centry@\the\c@refsection @\blx@dlist@name}{\abx@field@entrykey}% - \listcsxadd{blx@type@\the\c@refsection @\abx@field@entrytype}{\abx@field@entrykey}% - \ifdef\abx@field@entrysubtype - {\listcsxadd{blx@subt@\the\c@refsection @\abx@field@entrysubtype}{\abx@field@entrykey}} - {}} + \listcsxadd{blx@dlist@centry@\the\c@refsection @\blx@dlist@name}{\abx@field@entrykey}} {}}% {}% \nottoggle{blx@skipbiblist} @@ -8361,13 +8535,11 @@ \csgdef{blx@locallabelwidth@#1@#2}{#3}} \def\blx@locallabelwidth@write@length#1{% - \ifdimequal{\csname local#1width\endcsname}{0pt} - {} - {\blx@auxwrite\@mainaux{} - {\string\abx@aux@locallabelwidth - {\the\blx@biblioinstance}% - {#1}% - {\the\csname local#1width\endcsname}}}} + \blx@auxwrite\@mainaux{} + {\string\abx@aux@locallabelwidth + {\the\blx@biblioinstance}% + {#1}% + {\the\csname local#1width\endcsname}}} \def\blx@locallabelwidth@write{% \let\do\blx@locallabelwidth@write@length @@ -8603,21 +8775,39 @@ \let\annotation\blx@bbl@annotationdef} \def\blx@bblend{% + \def\blx@do@outer##1{% + \ifcsundef{blx@prelim@lastcites@##1} + {} + {\def\blx@do@inner####1{% + \ifinlistcs{####1}{blx@keyaliases@##1} + {\listcsxadd{blx@lastcites@##1} + {\csuse{blx@keyalias@##1@####1}}} + {\listcsgadd{blx@lastcites@##1}{####1}}}% + \forlistcsloop\blx@do@inner{blx@prelim@lastcites@##1}}}% + \forlistloop\blx@do@outer\blx@alllastrefsections % Special warning for defernumbers when a citation cannot be found \iftoggle{blx@defernumbers} - {\def\do##1{\ifinlist{##1}\blx@entries - {} - {\blx@warning@noline{% - citation '##1' was not found at all in the .bbl, bibliography labels cannot be generated, please correct the citation}}}% - \dolistloop\blx@lastcites} + {\def\blx@do@outer##1{% + \ifcsundef{blx@lastcites@##1} + {} + {\def\blx@do@inner####1{% + \ifinlistcs{####1}{blx@entries@##1} + {} + {\blx@warning@noline{% + citation '####1'\MessageBreak + was not found at all in the .bbl file,\MessageBreak + bibliography labels cannot be generated,\MessageBreak + please correct the citation}}}% + \forlistcsloop\blx@do@inner{blx@lastcites@##1}}}% + \forlistloop\blx@do@outer\blx@alllastrefsections} {}} % {<entrykey>} % Get the saved information on which citations were mentioned last run -\protected\def\abx@aux@cite#1{% - \xifinlist{\detokenize{#1}}\blx@lastcites +\protected\def\abx@aux@cite#1#2{% + \xifinlistcs{\detokenize{#2}}{blx@prelim@lastcites@#1} {} - {\listxadd\blx@lastcites{\detokenize{#1}}}} + {\listcsxadd{blx@prelim@lastcites@#1}{\detokenize{#2}}}} % {<refcontext>} % Get the saved information on which refcontexts were mentioned last run @@ -8637,7 +8827,7 @@ % .aux file as this means that deferred numbering is % complete. Otherwise we get in an endless rerun loop because the % checksum due to number changes is always different. -\AtEndDocument{% +\blx@AtEndDocument{% \def\abx@aux@number#1#2#3#4#5{% \ifblank{#5} {} @@ -8645,7 +8835,7 @@ {\blx@addchecksum{#1}{#5}} {}}}} -\AtEndDocument{% +\blx@AtEndDocument{% % Here we run some tests to decide if we need to issue re-run % messages in certain circumstances. In general, if we add/remove % any citations or add/remove any sorting templates, we need to re-run @@ -8656,15 +8846,29 @@ % information which are no longer in the .bbl. This is to catch % when .bib entries are removed when using \nocite{*}. In this case, % We need another run to remove the .aux localnumber info - \def\do#1{\xifinlist{#1}\blx@entries{}{\blx@rerun@latex}}% - \dolistloop\blx@localnumbers + \def\blx@do@outer#1{% + \def\blx@do@inner##1{% + \xifinlistcs{##1}{blx@entries@#1} + {} + {\blx@rerun@latex + \listbreak}}% + \forlistloop\blx@do@inner\blx@localnumbers}% + \forlistloop\blx@do@outer\blx@allrefsections % Test to see if we *removed* any citations since last run % (adding citations is dealt with naturally in \blx@citation@entry) % If so, give a rerun biber message. This also sets the % rerun biber toggle so defernums doesn't consume the localnumbers % in the .aux but instead, re-writes them, which is what we need. - \def\do#1{\ifinlist{#1}\blx@cites{}{\blx@logreq@active{}}\relax}% - \dolistloop\blx@lastcites + \def\blx@do@outer#1{% + \ifcsundef{blx@lastcites@#1} + {} + {\def\blx@do@inner##1{% + \ifinlistcs{##1}{blx@cites@#1} + {} + {\blx@logreq@active{}% + \listbreak}}% + \forlistcsloop\blx@do@inner{blx@lastcites@#1}}}% + \forlistloop\blx@do@outer\blx@alllastrefsections % Special case - if we are using sortingtemplate with \citeorder anywhere, % then changes in citation order matter and we need to re-run biber. % So a special test to see if the cites from last run are identical in order. @@ -8681,10 +8885,36 @@ \listbreak}}% \dolistloop\blx@sortingtemplatenames \iftoggle{blx@tempa} - {\ifdefstrequal{\blx@cites}{\blx@lastcites} - {} - {\blx@logreq@active{}}} + {\ifdefstrequal\blx@allrefsections\blx@alllastrefsections + {\def\do#1{% + \ifcsundef{blx@cites@#1} + {\cslet{blx@cites@#1}\@empty} + {}% + \ifcsundef{blx@lastcites@#1} + {\cslet{blx@lastcites@#1}\@empty} + {}% + \ifcsstrequal{blx@cites@#1}{blx@lastcites@#1} + {} + {\blx@logreq@active{}% + \listbreak}}% + \dolistloop\blx@allrefsections} + {\blx@logreq@active{}}} {}% + % if citecount is enabled we pass the counter on to Biber via the bcf + % for sorting, we need to rerun if anything here changed + \ifundef\blx@citecounter + {} + {\def\blx@do@outer#1{% + \ifcsundef{blx@cites@#1} + {} + {\def\blx@do@inner##1{% + \ifnumequal{0\csuse{blx@currcount@#1@\detokenize{##1}}} + {0\csuse{blx@count@#1@\detokenize{##1}}} + {} + {\blx@logreq@active{}% + \listbreak}}% + \forlistcsloop\blx@do@inner{blx@cites@#1}}}% + \forlistloop\blx@do@outer\blx@allrefsections}% % Test if we removed any mention of a reference context since last run % If we did, we need to re-run biber \def\do#1{\ifinlist{#1}\blx@refcontexts{}{\blx@logreq@active{}}\relax}% @@ -8729,7 +8959,9 @@ \blx@bbl@addentryfield{\detokenize{#2}}{#3}{localnumber}{#4}{#5}% \blx@bbl@addentryfield{\detokenize{#2}}{#3}{labelnumber}{#4}{#5}% \csgdef{blx@localnumber@#3@\detokenize{#2}}{#5}% - \xifinlist{\detokenize{#2}}\blx@localnumbers{}{\listxadd\blx@localnumbers{\detokenize{#2}}}% + \xifinlistcs{\detokenize{#2}}{blx@localnumbers@#3} + {} + {\listcsxadd{blx@localnumbers@#3}{\detokenize{#2}}}% \global\toggletrue{blx@localnumber}% \ifblank{#5} {} @@ -8894,7 +9126,10 @@ % {<name>}{<text>} \newrobustcmd*{\defbibnote}[1]{% - \long\csdef{blx@note@#1}} + \blx@defbibnote{#1}} + +\long\def\blx@defbibnote#1#2{% + \long\csdef{blx@note@#1}{#2}} % {<name>}{<code>} \newrobustcmd*{\defbibfilter}[2]{% @@ -9375,7 +9610,7 @@ \newrobustcmd*{\bibbysection}{% \begingroup \delimcontext{bib}% - \ifnum\blx@maxsection=\z@ + \ifnum\c@blx@maxsection=\z@ \blx@warning{No reference sections found}% \fi \edef\on@line{\on@line}% @@ -9403,7 +9638,7 @@ {\toggletrue{blx@tempa}% \begingroup \expandafter\blx@bibliography\csname blx@dlist@entry@\the\c@refsection @\blx@refcontext@context\endcsname}% - \ifnum\c@refsection<\blx@maxsection + \ifnum\c@refsection<\c@blx@maxsection \advance\c@refsection\@ne \expandafter\blx@refsections \else @@ -9416,7 +9651,7 @@ \begingroup \delimcontext{bib}% \edef\on@line{\on@line}% - \ifnum\csname blx@maxsegment@\the\c@refsection\endcsname=\z@ + \ifnum\csname c@blx@maxsegment@\the\c@refsection\endcsname=\z@ \blx@warning{No reference segments found}% \fi \@ifnextchar[%] @@ -9448,7 +9683,7 @@ {\letcs\blx@tempa{blx@dlist@entry@\the\c@refsection @\blx@refcontext@context}}% \blx@filter\blx@tempa{blx@segm@\the\c@refsection @\the\c@refsegment}% \blx@bibliography\blx@tempa}% - \ifnum\c@refsegment<\csname blx@maxsegment@\the\c@refsection\endcsname + \ifnum\c@refsegment<\csname c@blx@maxsegment@\the\c@refsection\endcsname \advance\c@refsegment\@ne \expandafter\blx@refsegments \else @@ -9632,35 +9867,31 @@ % bibliography list in standard cases where entries are not listed in % multiple bibliographies \def\blx@setdefaultrefcontext#1{% - \ifbool{refcontextdefaults} - {\blx@rerun@latex}% - {}% \ifinlistcs{#1}{blx@defaultrefcontexts@\the\c@refsection} {} {\listcsgadd{blx@defaultrefcontexts@\the\c@refsection}{#1}}% - \csxdef{blx@assignedrefcontextbib@\the\c@refsection @#1}{\blx@refcontext@context}} + \global\cslet{blx@assignedrefcontextbib@\the\c@refsection @#1}% + \blx@refcontext@context} % <refsection><key><refcontext> \def\abx@aux@defaultrefcontext#1#2#3{% - \global\boolfalse{refcontextdefaults}% - \csxdef{blx@assignedrefcontextbib@#1@#2}{\detokenize{#3}}} -\def\abx@aux@refcontextdefaultsdone{% - \global\boolfalse{refcontextdefaults}} + \csxdef{blx@assignedrefcontextbib@aux@#1@#2}{\detokenize{#3}}} % \abx@aux@defaultlabelprefix is a dummy only used by BibTeX to implement a % simple labelprefix not based on full refcontexts, which BibTeX does not % support. \let\abx@aux@defaultlabelprefix\@gobblethree -\AtEndDocument{% - % write the .aux to say we don't need to re-run to consume refcontext defaults - \ifbool{refcontextdefaults} - {} - {\blx@auxwrite\@mainaux{}{\string\abx@aux@refcontextdefaultsdone}}% +\blx@AtEndDocument{% % always add default refcontext declarations to .aux after biber run \iftoggle{blx@bbldone} {\def\do#1{% \begingroup \def\do##1{% - \blx@auxwrite\@mainaux{}{\string\abx@aux@defaultrefcontext{#1}{##1}{\csuse{blx@assignedrefcontextbib@#1@##1}}}}% + \blx@auxwrite\@mainaux{}{\string\abx@aux@defaultrefcontext{#1}{##1}{% + \csuse{blx@assignedrefcontextbib@#1@##1}}}% + \ifcsequal{blx@assignedrefcontextbib@#1@##1} + {blx@assignedrefcontextbib@aux@#1@##1} + {} + {\blx@rerun@latex}}% \dolistcsloop{blx@defaultrefcontexts@#1}% \endgroup} \dolistloop\blx@allrefsections} @@ -9735,7 +9966,7 @@ \fi \blx@addpagesum{#1}{#2}} -\AtEndDocument{% +\blx@AtEndDocument{% \def\abx@aux@page#1#2{\blx@addpagesum{#1}{#2}}% \def\abx@aux@fnpage#1#2{\blx@addpagesum{#1}{#2}}} @@ -10156,16 +10387,16 @@ \def\blx@refsection@i[#1]{% \endgroup - \global\advance\blx@maxsection\@ne - \global\c@refsection\blx@maxsection + \stepcounter{blx@maxsection}% + \setcounter{refsection}{\value{blx@maxsection}}% \xifinlist{\the\c@refsection}\blx@allrefsections {} {\listxadd\blx@allrefsections{\the\c@refsection}}% \ifcsdef{blx@defaultrefcontexts@\the\c@refsection} {} {\global\cslet{blx@defaultrefcontexts@\the\c@refsection}\@empty}% - \expandafter\newcount\csname blx@maxsegment@\the\c@refsection\endcsname - \expandafter\newcount\csname blx@sectionciteorder@\the\c@refsection\endcsname + \blx@providecounter{blx@maxsegment@\the\c@refsection}% + \blx@providecounter{blx@sectionciteorder@\the\c@refsection}% \blx@inf@refsec \blx@secinit \if@filesw @@ -10213,21 +10444,36 @@ \def\blx@endrefsection{% \blx@endrefsegment + \blx@providecounter{blx@sectionciteorder@\the\c@refsection}% % make sure we always output aliases to the .bcf otherwise after their % first resolution by biber, they will be invisible to subsequent biber % runs since biblatex will resolve the \keyalias{} macro to the main % entry key, biber won't put \keyalias{}in the .bbl on subsequent runs % and biblatex will report a missing citekey \def\do##1{% + \blx@xmlsanitizeafter{\def\blx@tempa}{##1}% % 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 - \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}}}% - \dolistcsloop{blx@keyaliases@\the\c@refsection}% + \stepcounter{blx@sectionciteorder@\the\c@refsection}% + \blx@auxwrite\blx@bcfout{}{% + \blx@xml@citekey{\blx@tempa}{} + {\expandafter\the\csname c@blx@sectionciteorder@\the\c@refsection\endcsname}}}% + \ifcsundef{blx@keyaliases@\the\c@refsection} + {} + {\dolistcsloop{blx@keyaliases@\the\c@refsection}}% + % output key counts (for \citecount sorting) if citecounter option is not false + \ifcsundef{blx@cites@\the\c@refsection} + {} + {\ifundef\blx@citecounter + {} + {\def\do##1{% + \ifcsundef{blx@currcount@\the\c@refsection @##1} + {\csdef{blx@currcount@\the\c@refsection @##1}{0}} + {}% + \blx@auxwrite\blx@bcfout{} + {\blx@xml@citekeycount{##1}{\csuse{blx@currcount@\the\c@refsection @##1}}}}}% + \dolistcsloop{blx@cites@\the\c@refsection}}% \ifnum\c@refsection>\z@ \blx@auxwrite\blx@bcfout{}{% \blx@xml@endsection\blx@nl @@ -10236,7 +10482,7 @@ \fi \global\c@refsection\z@} -\AtEndDocument{% +\blx@AtEndDocument{% \endrefcontext % close non-0 refsection if active \ifnum\c@refsection>\z@ @@ -10247,8 +10493,9 @@ \def\abx@aux@refsection#1#2{\blx@addchecksum{#1}{#2}}} \protected\def\abx@aux@refsection#1#2{% - \ifnum#1>\blx@maxsection - \global\blx@maxsection#1\relax + \listgadd\blx@alllastrefsections{#1}% + \ifnum#1>\c@blx@maxsection + \setcounter{blx@maxsection}{#1}% \fi \blx@addchecksum{#1}{#2}} @@ -10265,8 +10512,8 @@ \blx@err@nestenv{refsegment}% \blx@endrefsegment \fi - \global\advance\csname blx@maxsegment@\the\c@refsection\endcsname\@ne - \global\c@refsegment\csname blx@maxsegment@\the\c@refsection\endcsname + \stepcounter{blx@maxsegment@\the\c@refsection}% + \setcounter{refsegment}{\value{blx@maxsegment@\the\c@refsection}}% \blx@inf@refseg \blx@info{Setting label 'refsegment:\the\c@refsection\the\c@refsegment'}% \label{refsegment:\the\c@refsection\the\c@refsegment}% @@ -10599,7 +10846,7 @@ {} {\listcsxadd{blx@catg@#1}{\detokenize{#2}}}} -\AtEndDocument{\let\abx@aux@category\@gobbletwo} +\blx@AtEndDocument{\let\abx@aux@category\@gobbletwo} % [<options>]{<resource>,...} \renewrobustcmd*{\bibliography}[1]{% @@ -10829,10 +11076,10 @@ \def\blx@citation@entry#1#2{% \blx@bibreq{#1}% - \ifinlist{#1}\blx@cites + \ifinlistcs{#1}{blx@cites@\the\c@refsection} {} - {\listgadd{\blx@cites}{#1}}% - \blx@auxwrite\@mainaux{}{\string\abx@aux@cite{#1}}% + {\listcsgadd{blx@cites@\the\c@refsection}{#1}}% + \blx@auxwrite\@mainaux{}{\string\abx@aux@cite{\the\c@refsection}{#1}}% \ifinlistcs{#1}{blx@segm@\the\c@refsection @\the\c@refsegment} {} {\listcsgadd{blx@segm@\the\c@refsection @\the\c@refsegment}{#1}}% @@ -10843,7 +11090,7 @@ {} {\ifcsdef{blx@miss@\the\c@refsection} {\ifinlistcs{#1}{blx@miss@\the\c@refsection} - {} + {\@latex@warning{#2{#1}}} {\blx@logreq@active{#2{#1}}}} {\blx@logreq@active{#2{#1}}}}% \blx@hook@entrykey{#1}} @@ -10891,11 +11138,11 @@ % ignores all other citekeys in the section if citeall is present \ifstrequal{*}{#1} {\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}}}% + {\blx@auxwrite\blx@bcfout{}{\blx@xml@citekey{\blx@tempa}{\blx@tempb}{% + \expandafter\the\csname c@blx@sectionciteorder@\the\c@refsection\endcsname}}}% \endgroup} % {<set>}{<key1,key2,key3>} - \newrobustcmd*{\defbibentryset}[2]{% \@bsphack \begingroup @@ -10947,10 +11194,8 @@ % 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 - \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@providecounter{blx@sectionciteorder@\the\c@refsection}% + \stepcounter{blx@sectionciteorder@\the\c@refsection}% \blx@tempcnta\z@ \blx@tempcntb\z@ \let\blx@tempa\@empty @@ -11018,8 +11263,8 @@ % made (a bit strangely but some styles do this) inside a biblist % which never appear in any printed bib/biblist and therefore have no default % refcontext defined - \ifcsdef{blx@assignedrefcontextbib@\the\c@refsection @#1} - {\letcs\blx@refcontext@context{blx@assignedrefcontextbib@\the\c@refsection @#1}} + \ifcsdef{blx@assignedrefcontextbib@aux@\the\c@refsection @#1} + {\letcs\blx@refcontext@context{blx@assignedrefcontextbib@aux@\the\c@refsection @#1}} {\blx@edef@refcontext{\blx@sorting/global//global/global}}% % assignment via keyword list \ifdef\blx@assignedrefcontextkeywlist @@ -11118,7 +11363,8 @@ \def\blx@citecounter@global{% \ifbool{@filesw} {\ifbool{citetracker} - {\immediate\write\@mainaux{% + {\abx@curr@count{\the\c@refsection}{\abx@field@entrykey}% + \immediate\write\@mainaux{% \string\abx@aux@count {\the\c@refsection}{\abx@field@entrykey}}} {}} @@ -11127,7 +11373,11 @@ \def\blx@citecounter@context{% \ifbool{@filesw} {\ifbool{citetracker} - {\immediate\write\@mainaux{% + {\iftoggle{blx@footnote} + {\abx@curr@fncount} + {\abx@curr@count} + {\the\c@refsection}{\abx@field@entrykey}% + \immediate\write\@mainaux{% \iftoggle{blx@footnote} {\string\abx@aux@fncount} {\string\abx@aux@count}% @@ -11169,9 +11419,22 @@ \let\abx@aux@count\@gobbletwo \let\abx@aux@fncount\@gobbletwo -\AtEndDocument{% +\protected\def\blx@curr@count#1#2{% + \csnumgdef{blx@currcount@#1@#2}{% + \csuse{blx@currcount@#1@#2}+1}} + +\protected\def\blx@curr@fncount#1#2{% + \csnumgdef{blx@currfncount@#1@#2}{% + \csuse{blx@currfncount@#1@#2}+1}} + +\let\abx@curr@count\@gobbletwo +\let\abx@curr@fncount\@gobbletwo + +\blx@AtEndDocument{% \let\abx@aux@count\@gobbletwo - \let\abx@aux@fncount\@gobbletwo} + \let\abx@aux@fncount\@gobbletwo + \let\abx@curr@count\@gobbletwo + \let\abx@curr@fncount\@gobbletwo} \protected\def\blx@setcitecounter@global{% \c@citecounter0% @@ -11574,7 +11837,7 @@ {\listcsgadd{blx@pref@#3@\detokenize{#2}}{#4}}% \blx@addpagesum{#1}{#5}} -\AtEndDocument{% +\blx@AtEndDocument{% \def\abx@aux@backref#1#2#3#4#5{\blx@addpagesum{#1}{#5}}} % {<true>}{<false>} @@ -11650,10 +11913,8 @@ % 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 - \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@providecounter{blx@sectionciteorder@\the\c@refsection}% + \stepcounter{blx@sectionciteorder@\the\c@refsection}% \blx@nocitation{#1}\blx@msg@cundef} % {<macro>}[<arg1>][<arg2>]{<arg3>} @@ -11763,6 +12024,7 @@ \blx@tempa} \def\blx@defcitecmd@i#1#2{% + \listadd\blx@citecmds{#2}% \blx@checkcitecmd{#2}{#1}% \protected\csdef{#2}{% \blx@citecmdinit @@ -11911,6 +12173,7 @@ \begingroup \escapechar\m@ne \edef\blx@tempa{\endgroup + \listadd\noexpand\blx@citecmds{\string#1}% \protected\def\noexpand#1{% \blx@citecmdinit \noexpand\@ifstar @@ -11930,7 +12193,8 @@ {\unexpanded{#2}}% {\string#3####1}% {\unexpanded{#4}}}% - \protected\long\csdef{blx@mcitei@\string#1}}% + \protected\long\csdef{blx@mcitei@\string#1}% + }% \blx@tempa##1##2##3{##1{##2}##3\endgroup}} % {<command>}{<wrapper>}{<citecmd>}{<delimiter>} => @@ -12108,6 +12372,7 @@ \expandafter{\blx@autopunct}}% \endgroup} +\listadd\blx@citecmds{citename} % [<prenote>][<postnote>]{<entrykey>,...}[<format>]{<namelist>}<punct> \newrobustcmd*{\citename}{\blx@citexpunct{citename}} \long\csdef{blx@cite@citename}#1#2#3#4#5#6{% @@ -12136,6 +12401,8 @@ \blx@citeloop{#3}% \endgroup} + +\listadd\blx@citecmds{citelist} % [<prenote>][<postnote>]{<entrykey>,...}[<format>]{<list>}<punct> \newrobustcmd*{\citelist}{\blx@citexpunct{citelist}} \long\csdef{blx@cite@citelist}#1#2#3#4#5#6{% @@ -12164,6 +12431,7 @@ \blx@citeloop{#3}% \endgroup} +\listadd\blx@citecmds{citefield} % [<prenote>][<postnote>]{<entrykey>,...}[<format>]{<field>}<punct> \newrobustcmd*{\citefield}{\blx@citexpunct{citefield}} @@ -12494,7 +12762,7 @@ \protected\def\blx@errormark{% \rule[0.25ex]{1.25ex}{1.25ex}} -\AtEndDocument{% +\blx@AtEndDocument{% \unless\ifnum\blx@parenlevel@text=\z@ \blx@err@matchparen{% Unbalanced parentheses or brackets in the document body}% @@ -12789,6 +13057,13 @@ \xdef\blx@xml@nosort#1#2{% ~~~~<bcf:nosort field="#1" value="#2"/>\blx@nl} +\xdef\blx@xml@nonamestrings#1{% + ~~<bcf:nonamestrings>\blx@nl + #1% + ~~</bcf:nonamestrings>\blx@nl} +\xdef\blx@xml@nonamestring#1#2{% + ~~~~<bcf:nonamestring field="#1" value="#2"/>\blx@nl} + \xdef\blx@xml@noinits#1{% ~~<bcf:noinits>\blx@nl #1% @@ -12895,6 +13170,8 @@ ~~~~<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@citekeycount#1#2{% + ~~~~<bcf:citekeycount count="#2">#1</bcf:citekeycount>} \xdef\blx@xml@svalue#1#2{% \blx@xml@option{singlevalued}{% ~~~~~~<bcf:key>#1</bcf:key>\blx@nl @@ -13175,6 +13452,13 @@ \blx@xml@nosorts{% \csuse{blx@nosort}}}}% {}% + % nonamestrings + \ifcsdef{blx@nonamestring} + {\eappto\blx@tempa{% + \blx@xml@comment{NONAMESTRING}% + \blx@xml@nonamestrings{% + \csuse{blx@nonamestring}}}}% + {}% % transliteration \ifdefempty\blx@translits {} @@ -13296,6 +13580,20 @@ \eappto\blx@tempa{% \blx@xml@nosort{#1}{#2}}} +% nonamestring +\newrobustcmd*{\DeclareNonamestring}[1]{% + \begingroup + \let\nonamestring\blx@nonamestring@setup + \let\blx@tempa\@empty + #1% + \global\let\blx@nonamestring\blx@tempa + \endgroup} +\@onlypreamble\DeclareNonamestring + +\newcommand*{\blx@nonamestring@setup}[2]{% + \eappto\blx@tempa{% + \blx@xml@nonamestring{#1}{#2}}} + % noinit \newrobustcmd*{\DeclareNoinit}[1]{% \begingroup @@ -13562,6 +13860,10 @@ \appto\blx@tempf{ map\string_match="#1"}} \blx@kv@defkey{blx@sourcemap@step}{matchi}{% characters \appto\blx@tempf{ map\string_matchi="#1"}} +\blx@kv@defkey{blx@sourcemap@step}{matches}{% characters + \appto\blx@tempf{ map\string_matches="#1"}} +\blx@kv@defkey{blx@sourcemap@step}{matchesi}{% characters + \appto\blx@tempf{ map\string_matchesi="#1"}} \blx@kv@defkey{blx@sourcemap@step}{notmatch}{% characters \appto\blx@tempf{ map\string_notmatch="#1"}} \blx@kv@defkey{blx@sourcemap@step}{notmatchi}{% characters @@ -14011,6 +14313,8 @@ \def\citeorder{% \global\cslet{blx@sortingtemplate@citeorder@relevant@#2}\@empty \blx@sortdef@field{citeorder}}% + \def\citecount{% + \blx@sortdef@field{citecount}}% \blx@tempcnta\z@ \let\blx@tempa\@empty #3% @@ -14345,8 +14649,8 @@ \DeclareBibliographyOption[string]{texencoding}{% \ifstrequal{#1}{auto} - {\undef\blx@texencoding} - {\def\blx@texencoding{#1}}} + {\undef\blx@texencoding@fromoption} + {\def\blx@texencoding@fromoption{#1}}} \DeclareBibliographyOption[string]{bibencoding}{% \ifcsdef{blx@bibenc@#1} @@ -14530,9 +14834,9 @@ \DeclareBiblatexOption{global,type,entry}[boolean]{dateabbrev}[true]{% \ifstrequal{#1}{true} {\let\abx@bibmonth\blx@imc@bibsstring - \let\abx@bibseason\blx@imc@bibsstring} + \let\abx@bibyeardivision\blx@imc@bibsstring} {\let\abx@bibmonth\blx@imc@biblstring - \let\abx@bibseason\blx@imc@biblstring}} + \let\abx@bibyeardivision\blx@imc@biblstring}} \DeclareBibliographyOption[string]{sortlocale}{% \edef\blx@sortlocale{\detokenize{#1}}} @@ -14797,18 +15101,25 @@ \let\blx@citecounter\blx@citecounter@global \let\abx@aux@count\blx@aux@count \let\abx@aux@fncount\blx@aux@fncount + \let\abx@curr@count\blx@curr@count + \let\abx@curr@fncount\blx@curr@fncount \booltrue{citetracker}} \def\blx@opt@citecounter@context{% \let\blx@setcitecounter\blx@setcitecounter@context \let\blx@citecounter\blx@citecounter@context \let\abx@aux@count\blx@aux@count \let\abx@aux@fncount\blx@aux@fncount + \let\abx@curr@count\blx@curr@count + \let\abx@curr@fncount\blx@curr@fncount \booltrue{citetracker}} \def\blx@opt@citecounter@false{% \let\blx@setcitecounter\relax \let\blx@citecounter\relax \let\abx@aux@count\@gobbletwo - \let\abx@aux@fncount\@gobbletwo} + \let\abx@aux@fncount\@gobbletwo + \let\abx@curr@count\@gobbletwo + \let\abx@curr@fncount\@gobbletwo + \boolfalse{citetracker}} \DeclareBiblatexOption{global,type,entry}[string]{citetracker}[true]{% \ifcsdef{blx@opt@citetracker@#1} @@ -15133,10 +15444,8 @@ \blx@kv@setkeys{blx@opt@pre}{#1time=24h}% % Boolean to determine if times are printed with dates \newtoggle{blx@#1dateusetime}% - \DeclareBibliographyOption[boolean]{#1dateusetime}{% - \ifstrequal{##1}{true} - {\toggletrue{blx@#1dateusetime}} - {\togglefalse{blx@#1dateusetime}}}} + \DeclareBibliographyOption[boolean]{#1dateusetime}[true]{% + \settoggle{blx@#1dateusetime}{##1}}} \abx@dodatetypes \DeclareBibliographyOption[string]{alldatesusetime}{% @@ -15418,8 +15727,15 @@ \edef\blx@tempa{% \expandafter\blx@tempa\CurrentOption=&}% \blx@kv@ifkeyundef{blx@opt@ldt}{\blx@tempa} - {\endgroup - \eappto\blx@theoptions{\CurrentOption,}} + {% now it becomes messy, + % we need to intercept the bibtexcaseprotection option + % because it is only defined by the case changing code + % which is loaded after load-time options are processed + \ifdefstring\blx@tempa{bibtexcaseprotection} + {\endgroup + \edef\blx@deferoption@bibtexcaseprotection{\CurrentOption}} + {\endgroup + \eappto\blx@theoptions{\CurrentOption,}}} {\edef\blx@tempa{\endgroup \noexpand\blx@kv@setkeys{blx@opt@ldt}{\CurrentOption}}% \blx@tempa}} @@ -15510,7 +15826,16 @@ % Textcase defines \NoCaseChange as \let\NoCaseChange\@firstofone \ifundef\NoCaseChange {\let\NoCaseChange\@firstofone} - {}} + {}% + % we also need to defer the bibtexcaseprotection option until after we load + % the case changing code + \ifundef\blx@deferoption@bibtexcaseprotection + {} + {\begingroup + \edef\blx@tempa{\endgroup + \noexpand\blx@kv@setkeys{blx@opt@pre}{% + \blx@deferoption@bibtexcaseprotection}}% + \blx@tempa}} % That's it for the case change code % Set defaults @@ -15553,7 +15878,6 @@ % Process load-time options \ProcessOptions* - % Switch to BibTeX support if requested \iftoggle{blx@bibtex} {\blx@inputonce{blx-bibtex.def}{BibTeX backend compatibility}{}{}{}{}} @@ -15576,6 +15900,42 @@ % Process preamble options \blx@processoptions +% first stab at guessing the file encoding +\def\blx@guesstexencoding{% + \ifdef\blx@texencoding@fromoption + {\let\blx@texencoding\blx@texencoding@fromoption + \blx@info@noline{% + Input encoding '\blx@texencoding' specified}} + {\ifundef\inputencodingname + {\ifundef\XeTeXrevision + {\ifundef\luatexversion + {\def\blx@texencoding{ascii}% + \blx@info@noline{% + No input encoding detected.\MessageBreak + Assuming '\blx@texencoding'}} + {\def\blx@texencoding{utf8}% + \blx@info@noline{% + LuaTeX detected.\MessageBreak + Assuming input encoding '\blx@texencoding'}}} + {\def\blx@texencoding{utf8}% + \blx@info@noline{% + XeTeX detected.\MessageBreak + Assuming input encoding '\blx@texencoding'}}} + {\ifcsdef{blx@inpenc@\inputencodingname} + {\letcs\blx@texencoding{blx@inpenc@\inputencodingname}} + {\let\blx@texencoding\inputencodingname}% + \blx@info@noline{% + Input encoding '\blx@texencoding' detected}}}} + +\blx@guesstexencoding +\let\blx@texencoding@firstguess\blx@texencoding + +% this ultimately loads either +% blx-case-expl3.def or blx-case-latex2e.def +\blx@deferoption@casechanger +\blx@casechange@postload + + % Deferred setup at end of preamble \AtEndPreamble{% \blx@checkoptions@global @@ -15656,30 +16016,18 @@ \abx@dodates \do{labeldate}} + + \def\blx@checkencoding{% - \ifdef\blx@texencoding - {\blx@info@noline{% - Input encoding '\blx@texencoding' specified}} - {\ifundef\inputencodingname - {\ifundef\XeTeXrevision - {\ifundef\luatexversion - {\def\blx@texencoding{ascii}% - \blx@info@noline{% - No input encoding detected.\MessageBreak - Assuming '\blx@texencoding'}} - {\def\blx@texencoding{utf8}% - \blx@info@noline{% - LuaTeX detected.\MessageBreak - Assuming input encoding '\blx@texencoding'}}} - {\def\blx@texencoding{utf8}% - \blx@info@noline{% - XeTeX detected.\MessageBreak - Assuming input encoding '\blx@texencoding'}}} - {\ifcsdef{blx@inpenc@\inputencodingname} - {\letcs\blx@texencoding{blx@inpenc@\inputencodingname}} - {\let\blx@texencoding\inputencodingname}% - \blx@info@noline{% - Input encoding '\blx@texencoding' detected}}}% + \blx@guesstexencoding + \ifdefstrequal\blx@texencoding@firstguess\blx@texencoding + {} + {\blx@warning@noline{% + Initial guess for file encoding (\blx@texencoding@firstguess)\MessageBreak + and new guess (\blx@texencoding) do not match.\MessageBreak + Please set up your document encoding *before*\MessageBreak + loading biblatex.\MessageBreak + The case changing code might not work as expected}}% \ifdef\blx@bibencoding {\ifdefstring\blx@bibencoding{ascii} {\blx@info@noline{% @@ -15718,15 +16066,11 @@ \AtBeginDocument{% \blx@auxwrite\@mainaux{}{\string\abx@aux@refcontext{\blx@refcontext@context}} \blx@checkencoding - % this ultimately loads either - % blx-case-expl3.def or blx-case-latex2e.def - \blx@deferoption@casechanger - \blx@casechange@postload \if@filesw \blx@ctrlwrite \fi \blx@bblinput - \blx@maxsection\z@ + \setcounter{blx@maxsection}{0}% \csuse{abx@preamble}% \blx@inf@refsec \blx@inf@refseg} diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def b/Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def index 956b4708c54..9590e748a59 100644 --- a/Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def +++ b/Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def @@ -244,7 +244,7 @@ \def\blx@bblsecs{% \advance\c@refsection\@ne - \ifnum\c@refsection>\blx@maxsection + \ifnum\c@refsection>\c@blx@maxsection \else \blx@bblfile \expandafter\blx@bblsecs @@ -677,7 +677,7 @@ \MessageBreak Please report this bug}} -\AtEndDocument{% +\blx@AtEndDocument{% % always add default labelprefix declarations to .aux \iftoggle{blx@bbldone} {\def\do#1{% diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-compat.def b/Master/texmf-dist/tex/latex/biblatex/blx-compat.def index 46272f181ff..54dee8e6348 100644 --- a/Master/texmf-dist/tex/latex/biblatex/blx-compat.def +++ b/Master/texmf-dist/tex/latex/biblatex/blx-compat.def @@ -6,13 +6,13 @@ \AtBeginDocument{% \renewrobustcmd*{\bibliography}[1]{% \blx@error - {'\string\bibliography' invalid} + {'\string\bibliography' invalid in 'document' env} {Use '\string\addbibresource' instead.\MessageBreak I'm ignoring this command}}} \renewrobustcmd*{\bibliographystyle}[1]{% \blx@error - {'\string\bibliographystyle' invalid} + {'\string\bibliographystyle' invalid for 'biblatex'} {Use the package option 'style' instead.\MessageBreak I'm ignoring this command}} @@ -356,4 +356,18 @@ % and \mkrelatedstring for \mkrelatedstringtext \newcommand{\mkrelatedstring}{\mainlang} +% 3.17 +% ------------------------------------------------------------------ +% Deprecations for ISO8601 year divisions +% ------------------------------------------------------------------ + +% can't use \DeprecateFieldWithReplacement here because we do some +% testing on the field values, so injecting warnings breaks things +\def\do#1{% + \appto\blx@aliasfields{% + \csletcs{abx@field@#1season}{abx@field@#1yeardivision}% + \csletcs{abx@field@#1endseason}{abx@field@#1endyeardivision}}} +\abx@dodatetypes + + \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def index cb23e20c5fa..b53f0b0c92f 100644 --- a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def +++ b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def @@ -116,7 +116,7 @@ {}} % Valid dateparts -\def\blx@notnulldateparts{month,day,hour,minute,second,timezone,season,endmonth,endday,endhour,endminute,endsecond,endtimezone,endseason} +\def\blx@notnulldateparts{month,day,hour,minute,second,timezone,yeardivision,endmonth,endday,endhour,endminute,endsecond,endtimezone,endyeardivision} \def\blx@nullokdateparts{endyear,year} \edef\blx@dateparts{\blx@notnulldateparts,\blx@nullokdateparts} @@ -246,7 +246,7 @@ \expandafter\docsvlist\expandafter{\blx@nullokdateparts}% % dateparts which are not ok to be null by default: % *year, *(end)month, *(end)day, *(end)hour, *(end)minute, *(end)second, *(end)timezone - % *(end)season + % *(end)yeardivision \def\do####1{% \let\blx@tempa\@empty% reset setkeys buffer due to loop calls \xifinlistcs{\blx@datetype ####1}{blx@datamodel@fields} @@ -643,10 +643,10 @@ endhour, endminute, endmonth, - endseason, endsecond, endtimezone, endyear, + endyeardivision, entryset, entrysubtype, execute, @@ -685,17 +685,17 @@ origendhour, origendminute, origendmonth, - origendseason, origendsecond, origendtimezone, origendyear, + origendyeardivision, orighour, origminute, origmonth, - origseason, origsecond, origtimezone, origyear, + origyeardivision, origlocation, origpublisher, origtitle, @@ -705,7 +705,6 @@ relatedoptions, relatedstring, relatedtype, - season, second, shortauthor, shorteditor, @@ -746,7 +745,8 @@ verbc, xdata, xref, - year} + year, + yeardivision} \DeclareDatamodelEntryfields[set]{ entryset} @@ -1151,12 +1151,12 @@ note, number, pubstate, - season, series, subtitle, title, titleaddon, - volume} + volume, + yeardivision} \DeclareDatamodelEntryfields[mvproceedings]{ addendum, @@ -1167,17 +1167,17 @@ eventendhour, eventendminute, eventendmonth, - eventendseason, eventendsecond, eventendtimezone, eventendyear, + eventendyeardivision, eventhour, eventminute, eventmonth, - eventseason, eventsecond, eventtimezone, eventyear, + eventyeardivision, eventtitle, eventtitleaddon, isbn, @@ -1207,17 +1207,17 @@ eventendhour, eventendminute, eventendmonth, - eventendseason, eventendsecond, eventendtimezone, eventendyear, + eventendyeardivision, eventhour, eventminute, eventmonth, - eventseason, eventsecond, eventtimezone, eventyear, + eventyeardivision, eventtitle, eventtitleaddon, isbn, @@ -1257,17 +1257,17 @@ eventendhour, eventendminute, eventendmonth, - eventendseason, eventendsecond, eventendtimezone, eventendyear, + eventendyeardivision, eventhour, eventminute, eventmonth, - eventseason, eventsecond, eventtimezone, eventyear, + eventyeardivision, eventtitle, eventtitleaddon, isbn, @@ -1336,17 +1336,17 @@ eventendhour, eventendminute, eventendmonth, - eventendseason, eventendsecond, eventendtimezone, eventendyear, + eventendyeardivision, eventhour, eventminute, eventmonth, - eventseason, eventsecond, eventtimezone, eventyear, + eventyeardivision, eventtitle, eventtitleaddon, howpublished, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx index 675089ddd8b..65c51f2a056 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx @@ -13,12 +13,12 @@ {\mkbibmonth{\thefield{#2}}% \iffieldundef{#1}{}{\space}}% \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \mkyearzeros{\thefield{#1}}}% } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/basque.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/basque.lbx index 6263081e970..74170df577b 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/basque.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/basque.lbx @@ -72,12 +72,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -241,17 +241,17 @@ {ed.,\addabbrvspace ohk\adddotspace eta hitzaur\adddot}},% byeditoranaf = {{edizioa, oharrak eta hitzatzea}% {ed.,\addabbrvspace ohk\adddotspace eta hitzatz\adddot}},% - byeditortrcoin = {{edizioa, \lbx@lfromlang itzulpena, iruzkinak eta sarrera}% + byeditortrcoin = {{edizioa, \lbx@lfromlang\ itzulpena, iruzkinak eta sarrera}% {ed.,\addabbrvspace \lbx@sfromlang\ itz\adddot, irzk\adddotspace eta sar\adddot}},% - byeditortrcofo = {{edizioa, \lbx@lfromlang itzulpena, iruzkinak eta hitzaurrea}% + byeditortrcofo = {{edizioa, \lbx@lfromlang\ itzulpena, iruzkinak eta hitzaurrea}% {ed.,\addabbrvspace \lbx@sfromlang\ itz\adddot, irzk\adddotspace eta hitzaur\adddot}},% - byeditortrcoaf = {{edizioa, \lbx@lfromlang itzulpena, iruzkinak eta hitzatzea}% + byeditortrcoaf = {{edizioa, \lbx@lfromlang\ itzulpena, iruzkinak eta hitzatzea}% {ed.,\addabbrvspace \lbx@sfromlang\ itz\adddot, irzk\adddotspace eta hitzatz\adddot}},% - byeditortranin = {{edizioa, \lbx@lfromlang itzulpena, oharrak eta sarrera}% + byeditortranin = {{edizioa, \lbx@lfromlang\ itzulpena, oharrak eta sarrera}% {ed.,\addabbrvspace \lbx@sfromlang\ itz\adddot, ohk\adddotspace eta sar\adddot}},% - byeditortranfo = {{edizioa, \lbx@lfromlang itzulpena, oharrak eta hitzaurrea}% + byeditortranfo = {{edizioa, \lbx@lfromlang\ itzulpena, oharrak eta hitzaurrea}% {ed.,\addabbrvspace \lbx@sfromlang\ itz\adddot, ohk\adddotspace eta hitzaur\adddot}},% - byeditortranaf = {{edizioa, \lbx@lfromlang itzulpena, oharrak eta hitzatzea}% + byeditortranaf = {{edizioa, \lbx@lfromlang\ itzulpena, oharrak eta hitzatzea}% {ed.,\addabbrvspace \lbx@sfromlang\ itz\adddot, ohk\adddotspace eta hitzatz\adddot}},% bytranslatorco = {{\lbx@lfromlang\ itzulpena eta iruzkinak}% {\lbx@sfromlang\ itz\adddot\ eta irzk\adddot}},% @@ -263,18 +263,18 @@ {\lbx@sfromlang\ itz\adddot\ eta hitzaur\adddot}},% bytranslatoraf = {{\lbx@lfromlang\ itzulpena eta hitzatzea}% {\lbx@sfromlang\ itz\adddot\ eta hitzatz\adddot}},% - bytranslatorcoin = {{\lbx@lfromlang itzulpena, iruzkinak eta sarrera}% - {\lbx@sfromlang itz\adddot, irzk\adddotspace eta sar\adddot}},% - bytranslatorcofo = {{\lbx@lfromlang itzulpena, iruzkinak eta hitzaurrea}% - {\lbx@sfromlang itz\adddot, irzk\adddotspace eta pr\'ol\adddot}},% - bytranslatorcoaf = {{\lbx@lfromlang itzulpena, iruzkinak eta hitzatzea}% - {\lbx@sfromlang itz\adddot, irzk\adddotspace eta hitzatz\adddot}},% - bytranslatoranin = {{\lbx@lfromlang itzulpena, oharrak eta sarrera}% - {\lbx@sfromlang itz\adddot, ohk\adddotspace eta sar\adddot}},% - bytranslatoranfo = {{\lbx@lfromlang itzulpena, oharrak eta hitzaurrea}% - {\lbx@sfromlang itz\adddot, ohk\adddotspace eta pr\'ol\adddot}},% - bytranslatoranaf = {{\lbx@lfromlang itzulpena, oharrak eta hitzatzea}% - {\lbx@sfromlang itz\adddot, ohk\adddotspace eta hitzatz\adddot}},% + bytranslatorcoin = {{\lbx@lfromlang\ itzulpena, iruzkinak eta sarrera}% + {\lbx@sfromlang\ itz\adddot, irzk\adddotspace eta sar\adddot}},% + bytranslatorcofo = {{\lbx@lfromlang\ itzulpena, iruzkinak eta hitzaurrea}% + {\lbx@sfromlang\ itz\adddot, irzk\adddotspace eta pr\'ol\adddot}},% + bytranslatorcoaf = {{\lbx@lfromlang\ itzulpena, iruzkinak eta hitzatzea}% + {\lbx@sfromlang\ itz\adddot, irzk\adddotspace eta hitzatz\adddot}},% + bytranslatoranin = {{\lbx@lfromlang\ itzulpena, oharrak eta sarrera}% + {\lbx@sfromlang\ itz\adddot, ohk\adddotspace eta sar\adddot}},% + bytranslatoranfo = {{\lbx@lfromlang\ itzulpena, oharrak eta hitzaurrea}% + {\lbx@sfromlang\ itz\adddot, ohk\adddotspace eta pr\'ol\adddot}},% + bytranslatoranaf = {{\lbx@lfromlang\ itzulpena, oharrak eta hitzatzea}% + {\lbx@sfromlang\ itz\adddot, ohk\adddotspace eta hitzatz\adddot}},% and = {{eta}{eta}},% andothers = {{et\adddotspace al\adddot}{et\adddotspace al\adddot}},% andmore = {{et\adddotspace al\adddot}{et\adddotspace al\adddot}},% @@ -473,6 +473,23 @@ summer = {{uda}{uda}},% autumn = {{udazkena}{udaz\adddot}},% winter = {{negua}{neg\adddot}},% +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing 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/brazilian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx index 8d92cc663fd..366b6417bdd 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx @@ -70,12 +70,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -287,11 +287,11 @@ byeditortran = {{editado, traduzido \lbx@lfromlang\ e anotado por}% {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e anot\adddot\ por}}, byeditortrin = {{editado, traduzido \lbx@lfromlang\ e introduzido por}% - {ed.,\addabbrvspace trad. \lbx@sfromlang\ e introd\adddot\ por}}, + {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ e introd\adddot\ por}}, byeditortrfo = {{editado, traduzido \lbx@lfromlang\ e prefaciado por}% - {ed.,\addabbrvspace trad. \lbx@sfromlang\ e pref\adddot\ por}}, + {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ e pref\adddot\ por}}, byeditortraf = {{editado, traduzido \lbx@lfromlang\ e posfaciado por}% - {ed.,\addabbrvspace trad. \lbx@sfromlang\ e posf\adddot\ por}}, + {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ e posf\adddot\ por}}, byeditorcoin = {{editado, comentado e introduzido por}% {ed.,\addabbrvspace coment\adddot\ e introd\adddot\ por}}, byeditorcofo = {{editado, comentado e prefaciado por}% @@ -542,6 +542,23 @@ summer = {{ver\~ao}{ver\~ao}}, autumn = {{outono}{outono}}, winter = {{inverno}{inverno}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing am = {{AM}{AM}}, pm = {{PM}{PM}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx index 7bfdfced5de..b70c18302b5 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx @@ -70,12 +70,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/bulgarian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/bulgarian.lbx index fb64a01ab50..8683ab63286 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/bulgarian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/bulgarian.lbx @@ -97,12 +97,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -578,6 +578,23 @@ summer = {{лято}{лято}}, autumn = {{есен}{есен}}, winter = {{зима}{зима}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing am = {{преди обяд}{преди обяд}}, pm = {{след обяд}{сдед обяд}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx index abf7f8522ce..a400f3fce58 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx @@ -93,12 +93,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -282,7 +282,7 @@ byfounder = {{fundat per}{fund\adddotspace per}}, bycontinuator = {{continuat per}{cont\adddotspace per}}, bycollaborator = {{amb la co\l.laboraci\'o\smartof}{amb la co\l.l\adddot\smartof}}, - bytranslator = {{traducci\'o \lbx@fromlang\ a cura\smartof}{trad\adddotspace\lbx@fromlang\smartof}}, + bytranslator = {{tradu\"{\i}t \lbx@lfromlang\ per}{trad\adddotspace\lbx@sfromlang\ per}}, bycommentator = {{comentari a cura\smartof}{com\adddot\smartof}}, byannotator = {{notes a cura\smartof}{n\adddot\smartof}}, withcommentator = {{amb un comentari a cura\smartof}{amb un com\adddot\smartof}}, @@ -290,8 +290,8 @@ withintroduction = {{amb una introducci\'o a cura\smartof}{amb una intr\adddot\smartof}}, withforeword = {{amb un pr\`oleg a cura\smartof}{amb un pr\`ol\adddot\smartof}}, withafterword = {{amb un ep\'{\i}leg a cura\smartof}{amb un ep\adddot\smartof}}, - byeditortr = {{edici\'o i traducci\'o \lbx@fromlang\ a cura\smartof}% - {ed\adddotspace i trad\adddotspace\lbx@fromlang\smartof}}, + byeditortr = {{edici\'o i traducci\'o \lbx@lfromlang\ a cura\smartof}% + {ed\adddotspace i trad\adddotspace\lbx@sfromlang\smartof}}, byeditorco = {{edici\'o i comentari a cura\smartof}% {ed\adddotspace i com\adddot\smartof}}, byeditoran = {{edici\'o i notes a cura\smartof}% @@ -302,16 +302,16 @@ {ed\adddotspace i pr\`ol\adddot\smartof}}, byeditoraf = {{edici\'o i ep\'{\i}leg a cura\smartof}% {ed\adddotspace i ep\adddot\smartof}}, - byeditortrco = {{edici\'o, traducci\'o \lbx@fromlang\ i comentari a cura\smartof}% - {ed.,\addabbrvspace trad\adddotspace\lbx@fromlang\ i com\adddot\smartof}}, - byeditortran = {{edici\'o, traducci\'o \lbx@fromlang\ i notes a cura\smartof}% - {ed.,\addabbrvspace trad\adddotspace\lbx@fromlang\ i n\adddot\smartof}}, - byeditortrin = {{edici\'o, traducci\'o \lbx@fromlang\ i introducci\'o a cura\smartof}% - {ed.,\addabbrvspace trad\adddotspace\lbx@fromlang\ i intr\adddot\smartof}}, - byeditortrfo = {{edici\'o, traducci\'o \lbx@fromlang\ i pr\`oleg a cura\smartof}% - {ed.,\addabbrvspace trad\adddotspace\lbx@fromlang\ i pr\`ol\adddot\smartof}}, - byeditortraf = {{edici\'o, traducci\'o \lbx@fromlang\ i ep\'{\i}leg a cura\smartof}% - {ed.,\addabbrvspace trad\adddotspace\lbx@fromlang\ i ep\adddot\smartof}}, + byeditortrco = {{edici\'o, traducci\'o \lbx@lfromlang\ i comentari a cura\smartof}% + {ed.,\addabbrvspace trad\adddotspace\lbx@sfromlang\ i com\adddot\smartof}}, + byeditortran = {{edici\'o, traducci\'o \lbx@lfromlang\ i notes a cura\smartof}% + {ed.,\addabbrvspace trad\adddotspace\lbx@sfromlang\ i n\adddot\smartof}}, + byeditortrin = {{edici\'o, traducci\'o \lbx@lfromlang\ i introducci\'o a cura\smartof}% + {ed.,\addabbrvspace trad\adddotspace\lbx@sfromlang\ i intr\adddot\smartof}}, + byeditortrfo = {{edici\'o, traducci\'o \lbx@lfromlang\ i pr\`oleg a cura\smartof}% + {ed.,\addabbrvspace trad\adddotspace\lbx@sfromlang\ i pr\`ol\adddot\smartof}}, + byeditortraf = {{edici\'o, traducci\'o \lbx@lfromlang\ i ep\'{\i}leg a cura\smartof}% + {ed.,\addabbrvspace trad\adddotspace\lbx@sfromlang\ i ep\adddot\smartof}}, byeditorcoin = {{edici\'o, comentari i introducci\'o a cura\smartof} {ed.,\addabbrvspace com\adddotspace i intr\adddot\smartof}}, byeditorcofo = {{edici\'o, comentari i pr\`oleg a cura\smartof} @@ -324,40 +324,40 @@ {ed.,\addabbrvspace n\adddotspace i pr\`ol\adddot\smartof}}, byeditoranaf = {{edici\'o, notes i ep\'{\i}leg a cura\smartof}% {ed.,\addabbrvspace n\adddotspace i ep\adddot\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\adddot\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\adddot\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}% - {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, n\adddot\ i ep\adddot\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}}, - bytranslatorin = {{traducci\'o \lbx@fromlang\ i introducci\'o a cura\smartof}% - {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}% - {trad\adddot\ \lbx@fromlang\ i ep\adddot\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, comentari i pr\`oleg a cura\smartof}% - {trad\adddot\ \lbx@fromlang, com\adddot\ i pr\`ol\adddot\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}% - {trad\adddot\ \lbx@fromlang, n\adddot\ i ep\adddot\smartof}}, + byeditortrcoin = {{edici\'o, traducci\'o \lbx@lfromlang, comentari i introducci\'o a cura\smartof}% + {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, com\adddotspace i intr\adddot\smartof}}, + byeditortrcofo = {{edici\'o, traducci\'o \lbx@lfromlang, comentari i pr\`oleg a cura\smartof}% + {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, com\adddotspace i pr\`ol\adddot\smartof}}, + byeditortrcoaf = {{edici\'o, traducci\'o \lbx@lfromlang, comentari i ep\'{\i}leg a cura\smartof}% + {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ i ep\adddot\smartof}}, + byeditortranin = {{edici\'o, traducci\'o \lbx@lfromlang, notes i introducci\'o a cura\smartof}% + {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, n\adddot\ i intr\adddot\smartof}}, + byeditortranfo = {{edici\'o, traducci\'o \lbx@lfromlang, notes i pr\`oleg a cura\smartof}% + {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, n\adddot\ i pr\`ol\adddot\smartof}}, + byeditortranaf = {{edici\'o, traducci\'o \lbx@lfromlang, notes i ep\'{\i}leg a cura\smartof}% + {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, n\adddot\ i ep\adddot\smartof}}, + bytranslatorco = {{traducci\'o \lbx@lfromlang\ i comentari a cura\smartof}% + {trad\adddot\ \lbx@sfromlang\ i com\adddot\smartof}}, + bytranslatoran = {{traducci\'o \lbx@lfromlang\ i notes a cura\smartof}% + {trad\adddot\ \lbx@sfromlang\ i n\adddot\smartof}}, + bytranslatorin = {{traducci\'o \lbx@lfromlang\ i introducci\'o a cura\smartof}% + {trad\adddot\ \lbx@sfromlang\ i intr\adddot\smartof}}, + bytranslatorfo = {{traducci\'o \lbx@lfromlang\ i pr\`oleg a cura\smartof}% + {trad\adddot\ \lbx@sfromlang\ i pr\`ol\adddot\smartof}}, + bytranslatoraf = {{traducci\'o \lbx@lfromlang\ i ep\'{\i}leg a cura\smartof}% + {trad\adddot\ \lbx@sfromlang\ i ep\adddot\smartof}}, + bytranslatorcoin = {{traducci\'o \lbx@lfromlang, comentari i introducci\'o a cura\smartof}% + {trad\adddot\ \lbx@sfromlang, com\adddot\ i intr\adddot\smartof}}, + bytranslatorcofo = {{traducci\'o \lbx@lfromlang, comentari i pr\`oleg a cura\smartof}% + {trad\adddot\ \lbx@sfromlang, com\adddot\ i pr\`ol\adddot\smartof}}, + bytranslatorcoaf = {{traducci\'o \lbx@lfromlang, comentari i ep\'{\i}leg a cura\smartof}% + {trad\adddot\ \lbx@sfromlang, com\adddot\ i ep\adddot\smartof}}, + bytranslatoranin = {{traducci\'o \lbx@lfromlang, notes i introducci\'o a cura\smartof}% + {trad\adddot\ \lbx@sfromlang, n\adddot\ i intr\adddot\smartof}}, + bytranslatoranfo = {{traducci\'o \lbx@lfromlang, notes i pr\`oleg a cura\smartof}% + {trad\adddot\ \lbx@sfromlang, n\adddot\ i pr\`ol\adddot\smartof}}, + bytranslatoranaf = {{traducci\'o \lbx@lfromlang, notes i ep\'{\i}leg a cura\smartof}% + {trad\adddot\ \lbx@sfromlang, n\adddot\ i ep\adddot\smartof}}, and = {{i}{i}}, andothers = {{et al\adddot}{et al\adddot}}, andmore = {{i m\'es}{i m\'es}}, @@ -467,7 +467,8 @@ october = {{octubre}{oct\adddot}}, november = {{novembre}{nov\adddot}}, december = {{desembre}{des\adddot}}, - langamerican = {{angl\`es americ\`a}{ang\adddotspace amer\adddot}}, + langamerican = {{angl\`es americ\`a}{angl\adddotspace am\adddot}}, + langbasque = {{\`euscar}{\`eusc\adddot}}, langbrazilian = {{portugu\`es brasiler}{port\adddotspace bras\adddot}}, langbulgarian = {{b\'ulgar}{b\'ulg\adddot}}, langcatalan = {{catal\`a}{cat\adddot}}, @@ -475,28 +476,34 @@ langcroatian = {{croat}{croat}}, langdanish = {{dan\`es}{dan\adddot}}, langdutch = {{neerland\`es}{neerl\adddot}}, - langenglish = {{angl\`es}{ang\adddot}}, - langestonian = {{estoni\`a}{eston\adddot}}, + langenglish = {{angl\`es}{angl\adddot}}, + langestonian = {{estoni\`a}{est\adddot}}, langfinnish = {{fin\`es}{fin\adddot}}, langfrench = {{franc\`es}{fr\adddot}}, - langgalician = {{gallec}{gal\adddot}}, + langgalician = {{gallec}{gall\adddot}}, langgerman = {{alemany}{al\adddot}}, langgreek = {{grec}{grec}}, -% langhungarian = {{}{}}, % FIXME: missing + langhungarian = {{hongar\`es}{hong\adddot}}, langitalian = {{itali\`a}{it\adddot}}, langjapanese = {{japon\`es}{jap\adddot}}, langlatin = {{llat\'{\i}}{ll\adddot}}, - langlatvian = {{litu\`a}{lit\adddot}}, + langlatvian = {{let\'o}{let\'o}}, + langlithuanian = {{litu\`a}{lit\adddot}}, + langmarathi = {{marathi}{mar\adddot}}, langnorwegian = {{noruec}{nor\adddot}}, langpolish = {{polon\`es}{pol\adddot}}, langportuguese = {{portugu\`es}{port\adddot}}, + langromanian = {{roman\`es}{rom\adddot}}, langrussian = {{rus}{rus}}, + langserbian = {{serbi}{serbi}}, langslovak = {{eslovac}{eslovac}}, langslovene = {{eslov\`e}{eslov\`e}}, langspanish = {{castell\`a}{cast\adddot}}, langswedish = {{suec}{suec}}, + langturkish = {{turc}{turc}}, langukrainian = {{ucra\"{\i}n\`es}{ucr\adddot}}, - fromamerican = {{de l'angl\`es americ\`a}{de l'ang\adddotspace amer\adddot}}, + fromamerican = {{de l'angl\`es americ\`a}{de l'angl\adddotspace am\adddot}}, + frombasque = {{de l'\`euscar}{de l'\`eusc\adddot}}, frombrazilian = {{del portugu\`es brasiler}{del port\adddotspace bras\adddot}}, frombulgarian = {{del b\'ulgar}{del bulg\adddot}}, fromcatalan = {{del catal\`a}{del cat\adddot}}, @@ -504,26 +511,31 @@ 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 = {{de l'estoni\`a}{de l'eston\adddot}}, + fromenglish = {{de l'angl\`es}{de l'angl\adddot}}, + fromestonian = {{de l'estoni\`a}{de l'est\adddot}}, fromfinnish = {{del fin\`es}{del fin\adddot}}, fromfrench = {{del franc\`es}{del fr\adddot}}, fromgalician = {{del gallec}{del gall\adddot}}, fromgerman = {{de l'alemany}{de l'al\adddot}}, fromgreek = {{del grec}{del grec}}, -% fromhungarian = {{}{}}, % FIXME: missing + fromhungarian = {{de l'hongar\`es}{de l'hong\adddot}}, fromitalian = {{de l'itali\`a}{de l'it\adddot}}, fromjapanese = {{del japon\`es}{del jap\adddot}}, fromlatin = {{del llat\'{\i}}{del ll\adddot}}, - fromlatvian = {{del litu\`a}{del lit\adddot}}, + fromlatvian = {{del let\'o}{del let\'o}}, + fromlithuanian = {{del litu\`a}{del lit\adddot}}, + frommarathi = {{del marathi}{del mar\adddot}}, fromnorwegian = {{del noruec}{del nor\adddot}}, frompolish = {{del polon\`es}{del pol\adddot}}, fromportuguese = {{del portugu\`es}{del port\adddot}}, + fromromanian = {{del roman\`es}{del rom\adddot}}, fromrussian = {{del rus}{del rus}}, + fromserbian = {{del serbi}{del serbi}}, 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}}, + fromturkish = {{del turc}{del turc}}, fromukrainian = {{de l'ucra\"{\i}n\`es}{de l'ucr\adddot}}, countryde = {{Alemanya}{DE}}, countryeu = {{Uni\'o Europea}{UE}}, @@ -556,6 +568,23 @@ summer = {{estiu}{est\adddot}}, autumn = {{tardor}{tard\adddot}}, winter = {{hivern}{hiv\adddot}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing am = {{a\adddotspace m\adddot}{a\adddotspace m\adddot}}, pm = {{p\adddotspace m\adddot}{p\adddotspace m\adddot}}, } @@ -606,13 +635,13 @@ \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 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 +% \if Y\noexpand\lbx@tempa 1\fi >0 % \let\lbx@tempa\lbx@ca@smartof@d \else diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx index 59386494900..ba0b340d624 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx @@ -72,12 +72,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -567,6 +567,23 @@ summer = {{ljeto}{ljeto}}, autumn = {{jesen}{jesen}}, winter = {{zima}{zima}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing am = {{prije podne}{AM}}, pm = {{poslije podne}{PM}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx index d23131f0722..197d762daa4 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx @@ -65,12 +65,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -528,6 +528,23 @@ summer = {{l\'{e}to}{l\'{e}to}}, autumn = {{podzim}{podzim}}, winter = {{zima}{zima}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing am = {{AM}{AM}}, pm = {{PM}{PM}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx index 2b360a0c0ca..d1dafe601f6 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx @@ -63,12 +63,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -251,7 +251,7 @@ bycontinuator = {{videref\o rt af}{videref\adddotspace af}}, bycollaborator = {{i samarbejde med}{i samarb\adddotspace m\adddot}}, bytranslator = {{oversat \lbx@lfromlang\ af}% - {overs\adddot \lbx@sfromlang\ af}}, + {overs\adddot\ \lbx@sfromlang\ af}}, bycommentator = {{kommenteret af}{komm\adddot\ af}}, byannotator = {{annoteret af}{ann\adddot\ af}}, withcommentator = {{med kommentarer af}{m\adddotspace komm\adddot\ af}}, @@ -260,7 +260,7 @@ withforeword = {{med forord af}{m\adddotspace forord af}}, withafterword = {{med efterord af}{m\adddotspace efterord af}}, byeditortr = {{redigeret og oversat \lbx@lfromlang\ af}% - {red\adddotspace og overs\adddot \lbx@sfromlang\ af}}, + {red\adddotspace og overs\adddot\ \lbx@sfromlang\ af}}, byeditorco = {{redigeret og kommenteret af}% {red\adddotspace og komm\adddot\ af}}, byeditoran = {{redigeret med annoteringer af}% @@ -530,6 +530,23 @@ summer = {{sommer}{sommer}}, autumn = {{efter\aa r}{efter\aa r}}, winter = {{vinter}{vinter}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing am = {{formiddag}{form\adddot}}, pm = {{eftermiddag}{efterm\adddot}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx index 880c0643dc3..51cf91614e4 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx @@ -84,12 +84,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -286,11 +286,11 @@ byeditortran = {{geredigeerd, vertaald \lbx@lfromlang\ en geannoteerd door}% {red., vert\adddotspace \lbx@sfromlang\ en annot\adddotspace door}}, byeditortrin = {{geredigeerd en vertaald \lbx@lfromlang, met een inleiding, door}% - {red\adddotspace en vert. \lbx@sfromlang, met een inl., door}}, + {red\adddotspace en vert\adddotspace \lbx@sfromlang, met een inl., door}}, byeditortrfo = {{geredigeerd en vertaald \lbx@lfromlang, met een voorwoord, door}% - {red\adddotspace en vert. \lbx@sfromlang, met een voorw., door}}, + {red\adddotspace en vert\adddotspace \lbx@sfromlang, met een voorw., door}}, byeditortraf = {{geredigeerd en vertaald \lbx@lfromlang, met een nawoord, door}% - {red\adddotspace en vert. \lbx@sfromlang, met een naw., door}}, + {red\adddotspace en vert\adddotspace \lbx@sfromlang, met een naw., door}}, byeditorcoin = {{geredigeerd en becommentarieerd, met een inleiding, door}% {red\adddotspace en comm., met een inl., door}}, byeditorcofo = {{geredigeerd en becommentarieerd, met een voorwoord, door}% @@ -320,11 +320,11 @@ bytranslatoran = {{vertaald \lbx@lfromlang\ en geannoteerd door}% {vert\adddotspace \lbx@sfromlang\ en annot.\adddotspace door}}, bytranslatorin = {{vertaald \lbx@lfromlang, met een inleiding, door}% - {vert. \lbx@sfromlang, met een inl., door}}, + {vert\adddotspace \lbx@sfromlang, met een inl., door}}, bytranslatorfo = {{vertaald \lbx@lfromlang, met een voorwoord, door}% - {vert. \lbx@sfromlang, met een voorw., door}}, + {vert\adddotspace \lbx@sfromlang, met een voorw., door}}, bytranslatoraf = {{vertaald \lbx@lfromlang, met een nawoord, door}% - {vert. \lbx@sfromlang, met een naw., door}}, + {vert\adddotspace \lbx@sfromlang, met een naw., door}}, bytranslatorcoin = {{vertaald \lbx@lfromlang\ en becommentarieerd, met een inleiding, door}% {vert\adddotspace \lbx@sfromlang\ en comm., met een inl., door}}, bytranslatorcofo = {{vertaald \lbx@lfromlang\ en becommentarieerd, met een voorwoord, door}% @@ -549,6 +549,23 @@ % summer = {{}{}},% FIXME: missing % autumn = {{}{}},% FIXME: missing % winter = {{}{}},% FIXME: missing +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing am = {{a\adddot m\adddot}{a\adddot m\adddot}}, pm = {{p\adddot m\adddot}{p\adddot m\adddot}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx index d13bd0fd424..cf67033de1f 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx @@ -78,12 +78,12 @@ canadian,australian,newzealand,USenglish,UKenglish} \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% \savecommand\mkdaterangecomp @@ -491,9 +491,11 @@ canadian,australian,newzealand,USenglish,UKenglish} langlatin = {{Latin}{Latin}}, langlatvian = {{Latvian}{Latvian}}, langlithuanian = {{Lithuanian}{Lithuanian}}, + langmarathi = {{Marathi}{Marathi}}, langnorwegian = {{Norwegian}{Norwegian}}, langpolish = {{Polish}{Polish}}, langportuguese = {{Portuguese}{Portuguese}}, + langromanian = {{Romanian}{Romanian}}, langrussian = {{Russian}{Russian}}, langserbian = {{Serbian}{Serbian}}, langslovak = {{Slovak}{Slovak}}, @@ -524,9 +526,11 @@ canadian,australian,newzealand,USenglish,UKenglish} fromlatin = {{from the Latin}{from the Latin}}, fromlatvian = {{from the Latvian}{from the Latvian}}, fromlithuanian = {{from the Lithuanian}{from the Lithuanian}}, + frommarathi = {{from the Marathi}{from the Marathi}}, fromnorwegian = {{from the Norwegian}{from the Norwegian}}, frompolish = {{from the Polish}{from the Polish}}, fromportuguese = {{from the Portuguese}{from the Portuguese}}, + fromromanian = {{from the Romanian}{from the Romanian}}, fromrussian = {{from the Russian}{from the Russian}}, fromserbian = {{from the Serbian}{from the Serbian}}, fromslovak = {{from the Slovak}{from the Slovak}}, @@ -566,6 +570,23 @@ canadian,australian,newzealand,USenglish,UKenglish} summer = {{Summer}{Sum\adddot}}, autumn = {{Autumn}{Aut\adddot}}, winter = {{Winter}{Win\adddot}}, + springN = {{Spring (Northern Hemisphere)}{Spr\adddotspace NH}}, + summerN = {{Summer (Northern Hemisphere)}{Sum\adddotspace NH}}, + autumnN = {{Autumn (Northern Hemisphere)}{Aut\adddotspace NH}}, + winterN = {{Winter (Northern Hemisphere)}{Win\adddotspace NH}}, + springS = {{Spring (Southern Hemisphere)}{Spr\adddotspace SH}}, + summerS = {{Summer (Southern Hemisphere)}{Sum\adddotspace SH}}, + autumnS = {{Autumn (Southern Hemisphere)}{Aut\adddotspace SH}}, + winterS = {{Winter (Southern Hemisphere)}{Win\adddotspace SH}}, + Q1 = {{Quarter~1}{Q1}}, + Q2 = {{Quarter~2}{Q2}}, + Q3 = {{Quarter~3}{Q3}}, + Q4 = {{Quarter~4}{Q4}}, + QD1 = {{Quadrimester~1}{Q1}}, + QD2 = {{Quadrimester~2}{Q2}}, + QD3 = {{Quadrimester~3}{Q3}}, + S1 = {{Semestral~1}{S1}}, + S2 = {{Semestral~2}{S2}}, am = {{AM}{AM}}, pm = {{PM}{PM}}, } @@ -582,14 +603,14 @@ canadian,australian,newzealand,USenglish,UKenglish} {\blx@nounit} {\printtext[{#2date}]{% \datecircaprint - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibdate#1}{}{#2month}{#2day}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \dateeraprint{#2year}}} {\ifdateyearsequal{#2}{#2end} - {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}% + {\csuse{mkbibyeardivisiondate#1}{}{#2yeardivision}} + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}% \dateeraprint{#2year}}}% \dateuncertainprint \iffieldundef{#2endyear} @@ -598,13 +619,13 @@ canadian,australian,newzealand,USenglish,UKenglish} {\mbox{\bibdaterangesep}} {\bibdaterangesep \enddatecircaprint - \iffieldundef{#2endseason} + \iffieldundef{#2endyeardivision} {\ifdateyearsequal{#2}{#2end} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + {\csuse{mkbibyeardivisiondate#1}{#2endyear}{#2endyeardivision}}% \enddateuncertainprint \dateeraprint{#2endyear}}}}}% \endgroup} @@ -621,14 +642,14 @@ canadian,australian,newzealand,USenglish,UKenglish} {\blx@nounit} {\printtext[{#2date}]{% \datecircaprint - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibdate#1}{}{#2month}{#2day}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \dateeraprint{#2year}}} {\ifdateyearsequal{#2}{#2end} - {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}% + {\csuse{mkbibyeardivisiondate#1}{}{#2yeardivision}} + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}% \dateeraprint{#2year}}}% \dateuncertainprint \iffieldundef{#2endyear} @@ -637,9 +658,9 @@ canadian,australian,newzealand,USenglish,UKenglish} {\mbox{\bibdaterangesep}} {\bibdaterangesep \enddatecircaprint - \iffieldundef{#2endseason} + \iffieldundef{#2endyeardivision} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + {\csuse{mkbibyeardivisiondate#1}{#2endyear}{#2endyeardivision}}% \enddateuncertainprint \dateeraprint{#2endyear}}}}}% \endgroup} @@ -656,14 +677,14 @@ canadian,australian,newzealand,USenglish,UKenglish} {\blx@nounit} {\printtext[{#2date}]{% \datecircaprint - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibdate#1}{}{#2month}{#2day}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \dateeraprint{#2year}}} {\ifdateyearsequal{#2}{#2end} - {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}% + {\csuse{mkbibyeardivisiondate#1}{}{#2yeardivision}} + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}% \dateeraprint{#2year}}}% \dateuncertainprint \iffieldundef{#2endyear} @@ -673,13 +694,13 @@ canadian,australian,newzealand,USenglish,UKenglish} \mbox{\bibdaterangesep}} {\bibdaterangesep \enddatecircaprint - \iffieldundef{#2endseason} + \iffieldundef{#2endyeardivision} {\ifdateyearsequal{#2}{#2end} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + {\csuse{mkbibyeardivisiondate#1}{#2endyear}{#2endyeardivision}}% \printfield{extradate}% \enddateuncertainprint \dateeraprint{#2endyear}}}}}% @@ -697,14 +718,14 @@ canadian,australian,newzealand,USenglish,UKenglish} {\blx@nounit} {\printtext[{#2date}]{% \datecircaprint - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibdate#1}{}{#2month}{#2day}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \dateeraprint{#2year}}} {\ifdateyearsequal{#2}{#2end} - {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}% + {\csuse{mkbibyeardivisiondate#1}{}{#2yeardivision}} + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}% \dateeraprint{#2year}}}% \dateuncertainprint \iffieldundef{#2endyear} @@ -714,9 +735,9 @@ canadian,australian,newzealand,USenglish,UKenglish} \mbox{\bibdaterangesep}} {\bibdaterangesep \enddatecircaprint - \iffieldundef{#2endseason} + \iffieldundef{#2endyeardivision} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + {\csuse{mkbibyeardivisiondate#1}{#2endyear}{#2endyeardivision}}% \printfield{extradate}% \enddateuncertainprint \dateeraprint{#2endyear}}}}}% diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/estonian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/estonian.lbx index 07b58d529de..e91b3e46082 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/estonian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/estonian.lbx @@ -88,12 +88,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -557,6 +557,23 @@ summer = {{suvel}{suvel}}, autumn = {{s\"{u}gisel}{s\"{u}gisel}}, winter = {{talvel}{talvel}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing am = {{AM}{AM}}, pm = {{PM}{PM}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx index 99db65676da..1390c564cff 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx @@ -107,12 +107,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -582,6 +582,23 @@ summer = {{kes\"a}{kes\"a}},% Or kes\"all\"a ? autumn = {{syksy}{syksy}},% Or syksyll\"a ? winter = {{talvi}{talvi}},% Or talvella ? +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing am = {{ap\adddot}{ip\adddot}}, pm = {{ip\adddot}{ip\adddot}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx index 8b3f7f194b7..3638ae8fa83 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx @@ -91,12 +91,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -561,6 +561,23 @@ summer = {{\'et\'e}{\'et\'e}}, autumn = {{automne}{automne}}, winter = {{hiver}{hiver}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing am = {{AM}{AM}}, pm = {{PM}{PM}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/galician.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/galician.lbx index 293fe87520d..25eed96d070 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/galician.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/galician.lbx @@ -70,12 +70,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -287,11 +287,11 @@ byeditortran = {{editado, traducido \lbx@lfromlang\ e anotado por}% {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e anot\adddot\ por}}, byeditortrin = {{editado, traducido \lbx@lfromlang\ e introducido por}% - {ed.,\addabbrvspace trad. \lbx@sfromlang\ e introd\adddot\ por}}, + {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ e introd\adddot\ por}}, byeditortrfo = {{editado, traducido \lbx@lfromlang\ e prefaciado por}% - {ed.,\addabbrvspace trad. \lbx@sfromlang\ e pref\adddot\ por}}, + {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ e pref\adddot\ por}}, byeditortraf = {{editado, traducido \lbx@lfromlang\ e posfaciado por}% - {ed.,\addabbrvspace trad. \lbx@sfromlang\ e posf\adddot\ por}}, + {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ e posf\adddot\ por}}, byeditorcoin = {{editado, comentado e introducido por}% {ed.,\addabbrvspace com\adddot\ e introd\adddot\ por}}, byeditorcofo = {{editado, comentado e prefaciado por}% @@ -531,6 +531,24 @@ nodate = {{sen data}{s\adddot d\adddot}}, summer = {{ver\'an}{ver\'an}}, autumn = {{outono}{outono}}, winter = {{inverno}{inverno}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing + am = {{AM}{AM}}, pm = {{PM}{PM}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx index d09bee3a76d..403ead35549 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx @@ -77,12 +77,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -479,6 +479,7 @@ langnorwegian = {{Norwegisch}{Norwegisch}}, langpolish = {{Polnisch}{Polnisch}}, langportuguese = {{Portugiesisch}{Portugiesisch}}, + langromanian = {{Rum\"anisch}{Rum\"anisch}}, langrussian = {{Russisch}{Russisch}}, langserbian = {{Serbisch}{Serbisch}}, langslovak = {{Slowakisch}{Slowakisch}}, @@ -512,6 +513,7 @@ fromnorwegian = {{aus dem Norwegischen}{aus dem Norwegischen}}, frompolish = {{aus dem Polnischen}{aus dem Polnischen}}, fromportuguese = {{aus dem Portugiesischen}{aus dem Portugiesischen}}, + fromromanian = {{aus dem Rum\"anischen}{aus dem Rum\"anischen}}, fromrussian = {{aus dem Russischen}{aus dem Russischen}}, fromserbian = {{aus dem Serbian}{aus dem Serbian}}, fromslovak = {{aus dem Slowakischen}{aus dem Slowakischen}}, @@ -551,6 +553,23 @@ summer = {{Sommer}{Sommer}}, autumn = {{Herbst}{Herbst}}, winter = {{Winter}{Winter}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing am = {{vorm\adddot}{vorm\adddot}}, pm = {{nachm\adddot}{nachm\adddot}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx index 6d86ddc4a4d..ee1d664bfc7 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx @@ -105,12 +105,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -570,6 +570,23 @@ % summer = {{}{}},% FIXME: missing % autumn = {{}{}},% FIXME: missing % winter = {{}{}},% FIXME: missing +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing am = {{π\adddot μ\adddot}{π\adddot μ\adddot}}, pm = {{μ\adddot μ\adddot}{μ\adddot μ\adddot}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx index dc3ff3207a2..c6e051c5293 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx @@ -83,12 +83,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -481,6 +481,23 @@ % summer = {{}{}},% FIXME: missing % autumn = {{}{}},% FIXME: missing % winter = {{}{}},% FIXME: missing +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing am = {{f\adddot h\adddot}{f\adddot h\adddot}}, pm = {{e\adddot h\adddot}{e\adddot h\adddot}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx index b0469ad796f..6804011ad20 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx @@ -70,12 +70,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -464,6 +464,23 @@ % summer = {{}{}},% FIXME: missing % autumn = {{}{}},% FIXME: missing % winter = {{}{}},% FIXME: missing +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/latvian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/latvian.lbx index 137e97e6ddd..22d8f434838 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/latvian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/latvian.lbx @@ -1,20 +1,6 @@ \ProvidesFile{latvian.lbx} [\abx@lbxid] -\ifundef{\lbx@lv@loadinfo} - {\blx@warning@noline{% - Latvian 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 carefully, especially with non-\MessageBreak - standard styles or customisations to field formats.\MessageBreak - This warning can be disabled by calling\MessageBreak - '\string\BiblatexLatvianWarningOff'\MessageBreak - after 'biblatex' has been loaded, but before\MessageBreak - the localisation is loaded for the first time}% - \global\let\lbx@lv@loadinfo\@empty} - {} - \DeclareRedundantLanguages{latvian}{latvian} \NewBibliographyString{% @@ -110,7 +96,7 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% + \protected\def\mkbibyeardivisiondateshort#1#2{% \iffieldundef{#1} {} {\iffieldbibstring{#1} @@ -122,9 +108,9 @@ {\stripzeros{\thefield{#1}}}} {\mkbibordinal{\thefield{#1}}\addspace\bibstring{dateyear}\space}}}% \iftoggle{lbx@lv@datewhen} - {\mkbibseason{date\thefield{#2}}} - {\mkbibseason{\thefield{#2}}}}% - \let\mkbibseasondatelong\mkbibseasondateshort + {\mkbibyeardivision{date\thefield{#2}}} + {\mkbibyeardivision{\thefield{#2}}}}% + \let\mkbibyeardivisiondatelong\mkbibyeardivisiondateshort \savecommand\mkdaterangecomp \savecommand\mkdaterangecompextra \protected\def\mkdaterangecomp{% @@ -681,6 +667,23 @@ summer = {{vasara}{vas\adddot}}, autumn = {{rudens}{rud\adddot}}, winter = {{ziema}{ziema}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing locspring = {{pavasar\={\i}}{pav\adddot}}, locsummer = {{vasar\={a}}{vas\adddot}}, locautumn = {{ruden\={\i}}{rud\adddot}}, @@ -722,13 +725,13 @@ {\blx@nounit} {\printtext[{#2date}]{% \datecircaprint - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\ifdateyearsequal{#2}{#2end} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{#2year}{}{#2day}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}}% - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}}% \dateeraprint{#2year}% \dateuncertainprint \iffieldundef{#2endyear} @@ -737,13 +740,13 @@ {\mbox{\bibdaterangesep}} {\bibdaterangesep \enddatecircaprint - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibdate#1}{}{#2endmonth}{#2endday}} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} {\ifdateyearsequal{#2}{#2end} - {\csuse{mkbibseasondate#1}{}{#2endseason}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% + {\csuse{mkbibyeardivisiondate#1}{}{#2endyeardivision}} + {\csuse{mkbibyeardivisiondate#1}{#2endyear}{#2endyeardivision}}}% \enddateuncertainprint \dateeraprint{#2endyear}}}}}% \endgroup} @@ -760,13 +763,13 @@ {\blx@nounit} {\printtext[{#2date}]{% \datecircaprint - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\ifdateyearsequal{#2}{#2end} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{#2year}{}{#2day}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}}% - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}}% \dateeraprint{#2year}% \dateuncertainprint \iffieldundef{#2endyear} @@ -776,13 +779,13 @@ \mbox{\bibdaterangesep}} {\bibdaterangesep \enddatecircaprint - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibdate#1}{}{#2endmonth}{#2endday}} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} {\ifdateyearsequal{#2}{#2end} - {\csuse{mkbibseasondate#1}{}{#2endseason}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% + {\csuse{mkbibyeardivisiondate#1}{}{#2endyeardivision}} + {\csuse{mkbibyeardivisiondate#1}{#2endyear}{#2endyeardivision}}}% \printfield{extradate}% \enddateuncertainprint \dateeraprint{#2endyear}}}}}% diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/lithuanian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/lithuanian.lbx index 60d54760761..0bcbb3a7b5e 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/lithuanian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/lithuanian.lbx @@ -91,7 +91,7 @@ {\iffieldundef{#2}{}{\bibdatesep}% \forcezerosmdt{\thefield{#3}}}% }% - \let\mkbibseasondatelong\mkbibseasondateshort + \let\mkbibyeardivisiondatelong\mkbibyeardivisiondateshort \savecommand\mkdaterangefull \savecommand\mkdaterangefullextra \savecommand\mkdaterangetrunc @@ -122,12 +122,12 @@ {\bibtimezonesep \mkbibtimezone{\thefield{#4}}}}% \csletcs{mkbibtime12h}{mkbibtime24h}% - \protected\def\mkbibseasondateshort#1#2{% + \protected\def\mkbibyeardivisiondateshort#1#2{% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}% \iffieldundef{#1}{}{\addspace}% - \mkbibseason{\thefield{#2}}% + \mkbibyeardivision{\thefield{#2}}% }% - \let\mkbibseasondatelong\mkbibseasondateshort + \let\mkbibyeardivisiondatelong\mkbibyeardivisiondateshort }% \UndeclareBibliographyExtras{% @@ -627,8 +627,25 @@ summer = {{vasara}{vas\adddot}}, autumn = {{ruduo}{ruduo}}, winter = {{žiema}{žiema}}, -% am = {{}{}}, -% pm = {{}{}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing +% am = {{}{}}, +% pm = {{}{}}, year = {{m\adddot}{m\adddot}}, month = {{mėn\adddot}{mėn\adddot}}, day = {{d\adddot}{d\adddot}}, @@ -692,10 +709,10 @@ {} {\printtext[{#2date}]{% \datecircaprint - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \blx@printtime{#2}{}}% - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}}% \dateeraprint{#2year}% \dateuncertainprint \iffieldundef{#2endyear} @@ -709,7 +726,7 @@ \let\lbx@lt@ifdropmonthstring\@secondoftwo \let\lbx@lt@ifdropyearstring\@secondoftwo \enddatecircaprint - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\iffieldsequal{#2year}{#2endyear} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{}{}{#2endday}} @@ -717,8 +734,8 @@ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}% \blx@printtime{#2}{end}} {\iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibseasondate#1}{}{#2endseason}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% + {\csuse{mkbibyeardivisiondate#1}{}{#2endyeardivision}} + {\csuse{mkbibyeardivisiondate#1}{#2endyear}{#2endyeardivision}}}% \enddateuncertainprint \dateeraprint{#2endyear}}}}}% \endgroup} @@ -738,10 +755,10 @@ {} {\printtext[{#2date}]{% \datecircaprint - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \blx@printtime{#2}{}}% - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}}% \dateeraprint{#2year}% \dateuncertainprint \iffieldundef{#2endyear} @@ -756,7 +773,7 @@ \let\lbx@lt@ifdropmonthstring\@secondoftwo \let\lbx@lt@ifdropyearstring\@secondoftwo \enddatecircaprint - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\iffieldsequal{#2year}{#2endyear} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{}{}{#2endday}} @@ -764,8 +781,8 @@ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}% \blx@printtime{#2}{end}} {\iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibseasondate#1}{}{#2endseason}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% + {\csuse{mkbibyeardivisiondate#1}{}{#2endyeardivision}} + {\csuse{mkbibyeardivisiondate#1}{#2endyear}{#2endyeardivision}}}% \printfield{extradate}% \enddateuncertainprint \dateeraprint{#2endyear}}}}}% @@ -778,13 +795,13 @@ {\blx@nounit} {\printtext[{#2date}]{% \datecircaprint - % Such a season component can only come from an ISO8601 season which replaces + % Such a yeardivision component can only come from an ISO8601 yeardivision which replaces % a normal month so if it exists, we know that a normal date print is ruled out - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% % Optionally print the time after the date \blx@printtime{#2}{}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}}% \dateuncertainprint \dateeraprint{#2year}% \iffieldundef{#2endyear} @@ -793,11 +810,11 @@ {\mbox{\csuse{lbx@lt@bibdaterangesep#1}}} {\csuse{lbx@lt@bibdaterangesep#1}% \enddatecircaprint - \iffieldundef{#2endseason} + \iffieldundef{#2endyeardivision} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% % Optionally print the time after the date \blx@printtime{#2}{end}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + {\csuse{mkbibyeardivisiondate#1}{#2endyear}{#2endyeardivision}}% \enddateuncertainprint \dateeraprint{#2endyear}}}}}% \endgroup} @@ -809,13 +826,13 @@ {\blx@nounit} {\printtext[{#2date}]{% \datecircaprint - % Such a season component can only come from an ISO8601 season which replaces + % Such a yeardivision component can only come from an ISO8601 yeardivision which replaces % a normal month so if it exists, we know that a normal date print is ruled out - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% % Optionally print the time after the date \blx@printtime{#2}{}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}}% \dateuncertainprint \dateeraprint{#2year}% \iffieldundef{#2endyear} @@ -825,11 +842,11 @@ \mbox{\csuse{lbx@lt@bibdaterangesep#1}}} {\csuse{lbx@lt@bibdaterangesep#1}% \enddatecircaprint - \iffieldundef{#2endseason} + \iffieldundef{#2endyeardivision} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% % Optionally print the time after the date \blx@printtime{#2}{end}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% + {\csuse{mkbibyeardivisiondate#1}{#2endyear}{#2endyeardivision}}}% \printfield{extradate}% \enddateuncertainprint \dateeraprint{#2endyear}}}}% diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/magyar.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/magyar.lbx index 73bfdebbea2..daff5ea6011 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/magyar.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/magyar.lbx @@ -1,20 +1,6 @@ \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 carefully, especially with non-\MessageBreak - standard styles or customisations to field formats.\MessageBreak - This warning can be disabled by calling\MessageBreak - '\string\BiblatexHungarianWarningOff'\MessageBreak - after 'biblatex' has been loaded, but before\MessageBreak - the localisation is loaded for the first time}% - \global\let\lbx@hu@loadinfo\@empty} - {} - \DeclareRedundantLanguages{magyar}{magyar,hungarian} \DeclareBibliographyExtras{% @@ -65,7 +51,7 @@ {} {\mkdayzeros{\thefield{#3}}\lbx@hu@ifdayrange{}{\adddot}}% }% - \let\mkbibseasondatelong\mkbibseasondateshort + \let\mkbibyeardivisiondatelong\mkbibyeardivisiondateshort \savecommand\mkdaterangecomp \savecommand\mkdaterangecompextra \savecommand\mkdaterangeterse @@ -94,12 +80,12 @@ {\bibtimezonesep \mkbibtimezone{\thefield{#4}}}}% \csletcs{mkbibtime12h}{mkbibtime24h}% - \protected\def\mkbibseasondateshort#1#2{% + \protected\def\mkbibyeardivisiondateshort#1#2{% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}% \iffieldundef{#1}{}{\adddot\space}% - \mkbibseason{\thefield{#2}}% + \mkbibyeardivision{\thefield{#2}}% }% - \let\mkbibseasondatelong\mkbibseasondateshort + \let\mkbibyeardivisiondatelong\mkbibyeardivisiondateshort \savecommand\lbx@lfromlang \savecommand\lbx@sfromlang \def\lbx@lfromlang{% @@ -642,6 +628,23 @@ summer = {{ny\'ar}{ny\'ar}}, autumn = {{\H{o}sz}{\H{o}sz}}, winter = {{t\'el}{t\'el}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing am = {{d\'elel\H{o}tt}{de\adddot}}, pm = {{d\'elut\'an}{du\adddot}}, } @@ -666,10 +669,10 @@ {} {\printtext[{#2date}]{% \datecircaprint - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \blx@printtime{#2}{}}% - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}}% \dateeraprint{#2year}% \dateuncertainprint \iffieldundef{#2endyear} @@ -679,7 +682,7 @@ {\lbx@hu@ifdayrange{\bibrangedash}{\bibdaterangesep}% \let\lbx@hu@ifplainday\@secondoftwo \enddatecircaprint - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\iffieldsequal{#2year}{#2endyear} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{}{}{#2endday}} @@ -687,8 +690,8 @@ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}% \blx@printtime{#2}{end}} {\iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibseasondate#1}{}{#2endseason}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% + {\csuse{mkbibyeardivisiondate#1}{}{#2endyeardivision}} + {\csuse{mkbibyeardivisiondate#1}{#2endyear}{#2endyeardivision}}}% \enddateuncertainprint \dateeraprint{#2endyear}}}}}% \endgroup} @@ -706,10 +709,10 @@ {} {\printtext[{#2date}]{% \datecircaprint - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \blx@printtime{#2}{}}% - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}}% \dateeraprint{#2year}% \dateuncertainprint \iffieldundef{#2endyear} @@ -720,7 +723,7 @@ {\lbx@hu@ifdayrange{\bibrangedash}{\bibdaterangesep}% \let\lbx@hu@ifplainday\@secondoftwo \enddatecircaprint - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\iffieldsequal{#2year}{#2endyear} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{}{}{#2endday}} @@ -728,8 +731,8 @@ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}% \blx@printtime{#2}{end}} {\iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibseasondate#1}{}{#2endseason}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% + {\csuse{mkbibyeardivisiondate#1}{}{#2endyeardivision}} + {\csuse{mkbibyeardivisiondate#1}{#2endyear}{#2endyeardivision}}}% \printfield{extradate}% \enddateuncertainprint \dateeraprint{#2endyear}}}}}% diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/marathi.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/marathi.lbx new file mode 100644 index 00000000000..2357b48b3e6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/marathi.lbx @@ -0,0 +1,557 @@ +% हे काम ११ ऑक्टोबर, २०२० रोजी निरंजन ह्यांनी सादर केले. +% ह्यातील बहुतांश शब्दांकरिता भाषा संचालनालयाच्या भाषाविज्ञान +% व वाङ्मयविद्या परिभाषा कोश तसेच ग्रंथालयशास्त्र परिभाषा कोश +% ह्या दोन परिभाषा कोशांचा संदर्भ घेतला आहे. +% ह्यात सुधारणा सुचवण्याकरिता ह्या कोशांचा आधार जरूर +% घेण्यात यावा. भाषा संचालनालयाच्या कोशांतील शब्दांचे +% शोधसुकर अर्थ पुढील संकेतस्थळावरून शोधता येऊ शकतात. +% https://shabdakosh.marathi.gov.in/ + +\ProvidesFile{marathi.lbx} +[\abx@lbxid] + + +\lbx@ifutfinput + {} + {\PackageError{biblatex} + {Marathi requires UTF-8 support} + {The file 'marathi.lbx' requires UTF-8 encoding but you + seem\MessageBreak to be using a different encoding. + This is a fatal error. I will\MessageBreak abort loading + marathi.lbx now.}% + \endinput} + + +\DeclareBibliographyExtras{% + \protected\def\bibrangedash{-}% + \let\finalandcomma=\empty + % there is some housekeeping to do if we want to use non-ASCII digits + % first we declare Devanagari numerals as valid numerals + % this will let us pass \ifnumeral tests etc. + % \lbx@dononasciinumerals is a core hook to allo .lbx files to inject + % valid numerals + \savecommand\lbx@dononasciinumerals + \def\lbx@dononasciinumerals{\do\०\do\१\do\२\do\३\do\४\do\५\do\६\do\७\do\८\do\९}% + % since we want to calculate with Devanagari numbers, + % we need to convert them to US-ASCII numbers + % \blx@dononasciicomputablenumerals and \blx@initcomputableequivs + % are both used by \def\blx@defcomputableequivalent + \savecommand\blx@dononasciicomputablenumerals + \savecommand\blx@initcomputableequivs + \let\blx@dononasciicomputablenumerals\@empty + \let\blx@initcomputableequivs\@empty + % map Devanagari digit to US-ASCII digit + \blx@defcomputableequivalent{\०}{\0}% + \blx@defcomputableequivalent{\१}{\1}% + \blx@defcomputableequivalent{\२}{\2}% + \blx@defcomputableequivalent{\३}{\3}% + \blx@defcomputableequivalent{\४}{\4}% + \blx@defcomputableequivalent{\५}{\5}% + \blx@defcomputableequivalent{\६}{\6}% + \blx@defcomputableequivalent{\७}{\7}% + \blx@defcomputableequivalent{\८}{\8}% + \blx@defcomputableequivalent{\९}{\9}% + % we will use getcomputableequivalent to obtain the ASCII-number + % whenever we actually need a number for computations + \protected\def\mkbibordinal#1{% + \begingroup + \blx@imc@getcomputableequivalent{#1}{\blx@tempa}% + \@tempcnta0\blx@tempa\relax + #1% + \ifcase\@tempcnta व\or ल\or र\or र\or थ\else व\fi + \endgroup}% + \protected\def\mkbibmascord#1{\mkbibordinal{#1}ा}% + \protected\def\mkbibfemord#1{\mkbibordinal{#1}ी}% + \protected\def\mkbibneutord#1{\mkbibordinal{#1}े}% + \savecommand\mkbibordedition + \savecommand\mkbibordseries + \def\mkbibordedition{\mkbibfemord}% + \def\mkbibordseries{\mkbibmascord}% + \savecommand\blx@comprange@check + \def\blx@comprange@check#1#2{% + \blx@imc@ifinteger{#1} + {\blx@imc@ifinteger{#2}} + {\@secondoftwo} + {\blx@comprange@comp{#1}{#2}} + {\blx@imc@hascomputableequivalent{#1} + {\blx@imc@hascomputableequivalent{#2}} + {\@secondoftwo} + {\begingroup + \blx@imc@getcomputableequivalent{#1}{\blx@tempa}% + \blx@imc@getcomputableequivalent{#2}{\blx@tempb}% + \edef\blx@tempc{\endgroup + \noexpand\blx@comprange@comp{\blx@tempa}{\blx@tempb}}% + \blx@tempc} + {\begingroup + \protected@edef\blx@tempc{\endgroup + \blx@range@out@value{% + \blx@range@out@item@process{\unexpanded{#1}}% + \noexpand\bibrangedash + \blx@range@out@item@process{\unexpanded{#2}}}}% + \blx@tempc}}}% + \savefieldformat[article]{series}% + \savefieldformat[periodical]{series}% + \DeclareFieldFormat[article,periodical]{series}{% series of a journal + \blx@imc@ifiscomputable{#1} + {\mkbibordseries{#1}~\bibstring{jourser}} + {\ifbibstring{#1}{\bibstring{#1}}{#1}}}% + \savefieldformat{edition}% + \DeclareFieldFormat{edition}{% + \blx@imc@ifiscomputable{#1} + {\mkbibordedition{#1}~\bibstring{edition}} + {#1\isdot}}% + \savecommand\mknumalph + \protected\def\mknumalph#1{% + \begingroup + \blx@imc@getcomputableequivalent{#1}{\blx@tempa}% + \blx@tempcnta=\blx@tempa\relax + \blx@numalph\blx@tempcnta + \endgroup}% + \savecommand\blx@numalph + \def\blx@numalph#1{% + \ifcase#1\relax\blx@warning@entry{Value \number#1 out of range}\number#1\or + अ\or आ\or इ\or ई\or उ\or ऊ\or ए\or ऐ\or ओ\or औ\or अं\or अः\or क\or + ख\or ग\or घ\or ङ\or च\or छ\or ज\or झ\or ञ\or ट\or ठ\or ड\or ढ\or + ण\or त\or थ\or द\or ध\or न\or प\or फ\or ब\or भ\or म\or य\or र\or + ल\or व\or श\or ष\or स\or ह\or ळ\or क्ष\or ज्ञ\else + \blx@warning@entry{Value \number#1 out of range}\number#1\fi}% + \savecommand\mkbibmonth + \protected\def\mkbibmonth#1{% + \begingroup + \begingroup + \edef\blx@tempb{\endgroup + \noexpand\blx@imc@getcomputableequivalent + {#1} + {\noexpand\blx@tempa}}% + \blx@tempb + \ifcase0\blx@tempa\relax + \blx@warning@entry{Month out of range or not an integer}% + \or\abx@bibmonth{january}% + \or\abx@bibmonth{february}% + \or\abx@bibmonth{march}% + \or\abx@bibmonth{april}% + \or\abx@bibmonth{may}% + \or\abx@bibmonth{june}% + \or\abx@bibmonth{july}% + \or\abx@bibmonth{august}% + \or\abx@bibmonth{september}% + \or\abx@bibmonth{october}% + \or\abx@bibmonth{november}% + \or\abx@bibmonth{december}% + \else + \blx@warning@entry{Month out of range}#1% + \fi + \endgroup}% + \protected\def\mkbibdatelong#1#2#3{% + \iffieldundef{#3} + {} + {\mkdayzeros{\thefield{#3}}% + \iffieldundef{#2}{}{\nobreakspace}}% + \iffieldundef{#2} + {} + {\mkbibmonth{\thefield{#2}}% + \iffieldundef{#1}{}{\iffieldundef{#3}{}{\addcomma}\space}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% + \protected\def\mkbibdateshort#1#2#3{% + \iffieldundef{#3} + {} + {\mkdayzeros{\thefield{#3}}% + \iffieldundef{#2}{}{/}}% + \iffieldundef{#2} + {} + {\mkmonthzeros{\thefield{#2}}% + \iffieldundef{#1}{}{/}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1} + {} + {\mktimezeros{\thefield{#1}}% + \iffieldundef{#2}{}{\bibtimesep}}% + \iffieldundef{#2} + {} + {\mktimezeros{\thefield{#2}}% + \iffieldundef{#3}{}{\bibtimesep}}% + \iffieldundef{#3} + {} + {\mktimezeros{\thefield{#3}}}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \space + \stripzeros{\mktimehh{\thefield{#1}}}% + \bibtimesep + \mktimezeros{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \mktimezeros{\thefield{#3}}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \savefieldformat{url}% + \DeclareFieldFormat{url}{\bibstring{url}\addcolon\space\url{#1}}% + \savefieldformat{urldate}% + \DeclareFieldFormat{urldate}{\mkbibparens{#1\addspace\bibstring{urlseen}}}% +} + +\UndeclareBibliographyExtras{% + \restorecommand\lbx@dononasciinumerals + \restorecommand\blx@dononasciicomputablenumerals + \restorecommand\blx@initcomputableequivs + \restorecommand\blx@comprange@check + \restorecommand\mkbibordedition + \restorecommand\mkbibordseries + \restorecommand\mknumalph + \restorecommand\blx@numalph + \restorecommand\mkbibmonth + \restorefieldformat{url}% + \restorefieldformat{urldate}% + \restorefieldformat[article]{series}% + \restorefieldformat[periodical]{series}% + \restorefieldformat{edition}% +} + +\DeclareBibliographyStrings{% + bibliography = {{संदर्भसूची}{संदर्भसूची}}, + references = {{संदर्भ}{संदर्भ}}, + shorthands = {{संक्षेपसूची}{संक्षेप}}, + editor = {{संपादक}{संपा\adddot}}, + editors = {{संपादक}{संपा\adddot}}, + compiler = {{संग्राहक}{संग्रा\adddot}}, + compilers = {{संग्राहक}{संग्रा\adddot}}, + redactor = {{पाठशोधक}{पाठ\adddot}}, + redactors = {{पाठशोधक}{पाठ\adddot}}, + reviser = {{पुनरीक्षक}{पुन\adddot}}, + revisers = {{पुनरीक्षक}{पुन\adddot}}, + founder = {{संस्थापक}{संस्था\adddot}}, + founders = {{संस्थापक}{संस्था\adddot}}, + collaborator = {{सहलेखक}{सह\adddot}},% FIXME: unsure + collaborators = {{सहलेखक}{सहलेखक\adddot}},% FIXME: unsure + translator = {{अनुवादक}{अनु\adddot}}, + translators = {{अनुवादक}{अनु\adddot}}, + commentator = {{समालोचक}{समा\adddot}}, + commentators = {{समालोचक}{समा\adddot}}, + annotator = {{टीपालेखक}{टीपा\adddot}}, + annotators = {{टीपालेखक}{टीपा\adddot}}, + commentary = {{समालोचन}{समा\adddot}}, + annotations = {{टीपा}{टीपा}}, + introduction = {{प्रस्तावना}{प्रस्ता\adddot}}, + foreword = {{प्रास्ताविक}{प्रास्ता\adddot}}, + editortr = {{संपादक आणि अनुवादक}% + {संपा\adddotspace व अनु\adddot}}, + editorstr = {{संपादक आणि अनुवादक}% + {संपा\adddotspace व अनु\adddot}}, + editorco = {{संपादक आणि भाष्यकार}% + {संपा\adddotspace व भाष्य}}, + editorsco = {{संपादक आणि भाष्यकार}% + {संपा\adddotspace व भाष्य}}, + editoran = {{संपादक आणि टीपालेखक}% + {संपा\adddotspace व टीपा\adddot}}, + editorsan = {{संपादक आणि टीपालेखक}% + {संपा\adddotspace व टीपा\adddot}}, + editorin = {{संपादक आणि प्रस्तावना}% + {संपा\adddotspace व प्रस्ता\adddot}}, + editorsin = {{संपादक व प्रस्तावना}% + {संपा\adddotspace व प्रस्ता\adddot}}, + editorfo = {{संपादक व प्रास्ताविक}% + {संपा\adddotspace व प्रास्ता\adddot}}, + editorsfo = {{संपादक व प्रास्ताविक}% + {संपा\adddotspace व प्रास्ता\adddot}}, + editortrco = {{संपादक, अनुवादक व भाष्यकार}% + {संपा.\addabbrvspace अनु\adddot व भाष्य}}, + editorstrco = {{संपादक, अनुवादक व भाष्यकार}% + {संपा.\addabbrvspace अनु\adddot व भाष्य}}, + editortran = {{संपादक, अनुवादक व टीपालेखक}% + {संपा.\addabbrvspace अनु\adddot व टीपा\adddot}}, + editorstran = {{संपादक, अनुवादक व टीपालेखक}% + {संपा.\addabbrvspace अनु\adddot व टीपा\adddot}}, + editortrin = {{संपादक, अनुवादक व प्रस्तावना}% + {संपा.\addabbrvspace अनु\adddot व प्रस्ता\adddot}}, + editorstrin = {{संपादक, अनुवादक व प्रस्तावना}% + {संपा.\addabbrvspace अनु\adddot व प्रस्ता\adddot}}, + editortrfo = {{संपादक, अनुवादक व प्रास्ताविक}% + {संपा.\addabbrvspace अनु\adddot व प्रास्ता\adddot}}, + editorstrfo = {{संपादक, अनुवादक व प्रास्ताविक}% + {संपा.\addabbrvspace अनु\adddot व प्रास्ता\adddot}}, + editorcoin = {{संपादक, भाष्यकार व प्रस्तावना}% + {संपा.\addabbrvspace भाष्य व प्रस्ता\adddot}}, + editorscoin = {{संपादक, भाष्यकार व प्रस्तावना}% + {संपा.\addabbrvspace भाष्य व प्रस्ता\adddot}}, + editorcofo = {{संपादक, भाष्यकार व प्रास्ताविक}% + {संपा.\addabbrvspace भाष्य व प्रास्ता\adddot}}, + editorscofo = {{संपादक, भाष्यकार व प्रास्ताविक}% + {संपा.\addabbrvspace भाष्य व प्रास्ता\adddot}}, + editoranin = {{संपादक, टीपालेखक व प्रस्तावना}% + {संपा.\addabbrvspace टीपा\adddot व प्रस्ता\adddot}}, + editorsanin = {{संपादक, टीपालेखक व प्रस्तावना}% + {संपा.\addabbrvspace टीपा\adddot व प्रस्ता\adddot}}, + editoranfo = {{संपादक, टीपालेखक व प्रास्ताविक}% + {संपा.\addabbrvspace टीपा\adddot व प्रास्ता\adddot}}, + editorsanfo = {{संपादक, टीपालेखक व प्रास्ताविक}% + {संपा.\addabbrvspace टीपा\adddot व प्रास्ता\adddot}}, + editortrcoin = {{संपादक, अनुवादक, भाष्यकार व प्रस्तावना}% + {संपा.\addabbrvspace अनु., भाष्य व प्रस्ता\adddot}}, + editorstrcoin = {{संपादक, अनुवादक, भाष्यकार व प्रस्तावना}% + {संपा.\addabbrvspace अनु., भाष्य व प्रस्ता\adddot}}, + editortrcofo = {{संपादक, अनुवादक, भाष्यकार व प्रास्ताविक}% + {संपा.\addabbrvspace अनु., भाष्य व प्रास्ता\adddot}}, + editorstrcofo = {{संपादक, अनुवादक, भाष्यकार व प्रास्ताविक}% + {संपा.\addabbrvspace अनु., भाष्य व प्रास्ता\adddot}}, + editortranin = {{संपादक, अनुवादक, टीपालेखक व प्रस्तावना}% + {संपा.\addabbrvspace अनु., टीपा\adddot व प्रस्ता\adddot}}, + editorstranin = {{संपादक, अनुवादक, टीपालेखक व प्रस्तावना}% + {संपा.\addabbrvspace अनु., टीपा\adddot व प्रस्ता\adddot}}, + editortranfo = {{संपादक, अनुवादक, टीपालेखक व प्रास्ताविक}% + {संपा.\addabbrvspace अनु., टीपा\adddot व प्रास्ता\adddot}}, + editorstranfo = {{संपादक, अनुवादक, टीपालेखक व प्रास्ताविक}% + {संपा.\addabbrvspace अनु., टीपा\adddot व प्रास्ता\adddot}}, + translatorco = {{अनुवादक व भाष्य}% + {अनु\adddot\ व भाष्य}}, + translatorsco = {{अनुवादक व भाष्यकार}% + {अनु\adddot\ व भाष्य}}, + translatoran = {{अनुवादक व टीपालेखक}% + {अनु\adddot\ व टीपा\adddot}}, + translatorsan = {{अनुवादक व टीपालेखक}% + {अनु\adddot\ व टीपा\adddot}}, + translatorin = {{अनुवाद व प्रस्तावना}% + {अनु\adddot\ व प्रस्ता\adddot}}, + translatorsin = {{अनुवाद व प्रस्तावना}% + {अनु\adddot\ व प्रस्ता\adddot}}, + translatorfo = {{अनुवाद व प्रास्ताविक}% + {अनु\adddot\ व प्रास्ता\adddot}}, + translatorsfo = {{अनुवाद व प्रास्ताविक}% + {अनु\adddot\ व प्रास्ता\adddot}}, + translatorcoin = {{अनुवाद, समालोचन व प्रस्तावना}% + {अनु., भाष्य व प्रस्ता\adddot}}, + translatorscoin = {{अनुवाद, समालोचन व प्रस्तावना}% + {अनु., भाष्य व प्रस्ता\adddot}}, + translatorcofo = {{अनुवाद, समालोचन व प्रास्ताविक}% + {अनु., भाष्य व प्रास्ता\adddot}}, + translatorscofo = {{अनुवाद, समालोचन व प्रास्ताविक}% + {अनु., भाष्य व प्रास्ता\adddot}}, + translatoranin = {{अनुवाद, टीपा व प्रस्तावना}% + {अनु., टीपा\adddot व प्रस्ता\adddot}}, + translatorsanin = {{अनुवाद, टीपा व प्रस्तावना}% + {अनु., टीपा\adddot व प्रस्ता\adddot}}, + translatoranfo = {{अनुवाद, टीपा व प्रास्ताविक}% + {अनु., टीपा\adddot व प्रास्ता\adddot}}, + translatorsanfo = {{अनुवाद, टीपालेखन व प्रास्ताविक}% + {अनु., टीपा\adddot व प्रास्ता\adddot}}, + organizer = {{आयोजक}{आयो\adddot}}, + organizers = {{आयोजक}{आयो\adddot}}, + byorganizer = {{आयोजित}{आयो\adddot}}, + byauthor = {{लेखन}{लेखन}}, + byeditor = {{संपादित}{संपा\adddot}}, + bycompiler = {{संग्रहण}{संग्र\adddot}}, + byredactor = {{पाठशोधित}{पाठ\adddot}}, + byreviser = {{पुनरीक्षक}{पुन.\adddot}}, + byreviewer = {{परीक्षण}{परी\adddot}}, + byfounder = {{संस्थापना}{संस्था\adddot}}, + bycontinuator = {{क्रमशः}{क्रम\adddot}}, + bytranslator = {{\lbx@lfromlang\ तून अनुवादित}{\lbx@sfromlang\ अनु\adddot}}, + bycommentator = {{भाष्य}{भाष्य}}, + byannotator = {{टीपांसहित}{टीपा\adddot}}, + withcommentator = {{समालोचन}{समा\adddot}}, + withannotator = {{टीपांसह}{टीपा}}, + withintroduction = {{प्रस्तावनेसह}{प्रस्तावनेसह}}, + withforeword = {{प्रास्ताविकासह}{प्रास्ता\adddot}}, + byeditortr = {{संपादित व \lbx@lfromlang\ अनुवादित}% + {संपा\adddotspace व \lbx@sfromlang\ अनु\adddot}}, + byeditorco = {{संपादित व समालोचित}% + {संपा\adddotspace व भाष्य}}, + byeditoran = {{संपादित व टीपांसहित}% + {संपा\adddotspace व टीपा\adddot}}, + byeditorin = {{संपादित, प्रस्तावना}% + {संपा.\addabbrvspace प्रस्ता\adddot}}, + byeditorfo = {{संपादित, प्रास्ताविकासह}% + {संपा.\addabbrvspace प्रास्ता\adddot}}, + byeditortrco = {{संपादित, \lbx@lfromlang\ अनुवादित व समालोचित}% + {संपा.\addabbrvspace \lbx@sfromlang\ अनु\adddot\ व भाष्य}}, + byeditortran = {{संपादित, \lbx@lfromlang\ अनुवादित व टीपांसहित}% + {संपा.\addabbrvspace \lbx@sfromlang\ अनु\adddot\ व टीपा\adddot}}, + byeditortrin = {{संपादित व \lbx@lfromlang\ अनुवादित, प्रस्तावना}% + {संपा\adddotspace व \lbx@sfromlang\ अनु\adddot\, प्रस्ता\adddot}}, + byeditortrfo = {{संपादित व \lbx@lfromlang\ अनुवादित, प्रास्ताविकासह}% + {संपा\adddotspace व \lbx@sfromlang\ अनु\adddot\, प्रास्ताविकासह\adddot}}, + byeditorcoin = {{संपादित व समालोचित, प्रस्तावना}% + {संपा\adddotspace व समा., प्रस्ता\adddot}}, + byeditorcofo = {{संपादित व समालोचित, प्रास्ताविकासह}% + {संपा\adddotspace व समा., प्रास्ताविकासह\adddot}}, + byeditoranin = {{संपादित व टीपांसहित, प्रस्तावना}% + {संपा\adddotspace व टीपा., प्रस्ता\adddot}}, + byeditoranfo = {{संपादित व टीपांसहित, प्रास्ताविकासह}% + {संपा\adddotspace व टीपा., प्रास्ताविकासह\adddot}}, + byeditortrcoin = {{संपादित, \lbx@lfromlang\ अनुवादित व समालोचित, प्रस्तावना}% + {संपा.\addabbrvspace \lbx@sfromlang\ अनु\adddot व समा., प्रस्ता\adddot}}, + byeditortrcofo = {{संपादित, \lbx@lfromlang\ अनुवादित व समालोचित, प्रास्ताविकासह}% + {संपा.\addabbrvspace \lbx@sfromlang\ अनु\adddot\ व समा., प्रास्ताविकासह}}, + byeditortranin = {{संपादित, \lbx@lfromlang\ अनुवादित व टीपांसहित, प्रस्तावना}% + {संपा.\addabbrvspace \lbx@sfromlang\ अनु\adddot\ व टीपा, प्रस्ता\adddot}}, + byeditortranfo = {{संपादित, \lbx@lfromlang\ अनुवादित व टीपांसहित, प्रास्ताविकासह}% + {संपा.\addabbrvspace \lbx@sfromlang\ अनु\adddot\ व टीपा, प्रास्ताविकासह}}, + bytranslatorco = {{\lbx@lfromlang\ अनुवादित व समालोचित}% + {\lbx@sfromlang\ अनु\adddot\ व भाष्य}}, + bytranslatoran = {{\lbx@lfromlang\ अनुवादित व टीपांसहित}% + {\lbx@sfromlang\ अनु\adddot\ व टीपा}}, + bytranslatorin = {{\lbx@lfromlang\ अनुवादित, प्रस्तावना}% + {\lbx@sfromlang\ अनु\adddot\, प्रस्ता\adddot}}, + bytranslatorfo = {{\lbx@lfromlang\ अनुवादित, प्रास्ताविकासह}% + {\lbx@sfromlang\ अनु\adddot\, प्रास्ताविकासह\adddot}}, + bytranslatorcoin = {{\lbx@lfromlang\ अनुवादित व समालोचित, प्रस्तावना}% + {\lbx@sfromlang\ अनु\adddot\ व समा., प्रस्ता\adddot}}, + bytranslatorcofo = {{\lbx@lfromlang\ अनुवादित व समालोचित, प्रास्ताविकासह}% + {\lbx@sfromlang\ अनु\adddot\ व समा., प्रास्ताविकासह\adddot}}, + bytranslatoranin = {{\lbx@lfromlang\ अनुवादित व टीपांसहित, प्रस्तावना}% + {\lbx@sfromlang\ अनु\adddot\ व टीपा, प्रस्ता\adddot}}, + bytranslatoranfo = {{\lbx@lfromlang\ अनुवादित व टीपांसहित, प्रास्ताविकासह}% + {\lbx@sfromlang\ अनु\adddot\ व टीपा, प्रास्ताविकासह\adddot}}, + and = {{आणि}{व}}, + andothers = {{व इतर}{व इतर}}, + andmore = {{व इतर}{व इतर}}, + volume = {{खंड}{खंड}}, + volumes = {{खंड}{खंड}}, + jourvol = {{खंड}{खंड}}, + jourser = {{अंक}{अंक}}, + book = {{पुस्तक}{पुस्तक}}, + part = {{खंड}{खंड}}, + edition = {{आवृत्ती}{आ\adddot}}, + reprintfrom = {{पुनर्प्रकाशित}{पुन\adddot}}, + translationof = {{अनुवाद}{अनु\adddot}}, + translationas = {{अनुवादित}{अनु\adddot}}, + translationfrom = {{अनुवादित}{अनु\adddot}}, + origpubas = {{मूळ आवृत्ती}{मूळ\adddotspace आ\adddot}}, + origpubin = {{मूळ आवृत्ती}{मूळ\adddotspace आ\adddot}}, + bypublisher = {{प्रकाशन}{प्रका\adddot}}, + nodate = {{दिनांक अनिर्दिष्ट}{दिनांक अनिर्दिष्ट}}, + page = {{पृष्ठ}{पृ\adddot}}, + pages = {{पृष्ठे}{पृ\adddot}}, + column = {{स्तंभ}{स्तंभ}}, + columns = {{स्तंभ}{स्तंभ}}, + line = {{ओळ}{ओळ}}, + lines = {{ओळी}{ओळी}}, + verse = {{कडवे}{कडवे}}, + verses = {{कडवी}{कडवी}}, + section = {{विभाग}{विभाग}}, + sections = {{विभाग}{विभाग}}, + paragraph = {{परिच्छेद}{परि\adddot}}, + paragraphs = {{परिच्छेद}{परि\adddot}}, + pagetotal = {{पृष्ठ}{पृ\adddot}}, + pagetotals = {{पृष्ठे}{पृ\adddot}}, + columntotal = {{स्तंभ}{स्तंभ}}, + columntotals = {{स्तंभ}{स्तंभ}}, + linetotal = {{ओळ}{ओळ}}, + linetotals = {{ओळी}{ओळी}}, + versetotal = {{कडवे}{कडवे}}, + versetotals = {{कडवी}{कडवी}}, + sectiontotal = {{विभाग}{विभाग}}, + sectiontotals = {{विभाग}{विभाग}}, + paragraphtotal = {{परिच्छेद}{परि\adddot}}, + paragraphtotals = {{परिच्छेद}{परि\adddot}}, + in = {{समाविष्ट}{समाविष्ट}}, + inseries = {{समाविष्ट}{समाविष्ट}}, + number = {{क्रमांक}{क्र\adddot}}, + chapter = {{प्रकरण}{प्रकरण}}, + bathesis = {{पदवी प्रबंध}{पदवी प्रबंध}}, + mathesis = {{पदव्युत्तर प्रबंध}{पदव्युत्तर प्रबंध}}, + phdthesis = {{पीएचडी प्रबंध}{पीएचडी प्रबंध}}, + candthesis = {{उमेदवार निबंध}{उमे\adddotspace निबंध}}, + resreport = {{शोधअहवाल}{शोधअहवाल}}, + techreport = {{तांत्रिक अहवाल}{तां\adddotspace अह\adddot}}, + software = {{संगणकीय कार्यप्रणाली}{संग\adddotspace कार्यप्रणाली}}, + audiocd = {{ध्वनिफीत}{ध्वनिफीत}}, + version = {{आवृत्ती}{आवृत्ती}}, + url = {{दुवा}{दुवा}}, + urlfrom = {{उपलब्ध}{उपलब्ध}}, + urlseen = {{भेट दिली}{भेट दिली}}, + inpreparation = {{प्रगतिपथावर}{प्रगतिपथावर}}, + submitted = {{सादर केलेले}{सादर केलेले}}, + forthcoming = {{आगामी}{आगामी}}, + prepublished = {{पूर्वप्रकाशित}{पूर्वप्रकाशित}}, + thiscite = {{खासकरून}{खासकरून}}, + seenote = {{टीप पाहा}{टीप पाहा}}, + quotedin = {{उद्धृत}{उद्धृत}}, + see = {{पाहा}{पाहा}}, + seealso = {{हेदेखील पाहा}{हेदेखील पाहा}}, + january = {{जानेवारी}{जाने\adddot}}, + february = {{फेब्रुवारी}{फेब्रु\adddot}}, + march = {{मार्च}{मार्च\adddot}}, + april = {{एप्रिल}{एप्रि\adddot}}, + may = {{मे}{मे}}, + june = {{जून}{जून}}, + july = {{जुलै}{जुलै}}, + august = {{ऑगस्ट}{ऑग\adddot}}, + september = {{सप्टेंबर}{सप्टें\adddot}}, + october = {{ऑक्टोबर}{ऑक्टो\adddot}}, + november = {{नोव्हेंबर}{नोव्हें\adddot}}, + december = {{डिसेंबर}{डिसें\adddot}}, + langenglish = {{इंग्रजी}{इंग्रजी}}, + langfrench = {{फ्रेंच}{फ्रेंच}}, + langgerman = {{जर्मन}{जर्मन}}, + langgreek = {{ग्रीक}{ग्रीक}}, + langjapanese = {{जपानी}{जपानी}}, + langportuguese = {{पोर्तुगीज}{पोर्तुगीज}}, + langrussian = {{रशियन}{रशियन}}, + langspanish = {{स्पॅनिश}{स्पॅनिश}}, + langswedish = {{स्वीडी}{स्वीडी}}, + fromdutch = {{डचमधून}{डचमधून}}, + fromenglish = {{इंग्रजीतून}{इंग्रजीतून}}, + fromfrench = {{फ्रेंचमधून}{फ्रेंचमधून}}, + fromgerman = {{जर्मनमधून}{जर्मनमधून}}, + fromgreek = {{ग्रीकमधून}{ग्रीकमधून}}, + fromjapanese = {{जपानीतून}{जपानीतून}}, + fromlatin = {{लॅटिनमधून}{लॅटिनमधून}}, + fromportuguese = {{पोर्तुगीजमधून}{पोर्तुगीजमधून}}, + fromrussian = {{रशियनमधून}{रशियनमधून}}, + fromspanish = {{स्पॅनिशमधून}{स्पॅनिशमधून}}, + fromswedish = {{स्वीडीतून}{स्वीडीतून}}, + patent = {{पेटंट}{पे\adddot}}, + file = {{धारिका}{धारिका}}, + library = {{ग्रंथालय}{ग्रंथालय}}, + abstract = {{सारांश}{सारांश}}, + annotation = {{टीपा}{टीपा}}, + commonera = {{सामान्य युग}{सा.यु\adddot}}, + beforecommonera = {{सामान्य युग पूर्व}{सा.यु.पू\adddot}}, + annodomini = {{इसवी सन}{इ.स\adddot}}, + beforechrist = {{इ.स.पू\adddot}{इ.स.पू\adddot}}, + circa = {{सुमारे}{सुमारे}}, + spring = {{वसंत}{वसंत}}, + summer = {{उन्हाळा}{उन्हाळा}}, + autumn = {{शरद}{शरद}}, + winter = {{हिवाळा}{हिवाळा}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing + am = {{मध्यान्हपूर्व}{म.पू\adddot}}, + pm = {{मध्यान्होत्तर}{म.उ\adddot}}, +} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx index bef64fed9a9..f8078123e60 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx @@ -15,12 +15,12 @@ \iffieldbibstring{#1} {\bibstring{\thefield{#1}}} {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx index 76aa28fee66..5c6875ff509 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx @@ -63,12 +63,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -529,6 +529,23 @@ summer = {{sommer}{sommer}}, autumn = {{h{\o}st}{h{\o}st}}, winter = {{vinter}{vinter}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing am = {{a\adddot m\adddot}{a\adddot m\adddot}}, pm = {{p\adddot m\adddot}{p\adddot m\adddot}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx index 39ebe59e36a..8986c6d522d 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx @@ -310,6 +310,23 @@ summer = {{sommar}{sommar}}, autumn = {{haust}{haust}}, winter = {{vinter}{vinter}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing am = {{a\adddot m\adddot}{a\adddot m\adddot}}, pm = {{p\adddot m\adddot}{p\adddot m\adddot}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx index 50ae2383f40..37f10a4fccb 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx @@ -71,12 +71,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -289,10 +289,10 @@ byeditorin = {{zredagowany, z wst\c{e}pem}{zred., z wst\adddot}}, byeditorfo = {{zredagowany, z przedmow\c{a}}{zred., z przedm\adddot}}, byeditoraf = {{zredagowany, z pos\l owiem}{zred., z pos\l \adddot}}, - byeditortrco = {{zredagowany, t\l umaczenie \lbx@lfromlang i komentarze}% - {zred., t\l um\adddotspace \lbx@sfromlang i kom\adddot}}, - byeditortran = {{zredagowany, t\l umaczenie \lbx@lfromlang i uwagi}% - {zred., t\l um\adddotspace \lbx@sfromlang i uw\adddot}}, + byeditortrco = {{zredagowany, t\l umaczenie \lbx@lfromlang\ i komentarze}% + {zred., t\l um\adddotspace \lbx@sfromlang\ i kom\adddot}}, + byeditortran = {{zredagowany, t\l umaczenie \lbx@lfromlang\ i uwagi}% + {zred., t\l um\adddotspace \lbx@sfromlang\ i uw\adddot}}, byeditortrin = {{zredagowany, t\l umaczenie \lbx@lfromlang, wst\c{e}p}% {zred., t\l um\adddotspace \lbx@sfromlang, wst\adddot}}, byeditortrfo = {{zredagowany, t\l umaczenie \lbx@lfromlang, przedmowa}% @@ -317,16 +317,16 @@ {zred., t\l um\adddotspace \lbx@sfromlang, uw\adddotspace i przedm\adddot}}, byeditortranaf = {{zredagowany, t\l umaczenie \lbx@lfromlang, uwagi i pos\l owie}% {zred., t\l um\adddotspace \lbx@sfromlang, uw\adddotspace i pos\l \adddot}}, - bytranslatorco = {{t\l umaczenie \lbx@lfromlang i komentarze}% - {t\l um\adddotspace \lbx@sfromlang i kom\adddot}}, - bytranslatoran = {{t\l umaczenie \lbx@lfromlang i uwagi}% - {t\l um\adddotspace \lbx@sfromlang i uw\adddot}}, - bytranslatorin = {{t\l umaczenie \lbx@lfromlang i wst\c{e}p}% - {t\l um\adddotspace \lbx@sfromlang i wst\adddot}}, - bytranslatorfo = {{t\l umaczenie \lbx@lfromlang i przedmowa}% - {t\l um\adddotspace \lbx@sfromlang i przedm\adddot}}, - bytranslatoraf = {{t\l umaczenie \lbx@lfromlang i pos\l owie}% - {t\l um\adddotspace \lbx@sfromlang i pos\l \adddot}}, + bytranslatorco = {{t\l umaczenie \lbx@lfromlang\ i komentarze}% + {t\l um\adddotspace \lbx@sfromlang\ i kom\adddot}}, + bytranslatoran = {{t\l umaczenie \lbx@lfromlang\ i uwagi}% + {t\l um\adddotspace \lbx@sfromlang\ i uw\adddot}}, + bytranslatorin = {{t\l umaczenie \lbx@lfromlang\ i wst\c{e}p}% + {t\l um\adddotspace \lbx@sfromlang\ i wst\adddot}}, + bytranslatorfo = {{t\l umaczenie \lbx@lfromlang\ i przedmowa}% + {t\l um\adddotspace \lbx@sfromlang\ i przedm\adddot}}, + bytranslatoraf = {{t\l umaczenie \lbx@lfromlang\ i pos\l owie}% + {t\l um\adddotspace \lbx@sfromlang\ i pos\l \adddot}}, bytranslatorcoin = {{t\l umaczenie \lbx@lfromlang, komentarze i wst\c{e}p}% {t\l um\adddotspace \lbx@sfromlang, kom\adddotspace i wst\adddot}}, bytranslatorcofo = {{t\l umaczenie \lbx@lfromlang, komentarze i przedmowa}% @@ -550,6 +550,23 @@ summer = {{lato}{lato}}, autumn = {{jesie\'{n}}{jesie\'{n}}}, winter = {{zima}{zima}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing am = {{AM}{AM}}, pm = {{PM}{PM}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx index d408904515f..8ec26543e04 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx @@ -70,12 +70,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -287,11 +287,11 @@ byeditortran = {{editado, traduzido \lbx@lfromlang\ e anotado por}% {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e anot\adddot\ por}}, byeditortrin = {{editado, traduzido \lbx@lfromlang\ e introduzido por}% - {ed.,\addabbrvspace trad. \lbx@sfromlang\ e introd\adddot\ por}}, + {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ e introd\adddot\ por}}, byeditortrfo = {{editado, traduzido \lbx@lfromlang\ e prefaciado por}% - {ed.,\addabbrvspace trad. \lbx@sfromlang\ e pref\adddot\ por}}, + {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ e pref\adddot\ por}}, byeditortraf = {{editado, traduzido \lbx@lfromlang\ e posfaciado por}% - {ed.,\addabbrvspace trad. \lbx@sfromlang\ e posf\adddot\ por}}, + {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ e posf\adddot\ por}}, byeditorcoin = {{editado, comentado e introduzido por}% {ed.,\addabbrvspace coment\adddot\ e introd\adddot\ por}}, byeditorcofo = {{editado, comentado e prefaciado por}% @@ -534,6 +534,23 @@ summer = {{ver\~ao}{ver\~ao}}, autumn = {{outono}{outono}}, winter = {{inverno}{inverno}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing am = {{AM}{AM}}, pm = {{PM}{PM}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/romanian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/romanian.lbx new file mode 100644 index 00000000000..bc95e1ef55a --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/romanian.lbx @@ -0,0 +1,683 @@ +\ProvidesFile{romanian.lbx} +[\abx@lbxid] + +\DeclareRedundantLanguages{romanian}{romanian} + +\lbx@ifutfinput + {} + {\PackageError{biblatex} + {Romanian requires UTF-8 support} + {The file 'romanian.lbx' requires UTF-8 encoding but you + seem\MessageBreak to be using a different encoding. + This is a fatal error. I will\MessageBreak abort loading + romanian.lbx now.}% + \endinput} + +\DeclareBibliographyExtras{% + \savecommand\newunitpunct + \renewcommand*{\newunitpunct}{\addcomma\space}% + \savecommand\intitlepunct + \renewcommand*{\intitlepunct}{\addspace}% + \savecommand\subtitlepunct + \renewcommand*{\subtitlepunct}{\addperiod\space}% + \DeclareCapitalPunctuation{.:!?}% + \protected\def\bibrangedash{% + \textendash\penalty\hyphenpenalty}% breakable dash + \savecommand\bibdaterangesep + \protected\def\bibdaterangesep{% + \iftoggle{lbx@ro@dayrange} + {\textendash} + {\addnbspace\textendash\addnbspace}}% + \let\finalandcomma=\empty + \let\finalandsemicolon=\empty + \protected\def\mkbibmascord#1{% + \ifnumgreater{#1}{1} + {\autocap{a}~} + {}% + #1-lea}% + \protected\def\mkbibfemord#1{% + \ifnumgreater{#1}{1} + {\autocap{a}~} + {}% + #1-a}% + \protected\def\mkbibneutord{\mkbibmascord}% + \savecommand\mkbibordedition + \savecommand\mkbibordseries + \def\mkbibordedition{\mkbibfemord}% + \def\mkbibordseries{\mkbibfemord}% + \protected\def\mkbibdatelong#1#2#3{% + \iffieldundef{#3} + {} + {\thefield{#3}% + \iffieldundef{#2}{}{\nobreakspace}}% + \iffieldundef{#2} + {} + {\mkbibmonth{\thefield{#2}}% + \iffieldundef{#1}{}{\space}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% + \protected\def\mkbibdateshort#1#2#3{% + \iffieldundef{#3} + {} + {\thefield{#3}\adddot}% + \iffieldundef{#2} + {} + {\thefield{#2}\adddot}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1} + {} + {\mktimezeros{\thefield{#1}}% + \iffieldundef{#2}{}{\bibtimesep}}% + \iffieldundef{#2} + {} + {\mktimezeros{\thefield{#2}}% + \iffieldundef{#3}{}{\bibtimesep}}% + \iffieldundef{#3} + {} + {\mktimezeros{\thefield{#3}}}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezerosmdt{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \savecommand\mkdaterangetrunc@i + \savecommand\mkdaterangetruncextra@i + \def\mkdaterangetrunc@i{\lbx@ro@mkdaterangetrunc@i}% + \def\mkdaterangetruncextra@i{\lbx@ro@mkdaterangetruncextra@i}% +} + +\UndeclareBibliographyExtras{% + \restorecommand\bibdaterangesep + \restorecommand\newunitpunct + \restorecommand\intitlepunct + \restorecommand\subtitlepunct + \restorecommand\mkbibordedition + \restorecommand\mkbibordseries + \restorecommand\mkdaterangetrunc@i + \restorecommand\mkdaterangetruncextra@i +} + +\DeclareBibliographyStrings{% + bibliography = {{Bibliografie}{Bibliografie}}, + references = {{Referințe}{Referințe}}, + shorthands = {{Lista Abrevierilor}{Abrevieri}}, + editor = {{editor}{ed\adddot}}, + editors = {{editori}{ed\adddot}}, + compiler = {{redactor}{red\adddot}}, + compilers = {{redactori}{red\adddot}}, + redactor = {{redactor}{red\adddot}}, + redactors = {{redactori}{red\adddot}}, + reviser = {{revizor}{rev\adddot}}, + revisers = {{revizori}{rev\adddot}}, + founder = {{fondator}{fond\adddot}}, + founders = {{fondatori}{fond\adddot}}, + continuator = {{continuator}{cont\adddot}},% FIXME: unsure + continuators = {{continuatori}{cont\adddot}},% FIXME: unsure + collaborator = {{colaborator}{colab\adddot}},% FIXME: unsure + collaborators = {{colaboratori}{colab\adddot}},% FIXME: unsure + translator = {{traducător}{trad\adddot}}, + translators = {{traducători}{trad\adddot}}, + commentator = {{comentator}{coment\adddot}}, + commentators = {{comentatori}{coment\adddot}}, + annotator = {{adnotator}{adnot\adddot}}, + annotators = {{adnotatori}{adnot\adddot}}, + commentary = {{comentariu}{com\adddot}}, + annotations = {{note}{note}}, + introduction = {{introducere}{introd\adddot}}, + foreword = {{prefață}{pref\adddot}}, + afterword = {{postfață}{postf\adddot}}, + editortr = {{editor și traducător}% + {ed\adddotspace și trad\adddot}}, + editorstr = {{editori și traducători}% + {ed\adddotspace și trad\adddot}}, + editorco = {{editor și comentator}% + {ed\adddotspace și coment\adddot}}, + editorsco = {{editori și comentatori}% + {ed\adddotspace și coment\adddot}}, + editoran = {{editor și adnotator}% + {ed\adddotspace și adnot\adddot}}, + editorsan = {{editori și adnotatori}% + {ed\adddotspace și adnot\adddot}}, + editorin = {{editor și introducere}% + {ed\adddotspace și introd\adddot}}, + editorsin = {{editori și introducere}% + {ed\adddotspace și introd\adddot}}, + editorfo = {{editor și prefață}% + {ed\adddotspace și pref\adddot}}, + editorsfo = {{editori și prefață}% + {ed\adddotspace și pref\adddot}}, + editoraf = {{editor și postfață}% + {ed\adddotspace și postf\adddot}}, + editorsaf = {{editori și postfață}% + {ed\adddotspace și postf\adddot}}, + editortrco = {{editor, traducător\ și comentator}% + {ed.,\addabbrvspace trad\adddot\ și coment\adddot}}, + editorstrco = {{editori, traducători\ și comentatori}% + {ed.,\addabbrvspace trad\adddot\ și coment\adddot}}, + editortran = {{editor, traducător\ și adnotator}% + {ed.,\addabbrvspace trad\adddot\ și adnot\adddot}}, + editorstran = {{editori, traducători\ și adnotatori}% + {ed.,\addabbrvspace trad\adddot\ și adnot\adddot}}, + editortrin = {{editor, traducător\ și introducere}% + {ed.,\addabbrvspace trad\adddot\ și introd\adddot}}, + editorstrin = {{editori, traducători\ și introducere}% + {ed.,\addabbrvspace trad\adddot\ și introd\adddot}}, + editortrfo = {{editor, traducător\ și prefață}% + {ed.,\addabbrvspace trad\adddot\ și pref\adddot}}, + editorstrfo = {{editori, traducători\ și prefață}% + {ed.,\addabbrvspace trad\adddot\ și pref\adddot}}, + editortraf = {{editor, traducător\ și postfață}% + {ed.,\addabbrvspace trad\adddot\ și postf\adddot}}, + editorstraf = {{editori, traducători\ și postfață}% + {ed.,\addabbrvspace trad\adddot\ și postf\adddot}}, + editorcoin = {{editor, comentator\ și introducere}% + {ed.,\addabbrvspace coment\adddot\ și introd\adddot}}, + editorscoin = {{editori, comentatori\ și introducere}% + {ed.,\addabbrvspace coment\adddot\ și introd\adddot}}, + editorcofo = {{editor, comentator\ și prefață}% + {ed.,\addabbrvspace coment\adddot\ și pref\adddot}}, + editorscofo = {{editori, comentatori\ și prefață}% + {ed.,\addabbrvspace coment\adddot\ și pref\adddot}}, + editorcoaf = {{editor, comentator\ și postfață}% + {ed.,\addabbrvspace coment\adddot\ și postf\adddot}}, + editorscoaf = {{editori, comentatori\ și prefață}% + {ed.,\addabbrvspace coment\adddot\ și pref\adddot}}, + editoranin = {{editor, adnotator\ și introducere}% + {ed.,\addabbrvspace adnot\adddot\ și introd\adddot}}, + editorsanin = {{editori, adnotatori\ și introducere}% + {ed.,\addabbrvspace adnot\adddot\ și introd\adddot}}, + editoranfo = {{editor, adnotator\ și prefață}% + {ed.,\addabbrvspace adnot\adddot\ și pref\adddot}}, + editorsanfo = {{editori, adnotatori\ și prefață}% + {ed.,\addabbrvspace adnot\adddot\ și pref\adddot}}, + editoranaf = {{editor, adnotator\ și postfață}% + {ed.,\addabbrvspace adnot\adddot\ și postf\adddot}}, + editorsanaf = {{editori, adnotatori\ și postfață}% + {ed.,\addabbrvspace adnot\adddot\ și postf\adddot}}, + editortrcoin = {{editor, traducător, comentator\ și introducere}% + {ed.,\addabbrvspace trad., coment\adddot\ și introd\adddot}}, + editorstrcoin = {{editori, traducători, comentatori\ și introducere}% + {ed.,\addabbrvspace trad., coment\adddot\ și introd\adddot}}, + editortrcofo = {{editor, traducător, comentator\ și prefață}% + {ed.,\addabbrvspace trad., coment\adddot\ și pref\adddot}}, + editorstrcofo = {{editori, traducători, comentatori\ și prefață}% + {ed.,\addabbrvspace trad., coment\adddot\ și pref\adddot}}, + editortrcoaf = {{editor, traducător, comentator\ și postfață}% + {ed.,\addabbrvspace trad., coment\adddot\ și postf\adddot}}, + editorstrcoaf = {{editori, traducători, comentatori\ și postfață}% + {ed.,\addabbrvspace trad., coment\adddot\ și postf\adddot}}, + editortranin = {{editor, traducător, adnotator\ și introducere}% + {ed.,\addabbrvspace trad., adnot\adddot\ și introd\adddot}}, + editorstranin = {{editori, traducători, adnotatori\ și introducere}% + {ed.,\addabbrvspace trad., adnot\adddot\ și introd\adddot}}, + editortranfo = {{editor, traducător, adnotator\ și prefață}% + {ed.,\addabbrvspace trad., adnot\adddot\ și pref\adddot}}, + editorstranfo = {{editori, traducători, adnotatori\ și prefață}% + {ed.,\addabbrvspace trad., adnot\adddot\ și pref\adddot}}, + editortranaf = {{editor, traducător, adnotator\ și postfață}% + {ed.,\addabbrvspace trad., adnot\adddot\ și postf\adddot}}, + editorstranaf = {{editori, traducători, adnotatori\ și postfață}% + {ed.,\addabbrvspace trad., adnot\adddot\ și postf\adddot}}, + translatorco = {{traducător și comentator}% + {trad\adddot\ și coment\adddot}}, + translatorsco = {{traducători și comentatori}% + {trad\adddot\ și coment\adddot}}, + translatoran = {{traducător și adnotator}% + {trad\adddot\ și adnot\adddot}}, + translatorsan = {{traducători și adnotatori}% + {trad\adddot\ și adnot\adddot}}, + translatorin = {{traducere și introducere}% + {trad\adddot\ și introd\adddot}}, + translatorsin = {{traducere și introducere}% + {trad\adddot\ și introd\adddot}}, + translatorfo = {{traducere și prefață}% + {trad\adddot\ și pref\adddot}}, + translatorsfo = {{traducere și prefață}% + {trad\adddot\ și pref\adddot}}, + translatoraf = {{traducere și postfață}% + {trad\adddot\ și postf\adddot}}, + translatorsaf = {{traducere și postfață}% + {trad\adddot\ și postf\adddot}}, + translatorcoin = {{traducere, comentarii\ și introducere}% + {trad., coment\adddot\ și introd\adddot}}, + translatorscoin = {{traducere, comentarii\ și introducere}% + {trad., coment\adddot\ și introd\adddot}}, + translatorcofo = {{traducere, comentarii\ și prefață}% + {trad., coment\adddot\ și pref\adddot}}, + translatorscofo = {{traducere, comentarii\ și prefață}% + {trad., coment\adddot\ și pref\adddot}}, + translatorcoaf = {{traducere, comentarii\ și postfață}% + {trad., coment\adddot\ și postf\adddot}}, + translatorscoaf = {{traducere, comentarii\ și postfață}% + {trad., coment\adddot\ și postf\adddot}}, + translatoranin = {{traducere, note\ și introducere}% + {trad., note\ și introd\adddot}}, + translatorsanin = {{traducere, note\ și introducere}% + {trad., note\ și introd\adddot}}, + translatoranfo = {{traducere, note\ și prefață}% + {trad., note\ și pref\adddot}}, + translatorsanfo = {{traducere, note\ și prefață}% + {trad., note\ și pref\adddot}}, + translatoranaf = {{traducere, note\ și postfață}% + {trad., note\ și postf\adddot}}, + translatorsanaf = {{traducere, note\ și postfață}% + {trad., note\ și postf\adddot}}, + organizer = {{organizator}{org\adddot}}, + organizers = {{organizatori}{org\adddot}}, + byorganizer = {{organizat de}{org\adddotspace de}}, + byauthor = {{de}{de}}, + byeditor = {{editat de}{ed\adddotspace de}}, + bycompiler = {{redactat de}{red\adddotspace de}}, + byredactor = {{redactat de}{red\adddotspace de}}, + byreviser = {{revizuit de}{rev\adddotspace de}}, + byreviewer = {{revizuit de}{rev\adddotspace de}}, + byfounder = {{fondat de}{fond\adddotspace de}}, + bycontinuator = {{continuat de}{cont\adddotspace de}}, + bycollaborator = {{în colaborare cu}{în colab\adddotspace cu}},% FIXME: unsure + bytranslator = {{traducere \lbx@lfromlang\ de}{trad\adddot\ \lbx@sfromlang\ de}}, + bycommentator = {{comentarii de}{coment\adddot\ de}}, + byannotator = {{note de}{note de}}, + withcommentator = {{cu comentarii de}{cu coment\adddot\ de}}, + withannotator = {{cu note de}{cu note de}}, + withintroduction = {{cu o introducere de}{cu o introd\adddot\ de}}, + withforeword = {{cu o prefață de}{cu o pref\adddot\ de}}, + withafterword = {{cu o postfață de}{cu o postf\adddot\ de}}, + byeditortr = {{editare și traducere \lbx@lfromlang\ de}% + {ed\adddotspace și trad\adddot\ \lbx@sfromlang\ de}}, + byeditorco = {{editare și comentarii de}% + {ed\adddotspace și coment\adddot\ de}}, + byeditoran = {{editare și note de}% + {ed\adddotspace și note de}}, + byeditorin = {{editare, cu o introducere, de}% + {ed.,\addabbrvspace cu o introd., de}}, + byeditorfo = {{editare, cu o prefață, de}% + {ed.,\addabbrvspace cu o pref., de}}, + byeditoraf = {{editare, cu o postfață, de}% + {ed.,\addabbrvspace cu o postf., de}}, + byeditortrco = {{editare, traducere \lbx@lfromlang\ și comentarii de}% + {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ și coment\adddot\ de}}, + byeditortran = {{editare, traducere \lbx@lfromlang\ și note de}% + {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ și note de}}, + byeditortrin = {{editare și traducere \lbx@lfromlang, cu o introducere, de}% + {ed\adddotspace și trad\adddot\ \lbx@sfromlang, cu o introd., de}}, + byeditortrfo = {{editare și traducere \lbx@lfromlang, cu o prefață, de}% + {ed\adddotspace și trad\adddot\ \lbx@sfromlang, cu o pref., de}}, + byeditortraf = {{editare și traducere \lbx@lfromlang, cu o postfață, de}% + {ed\adddotspace și trans\adddot\ \lbx@sfromlang, cu o postf., de}}, + byeditorcoin = {{editare și comentarii, cu o introducere, de}% + {ed\adddotspace și coment., cu o introd., de}}, + byeditorcofo = {{editare și comentarii, cu o prefață, de}% + {ed\adddotspace și coment., cu o pref., de}}, + byeditorcoaf = {{editare și comentarii, cu o postfață, de}% + {ed\adddotspace și coment., cu o postf., de}}, + byeditoranin = {{editare și note, cu o introducere, de}% + {ed\adddotspace și note, cu o introd., de}}, + byeditoranfo = {{editare și note, cu o prefață, de}% + {ed\adddotspace și note, cu o pref., de}}, + byeditoranaf = {{editare și note, cu o postfață, de}% + {ed\adddotspace și note, cu o postf., de}}, + byeditortrcoin = {{editare, traducere \lbx@lfromlang\ și comentarii, cu o introducere, de}% + {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ și coment., cu o introd., de}}, + byeditortrcofo = {{editare, traducere \lbx@lfromlang\ și comentarii, cu o prefață, de}% + {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ și coment., cu o pref., de}}, + byeditortrcoaf = {{editare, traducere \lbx@lfromlang\ și comentarii, cu o postfață, de}% + {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ și coment., cu o postf., de}}, + byeditortranin = {{editare, traducere \lbx@lfromlang\ și note, cu o introducere, de}% + {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ și note, cu o introd., de}}, + byeditortranfo = {{editare, traducere \lbx@lfromlang\ și note, cu o prefață, de}% + {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ și note, cu o pref., de}}, + byeditortranaf = {{editare, traducere \lbx@lfromlang\ și note, cu o postfață, de}% + {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ și note, cu o postf., de}}, + bytranslatorco = {{traducere \lbx@lfromlang\ și comentarii de}% + {trad\adddot\ \lbx@sfromlang\ și coment\adddot\ de}}, + bytranslatoran = {{traducere \lbx@lfromlang\ și note de}% + {trad\adddot\ \lbx@sfromlang\ și note de}}, + bytranslatorin = {{traducere \lbx@lfromlang, cu o introducere, de}% + {trad\adddot\ \lbx@sfromlang, cu o introd., de}}, + bytranslatorfo = {{traducere \lbx@lfromlang, cu o prefață, de}% + {trad\adddot\ \lbx@sfromlang, cu o pref., de}}, + bytranslatoraf = {{traducere \lbx@lfromlang, cu o postfață, de}% + {trad\adddot\ \lbx@sfromlang, cu o postf., de}}, + bytranslatorcoin = {{traducere \lbx@lfromlang\ și comentarii, cu o introducere, de}% + {trad\adddot\ \lbx@sfromlang\ și coment., cu o introd., de}}, + bytranslatorcofo = {{traducere \lbx@lfromlang\ și comentarii, cu o prefață, de}% + {trad\adddot\ \lbx@sfromlang\ și coment., cu o pref., de}}, + bytranslatorcoaf = {{traducere \lbx@lfromlang\ și comentarii, cu o postfață, de}% + {trad\adddot\ \lbx@sfromlang\ și coment., cu o postf., de}}, + bytranslatoranin = {{traducere \lbx@lfromlang\ și note, cu o introducere, de}% + {trad\adddot\ \lbx@sfromlang\ și note, cu o introd., de}}, + bytranslatoranfo = {{traducere \lbx@lfromlang\ și note, cu o prefață, de}% + {trad\adddot\ \lbx@sfromlang\ și note, cu o pref., de}}, + bytranslatoranaf = {{traducere \lbx@lfromlang\ și note, cu o postfață, de}% + {trad\adddot\ \lbx@sfromlang\ și note, cu o postf., de}}, + and = {{și}{și}}, + andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + andmore = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + volume = {{volum}{vol\adddot}}, + volumes = {{volume}{vol\adddot}}, + involumes = {{în}{în}}, + jourvol = {{volumul}{vol\adddot}}, + jourser = {{serii}{ser\adddot}}, + book = {{carte}{carte}}, + part = {{partea}{partea}}, + issue = {{număr}{nr\adddot}}, + newseries = {{serie nouă}{ser\adddotspace nouă}}, + oldseries = {{serie anterioară}{ser\adddotspace anterioară}}, + edition = {{ediție}{ed\adddot}}, + reprint = {{republicat}{repub\adddot}}, + reprintof = {{republicat în}{repub\adddotspace în}}, + reprintas = {{republicat ca}{repub\adddotspace ca}}, + reprintfrom = {{republicat din}{repub\adddotspace din}}, + reviewof = {{revizuit în}{rev\adddotspace în}}, + translationof = {{traducere în}{trad\adddotspace în}}, + translationas = {{traducere ca}{trad\adddotspace ca}}, + translationfrom = {{traducere din}{trad\adddotspace din}}, + origpubas = {{publicat original ca}{publ\adddotspace orig\adddotspace ca}}, + origpubin = {{publicat original în}{pub\adddotspace orig\adddotspace în}}, + astitle = {{ca}{ca}}, + bypublisher = {{de}{de}}, + nodate = {{fără dată}{f\adddot d\adddot}}, + page = {{pagina}{p\adddot}}, + pages = {{paginile}{pp\adddot}}, + column = {{coloana}{col\adddot}}, + columns = {{coloanele}{col\adddot}}, + line = {{linia}{l\adddot}}, + lines = {{liniile}{ll\adddot}}, + verse = {{versul}{v\adddot}}, + verses = {{versuri}{vv\adddot}}, + section = {{secțiunea}{\S}}, + sections = {{secțiuni}{\S\S}}, + paragraph = {{paragraf}{par\adddot}}, + paragraphs = {{paragrafe}{par\adddot}}, + pagetotal = {{pagină}{p\adddot}}, + pagetotals = {{pagini}{pp\adddot}}, + columntotal = {{coloană}{col\adddot}}, + columntotals = {{coloane}{col\adddot}}, + linetotal = {{linia}{l\adddot}}, + linetotals = {{linii}{ll\adddot}}, + versetotal = {{vers}{v\adddot}}, + versetotals = {{versuri}{vv\adddot}}, + sectiontotal = {{secțiune}{\S}}, + sectiontotals = {{secțiuni}{\S\S}}, + paragraphtotal = {{paragrafe}{par\adddot}}, + paragraphtotals = {{paragrafe}{par\adddot}}, + in = {{în}{în}}, + inseries = {{în}{în}}, + ofseries = {{din}{din}}, + number = {{număr}{nr\adddot}}, + chapter = {{capitol}{cap\adddot}}, + bathesis = {{Teză de licență}{Teză de lic\adddot}}, + mathesis = {{Teză de dizertație}{Teză de dizert\adddot}}, + phdthesis = {{Teză de doctorat}{Teză de doct\adddot}}, + candthesis = {{Teză de abilitare}{Teză de abilit\adddot}}, % not sure + resreport = {{raport de cercetare}{rap\adddotspace de cercet\adddot}}, + techreport = {{raport tehnic}{rap\adddotspace teh\adddot}}, + software = {{computer software}{comp\adddotspace software}}, + datacd = {{CD-ROM}{CD-ROM}}, + audiocd = {{CD audio}{CD audio}}, + version = {{versiunea}{versiunea}}, + url = {{adresa}{adresa}}, + urlfrom = {{disponibil la}{disponibil la}}, + urlseen = {{accesat în}{accesat în}}, + inpreparation = {{în pregătire}{în pregătire}}, + submitted = {{depus}{depus}}, + forthcoming = {{în curs de apariție}{în curs de apariție}}, + inpress = {{bun de tipar}{bun de tipar}}, + prepublished = {{prepublicat}{prepublicat}}, + citedas = {{în continuare citat ca}{în cont\adddotspace cit\adddotspace ca}}, + thiscite = {{în special}{în spec\adddot}}, + seenote = {{vezi nota}{vezi n\adddot}}, + quotedin = {{citat în}{cit\adddotspace în}}, + idem = {{idem}{idem}}, + 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 = {{vezi}{vezi}}, + seealso = {{vezi de asemenea}{vezi de asemenea}}, + backrefpage = {{citat în pagina}{cit\adddotspace în p\adddot}}, + backrefpages = {{citat în paginile}{cit\adddotspace în pp\adddot}}, + january = {{Ianuarie}{Ian\adddot}}, + february = {{Februarie}{Feb\adddot}}, + march = {{Martie}{Mar\adddot}}, + april = {{Aprilie}{Apr\adddot}}, + may = {{Mai}{Mai}}, + june = {{Iunie}{Iun\adddot}}, + july = {{Iulie}{Iul\adddot}}, + august = {{August}{Aug\adddot}}, + september = {{Septembrie}{Sept\adddot}}, + october = {{Octombrie}{Oct\adddot}}, + november = {{Noiembrie}{Nov\adddot}}, + december = {{Decembrie}{Dec\adddot}}, + langamerican = {{Engleză}{Engleză}}, + langbasque = {{Bască}{Bască}}, + langbrazilian = {{Braziliană}{Braziliană}}, + langbulgarian = {{Bulgară}{Bulgară}}, + langcatalan = {{Catalană}{Catalană}}, + langcroatian = {{Croată}{Croată}}, + langczech = {{Cehă}{Cehă}}, + langdanish = {{Daneză}{Daneză}}, + langdutch = {{Olandeză}{Olandeză}}, + langenglish = {{Engleză}{Engleză}}, + langestonian = {{Estonă}{Estonă}}, + langfinnish = {{Finlandeză}{Finlandeză}}, + langfrench = {{Franceză}{Franceză}}, + langgalician = {{Galeză}{Galeză}}, + langgerman = {{Germană}{Germană}}, + langgreek = {{Greacă}{Greacă}}, + langhungarian = {{Maghiară}{Maghiară}}, + langitalian = {{Italiană}{Italiană}}, + langjapanese = {{Japoneză}{Japoneză}}, + langlatin = {{Latină}{Latină}}, + langlatvian = {{Letonă}{Letonă}}, + langlithuanian = {{Lituaniană}{Lituaniană}}, + langnorwegian = {{Norvegiană}{Norvegiană}}, + langpolish = {{Polonă}{Polonă}}, + langportuguese = {{Portugheză}{Portugheză}}, + langamerican = {{Engleză}{Engleză}}, + langromanian = {{Română}{Română}}, + langrussian = {{Rusă}{Rusă}}, + langserbian = {{Sârbă}{Sârbă}}, + langslovak = {{Slovacă}{Slovacă}}, + langslovene = {{Slovenă}{Slovenă}}, + langspanish = {{Spaniolă}{Spaniolă}}, + langswedish = {{Suedeză}{Suedeză}}, + langturkish = {{Turcă}{Turcă}}, + langukrainian = {{Ucraineană}{Ucraineană}}, + fromamerican = {{din engleză}{din engleză}}, + frombasque = {{din bască}{din bască}}, + frombrazilian = {{din braziliană}{din braziliană}}, + frombulgarian = {{din bulgară}{din bulgară}}, + fromcatalan = {{din catalană}{din catalană}}, + fromcroatian = {{din Croatian}{din Croatian}}, + fromczech = {{din cehă}{din cehă}}, + fromdanish = {{din daneză}{din daneză}}, + fromdutch = {{din olandeză}{din olandeză}}, + fromenglish = {{din engleză}{din engleză}}, + fromestonian = {{din estonă}{din estonă}}, + fromfinnish = {{din finlandeză}{din finlandeză}}, + fromfrench = {{din franceză}{din franceză}}, + fromgalician = {{din galiciană}{din galiciană}}, + fromgerman = {{din germană}{din germană}}, + fromgreek = {{din greacă}{din greacă}}, + fromhungarian = {{din maghiară}{din maghiară}}, + fromitalian = {{din italiană}{din italiană}}, + fromjapanese = {{din japoneză}{din japoneză}}, + fromlatin = {{din latină}{din latină}}, + fromlatvian = {{din letonă}{din letonă}}, + fromlithuanian = {{din lituaniană}{din lituaniană}}, + fromnorwegian = {{din norvegiană}{din norvegiană}}, + frompolish = {{din poloneză}{din poloneză}}, + fromportuguese = {{din portugheză}{din portugheză}}, + fromrussian = {{din rusă}{din rusă}}, + fromserbian = {{din sârbă}{din sârbă}}, + fromslovak = {{din slovacă}{din slovacă}}, + fromslovene = {{din slovenă}{din slovenă}}, + fromspanish = {{din spaniolă}{din slovenă}}, + fromswedish = {{din suedeză}{fdin suedeză}}, + fromturkish = {{din turcă}{din turcă}}, + fromukrainian = {{din ucraineană}{din ucraineană}}, + countryde = {{Germania}{DE}}, + countryeu = {{Uniunea Europeană}{UE}}, + countryep = {{Uniunea Europeană}{EP}}, + countryfr = {{Franța}{FR}}, + countryuk = {{Marea Britanie}{GB}}, + countryus = {{Statele Unite ale Americii}{SUA}}, + patent = {{brevet}{brev\adddot}}, + patentde = {{brevet german}{brev\adddotspace german}}, + patenteu = {{brevet european}{brev\adddotspace european}}, + patentfr = {{brevet francez}{brev\adddotspace francez}}, + patentuk = {{brevet englezesc}{brev\adddotspace englezesc}}, + patentus = {{brevet american}{brev\adddotspace american}}, + patreq = {{cerere brevet}{cerere brev\adddot}}, + patreqde = {{cerere brevet german}{cerere brev\adddot\ germ\adddot}}, + patreqeu = {{cerere brevet european}{cerere brev\adddot\ europ\adddot}}, + patreqfr = {{cerere brevet francez}{cerere brev\adddot\ franc\adddot}}, + patrequk = {{cerere brevet englezesc}{cerere brev\adddot\ engl\adddot}}, + patrequs = {{cerere brevet american}{cerere brev\adddot\ americ\adddot}}, + file = {{filă}{filă}}, + library = {{bibliotecă}{bibliotecă}}, + abstract = {{rezumat}{rezumat}}, + annotation = {{note}{note}}, + commonera = {{era noastră}{e\adddot n\adddot}}, + beforecommonera = {{înaintea erei noastre}{î\adddot e\adddot n\adddot}}, + annodomini = {{Anul Domnului}{AD}}, + beforechrist = {{înainte de Hristos}{î\adddot Hr\adddot}}, + circa = {{circa}{cca\adddot}}, + spring = {{Primăvara}{Primăvara}}, + summer = {{Vara}{Vara}}, + autumn = {{Toamna}{Toamna}}, + winter = {{Iarna}{Iarna}}, + springN = {{Primăvara (Emisfera Nordică)}{Primăvara (Emisf\adddotspace Nordică)}}, + summerN = {{Vara (Emisfera Nordică)}{Vara (Emisf\adddotspace Nordică)}}, + autumnN = {{Toamna (Emisfera Nordică)}{Toamna (Emisf\adddotspace Nordică)}}, + winterN = {{Iarna (Emisfera Nordică)}{Iarna (Emisf\adddotspace Nordică)}}, + springS = {{Primăvara (Emisfera Sudică)}{Primăvara (Emisf\adddotspace Sudică)}}, + summerS = {{Vara (Emisfera Sudică)}{Vara (Emisf\adddotspace Sudică)}}, + autumnS = {{Toamna (Emisfera Sudică)}{Toamna (Emisf\adddotspace Sudică)}}, + winterS = {{Iarna (Emisfera Sudică)}{Iarna (Emisf\adddotspace Sudică)}}, + Q1 = {{Trimestrul~1}{Trim\adddot~1}}, + Q2 = {{Trimestrul~2}{Trim\adddot~2}}, + Q3 = {{Trimestrul~3}{Trim\adddot~3}}, + Q4 = {{Trimestrul~4}{Trim\adddot~4}}, +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing + S1 = {{Semestrul~1}{Sem\adddot~1}}, + S2 = {{Semestrul~2}{Sem\adddot~2}}, + am = {{am}{a\adddot m\adddot}}, + pm = {{pm}{p\adddot m\adddot}}, +} + +\global\blx@etb@inittoggle{lbx@ro@dayrange} + +\protected\gdef\lbx@ro@mkdaterangetrunc@i#1#2{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {\blx@nounit} + {\printtext[{#2date}]{% + \datecircaprint + % Such a yeardivision component can only come from an ISO8601 yeardivision which replaces + % a normal month so if it exists, we know that a normal date print is ruled out + \iffieldundef{#2yeardivision} + {\ifdateyearsequal{#2}{#2end} + {\iffieldsequal{#2month}{#2endmonth} + {\toggletrue{lbx@ro@dayrange}% + \csuse{mkbibdate#1}{}{}{#2day}} + {\csuse{mkbibdate#1}{}{#2month}{#2day}}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \iffieldsequal{#2dateera}{#2enddateera}{} + {\dateeraprint{#2year}}}} + {\ifdateyearsequal{#2}{#2end} + {\csuse{mkbibyeardivisiondate#1}{}{#2yeardivision}} + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}% + \iffieldsequal{#2dateera}{#2enddateera}{} + {\dateeraprint{#2year}}}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdaterangesep}} + {\bibdaterangesep + \enddatecircaprint + \iffieldundef{#2endyeardivision} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} + {\csuse{mkbibyeardivisiondate#1}{#2endyear}{#2endyeardivision}}% + \enddateuncertainprint + \dateeraprint{#2endyear}}}}}% + \endgroup} + +\protected\gdef\lbx@ro@mkdaterangetruncextra@i#1#2{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {\blx@nounit} + {\printtext[{#2date}]{% + \datecircaprint + % Such a yeardivision component can only come from an ISO8601 yeardivision which replaces + % a normal month so if it exists, we know that a normal date print is ruled out + \iffieldundef{#2yeardivision} + {\ifdateyearsequal{#2}{#2end} + {\iffieldsequal{#2month}{#2endmonth} + {\toggletrue{lbx@ro@dayrange}% + \csuse{mkbibdate#1}{}{}{#2day}} + {\csuse{mkbibdate#1}{}{#2month}{#2day}}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \iffieldsequal{#2dateera}{#2enddateera}{} + {\dateeraprint{#2year}}}} + {\ifdateyearsequal{#2}{#2end} + {\csuse{mkbibyeardivisiondate#1}{}{#2yeardivision}} + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}% + \iffieldsequal{#2dateera}{#2enddateera}{} + {\dateeraprint{#2year}}}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {\printfield{extradate}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extradate}% + \mbox{\bibdaterangesep}} + {\bibdaterangesep + \enddatecircaprint + \iffieldundef{#2endyeardivision} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} + {\csuse{mkbibyeardivisiondate#1}{#2endyear}{#2endyeardivision}}}% + \printfield{extradate}% + \enddateuncertainprint + \dateeraprint{#2endyear}}}}% + \endgroup} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx index 7d2cf694b1a..b0e6ca595ee 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx @@ -97,12 +97,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -580,6 +580,23 @@ summer = {{лето}{лето}}, autumn = {{осень}{осень}}, winter = {{зима}{зима}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing am = {{ДП}{ДП}}, pm = {{ПП}{ПП}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/serbian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/serbian.lbx index 52faffd9312..cf540ec3ed6 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/serbian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/serbian.lbx @@ -74,12 +74,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep% \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}\adddot}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}\adddot}% } @@ -101,6 +101,23 @@ audiocd = {{audio CD}{audio CD}}, august = {{avgust}{avg\adddot}}, autumn = {{jesen}{jesen}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing backrefpage = {{citirano na stranici}{cit\adddot\ na str\adddot}}, backrefpages = {{citirano na stranicama}{cit\adddot\ na str\adddot}}, bathesis = {{ba\v celor rad}{BA\addabbrvspace rad}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/serbianc.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/serbianc.lbx index 1e11519af0d..b7e04658d2b 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/serbianc.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/serbianc.lbx @@ -83,12 +83,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep% \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}\adddot}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}\adddot}% } @@ -110,6 +110,23 @@ audiocd = {{аудио ЦД}{аудио ЦД}}, august = {{август}{авг\adddot}}, autumn = {{јесен}{јесен}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing backrefpage = {{цитирано на страници}{цит\adddot\ на стр\adddot}}, backrefpages = {{цитирано на страницама}{цит\adddot\ на стр\adddot}}, bathesis = {{бачелор рад}{БА\addabbrvspace рад}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/slovak.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/slovak.lbx index 2e7201e9c8c..421d80a4b74 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/slovak.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/slovak.lbx @@ -67,12 +67,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -530,6 +530,23 @@ summer = {{leto}{leto}}, autumn = {{jese\v{n}}{jese\v{n}}}, winter = {{zima}{zima}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing am = {{AM}{AM}}, pm = {{PM}{PM}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/slovene.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/slovene.lbx index d1c1df5f41c..0efc0295f49 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/slovene.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/slovene.lbx @@ -67,12 +67,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -529,6 +529,23 @@ % summer = {{}{}},% FIXME: missing % autumn = {{}{}},% FIXME: missing % winter = {{}{}},% FIXME: missing +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing am = {{dop\adddot}{dop\adddot}}, pm = {{pop\adddot}{pop\adddot}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx index 9f07124a8d2..38121886d66 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx @@ -80,12 +80,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -207,7 +207,7 @@ 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}}, + bytranslator = {{traducido \lbx@lfromlang\ por}{trad\adddotspace \lbx@sfromlang\ por}}, bycommentator = {{comentado por}{com\adddotspace por}}, byannotator = {{anotado por}{anot\adddotspace por}}, withcommentator = {{con comentario de}{con com\adddotspace de}}, @@ -216,7 +216,7 @@ 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}}, + {ed\adddotspace y trad\adddotspace \lbx@sfromlang\ por}}, byeditorco = {{editado y comentado por}% {ed\adddotspace y com\adddotspace por}}, byeditoran = {{editado y anotado por}% @@ -272,17 +272,17 @@ bytranslatoraf = {{traducido \lbx@lfromlang\ y epilogado por}% {trad\adddotspace \lbx@sfromlang\ y ep\'{\i}l\adddotspace por}}, bytranslatorcoin = {{traducido \lbx@lfromlang, comentado e introducido por}% - {trad\adddot \lbx@sfromlang, com\adddotspace e intr\adddotspace por}}, + {trad\adddotspace \lbx@sfromlang, com\adddotspace e intr\adddotspace por}}, bytranslatorcofo = {{traducido \lbx@lfromlang, comentado y prologado por}% - {trad\adddot \lbx@sfromlang, com\adddotspace y pr\'ol\adddotspace por}}, + {trad\adddotspace \lbx@sfromlang, com\adddotspace y pr\'ol\adddotspace por}}, bytranslatorcoaf = {{traducido \lbx@lfromlang, comentado y epilogado por}% - {trad\adddot \lbx@sfromlang, com\adddotspace y ep\'{\i}l\adddotspace por}}, + {trad\adddotspace \lbx@sfromlang, com\adddotspace y ep\'{\i}l\adddotspace por}}, bytranslatoranin = {{traducido \lbx@lfromlang, anotado e introducido por}% - {trad\adddot \lbx@sfromlang, anot\adddotspace e intr\adddotspace por}}, + {trad\adddotspace \lbx@sfromlang, anot\adddotspace e intr\adddotspace por}}, bytranslatoranfo = {{traducido \lbx@lfromlang, anotado y prologado por}% - {trad\adddot \lbx@sfromlang, anot\adddotspace y pr\'ol\adddotspace por}}, + {trad\adddotspace \lbx@sfromlang, anot\adddotspace y pr\'ol\adddotspace por}}, bytranslatoranaf = {{traducido \lbx@lfromlang, anotado y epilogado por}% - {trad\adddot \lbx@sfromlang, anot\adddotspace y ep\'{\i}l\adddotspace por}}, + {trad\adddotspace \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}}, @@ -481,6 +481,23 @@ summer = {{verano}{ver\adddot}}, autumn = {{oto\~no}{ot\adddot}}, winter = {{invierno}{inv\adddot}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing 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 2ac4fb301b3..9bf171b2c32 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx @@ -104,12 +104,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -507,6 +507,23 @@ % summer = {{}{}},% FIXME: missing % autumn = {{}{}},% FIXME: missing % winter = {{}{}},% FIXME: missing +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing am = {{fm}{fm}}, pm = {{em}{em}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/turkish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/turkish.lbx index ad999c180ec..6e6711ff088 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/turkish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/turkish.lbx @@ -65,12 +65,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% \savecommand\lbx@lfromlang @@ -545,6 +545,23 @@ summer = {{Yaz}{Yaz}}, autumn = {{Sonbahar}{Sonbahar}}, winter = {{K\i \c{s}}{K\i \c{s}}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing am = {{\"{o}\u{g}leden \"{o}nce}{\"{O}\"{O}}}, pm = {{\"{o}\u{g}leden sonra}{\"{O}S}}, } diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/ukrainian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/ukrainian.lbx index 19b2a2e1892..e792c25a64e 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/ukrainian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/ukrainian.lbx @@ -97,12 +97,12 @@ \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } @@ -580,6 +580,23 @@ summer = {{літо}{літо}}, autumn = {{осінь}{осінь}}, winter = {{зима}{зима}}, +% springN = {{}{}},% FIXME: missing +% summerN = {{}{}},% FIXME: missing +% autumnN = {{}{}},% FIXME: missing +% winterN = {{}{}},% FIXME: missing +% springS = {{}{}},% FIXME: missing +% summerS = {{}{}},% FIXME: missing +% autumnS = {{}{}},% FIXME: missing +% winterS = {{}{}},% FIXME: missing +% Q1 = {{}{}},% FIXME: missing +% Q2 = {{}{}},% FIXME: missing +% Q3 = {{}{}},% FIXME: missing +% Q4 = {{}{}},% FIXME: missing +% QD1 = {{}{}},% FIXME: missing +% QD2 = {{}{}},% FIXME: missing +% QD3 = {{}{}},% FIXME: missing +% S1 = {{}{}},% FIXME: missing +% S2 = {{}{}},% FIXME: missing am = {{ДП}{ДП}}, pm = {{ПП}{ПП}}, } |