From cf3bfced31aa1039d850d531c69ee993e99430de Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 5 Mar 2018 22:15:52 +0000 Subject: biblatex (4mar18) git-svn-id: svn://tug.org/texlive/trunk@46851 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/biblatex/bbx/standard.bbx | 15 +- Master/texmf-dist/tex/latex/biblatex/biblatex.def | 86 +- Master/texmf-dist/tex/latex/biblatex/biblatex.sty | 1318 +++++++++++++------- Master/texmf-dist/tex/latex/biblatex/blx-dm.def | 62 +- .../texmf-dist/tex/latex/biblatex/blx-unicode.def | 38 +- .../tex/latex/biblatex/lbx/brazilian.lbx | 158 +-- .../tex/latex/biblatex/lbx/bulgarian.lbx | 6 +- .../texmf-dist/tex/latex/biblatex/lbx/catalan.lbx | 6 +- .../texmf-dist/tex/latex/biblatex/lbx/croatian.lbx | 6 +- Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx | 4 + .../texmf-dist/tex/latex/biblatex/lbx/danish.lbx | 22 +- Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx | 2 + .../texmf-dist/tex/latex/biblatex/lbx/english.lbx | 234 ++-- .../texmf-dist/tex/latex/biblatex/lbx/estonian.lbx | 4 + .../texmf-dist/tex/latex/biblatex/lbx/finnish.lbx | 6 +- .../texmf-dist/tex/latex/biblatex/lbx/french.lbx | 10 +- .../texmf-dist/tex/latex/biblatex/lbx/galician.lbx | 4 + .../texmf-dist/tex/latex/biblatex/lbx/german.lbx | 2 + Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx | 8 +- .../tex/latex/biblatex/lbx/icelandic.lbx | 4 + .../texmf-dist/tex/latex/biblatex/lbx/italian.lbx | 86 +- .../texmf-dist/tex/latex/biblatex/lbx/latvian.lbx | 690 ++++++++++ Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx | 2 + .../texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx | 3 +- .../texmf-dist/tex/latex/biblatex/lbx/polish.lbx | 4 + .../tex/latex/biblatex/lbx/portuguese.lbx | 2 + .../texmf-dist/tex/latex/biblatex/lbx/russian.lbx | 20 +- .../texmf-dist/tex/latex/biblatex/lbx/slovak.lbx | 2 + .../texmf-dist/tex/latex/biblatex/lbx/slovene.lbx | 4 + .../texmf-dist/tex/latex/biblatex/lbx/spanish.lbx | 8 +- .../texmf-dist/tex/latex/biblatex/lbx/swedish.lbx | 3 + .../tex/latex/biblatex/lbx/ukrainian.lbx | 4 + 32 files changed, 2052 insertions(+), 771 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/biblatex/lbx/latvian.lbx (limited to 'Master/texmf-dist/tex/latex/biblatex') diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx index 8edb549d154..9e48d9a235e 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx @@ -668,6 +668,10 @@ \newunit\newblock \printfield{howpublished}% \newunit\newblock + \printfield{type}% + \newunit\newblock + \usebibmacro{event+venue+date}% + \newunit\newblock \printfield{note}% \newunit\newblock \usebibmacro{location+date}% @@ -795,7 +799,7 @@ test {\iffieldundef{eventyear}} } {} - {\setunit*{\addspace}% + {\setunit{\addspace}% \printtext[parens]{% \printfield{venue}% \setunit*{\addcomma\space}% @@ -892,7 +896,10 @@ \newbibmacro*{related}{% \ifboolexpr{ test {\iffieldundef{related}} or test {\ifrelatedloop} } {} - {\usebibmacro{begrelated}% + {\ifcsundef{begrelateddelim\strfield{relatedtype}} + {\printunit{\begrelateddelim}} + {\printunit{\csuse{begrelateddelim\strfield{relatedtype}}}}% + \usebibmacro{begrelated}% \def\bbx@tempa{}% \setcounter{bbx:relatedtotal}{0}% \def\do##1{% @@ -913,8 +920,8 @@ \stepcounter{bbx:relatedcount}% \ifnumgreater{\value{bbx:relatedcount}}{1} {\ifcsundef{relateddelim\strfield{relatedtype}} - {\printtext{\relateddelim}} - {\printtext{\csuse{relateddelim\strfield{relatedtype}}}}} + {\printunit{\relateddelim}} + {\printunit{\csuse{relateddelim\strfield{relatedtype}}}}} {}}% \ifbibmacroundef{related:\strfield{relatedtype}} {\appto{\do}{\usebibmacro{related:default}}} diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def index 54bf8a0d9d8..ef48dc2d932 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def @@ -177,6 +177,11 @@ {\textemdash}}}} \newcommand*{\relatedpunct}{\addspace} \newcommand*{\relateddelim}{\adddot\par\nobreak} +\newcommand*{\begrelateddelim}{\newunitpunct} +\newcommand*{\begrelateddelimmultivolume}{\newunitpunct\par\nobreak} +% Examples of use, uncommenting these would break backwards compatibility +%\newcommand*{\begrelateddelimorigpubin}{\addspace} +%\newcommand*{\begrelateddelimorigpubas}{\addspace} \newcommand{\mkrelatedstring}{\mainlang} % Used for indexing @@ -419,9 +424,9 @@ \ifcapital{\MakeCapital{#1}}{#1}\isdot} % citation commands \DeclareFieldFormat{prenote}{#1\isdot} -\DeclareFieldFormat{postnote}{\mkpageprefix[pagination]{#1}} +\DeclareFieldFormat{postnote}{\mkpageprefix[pagination][\mknormrange]{#1}} \DeclareFieldFormat{volcitevolume}{\bibstring{volume}\ppspace#1} -\DeclareFieldFormat{volcitepages}{\mkpageprefix[pagination]{#1}} +\DeclareFieldFormat{volcitepages}{\mkpageprefix[pagination][\mknormrange]{#1}} \DeclareFieldFormat{volcitenote}{\mkvolcitenote#1} \newrobustcmd*{\mkvolcitenote}[2]{% \printtext[volcitevolume]{#1}% @@ -429,7 +434,7 @@ % multicite commands \DeclareFieldFormat{multiprenote}{#1\isdot} -\DeclareFieldFormat{multipostnote}{\mkpageprefix[pagination]{#1}} +\DeclareFieldFormat{multipostnote}{\mkpageprefix[pagination][\mknormrange]{#1}} % Used by \citeurl @@ -466,7 +471,7 @@ \DeclareFieldFormat{eprint:arxiv}{% arXiv\addcolon\space \ifhyperref - {\href{http://arxiv.org/\abx@arxivpath/#1}{% + {\href{https://arxiv.org/\abx@arxivpath/#1}{% \nolinkurl{#1}% \iffieldundef{eprintclass} {} @@ -531,7 +536,7 @@ \DeclareFieldFormat[article,periodical]{volume}{#1}% volume of a journal \DeclareFieldFormat{volumes}{#1~\bibstring{volumes}} \DeclareFieldFormat{related}{#1} -\DeclareFieldFormat{related:multivolume}{\par\nobreak#1} +\DeclareFieldFormat{related:multivolume}{#1} \DeclareFieldFormat{related:origpubin}{\mkbibparens{#1}} \DeclareFieldFormat{related:origpubas}{\mkbibparens{#1}} \DeclareFieldFormat{relatedstring:default}{#1\printunit{\relatedpunct}} @@ -1752,48 +1757,23 @@ \def\abx@MakeMarkcase{\MakeUppercase} \AtEndPreamble{% - \ifcsundef{MakeMarkcase}{}{\def\abx@MakeMarkcase{\MakeMarkcase}}% - \providecommand*{\@mkdouble}[1]{\@mkboth{#1}{#1}}% - \providecommand*{\@mkright}{% - \begingroup - \ifx\@mkboth\markboth \aftergroup\markright - \else - \ifx\@mkboth\@gobbletwo \aftergroup\@gobble - \else \def\@gobbletwo##1##2{}% - \ifx \@mkboth\@gobbletwo \aftergroup\@gobble - \else - \PackageWarning{biblatex}{% changed for biblatex - package incompatibility detected!\MessageBreak - \string\@mkboth it neither \string\markboth nor any\MessageBreak - kind of two arguments gobbling,\MessageBreak - e.g., \string\@gobbletwo.\MessageBreak - So I don't known, what to do\MessageBreak - with \string\@mkright.\MessageBreak - Nevertheless, \string\markright\space will be\MessageBreak - used% - }% - \aftergroup\markright - \fi - \fi - \fi - \endgroup - }} + \ifcsundef{MakeMarkcase}{}{\def\abx@MakeMarkcase{\MakeMarkcase}}} \ifcase\abx@classtype\relax % article \defbibheading{bibliography}[\refname]{% \section*{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \@mkboth{\abx@MakeMarkcase{#1}}{\abx@MakeMarkcase{#1}}} \defbibheading{biblist}[\biblistname]{% \section*{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \@mkboth{\abx@MakeMarkcase{#1}}{\abx@MakeMarkcase{#1}}} \defbibheading{bibintoc}[\refname]{% \section*{#1}% \addcontentsline{toc}{section}{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \@mkboth{\abx@MakeMarkcase{#1}}{\abx@MakeMarkcase{#1}}} \defbibheading{biblistintoc}[\biblistname]{% \section*{#1}% \addcontentsline{toc}{section}{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \@mkboth{\abx@MakeMarkcase{#1}}{\abx@MakeMarkcase{#1}}} \defbibheading{bibnumbered}[\refname]{% \section{#1}} \defbibheading{biblistnumbered}[\biblistname]{% @@ -1809,18 +1789,18 @@ \or % book/report \defbibheading{bibliography}[\bibname]{% \chapter*{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \@mkboth{\abx@MakeMarkcase{#1}}{\abx@MakeMarkcase{#1}}} \defbibheading{biblist}[\biblistname]{% \chapter*{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \@mkboth{\abx@MakeMarkcase{#1}}{\abx@MakeMarkcase{#1}}} \defbibheading{bibintoc}[\bibname]{% \chapter*{#1}% \addcontentsline{toc}{chapter}{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \@mkboth{\abx@MakeMarkcase{#1}}{\abx@MakeMarkcase{#1}}} \defbibheading{biblistintoc}[\biblistname]{% \chapter*{#1}% \addcontentsline{toc}{chapter}{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}} + \@mkboth{\abx@MakeMarkcase{#1}}{\abx@MakeMarkcase{#1}}} \defbibheading{bibnumbered}[\bibname]{% \chapter{#1}} \defbibheading{biblistnumbered}[\biblistname]{% @@ -1843,7 +1823,9 @@ {\ifkomabibtotoc {\addsec{#1}} {\section*{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}}}} + \ifcsundef{@mkdouble} + {\@mkboth{\abx@MakeMarkcase{#1}}{\abx@MakeMarkcase{#1}}} + {\@mkdouble{\abx@MakeMarkcase{#1}}}}}} {\bibliography@heading{#1}}} \defbibheading{biblist}[\biblistname]{% \ifcsundef{bibliography@heading} @@ -1852,7 +1834,9 @@ {\ifkomabibtotoc {\addsec{#1}} {\section*{#1}% - \@mkdouble{\abx@MakeMarkcase{#1}}}}} + \ifcsundef{@mkdouble} + {\@mkboth{\abx@MakeMarkcase{#1}}{\abx@MakeMarkcase{#1}}} + {\@mkdouble{\abx@MakeMarkcase{#1}}}}}} {\bibliography@heading{#1}}} \defbibheading{bibintoc}[\refname]{% \addsec{#1}} @@ -1864,11 +1848,15 @@ \section{#1}} \defbibheading{subbibliography}[\refname]{% \subsection*{#1}% - \@mkright{\abx@MakeMarkcase{#1}}} + \ifcsundef{@mkright} + {\ifx\@mkboth\@gobbletwo\else\markright{\abx@MakeMarkcase{#1}}\fi} + {\@mkright{\abx@MakeMarkcase{#1}}}} \defbibheading{subbibintoc}[\refname]{% \subsection*{#1}% \addcontentsline{toc}{subsection}{#1}% - \@mkright{\abx@MakeMarkcase{#1}}} + \ifcsundef{@mkright} + {\ifx\@mkboth\@gobbletwo\else\markright{\abx@MakeMarkcase{#1}}\fi} + {\@mkright{\abx@MakeMarkcase{#1}}}} \defbibheading{subbibnumbered}[\refname]{% \subsection{#1}} @@ -1880,7 +1868,9 @@ {\ifkomabibtotoc {\addchap{#1}} {\chapter*{#1} - \@mkdouble{\abx@MakeMarkcase{#1}}}}} + \ifcsundef{@mkdouble} + {\@mkboth{\abx@MakeMarkcase{#1}}{\abx@MakeMarkcase{#1}}} + {\@mkdouble{\abx@MakeMarkcase{#1}}}}}} {\bibliography@heading{#1}}} \defbibheading{biblist}[\biblistname]{% \ifcsundef{bibliography@heading} @@ -1889,7 +1879,9 @@ {\ifkomabibtotoc {\addchap{#1}} {\chapter*{#1} - \@mkdouble{\abx@MakeMarkcase{#1}}}}} + \ifcsundef{@mkdouble} + {\@mkboth{\abx@MakeMarkcase{#1}}{\abx@MakeMarkcase{#1}}} + {\@mkdouble{\abx@MakeMarkcase{#1}}}}}} {\bibliography@heading{#1}}} \defbibheading{bibintoc}[\bibname]{% \addchap{#1}} @@ -1901,7 +1893,9 @@ \chapter{#1}} \defbibheading{subbibliography}[\refname]{% \section*{#1}% - \@mkright{\abx@MakeMarkcase{#1}}} + \ifcsundef{@mkright} + {\ifx\@mkboth\@gobbletwo\else\markright{\abx@MakeMarkcase{#1}}\fi} + {\@mkright{\abx@MakeMarkcase{#1}}}} \defbibheading{subbibintoc}[\refname]{% \addsec{#1}} \defbibheading{subbibnumbered}[\refname]{% diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty index 37e937e54cb..fdb30d4b2c5 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty @@ -1,5 +1,6 @@ % Copyright (c) 2006-2011 Philipp Lehman. % 2012-2017 Philip Kime, Audrey Boruvka, Joseph Wright +% 2018- Philip Kime, Moritz Wemheuer % % Permission is granted to copy, distribute and/or modify this % software under the terms of the LaTeX Project Public License @@ -11,12 +12,12 @@ % particular purpose. % Set up the version strings here -\def\abx@date{2017/12/19} -\def\abx@version{3.10} -\def\abx@bbxid{\abx@date\space v\abx@version\space biblatex bibliography style (PK/JW/AB)} -\def\abx@cbxid{\abx@date\space v\abx@version\space biblatex citation style (PK/JW/AB)} -\def\abx@lbxid{\abx@date\space v\abx@version\space biblatex localization (PK/JW/AB)} -\def\abx@cptid{\abx@date\space v\abx@version\space biblatex compatibility (PK/JW/AB)} +\def\abx@date{2018/03/04} +\def\abx@version{3.11} +\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)} +\def\abx@cptid{\abx@date\space v\abx@version\space biblatex compatibility (PK/MW)} % This is not updated by build script as the control file version % does not necessarily change with the package version. @@ -30,7 +31,7 @@ \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{biblatex} -[\abx@date\space v\abx@version\space programmable bibliographies (PK/JW/AB)] +[\abx@date\space v\abx@version\space programmable bibliographies (PK/MW)] %% Dependencies \RequirePackage{pdftexcmds} @@ -613,7 +614,6 @@ \newtoggle{blx@bibindex} \newtoggle{blx@localnumber} \newtoggle{blx@refcontext} -\newtoggle{blx@nosuffrecurse} % Nice command from etextools which causes too many problems if you load % the whole package @@ -681,15 +681,15 @@ \newrobustcmd*{\DeprecateField}[2]{% \csdef{abx@field@#1}{% \ifcsundef{abx@field@legacy@warning@#1}{\blx@warning@noline{Field '#1' is deprecated. #2}}{}% - \global\csdef{abx@field@legacy@warning@#1}{}}}% + \global\cslet{abx@field@legacy@warning@#1}\@empty}}% \newrobustcmd*{\DeprecateList}[2]{% \csdef{abx@list@#1}{% \ifcsundef{abx@list@legacy@warning@#1}{\blx@warning@noline{List '#1' is deprecated. #2}}{}% - \global\csdef{abx@list@legacy@warning@#1}{}}}% + \global\cslet{abx@list@legacy@warning@#1}\@empty}}% \newrobustcmd*{\DeprecateName}[2]{% \csdef{abx@name@#1}{% \ifcsundef{abx@name@legacy@warning@#1}{\blx@warning@noline{Name '#1' is deprecated. #2}}{}% - \global\csdef{abx@name@legacy@warning@#1}{}}}% + \global\cslet{abx@name@legacy@warning@#1}\@empty}}% \let\blx@aliasfields\@empty @@ -704,7 +704,7 @@ Please use '#2' instead.\MessageBreak Using '#2' now}} {}% - \global\csdef{abx@field@legacy@warning@#1}{}}}}} + \global\cslet{abx@field@legacy@warning@#1}\@empty}}}} \newrobustcmd*{\DeprecateListWithReplacement}[2]{% \appto\blx@aliasfields{% @@ -717,7 +717,7 @@ Please use '#2' instead.\MessageBreak Using '#2' now}} {}% - \global\csdef{abx@list@legacy@warning@#1}{}}}}} + \global\cslet{abx@list@legacy@warning@#1}\@empty}}}} \newrobustcmd*{\DeprecateNameWithReplacement}[2]{% \appto\blx@aliasfields{% @@ -730,7 +730,7 @@ Please use '#2' instead.\MessageBreak Using '#2' now}} {}% - \global\csdef{abx@name@legacy@warning@#1}{}}}}} + \global\cslet{abx@name@legacy@warning@#1}\@empty}}}} %% Initialisation \def\blx@blxinit{% @@ -900,11 +900,11 @@ {\blx@info@noline{Trying to load #2..}% \IfFileExists{#1} {\blx@info@noline{... file '#1' found}% + #3\@@input\@filef@und#4#5% \listxadd\blx@list@req@stat{#1}% - #3\@@input\@filef@und#4#5} + \@addtofilelist{#1}} {\blx@info@noline{... file '#1' not found}#6}% - \global\csdef{blx@file@#1}{}% - \@addtofilelist{#1}} + \global\cslet{blx@file@#1}\@empty} {#5}} % {}{}{} @@ -1152,7 +1152,8 @@ #2} \protected\def\blx@warn@nostring#1{% - \blx@warning@entry{Bibliography string '#1' undefined}% + \blx@warning@entry{Bibliography string '#1' + \ifcsundef{KV@blx@lbx@#1}{undefined}{untranslated}}% \abx@missing{#1}} \def\blx@warn@conflopt#1{% @@ -2978,69 +2979,132 @@ {}} % <*>[]{} -\newrobustcmd*{\mkcomprange}{% +\newrobustcmd*{\mknormrange}{% \begingroup \@ifstar - {\blx@comprange\blx@comprange@ii} - {\blx@comprange\blx@comprange@i}} + {\blx@range@aux\blx@normrange@ii} + {\blx@range@aux\blx@normrange@i}} -\def\blx@comprange#1{% +\def\blx@range@aux#1{% \@ifnextchar[{#1}{#1[\@firstofone]}} -\def\blx@comprange@i[#1]#2{% +\def\blx@normrange@i[#1]#2{% \let\blx@tempa\@empty \protected\def\blx@range@out@value{\appto\blx@tempa}% \let\blx@range@out@delim\blx@range@out@value - \let\blx@range@split\blx@comprange@split + \let\blx@range@split\blx@normrange@split + \let\blx@range@process\blx@normrange@process \blx@range@chunk{#2}% \edef\blx@tempa{\endgroup \unexpanded{#1}{\expandonce\blx@tempa}}% \blx@tempa} -\def\blx@comprange@ii[#1]#2{% +\def\blx@normrange@ii[#1]#2{% \protected\def\blx@range@out@value{#1}% \let\blx@range@out@delim\@firstofone - \let\blx@range@split\blx@comprange@split + \let\blx@range@split\blx@normrange@split + \let\blx@range@process\blx@normrange@process \blx@range@chunk{#2}% \endgroup} -\def\blx@comprange@split#1{% - \def\blx@comprange@abort{\blx@range@out@value{#1}}% +\def\blx@range@chunk#1{% + \blx@range@chunk@semcol#1;&} + +\def\blx@range@chunk@semcol#1;#2&{% + \notblank{#1} + {\blx@range@chunk@comma#1,&} + {}% + \notblank{#2} + {\notblank{#1}{\blx@range@out@delim{\bibrangessep}}{}% + \blx@range@chunk@semcol#2&} + {}} + +\def\blx@range@chunk@comma#1,#2&{% + \notblank{#1} + {\blx@range@chunk@sep#1\bibrangessep&} + {}% + \notblank{#2} + {\notblank{#1}{\blx@range@out@delim{\bibrangessep}}{}% + \blx@range@chunk@comma#2&} + {}} + +\def\blx@range@chunk@sep#1\bibrangessep#2&{% + \notblank{#1} + {\expandafter\blx@range@split + \expandafter{\@firstofone#1}} + {}% + \notblank{#2} + {\notblank{#1}{\blx@range@out@delim{\bibrangessep}}{}% + \blx@range@chunk@sep#2&} + {}} + +% Unicode en-dashes are supported in blx-unicode.def +\def\blx@normrange@split#1{% + \def\blx@normrange@abort{\blx@range@out@value{#1}}% \blx@imc@ifpages{#1} - {\blx@comprange@range#1\bibrangedash\bibrangedash&} - {\blx@comprange@abort}} + {\blx@normrange@range#1\bibrangedash\bibrangedash&} + {\blx@normrange@abort}} -\def\blx@comprange@range#1\bibrangedash#2\bibrangedash#3&{% +\def\blx@normrange@range#1\bibrangedash#2\bibrangedash#3&{% \ifblank{#3} - {\blx@comprange@hyphen#1--&} + {\blx@normrange@hyphen#1--&} {\ifblank{#2} {\blx@range@out@value{#1\bibrangedash}} {\ifblank{#1} {\blx@range@out@value{\bibrangedash#2}} - {\blx@comprange@check{#1}{#2}}}}} + {\blx@range@process{#1}{#2}}}}} -\def\blx@comprange@hyphen#1-#2-#3&{% +\def\blx@normrange@hyphen#1-#2-#3&{% \ifblank{#3} - {\blx@comprange@abort} + {\blx@normrange@abort} {\ifblank{#2} {\ifblank{#1} {\let\blx@tempb\@empty} {\def\blx@tempb{#1}}% - \blx@comprange@hyphen@i#3&} + \blx@normrange@hyphen@i#3&} {\ifblank{#1} {\blx@range@out@value{\bibrangedash#2}} - {\blx@comprange@check{#1}{#2}}}}} + {\blx@range@process{#1}{#2}}}}} -\def\blx@comprange@hyphen@i#1-#2&{% +\def\blx@normrange@hyphen@i#1-#2&{% \ifblank{#1#2} {\expandafter\blx@range@out@value \expandafter{\blx@tempb\bibrangedash}} {\notblank{#1} {\ifdefempty\blx@tempb {\blx@range@out@value{\bibrangedash#1}} - {\expandafter\blx@comprange@check + {\expandafter\blx@range@process \expandafter{\blx@tempb}{#1}}} - {\blx@comprange@hyphen@i#2&}}} + {\blx@normrange@hyphen@i#2&}}} + +\def\blx@normrange@process#1#2{% + \blx@range@out@value{#1\bibrangedash#2}} + +% <*>[]{} +\newrobustcmd*{\mkcomprange}{% + \begingroup + \@ifstar + {\blx@range@aux\blx@comprange@ii} + {\blx@range@aux\blx@comprange@i}} + +\def\blx@comprange@i[#1]#2{% + \let\blx@tempa\@empty + \protected\def\blx@range@out@value{\appto\blx@tempa}% + \let\blx@range@out@delim\blx@range@out@value + \let\blx@range@split\blx@normrange@split + \let\blx@range@process\blx@comprange@check + \blx@range@chunk{#2}% + \edef\blx@tempa{\endgroup + \unexpanded{#1}{\expandonce\blx@tempa}}% + \blx@tempa} + +\def\blx@comprange@ii[#1]#2{% + \protected\def\blx@range@out@value{#1}% + \let\blx@range@out@delim\@firstofone + \let\blx@range@split\blx@normrange@split + \let\blx@range@process\blx@comprange@check + \blx@range@chunk{#2}% + \endgroup} \def\blx@comprange@check#1#2{% \blx@imc@ifinteger{#1} @@ -3102,37 +3166,6 @@ \expandafter\blx@comprange@end \fi} -\def\blx@range@chunk#1{% - \blx@range@chunk@semcol#1;&} - -\def\blx@range@chunk@semcol#1;#2&{% - \notblank{#1} - {\blx@range@chunk@comma#1,&} - {}% - \notblank{#2} - {\notblank{#1}{\blx@range@out@delim{\bibrangessep}}{}% - \blx@range@chunk@semcol#2&} - {}} - -\def\blx@range@chunk@comma#1,#2&{% - \notblank{#1} - {\blx@range@chunk@sep#1\bibrangessep&} - {}% - \notblank{#2} - {\notblank{#1}{\blx@range@out@delim{\bibrangessep}}{}% - \blx@range@chunk@comma#2&} - {}} - -\def\blx@range@chunk@sep#1\bibrangessep#2&{% - \notblank{#1} - {\expandafter\blx@range@split - \expandafter{\@firstofone#1}} - {}% - \notblank{#2} - {\notblank{#1}{\blx@range@out@delim{\bibrangessep}}{}% - \blx@range@chunk@sep#2&} - {}} - % <*>[]{} \newrobustcmd*{\mkfirstpage}{% \begingroup @@ -3160,6 +3193,7 @@ \blx@range@chunk{#2}% \endgroup} +% Unicode en-dashes are supported in blx-unicode.def \def\blx@firstpage@split#1{% \def\blx@firstpage@abort{\blx@range@out@value{#1}}% \blx@firstpage@range#1\bibrangedash\bibrangedash&} @@ -3213,8 +3247,11 @@ {\blx@declaredelim}} \newrobustcmd*{\blx@declaredelimclear}[3][]{% - \def\do##1{\global\cslet{blx@printdelim@##1@#2}=\undefined}% - \dolistcsloop{blx@declaredelimcontexts@#2}% + \ifcsvoid{blx@declaredelimcontexts@#2} + {} + {\def\do##1{\csundef{blx@printdelim@##1@#2}}% + \dolistcsloop{blx@declaredelimcontexts@#2}}% + \cslet{blx@declaredelimcontexts@#2}\@empty \ifblank{#1} {\blx@declaredelim{#2}{#3}} {\blx@declaredelim[#1]{#2}{#3}}} @@ -3223,19 +3260,17 @@ \ifblank{#1} {\blx@declaredelim@i{}{}{#2}{#3}} {\def\do##1{% - \listcsgadd{blx@declaredelimcontexts@#2}{##1}% - \blx@declaredelim@i{blx@printdelim@##1@}{##1}{#2}{#3}}% + \listcsadd{blx@declaredelimcontexts@#2}{##1}% + \blx@declaredelim@i{blx@printdelim@##1@}{##1}{#2}{#3}}% \docsvlist{#1}}}% \def\blx@declaredelim@i#1#2#3#4{% - \begingroup - \def\do##1{% + \def\do@i##1{% \ifcsdef{#1##1} {\blx@inf@delimdeclare{##1}{#2}} {}% - \csgdef{#1##1}{#4}}% - \docsvlist{#3}% - \endgroup} + \csdef{#1##1}{#4}}% + \forcsvlist{\do@i}{#3}} % *[]{}{} \newrobustcmd*{\DeclareDelimAlias}{% @@ -3247,7 +3282,7 @@ \ifblank{#1} {\blx@declaredelimalias@i{}{#2}{#3}} {\def\do##1{% - \blx@declaredelimalias@i{blx@printdelim@##1@}{#2}{#3}}% + \blx@declaredelimalias@i{blx@printdelim@##1@}{#2}{#3}}% \docsvlist{#1}}} \newrobustcmd*{\blx@declaredelimaliasauto}[2]{% @@ -3262,7 +3297,7 @@ \ifcsdef{#1#2} {\blx@inf@delimdeclare{#2}{#1}} {}% - \global\csletcs{#1#2}{#1#3}} + \csdef{#1#2}{\csuse{#1#3}}} \def\blx@delimcontext{none} \newcommand*{\printdelim}[2][]{% @@ -4249,11 +4284,17 @@ \blx@imc@clearlist{pageref}% \blx@getdata{#1}% \blx@setoptions@type\abx@field@entrytype + \blx@setoptions@entry \def\abx@field@entrysetcount{1}% + \blx@execute + \blx@beglangbib + \blx@begunit \blx@anchor \blx@entryset@precode \blx@driver{\blx@imc@thefield{entrytype}}% \blx@entryset@postcode + \blx@endunit + \blx@endlangbib \endgroup} {}% \let\do\blx@entryset@i} @@ -4268,11 +4309,11 @@ \blx@setoptions@entry \addtocounter{instcount}\@ne \blx@execute + \blx@beglangbib \blx@begunit \blx@anchor - \blx@beglangbib \blx@entryset@precode - \blx@driver{\blx@imc@thefield{entrytype}} + \blx@driver{\blx@imc@thefield{entrytype}}% \blx@entryset@postcode \blx@endunit \blx@endlangbib @@ -4782,6 +4823,7 @@ \do{langitalian}% \do{langjapanese}% \do{langlatin}% + \do{langlatvian}% \do{langnorwegian}% \do{langpolish}% \do{langportuguese}% @@ -4809,6 +4851,7 @@ \do{fromitalian}% \do{fromjapanese}% \do{fromlatin}% + \do{fromlatvian}% \do{fromnorwegian}% \do{frompolish}% \do{fromportuguese}% @@ -4866,8 +4909,7 @@ % in *.cbx/bbx/tex: (implicit) % in *.lbx: inherit = {}, \define@key{blx@lbx}{inherit}{% - \global\toggletrue{blx@nosuffrecurse}% - \blx@lbxinput{#1}{}{\blx@err@nolang{#1}}% + \blx@lbxinput@strings{#1}{}{\blx@err@nolang{#1}}% \csuse{abx@strings@#1}} \def\blx@cfg@defstring#1#2{% @@ -4910,8 +4952,7 @@ % {}{} \def\blx@letbibextras#1#2{% - \global\toggletrue{blx@nosuffrecurse}% - \blx@lbxinput{#2}{}{\blx@err@nolang{#2}}% + \blx@lbxinput@extras{#2}{}{\blx@err@nolang{#2}}% \global\csletcs{abx@extras@#1}{abx@extras@#2} \global\csletcs{abx@noextras@#1}{abx@noextras@#2}}% @@ -4955,8 +4996,7 @@ % {}{} \def\blx@letbibstrings#1#2{% - \global\toggletrue{blx@nosuffrecurse}% - \blx@lbxinput{#2}{}{\blx@err@nolang{#2}}% + \blx@lbxinput@strings{#2}{}{\blx@err@nolang{#2}}% \global\csletcs{abx@strings@#1}{abx@strings@#2}}% % {}{} @@ -4987,78 +5027,140 @@ \csgdef{blx@lng@explicit@#1}{#2}} \@onlypreamble\DeclareLanguageMapping +% to avoid copying, these commands simply redefine the input handlers and +% process and postprocess code % {}{}{} \def\blx@lbxinput#1{% - \ifdefempty\blx@lng@suff - {} - {\ifcsdef{blx@lng@explicit@#1}% \DeclareLanguageMapping overrides \DeclareLanguageMappingSuffix - {} - {\nottoggle{blx@nosuffrecurse} - {\csgdef{blx@lng@#1}{#1\blx@lng@suff}} - {}}}% - \blx@lbxinput@0{#1}} + \csletcs{blx@lbx@input@handler}{blx@lbx@input@handler@once}% + \csletcs{blx@lbx@input@process}{blx@lbx@input@process@all}% + \csletcs{blx@lbx@input@postprocess}{blx@lbx@input@postprocess@all}% + \blx@lbxinput@i{#1}} + +\def\blx@lbxinput@strings#1{% + \csletcs{blx@lbx@input@handler}{blx@lbx@input@handler@simple}% + \csletcs{blx@lbx@input@process}{blx@lbx@input@process@strings}% + \csletcs{blx@lbx@input@postprocess}{blx@lbx@input@postprocess@strings}% + \blx@lbxinput@i{#1}} + +\def\blx@lbxinput@extras#1{% + \csletcs{blx@lbx@input@handler}{blx@lbx@input@handler@simple}% + \csletcs{blx@lbx@input@process}{blx@lbx@input@process@extras}% + \csletcs{blx@lbx@input@postprocess}{blx@lbx@input@postprocess@extras}% + \blx@lbxinput@i{#1}} + +\def\blx@lbxinput@i#1{% + \ifcsundef{blx@nolbxrecurse@#1} + {\ifcsdef{blx@lng@explicit@#1} + {\global\csletcs{blx@lng@#1}{blx@lng@explicit@#1}} + {\ifdefempty\blx@lng@suff + {} + {\csgdef{blx@lng@#1}{#1\blx@lng@suff}}}} + {}% + \blx@lbxinput@ii{#1}} -\def\blx@lbxinput@0#1{% +\def\blx@lbxinput@ii#1{% \ifcsdef{blx@lng@#1} - {\expandafter\expandafter\expandafter\blx@lbxinput@i + {\expandafter\expandafter\expandafter\blx@lbxinput@iii \expandafter\expandafter\expandafter{% \csname blx@lng@#1\endcsname}{#1}} - {\blx@lbxinput@ii{#1}{#1}{language '#1'}}} + {\blx@lbxinput@iv{#1}{#1}{language '#1'}}} % {}{} -\def\blx@lbxinput@i#1#2{% +\def\blx@lbxinput@iii#1#2{% \global\csundef{blx@lng@#2}% \IfFileExists{#1.lbx} - {\blx@lbxinput@ii{#2}{#1}{language '#2' -> '#1'}} + {\blx@lbxinput@iv{#2}{#1}{language '#2' -> '#1'}} {\ifcsdef{blx@suffmaptried@#2} {} {\blx@warning@noline{% File '#1.lbx' not found!\MessageBreak Ignoring mapping '#2' -> '#1'}% - \cslet{blx@suffmaptried@#2}\@empty}% - \blx@lbxinput@0{#2}}} + \global\cslet{blx@suffmaptried@#2}\@empty}% + \blx@lbxinput@iv{#2}{#2}{language '#2'}}} + +% .lbx files must be read with one of the two following commands, +% do not use \blx@inputonce. Only the commands here make sure that the file +% is read as many times as necessary. +% {}{}{}{}{}{} +\protected\long\def\blx@lbx@input@handler@simple#1#2#3#4#5#6{% + \blx@info@noline{Trying to load #2..}% + \IfFileExists{#1} + {\blx@info@noline{... file '#1' found}% + #3\@@input\@filef@und#4#5% + \ifcsundef{blx@file@lbx@#1} + {\listxadd\blx@list@req@stat{#1}% + \@addtofilelist{#1}% + \global\cslet{blx@file@lbx@#1}\@empty} + {}} + {\blx@info@noline{... file '#1' not found}#6}} + +% {}{}{}{}{}{} +\protected\long\def\blx@lbx@input@handler@once#1#2#3#4#5#6{% + \ifcsundef{blx@file@lbx@#1} + {\blx@info@noline{Trying to load #2..}% + \global\cslet{blx@file@lbx@#1}\@empty + \IfFileExists{#1} + {\blx@info@noline{... file '#1' found}% + #3\@@input\@filef@und#4#5% + \listxadd\blx@list@req@stat{#1}% + \@addtofilelist{#1}} + {\blx@info@noline{... file '#1' not found}#6}} + {#5}} + +\def\blx@lbx@input@process@strings#1{ + \global\cslet{abx@strings@#1}\@empty + \def\InheritBibliographyStrings{% + \blx@letbibstrings{#1}}% + \def\DeclareBibliographyStrings##1{% + \begingroup + \let\blx@defstring\blx@lbx@defstring + \blx@defbibstrings{#1}{##1}% + \endgroup}} + +\def\blx@lbx@input@process@extras#1{% + \global\cslet{abx@extras@#1}\@empty + \global\cslet{abx@noextras@#1}\@empty + \def\InheritBibliographyExtras{\blx@letbibextras{#1}}% + \def\DeclareBibliographyExtras{\blx@defbibextras{#1}}% + \def\UndeclareBibliographyExtras{\blx@undefbibextras{#1}}} + +\def\blx@lbx@input@process@all#1{% + \blx@lbx@input@process@strings{#1}% + \blx@lbx@input@process@extras{#1}% + \def\DeclareHyphenationExceptions{\blx@hyphexcept{#1}}} + +\def\blx@lbx@input@postprocess@strings#1{ + \csuse{blx@hook@strings@#1}} + +\def\blx@lbx@input@postprocess@extras#1{% + \csuse{blx@hook@extras@#1}% + \csuse{blx@hook@noextras@#1}} + +\def\blx@lbx@input@postprocess@all#1{% + \blx@lbx@input@postprocess@strings{#1}% + \blx@lbx@input@postprocess@extras{#1}% + \csuse{blx@hook@hyph@#1}} % {}{}{} -% toggle 'blx@nosuffrecurse' is set to true at the places where recursion into here -% can occur when loading a .lbx otherwise, when using \DeclareLanguageMappingSuffix -% it is possible to get into infinite loops. We only want to apply the suffix to explicitly -% loaded languages, not those loaded by recursion. -\def\blx@lbxinput@ii#1#2#3{% - \begingroup - \setbox\@tempboxa=\hbox\bgroup - \aftergroup\endgroup - \blx@inputonce{#2.lbx}{#3} - {\global\cslet{abx@strings@#1}\@empty - \global\cslet{abx@extras@#1}\@empty - \global\cslet{abx@noextras@#1}\@empty - \blx@maplang{#1}{#1}% - \def\InheritBibliographyStrings{% - \blx@letbibstrings{#1}}% - \def\DeclareBibliographyStrings####1{% - \begingroup - \let\blx@defstring\blx@lbx@defstring - \blx@defbibstrings{#1}{####1}% - \endgroup}% - \def\InheritBibliographyExtras{\blx@letbibextras{#1}}% - \def\DeclareBibliographyExtras{\blx@defbibextras{#1}}% - \def\UndeclareBibliographyExtras{\blx@undefbibextras{#1}}% - \def\DeclareHyphenationExceptions{\blx@hyphexcept{#1}}% +\def\blx@lbxinput@iv#1#2#3{% + \begingroup + \blx@lbx@input@handler{#2.lbx}{#3} + {\blx@maplang{#1}{#1}% + \let\InheritBibliographyStrings\@gobble + \let\DeclareBibliographyStrings\@gobble + \let\InheritBibliographyExtras\@gobble + \let\DeclareBibliographyExtras\@gobble + \let\UndeclareBibliographyExtras\@gobble + \blx@lbx@input@process{#1}% \begingroup + \cslet{blx@nolbxrecurse@#1}\@empty \blx@saneccodes \makeatletter} {\endgroup - \csuse{blx@hook@strings@#1}% - \csuse{blx@hook@strings@#2}% - \csuse{blx@hook@extras@#1}% - \csuse{blx@hook@extras@#2}% - \csuse{blx@hook@noextras@#1}% - \csuse{blx@hook@noextras@#2}% - \csuse{blx@hook@hyph@#1}% - \csuse{blx@hook@hyph@#2}% - \global\togglefalse{blx@nosuffrecurse}} + \blx@lbx@input@postprocess{#1}} {\aftergroup\@firstoftwo} {\aftergroup\@secondoftwo}% - \egroup} + \endgroup} % {} \def\blx@langsetup#1{% @@ -5098,6 +5200,7 @@ \newrobustcmd*{\mkdaterangecompextra}{% \mkdaterangetruncextra{long}} +% calls to \blx@metadateinfo should be grouped to avoid name clashes \def\blx@metadateinfo#1{% \letcs\ifdateera{if#1dateera}% \letcs\ifenddateera{if#1enddateera}% @@ -5106,7 +5209,9 @@ \letcs\ifdatejulian{if#1datejulian}% \letcs\ifenddatejulian{if#1enddatejulian}% \letcs\ifdateuncertain{if#1dateuncertain}% - \letcs\ifenddateuncertain{if#1enddateuncertain}} + \letcs\ifenddateuncertain{if#1enddateuncertain}% + \letcs\ifdateunknown{if#1dateunknown}% + \letcs\ifenddateunknown{if#1enddateunknown}} \expandafter\newrobustcmd\expandafter*\csname mktimerange24h\endcsname{% \mktimerange{24h}} @@ -5158,138 +5263,144 @@ % {}{} \newrobustcmd*{\mkdaterangefull}[2]{% - \blx@metadateinfo{#2}% - \iffieldundef{#2year} - {} - {\datecircaprint - \printtext[#2date]{% - % Such a season component can only come from an ISO8601 season which replaces - % a normal month so if it exists, we know that a normal date print is ruled out - \iffieldundef{#2season} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% - % Optionally print the time after the date - \blx@printtime{#2}{}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% - \dateuncertainprint - \dateeraprint{#2year}% - \iffieldundef{#2endyear} - {} - {\iffieldequalstr{#2endyear}{} - {\mbox{\bibdaterangesep}} - {\bibdaterangesep - \enddatecircaprint - \iffieldundef{#2season} - {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% - % Optionally print the time after the date - \blx@printtime{#2}{end}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% - \enddateuncertainprint - \dateeraprint{#2endyear}}}}}} - -\newrobustcmd*{\mkdaterangetrunc}[2]{% - \blx@metadateinfo{#2}% - \iffieldundef{#2year} - {} - {\datecircaprint - \printtext[#2date]{% - % Such a season component can only come from an ISO8601 season which replaces - % a normal month so if it exists, we know that a normal date print is ruled out - \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} - {\iffieldsequal{#2month}{#2endmonth} - {\csuse{mkbibdate#1}{}{}{#2day}} - {\csuse{mkbibdate#1}{}{#2month}{#2day}}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% - \iffieldsequal{#2dateera}{#2enddateera}{} - {\dateeraprint{#2year}}}} - {\iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}% - \iffieldsequal{#2dateera}{#2enddateera}{} - {\dateeraprint{#2year}}}}% - \dateuncertainprint - \iffieldundef{#2endyear} - {} - {\iffieldequalstr{#2endyear}{} - {\mbox{\bibdaterangesep}} - {\bibdaterangesep - \enddatecircaprint - \iffieldundef{#2season} - {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% - \enddateuncertainprint - \dateeraprint{#2endyear}}}}}} - -\newrobustcmd*{\mkdaterangefullextra}[2]{% - \blx@metadateinfo{#2}% - \iffieldundef{#2year} - {} - {\datecircaprint - \printtext[#2date]{% - \printtext{% - % Such a season component can only come from an ISO8601 season which replaces - % a normal month so if it exists, we know that a normal date print is ruled out - \iffieldundef{#2season} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% - % Optionally print the time after the date - \blx@printtime{#2}{}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% - \dateuncertainprint - \dateeraprint{#2year}% - \iffieldundef{#2endyear} - {\printfield{extradate}} - {\iffieldequalstr{#2endyear}{} - {\printfield{extradate}% - \printtext{\mbox{\bibdaterangesep}}} - {\printtext{% - \bibdaterangesep + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\printtext[#2date]{% + \datecircaprint + % Such a season component can only come from an ISO8601 season which replaces + % a normal month so if it exists, we know that a normal date print is ruled out + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + % Optionally print the time after the date + \blx@printtime{#2}{}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateuncertainprint + \dateeraprint{#2year}% + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdaterangesep}} + {\bibdaterangesep \enddatecircaprint \iffieldundef{#2season} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% % Optionally print the time after the date \blx@printtime{#2}{end}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% - \printfield{extradate}% + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% \enddateuncertainprint - \dateeraprint{#2endyear}}}}}}} + \dateeraprint{#2endyear}}}}}% + \endgroup} -\newrobustcmd*{\mkdaterangetruncextra}[2]{% - \blx@metadateinfo{#2}% - \iffieldundef{#2year} - {} - {\datecircaprint - \printtext[#2date]{% - \printtext{% - % Such a season component can only come from an ISO8601 season which replaces - % a normal month so if it exists, we know that a normal date print is ruled out - \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} - {\iffieldsequal{#2month}{#2endmonth} - {\csuse{mkbibdate#1}{}{}{#2day}} - {\csuse{mkbibdate#1}{}{#2month}{#2day}}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% - \iffieldsequal{#2dateera}{#2enddateera}{} - {\dateeraprint{#2year}}}} - {\iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}% - \iffieldsequal{#2dateera}{#2enddateera}{} - {\dateeraprint{#2year}}}}% - \dateuncertainprint - \iffieldundef{#2endyear} - {\printfield{extradate}} - {\iffieldequalstr{#2endyear}{} - {\printfield{extradate}% - \printtext{\mbox{\bibdaterangesep}}} - {\printtext{% - \bibdaterangesep +\newrobustcmd*{\mkdaterangetrunc}[2]{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\printtext[#2date]{% + \datecircaprint + % Such a season component can only come from an ISO8601 season which replaces + % a normal month so if it exists, we know that a normal date print is ruled out + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{}{}{#2day}} + {\csuse{mkbibdate#1}{}{#2month}{#2day}}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \iffieldsequal{#2dateera}{#2enddateera}{} + {\dateeraprint{#2year}}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}% + \iffieldsequal{#2dateera}{#2enddateera}{} + {\dateeraprint{#2year}}}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdaterangesep}} + {\bibdaterangesep \enddatecircaprint \iffieldundef{#2season} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% - \printfield{extradate}% + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% \enddateuncertainprint - \dateeraprint{#2endyear}}}}}}} + \dateeraprint{#2endyear}}}}}% + \endgroup} + +\newrobustcmd*{\mkdaterangefullextra}[2]{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\printtext[#2date]{% + \datecircaprint + % Such a season component can only come from an ISO8601 season which replaces + % a normal month so if it exists, we know that a normal date print is ruled out + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + % Optionally print the time after the date + \blx@printtime{#2}{}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateuncertainprint + \dateeraprint{#2year}% + \iffieldundef{#2endyear} + {\printfield{extradate}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extradate}% + \printtext{\mbox{\bibdaterangesep}}} + {\printtext{% + \bibdaterangesep + \enddatecircaprint + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% + % Optionally print the time after the date + \blx@printtime{#2}{end}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% + \printfield{extradate}% + \enddateuncertainprint + \dateeraprint{#2endyear}}}}}% + \endgroup} + +\newrobustcmd*{\mkdaterangetruncextra}[2]{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\printtext[#2date]{% + \datecircaprint + % Such a season component can only come from an ISO8601 season which replaces + % a normal month so if it exists, we know that a normal date print is ruled out + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{}{}{#2day}} + {\csuse{mkbibdate#1}{}{#2month}{#2day}}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \iffieldsequal{#2dateera}{#2enddateera}{} + {\dateeraprint{#2year}}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}% + \iffieldsequal{#2dateera}{#2enddateera}{} + {\dateeraprint{#2year}}}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {\printfield{extradate}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extradate}% + \printtext{\mbox{\bibdaterangesep}}} + {\printtext{% + \bibdaterangesep + \enddatecircaprint + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% + \printfield{extradate}% + \enddateuncertainprint + \dateeraprint{#2endyear}}}}}% + \endgroup} \newrobustcmd*{\mkdaterangeyear}[1]{% \blx@imc@clearfield{#1season}% @@ -5313,64 +5424,68 @@ % {} \newrobustcmd*{\mkdaterangeymd}[1]{% - \blx@metadateinfo{#1}% - \iffieldundef{#1year} - {} - {\datecircaprint - \printtext[#1date]{% - % Such a season component can only come from an ISO8601 season which replaces - % a normal month so if it exists, we know that a normal date print is ruled out - \iffieldundef{#1season} - {\blx@ymddate{#1}{}% - % Optionally print the time after the date - \blx@printtime{#1}{}} - {\csuse{mkbibseasondateshort}{#1year}{#1season}}% - \dateuncertainprint - \dateeraprint{#1year}% - \iffieldundef{#1endyear} - {} - {\iffieldequalstr{#1endyear}{} - {\mbox{\bibdaterangesep}} - {\bibdaterangesep - \enddatecircaprint - \iffieldundef{#1season} - {\blx@ymddate{#1}{end}% - % Optionally print the time after the date - \blx@printtime{#1}{end}} - {\csuse{mkbibseasondateshort}{#1endyear}{#1endseason}}% - \enddateuncertainprint - \dateeraprint{#1endyear}}}}}} - -% {} -\newrobustcmd*{\mkdaterangeymdextra}[1]{% - \blx@metadateinfo{#1}% - \iffieldundef{#1year} - {} - {\datecircaprint - \printtext[#1date]{% - % Such a season component can only come from an ISO8601 season which replaces - % a normal month so if it exists, we know that a normal date print is ruled out - \iffieldundef{#1season} - {\blx@ymddate[extradate]{#1}{}% - % Optionally print the time after the date - \blx@printtime{#1}{}} - {\csuse{mkbibseasondateshort}{#1year}{#1season}}% - \dateuncertainprint - \dateeraprint{#1year}% - \iffieldundef{#1endyear} - {} - {\iffieldequalstr{#1endyear}{} - {\mbox{\bibdaterangesep}} - {\printtext{% - \bibdaterangesep + \begingroup + \blx@metadateinfo{#1}% + \iffieldundef{#1year} + {} + {\printtext[#1date]{% + \datecircaprint + % Such a season component can only come from an ISO8601 season which replaces + % a normal month so if it exists, we know that a normal date print is ruled out + \iffieldundef{#1season} + {\blx@ymddate{#1}{}% + % Optionally print the time after the date + \blx@printtime{#1}{}} + {\csuse{mkbibseasondateshort}{#1year}{#1season}}% + \dateuncertainprint + \dateeraprint{#1year}% + \iffieldundef{#1endyear} + {} + {\iffieldequalstr{#1endyear}{} + {\mbox{\bibdaterangesep}} + {\bibdaterangesep \enddatecircaprint \iffieldundef{#1season} {\blx@ymddate{#1}{end}% % Optionally print the time after the date \blx@printtime{#1}{end}} - {\csuse{mkbibseasondateshort}{#1endyear}{#1endseason}}}% - \enddateuncertainprint - \dateeraprint{#1endyear}}}}}} + {\csuse{mkbibseasondateshort}{#1endyear}{#1endseason}}% + \enddateuncertainprint + \dateeraprint{#1endyear}}}}}% + \endgroup} + +% {} +\newrobustcmd*{\mkdaterangeymdextra}[1]{% + \begingroup + \blx@metadateinfo{#1}% + \iffieldundef{#1year} + {} + {\printtext[#1date]{% + \datecircaprint + % Such a season component can only come from an ISO8601 season which replaces + % a normal month so if it exists, we know that a normal date print is ruled out + \iffieldundef{#1season} + {\blx@ymddate[extradate]{#1}{}% + % Optionally print the time after the date + \blx@printtime{#1}{}} + {\csuse{mkbibseasondateshort}{#1year}{#1season}}% + \dateuncertainprint + \dateeraprint{#1year}% + \iffieldundef{#1endyear} + {} + {\iffieldequalstr{#1endyear}{} + {\mbox{\bibdaterangesep}} + {\printtext{% + \bibdaterangesep + \enddatecircaprint + \iffieldundef{#1season} + {\blx@ymddate{#1}{end}% + % Optionally print the time after the date + \blx@printtime{#1}{end}} + {\csuse{mkbibseasondateshort}{#1endyear}{#1endseason}}}% + \enddateuncertainprint + \dateeraprint{#1endyear}}}}}% + \endgroup} % [extradate]{}{''|end} \newrobustcmd*{\blx@ymddate}[3][]{% @@ -5411,64 +5526,68 @@ {}} \newrobustcmd*{\mkdaterangeiso}[1]{% - \blx@metadateinfo{#1}% - \def\bibdatetimesep{T}% - \iffieldundef{#1year} - {} - {\printtext[#1date]{% - \blx@isodate{#1}{}% - \ifboolexpr{% - togl {blx@#1dateusetime} - and - not test {\iffieldundef{#1hour}}} - {\printtext{\bibdatetimesep}% - \blx@isotime{#1}{}} - {}% - \dateuncertainprint - \datecircaprintiso - \iffieldundef{#1endyear} - {} - {\addslash - \blx@isodate{#1}{end}% - \ifboolexpr{% - togl {blx@#1dateusetime} - and - not test {\iffieldundef{#1endhour}}} - {\printtext{\bibdatetimesep}% - \blx@isotime{#1}{end}} - {}% - \enddateuncertainprint - \enddatecircaprintiso}}}} + \begingroup + \blx@metadateinfo{#1}% + \def\bibdatetimesep{T}% + \iffieldundef{#1year} + {} + {\printtext[#1date]{% + \blx@isodate{#1}{}% + \ifboolexpr{% + togl {blx@#1dateusetime} + and + not test {\iffieldundef{#1hour}}} + {\printtext{\bibdatetimesep}% + \blx@isotime{#1}{}} + {}% + \dateuncertainprint + \datecircaprintiso + \iffieldundef{#1endyear} + {} + {\addslash + \blx@isodate{#1}{end}% + \ifboolexpr{% + togl {blx@#1dateusetime} + and + not test {\iffieldundef{#1endhour}}} + {\printtext{\bibdatetimesep}% + \blx@isotime{#1}{end}} + {}% + \enddateuncertainprint + \enddatecircaprintiso}}}% + \endgroup} \newrobustcmd*{\mkdaterangeisoextra}[1]{% - \blx@metadateinfo{#1}% - \def\bibdatetimesep{T}% - \iffieldundef{#1year} - {} - {\printtext[#1date]{% - \blx@isodate[extradate]{#1}{}% - \ifboolexpr{% - togl {blx@#1dateusetime} - and - not test {\iffieldundef{#1hour}}} - {\printtext{\bibdatetimesep}% - \blx@isotime{#1}{}} - {}% - \dateuncertainprint - \datecircaprintiso - \iffieldundef{#1endyear} - {} - {\addslash - \blx@isodate{#1}{end}}% - \ifboolexpr{% - togl {blx@#1dateusetime} - and - not test {\iffieldundef{#1endhour}}} - {\printtext{\bibdatetimesep}% - \blx@isotime{#1}{end}} - {}% - \enddateuncertainprint - \enddatecircaprintiso}}} + \begingroup + \blx@metadateinfo{#1}% + \def\bibdatetimesep{T}% + \iffieldundef{#1year} + {} + {\printtext[#1date]{% + \blx@isodate[extradate]{#1}{}% + \ifboolexpr{% + togl {blx@#1dateusetime} + and + not test {\iffieldundef{#1hour}}} + {\printtext{\bibdatetimesep}% + \blx@isotime{#1}{}} + {}% + \dateuncertainprint + \datecircaprintiso + \iffieldundef{#1endyear} + {} + {\addslash + \blx@isodate{#1}{end}}% + \ifboolexpr{% + togl {blx@#1dateusetime} + and + not test {\iffieldundef{#1endhour}}} + {\printtext{\bibdatetimesep}% + \blx@isotime{#1}{end}} + {}% + \enddateuncertainprint + \enddatecircaprintiso}}% + \endgroup} % [extradate]{}{''|end} \newrobustcmd*{\blx@isodate}[3][]{% @@ -6026,7 +6145,9 @@ \cslet{if#1datejulian}\@secondoftwo \cslet{if#1enddatejulian}\@secondoftwo \cslet{if#1dateuncertain}\@secondoftwo - \cslet{if#1enddateuncertain}\@secondoftwo} + \cslet{if#1enddateuncertain}\@secondoftwo + \cslet{if#1dateunknown}\@secondoftwo + \cslet{if#1enddateunknown}\@secondoftwo} \abx@dodatetypes \do{labeldate} @@ -6044,7 +6165,9 @@ \listxadd\blx@datemetabooleans{#1datejulian}% \listxadd\blx@datemetabooleans{#1enddatejulian}% \listxadd\blx@datemetabooleans{#1dateuncertain}% - \listxadd\blx@datemetabooleans{#1enddateuncertain}} + \listxadd\blx@datemetabooleans{#1enddateuncertain}% + \listxadd\blx@datemetabooleans{#1dateunknown}% + \listxadd\blx@datemetabooleans{#1enddateunknown}} \abx@dodatetypes \def\do#1{% @@ -6063,6 +6186,22 @@ \do{labeldatesource}% \do{labeldateera}% \do{labelenddateera}% + \do{labelyear}% + \do{labelendyear}% + \do{labelmonth}% + \do{labelendmonth}% + \do{labelday}% + \do{labelendday}% + \do{labelhour}% + \do{labelendhour}% + \do{labelminute}% + \do{labelendminute}% + \do{labelsecond}% + \do{labelendsecond}% + \do{labeltimezone}% + \do{labelendtimezone}% + \do{labelseason}% + \do{labelendseason}% \do{entrykey}% \do{entryset}% \do{entrysetcount}% @@ -6111,33 +6250,40 @@ \abx@dodatetypes % Set up circa, julian and uncertain date internals -\def\blx@imc@ifdatemeta@i#1#2{% +\def\blx@makeifdatemeta@bools@i#1#2{% \appto\blx@blxinit{% - \csdef{if#1date#2}{\iftoggle{abx@bool@#1date#2}}% - \csdef{if#1enddate#2}{\iftoggle{abx@bool@#1enddate#2}}% - \appto\blx@TE@hook{% - \csdef{if#1date#2}{\blx@TE{\iftoggle{abx@bool@#1date#2}}}% - \csdef{if#1enddate#2}{\blx@TE{\iftoggle{abx@bool@#1enddate#2}}}}}} + \blx@makeifdatemeta@bools{#1}{#2}}} + +\def\blx@makeifdatemeta@bools#1#2{% + \csdef{if#1date#2}{\iftoggle{abx@bool@#1date#2}}% + \csdef{if#1enddate#2}{\iftoggle{abx@bool@#1enddate#2}}% + \appto\blx@TE@hook{% + \csdef{if#1date#2}{\blx@TE{\iftoggle{abx@bool@#1date#2}}}% + \csdef{if#1enddate#2}{\blx@TE{\iftoggle{abx@bool@#1enddate#2}}}}} % Set up date era internals -\def\blx@imc@ifdatemeta@ii#1{% +\def\blx@makeifdatemeta@fields@i#1{% \appto\blx@blxinit{% - \csdef{if#1dateera}##1{\ifcsstring{abx@field@#1dateera}{##1}}% - \csdef{if#1enddateera}##1{\ifcsstring{abx@field@#1enddateera}{##1}}% - \appto\blx@TE@hook{% - \csdef{if#1dateera}##1{\blx@TE{\ifcsstring{abx@field@#1dateera}{##1}}}% - \csdef{if#1enddateera}##1{\blx@TE{\ifcsstring{abx@field@#1enddateera}{##1}}}}}} + \blx@makeifdatemeta@fields{#1}}} + +\def\blx@makeifdatemeta@fields#1{% + \csdef{if#1dateera}##1{\ifcsstring{abx@field@#1dateera}{##1}}% + \csdef{if#1enddateera}##1{\ifcsstring{abx@field@#1enddateera}{##1}}% + \appto\blx@TE@hook{% + \csdef{if#1dateera}##1{\blx@TE{\ifcsstring{abx@field@#1dateera}{##1}}}% + \csdef{if#1enddateera}##1{\blx@TE{\ifcsstring{abx@field@#1enddateera}{##1}}}}} % Create date meta information boolean tests \def\do#1{% - \blx@imc@ifdatemeta@i{#1}{circa}% - \blx@imc@ifdatemeta@i{#1}{julian}% - \blx@imc@ifdatemeta@i{#1}{uncertain}} + \blx@makeifdatemeta@bools@i{#1}{circa}% + \blx@makeifdatemeta@bools@i{#1}{julian}% + \blx@makeifdatemeta@bools@i{#1}{uncertain}% + \blx@makeifdatemeta@bools@i{#1}{unknown}} \abx@dodatetypes % Create date meta information field tests \def\do#1{% - \blx@imc@ifdatemeta@ii{#1}} + \blx@makeifdatemeta@fields@i{#1}} \abx@dodatetypes % Resolve date meta information tests and print routines for labeldate @@ -6316,6 +6462,11 @@ \def\do#1{\expandafter\newlength\expandafter{\csname #1width\endcsname}} \abx@dolabelfields +\newlength{\locallabelnumberwidth} +\newlength{\locallabelalphawidth} +\def\do#1{\expandafter\newlength\expandafter{\csname local#1width\endcsname}} +\abx@dolabelfields + \protected\def\blx@resetdata{% \let\blx@saved@do\do \let\do\blx@imc@clearname @@ -6325,6 +6476,11 @@ \let\do\blx@imc@clearfield \abx@dofields \abx@dointernalfields + \ifundef\abx@annotation@defined + {} + {\def\do##1{\csundef{abx@annotation@##1}}% + \dolistloop\abx@annotation@defined}% + \let\abx@annotation@defined\@empty \def\do##1{\togglefalse{abx@bool@##1}}% \abx@dobooleans \let\do\blx@saved@do @@ -6349,11 +6505,24 @@ \dolistloop\abx@dorellists \let\do\blx@savefield \abx@dofields + \abx@dointernalfields \let\do\blx@saverelfield \dolistloop\abx@dorelfields - \abx@dointernalfields + \ifundef\abx@savedannotation@defined + {} + {\def\do##1{\csundef{abx@annotation@\blx@saveannotations@makesaved##1}}% + \dolistloop\abx@savedannotation@defined}% + \let\abx@savedannotation@defined\@empty + \ifundef\abx@annotation@defined + {} + {\let\do\blx@saveannotations + \dolistloop\abx@annotation@defined}% + \let\abx@savedannotation@defined\abx@annotation@defined \let\do\blx@savebool \abx@dobooleans + \let\do\blx@savedatetype + \abx@dodatetypes + \do{label}% \c@savedcitecounter\c@citecounter \let\do\blx@saved@do} @@ -6387,7 +6556,46 @@ \csletcs{abx@field@saved@#1}{abx@field@relsaved#1}} \protected\def\blx@savebool#1{% - \csletcs{abx@bool@saved#1}{abx@bool@#1}} + \csletcs{etb@tgl@abx@bool@saved#1}{etb@tgl@abx@bool@#1}} + +\protected\def\blx@savedatetype#1{% + \csletcs{blx@dateformat@saved#1date}{blx@dateformat@#1date}% + \protected\csedef{blx@imc@printsaved#1date}{% + \noexpand\csuse{mkdaterange\csuse{blx@dateformat@saved#1date}} + {saved#1}}% + \protected\csedef{blx@imc@printsaved#1dateextra}{% + \begingroup + % extradate is hard-coded in date macros, so reset it temporarily + \csletcs{abx@field@extradate}{abx@field@savedextradate}% + \noexpand\csuse{mkdaterange\csuse{blx@dateformat@saved#1date}extra} + {saved#1}% + \endgroup}% + \csletcs{blx@timeformat@saved#1time}{blx@timeformat@#1time}% + \protected\csedef{blx@imc@printsaved#1time}{% + \noexpand\csuse{mktimerange\csuse{blx@timeformat@saved#1time}} + {saved#1}}% + \csletcs{etb@tgl@blx@saved#1dateusetime}{etb@tgl@blx@#1dateusetime}% + % the datemetabooleans are here again for labeldate + \blx@savebool{#1datecirca}% + \blx@savebool{#1enddatecirca}% + \blx@savebool{#1datejulian}% + \blx@savebool{#1enddatejulian}% + \blx@savebool{#1dateuncertain}% + \blx@savebool{#1enddateuncertain}% + \blx@savebool{#1dateunknown}% + \blx@savebool{#1enddateunknown}% + \blx@makeifdatemeta@bools{saved#1}{circa}% + \blx@makeifdatemeta@bools{saved#1}{julian}% + \blx@makeifdatemeta@bools{saved#1}{uncertain}% + \blx@makeifdatemeta@bools{saved#1}{unknown}% + \blx@makeifdatemeta@fields{saved#1}% + \csletcs{printsaved#1date}{blx@imc@printsaved#1date}% + \csletcs{printsaved#1time}{blx@imc@printsaved#1time}% + \csletcs{printsaved#1dateextra}{blx@imc@printsaved#1dateextra}} + +\def\blx@saveannotations@makesaved#1@#2{#1@saved#2} +\protected\def\blx@saveannotations#1{% + \csletcs{abx@annotation@\blx@saveannotations@makesaved#1}{abx@annotation@#1}} % {} \protected\long\def\blx@bbl@preamble#1{% @@ -6516,45 +6724,89 @@ % {}{}{}{}{} \protected\def\blx@bbl@annotationdef#1#2#3#4#5{% - \ifboolexpr { test {\ifstrequal{#1}{field}} } + \ifstrequal{#1}{field} {\csxappto\blx@bbl@data{% - \def\do####1{\listcsadd{abx@annotation@#1@#2}{####1}}% - \docsvlist{#5}}} + \listadd\noexpand\abx@annotation@defined{#1@#2}% + \def\do####1{\listcsadd{abx@annotation@#1@#2}{####1}}% + \docsvlist{#5}}} {}% - \ifboolexpr { test {\ifstrequal{#1}{item}} } + \ifstrequal{#1}{item} {\csxappto\blx@bbl@data{% - \def\do####1{\listcsadd{abx@annotation@#1@#2@#3}{####1}}% - \docsvlist{#5}}} + \listadd\noexpand\abx@annotation@defined{#1@#2@#3}% + \def\do####1{\listcsadd{abx@annotation@#1@#2@#3}{####1}}% + \docsvlist{#5}}} {}% - \ifboolexpr { test {\ifstrequal{#1}{part}} } + \ifstrequal{#1}{part} {\csxappto\blx@bbl@data{% - \def\do####1{\listcsadd{abx@annotation@#1@#2@#3@#4}{####1}}% - \docsvlist{#5}}} + \listadd\noexpand\abx@annotation@defined{#1@#2@#3@#4}% + \def\do####1{\listcsadd{abx@annotation@#1@#2@#3@#4}{####1}}% + \docsvlist{#5}}} {}} -% {} -\newcommand*{\iffieldannotation}[1]{% - \ifdefvoid\currentfield{}{\let\blx@tempa\currentfield}% - \ifdefvoid\currentlist{}{\let\blx@tempa\currentlist}% - \ifdefvoid\currentname{}{\let\blx@tempa\currentname}% +% []{} +\newcommand*{\blx@imc@iffieldannotation}[2][]{% + \ifblank{#1} + {\ifdefvoid\currentfield{}{\let\blx@tempa\currentfield}% + \ifdefvoid\currentlist{}{\let\blx@tempa\currentlist}% + \ifdefvoid\currentname{}{\let\blx@tempa\currentname}} + {\def\blx@tempa{#1}}% \blx@resolve@annotation@label{\blx@tempa}% - \ifinlistcs{#1}{abx@annotation@field@\blx@tempa}} + \ifinlistcs{#2}{abx@annotation@field@\blx@tempa}} -% {} -\newcommand*{\ifitemannotation}[1]{% +% [][]{} +\def\blx@imc@ifitemannotation{% \ifdefvoid\currentfield{}{\let\blx@tempa\currentfield}% \ifdefvoid\currentlist{}{\let\blx@tempa\currentlist}% \ifdefvoid\currentname{}{\let\blx@tempa\currentname}% - \blx@resolve@annotation@label{\blx@tempa}% - \ifinlistcs{#1}{abx@annotation@item@\blx@tempa @\the\value{listcount}}} + \@ifnextchar[%] + {\blx@imc@ifitemannotation@i} + {\blx@imc@ifitemannotation@i[\blx@tempa]} +} -% {}{} -\newcommand*{\ifpartannotation}[2]{% +\def\blx@imc@ifitemannotation@i[#1]{% + \@ifnextchar[%] + {\blx@imc@ifitemannotation@ii{#1}} + {\blx@imc@ifitemannotation@ii{#1}[\the\value{listcount}]}} + +\def\blx@imc@ifitemannotation@ii#1[#2]#3{% + \def\blx@tempb{#1}% + \blx@resolve@annotation@label{\blx@tempb}% + \ifinlistcs{#3}{abx@annotation@item@\blx@tempb @#2}} + +% [][]{}{} +\def\blx@imc@ifpartannotation{% \ifdefvoid\currentfield{}{\let\blx@tempa\currentfield}% \ifdefvoid\currentlist{}{\let\blx@tempa\currentlist}% \ifdefvoid\currentname{}{\let\blx@tempa\currentname}% - \blx@resolve@annotation@label{\blx@tempa}% - \ifinlistcs{#2}{abx@annotation@part@\blx@tempa @\the\value{listcount}@#1}} + \@ifnextchar[%] + {\blx@imc@ifpartannotation@i} + {\blx@imc@ifpartannotation@i[\blx@tempa]}} + +\def\blx@imc@ifpartannotation@i[#1]{% + \@ifnextchar[%] + {\blx@imc@ifpartannotation@ii{#1}} + {\blx@imc@ifpartannotation@ii{#1}[\the\value{listcount}]}} + +\def\blx@imc@ifpartannotation@ii#1[#2]#3#4{% + \def\blx@tempb{#1}% + \blx@resolve@annotation@label{\blx@tempb}% + \ifinlistcs{#4}{abx@annotation@part@\blx@tempb @#2@#3}} + +% {}{} +% labeldatesource has a slightly different format than other sources +% that's one reason for a dedicated command, the other being that this command +% is probably only used in contexts where \currentfield is not defined, so +% the argument is always required +\newcommand*{\blx@imc@ifdateannotation}[2]{% + \def\blx@tempa{#1}% + \ifcsundef{abx@field@\blx@tempa source} + {}% + {\letcs\blx@tempa{abx@field@\blx@tempa source}% + \edef\blx@tempa{\blx@tempa date}}% + \ifinlistcs{#2}{abx@annotation@field@\blx@tempa}} + +\blx@regimcs{\iffieldannotation \ifitemannotation \ifpartannotation + \ifdateannotation} % {} \def\blx@resolve@annotation@label#1{% @@ -6825,6 +7077,38 @@ {}% \ifcsdef{abx@field@\abx@field@labeldatesource endseason} {\edef\abx@field@labelendseason{\csuse{abx@field@\abx@field@labeldatesource endseason}}} + {}% + % labeldateunspecified + \ifcsdef{abx@field@\abx@field@labeldatesource dateunspecified} + {\csletcs{abx@field@labeldateunspecified}{abx@field@\abx@field@labeldatesource dateunspecified}} + {}% + % labeldatecirca/labelenddatecirca + \ifcsdef{etb@tgl@abx@bool@\abx@field@labeldatesource datecirca} + {\csletcs{etb@tgl@abx@bool@labeldatecirca}{etb@tgl@abx@bool@\abx@field@labeldatesource datecirca}} + {}% + \ifcsdef{etb@tgl@abx@bool@\abx@field@labeldatesource enddatecirca} + {\csletcs{etb@tgl@abx@bool@labelenddatecirca}{etb@tgl@abx@bool@\abx@field@labeldatesource enddatecirca}} + {}% + % labeldatejulian/labelenddatejulian + \ifcsdef{etb@tgl@abx@bool@\abx@field@labeldatesource datejulian} + {\csletcs{etb@tgl@abx@bool@labeldatejulian}{etb@tgl@abx@bool@\abx@field@labeldatesource datejulian}} + {}% + \ifcsdef{etb@tgl@abx@bool@\abx@field@labeldatesource enddatejulian} + {\csletcs{etb@tgl@abx@bool@labelenddatejulian}{etb@tgl@abx@bool@\abx@field@labeldatesource enddatejulian}} + {}% + % labeldateuncertain/labelenddateuncertain + \ifcsdef{etb@tgl@abx@bool@\abx@field@labeldatesource dateuncertain} + {\csletcs{etb@tgl@abx@bool@labeldateuncertain}{etb@tgl@abx@bool@\abx@field@labeldatesource dateuncertain}} + {}% + \ifcsdef{etb@tgl@abx@bool@\abx@field@labeldatesource enddateuncertain} + {\csletcs{etb@tgl@abx@bool@labelenddateuncertain}{etb@tgl@abx@bool@\abx@field@labeldatesource enddateuncertain}} + {}% + % labeldateunknown/labelenddateunknown + \ifcsdef{etb@tgl@abx@bool@\abx@field@labeldatesource dateunknown} + {\csletcs{etb@tgl@abx@bool@labeldateunknown}{etb@tgl@abx@bool@\abx@field@labeldatesource dateunknown}} + {}% + \ifcsdef{etb@tgl@abx@bool@\abx@field@labeldatesource enddateunknown} + {\csletcs{etb@tgl@abx@bool@labelenddateunknown}{etb@tgl@abx@bool@\abx@field@labeldatesource enddateunknown}} {}}}} % This gets the entry data for a citation @@ -6948,10 +7232,10 @@ \blx@bbl@options{#3}% \blx@setoptions@entry \edef\blx@bbl@data{blx@data@\the\c@refsection @\blx@dlist@name @\abx@field@entrykey}% - \csuse\blx@bbl@data \blx@bbl@addfield{entrykey}{\abx@field@entrykey}% \listxadd\blx@entries{\abx@field@entrykey}% \blx@bbl@addfield{entrytype}{#2}% + \csuse\blx@bbl@data \blx@imc@iffieldundef{options} {} {\blx@bbl@fieldedef{options}{\expandonce\abx@field@options}}} @@ -7032,12 +7316,99 @@ \def\blx@addset@ii#1{% \listcsgadd{blx@dlist@centry@\the\c@refsection @\blx@refcontext@context}{#1}} -\def\blx@bbl@labelfields{% +% {}{/}{} +\def\abx@flfw@getfieldformat#1#2#3{% + \blx@getformat\abx@tmp@theformat{ffd}{#2}{#3}% + \csletcs{#1}{abx@tmp@theformat}} + +\def\blx@labelwidth@resetlocal{% + \locallabelnumberwidth0pt\relax + \locallabelalphawidth0pt\relax + \def\do##1{% + \csname local##1width\endcsname0pt\relax}% + \abx@dolabelfields} + +\def\blx@labelwidth@settolocal{% + \labelnumberwidth\locallabelnumberwidth + \labelalphawidth\locallabelalphawidth + \def\do##1{% + \csname ##1width\endcsname\csname local##1width\endcsname}% + \abx@dolabelfields} + +\def\blx@locallabelwidth#1{% + \blx@labelwidth@resetlocal + \let\blx@do\blx@lengthitem + \let\blx@done\relax + \blx@listloop{#1}% + \blx@labelwidth@settolocal} + +% {} +\def\blx@bbl@labelnumberwidth@numeric#1{% + \abx@flfw@getfieldformat{abx@flfw@labelnumberwidth}{labelnumberwidth}{}% + \abx@flfw@getfieldformat{abx@flfw@labelprefix}{labelprefix}{}% + \abx@flfw@getfieldformat{abx@flfw@labelnumber}{labelnumber}{}% + \iftoggle{blx@defernumbers} + {\ifundef\abx@field@localnumber + {\numdef\abx@field@localnumber{0}}% + {}} + {\ifundef\abx@field@localnumber + {\edef\abx@field@localnumber{% + \csuse{blx@labelnumber@\the\c@refsection}}} + {}}% + \blx@setlabwidth{\csname #1labelnumberwidth\endcsname}{% + \csuse{abx@flfw@labelnumberwidth}{% + \ifdef\abx@field@labelprefix + {\csuse{abx@flfw@labelprefix}{\abx@field@labelprefix}} + {}% + \csuse{abx@flfw@labelnumber}{\abx@field@localnumber}}}} + +\def\blx@bbl@labelnumberwidth@shorthand#1{% + \abx@flfw@getfieldformat{abx@flfw@labelnumberwidth}{labelnumberwidth}{}% + \abx@flfw@getfieldformat{abx@flfw@labelnumber}{labelnumber}{}% + \blx@setlabwidth{\csname #1labelnumberwidth\endcsname}{% + \csuse{abx@flfw@labelnumberwidth}{% + \csuse{abx@flfw@labelnumber}{\abx@field@shorthand}}}} + +\def\blx@bbl@locallabelnumberwidth{% + \ifdefempty\abx@field@localnumber + {} + {\ifundef\abx@field@shorthand + {\blx@bbl@labelnumberwidth@numeric{local}} + {\blx@bbl@labelnumberwidth@shorthand{local}}}} + +% {} +\def\blx@bbl@labelalphawidth#1{% + \abx@flfw@getfieldformat{abx@flfw@labelalphawidth}{labelalphawidth}{}% + \abx@flfw@getfieldformat{abx@flfw@labelprefix}{labelprefix}{}% + \abx@flfw@getfieldformat{abx@flfw@labelalpha}{labelalpha}{}% + \abx@flfw@getfieldformat{abx@flfw@extraalpha}{extraalpha}{}% + \blx@setlabwidth{\csname #1labelalphawidth\endcsname}{% + \csuse{abx@flfw@labelalphawidth}{% + \ifdef\abx@field@labelprefix + {\csuse{abx@flfw@labelprefix}{\abx@field@labelprefix}} + {}% + \csuse{abx@flfw@labelalpha}{\abx@field@labelalpha}% + \ifundef\abx@field@extraalpha + {} + {\csuse{abx@flfw@extraalpha}{\abx@field@extraalpha}}}}} + +\def\blx@bbl@locallabelalphawidth{% + \ifundef\abx@field@labelalpha + {} + {\blx@bbl@labelalphawidth{local}}} + +\def\blx@bbl@locallabelfields{\blx@bbl@labelfields@i{local}} + +\def\blx@bbl@labelfields{\blx@bbl@labelfields@i{}} + +% {} +\def\blx@bbl@labelfields@i#1{% \def\do##1{% \ifcsundef{abx@field@##1} {} - {\blx@setlabwidth{\csname ##1width\endcsname}{% - \csuse{abx@ffd@*@##1width}{\csname abx@field@##1\endcsname}}}}% + {\abx@flfw@getfieldformat{abx@flfw@##1width}{##1width}{##1}% + \blx@setlabwidth{\csname #1##1width\endcsname}{% + \csuse{abx@flfw@##1width}{\csname abx@field@##1\endcsname}}}}% \abx@dolabelfields} \def\blx@bbl@labelnumber{% @@ -7046,16 +7417,7 @@ % the labelnumbers for each sortlist \ifdefempty\abx@field@localnumber {}% only if omitnumbers=true - {\ifcsundef{abx@ffd@\blx@imc@thefield{entrytype}@labelnumberwidth} - {\letcs{\@lnw@labelnumberwidth}{abx@ffd@*@labelnumberwidth}} - {\letcs{\@lnw@labelnumberwidth}{abx@ffd@\blx@imc@thefield{entrytype}@labelnumberwidth}}% - \ifcsundef{abx@ffd@\blx@imc@thefield{entrytype}@labelprefix} - {\letcs{\@lnw@labelprefix}{abx@ffd@*@labelprefix}} - {\letcs{\@lnw@labelprefix}{abx@ffd@\blx@imc@thefield{entrytype}@labelprefix}}% - \ifcsundef{abx@ffd@\blx@imc@thefield{entrytype}@labelnumber} - {\letcs{\@lnw@labelnumber}{abx@ffd@*@labelnumber}} - {\letcs{\@lnw@labelnumber}{abx@ffd@\blx@imc@thefield{entrytype}@labelnumber}}% - \ifundef\abx@field@shorthand + {\ifundef\abx@field@shorthand {\iftoggle{blx@defernumbers} % only if defernumbers=true, we have to define localnumber to % something to stop labelnumberwidth def complaining on first @@ -7076,17 +7438,11 @@ \blx@bbl@fieldedef{labelnumber}{\abx@field@localnumber}}% \iftoggle{blx@skipbib} {} - {\blx@setlabwidth{\labelnumberwidth}{% - \csuse{@lnw@labelnumberwidth}{% - \ifdef\abx@field@labelprefix - {\csuse{@lnw@labelprefix}{\abx@field@labelprefix}} - {}% - \csuse{@lnw@labelnumber}{\abx@field@localnumber}}}}} + {\blx@bbl@labelnumberwidth@numeric{}}} {\csgappto\blx@bbl@data{\let\abx@field@labelnumber\abx@field@shorthand}% \iftoggle{blx@skipbib} {} - {\blx@setlabwidth{\labelnumberwidth}{% - \csuse{@lnw@labelnumberwidth}{\abx@field@shorthand}}}}}} + {\blx@bbl@labelnumberwidth@shorthand{}}}}} \def\blx@bbl@labelalpha{% \ifundef\abx@field@labelalpha @@ -7098,15 +7454,7 @@ \fi}% \iftoggle{blx@skipbib} {} - {\blx@setlabwidth{\labelalphawidth}{% - \csuse{abx@ffd@*@labelalphawidth}{% - \ifdef\abx@field@labelprefix - {\csuse{abx@ffd@*@labelprefix}{\abx@field@labelprefix}} - {}% - \csuse{abx@ffd@*@labelalpha}{\abx@field@labelalpha}% - \ifundef\abx@field@extraalpha - {} - {\csuse{abx@ffd@*@extraalpha}{\abx@field@extraalpha}}}}}}} + {\blx@bbl@labelalphawidth{}}}} \def\blx@bbl@labeltitle{% \ifundef\abx@field@extratitle @@ -7333,7 +7681,7 @@ {\abx@field@localnumber}}% % record that we have already generated and output localnum % for this key in this refsection/refcontext - \csgdef{blx@defer@\the\c@refsection @\blx@refcontext@context @\abx@field@entrykey}{}}} + \global\cslet{blx@defer@\the\c@refsection @\blx@refcontext@context @\abx@field@entrykey}\@empty}} {}} {}}% {}} @@ -7755,6 +8103,16 @@ Use \string\defbibnote\space to define it}} {\def\blx@thepostnote{#1}}} +\define@key{blx@bib1}{locallabelwidth}[]{} +\define@key{blx@biblist1}{locallabelwidth}[]{} +\define@key{blx@bib2}{locallabelwidth}[true]{\blx@key@locallabelwidth{#1}} +\define@key{blx@biblist2}{locallabelwidth}[true]{\blx@key@locallabelwidth{#1}} + +\def\blx@key@locallabelwidth#1{% + \ifstrequal{#1}{true} + {\def\abx@locallabelwidth{\blx@locallabelwidth}} + {\let\abx@locallabelwidth\@gobble}} + \define@key{blx@bib2}{resetnumbers}[true]{% \iftoggle{blx@defernumbers} {\ifstrequal{#1}{true} @@ -7976,7 +8334,7 @@ \endgroup} % {,...} -\def\blx@bibliography{% +\def\blx@bibliography#1{% \blx@langstrings \blx@bibheading\blx@theheading\blx@thetitle \blx@bibnote\blx@theprenote @@ -7990,12 +8348,13 @@ \ifnum\bibnamesep=\z@ \let\blx@namesep\relax \fi + \abx@locallabelwidth{#1}% \csuse{blx@env@\blx@theenv}% \csuse{blx@hook@bibinit}% \csuse{blx@hook@bibinit@next}% \let\blx@do\blx@bibitem \let\blx@done\blx@endbibliography - \blx@listloop} + \blx@listloop{#1}} \def\blx@endbibliography{% \csuse{blx@endenv@\blx@theenv}% @@ -8040,6 +8399,25 @@ \blx@setsfcodes \csuse{blx@bibsetup}} +% {} +\def\blx@lengthitem#1{% + \blx@ifdata{#1} + {\begingroup + \blx@getdata{#1}% + \blx@bibcheck + \iftoggle{blx@skipentry}{}{% + \iftoggle{blx@labelnumber} + {\blx@bbl@locallabelnumberwidth} + {}% + \iftoggle{blx@labelalpha} + {\blx@bbl@locallabelalphawidth} + {}% + \nottoggle{blx@skipbiblist} + {\blx@bbl@locallabelfields} + {}}% + \endgroup} + {}} + % {} % output a bib item, this is why \blx@thelabelnumber is here so that % labelnumber is deferred if defernumbers=true @@ -8201,6 +8579,12 @@ \appto\blx@mknohyperref{\let\blx@anchor\relax} +\define@key{blx@biblist2}{driver}{\blx@key@driver{#1}} +\define@key{blx@biblist1}{driver}{} + +\def\blx@key@driver#1{% + \def\blx@thebiblistdriver{#1}} + % Custom bibliography list % []{biblistname} \newrobustcmd*{\printbiblist}[2][]{% @@ -8212,6 +8596,8 @@ \def\blx@theheading{biblist}% default to biblist heading \def\blx@theenv{#2}% default to list name \def\blx@thebiblist{#2}% + \def\blx@thebiblistdriver{#2}% + \def\blx@thebiblistfilter{#2}% \let\blx@theprenote\@empty \let\blx@thepostnote\@empty \let\blx@thetitle\@empty @@ -8257,7 +8643,7 @@ {} {\listxadd\blx@dlistnames{\blx@refcontext@context @\blx@tempe @list}% \csxappto{blx@dlists}{% - \blx@xml@dlist{\blx@refcontext@context}{list}{\blx@tempe}{\blx@xml@dlist@refcontext{\blx@tempc}{\blx@refcontext@sortingnamekeytemplatename}{\blx@refcontext@labelprefix}{\blx@refcontext@uniquenametemplatename}{\blx@refcontext@labelalphanametemplatename}}{\csuse{blx@biblistfilters@#2}}}}% + \blx@xml@dlist{\blx@refcontext@context}{list}{\blx@tempe}{\blx@xml@dlist@refcontext{\blx@tempc}{\blx@refcontext@sortingnamekeytemplatename}{\blx@refcontext@labelprefix}{\blx@refcontext@uniquenametemplatename}{\blx@refcontext@labelalphanametemplatename}}{\csuse{blx@biblistfilters@\blx@thebiblistfilter}}}}% \ifdefvoid\blx@tempa {\blx@warn@biblistempty{#2}\endgroup} {\blx@biblist\blx@tempa}} @@ -8271,7 +8657,7 @@ {\global\let\blx@printbibchecks\relax}}} % {,...} -\def\blx@biblist{% +\def\blx@biblist#1{% \if@twocolumn \@restonecoltrue\onecolumn \else @@ -8284,11 +8670,12 @@ \blx@bibinit \let\@noitemerr\@empty \def\blx@noitem{\blx@warn@biblistempty{\blx@thebiblist}}% + \abx@locallabelwidth{#1}% \csuse{blx@env@\blx@theenv}% \csuse{blx@hook@biblistinit@\blx@thebiblist}% \let\blx@do\blx@biblistitem \let\blx@done\blx@endbiblist - \blx@listloop} + \blx@listloop{#1}} \def\blx@endbiblist{% \csuse{blx@endenv@\blx@theenv}% @@ -8323,7 +8710,7 @@ \blx@beglangbib \bibsentence \blx@pagetracker - \blx@driver{\blx@thebiblist}% + \blx@driver{\blx@thebiblistdriver}% \blx@postpunct \blx@endlangbib}% \endgroup} @@ -8488,6 +8875,7 @@ % Reference sections \newrobustcmd*{\newrefsection}{% + \endrefcontext \ifnum\c@refsection>\z@ \endrefsection \fi @@ -8690,6 +9078,7 @@ \H@old@sect,% hyperref \NR@sect,% nameref \scr@sect,% koma-script 3.x + \scr@startsection,% bad hack for koma >= 3.15 \@startsection}% latex \iftoggle{blx@tempa} {\blx@err@patch{\string\@sect}} @@ -9011,6 +9400,8 @@ % {,...} \protected\def\blx@citeloop#1{% + \expandafter\blx@citeloop@i\expandafter{\detokenize{#1}}} +\protected\def\blx@citeloop@i#1{% \begingroup % This must be here and not after \blx@citeadd as this changes the refcontext \letcs\blx@tempb{blx@dlist@centry@\the\c@refsection @\blx@refcontext@context}% @@ -11293,7 +11684,7 @@ \let\maps\blx@usersourcemap@maps \let\blx@tempa\@empty #1% - \csxdef{blx@sourcemap@user}{\blx@tempa}% + \xappto\blx@sourcemap@user\blx@tempa% \endgroup} \@onlypreamble\DeclareSourcemap @@ -11432,6 +11823,10 @@ \ifstrequal{#1}{true} {\appto\blx@tempf{ map\string_entry\string_null="1"}} {}} +\define@key{blx@sourcemap@step}{entrynocite}[true]{% true|false + \ifstrequal{#1}{true} + {\appto\blx@tempf{ map\string_entry\string_nocite="1"}} + {}} \define@key{blx@sourcemap@step}{entrynew}{% characters \appto\blx@tempf{ map\string_entry\string_new="#1"}} \define@key{blx@sourcemap@step}{entrynewtype}{% characters @@ -11737,6 +12132,17 @@ \def\do#1{\DeclareBiblistFilter{#1}{\filter[type=field,filter=#1]}} \abx@dolabelfields +\define@key{blx@biblist2}{biblistfilter}{\blx@key@biblistfilter{#1}} +\define@key{blx@biblist1}{biblistfilter}{} + +\def\blx@key@biblistfilter#1{% + \ifcsundef{blx@biblistfilters@#1} + {\blx@error + {BiblistFilter '#1' not found} + {The BiblistFilter '#1' could not be found.\MessageBreak + Use '\string\DeclareBiblistFilter' to define it}} + {\def\blx@thebiblistfilter{#1}}} + % [] \newrobustcmd*{\DeclareSortTranslit}[2][]{% \begingroup @@ -13007,9 +13413,6 @@ {\blx@err@invopt{#1time=##1}{}}}% % Default for new time fields is "24h" \setkeys{blx@opt@pre}{#1time=24h}% - % Boolean for unknown dates - \newtoggle{abx@bool@#1dateunknown}% - \newtoggle{abx@bool@end#1dateunknown}% % Boolean to determine if times are printed with dates \newtoggle{blx@#1dateusetime}% \DeclareBibliographyOption[boolean]{#1dateusetime}{% @@ -13200,6 +13603,9 @@ {\let\blx@thelabelnumber\relax \let\abx@aux@number\@gobblefive}} +\DeclareBibliographyOption[boolean]{locallabelwidth}[true]{% + \blx@key@locallabelwidth{#1}} + \DeclareBibliographyOption[string]{refsection}{% \ifcsdef{blx@opt@refsection@#1} {\letcs\blx@refsecreset@level{blx@opt@refsection@#1}} @@ -13360,7 +13766,7 @@ autopunct=true,punctfont=false,defernumbers=false,timezeros=true, refsection=none,refsegment=none,citereset=none,hyperref=auto, parentracker,maxparens=3,bibencoding=auto,bibwarn,timezones=false, - seconds=false,julian=false,labeltime=24h} + seconds=false,julian=false,labeltime=24h,locallabelwidth=false} % Load Unicode enhancements (only for LuaTeX and XeTeX) \ifboolexpr{ diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def index 959dbd398dc..d62831b6ad9 100644 --- a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def +++ b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def @@ -1,5 +1,7 @@ -% -*- mode: LaTeX -*- +\ProvidesFile{blx-dm.def} +[\abx@lbxid] +% -*- mode: LaTeX -*- \newbool{dmskipout}% \newbool{dmlabelfield}% @@ -100,7 +102,7 @@ \endgroup} \define@key{blx@datamodel@entrytypes}{skipout}[true]{% true|false - \ifstrequal{#1}{true} + \ifstrequal{#1}{true} {\appto\blx@tempa{ skip\string_output="true"}} {}} @@ -264,7 +266,7 @@ {\appto\blx@tempa{ nullok="true"}} {}} \define@key{blx@datamodel@field}{skipout}[true]{% true|false - \ifstrequal{#1}{true} + \ifstrequal{#1}{true} {\appto\blx@tempa{ skip\string_output="true"}% \booltrue{dmskipout}} {}} @@ -691,7 +693,7 @@ urlendhour, urlendminute, urlendmonth, - urlendsecond, + urlendsecond, urlendtimezone, urlendyear, urlhour, @@ -1152,9 +1154,19 @@ eprinttype, eventday, eventendday, + eventendhour, + eventendminute, eventendmonth, + eventendseason, + eventendsecond, + eventendtimezone, eventendyear, + eventhour, + eventminute, eventmonth, + eventseason, + eventsecond, + eventtimezone, eventyear, eventtitle, eventtitleaddon, @@ -1185,9 +1197,19 @@ eprinttype, eventday, eventendday, + eventendhour, + eventendminute, eventendmonth, + eventendseason, + eventendsecond, + eventendtimezone, eventendyear, + eventhour, + eventminute, eventmonth, + eventseason, + eventsecond, + eventtimezone, eventyear, eventtitle, eventtitleaddon, @@ -1228,9 +1250,19 @@ eprinttype, eventday, eventendday, + eventendhour, + eventendminute, eventendmonth, + eventendseason, + eventendsecond, + eventendtimezone, eventendyear, + eventhour, + eventminute, eventmonth, + eventseason, + eventsecond, + eventtimezone, eventyear, eventtitle, eventtitleaddon, @@ -1301,6 +1333,24 @@ \DeclareDatamodelEntryfields[unpublished]{ addendum, author, + eventday, + eventendday, + eventendhour, + eventendminute, + eventendmonth, + eventendseason, + eventendsecond, + eventendtimezone, + eventendyear, + eventhour, + eventminute, + eventmonth, + eventseason, + eventsecond, + eventtimezone, + eventyear, + eventtitle, + eventtitleaddon, howpublished, language, location, @@ -1308,7 +1358,9 @@ pubstate, subtitle, title, - titleaddon} + titleaddon, + type, + venue} \DeclareDatamodelConstraints[ article, diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-unicode.def b/Master/texmf-dist/tex/latex/biblatex/blx-unicode.def index 9898099135d..a3339b0b869 100644 --- a/Master/texmf-dist/tex/latex/biblatex/blx-unicode.def +++ b/Master/texmf-dist/tex/latex/biblatex/blx-unicode.def @@ -32,13 +32,45 @@ \closein\blx@bcfin \endgroup -\DeclarePrefChars{'’-} -\DeclareRangeChars{~,;-–—+/} - \appto\blx@setfrcodes{% % … should probably have dot spacefactor, but pdfLaTeX % makes it a period, so we have this here for consistency \sfcode`\…=\blx@sf@period } +\DeclarePrefChars*{’} +\DeclareRangeChars*{–—} + +\def\blx@normrange@range#1\bibrangedash#2\bibrangedash#3&{% + \ifblank{#3} + {\blx@normrange@endash#1––&} + {\ifblank{#2} + {\blx@range@out@value{#1\bibrangedash}} + {\ifblank{#1} + {\blx@range@out@value{\bibrangedash#2}} + {\blx@range@process{#1}{#2}}}}} + +\def\blx@normrange@endash#1–#2–#3&{% + \ifblank{#3} + {\blx@normrange@hyphen#1--&} + {\ifblank{#2} + {\blx@range@out@value{#1\bibrangedash}} + {\ifblank{#1} + {\blx@range@out@value{\bibrangedash#2}} + {\blx@range@process{#1}{#2}}}}} + +\def\blx@firstpage@range#1\bibrangedash#2\bibrangedash#3&{% + \ifblank{#3} + {\blx@firstpage@endash#1––&} + {\ifblank{#1} + {\blx@range@out@value{\bibrangedash#2}} + {\blx@range@out@value{#1}}}} + +\def\blx@firstpage@endash#1–#2–#3&{% + \ifblank{#3} + {\blx@firstpage@hyphen#1--&} + {\ifblank{#1} + {\blx@range@out@value{\bibrangedash#2}} + {\blx@range@out@value{#1}}}} + \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx index 92ac6572c5d..947f131d05a 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx @@ -86,7 +86,7 @@ references = {{Refer\^encias}{Refer\^encias}}, shorthands = {{Lista de abreviaturas}{Abreviaturas}}, editor = {{editor}{ed\adddot}}, - editors = {{editores}{eds\adddot}}, + editors = {{editores}{ed\adddot}}, compiler = {{compilador}{comp\adddot}}, compilers = {{compiladores}{comp\adddot}}, redactor = {{redator}{red\adddot}}, @@ -101,10 +101,10 @@ collaborators = {{colaboradores}{colab\adddot}}, translator = {{tradutor}{trad\adddot}}, translators = {{tradutores}{trad\adddot}}, - commentator = {{comentador}{coment\adddot}}, - commentators = {{comentadores}{coment\adddot}}, - annotator = {{anotador}{anot\adddot}}, - annotators = {{anotadores}{anot\adddot}}, + commentator = {{coment\'ario}{coment\adddot}}, + commentators = {{coment\'ario}{coment\adddot}}, + annotator = {{notas}{notas}}, + annotators = {{notas}{notas}}, commentary = {{coment\'ario}{coment\adddot}}, annotations = {{notas}{notas}}, introduction = {{introdu\c{c}\~ao}{introd\adddot}}, @@ -113,95 +113,95 @@ editortr = {{editor e tradutor}% {ed\adddotspace e trad\adddot}}, editorstr = {{editores e tradutores}% - {eds\adddotspace e trad\adddot}}, - editorco = {{editor e comentador}% + {ed\adddotspace e trad\adddot}}, + editorco = {{editor e coment\'ario}% + {ed\adddotspace e coment\adddot}}, + editorsco = {{editores e coment\'ario}% {ed\adddotspace e coment\adddot}}, - editorsco = {{editores e comentadores}% - {eds\adddotspace e coment\adddot}}, - editoran = {{editor e anotador}% - {ed\adddotspace e anot\adddot}}, - editorsan = {{editores e anotadores}% - {eds\adddotspace e anot\adddot}}, + editoran = {{editor e notas}% + {ed\adddotspace e notas}}, + editorsan = {{editores e notas}% + {ed\adddotspace e notas}}, editorin = {{editor e introdu\c{c}\~ao}% {ed\adddotspace e introd\adddot}}, editorsin = {{editores e introdu\c{c}\~ao}% - {eds\adddotspace e introd\adddot}}, + {ed\adddotspace e introd\adddot}}, editorfo = {{editor e pref\'acio}% {ed\adddotspace e pref\adddot}}, editorsfo = {{editores e pref\'acio}% - {eds\adddotspace e pref\adddot}}, + {ed\adddotspace e pref\adddot}}, editoraf = {{editor e posf\'acio}% {ed\adddotspace e posf\adddot}}, editorsaf = {{editores e posf\'acio}% - {eds\adddotspace e posf\adddot}}, - editortrco = {{editor, tradutor e comentador}% + {ed\adddotspace e posf\adddot}}, + editortrco = {{editor, tradutor e coment\'ario}% + {ed., trad\adddot\ e coment\adddot}}, + editorstrco = {{editores, tradutores e coment\'ario}% {ed., trad\adddot\ e coment\adddot}}, - editorstrco = {{editores, tradutores e comentadores}% - {eds., trad\adddot\ e coment\adddot}}, - editortran = {{editor, tradutor e anotador}% - {ed., trad\adddot\ e anot\adddot}}, - editorstran = {{editores, tradutores e anotadores}% - {eds., trad\adddot\ e anot\adddot}}, + editortran = {{editor, tradutor e notas}% + {ed., trad\adddot\ e notas}}, + editorstran = {{editores, tradutores e notas}% + {ed., trad\adddot\ e notas}}, editortrin = {{editor, tradutor e introdu\c{c}\~ao}% {ed., trad\adddot\ e introd\adddot}}, editorstrin = {{editores, tradutores e introdu\c{c}\~ao}% - {eds., trad\adddot\ e introd\adddot}}, + {ed., trad\adddot\ e introd\adddot}}, editortrfo = {{editor, tradutor e pref\'acio}% {ed., trad\adddot\ e pref\adddot}}, editorstrfo = {{editores, tradutores e pref\'acio}% - {eds., trad\adddot\ e pref\adddot}}, + {ed., trad\adddot\ e pref\adddot}}, editortraf = {{editor, tradutor e posf\'acio}% {ed., trad\adddot\ e posf\adddot}}, editorstraf = {{editores, tradutores e posf\'acio}% - {eds., trad\adddot\ e posf\adddot}}, - editorcoin = {{editor, comentador e introdu\c{c}\~ao}% + {ed., trad\adddot\ e posf\adddot}}, + editorcoin = {{editor, coment\'ario e introdu\c{c}\~ao}% + {ed., coment\adddot\ e introd\adddot}}, + editorscoin = {{editores, coment\'ario e introdu\c{c}\~ao}% {ed., coment\adddot\ e introd\adddot}}, - editorscoin = {{editores, comentadores e introdu\c{c}\~ao}% - {eds., coment\adddot\ e introd\adddot}}, - editorcofo = {{editor, comentador e pref\'acio}% + editorcofo = {{editor, coment\'ario e pref\'acio}% {ed., coment\adddot\ e pref\adddot}}, - editorscofo = {{editores, comentadores e pref\'acio}% - {eds., coment\adddot\ e pref\adddot}}, - editorcoaf = {{editor, comentador e posf\'acio}% + editorscofo = {{editores, coment\'ario e pref\'acio}% + {ed., coment\adddot\ e pref\adddot}}, + editorcoaf = {{editor, coment\'ario e posf\'acio}% + {ed., coment\adddot\ e posf\adddot}}, + editorscoaf = {{editores, coment\'ario e posf\'acio}% {ed., coment\adddot\ e posf\adddot}}, - editorscoaf = {{editores, comentadores e posf\'acio}% - {eds., coment\adddot\ e posf\adddot}}, - editoranin = {{editor, anotador e introdu\c{c}\~ao}% - {ed., anot\adddot\ e introd\adddot}}, - editorsanin = {{editores, anotadores e introdu\c{c}\~ao}% - {eds., anot\adddot\ e introd\adddot}}, - editoranfo = {{editor, anotador e pref\'acio}% - {ed., anot\adddot\ e pref\adddot}}, - editorsanfo = {{editores, anotadores e pref\'acio}% - {eds., anot\adddot\ e pref\adddot}}, - editoranaf = {{editor, anotador e posf\'acio}% - {ed., anot\adddot\ e posf\adddot}}, - editorsanaf = {{editores, anotadores e posf\'acio}% - {eds., anot\adddot\ e posf\adddot}}, - editortrcoin = {{editor, tradutor, comentador e introdu\c{c}\~ao}% + editoranin = {{editor, notas e introdu\c{c}\~ao}% + {ed., notas e introd\adddot}}, + editorsanin = {{editores, notas e introdu\c{c}\~ao}% + {ed., notas e introd\adddot}}, + editoranfo = {{editor, notas e pref\'acio}% + {ed., notas e pref\adddot}}, + editorsanfo = {{editores, notas e pref\'acio}% + {ed., notas e pref\adddot}}, + editoranaf = {{editor, notas e posf\'acio}% + {ed., notas e posf\adddot}}, + editorsanaf = {{editores, notas e posf\'acio}% + {ed., notas e posf\adddot}}, + editortrcoin = {{editor, tradutor, coment\'ario e introdu\c{c}\~ao}% {ed., trad., coment\adddot\ e introd\adddot}}, - editorstrcoin = {{editores, tradutores, comentadores e introdu\c{c}\~ao}% - {eds., trad., coment\adddot\ e introd\adddot}}, - editortrcofo = {{editor, tradutor, comentador e pref\'acio}% + editorstrcoin = {{editores, tradutores, coment\'ario e introdu\c{c}\~ao}% + {ed., trad., coment\adddot\ e introd\adddot}}, + editortrcofo = {{editor, tradutor, coment\'ario e pref\'acio}% + {ed., trad., coment\adddot\ e pref\adddot}}, + editorstrcofo = {{editores, tradutores, coment\'ario e pref\'acio}% {ed., trad., coment\adddot\ e pref\adddot}}, - editorstrcofo = {{editores, tradutores, comentadores e pref\'acio}% - {eds., trad., coment\adddot\ e pref\adddot}}, - editortrcoaf = {{editor, tradutor, comentador e posf\'acio}% + editortrcoaf = {{editor, tradutor, coment\'ario e posf\'acio}% + {ed., trad., coment\adddot\ e posf\adddot}}, + editorstrcoaf = {{editores, tradutores, coment\'ario e posf\'acio}% {ed., trad., coment\adddot\ e posf\adddot}}, - editorstrcoaf = {{editores, tradutores, comentadores e posf\'acio}% - {eds., trad., coment\adddot\ e posf\adddot}}, - editortranin = {{editor, tradutor, anotador e introdu\c{c}\~ao}% - {ed., trad., anot\adddot\ e introd\adddot}}, - editorstranin = {{editores, tradutores, anotadores e introdu\c{c}\~ao}% - {eds., trad., anot\adddot\ e introd\adddot}}, - editortranfo = {{editor, tradutor, anotador e pref\'acio}% - {ed., trad., anot\adddot\ e pref\adddot}}, - editorstranfo = {{editores, tradutores, anotadores e pref\'acio}% - {eds., trad., anot\adddot\ e pref\adddot}}, - editortranaf = {{editor, tradutor, anotador e posf\'acio}% - {ed., trad., anot\adddot\ e posf\adddot}}, - editorstranaf = {{editores, tradutores, anotadores e posf\'acio}% - {eds., trad., anot\adddot\ e posf\adddot}}, + editortranin = {{editor, tradutor, notas e introdu\c{c}\~ao}% + {ed., trad., notas e introd\adddot}}, + editorstranin = {{editores, tradutores, notas e introdu\c{c}\~ao}% + {ed., trad., notas e introd\adddot}}, + editortranfo = {{editor, tradutor, notas e pref\'acio}% + {ed., trad., notas e pref\adddot}}, + editorstranfo = {{editores, tradutores, notas e pref\'acio}% + {ed., trad., notas e pref\adddot}}, + editortranaf = {{editor, tradutor, notas e posf\'acio}% + {ed., trad., notas e posf\adddot}}, + editorstranaf = {{editores, tradutores, notas e posf\'acio}% + {ed., trad., notas e posf\adddot}}, translatorco = {{tradu\c{c}\~ao e coment\'ario}% {trad\adddot\ e coment\adddot}}, translatorsco = {{tradu\c{c}\~ao e coment\'ario}% @@ -247,7 +247,7 @@ translatorsanaf = {{tradu\c{c}\~ao, notas e posf\'acio}% {trad., notas e posf\adddot}}, organizer = {{organizador}{org\adddot}}, - organizers = {{organizadores}{orgs\adddot}}, + organizers = {{organizadores}{org\adddot}}, byauthor = {{por}{por}}, byeditor = {{editado por}{ed\adddotspace por}}, bycompiler = {{compilado por}{comp\adddotspace por}}, @@ -338,9 +338,9 @@ andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, andmore = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, volume = {{volume}{vol\adddot}}, - volumes = {{volumes}{vols\adddot}}, + volumes = {{volumes}{vol\adddot}}, involumes = {{em}{em}}, - jourvol = {{volume}{vol\adddot}}, + jourvol = {{volume}{v\adddot}}, jourser = {{s\'erie}{s\'er\adddot}}, book = {{livro}{livro}}, part = {{parte}{parte}}, @@ -364,7 +364,7 @@ page = {{p\'agina}{p\adddot}}, pages = {{p\'aginas}{pp\adddot}}, column = {{coluna}{col\adddot}}, - columns = {{colunas}{cols\adddot}}, + columns = {{colunas}{col\adddot}}, line = {{linha}{l\adddot}}, lines = {{linhas}{ll\adddot}}, verse = {{verso}{v\adddot}}, @@ -376,7 +376,7 @@ pagetotal = {{p\'agina}{p\adddot}}, pagetotals = {{p\'aginas}{pp\adddot}}, columntotal = {{coluna}{col\adddot}}, - columntotals = {{colunas}{cols\adddot}}, + columntotals = {{colunas}{col\adddot}}, linetotal = {{linha}{l\adddot}}, linetotals = {{linhas}{ll\adddot}}, versetotal = {{verso}{v\adddot}}, @@ -388,12 +388,12 @@ in = {{em}{em}}, inseries = {{em}{em}}, ofseries = {{de}{de}}, - number = {{n\'umero}{n\adddot\textordmasculine}}, + number = {{n\'umero}{n\adddot}}, chapter = {{cap\'\i tulo}{cap\adddot}}, -% bathesis = {{}{}},% FIXME: missing + bathesis = {{trabalho de conclus\~ao}{trab\adddotspace de conc\adddot}}, mathesis = {{disserta\c{c}\~ao de mestrado}{diss\adddot\ de mestr\adddot}}, phdthesis = {{tese de doutorado}{tese de dout\adddot}}, - candthesis = {{trabalho de conclus\~ao}{trab\adddotspace de conc\adddot}}, + candthesis = {{}{}},% FIXME: missing resreport = {{relat\'orio de pesquisa}{rel\adddotspace de pesq\adddot}}, techreport = {{relat\'orio t\'ecnico}{rel\adddotspace t\'ecn\adddot}}, software = {{software}{software}}, @@ -426,7 +426,7 @@ confer = {{cf\adddot}{cf\adddot}}, sequens = {{sq\adddot}{sq\adddot}}, sequentes = {{sqq\adddot}{sqq\adddot}}, - passim = {{passim}{pass\adddot}}, + passim = {{passim}{passim}}, see = {{ver}{ver}}, seealso = {{ver tamb\'em}{ver tamb\'em}}, backrefpage = {{ver p\'agina}{ver p\adddot}}, @@ -461,6 +461,7 @@ langitalian = {{italiano}{italiano}}, langjapanese = {{japon\^es}{japon\^es}}, langlatin = {{latim}{latim}}, + langlatvian = {{let\~ao}{let\~ao}}, langnorwegian = {{noruegu\^es}{noruegu\^es}}, langpolish = {{polon\^es}{polon\^es}}, langportuguese = {{portugu{\^e}s}{portugu{\^e}s}}, @@ -469,6 +470,7 @@ langslovene = {{esloveno}{esloveno}}, langspanish = {{espanhol}{espanhol}}, langswedish = {{sueco}{sueco}}, + langukrainian = {{ucraniano}{ucraniano}}, fromamerican = {{do ingl\^es}{do ingl\^es}}, frombrazilian = {{do portugu{\^e}s}{do portugu{\^e}s}}, frombulgarian = {{do b\'ulgaro}{do b\'ulgaro}}, @@ -487,6 +489,7 @@ fromitalian = {{do italiano}{do italiano}}, fromjapanese = {{do japon\^es}{do japon\^es}}, fromlatin = {{do latim}{do latim}}, + fromlatvian = {{do let\~ao}{do let\~ao}}, fromnorwegian = {{do noruegu\^es}{do noruegu\^es}}, frompolish = {{do polon\^es}{do polon\^es}}, fromportuguese = {{do portugu{\^e}s}{do portugu{\^e}s}}, @@ -495,6 +498,7 @@ fromslovene = {{do esloveno}{do esloveno}}, fromspanish = {{do espanhol}{do espanhol}}, fromswedish = {{do sueco}{do sueco}}, + fromukrainian = {{do ucraniano}{do ucraniano}}, countryde = {{Alemanha}{DE}}, countryeu = {{Uni\~ao Europeia}{EU}}, countryep = {{Uni\~ao Europeia}{EP}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/bulgarian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/bulgarian.lbx index 59563bcba77..dd5dad6a49a 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/bulgarian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/bulgarian.lbx @@ -1,7 +1,7 @@ \ProvidesFile{bulgarian.lbx} [\abx@lbxid] -\DeclareRedundantLanguages{bulgarian}{bulgarian} +\DeclareRedundantLanguages{bulgarian}{bulgarian} % This file requires UTF-8 support! @@ -505,10 +505,12 @@ langitalian = {{италиански}{итал\adddot}}, langjapanese = {{японски}{яп\adddot}}, langlatin = {{латински}{лат\adddot}}, +% langlatvian = {{}{}},% FIXME: missing langnorwegian = {{норвежки}{норв\adddot}}, langpolish = {{полски}{пол\adddot}}, langportuguese = {{португалски}{порт\adddot}}, langrussian = {{русски}{рус\adddot}}, +% langslovak = {{}{}},% FIXME: missing langslovene = {{словенски}{слов\adddot}}, langspanish = {{испански}{исп\adddot}}, langswedish = {{шведски}{швед\adddot}}, @@ -530,10 +532,12 @@ fromitalian = {{от италиански}{от\addabbrvspace итал\adddot}}, fromjapanese = {{от японски}{от\addabbrvspace яп\adddot}}, fromlatin = {{от латински}{от\addabbrvspace лат\adddot}}, +% fromlatvian = {{}{}},% FIXME: missing fromnorwegian = {{от норвежки}{от\addabbrvspace норв\adddot}}, frompolish = {{от полски}{от пол\adddot}}, fromportuguese = {{от португалски}{от\addabbrvspace порт\adddot}}, fromrussian = {{от руски}{от\addabbrvspace рус\adddot}}, +% fromslovak = {{}{}},% FIXME: missing fromslovene = {{от словенски}{от\addabbrvspace слов\adddot}}, fromspanish = {{от испански}{от\addabbrvspace исп\adddot}}, fromswedish = {{от шведски}{от\addabbrvspace швед\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx index fb9834e495d..002418b9b53 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx @@ -480,10 +480,12 @@ langgreek = {{grec}{grec}}, langitalian = {{itali\`a}{it\adddot}}, langlatin = {{llat{\'\i}}{ll\adddot}}, +% langlatvian = {{}{}},% FIXME: missing langnorwegian = {{noruec}{nor\adddot}}, langpolish = {{polon\`es}{pol\adddot}}, langportuguese = {{portugu\`es}{port\adddot}}, langrussian = {{rus}{rus}}, +% langslovak = {{}{}},% FIXME: missing langslovene = {{eslov\`e}{esl\adddot}}, langspanish = {{castell\`a}{cast\adddot}}, langswedish = {{suec}{suec}}, @@ -504,10 +506,12 @@ fromgreek = {{del grec}{del grec}}, fromitalian = {{de l'itali\`a}{de l'it\adddot}}, fromlatin = {{del llat{\'\i}}{del ll\adddot}}, +% fromlatvian = {{}{}},% FIXME: missing fromnorwegian = {{del noruec}{del nor\adddot}}, frompolish = {{del polon\`es}{del pol\adddot}}, fromportuguese = {{del portugu\`es}{del port\adddot}}, fromrussian = {{del rus}{del rus}}, +% fromslovak = {{}{}},% FIXME: missing fromslovene = {{de l'eslov\`e}{de l'esl\adddot}}, fromspanish = {{del castell\`a}{del cast\adddot}}, fromswedish = {{del suec}{del suec}}, @@ -534,7 +538,7 @@ abstract = {{resum}{res\adddot}}, annotation = {{nota}{n\adddot}}, commonera = {{Era Comuna}{EC}}, - beforecommonera = {{abans de l’Era Comuna}{AEC}}, + beforecommonera = {{abans de l'Era Comuna}{AEC}}, annodomini = {{despr\'es de Crist}{dC}}, beforechrist = {{abans de Crist}{aC}}, % circa = {{}{}},% FIXME: missing diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx index 98f70d7f3c7..83547e50d74 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx @@ -130,7 +130,7 @@ afterword = {{pogovor}{pogovor}}, editortr = {{prijevod i obrada}{ur\adddotspace i prev\adddot}}, editorstr = {{prijevod i obrada}{ur\adddotspace i prev\adddot}}, - editorco = {{obrada i komentari}% gender neutral + editorco = {{obrada i komentari}% gender neutral {obrada i komentari}}, editorsco = {{obrada i komentari}% {obrada i komentari}}, @@ -489,10 +489,12 @@ langgreek = {{gr\v{c}ki}{gr\v{c}ki}}, langitalian = {{talijanski}{talijanski}}, langlatin = {{latinski}{latinski}}, +% langlatvian = {{}{}},% FIXME: missing langnorwegian = {{norve\v{s}ki}{norve\v{s}ki}}, % langpolish = {{}{}},% FIXME: missing langportuguese = {{portugalski}{portugalski}}, % langrussian = {{}{}},% FIXME: missing +% langslovak = {{}{}},% FIXME: missing % langslovene = {{}{}},% FIXME: missing langspanish = {{\v{s}panjolski}{\v{s}panjolski}}, langswedish = {{\v{s}vedski}{\v{s}vedski}}, @@ -513,10 +515,12 @@ fromgreek = {{s gr\v{c}kog}{s gr\v{c}kog}}, fromitalian = {{s talijanskog}{s talijanskog}}, fromlatin = {{s latinskog}{s latinskog}}, +% fromlatvian = {{}{}},% FIXME: missing fromnorwegian = {{s norve\v{s}kog}{s norve\v{s}kog}}, % frompolish = {{}{}},% FIXME: missing fromportuguese = {{s portugalskog}{s portugalskog}}, % fromrussian = {{}{}},% FIXME: missing +% fromslovak = {{}{}},% FIXME: missing % fromslovene = {{}{}},% FIXME: missing fromspanish = {{sa \v{s}panjolskog}{sa \v{s}panjolskog}}, fromswedish = {{sa \v{s}vedskog}{sa \v{s}vedskog}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx index 2eff92d3012..ee31cd2c658 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx @@ -401,9 +401,11 @@ langgreek = {{\v{r}e\v{c}tina}{\v{r}e\v{c}\adddot}}, langitalian = {{ital\v{s}tina}{ital\adddot}}, langlatin = {{latina}{lat\adddot}}, +% langlatvian = {{}{}},% FIXME: missing langnorwegian = {{nor\v{s}tina}{nor\v{s}\adddot}}, % langpolish = {{}{}},% FIXME: missing langportuguese = {{portugal\v{s}tina}{port\adddot}}, +% langslovak = {{}{}},% FIXME: missing % langslovene = {{}{}},% FIXME: missing langspanish = {{\v{s}pan\v{e}l\v{s}tina}{\v{s}pa\v{n}\adddot}}, langswedish = {{\v{s}v\'{e}d\v{s}tina}{\v{s}v\'{e}d\adddot}}, @@ -424,9 +426,11 @@ fromgreek = {{z \v{r}e\v{c}tiny}{z \v{r}e\v{c}\adddot}}, fromitalian = {{z ital\v{s}tiny}{z ital\adddot}}, fromlatin = {{z latiny}{z lat\adddot}}, +% fromlatvian = {{}{}},% FIXME: missing fromnorwegian = {{z nor\v{s}tiny}{z nor\adddot}}, % frompolish = {{}{}},% FIXME: missing fromportuguese = {{z portugal\v{s}tiny}{z portugal\v{s}tiny}}, +% fromslovak = {{}{}},% FIXME: missing % fromslovene = {{}{}},% FIXME: missing fromspanish = {{ze \v{s}pan\v{e}l\v{s}tiny}{ze \v{s}pa\v{n}\adddot}}, fromswedish = {{ze \v{s}v\'{e}d\v{s}tiny}{ze \v{s}v\'{e}d\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx index 80591cb109b..9d5801a91a2 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx @@ -305,15 +305,15 @@ byeditortrcoaf = {{udgivet, oversat \lbx@lfromlang, kommenteret og med et efterord skrevet af}% {udg.,\addabbrvspace oversat \lbx@sfromlang, komm\adddot\ og med et efterord skrev\adddot\ af}}, byeditortranin = {{udgivet, oversat \lbx@lfromlang, forklaret og med en indledning skrevet af}% - {udg.,\addabbrvspace oversat \lbx@sfromlang, forkl\adddot\ og med en indl\adddot\ skrev\adddot\ af}}, + {udg.,\addabbrvspace oversat \lbx@sfromlang, forkl\adddot\ og med en indl\adddot\ skrev\adddot\ af}}, byeditortranfo = {{udgivet, oversat \lbx@lfromlang, forklaret og med et forord skrevet af}% {udg.,\addabbrvspace oversat \lbx@sfromlang, forkl\adddot\ og med et forord skrev\adddot\ af}}, byeditortranaf = {{udgivet, oversat \lbx@lfromlang, forklaret og med et efterord skrevet af}% - {udg.,\addabbrvspace oversat \lbx@sfromlang, forkl\adddot\ og med et efterord skrev\adddot\ af}}, + {udg.,\addabbrvspace oversat \lbx@sfromlang, forkl\adddot\ og med et efterord skrev\adddot\ af}}, bytranslatorco = {{oversat \lbx@lfromlang\ og kommenteret af}% {oversat \lbx@sfromlang\ og komm\adddot\ af}}, bytranslatoran = {{oversat \lbx@lfromlang\ og forklaret af}% - {oversat \lbx@sfromlang\ og forkl\adddot\ af}}, + {oversat \lbx@sfromlang\ og forkl\adddot\ af}}, bytranslatorin = {{oversat \lbx@lfromlang\ og med en indledning skrevet af}% {oversat \lbx@sfromlang\ og med en indl\adddot\ skrev\adddot\ af}}, bytranslatorfo = {{oversat \lbx@lfromlang\ og med et forord skrevet af}% @@ -336,7 +336,7 @@ andothers = {{med flere}{m.fl\adddot}},% FIXME: spacing after abbreviation dot? andmore = {{med flere}{m.fl\adddot}},% FIXME: spacing after abbreviation dot? volume = {{bind}{bd\adddot}}, - volumes = {{bind}{bd\adddot}}, + volumes = {{bind}{bd\adddot}}, involumes = {{i}{i}}, jourvol = {{\aa rgang}{\aa g\adddot}}, jourser = {{serie}{ser\adddot}}, @@ -402,8 +402,8 @@ candthesis = {{kandidatafhandling}{kandidatafh\adddot}},% FIXME: check resreport = {{forskningsrapport}{forskningsrap\adddot}}, techreport = {{teknisk rapport}{tek\adddot\ rap\adddot}}, - software = {{software}{software}}, - datacd = {{data-cd}{data-cd}}, + software = {{software}{software}}, + datacd = {{data-cd}{data-cd}}, audiocd = {{lyd-cd}{lyd-cd}}, version = {{version}{vers\adddot}}, url = {{side}{side}}, @@ -468,10 +468,12 @@ langgreek = {{gr\ae sk}{gr\ae sk}}, langitalian = {{italiensk}{italiensk}}, langlatin = {{latin}{latin}}, +% langlatvian = {{}{}},% FIXME: missing langnorwegian = {{norsk}{norsk}}, langpolish = {{polsk}{polsk}}, - langportuguese = {{portugisisk}{portugisisk}},% FIXME: missing + langportuguese = {{portugisisk}{portugisisk}}, langrussian = {{russisk}{russisk}}, +% langslovak = {{}{}},% FIXME: missing langslovene = {{slovensk}{slovensk}}, langspanish = {{spansk}{spansk}}, langswedish = {{svensk}{svensk}}, @@ -492,10 +494,12 @@ fromgreek = {{fra gr\ae sk}{fra gr\ae sk}}, fromitalian = {{fra italiensk}{fra italiensk}}, fromlatin = {{fra latin}{fra latin}}, +% fromlatvian = {{}{}},% FIXME: missing fromnorwegian = {{fra norsk}{fra norsk}}, frompolish = {{fra polsk}{fra polsk}}, fromportuguese = {{fra portugisisk}{fra portugisisk}}, fromrussian = {{fra russisk}{fra russisk}}, +% fromslovak = {{}{}},% FIXME: missing fromslovene = {{fra slovensk}{fra slovensk}}, fromspanish = {{fra spansk}{fra spansk}}, fromswedish = {{fra svensk}{fra svensk}}, @@ -507,11 +511,11 @@ countryus = {{USA}{US}}, patent = {{patent}{patent}}, patentde = {{tysk patent}{tys\adddot\ pat\adddot}}, - patenteu = {{europ\ae isk patent}{eur\adddot\ pat\adddot}}, + patenteu = {{europ\ae isk patent}{eur\adddot\ pat\adddot}}, patentfr = {{fransk patent}{fra\adddot\ pat\adddot}}, patentuk = {{britisk patent}{brit\adddot pat\adddot}}, patentus = {{amerikansk patent}{amerikansk pat\adddot}}, - patreq = {{ans\o gning om patent}{pat\adddot\ ans\o gn\adddot}}, + patreq = {{ans\o gning om patent}{pat\adddot\ ans\o gn\adddot}}, patreqde = {{ans\o gning om tysk patent}{tys\adddot\ pat\adddot\ ans\o gn\adddot}}, patreqeu = {{ans\o gning om europ\ae isk patent}{eur\adddot\ pat\adddot\ ans\o gn\adddot}}, patreqfr = {{ans\o gning om fransk patent}{fra\adddot\ pat\adddot\ ans\o gn\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx index 5dc30642a47..acc600377cf 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx @@ -472,6 +472,7 @@ langitalian = {{Italiaans}{Italiaans}}, langjapanese = {{Japaans}{Japaans}}, langlatin = {{Latijn}{Latijn}}, + langlatvian = {{Lets}{Lets}}, langnorwegian = {{Noors}{Noors}}, langpolish = {{Pools}{Pools}}, langportuguese = {{Portugees}{Portugees}}, @@ -499,6 +500,7 @@ fromitalian = {{uit het Italiaans}{uit het Italiaans}}, fromjapanese = {{uit het Japaans}{uit het Japaans}}, fromlatin = {{uit het Latijn}{uit het Latijn}}, + fromlatvian = {{uit het Lets}{uit het Lets}}, fromnorwegian = {{uit het Noors}{uit het Noors}}, frompolish = {{uit het Pools}{uit het Pools}}, fromportuguese = {{uit het Portugees}{uit het Portugees}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx index e273b56e620..a0017682979 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx @@ -481,11 +481,14 @@ canadian,australian,newzealand,USenglish,UKenglish} langgerman = {{German}{German}}, langgreek = {{Greek}{Greek}}, langitalian = {{Italian}{Italian}}, + langjapanese = {{Japanese}{Japanese}}, langlatin = {{Latin}{Latin}}, + langlatvian = {{Latvian}{Latvian}}, langnorwegian = {{Norwegian}{Norwegian}}, langpolish = {{Polish}{Polish}}, langportuguese = {{Portuguese}{Portuguese}}, langrussian = {{Russian}{Russian}}, + langslovak = {{Slovak}{Slovak}}, langslovene = {{Slovene}{Slovene}}, langspanish = {{Spanish}{Spanish}}, langswedish = {{Swedish}{Swedish}}, @@ -506,11 +509,14 @@ canadian,australian,newzealand,USenglish,UKenglish} fromgerman = {{from the German}{from the German}}, fromgreek = {{from the Greek}{from the Greek}}, fromitalian = {{from the Italian}{from the Italian}}, + fromjapanese = {{from the Japanese}{from the Japanese}}, fromlatin = {{from the Latin}{from the Latin}}, + fromlatvian = {{from the Latvian}{from the Latvian}}, fromnorwegian = {{from the Norwegian}{from the Norwegian}}, frompolish = {{from the Polish}{from the Polish}}, fromportuguese = {{from the Portuguese}{from the Portuguese}}, fromrussian = {{from the Russian}{from the Russian}}, + fromslovak = {{from the Slovak}{from the Slovak}}, fromslovene = {{from the Slovene}{from the Slovene}}, fromspanish = {{from the Spanish}{from the Spanish}}, fromswedish = {{from the Swedish}{from the Swedish}}, @@ -551,121 +557,131 @@ canadian,australian,newzealand,USenglish,UKenglish} } \protected\gdef\lbx@us@mkdaterangetrunc@long#1#2{% - \iffieldundef{#2year} - {} - {\datecircaprint - \printtext[#2date]{% - \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibdate#1}{}{#2month}{#2day}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% - \dateeraprint{#2}}} - {\iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% - \dateeraprint{#2}}% - \dateuncertainprint - \iffieldundef{#2endyear} - {} - {\iffieldequalstr{#2endyear}{} - {\mbox{\bibdaterangesep}} - {\bibdaterangesep - \enddatecircaprint - \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} - {\iffieldsequal{#2month}{#2endmonth} - {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\printtext[#2date]{% + \datecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}}% + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}}% + \dateeraprint{#2year}% + \dateuncertainprint + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdaterangesep}} + {\bibdaterangesep + \enddatecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} - {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% - \enddateuncertainprint - \dateeraprint{#2}}}}}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \enddateuncertainprint + \dateeraprint{#2endyear}}}}}% + \endgroup} \protected\gdef\lbx@us@mkdaterangetrunc@short#1#2{% - \iffieldundef{#2year} - {} - {\datecircaprint - \printtext[#2date]{% - \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibdate#1}{}{#2month}{#2day}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day} - \dateeraprint{#2}}} - {\iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% - \dateeraprint{#2}}% - \dateuncertainprint - \iffieldundef{#2endyear} - {} - {\iffieldequalstr{#2endyear}{} - {\mbox{\bibdaterangesep}} - {\bibdaterangesep - \enddatecircaprint - \iffieldundef{#2season} - {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% - \enddateuncertainprint - \dateeraprint{#2}}}}}} + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\printtext[#2date]{% + \datecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}}% + \dateeraprint{#2year}% + \dateuncertainprint + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdaterangesep}} + {\bibdaterangesep + \enddatecircaprint + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \enddateuncertainprint + \dateeraprint{#2endyear}}}}}% + \endngroup} \protected\gdef\lbx@us@mkdaterangetruncextra@long#1#2{% - \iffieldundef{#2year} - {} - {\datecircaprint - \printtext[#2date]{% - \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibdate#1}{}{#2month}{#2day}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} - {\iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% - \dateeraprint{#2}}% - \dateuncertainprint - \iffieldundef{#2endyear} - {\printfield{extradate}} - {\iffieldequalstr{#2endyear}{} - {\printfield{extradate}% - \mbox{\bibdaterangesep}} - {\bibdaterangesep - \enddatecircaprint - \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} - {\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}}% - \printfield{extradate}% - \enddateuncertainprint - \dateeraprint{#2}}}}}} + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\printtext[#2date]{% + \datecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}}% + \dateeraprint{#2year}% + \dateuncertainprint + \iffieldundef{#2endyear} + {\printfield{extradate}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extradate}% + \mbox{\bibdaterangesep}} + {\bibdaterangesep + \enddatecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\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}}% + \printfield{extradate}% + \enddateuncertainprint + \dateeraprint{#2endyear}}}}}% + \endgroup} \protected\gdef\lbx@us@mkdaterangetruncextra@short#1#2{% - \iffieldundef{#2year} - {} - {\datecircaprint - \printtext[#2date]{% - \iffieldundef{#2season} - {\iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibdate#1}{}{#2month}{#2day}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} - {\iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}}% - \dateeraprint{#2}}% - \dateuncertainprint - \iffieldundef{#2endyear} - {\printfield{extradate}} - {\iffieldequalstr{#2endyear}{} - {\printfield{extradate}% - \mbox{\bibdaterangesep}} - {\bibdaterangesep - \enddatecircaprint - \iffieldundef{#2season} - {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% - \printfield{extradate}% - \enddateuncertainprint - \dateeraprint{#2}}}}}} + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\printtext[#2date]{% + \datecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}}% + \dateeraprint{#2year}% + \dateuncertainprint + \iffieldundef{#2endyear} + {\printfield{extradate}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extradate}% + \mbox{\bibdaterangesep}} + {\bibdaterangesep + \enddatecircaprint + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \printfield{extradate}% + \enddateuncertainprint + \dateeraprint{#2endyear}}}}}% + \endgroup} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/estonian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/estonian.lbx index d5b0ded3030..0a8baeda5b6 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/estonian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/estonian.lbx @@ -510,10 +510,12 @@ langgreek = {{kreeka}{kreeka}}, langitalian = {{itaalia}{itaalia}}, langlatin = {{ladina}{ladina}}, +% langlatvian = {{}{}},% FIXME: missing langnorwegian = {{norra}{norra}}, langpolish = {{poola}{poola}}, langportuguese = {{portugali}{portugali}}, langrussian = {{vene}{vene}}, +% langslovak = {{}{}},% FIXME: missing langslovene = {{sloveeni}{sloveeni}}, langspanish = {{hispaania}{hispaania}}, langswedish = {{rootsi}{rootsi}}, @@ -534,10 +536,12 @@ fromgreek = {{alates Kreeka}{alates Kreeka}}, fromitalian = {{alates Itaalia}{: Itaalia}}, fromlatin = {{alates Ladina}{: Ladina}}, +% fromlatvian = {{}{}},% FIXME: missing fromnorwegian = {{alates Norra}{: Norra}}, frompolish = {{alates Poola} {alates Poola}}, fromportuguese = {{alates Portugali}{: Portugali}}, fromrussian = {{alates Vene}{: vene}}, +% fromslovak = {{}{}},% FIXME: missing fromslovene = {{alates sloveeni}{: sloveeni}}, fromspanish = {{alates Hispaania}{alates Hispaania}}, fromswedish = {{alates Rootsi}{: Rootsi}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx index c240db97801..9459598c1d4 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx @@ -445,7 +445,7 @@ forthcoming = {{hyv\"aksytty julkaistavaksi}{hyv\"aksytty julkaistavaksi}},% FIXME: unsure inpress = {{painossa}{painossa}},% FIXME: unsure prepublished = {{esijulkaistu}{esijulkaistu}},% FIXME: unsure - citedas = {{jatkossa}{jatkossa}}, + citedas = {{jatkossa}{jatkossa}}, thiscite = {{t\"am\"a lainaus}{t\"am\"a lainaus}},% FIXME: unsure seenote = {{katso viite}{katso viite}}, quotedin = {{lainattu teoksessa}{lainattu teoksessa}}, @@ -509,10 +509,12 @@ langgreek = {{kreikka}{kreikka}}, langitalian = {{italia}{italia}}, langlatin = {{latina}{latina}}, +% langlatvian = {{}{}},% FIXME: missing langnorwegian = {{norja}{norja}}, langpolish = {{puola}{puola}}, langportuguese = {{portugali}{portugali}}, langrussian = {{ven\"aj\"a}{ven\"aj\"a}}, +% langslovak = {{}{}},% FIXME: missing % langslovene = {{}{}},% FIXME: missing langspanish = {{espanja}{espanja}}, langswedish = {{ruotsi}{ruotsi}}, @@ -533,10 +535,12 @@ fromgreek = {{kreikan kielest\"a}{kreikan kielest\"a}}, fromitalian = {{italian kielest\"a}{italian kielest\"a}}, fromlatin = {{latinan kielest\"a}{latinan kielest\"a}}, +% fromlatvian = {{}{}},% FIXME: missing fromnorwegian = {{norjan kielest\"a}{norjan kielest\"a}}, frompolish = {{puolan kielest\"a}{puolan kielest\"a}}, fromportuguese = {{portugalin kielest\"a}{portugalin kielest\"a}}, fromrussian = {{ven\"aj\"an kielest\"a}{ven\"aj\"an kielest\"a}}, +% fromslovak = {{}{}},% FIXME: missing % fromslovene = {{}{}},% FIXME: missing fromspanish = {{espanjan kielest\"a}{espanjan kielest\"a}}, fromswedish = {{ruotsin kielest\"a}{ruotsin kielest\"a}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx index a551d132a40..1f62e348e46 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx @@ -415,7 +415,7 @@ ofseries = {{de}{de}}, number = {{num\'ero}{n\textsuperscript{o}}}, chapter = {{chapitre}{chap\adddot}}, -% bathesis = {{}{}},% FIXME: missing + bathesis = {{m\'emoire de bachelor}{m\'em\adddotspace de bach\adddot}}, mathesis = {{m\'emoire de master}{m\'em\adddotspace de mast\adddot}}, phdthesis = {{th\`ese de doctorat}{th\`ese de doct\adddot}}, candthesis = {{th\`ese de candidature}{th\`ese de cand\adddot}}, @@ -486,6 +486,7 @@ langitalian = {{italien}{italien}}, langjapanese = {{japonais}{japonais}}, langlatin = {{latin}{latin}}, +% langlatvian = {{}{}},% FIXME: missing langnorwegian = {{norv\'egien}{norv\'egien}}, langpolish = {{polonais}{polonais}}, langportuguese = {{portugais}{portugais}}, @@ -513,6 +514,7 @@ fromitalian = {{de l'italien}{de l'italien}}, fromjapanese = {{du japonais}{du japonais}}, fromlatin = {{du latin}{du latin}}, +% fromlatvian = {{}{}},% FIXME: missing fromnorwegian = {{du norv\'egien}{du norv\'egien}}, frompolish = {{du polonais}{du polonais}}, fromportuguese = {{du portugais}{du portugais}}, @@ -544,13 +546,13 @@ library = {{biblioth\`eque}{biblioth\adddot}}, abstract = {{r\'esum\'e}{r\'es\adddot}}, annotation = {{annotations}{annotations}}, - commonera = {{de l’\`ere commune}{EC}}, - beforecommonera = {{avant l’\`ere commune}{AEC}}, + commonera = {{de l'\`ere commune}{EC}}, + beforecommonera = {{avant l'\`ere commune}{AEC}}, annodomini = {{apr\`es J\'esus-Christ}{apr\adddotspace J\adddot-C\adddot}}, beforechrist = {{avant J\'esus-Christ}{av\adddotspace J\adddot-C\adddot}}, circa = {{vers}{vers}}, spring = {{printemps}{printemps}}, - summer = {{été}{été}}, + summer = {{\'et\'e}{\'et\'e}}, autumn = {{automne}{automne}}, winter = {{hiver}{hiver}}, am = {{AM}{AM}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/galician.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/galician.lbx index 120d811c965..4d0e723263d 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/galician.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/galician.lbx @@ -459,10 +459,12 @@ nodate = {{sen data}{s\adddot d\adddot}}, langgreek = {{grego}{grego}}, langitalian = {{italiano}{ital\adddot}}, langlatin = {{lat\'in}{lat\adddot}}, +% langlatvian = {{}{}},% FIXME: missing langnorwegian = {{noruegu\'es}{nor\adddot}}, langpolish = {{polaco}{pol\adddot}}, langportuguese = {{portugu\'es}{port\adddot}}, langrussian = {{ruso}{ruso}}, +% langslovak = {{}{}},% FIXME: missing langslovene = {{esloveno}{eslov\adddot}}, langspanish = {{castel\'an}{cast\adddot}}, langswedish = {{sueco}{sueco}}, @@ -483,10 +485,12 @@ nodate = {{sen data}{s\adddot d\adddot}}, fromgreek = {{do grego}{do grego}}, fromitalian = {{do italiano}{do ital\adddot}}, fromlatin = {{do lat\'in'}{do lat\adddot}}, +% fromlatvian = {{}{}},% FIXME: missing fromnorwegian = {{do noruegu\'es}{do nor\adddot}}, frompolish = {{do polaco}{do pol\adddot}}, fromportuguese = {{do portugu\'es}{do port\adddot}}, fromrussian = {{do ruso}{do ruso}}, +% fromslovak = {{}{}},% FIXME: missing fromslovene = {{do esloveno}{do eslov\adddot}}, fromspanish = {{do castel\'an}{do cast\adddot}}, fromswedish = {{do sueco}{do sueco}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx index 0505a2db309..1898df60106 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx @@ -468,6 +468,7 @@ langitalian = {{Italienisch}{Italienisch}}, langjapanese = {{Japanisch}{Japanisch}}, langlatin = {{Lateinisch}{Lateinisch}}, + langlatvian = {{Lettisch}{Lettisch}}, langnorwegian = {{Norwegisch}{Norwegisch}}, langpolish = {{Polnisch}{Polnisch}}, langportuguese = {{Portugiesisch}{Portugiesisch}}, @@ -495,6 +496,7 @@ fromitalian = {{aus dem Italienischen}{aus dem Italienischen}}, fromjapanese = {{aus dem Japanischen}{aus dem Japanischen}}, fromlatin = {{aus dem Lateinischen}{aus dem Lateinischen}}, + fromlatvian = {{aus dem Lettischen}{aus dem Lettischen}}, fromnorwegian = {{aus dem Norwegischen}{aus dem Norwegischen}}, frompolish = {{aus dem Polnischen}{aus dem Polnischen}}, fromportuguese = {{aus dem Portugiesischen}{aus dem Portugiesischen}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx index 4418c96f531..442def75ebc 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx @@ -2,10 +2,10 @@ [\abx@lbxid] % Translator's notes: -% +% % The translations should be OK but should also be tested against % enough real data. Especially: -% +% % a) Abbreviations should be checked % b) Issues concerning grammatical gender have not been studied % @@ -486,10 +486,12 @@ langgreek = {{Ελληνικά}{Ελληνικά}}, langitalian = {{Ιταλικά}{Ιταλικά}}, langlatin = {{Λατινικά}{Λατινικά}}, +% langlatvian = {{}{}},% FIXME: missing langnorwegian = {{Νορβηγικά}{Νορβηγικά}}, % langpolish = {{}{}},% FIXME: missing langportuguese = {{Πορτογαλικά}{Πορτογαλικά}}, % langrussian = {{}{}},% FIXME: missing +% langslovak = {{}{}},% FIXME: missing % langslovene = {{}{}},% FIXME: missing langspanish = {{Ισπανικά}{Ισπανικά}}, langswedish = {{Σουηδικά}{Σουηδικά}}, @@ -510,10 +512,12 @@ fromgreek = {{από τα Ελληνικά}{από τα Ελληνικά}}, fromitalian = {{από τα Ιταλικά}{από τα Ιταλικά}}, fromlatin = {{από τα Λατινικά}{από τα Λατινικά}}, +% fromlatvian = {{}{}},% FIXME: missing fromnorwegian = {{από τα Νορβηγικά}{από τα Νορβηγικά}}, % frompolish = {{}{}},% FIXME: missing fromportuguese = {{από τα Πορτογαλικά}{από τα Πορτογαλικά}}, % fromrussian = {{}{}},% FIXME: missing +% fromslovak = {{}{}},% FIXME: missing % fromslovene = {{}{}},% FIXME: missing fromspanish = {{από τα Ισπανικά}{από τα Ισπανικά}}, fromswedish = {{από τα Σουηδικά}{από τα Σουηδικά}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx index 0f2a419efa3..08c4305bd49 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx @@ -409,10 +409,12 @@ langgreek = {{gr\'{\i}ska}{gr\'{\i}ska}}, langitalian = {{\'{\i}talska}{\'{\i}talska}}, langlatin = {{lat\'{\i}na}{lat\'{\i}na}}, +% langlatvian = {{}{}},% FIXME: missing langnorwegian = {{norska}{norska}}, langpolish = {{p\'olska}{p\'olska}}, langportuguese = {{port\'ugalska}{port\'ugalska}}, langrussian = {{r\'ussneska}{r\'ussneska}}, +% langslovak = {{}{}},% FIXME: missing % langslovene = {{}{}},% FIXME: missing langspanish = {{sp\ae{}nska}{sp\ae{}nska}}, langswedish = {{s\ae{}nska}{s\ae{}nska}}, @@ -433,10 +435,12 @@ fromgreek = {{\'ur gr\'{\i}sku}{\'ur gr\'{\i}sku}}, fromitalian = {{\'ur \'{\i}t\"olsku}{\'ur \'{\i}t\"olsku}}, fromlatin = {{\'ur lat\'{\i}nu}{\'ur lat\'{\i}nu}}, +% fromlatvian = {{}{}},% FIXME: missing fromnorwegian = {{\'ur norsku}{\'ur norsku}}, frompolish = {{\'ur p\'olsku}{\'ur p\'olsku}}, fromportuguese = {{\'ur port\'ug\"olsku}{\'ur port\'ug\"olsku}}, fromrussian = {{\'ur r\'ussnesku}{\'ur r\'ussnesku}}, +% fromslovak = {{}{}},% FIXME: missing % fromslovene = {{}{}},% FIXME: missing fromspanish = {{\'ur sp\ae{}nsku}{\'ur sp\ae{}nsku}}, fromswedish = {{\'ur s\ae{}nsku}{\'ur s\ae{}nsku}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx index c31a2e4cf52..763ec856acf 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx @@ -87,8 +87,8 @@ shorthands = {{Elenco delle sigle}{Sigle}}, editor = {{curatore}{cur\adddot}}, editors = {{curatori}{cur\adddot}}, - compiler = {{compilatore}{comp\adddot}}, - compilers = {{compilatori}{comp\adddot}}, + compiler = {{compilatore}{comp\adddot}}, + compilers = {{compilatori}{comp\adddot}}, redactor = {{redattore}{red\adddot}}, redactors = {{redattori}{red\adddot}}, % reviser = {{}{}},% FIXME: missing @@ -280,7 +280,7 @@ newseries = {{nuova serie}{nuova ser\adddot}}, oldseries = {{vecchia serie}{vecchia ser\adddot}}, edition = {{edizione}{ed\adddot}}, - reprint = {{ristampa}{rist\adddotspace}}, + reprint = {{ristampa}{rist\adddotspace}}, reprintof = {{ristampa di}{rist\adddotspace di}}, % reprintas = {{}{}},% FIXME: missing % reprintfrom = {{}{}},% FIXME: missing @@ -295,28 +295,28 @@ nodate = {{senza\space data}{{}n\adddot d\adddot}}, page = {{pagina}{p\adddot}}, pages = {{pagine}{pp\adddot}}, - column = {{colonna}{col\adddot}}, + column = {{colonna}{col\adddot}}, columns = {{colonne}{coll\adddot}}, - line = {{riga}{r\adddot}}, - lines = {{righe}{rr\adddot}}, + line = {{riga}{r\adddot}}, + lines = {{righe}{rr\adddot}}, verse = {{verso}{v\adddot}}, verses = {{versi}{vv\adddot}}, % section = {{}{\S}},% FIXME: missing % sections = {{}{\S\S}},% FIXME: missing paragraph = {{paragrafo}{par\adddot}}, paragraphs = {{paragrafi}{par\adddot}}, -% pagetotal = {{}{}},% FIXME: missing -% pagetotals = {{}{}},% FIXME: missing -% columntotal = {{}{}},% FIXME: missing -% columntotals = {{}{}},% FIXME: missing -% linetotal = {{}{}},% FIXME: missing -% linetotals = {{}{}},% FIXME: missing -% versetotal = {{}{}},% FIXME: missing -% versetotals = {{}{}},% FIXME: missing + pagetotal = {{pagina}{p\adddot}}, + pagetotals = {{pagine}{pp\adddot}}, + columntotal = {{colonna}{col\adddot}}, + columntotals = {{colonne}{coll\adddot}}, + linetotal = {{riga}{r\adddot}}, + linetotals = {{righe}{rr\adddot}}, + versetotal = {{verso}{v\adddot}}, + versetotals = {{versi}{vv\adddot}}, % sectiontotal = {{}{}},% FIXME: missing % sectiontotals = {{}{}},% FIXME: missing -% paragraphtotal = {{}{}},% FIXME: missing -% paragraphtotals = {{}{}},% FIXME: missing + paragraphtotal = {{paragrafo}{par\adddot}}, + paragraphtotals = {{paragrafi}{par\adddot}}, in = {{in}{in}}, inseries = {{in}{in}}, ofseries = {{di}{di}}, @@ -326,24 +326,24 @@ mathesis = {{tesi di laurea magistrale}{tesi di laurea mag\adddot}}, phdthesis = {{tesi di dottorato}{tesi di dott\adddot}}, % candthesis = {{}{}},% FIXME: missing - resreport = {{rapporto di ricerca}{rapporto di ricerca}}, + resreport = {{rapporto di ricerca}{rapporto di ricerca}}, techreport = {{rapporto tecnico}{rapp\adddotspace tecn\adddot}}, % software = {{}{}},% FIXME: missing % datacd = {{}{}},% FIXME: missing % audiocd = {{}{}},% FIXME: missing - version = {{versione}{ver\adddot}}, + version = {{versione}{ver\adddot}}, url = {{indirizzo}{indirizzo}}, % urlfrom = {{}{}},% FIXME: missing urlseen = {{visitato il}{visitato il}}, % inpreparation = {{}{}},% FIXME: missing % submitted = {{}{}},% FIXME: missing % forthcoming = {{}{}},% FIXME: missing - inpress = {{in stampa}{in stampa}}, + inpress = {{in stampa}{in stampa}}, % prepublished = {{}{}},% FIXME: missing citedas = {{citato come}{cit\adddotspace come}}, % thiscite = {{}{}},% FIXME: missing seenote = {{vedi nota}{v\adddotspace nota}}, - quotedin = {{citato da}{cit\adddotspace da}}, + quotedin = {{citato da}{cit\adddotspace da}}, idem = {{idem}{idem}}, idemsm = {{idem}{idem}}, idemsf = {{eadem}{eadem}}, @@ -377,50 +377,54 @@ december = {{dicembre}{dic\adddot}}, langamerican = {{americano}{americano}}, langbrazilian = {{brasiliano}{brasiliano}}, -% langbulgarian = {{}{}},% FIXME: missing -% langcatalan = {{}{}},% FIXME: missing -% langcroatian = {{}{}},% FIXME: missing -% langczech = {{}{}},% FIXME: missing + langbulgarian = {{bulgaro}{bulgaro}}, + langcatalan = {{catalano}{catalano}}, + langcroatian = {{croato}{croato}}, + langczech = {{ceco}{ceco}}, langdanish = {{danese}{danese}}, langdutch = {{olandese}{olandese}}, langenglish = {{inglese}{inglese}}, -% langestonian = {{}{}},% FIXME: missing -% langfinnish = {{}{}},% FIXME: missing + langestonian = {{estone}{estone}}, + langfinnish = {{finlandese}{finlandese}}, langfrench = {{francese}{francese}}, langgalician = {{galiziano}{galiziano}}, langgerman = {{tedesco}{tedesco}}, langgreek = {{greco}{greco}}, langitalian = {{italiano}{italiano}}, langlatin = {{latino}{latino}}, +% langlatvian = {{}{}},% FIXME: missing langnorwegian = {{norvegese}{norvegese}}, -% langpolish = {{}{}},% FIXME: missing + langpolish = {{polacco}{polacco}}, langportuguese = {{portoghese}{portoghese}}, -% langrussian = {{}{}},% FIXME: missing -% langslovene = {{}{}},% FIXME: missing + langrussian = {{russo}{russo}}, +% langslovak = {{}{}},% FIXME: missing + langslovene = {{sloveno}{sloveno}}, langspanish = {{spagnolo}{spagnolo}}, langswedish = {{svedese}{svedese}}, fromamerican = {{dall'americano}{dall'americano}}, frombrazilian = {{dall brasiliano}{dall brasiliano}}, -% frombulgarian = {{}{}},% FIXME: missing -% fromcatalan = {{}{}},% FIXME: missing -% fromcroatian = {{}{}},% FIXME: missing -% fromczech = {{}{}},% FIXME: missing + frombulgarian = {{dal bulgaro}{dal bulgaro}}, + fromcatalan = {{dal catalano}{dal catalano}}, + fromcroatian = {{dal croato}{dal croato}}, + fromczech = {{dal ceco}{dal ceco}}, fromdanish = {{dal danese}{dal danese}}, fromdutch = {{dall'olandese}{dall'olandese}}, fromenglish = {{dall'inglese}{dall'inglese}}, -% fromestonian = {{}{}},% FIXME: missing -% fromfinnish = {{}{}},% FIXME: missing + fromestonian = {{dall'estone}{dall'estone}}, + fromfinnish = {{dal finlandese}{dal finlandese}}, fromfrench = {{dal francese}{dal francese}}, fromgalician = {{dal galiziano}{dal galiziano}}, fromgerman = {{dal tedesco}{dal tedesco}}, fromgreek = {{dal greco}{dal greco}}, fromitalian = {{dall'italiano}{dall'italiano}}, fromlatin = {{dal latino}{dal latino}}, +% fromlatvian = {{}{}},% FIXME: missing fromnorwegian = {{dal norvegese}{dal norvegese}}, -% frompolish = {{}{}},% FIXME: missing + frompolish = {{dal polacco}{dal polacco}}, fromportuguese = {{dall portoghese}{dall portoghese}}, -% fromrussian = {{}{}},% FIXME: missing -% fromslovene = {{}{}},% FIXME: missing + fromrussian = {{dal russo}{dal russo}}, +% fromslovak = {{}{}},% FIXME: missing + fromslovene = {{dallo sloveno}{dallo sloveno}}, fromspanish = {{dallo spagnolo}{dallo spagnolo}}, fromswedish = {{dal svedese}{dal svedese}}, countryde = {{Germania}{DE}}, @@ -441,10 +445,10 @@ patreqfr = {{brevetto francese richiesto}{brev\adddot\ francese rich\adddot}}, patrequk = {{brevetto britannico richiesto}{brev\adddot\ britannico rich\adddot}}, patrequs = {{brevetto U.S.A\adddot\ richiesto}{brev\adddot\ U.S.A\adddot\ rich\adddot}}, - file = {{file}{file}}, + file = {{file}{file}}, library = {{biblioteca}{biblioteca}}, - abstract = {{abstract}{abstract}}, - annotation = {{annotazione}{annotazione}}, + abstract = {{abstract}{abstract}}, + annotation = {{annotazione}{annotazione}}, commonera = {{Era Volgare}{E\adddot V\adddot}}, beforecommonera = {{avanti Era Volgare}{a\adddot E\adddot V\adddot}}, annodomini = {{d\adddot C\adddot}{d\adddot C\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/latvian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/latvian.lbx new file mode 100644 index 00000000000..d24cbce2627 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/latvian.lbx @@ -0,0 +1,690 @@ +\ProvidesFile{latvian.lbx} +[\abx@lbxid] + +\DeclareRedundantLanguages{latvian}{latvian} + +\NewBibliographyString{% + locjanuary, + locfebruary, + locmarch, + locapril, + locmay, + locjune, + locjuly, + locaugust, + locseptember, + lococtober, + locnovember, + locdecember, + locspring, + locsummer, + locautumn, + locwinter, + locdateyear, + dateyear} + +\DeclareBibliographyExtras{% + \providetoggle{lbx@lv@datewhen}% + \providecommand*{\lbx@lv@requestwhendate}{\toggletrue{lbx@lv@datewhen}}% + \DeclareCapitalPunctuation{.!?}% + \protected\def\bibrangedash{% + \textemdash\penalty\hyphenpenalty}% breakable dash + \let\finalandcomma=\empty + \let\finalandsemicolon=\empty + \protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}% + \protected\def\mkbibmascord{\mkbibordinal}% + \protected\def\mkbibfemord{\mkbibordinal}% + \protected\def\mkbibneutord{\mkbibordinal}% + \protected\def\mkbibdatelong#1#2#3{% + \iffieldundef{#1} + {} + {\iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}% + \ifboolexpr{test {\iffieldundef{#2}} and test {\iffieldundef{#3}}} + {\iftoggle{lbx@lv@datewhen} + {\mkbibordinal{\thefield{#1}}\addspace\bibstring{locdateyear}} + {\stripzeros{\thefield{#1}}}} + {\mkbibordinal{\thefield{#1}}\addspace\bibstring{dateyear}\space}}}% + \iffieldundef{#3} + {} + {\mkbibordinal{\thefield{#3}}% + \iffieldundef{#2}{}{\nobreakspace}}% + \iffieldundef{#2} + {} + {\iftoggle{lbx@lv@datewhen} + {\lbx@ru@mkbibdatemonthwhen{\thefield{#2}}} + {\mkbibmonth{\thefield{#2}}}}}% + \protected\def\mkbibdateshort#1#2#3{% + \iffieldundef{#3} + {} + {\mkdayzeros{\thefield{#3}}\adddot}% + \iffieldundef{#2} + {} + {\mkmonthzeros{\thefield{#2}}\adddot}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}% + \ifboolexpr{test {\iffieldundef{#2}} and test {\iffieldundef{#3}}} + {} + {\adddot}}}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \iffieldundef{#1} + {} + {\iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}% + \iffieldundef{#2} + {\iftoggle{lbx@lv@datewhen} + {\mkbibordinal{\thefield{#1}}\addspace\bibstring{locdateyear}} + {\stripzeros{\thefield{#1}}}} + {\mkbibordinal{\thefield{#1}}\addspace\bibstring{dateyear}\space}}}% + \iftoggle{lbx@lv@datewhen} + {\mkbibseason{date\thefield{#2}}} + {\mkbibseason{\thefield{#2}}}}% + \let\mkbibseasondatelong\mkbibseasondateshort + \savecommand\mkdaterangecomp + \savecommand\mkdaterangecompextra + \protected\def\mkdaterangecomp{% + \lbx@lv@mkdaterangetrunc@long{long}}% + \protected\def\mkdaterangecompextra{% + \lbx@lv@mkdaterangetruncextra@long{long}}% + \def\lbx@lv@makewhendate@i#1{% + \expandafter\savecommand\csname abx@ffd@#1@\lbx@lv@whendate@date\endcsname + \cspreto{abx@ffd@#1@\lbx@lv@whendate@date}{\lbx@lv@requestwhendate}}% + \providecommand*{\lbx@lv@makewhendate}[2][*]{% + \def\lbx@lv@whendate@date{#2}% + \def\lbx@lv@whendate@formats{#1}% + \expandafter\forcsvlist + \expandafter\lbx@lv@makewhendate@i + \expandafter{\lbx@lv@whendate@formats}}% + %\lbx@lv@makewhendate{eventdate}% +} + +\UndeclareBibliographyExtras{% + \def\lbx@lv@restorewhendate@i#1{% + \expandafter\restorecommand + \csname abx@ffd@#1@\lbx@lv@whendate@date\endcsname}% + \providecommand*{\lbx@lv@restorewhendate}[2][*]{% + \def\lbx@lv@whendate@date{#2}% + \def\lbx@lv@whendate@formats{#1}% + \expandafter\forcsvlist + \expandafter\lbx@lv@restorewhendate@i + \expandafter{\lbx@lv@whendate@formats}}% + %\lbx@lv@restorewhendate{eventdate}% + \restorecommand\mkdaterangecomp + \restorecommand\mkdaterangecompextra +} + +\DeclareBibliographyStrings{% + bibliography = {{Bibliogr\={a}fija}{Bibliogr\={a}fija}}, + references = {{Literat\={u}ras saraksts}{Literat\={u}ras saraksts}}, + shorthands = {{Sa\={\i}sin\={a}jumu saraksts}{Sa\={\i}sin\={a}jumi}}, + % FIXME: not sure if correct, the standard editor translation seems to be the same as redactor + editor = {{izdev\={e}js}{izdev\adddot}}, + editors = {{izdev\={e}ji}{izdev\adddot}}, + compiler = {{sast\={a}d\={\i}t\={a}js}{sast\={a}d\adddot}}, + compilers = {{sast\={a}d\={\i}t\={a}ji}{sast\={a}d\adddot}}, + redactor = {{redaktors}{redakt\adddot}}, + redactors = {{redaktori}{radakt\adddot}}, + reviser = {{revidents}{revid\adddot}}, + revisers = {{revidenti}{revid\adddot}}, + founder = {{dibin\={a}t\={a}js}{dib\adddot}}, + founders = {{dibin\={a}t\={a}ji}{dib\adddot}}, + continuator = {{turpin\={a}t\={a}js}{turp\adddot}}, + continuators = {{turpin\={a}t\={a}ji}{turp\adddot}}, + collaborator = {{l\={\i}dzstr\={a}dnieks}{l\={\i}dzstr\adddot}}, + collaborators = {{l\={\i}dzstr\={a}dnieki}{l\={\i}dzstr\adddot}}, + translator = {{tulkot\={a}js}{tulk\adddot}}, + translators = {{tulkot\={a}ji}{tulk\adddot}}, + commentator = {{koment\={e}t\={a}js}{koment\adddot}}, + commentators = {{koment\={e}t\={a}ji}{koment\adddot}}, + annotator = {{anot\={a}cijas autors}{anot\adddotspace autors}}, + annotators = {{anot\={a}cijas autori}{anot\adddotspace autori}}, + commentary = {{koment\={a}rs}{koment\adddot}}, + annotations = {{anot\={a}cijas}{anot\={a}c\adddot}}, + introduction = {{ievads}{ievads}}, + foreword = {{priek\v{s}v\={a}rds}{priek\v{s}v\adddot}}, + afterword = {{p\={e}cv\={a}rds}{p\={e}cv\adddot}}, + editortr = {{izdev\={e}js un tulkot\={a}js}{izdev\adddotspace un tulk\adddot}}, + editorstr = {{izdev\={e}ji un tulkot\={a}ji}{izdev\adddotspace un tulk\adddot}}, + editorco = {{izdev\={e}js un koment\={e}t\={a}js}{izdev\adddotspace un koment\adddot}}, + editorsco = {{izdev\={e}ji un koment\={e}t\={a}ji}{izdev\adddotspace un koment\adddot}}, + editoran = {{izdev\={e}js un anot\={a}cijas autors}% + {izdev\adddotspace un anot\adddotspace autors}}, + editorsan = {{izdev\={e}ji un anot\={a}cijas autori}% + {izdev\adddotspace un anot\adddotspace autori}}, + editorin = {{izdev\={e}js un ievada autors}{izdev\adddotspace un ievada autors}}, + editorsin = {{izdev\={e}ji un ievada autori}{izdev\adddotspace un ievada autori}}, + editorfo = {{izdev\={e}js un priek\v{s}v\={a}rda autors}% + {izdev\adddotspace un priek\v{s}v\adddotspace autors}}, + editoraf = {{izdev\={e}js un p\={e}cv\={a}rda autors}% + {izdev\adddotspace un p\={e}cv\adddotspace autors}}, + editorsaf = {{izdev\={e}ji un p\={e}cv\={a}rda autori}% + {izdev\adddotspace un p\={e}cv\adddotspace autori}}, + editortrco = {{izdev\={e}js, tulkot\={a}js un koment\={e}t\={a}js}% + {izdev\adddot, tulk\adddotspace un koment\adddot}}, + editorstrco = {{izdev\={e}ji, tulkot\={a}ji un koment\={e}t\={a}ji}% + {izdev\adddot, tulk\adddotspace un koment\adddot}}, + editortran = {{izdev\={e}js, tulkot\={a}js un anot\={a}cijas autors}% + {izdev\adddot, tulk\adddotspace un anot\adddotspace autors}}, + editorstran = {{izdev\={e}ji, tulkot\={a}ji un anot\={a}cijas autori}% + {izdev\adddot, tulk\adddotspace un anot\adddotspace autori}}, + editortrin = {{izdev\={e}js, tulkot\={a}js un ievada autors}% + {izdev\adddot, tulk\adddotspace un ievada autors}}, + editorstrin = {{izdev\={e}ji, tulkot\={a}ji un ievada autori}% + {izdev\adddot, tulk\adddotspace un ievada autori}}, + editortrfo = {{izdev\={e}js, tulkot\={a}js un priek\v{s}v\={a}rds autors}% + {izdev\adddot, tulk\adddotspace un priek\v{s}v\adddotspace autors}}, + editorstrfo = {{izdev\={e}ji, tulkot\={a}ji un priek\v{s}v\={a}rds autori}% + {izdev\adddot, tulk\adddotspace un priek\v{s}v\adddotspace autori}}, + editortraf = {{izdev\={e}js, tulkot\={a}js un p\={e}cv\={a}rda autors}% + {izdev\adddot, tulk\adddotspace un p\={e}cv\adddotspace autors}}, + editorstraf = {{izdev\={e}ji, tulkot\={a}ji un p\={e}cv\={a}rda autori}% + {izdev\adddot, tulk\adddotspace un p\={e}cv\adddotspace autori}}, + editorcoin = {{izdev\={e}js, koment\={e}t\={a}js un ievada autors}% + {izdev\adddot, koment\adddotspace un ievada autors}}, + editorscoin = {{izdev\={e}ji, koment\={e}t\={a}ji un ievada autori}% + {izdev\adddot, koment\adddotspace un ievada autori}}, + editorcofo = {{izdev\={e}js, koment\={e}t\={a}js un priek\v{s}v\={a}rds autors}% + {izdev\adddot, koment\adddotspace un priek\v{s}v\adddotspace autors}}, + editorscofo = {{izdev\={e}ji, koment\={e}t\={a}ji un priek\v{s}v\={a}rds autori}% + {izdev\adddot, koment\adddotspace un priek\v{s}v\adddotspace autori}}, + editorcoaf = {{izdev\={e}js, koment\={e}t\={a}js un p\={e}cv\={a}rda autors}% + {izdev\adddot, koment\adddotspace un p\={e}cv\adddotspace autors}}, + editorscoaf = {{izdev\={e}ji, koment\={e}t\={a}ji un p\={e}cv\={a}rda autori}% + {izdev\adddot, koment\adddotspace un p\={e}cv\adddotspace autori}}, + editoranin = {{izdev\={e}js, anot\={a}cijas un ievada autors}% + {izdev\adddot, anot\adddotspace un ievada autors}}, + editorsanin = {{izdev\={e}ji, anot\={a}cijas un ievada autori}% + {izdev\adddot, anot\adddotspace un ievada autori}}, + editoranfo = {{izdev\={e}js, anot\={a}cijas un priek\v{s}v\={a}rda autors}% + {izdev\adddot, anot\adddotspace un priek\v{s}v\adddotspace autors}}, + editorsanfo = {{izdev\={e}ji, anot\={a}cijas un priek\v{s}v\={a}rda autori}% + {izdev\adddot, anot\adddotspace un priek\v{s}v\adddotspace autori}}, + editoranaf = {{izdev\={e}js, anot\={a}cijas un p\={e}cv\={a}rda autors}% + {izdev\adddot, anot\adddotspace un p\={e}cv\adddotspace autors}}, + editorsanaf = {{izdev\={e}ji, anot\={a}cijas un p\={e}cv\={a}rda autori}% + {izdev\adddot, anot\adddotspace un p\={e}cv\adddotspace autori}}, + editortrcoin = {{izdev\={e}js, tulkot\={a}js, koment\={e}t\={a}js un ievada autors}% + {izdev\adddot, tulk\adddot, koment\adddotspace un ievada autors}}, + editorstrcoin = {{izdev\={e}ji, tulkot\={a}ji, koment\={e}t\={a}ji un ievada autori}% + {izdev\adddot, tulk\adddot, koment\adddotspace un ievada autori}}, + editortrcofo = {{izdev\={e}js, tulkot\={a}js, koment\={e}t\={a}js un priek\v{s}v\={a}rda autors}% + {izdev\adddot, tulk\adddot, koment\adddotspace un priek\v{s}v\adddotspace autors}}, + editorstrcofo = {{izdev\={e}ji, tulkot\={a}ji, koment\={e}t\={a}ji un priek\v{s}v\={a}rda autori}% + {izdev\adddot, tulk\adddot, koment\adddotspace un priek\v{s}v\adddotspace autori}}, + editortrcoaf = {{izdev\={e}js, tulkot\={a}js, koment\={e}t\={a}js un p\={e}cv\={a}rda autors}% + {izdev\adddot, tulk\adddot, koment\adddotspace un p\={e}cv\adddotspace autors}}, + editorstrcoaf = {{izdev\={e}ji, tulkot\={a}ji, koment\={e}t\={a}ji un p\={e}cv\={a}rda autori}% + {izdev\adddot, tulk\adddot, koment\adddotspace un p\={e}cv\adddotspace autori}}, + editortranin = {{izdev\={e}js, koment\={e}t\={a}js, anot\={a}cijas un ievada autors}% + {izdev\adddot, koment\adddot, anot\adddotspace un ievada autors}}, + editorstranin = {{izdev\={e}ji, koment\={e}t\={a}ji, anot\={a}cijas un ievada autori}% + {izdev\adddot, koment\adddot, anot\adddotspace un ievada autori}}, + editortranfo = {{izdev\={e}js, koment\={e}t\={a}js, anot\={a}cijas un priek\v{s}v\={a}rda autors}% + {izdev\adddot, koment\adddot, anot\adddotspace un priek\v{s}v\adddotspace autors}}, + editorstranfo = {{izdev\={e}ji, koment\={e}t\={a}ji, anot\={a}cijas un priek\v{s}v\={a}rda autori}% + {izdev\adddot, koment\adddot, anot\adddotspace un priek\v{s}v\adddotspace autori}}, + editortranaf = {{izdev\={e}js, koment\={e}t\={a}js, anot\={a}cijas un p\={e}cv\={a}rda autors}% + {izdev\adddot, koment\adddot, anot\adddotspace un p\={e}cv\adddotspace autors}}, + editorstranaf = {{izdev\={e}ji, koment\={e}t\={a}ji, anot\={a}cijas un p\={e}cv\={a}rda autori}% + {izdev\adddot, koment\adddot, anot\adddotspace un p\={e}cv\adddotspace autori}}, + translatorco = {{tulkot\={a}js un koment\={e}t\={a}js}{tulk\adddotspace un koment\adddot}}, + translatorsco = {{tulkot\={a}ji un koment\={e}t\={a}ji}{tulk\adddotspace un koment\adddot}}, + translatoran = {{tulkot\={a}js un anot\={a}cijas autors}% + {tulk\adddotspace un anot\adddotspace autors}}, + translatorsan = {{tulkot\={a}ji un anot\={a}cijas autori}% + {tulk\adddotspace un anot\adddotspace autori}}, + translatorin = {{tulkot\={a}js un ievada autors}{tulk\adddotspace un ievada autors}}, + translatorsin = {{tulkot\={a}ji un ievada autori}{tulk\adddotspace un ievada autori}}, + translatorfo = {{tulkot\={a}js un priek\v{s}v\={a}rda autors}% + {tulk\adddotspace un priek\v{s}v\adddotspace autors}}, + translatorsfo = {{tulkot\={a}ji un priek\v{s}v\={a}rda autori}% + {tulk\adddotspace un priek\v{s}v\adddotspace autori}}, + translatoraf = {{tulkot\={a}js un p\={e}cv\={a}rda autors}% + {tulk\adddotspace un p\={e}cv\adddotspace autors}}, + translatorsaf = {{tulkot\={a}ji un p\={e}cv\={a}rda autori}% + {tulk\adddotspace un p\={e}cv\adddotspace autori}}, + translatorcoin = {{tulkot\={a}js, koment\={e}t\={a}js un ievada autors}% + {tulk\adddot, koment\adddotspace un ievada autors}}, + translatorscoin = {{tulkot\={a}ji, koment\={e}t\={a}ji un ievada autori}% + {tulk\adddot, koment\adddotspace un ievada autori}}, + translatorcofo = {{tulkot\={a}js, koment\={e}t\={a}js un priek\v{s}v\={a}rda autors}% + {tulk\adddot, koment\adddotspace un priek\v{s}v\adddotspace autors}}, + translatorscofo = {{tulkot\={a}ji, koment\={e}t\={a}ji un priek\v{s}v\={a}rda autori}% + {tulk\adddot, koment\adddotspace un priek\v{s}v\adddotspace autori}}, + translatorcoaf = {{tulkot\={a}js, koment\={e}t\={a}js un p\={e}cv\={a}rda autors}% + {tulk\adddot, koment\adddotspace un p\={e}cv\adddotspace autors}}, + translatorscoaf = {{tulkot\={a}ji, koment\={e}t\={a}ji un p\={e}cv\={a}rda autori}% + {tulk\adddot, koment\adddotspace un p\={e}cv\adddotspace autori}}, + translatoranin = {{tulkot\={a}js, anot\={a}cijas un ievada autors}% + {tulk\adddot, anot\adddotspace un ievada autors}}, + translatorsanin = {{tulkot\={a}ji, anot\={a}cijas un ievada autori}% + {tulk\adddot, anot\adddotspace un ievada autori}}, + translatoranfo = {{tulkot\={a}js, anot\={a}cijas un priek\v{s}v\={a}rda autors}% + {tulk\adddot, anot\adddotspace un priek\v{s}v\adddotspace autors}}, + translatorsanfo = {{tulkot\={a}ji, anot\={a}cijas un priek\v{s}v\={a}rda autori}% + {tulk\adddot, anot\adddotspace un priek\v{s}v\adddotspace autori}}, + translatoranaf = {{tulkot\={a}js, anot\={a}cijas un p\={e}cv\={a}rda autors}% + {tulk\adddot, anot\adddotspace un p\={e}cv\adddotspace autors}}, + translatorsanaf = {{tulkot\={a}ji, anot\={a}cijas un p\={e}cv\={a}rda autori}% + {tulk\adddot, anot\adddotspace un p\={e}cv\adddotspace autori}}, + organizer = {{organiz\={e}t\={a}js}{organiz\adddot}}, + organizers = {{organiz\={e}t\={a}ji}{organiz\adddot}}, + % FIXME: currently by* strings can appear akward if they're followed by multiple + % words connected by "and" or feminine nouns and abbreviate=false is used + byorganizer = {{organiz\={e}jis}{organiz\adddot}}, + byauthor = {{sarakst\={\i}jis}{sarakst\adddot}}, + byeditor = {{izdevis}{izdevis}}, + bycompiler = {{sast\={a}d\={\i}jis}{sast\={a}d\adddot}}, + byredactor = {{redi\v{g}\={e}jis}{redi\v{g}\adddot}}, + byreviser = {{revid\={e}jis}{revid\adddot}}, + byreviewer = {{recenz\={e}jis}{recenz\adddot}}, + byfounder = {{dibin\={a}jis}{dib\adddot}}, + bycontinuator = {{turpin\={a}jis}{turpin\adddot}}, + bycollaborator = {{ar sadarb\={\i}bu no}{ar sadarb\={\i}bu no}}, + bytranslator = {{tulkojis}{tulk\adddot}}, + bycommentator = {{koment\={e}jis}{koment\adddot}}, + byannotator = {{anot\={a}ciju sast\={a}d\={\i}jis}{anot\adddotspace sast\={a}d\adddot}}, + withcommentator = {{ar koment\={a}riem no}{ar koment\adddotspace no}}, + withannotator = {{ar anot\={a}ciju no}{ar anot\adddotspace no}}, + withintroduction = {{ar ievadu no}{ar ievadu no}}, + withforeword = {{ar priek\v{s}v\={a}rdu no}{ar priek\v{s}v\adddotspace no}}, + withafterword = {{ar p\={e}cv\={a}rdu no}{ar p\={e}cv\adddotspace no}}, + byeditortr = {{izdevis un tulkojis}{izdev\adddotspace un tulk\adddot}}, + byeditorco = {{izdevis un koment\={e}jis}{izdev\adddotspace un koment\adddot}}, + byeditoran = {{izdevis un anot\={a}ciju sast\={a}d\={\i}jis}% + {izdev\adddotspace un anot\adddotspace sast\={a}d\adddot}}, + byeditorin = {{izdevis un ievadu sast\={a}d\={\i}jis}% + {izdev\adddotspace un ievadu sast\={a}d\adddot}}, + byeditorfo = {{izdevis un priek\v{s}v\={a}rdu sast\={a}d\={\i}jis}% + {izdev\adddotspace un priek\v{s}v\adddotspace sast\={a}d\adddot}}, + byeditoraf = {{izdevis un p\={e}cv\={a}rdu sast\={a}d\={\i}jis}% + {izdev\adddotspace un p\={e}cv\adddotspace sast\={a}d\adddot}}, + byeditortrco = {{izdevis, tulkojis un koment\={e}jis}% + {izdev\adddot, tulk\adddotspace un koment\adddot}}, + byeditortran = {{izdevis, tulkojis un anot\={a}ciju sast\={a}d\={\i}jis}% + {izdev\adddot, tulk\adddotspace un anot\adddotspace sast\={a}d\adddot}}, + byeditortrin = {{izdevis, tulkojis un ievadu sast\={a}d\={\i}jis}% + {izdev\adddot, tulk\adddotspace un ievadu sast\={a}d\adddot}}, + byeditortrfo = {{izdevis, tulkojis un priek\v{s}v\={a}rdu sast\={a}d\={\i}jis}% + {izdev\adddot, tulk\adddotspace un priek\v{s}v\adddotspace sast\={a}d\adddot}}, + byeditortraf = {{izdevis, tulkojis un p\={e}cv\={a}rdu sast\={a}d\={\i}jis}% + {izdev\adddot, tulk\adddotspace un p\={e}cv\adddotspace sast\={a}d\adddot}}, + byeditorcoin = {{izdevis, koment\={e}jis un ievadu sast\={a}d\={\i}jis}% + {izdev\adddot, koment\adddotspace un ievadu sast\={a}d\adddot}}, + byeditorcofo = {{izdevis, koment\={e}jis un priek\v{s}v\={a}rdu sast\={a}d\={\i}jis}% + {izdev\adddot, koment\adddotspace un priek\v{s}v\adddotspace sast\={a}d\adddot}}, + byeditorcoaf = {{izdevis, koment\={e}jis un p\={e}cv\={a}rdu sast\={a}d\={\i}jis}% + {izdev\adddot, koment\adddotspace un p\={e}cv\adddotspace sast\={a}d\adddot}}, + byeditoranin = {{izdevis, anot\={a}ciju un ievadu sast\={a}d\={\i}jis}% + {izdev\adddot, anot\adddotspace un ievadu sast\={a}d\adddot}}, + byeditoranfo = {{izdevis, anot\={a}ciju un priek\v{s}v\={a}rdu sast\={a}d\={\i}jis}% + {izdev\adddot, anot\adddotspace un priek\v{s}v\adddotspace sast\={a}d\adddot}}, + byeditoranaf = {{izdevis, anot\={a}ciju un p\={e}cv\={a}rdu sast\={a}d\={\i}jis}% + {izdev\adddot, anot\adddotspace un p\={e}cv\adddotspace sast\={a}d\adddot}}, + byeditortrcoin = {{izdevis, tulkojis, koment\={e}jis un ievadu sast\={a}d\={\i}jis}% + {izdev\adddot, tulk\adddot, koment\adddotspace un ievadu sast\={a}d\adddot}}, + byeditortrcoin = {{izdevis, tulkojis, koment\={e}jis un priek\v{s}v\={a}rdu sast\={a}d\={\i}jis}% + {izdev\adddot, tulk\adddot, koment\adddotspace un priek\v{s}v\adddotspace sast\={a}d\adddot}}, + byeditortrcoaf = {{izdevis, tulkojis, koment\={e}jis un p\={e}cv\={a}rdu sast\={a}d\={\i}jis}% + {izdev\adddot, tulk\adddot, koment\adddotspace un p\={e}cv\adddotspace sast\={a}d\adddot}}, + byeditortranin = {{izdevis, koment\={e}jis, anot\={a}ciju un ievadu sast\={a}d\={\i}jis}% + {izdev\adddot, koment\adddot, anot\adddotspace un ievadu sast\={a}d\adddot}}, + byeditortranfo = {{izdevis, koment\={e}jis, anot\={a}ciju priek\v{s}v\={a}rdu sast\={a}d\={\i}jis}% + {izdev\adddot, koment\adddot, anot\adddotspace un priek\v{s}v\adddotspace sast\={a}d\adddot}}, + byeditortranaf = {{izdevis, koment\={e}jis, anot\={a}ciju un p\={e}cv\={a}rdu sast\={a}d\={\i}jis}% + {izdev\adddot, koment\adddot, anot\adddotspace un p\={e}cv\adddotspace sast\={a}d\adddot}}, + bytranslatorco = {{tulkojis un koment\={e}jis}{tulk\adddotspace un koment\adddot}}, + bytranslatoran = {{tulkojis un anot\={a}ciju sast\={a}d\={\i}jis}% + {tulk\adddotspace un anot\adddotspace sast\={a}d\adddot}}, + bytranslatorin = {{tulkojis un ievadu sast\={a}d\={\i}jis}% + {tulk\adddotspace un ievadu sast\={a}d\adddot}}, + bytranslatorfo = {{tulkojis un priek\v{s}v\={a}rdu sast\={a}d\={\i}jis}% + {tulk\adddotspace un priek\v{s}v\adddotspace sast\={a}d\adddot}}, + bytranslatoraf = {{tulkojis un p\={e}cv\={a}rdu sast\={a}d\={\i}jis}% + {tulk\adddotspace un p\={e}cv\adddotspace sast\={a}d\adddot}}, + bytranslatorcoin = {{tulkojis, koment\={e}jis un ievadu sast\={a}d\={\i}jis}% + {tulk\adddot, koment\adddotspace un ievadu sast\={a}d\adddot}}, + bytranslatorcofo = {{tulkojis, koment\={e}jis un priek\v{s}v\={a}rdu sast\={a}d\={\i}jis}% + {tulk\adddot, koment\adddotspace un priek\v{s}v\adddotspace sast\={a}d\adddot}}, + bytranslatorcoaf = {{tulkojis, koment\={e}jis un p\={e}cv\={a}rdu sast\={a}d\={\i}jis}% + {tulk\adddot, koment\adddotspace un p\={e}cv\adddotspace sast\={a}d\adddot}}, + bytranslatoranin = {{tulkojis, anot\={a}ciju un ievadu sast\={a}d\={\i}jis}% + {tulk\adddot, anot\adddotspace un ievadu sast\={a}d\adddot}}, + bytranslatoranfo = {{tulkojis, anot\={a}ciju un priek\v{s}v\={a}rdu sast\={a}d\={\i}jis}% + {tulk\adddot, anot\adddotspace un priek\v{s}v\adddotspace sast\={a}d\adddot}}, + bytranslatoranaf = {{tulkojis, anot\={a}ciju un p\={e}cv\={a}rdu sast\={a}d\={\i}jis}% + {tulk\adddot, anot\adddotspace un p\={e}cv\adddotspace sast\={a}d\adddot}}, + and = {{un}{un}}, + andothers = {{un citi}{u\adddotspace c\adddot}}, + andmore = {{un t\={a} t\={a}l\={a}k}{utt\adddot}}, + volume = {{s\={e}jums}{s\={e}jums}}, + volumes = {{s\={e}jumi}{s\={e}jumi}}, + % FIXME: should be after the volume count not before, e.g. "10 s\={e}jumos" + % involumes = {{s\={e}jumos}{s\={e}jumos}}, + jourvol = {{izdevums}{izdev\adddot}}, + jourser = {{s\={e}rija}{s\={e}rija}}, + book = {{gr\={a}mata}{gr\={a}m\adddot}}, + part = {{da\c{l}a}{da\c{l}a}}, + issue = {{izdevums}{izdev\adddot}}, + newseries = {{jaun\={a}s s\={e}rijas}{jaun\={a}s s\={e}r\adddot}}, + oldseries = {{vec\={a}s s\={e}rijas}{vec\={a}s s\={e}rijas}}, + edition = {{izdevums}{izdev\adddot}}, + reprint = {{atk\={a}rtots izdevums}{atk\={a}rt\adddotspace izdev\adddot}}, + reprintof = {{atk\={a}rtots izdevums no}{atk\={a}rt\adddotspace izdev\adddotspace no}}, + reprintas = {{atk\={a}rtoti izdots k\={a}}{atk\={a}rt\adddotspace izdots k\={a}}}, + reprintfrom = {{atk\={a}rtots izdevums no}{atk\={a}rt\adddotspace izdev\adddotspace no}}, + translationof = {{tulkojums no}{tulk\adddotspace no}}, + translationas = {{tulkots k\={a}}{tulk\adddotspace k\={a}}}, + translationfrom = {{tulkots no}{tulk\adddotspace no}}, + reviewof = {{recenzija}{recenz\adddot}}, + origpubas = {{ori\v{g}in\={a}li public\={e}ts k\={a}}{ori\v{g}\adddotspace public\adddotspace k\={a}}}, + origpubin = {{ori\v{g}in\={a}li public\={e}ts}{ori\v{g}\adddotspace public\adddot}}, + astitle = {{k\={a}}{k\={a}}}, + bypublisher = {{no}{no}}, + nodate = {{bez datuma}{bez dat\adddot}}, + page = {{lappuse}{lpp\adddot}}, + pages = {{lappuses}{lpp\adddot}}, + column = {{sleja}{sleja}}, + columns = {{slejas}{slejas}}, + line = {{rinda}{rinda}}, + lines = {{rindas}{rindas}}, + verse = {{pants}{pants}}, + verses = {{panti}{panti}}, + section = {{noda\c{l}a}{nod\adddot}}, + sections = {{noda\c{l}as}{nod\adddot}}, + paragraph = {{rindkopa}{rindk\adddot}}, + paragraphs = {{rindkopas}{rindk\adddot}}, + pagetotal = {{lappuse}{lpp\adddot}}, + pagetotals = {{lappuses}{lpp\adddot}}, + columntotal = {{sleja}{sleja}}, + columntotals = {{slejas}{slejas}}, + linetotal = {{rinda}{rinda}}, + linetotals = {{rindas}{rindas}}, + versetotal = {{pants}{pants}}, + versetotals = {{panti}{panti}}, + sectiontotal = {{noda\c{l}a}{nod\adddot}}, + sectiontotals = {{noda\c{l}as}{nod\adddot}}, + paragraphtotal = {{rindkopa}{rindk\adddot}}, + paragraphtotals = {{rindkopas}{rindk\adddot}}, + in = {{}{}}, % Works well as an empty string + inseries = {{s\={e}rij\={a}s}{s\={e}rij\={a}s}}, + ofseries = {{s\={e}rijas}{s\={e}rijas}}, + number = {{numurs}{nr\adddot}}, + chapter = {{noda\c{l}a}{nod\adddot}}, + % bathesis = {{bakalaura darbs}{bak\adddotspace darbs}}, + mathesis = {{ma\v{g}istra darbs}{ma\v{g}\adddotspace darbs}}, + phdthesis = {{doktora gr\={a}da disert\={a}cija}{dokt\adddotspace gr\={a}da disert\adddot}}, + candthesis = {{kandid\={a}ta disert\={a}cija}{kand\adddotspace disert\adddot}}, + resreport = {{p\={e}tniec\={\i}bas darba p\={a}rskats}{p\={e}tn\adddotspace darba p\={a}rsk\adddot}}, + techreport = {{tehniskais zi\c{n}ojums}{tehn\adddotspace zi\c{n}\adddot}}, + software = {{programmat\={u}ra}{progr\adddot}}, + datacd = {{datu CD}{datu CD}}, + audiocd = {{audio CD}{audio CD}}, + version = {{versija}{versija}}, + url = {{pieejams}{pieejams}}, + urlfrom = {{pieejams no}{pieejams no}}, + urlseen = {{apl\={u}kots\aftergroup\lbx@lv@requestwhendate}{apl\={u}kots\aftergroup\lbx@lv@requestwhendate}}, + inpreparation = {{tiek gatavots}{tiek gatavots}}, + submitted = {{iesniegts}{iesniegts}}, + forthcoming = {{gaid\={a}mais}{gaid\={a}mais}}, + inpress = {{pres\={e}}{pres\={e}}}, + prepublished = {{agr\={a}k public\={e}ts}{agr\={a}k public\adddot}},% FIXME: not sure if correct + citedas = {{turpm\={a}k cit\={e}ts k\={a}}{turpm\={a}k cit\={e}ts k\={a}}}, + % thiscite = {{}{}},% FIXME: missing + seenote = {{skat\={\i}t piez\={\i}mi}{skat\adddotspace piez\adddot}}, + quotedin = {{cit\={e}ts}{cit\={e}ts}}, + % idem = {{}{}},% FIXME: missing + % idemsf = {{}{}},% FIXME: missing + % idemsm = {{}{}},% FIXME: missing + % idemsn = {{}{}},% FIXME: missing + % idempf = {{}{}},% FIXME: missing + % idempm = {{}{}},% FIXME: missing + % idempn = {{}{}},% FIXME: missing + % idempp = {{}{}},% FIXME: missing + % ibidem = {{}{}},% FIXME: missing + % opcit = {{}{}},% FIXME: missing + % loccit = {{}{}},% FIXME: missing + % confer = {{}{}},% FIXME: missing + % sequens = {{}{}},% FIXME: missing + % sequentes = {{}{}},% FIXME: missing + % passim = {{}{}},% FIXME: missing + see = {{skat\={\i}t}{skat\adddot}}, + seealso = {{skat\={\i}t ar\={\i}}{skat\adddotspace ar\={\i}}}, + backrefpage = {{cit\={e}ts lappus\={e}}{cit\={e}ts lpp\adddot}}, + backrefpages = {{cit\={e}ts lappus\={e}s}{cit\={e}ts lpp\adddot}}, + january = {{janv\={a}ris}{janv\adddot}}, + february = {{febru\={a}ris}{febr\adddot}}, + march = {{marts}{marts}}, + april = {{apr\={\i}lis}{apr\adddot}}, + may = {{maijs}{maijs}}, + june = {{j\={u}nijs}{j\={u}n\adddot}}, + july = {{j\={u}lijs}{j\={u}l\adddot}}, + august = {{augusts}{aug\adddot}}, + september = {{septembris}{sept\adddot}}, + october = {{oktobris}{okt\adddot}}, + november = {{novembris}{nov\adddot}}, + december = {{decembris}{dec\adddot}}, + locjanuary = {{janv\={a}r\={\i}}{janv\adddot}}, + locfebruary = {{febru\={a}r\={\i}}{febr\adddot}}, + locmarch = {{mart\={a}}{mart\={a}}}, + locapril = {{apr\={\i}l\={\i}}{apr\adddot}}, + locmay = {{maij\={a}}{maij\={a}}}, + locjune = {{j\={u}nij\={a}}{j\={u}n\adddot}}, + locjuly = {{j\={u}lij\={a}}{j\={u}l\adddot}}, + locaugust = {{august\={a}}{aug\adddot}}, + locseptember = {{septembr\={\i}}{sept\adddot}}, + lococtober = {{oktobr\={\i}}{okt\adddot}}, + locnovember = {{novembr\={\i}}{nov\adddot}}, + locdecember = {{decembr\={\i}}{dec\adddot}}, + langamerican = {{amerik\={a}\c{n}u}{amerik\={a}\c{n}u}}, + langbrazilian = {{braz\={\i}lie\v{s}u}{braz\={\i}lie\v{s}u}}, + langbulgarian = {{bulg\={a}ru}{bulg\={a}ru}}, + langcatalan = {{katal\={a}\c{n}u}{katal\={a}\c{n}u}}, + langcroatian = {{horv\={a}tu}{horv\={a}tu}}, + langczech = {{\v{c}ehu}{\v{c}ehu}}, + langdanish = {{d\={a}\c{n}u}{d\={a}\c{n}u}}, + langdutch = {{n\={\i}derlandie\v{s}u}{n\={\i}derlandie\v{s}u}}, + langenglish = {{ang\c{l}u}{ang\c{l}u}}, + langestonian = {{igau\c{n}u}{igau\c{n}u}}, + langfinnish = {{somu}{somu}}, + langfrench = {{fran\v{c}u}{fran\v{c}u}}, + langgalician = {{galsie\v{s}u}{galsie\v{s}u}}, + langgerman = {{v\={a}cu}{v\={a}cu}}, + langgreek = {{grie\c{k}u}{grie\c{k}u}}, + langitalian = {{it\={a}\c{l}u}{it\={a}\c{l}u}}, + langjapanese = {{jap\={a}\c{n}u}{jap\={a}\c{n}u}}, + langlatin = {{lat\={\i}\c{n}u}{lat\={\i}\c{n}u}}, + langlatvian = {{latvie\v{s}u}{latvie\v{s}u}}, + langnorwegian = {{norv\={e}\v{g}u}{norv\={e}\v{g}u}}, + langpolish = {{po\c{l}u}{po\c{l}u}}, + langportuguese = {{portug\={a}\c{l}u}{portug\={a}\c{l}u}}, + langrussian = {{krievu}{krievu}}, + langslovak = {{slov\={a}ku}{slov\={a}ku}}, + langslovene = {{slov\={e}\c{n}u}{slov\={e}\c{n}u}}, + langspanish = {{sp\={a}\c{n}u}{sp\={a}\c{n}u}}, + langswedish = {{zviedru}{zviedru}}, + langukrainian = {{ukrai\c{n}u}{ukrai\c{n}u}}, + fromamerican = {{no amerik\={a}\c{n}u}{no amerik\={a}\c{n}u}}, + frombrazilian = {{no braz\={\i}lie\v{s}u}{no braz\={\i}lie\v{s}u}}, + frombulgarian = {{no bulg\={a}ru}{no bulg\={a}ru}}, + fromcatalan = {{no katal\={a}\c{n}u}{no katal\={a}\c{n}u}}, + fromcroatian = {{no horv\={a}tu}{no horv\={a}tu}}, + fromczech = {{no \v{c}ehu}{no \v{c}ehu}}, + fromdanish = {{no d\={a}\c{n}u}{no d\={a}\c{n}u}}, + fromdutch = {{no n\={\i}derlandie\v{s}u}{no n\={\i}derlandie\v{s}u}}, + fromenglish = {{no ang\c{l}u}{no ang\c{l}u}}, + fromestonian = {{no igau\c{n}u}{no igau\c{n}u}}, + fromfinnish = {{no somu}{no somu}}, + fromfrench = {{no fran\v{c}u}{no fran\v{c}u}}, + fromgalician = {{no galsie\v{s}u}{no galsie\v{s}u}}, + fromgerman = {{no v\={a}cu}{no v\={a}cu}}, + fromgreek = {{no grie\c{k}u}{no grie\c{k}u}}, + fromitalian = {{no it\={a}\c{l}u}{no it\={a}\c{l}u}}, + fromjapanese = {{no jap\={a}\c{n}u}{no jap\={a}\c{n}u}}, + fromlatin = {{no lat\={\i}\c{n}u}{no lat\={\i}\c{n}u}}, + fromlatvian = {{no latvie\v{s}u}{no latvie\v{s}u}}, + fromnorwegian = {{no norv\={e}\v{g}u}{no norv\={e}\v{g}u}}, + frompolish = {{no po\c{l}u}{no po\c{l}u}}, + fromportuguese = {{no portug\={a}\c{l}u}{no portug\={a}\c{l}u}}, + fromrussian = {{no krievu}{no krievu}}, + fromslovak = {{no slov\={a}ku}{no slov\={a}ku}}, + fromslovene = {{no slov\={e}\c{n}u}{no slov\={e}\c{n}u}}, + fromspanish = {{no sp\={a}\c{n}u}{no sp\={a}\c{n}u}}, + fromswedish = {{no zviedru}{no zviedru}}, + fromukrainian = {{no ukrai\c{n}u}{no ukrai\c{n}u}}, + countryde = {{V\={a}cija}{DE}}, + countryeu = {{Eiropas Savien\={\i}ba}{ES}}, + countryep = {{Eiropas Parlaments}{EP}}, + countryfr = {{Francija}{FR}}, + countryuk = {{Lielbrit\={a}nija}{GB}}, + countryus = {{Amerikas Savienot\={a}s Valstis}{ASV}}, + patent = {{patents}{patents}}, + patentde = {{v\={a}cu patents}{v\={a}cu pat\adddot}}, + patenteu = {{Eiropas patents}{Eiropas pat\adddot}}, + patentfr = {{fran\v{c}u patents}{fran\v{c}u pat\adddot}}, + patentuk = {{ang\c{l}u patents}{ang\c{l}u pat\adddot}}, + patentus = {{ASV patents}{ASV pat\adddot}}, + patreq = {{patenta piepras\={\i}jums}{pat\adddotspace piepras\adddot}}, + patreqde = {{v\={a}cu patenta piepras\={\i}jums}{V\={a}cu pat\adddotspace piepras\adddot}}, + patreqeu = {{Eiropas patenta piepras\={\i}jums}{Eiropas pat\adddotspace piepras\adddot}}, + patreqfr = {{fran\v{c}u patenta piepras\={\i}jums}{fran\v{c}u pat\adddotspace piepras\adddot}}, + patrequk = {{ang\c{l}u patenta piepras\={\i}jums}{ang\c{l}u pat\adddotspace piepras\adddot}}, + patrequs = {{ASV patenta piepras\={\i}jums}{ASV pat\adddotspace piepras\adddot}}, + file = {{fails}{fails}}, + library = {{bibliot\={e}ka}{bibliot\={e}ka}}, + abstract = {{atrefer\={e}jums}{atref\adddot}}, + annotation = {{anot\={a}cija}{anot\={a}cija}}, + commonera = {{m\={u}su \={e}ra}{m\adddotspace \={e}\adddot}}, + beforecommonera = {{pirms m\={u}su \={e}ras}{p\adddotspace m\adddotspace \={e}\adddot}}, + annodomini = {{p\={e}c Kristus dzim\v{s}anas}{AD}}, + beforechrist = {{pirms Kristus dzim\v{s}anas}{BC}}, + circa = {{ap}{ap}}, + spring = {{pavasaris}{pav\adddot}}, + summer = {{vasara}{vas\adddot}}, + autumn = {{rudens}{rud\adddot}}, + winter = {{ziema}{ziema}}, + locspring = {{pavasar\={\i}}{pav\adddot}}, + locsummer = {{vasar\={a}}{vas\adddot}}, + locautumn = {{ruden\={\i}}{rud\adddot}}, + locwinter = {{ziem\={a}}{ziem\={a}}}, + am = {{AM}{AM}}, + pm = {{PM}{PM}}, + dateyear = {{gada}{g\adddot}}, + locdateyear = {{gad\={a}}{g\adddot}}, +} + +\protected\gdef\lbx@ru@mkbibdatemonthwhen#1{% + \ifcase0#1\relax + #1\BibliographyWarning{Month out of range}% + \or\abx@bibmonth{locjanuary}% + \or\abx@bibmonth{locfebruary}% + \or\abx@bibmonth{locmarch}% + \or\abx@bibmonth{locapril}% + \or\abx@bibmonth{locmay}% + \or\abx@bibmonth{locjune}% + \or\abx@bibmonth{locjuly}% + \or\abx@bibmonth{locaugust}% + \or\abx@bibmonth{locseptember}% + \or\abx@bibmonth{lococtober}% + \or\abx@bibmonth{locnovember}% + \or\abx@bibmonth{locdecember}% + \else + #1\BibliographyWarning{Month out of range}% + \fi}% + +\protected\gdef\lbx@lv@mkdaterangetrunc@long#1#2{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\printtext[#2date]{% + \datecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\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}}% + \dateeraprint{#2year}% + \dateuncertainprint + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdaterangesep}} + {\bibdaterangesep + \enddatecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2endmonth}{#2endday}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2endseason}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% + \enddateuncertainprint + \dateeraprint{#2endyear}}}}}% + \endgroup} + +\protected\gdef\lbx@lv@mkdaterangetruncextra@long#1#2{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\printtext[#2date]{% + \datecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\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}}% + \dateeraprint{#2year}% + \dateuncertainprint + \iffieldundef{#2endyear} + {\printfield{extradate}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extradate}% + \mbox{\bibdaterangesep}} + {\bibdaterangesep + \enddatecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2endmonth}{#2endday}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2endseason}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% + \printfield{extradate}% + \enddateuncertainprint + \dateeraprint{#2endyear}}}}}% + \endgroup} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx index d716b4264fb..da7e0d6fa9f 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx @@ -449,6 +449,7 @@ langitalian = {{italiensk}{italiensk}}, langjapanese = {{japansk}{japansk}}, langlatin = {{latin}{latin}}, +% langlatvian = {{}{}},% FIXME: missing langnorwegian = {{norsk}{norsk}}, langpolish = {{polsk}{polsk}}, langportuguese = {{portugisisk}{portugisisk}}, @@ -476,6 +477,7 @@ fromitalian = {{fra italiensk}{fra italiensk}}, fromjapanese = {{fra japansk}{fra japansk}}, fromlatin = {{fra latin}{fra latin}}, +% fromlatvian = {{}{}},% FIXME: missing fromnorwegian = {{fra norsk}{fra norsk}}, frompolish = {{fra polsk}{fra polsk}}, fromportuguese = {{fra portugisisk}{fra portugisisk}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx index be93cb4f1a3..a17c60552a7 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx @@ -3,7 +3,7 @@ % Remarks by translators: % -% Since "nynorsk" inherits "norsk" (bokmål) only strings that are +% Since "nynorsk" inherits "norsk" (bokm\aa l) only strings that are % different in the two languages are included. In particular, this % means that no language or month name strings are listed below. % @@ -287,6 +287,7 @@ fromitalian = {{fr{\aa} italiensk}{fr{\aa} italiensk}}, fromjapanese = {{fr{\aa} japansk}{fr{\aa} japansk}}, fromlatin = {{fr{\aa} latin}{fr{\aa} latin}}, +% fromlatvian = {{}{}},% FIXME: missing fromnorwegian = {{fr{\aa} norsk}{fr{\aa} norsk}}, frompolish = {{fr{\aa} polsk}{fr{\aa} polsk}}, fromportuguese = {{fr{\aa} portugisisk}{fr{\aa} portugisisk}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx index 5adb9557ee3..41ec716dca2 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx @@ -475,10 +475,12 @@ langgreek = {{grecki}{grecki}}, langitalian = {{w\l oski}{w\l oski}}, langlatin = {{\l acina}{\l acina}}, +% langlatvian = {{}{}},% FIXME: missing langnorwegian = {{norweski}{norweski}}, langpolish = {{polski}{polski}}, langportuguese = {{portugalski}{portugalski}}, langrussian = {{rosyjski}{rosyjski}}, +% langslovak = {{}{}},% FIXME: missing langslovene = {{s\l owe\'{n}ski}{s\l owe\'{n}ski}}, langspanish = {{hiszpa\'{n}ski}{hiszpa\'{n}ski}}, langswedish = {{szwedzki}{szwedzki}}, @@ -499,10 +501,12 @@ fromgreek = {{z greckiego}{z grec\adddot}}, fromitalian = {{z w\l oskiego}{z w\l os\adddot}}, fromlatin = {{z \l aciny}{z \l at\adddot}}, +% fromlatvian = {{}{}},% FIXME: missing fromnorwegian = {{z norweskiego}{z norw\adddot}}, frompolish = {{z polskiego}{z pol\adddot}}, fromportuguese = {{z portugalskiego}{z port\adddot}}, fromrussian = {{z rosyjskiego}{z ros\adddot}}, +% fromslovak = {{}{}},% FIXME: missing fromslovene = {{z s\l owe\'{n}skiego}{z s\l owe\'{n}\adddot}}, fromspanish = {{z hiszpa\'{n}skiego}{z hiszp\adddot}}, fromswedish = {{ze szwedskiego}{ze szw\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx index eaef7f44e0b..d4f6c2d6fc4 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx @@ -461,6 +461,7 @@ langitalian = {{italiano}{italiano}}, langjapanese = {{japon\^es}{japon\^es}}, langlatin = {{latim}{latim}}, +% langlatvian = {{}{}},% FIXME: missing langnorwegian = {{noruegu\^es}{noruegu\^es}}, langpolish = {{polaco}{polaco}}, langportuguese = {{portugu{\^e}s}{portugu{\^e}s}}, @@ -487,6 +488,7 @@ fromitalian = {{do italiano}{do italiano}}, fromjapanese = {{do japon\^es}{do japon\^es}}, fromlatin = {{do latim}{do latim}}, +% fromlatvian = {{}{}},% FIXME: missing fromnorwegian = {{do noruegu\^es}{do noruegu\^es}}, frompolish = {{do polaco}{do polaco}}, fromportuguese = {{do portugu{\^e}s}{do portugu{\^e}s}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx index 22fae8e12ce..66e2a5460db 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx @@ -1,7 +1,7 @@ \ProvidesFile{russian.lbx} [\abx@lbxid] -\DeclareRedundantLanguages{russian}{russian} +\DeclareRedundantLanguages{russian}{russian} % This file requires UTF-8 support! @@ -406,13 +406,13 @@ pagetotals = {{страницы}{с\adddot}}, columntotal = {{колонка}{кол\adddot}}, columntotals = {{колонки}{кол\adddot}}, - linetotal = {{строка}{строка}}, - linetotals = {{строки}{строка}}, - versetotal = {{стих}{стих}}, - versetotals = {{стихи}{стихи}}, - sectiontotal = {{параграф}{\S}}, - sectiontotals = {{параграфы}{\S\S}}, - paragraphtotal = {{абзац}{абз\adddot}}, + linetotal = {{строка}{строка}}, + linetotals = {{строки}{строка}}, + versetotal = {{стих}{стих}}, + versetotals = {{стихи}{стихи}}, + sectiontotal = {{параграф}{\S}}, + sectiontotals = {{параграфы}{\S\S}}, + paragraphtotal = {{абзац}{абз\adddot}}, paragraphtotals = {{абзацы}{абз\adddot}}, in = {{в}{в}}, inseries = {{в}{в}}, @@ -505,10 +505,12 @@ langitalian = {{итальянский}{итал\adddot}}, langjapanese = {{японский}{яп\adddot}}, langlatin = {{латинский}{лат\adddot}}, +% langlatvian = {{}{}},% FIXME: missing langnorwegian = {{норвежский}{норв\adddot}}, langpolish = {{польский}{пол\adddot}}, langportuguese = {{португальский}{порт\adddot}}, langrussian = {{русский}{рус\adddot}}, +% langslovak = {{}{}},% FIXME: missing langslovene = {{словенский}{слов\adddot}}, langspanish = {{испанский}{исп\adddot}}, langswedish = {{шведский}{швед\adddot}}, @@ -531,10 +533,12 @@ fromitalian = {{с итальянского}{с\addabbrvspace итал\adddot}}, fromjapanese = {{с японского}{с\addabbrvspace яп\adddot}}, fromlatin = {{с латинского}{с\addabbrvspace лат\adddot}}, +% fromlatvian = {{}{}},% FIXME: missing fromnorwegian = {{с норвежского}{с\addabbrvspace норв\adddot}}, frompolish = {{с польского}{с пол\adddot}}, fromportuguese = {{с португальского}{с\addabbrvspace порт\adddot}}, fromrussian = {{с русского}{с\addabbrvspace рус\adddot}}, +% fromslovak = {{}{}},% FIXME: missing fromslovene = {{со словенского}{со\addabbrvspace слов\adddot}}, fromspanish = {{с испанского}{с\addabbrvspace исп\adddot}}, fromswedish = {{со шведского}{со\addabbrvspace швед\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/slovak.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/slovak.lbx index 73a98fb51c3..817716ac143 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/slovak.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/slovak.lbx @@ -594,6 +594,7 @@ {jap\adddot}}, langlatin = {{latin\v{c}ina}% {lat\adddot}}, +% langlatvian = {{}{}},% FIXME: missing langnorwegian = {{n\'{o}r\v{c}ina}% {n\'{o}r\adddot}}, langpolish = {{po\v{l}\v{s}tina}% @@ -644,6 +645,7 @@ {z\addnbspace jap\adddot}}, fromlatin = {{z\addnbspace latin\v{c}iny}% {z\addnbspace lat\adddot}}, +% fromlatvian = {{}{}},% FIXME: missing fromnorwegian = {{z\addnbspace n\'{o}r\v{c}iny}% {z\addnbspace n\'{o}r\adddot}}, frompolish = {{z\addnbspace po\v{l}\v{s}tiny}% diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/slovene.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/slovene.lbx index abb9016da70..1a78591820f 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/slovene.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/slovene.lbx @@ -457,10 +457,12 @@ langgreek = {{gr\v{s}\v{c}ina}{gr\adddot}}, langitalian = {{italijan\v{s}\v{c}ina}{it\adddot}}, langlatin = {{latin\v{s}\v{c}ina}{lat\adddot}}, +% langlatvian = {{}{}},% FIXME: missing langnorwegian = {{norve\v{s}\v{c}ina}{nor\adddot}}, langpolish = {{polj\v{s}\v{c}ina}{polj\adddot}}, langportuguese = {{portugal\v{s}\v{c}ina}{por\adddot}}, langrussian = {{ru\v{s}\v{c}ina}{ru\adddot}}, +% langslovak = {{}{}},% FIXME: missing langslovene = {{sloven\v{s}\v{c}ina}{sl\adddot}}, langspanish = {{\v{s}pan\v{s}\v{c}ina}{\v{s}p\adddot}}, langswedish = {{\v{s}ved\v{s}\v{c}ina}{\v{s}ved\adddot}}, @@ -481,10 +483,12 @@ fromgreek = {{iz gr\v{s}\v{c}ine}{iz gr\adddot}}, fromitalian = {{iz italijan\v{s}\v{c}ine}{iz it\adddot}}, fromlatin = {{iz latin\v{s}\v{c}ine}{iz lat\adddot}}, +% fromlatvian = {{}{}},% FIXME: missing fromnorwegian = {{iz norve\v{s}\v{c}ine}{iz nor\adddot}}, frompolish = {{iz polj\v{s}\v{c}ine}{iz polj\adddot}}, fromportuguese = {{iz portugal\v{s}\v{c}ine}{iz por\adddot}}, fromrussian = {{iz ru\v{s}\v{c}ine}{iz ru\adddot}}, +% fromslovak = {{}{}},% FIXME: missing fromslovene = {{iz sloven\v{s}\v{c}ine}{iz sl\adddot}}, fromspanish = {{iz \v{s}pan\v{s}\v{c}ine}{iz \v{s}p\adddot}}, fromswedish = {{iz \v{s}ved\v{s}\v{c}ine}{iz \v{s}ved\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx index 185f781987b..a01029ffc9e 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx @@ -197,7 +197,7 @@ byauthor = {{de}{de}}, byeditor = {{editado por}{ed\adddotspace por}}, bycompiler = {{compilado por}{comp\adddotspace por}}, - byredactor = {{redacción de}{red\adddotspace de}}, + byredactor = {{redacci\'on de}{red\adddotspace de}}, byreviser = {{revisado por}{rev\adddotspace por}},% FIXME: unsure byreviewer = {{rese\~{nado por}}{res\adddotspace por}},% FIXME: unsure byfounder = {{fundado por}{fund\adddotspace por}}, @@ -350,7 +350,7 @@ urlseen = {{visitado}{visitado}}, inpreparation = {{en preparaci\'{o}}{en prep\adddot}}, submitted = {{enviado}{enviado}}, - forthcoming = {{próximamente}{prox\adddot}}, + forthcoming = {{pr\'oximamente}{prox\adddot}}, inpress = {{en prensa}{en prensa}}, prepublished = {{previamente publicado}{prepublicado}}, citedas = {{citado en adelante como}{cit\adddotspace en adelante como}}, @@ -405,10 +405,12 @@ langgreek = {{griego}{griego}}, langitalian = {{italiano}{italiano}}, langlatin = {{lat\'{\i}n}{lat\'{\i}n}}, +% langlatvian = {{}{}},% FIXME: missing langnorwegian = {{noruego}{noruego}}, langpolish = {{polaco}{polaco}}, langportuguese = {{portugu\'es}{portugu\'es}}, langrussian = {{ruso}{ruso}}, +% langslovak = {{}{}},% FIXME: missing % langslovene = {{esloveno}{esloveno}}, %%FIXME: not defined? langspanish = {{espa\~nol}{espa\~nol}}, langswedish = {{sueco}{sueco}}, @@ -429,10 +431,12 @@ fromgreek = {{del griego}{del griego}}, fromitalian = {{del italiano}{del italiano}}, fromlatin = {{del lat\'{\i}n}{del lat\'{\i}n}}, +% fromlatvian = {{}{}},% FIXME: missing fromnorwegian = {{del noruego}{del noruego}}, frompolish = {{del polaco}{del polaco}}, fromportuguese = {{del portugu\'es}{del portugu\'es}}, fromrussian = {{del ruso}{del ruso}}, +% fromslovak = {{}{}},% FIXME: missing % fromslovene = {{del esloveno}{del esloveno}}, %%FIXME: not defined? fromspanish = {{del espa\~nol}{del espa\~nol}}, fromswedish = {{del sueco}{del sueco}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx index bc991f8dbd3..e8394cf9b29 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx @@ -436,6 +436,7 @@ langgreek = {{grekiska}{grekiska}}, langitalian = {{italienska}{italienska}}, langlatin = {{latin}{latin}}, +% langlatvian = {{}{}},% FIXME: missing langnorwegian = {{norska}{norska}}, langpolish = {{polska}{polska}}, langportuguese = {{portugisiska}{portugisiska}}, @@ -460,10 +461,12 @@ fromgreek = {{fr\aa n grekiska}{fr\aa n grekiska}}, fromitalian = {{fr\aa n italienska}{fr\aa n italienska}}, fromlatin = {{fr\aa n latin}{fr\aa n latin}}, +% fromlatvian = {{}{}},% FIXME: missing fromnorwegian = {{fr\aa n norska}{fr\aa n norska}}, frompolish = {{fr\aa n polska}{fr\aa n polska}}, fromportuguese = {{fr\aa n portugisiska}{fr\aa n portugisiska}}, fromrussian = {{fr\aa n ryska}{fr\aa n ryska}}, +% fromslovak = {{}{}},% FIXME: missing % fromslovene = {{}{}},% FIXME: missing fromspanish = {{fr\aa n spanska}{fr\aa n spanska}}, fromswedish = {{fr\aa n svenska}{fr\aa n svenska}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/ukrainian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/ukrainian.lbx index d954ecbfa52..4a087a4ca11 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/ukrainian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/ukrainian.lbx @@ -505,10 +505,12 @@ langitalian = {{італійська}{італ\adddot}}, langjapanese = {{японська}{яп\adddot}}, langlatin = {{латинська}{лат\adddot}}, +% langlatvian = {{}{}},% FIXME: missing langnorwegian = {{норвезька}{норв\adddot}}, langpolish = {{польська}{пол\adddot}}, langportuguese = {{португальська}{порт\adddot}}, langrussian = {{російська}{рос\adddot}}, +% langslovak = {{}{}},% FIXME: missing langslovene = {{словенська}{слов\adddot}}, langspanish = {{іспанська}{ісп\adddot}}, langswedish = {{шведська}{швед\adddot}}, @@ -531,10 +533,12 @@ fromitalian = {{з італійської}{з\addabbrvspace італ\adddot}}, fromjapanese = {{з японської}{з\addabbrvspace яп\adddot}}, fromlatin = {{з латинської}{з\addabbrvspace лат\adddot}}, +% fromlatvian = {{}{}},% FIXME: missing fromnorwegian = {{з норвезької}{з\addabbrvspace норв\adddot}}, frompolish = {{з польської}{з\addabbrvspace пол\adddot}}, fromportuguese = {{з португальської}{з\addabbrvspace порт\adddot}}, fromrussian = {{з російської}{з\addabbrvspace рос\adddot}}, +% fromslovak = {{}{}},% FIXME: missing fromslovene = {{зі словенської}{зі\addabbrvspace слов\adddot}}, fromspanish = {{з іспанської}{з\addabbrvspace ісп\adddot}}, fromswedish = {{з шведської}{з\addabbrvspace швед\adddot}}, -- cgit v1.2.3