diff options
author | Karl Berry <karl@freefriends.org> | 2016-09-14 22:21:10 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-09-14 22:21:10 +0000 |
commit | 255f0a58d9bae0f193b4bd7d07885325f2fe8585 (patch) | |
tree | 1023130a997bd4b06c760600b892fcaa73fcaa30 /Master/texmf-dist/tex/latex/biblatex/lbx | |
parent | ada185c4b489c295d97a94e2a8095efa22bf711e (diff) |
biblatex (14sep16)
git-svn-id: svn://tug.org/texlive/trunk@42063 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/lbx')
26 files changed, 1935 insertions, 257 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx index 551afa2c5df..675089ddd8b 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx @@ -13,6 +13,14 @@ {\mkbibmonth{\thefield{#2}}% \iffieldundef{#1}{}{\space}}% \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \mkyearzeros{\thefield{#1}}}% } \InheritBibliographyStrings{english} diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx index 317aa18ab3e..80e2fd4ede3 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx @@ -6,7 +6,6 @@ \DeclareBibliographyExtras{% \protected\def\bibrangedash{% \textendash\penalty\hyphenpenalty}% breakable dash - \protected\def\bibdatedash{\bibrangedash}% \let\finalandcomma=\empty \let\finalandsemicolon=\empty \def\mkbibordinal{\mkbibmascord}% @@ -24,21 +23,57 @@ {} {\mkbibmonth{\thefield{#2}}% \iffieldundef{#1}{}{\nobreakspace de\space}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% \protected\def\mkbibdateshort#1#2#3{% \iffieldundef{#3} {} - {\mkdatezeros{\thefield{#3}}% + {\mkdayzeros{\thefield{#3}}% \iffieldundef{#2}{}{/}}% \iffieldundef{#2} {} - {\mkdatezeros{\thefield{#2}}% + {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#1}{}{/}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% \savecommand\mkbibordedition \savecommand\mkbibordseries \def\mkbibordedition{\mkbibfemord}% \def\mkbibordseries{\mkbibfemord}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } \UndeclareBibliographyExtras{% @@ -400,6 +435,7 @@ langdutch = {{holand{\^e}s}{holand{\^e}s}}, langenglish = {{ingl\^es}{ingl\^es}}, langfinnish = {{finland\^es}{finland\^es}}, +% langestonian = {{}{}},% FIXME: missing langfrench = {{franc\^es}{franc\^es}}, langgerman = {{alem\~ao}{alem\~ao}}, langgreek = {{grego}{grego}}, @@ -420,6 +456,7 @@ fromdanish = {{do dinamarqu\^es}{do dinamarqu\^es}}, fromdutch = {{do holand{\^e}s}{do holand{\^e}s}}, fromenglish = {{do ingl\^es}{do ingl\^es}}, +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{do finland\^es}{do finland\^es}}, fromfrench = {{do franc\^es}{do franc\^es}}, fromgerman = {{do alem\~ao}{do alem\~ao}}, @@ -455,6 +492,17 @@ library = {{biblioteca}{biblioteca}}, abstract = {{resumo}{resumo}}, annotation = {{notas}{notas}}, + commonera = {{Era Comum}{EC}}, + beforecommonera = {{antes da Era Comum}{AEC}}, + annodomini = {{depois de Cristo}{d\adddot C\adddot}}, + beforechrist = {{antes de Cristo}{a\adddot C\adddot}}, +% circa = {{}{}},% FIXME: missing +% spring = {{}{}},% FIXME: missing +% summer = {{}{}},% FIXME: missing +% autumn = {{}{}},% FIXME: missing +% winter = {{}{}},% FIXME: missing + am = {{AM}{AM}}, + pm = {{PM}{PM}}, } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx index 5d54ac91fad..fe10f05545d 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx @@ -4,7 +4,6 @@ \DeclareBibliographyExtras{% \protected\def\bibrangedash{% \textendash\penalty\hyphenpenalty}% breakable dash - \protected\def\bibdatedash{\bibrangedash}% \let\finalandcomma=\empty \protected\def\mkbibordinal#1{% \begingroup @@ -27,17 +26,54 @@ {} {\mkbibmonth{\thefield{#2}}% \iffieldundef{#1}{}{\space}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% \protected\def\mkbibdateshort#1#2#3{% \iffieldundef{#3} {} - {\mkdatezeros{\thefield{#3}}% + {\mkdayzeros{\thefield{#3}}% \iffieldundef{#2}{}{/}}% \iffieldundef{#2} {} - {\mkdatezeros{\thefield{#2}}% + {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#1}{}{/}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}% + \bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } \InheritBibliographyStrings{english} diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx index 9b116925185..8b6675d12b0 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx @@ -5,7 +5,6 @@ \DeclareBibliographyExtras{% \protected\def\bibrangedash{\addnbthinspace -\addnbthinspace}% - \protected\def\bibdatedash{\addnbthinspace\textendash\addhpthinspace}% \let\finalandcomma=\empty \let\finalandsemicolon=\empty \def\mkbibordinal{\mkbibmascord}% @@ -37,37 +36,73 @@ {\space de\nobreakspace}}% \iffieldundef{#1} {} - {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}% + {\iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\thefield{#1}}}}% \protected\def\mkbibdateshort#1#2#3{% maintainers: check me \iffieldundef{#3} {} - {\stripzeros{\thefield{#3}}% + {\mkdayzeros{\thefield{#3}}% \iffieldundef{#2}{}{\mbox{-}}}% \iffieldundef{#2} {} - {\stripzeros{\thefield{#2}}% + {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#1}{}{\mbox{-}}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\thefield{#1}}}% \savecommand\lbx@initnamehook \savecommand\lbx@inittitlehook - \savecommand\mkbibrangeterse + \savecommand\mkdaterangeterse \savecommand\mkbibordedition \savecommand\mkbibordseries \let\lbx@initnamehook=\lbx@ca@smartof \let\lbx@inittitlehook=\lbx@ca@smartof - \protected\def\mkbibrangeterse{% + \protected\def\mkdaterangeterse{% \BibliographyWarning{% Date format 'terse' not applicable to\MessageBreak Catalan dates. Using format 'short' instead}% - \mkbibrangefull{short}}% + \mkdaterangefull{short}}% \def\mkbibordedition{\mkbibfemord}% \def\mkbibordseries{\mkbibfemord}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } \UndeclareBibliographyExtras{% \restorecommand\lbx@initnamehook \restorecommand\lbx@inittitlehook - \restorecommand\mkbibrangeterse + \restorecommand\mkdaterangeterse \restorecommand\mkbibordedition \restorecommand\mkbibordseries } @@ -420,6 +455,7 @@ langdanish = {{dan\`es}{dan\adddot}}, langdutch = {{neerland\`es}{neerl\adddot}}, langenglish = {{angl\`es}{ang\adddot}}, +% langestonian = {{}{}},% FIXME: missing langfinnish = {{fin\`es}{fin\adddot}}, langfrench = {{franc\`es}{fr\adddot}}, langgerman = {{alemany}{al\adddot}}, @@ -441,6 +477,7 @@ fromdanish = {{del dan\`es}{del dan\adddot}}, fromdutch = {{del neerland\`es}{del neerl\adddot}}, fromenglish = {{de l'angl\`es}{de l'ang\adddot}}, +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{del fin\`es}{del fin\adddot}}, fromfrench = {{del franc\`es}{del fr\adddot}}, fromgerman = {{de l'alemany}{de l'al\adddot}}, @@ -476,6 +513,17 @@ library = {{biblioteca}{bibl\adddot}}, abstract = {{resum}{res\adddot}}, annotation = {{nota}{n\adddot}}, + commonera = {{Era Comuna}{EC}}, + beforecommonera = {{abans de l’Era Comuna}{AEC}}, + annodomini = {{despr\'es de Crist}{dC}}, + beforechrist = {{abans de Crist}{aC}}, +% circa = {{}{}},% FIXME: missing +% spring = {{}{}},% FIXME: missing +% summer = {{}{}},% FIXME: missing +% autumn = {{}{}},% FIXME: missing +% winter = {{}{}},% FIXME: missing + am = {{a\adddotspace m\adddot}{a\adddotspace m\adddot}}, + pm = {{p\adddotspace m\adddot}{p\adddotspace m\adddot}}, } \begingroup diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx index 08aee901dbf..cacb3ced281 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx @@ -9,7 +9,6 @@ \DeclareBibliographyExtras{% \protected\def\bibrangedash{\textendash\penalty\hyphenpenalty}% - \protected\def\bibdatedash{\addnbthinspace\textendash\addhpthinspace}% \let\finalandcomma=\empty \let\finalandsemicolon=\empty \protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}% @@ -29,7 +28,7 @@ \iffieldundef{#1}{}{\space}}% \iffieldbibstring{#1} {\bibstring{\thefield{#1}}} - {\stripzeros{\thefield{#1}}}}% + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% \protected\def\mkbibdateshort#1#2#3{% \iffieldundef{#3} {} @@ -41,11 +40,43 @@ \iffieldundef{#1}{}{\addnbthinspace}}% \iffieldbibstring{#1} {\bibstring{\thefield{#1}}} - {\stripzeros{\thefield{#1}}}}% + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% \savecommand\mkbibordedition \savecommand\mkbibordseries \def\mkbibordedition{\mkbibordinal}% \def\mkbibordseries{\mkbibfemord}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } \UndeclareBibliographyExtras{% @@ -433,6 +464,7 @@ langdanish = {{danski}{danski}}, langdutch = {{nizozemski}{nizozemski}}, langenglish = {{engleski}{engleski}}, +% langestonian = {{}{}},% FIXME: missing % langfinnish = {{}{}},% FIXME: missing langfrench = {{francuski}{francuski}}, langgerman = {{njema\v{c}ki}{njema\v{c}ki}}, @@ -454,6 +486,7 @@ fromdanish = {{s danskog}{s danskog}}, fromdutch = {{s nizozemskog}{s nizozemskog}}, fromenglish = {{s engleskog}{s engleskog}}, +% fromestonian = {{}{}},% FIXME: missing % fromfinnish = {{}{}},% FIXME: missing fromfrench = {{s francuskog}{s francuskog}}, fromgerman = {{s njema\v{c}kog}{s njema\v{c}kog}}, @@ -492,6 +525,17 @@ library = {{biblioteka}{biblioteka}}, abstract = {{sa\v{z}etak}{sa\v{z}etak}}, annotation = {{bilje\v{s}ka}{bilje\v{s}ka}}, + commonera = {{n\adddot e\adddot}{n\adddot e\adddot}}, + beforecommonera = {{pr\adddotspace n\adddotspace e\adddot}{pr\adddotspace n\adddotspace e\adddot}}, + annodomini = {{poslije Krista}{p\adddotspace Kr\adddot}}, + beforechrist = {{prije Krista}{pr\adddotspace Kr\adddot}}, +% circa = {{}{}},% FIXME: missing +% spring = {{}{}},% FIXME: missing +% summer = {{}{}},% FIXME: missing +% autumn = {{}{}},% FIXME: missing +% winter = {{}{}},% FIXME: missing + am = {{AM}{AM}}, + pm = {{PM}{PM}}, } \protected\gdef\lbx@cr@mkbibmonth#1{% diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx index 5c3593dff42..0a8cfeeef94 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx @@ -5,8 +5,6 @@ \DeclareCapitalPunctuation{.!?}% \protected\def\bibrangedash{% \textendash\penalty\hyphenpenalty}% breakable dash - \protected\def\bibdatedash{% - \textemdash\penalty\hyphenpenalty}% breakable dash \let\finalandcomma=\empty \let\finalandsemicolon=\empty \protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}% @@ -22,19 +20,55 @@ {} {\mkbibmonth{\thefield{#2}}% \iffieldundef{#1}{}{\space}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% \protected\def\mkbibdateshort#1#2#3{% \iffieldundef{#3} {} - {\mkdatezeros{\thefield{#3}}\adddot + {\mkdayzeros{\thefield{#3}}\adddot \iffieldundef{#2}{}{\thinspace}}% \iffieldundef{#2} {} - {\mkdatezeros{\thefield{#2}}% + {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#1} {} {\iffieldundef{#3}{/}{\adddot\thinspace}}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } \DeclareBibliographyStrings{% @@ -342,6 +376,7 @@ langdanish = {{d\'{a}n\v{s}tina}{d\'{a}n\adddot}}, langdutch = {{holand\v{s}tina}{hol.\adddot}}, langenglish = {{angli\v{c}tina}{angl\adddot}}, +% langestonian = {{}{}},% FIXME: missing langfinnish = {{fin\v{s}tina}{fin\adddot}}, langfrench = {{francouz\v{s}tina}{franc\adddot}}, langgerman = {{n\v{e}m\v{c}ina}{n\v{e}m\adddot}}, @@ -362,6 +397,7 @@ fromdanish = {{z d\'{a}n\v{s}tiny}{z d\'{a}n\adddot}}, fromdutch = {{z holand\v{s}tiny}{z hol\adddot}}, fromenglish = {{z angli\v{c}tiny}{z angl\adddot}}, +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{z fin\v{s}tiny}{z fin.}}, fromfrench = {{z francouz\v{s}tiny}{z franc\adddot}}, fromgerman = {{z n\v{e}m\v{c}iny}{z n\v{e}m\adddot}}, @@ -396,6 +432,17 @@ library = {{knihovna}{knih\adddot}}, abstract = {{abstrakt}{abst\adddot}}, annotation = {{anotace}{anot\adddot}}, +% commonera = {{}{}}, +% beforecommonera = {{}{}}, + annodomini = {{n\adddotspace l\adddot}{n\adddotspace l\adddot}}, + beforechrist = {{p\v{r}\adddotspace n\adddotspace l\adddot}{p\v{r}\adddotspace n\adddotspace l\adddot}}, +% circa = {{}{}},% FIXME: missing +% spring = {{}{}},% FIXME: missing +% summer = {{}{}},% FIXME: missing +% autumn = {{}{}},% FIXME: missing +% winter = {{}{}},% FIXME: missing + am = {{dop\adddot}{dop\adddot}}, + pm = {{odp\adddot}{odp\adddot}}, } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx index b0799936d61..c9786e9ee96 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx @@ -6,7 +6,6 @@ \DeclareBibliographyExtras{% \protected\def\bibrangedash{% \textendash\penalty\hyphenpenalty}% breakable dash - \protected\def\bibdatedash{\bibrangedash}% \let\finalandcomma=\empty \let\finalandsemicolon=\empty \protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}% @@ -22,16 +21,52 @@ {} {\mkbibmonth{\thefield{#2}}% \iffieldundef{#1}{}{\space}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% \protected\def\mkbibdateshort#1#2#3{% \iffieldundef{#3} {} - {\mkdatezeros{\thefield{#3}}\adddot}% + {\mkdayzeros{\thefield{#3}}\adddot}% \iffieldundef{#2} {} - {\mkdatezeros{\thefield{#2}}% + {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#1}{}{\adddot}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } \DeclareBibliographyStrings{% @@ -408,6 +443,7 @@ langdanish = {{dansk}{dansk}}, langdutch = {{nederlandsk}{nederlandsk}}, langenglish = {{engelsk}{engelsk}}, +% langestonian = {{}{}},% FIXME: missing langfinnish = {{finsk}{finsk}}, langfrench = {{fransk}{fransk}}, langgerman = {{tysk}{tysk}}, @@ -429,6 +465,7 @@ fromdanish = {{fra dansk}{fra dansk}}, fromdutch = {{fra nederlandsk}{fra nederlandsk}}, fromenglish = {{fra engelsk}{fra engelsk}}, +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{fra finsk}{fra finsk}}, fromfrench = {{fra fransk}{fra fransk}}, fromgerman = {{fra tysk}{fra tysk}}, @@ -466,6 +503,17 @@ % alternative translation: % abstract = {{abstract}{abstract}}, annotation = {{forklaring}{forklaring}}, + commonera = {{vesterlandsk tidsregning}{v\adddot t\adddot}}, + beforecommonera = {{f\o r vesterlandsk tidsregning}{f\adddot v\adddot t\adddot}}, + annodomini = {{e\adddot Kr\adddot}{e\adddot Kr\adddot}}, + beforechrist = {{f\adddot Kr\adddot}{f\adddot Kr\adddot}}, +% circa = {{}{}},% FIXME: missing +% spring = {{}{}},% FIXME: missing +% summer = {{}{}},% FIXME: missing +% autumn = {{}{}},% FIXME: missing +% winter = {{}{}},% FIXME: missing + am = {{AM}{AM}}, + pm = {{PM}{PM}}, } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx index 2f0b63da8a3..e9a068242a5 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx @@ -10,7 +10,6 @@ \DeclareBibliographyExtras{% \protected\def\bibrangedash{% \textendash\penalty\hyphenpenalty}% breakable dash - \protected\def\bibdatedash{\bibrangedash}% \let\finalandcomma=\empty \let\finalandsemicolon=\empty % both ordinal numbers are valid, the first is the most basic: 1e, 2e, 19e @@ -42,17 +41,53 @@ {} {\mkbibmonth{\thefield{#2}}% \iffieldundef{#1}{}{\space}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% \protected\def\mkbibdateshort#1#2#3{% \iffieldundef{#3} {} - {\mkdatezeros{\thefield{#3}}% + {\mkdayzeros{\thefield{#3}}% \iffieldundef{#2}{}{\mbox{-}}}% \iffieldundef{#2} {} - {\mkdatezeros{\thefield{#2}}% + {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#1}{}{\mbox{-}}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } \DeclareBibliographyStrings{% @@ -411,6 +446,7 @@ langdanish = {{Deens}{Deens}}, langdutch = {{Nederlands}{Nederlands}}, langenglish = {{Engels}{Engels}}, +% langestonian = {{}{}},% FIXME: missing langfinnish = {{Fins}{Fins}}, langfrench = {{Frans}{Frans}}, langgerman = {{Duits}{Duits}}, @@ -432,6 +468,7 @@ fromdanish = {{uit het Deens}{uit het Deens}}, fromdutch = {{uit het Nederlands}{uit het Nederlands}}, fromenglish = {{uit het Engels}{uit het Engels}}, +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{uit het Fins}{uit het Fins}}, fromfrench = {{uit het Frans}{uit het Frans}}, fromgerman = {{uit het Duits}{uit het Duits}}, @@ -463,6 +500,17 @@ patreqfr = {{Franse patentaanvraag}{Franse patentaanvr\adddot}}, patrequk = {{Britse patentaanvraag}{Britse patentaanvr\adddot}}, patrequs = {{Amerikaanse patentaanvraag}{Amer\adddot patentaanvr\adddot}}, + commonera = {{gewone jaartelling}{g\adddot j\adddot}}, + beforecommonera = {{v\'o\'or gewone jaartelling}{v\adddot g\adddot j\adddot}}, + annodomini = {{na Christus}{n\adddot Chr\adddot}}, + beforechrist = {{voor Christus}{v\adddot Chr\adddot}}, +% circa = {{}{}},% FIXME: missing +% spring = {{}{}},% FIXME: missing +% summer = {{}{}},% FIXME: missing +% autumn = {{}{}},% FIXME: missing +% winter = {{}{}},% FIXME: missing + am = {{a\adddot m\adddot}{a\adddot m\adddot}}, + pm = {{p\adddot m\adddot}{p\adddot m\adddot}}, } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx index 754cc2939a7..b8f5ff5728c 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx @@ -7,7 +7,6 @@ canadian,australian,newzealand,USenglish,UKenglish} \DeclareBibliographyExtras{% \protected\def\bibrangedash{% \textendash\penalty\hyphenpenalty}% breakable dash - \protected\def\bibdatedash{\bibrangedash}% \def\finalandcomma{\addcomma}% \def\finalandsemicolon{\addsemicolon}% \protected\def\mkbibordinal#1{% @@ -35,40 +34,73 @@ canadian,australian,newzealand,USenglish,UKenglish} \iffieldundef{#1}{}{,\space}}% \iffieldbibstring{#1} {\bibstring{\thefield{#1}}} - {\stripzeros{\thefield{#1}}}}% + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% \protected\def\mkbibdateshort#1#2#3{% \iffieldundef{#2} {} - {\mkdatezeros{\thefield{#2}}% + {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#3} {\iffieldundef{#1}{}{/}} {/}}% \iffieldundef{#3} {} - {\mkdatezeros{\thefield{#3}}% + {\mkdayzeros{\thefield{#3}}% \iffieldundef{#1}{}{/}}% \iffieldbibstring{#1} {\bibstring{\thefield{#1}}} - {\mkdatezeros{\thefield{#1}}}}% - \savecommand\mkbibrangecomp - \savecommand\mkbibrangecompextra - \savecommand\mkbibrangeterse - \savecommand\mkbibrangeterseextra - \protected\def\mkbibrangecomp{% - \lbx@us@mkbibrangetrunc@long{long}}% - \protected\def\mkbibrangeterse{% - \lbx@us@mkbibrangetrunc@short{short}}% - \protected\def\mkbibrangecompextra{% - \lbx@us@mkbibrangetruncextra@long{long}}% - \protected\def\mkbibrangeterseextra{% - \lbx@us@mkbibrangetruncextra@short{short}}% + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}% + \bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \savecommand\mkdaterangecomp + \savecommand\mkdaterangecompextra + \savecommand\mkdaterangeterse + \savecommand\mkdaterangeterseextra + \protected\def\mkdaterangecomp{% + \lbx@us@mkdaterangetrunc@long{long}}% + \protected\def\mkdaterangeterse{% + \lbx@us@mkdaterangetrunc@short{short}}% + \protected\def\mkdaterangecompextra{% + \lbx@us@mkdaterangetruncextra@long{long}}% + \protected\def\mkdaterangeterseextra{% + \lbx@us@mkdaterangetruncextra@short{short}}% } \UndeclareBibliographyExtras{% - \restorecommand\mkbibrangecomp - \restorecommand\mkbibrangecompextra - \restorecommand\mkbibrangeterse - \restorecommand\mkbibrangeterseextra + \restorecommand\mkdaterangecomp + \restorecommand\mkdaterangecompextra + \restorecommand\mkdaterangeterse + \restorecommand\mkdaterangeterseextra } \DeclareBibliographyStrings{% @@ -425,6 +457,7 @@ canadian,australian,newzealand,USenglish,UKenglish} langdanish = {{Danish}{Danish}}, langdutch = {{Dutch}{Dutch}}, langenglish = {{English}{English}}, + langestonian = {{Estonian}{Estonian}}, langfinnish = {{Finnish}{Finnish}}, langfrench = {{French}{French}}, langgerman = {{German}{German}}, @@ -446,6 +479,7 @@ canadian,australian,newzealand,USenglish,UKenglish} fromdanish = {{from the Danish}{from the Danish}}, fromdutch = {{from the Dutch}{from the Dutch}}, fromenglish = {{from the English}{from the English}}, + fromestonian = {{from the Estonian}{from the Estonian}}, fromfinnish = {{from the Finnish}{from the Finnish}}, fromfrench = {{from the French}{from the French}}, fromgerman = {{from the German}{from the German}}, @@ -481,74 +515,135 @@ canadian,australian,newzealand,USenglish,UKenglish} library = {{library}{library}}, abstract = {{abstract}{abstract}}, annotation = {{annotations}{annotations}}, + commonera = {{Common Era}{CE}}, + beforecommonera = {{Before Common Era}{BCE}}, + annodomini = {{Anno Domini}{AD}}, + beforechrist = {{Before Christ}{BC}}, + circa = {{circa}{ca\adddot}}, + spring = {{Spring}{Spr\adddot}}, + summer = {{Summer}{Sum\adddot}}, + autumn = {{Autumn}{Aut\adddot}}, + winter = {{Winter}{Win\adddot}}, + am = {{AM}{AM}}, + pm = {{PM}{PM}}, } -\protected\gdef\lbx@us@mkbibrangetrunc@long#1#2{% +\protected\gdef\lbx@us@mkdaterangetrunc@long#1#2{% \iffieldundef{#2year} {} - {\printtext[#2date]{% - \iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibdate#1}{}{#2month}{#2day}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% + {\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{\bibdatedash}} - {\bibdatedash - \iffieldsequal{#2year}{#2endyear} - {\iffieldsequal{#2month}{#2endmonth} - {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} - {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} - {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}} + {} + {\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{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \enddateuncertainprint + \dateeraprint{#2}}}}}} -\protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{% +\protected\gdef\lbx@us@mkdaterangetrunc@short#1#2{% \iffieldundef{#2year} {} - {\printtext[#2date]{% - \iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibdate#1}{}{#2month}{#2day}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% + {\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{\bibdatedash}} - {\bibdatedash - \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}} + {\mbox{\bibdaterangesep}} + {\bibdaterangesep + \enddatecircaprint + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \enddateuncertainprint + \dateeraprint{#2}}}}}} -\protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{% +\protected\gdef\lbx@us@mkdaterangetruncextra@long#1#2{% \iffieldundef{#2year} {} - {\printtext[#2date]{% - \iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibdate#1}{}{#2month}{#2day}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% + {\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{extrayear}} {\iffieldequalstr{#2endyear}{} {\printfield{extrayear}% - \mbox{\bibdatedash}} - {\bibdatedash - \iffieldsequal{#2year}{#2endyear} - {\iffieldsequal{#2month}{#2endmonth} - {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} - {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} - {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}% - \printfield{extrayear}}}}}} + \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{extrayear}% + \enddateuncertainprint + \dateeraprint{#2}}}}}} -\protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{% +\protected\gdef\lbx@us@mkdaterangetruncextra@short#1#2{% \iffieldundef{#2year} {} - {\printtext[#2date]{% - \iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibdate#1}{}{#2month}{#2day}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% + {\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{extrayear}} {\iffieldequalstr{#2endyear}{} {\printfield{extrayear}% - \mbox{\bibdatedash}} - {\bibdatedash - \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% - \printfield{extrayear}}}}}} + \mbox{\bibdaterangesep}} + {\bibdaterangesep + \enddatecircaprint + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \printfield{extrayear}% + \enddateuncertainprint + \dateeraprint{#2}}}}}} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/estonian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/estonian.lbx new file mode 100644 index 00000000000..3af5e3c9cb0 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/estonian.lbx @@ -0,0 +1,578 @@ +\ProvidesFile{estonian.lbx} +[\abx@lbxid] + +% First attempt at Estonian using Finnish.lbx, Bing translator and a dictionary +% Translator's notes: +% Some translations look akward but they are made in such a way +% that they look as good as possible in running text. +% Source for some items in translations: Kielikello 3/1998. +% and Liisa Junno: Kirjastosanasto 1. BTJ Kirjastopalvelu 2006. + +\DeclareRedundantLanguages{estonian}{estonian} + +\NewBibliographyString{% + basicjanuary, + basicfebruary, + basicmarch, + basicapril, + basicmay, + basicjune, + basicjuly, + basicaugust, + basicseptember, + basicoctober, + basicnovember, + basicdecember% +} + +\DeclareBibliographyExtras{% + % dashes: may be either \textendash or \textemdash + \protected\def\bibrangedash{% + \textendash\penalty\hyphenpenalty}% breakable dash + \let\finalandcomma=\empty + \let\finalandsemicolon=\empty + \protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}% + \protected\def\mkbibmascord{\mkbibordinal}% + \protected\def\mkbibfemord{\mkbibordinal}% + \protected\def\mkbibneutord{\mkbibordinal}% + \protected\def\mkbibdatelong#1#2#3{% + \iffieldundef{#3} + {} + {\mkbibordinal{\thefield{#3}}% + \iffieldundef{#2}{}{\nobreakspace}}% + \iffieldundef{#2} + {} + {\iffieldundef{#3} + {\lbx@fi@mkbibmonthbasic{\thefield{#2}}% + \iffieldundef{#1}{}{\space}}% + {\mkbibmonth{\thefield{#2}}% + \iffieldundef{#1}{}{\space}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% + \protected\def\mkbibdateshort#1#2#3{% + \iffieldundef{#3} + {} + {\mkdayzeros{\thefield{#3}}\adddot + \iffieldundef{#2}{}{\thinspace}}% + \iffieldundef{#2} + {} + {\mkmonthzeros{\thefield{#2}}% + \iffieldundef{#1} + {} + {\iffieldundef{#3}{/}{\adddot\thinspace}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% + \savecommand\lbx@lfromlang + \savecommand\lbx@sfromlang + \def\lbx@lfromlang{% + \iffieldundef{origlanguage} + {} + {\biblstring{from\thefield{origlanguage}}\space}}% + \def\lbx@sfromlang{% + \iffieldundef{origlanguage} + {} + {\bibsstring{from\thefield{origlanguage}}\space}}% + \savebibmacro{in:}% + \renewbibmacro{in:}{% + \iffieldequalstr{entrytype}{article} + {} + {\printtext{\bibstring{in}\intitlepunct}}}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% +} + +\UndeclareBibliographyExtras{% + \restorecommand\lbx@lfromlang + \restorecommand\lbx@sfromlang + \restorebibmacro{in:}% +} + +\DeclareBibliographyStrings{% + bibliography = {{bibliograafia}{bibliograafia}}, + references = {{viited}{viited}}, + shorthands = {{nimekirja ning l\"{u}hendid}{l\"{u}hendid}}, + editor = {{toimetaja}{toim\adddot}}, + editors = {{toimetajad}{toim\adddot}}, + compiler = {{kompilaator}{koompilaator}}, + compilers = {{kompilaatorid}{kompilaatorid}}, + redactor = {{toimittanut}{toim\adddot}}, + redactors = {{toimittaneet}{toim\adddot}}, + reviser = {{L\"{a}bi vaadataja}{L\"{a}bi vaadataja}}, + revisers = {{L\"{a}bi vaadatajad}{L\"{a}bi vaadatajad}}, + founder = {{asutaja}{asutaja}}, + founders = {{asutajad}{asutajad}}, + continuator = {{jatkaja}{jatkaja}}, + continuators = {{jatkajad}{jatkajad}}, + collaborator = {{kaast\"{o}\"{o}line}{kaast\"{o}\"{o}line}}, + collaborators = {{kaast\"{o}\"{o}tajate}{kaast\"{o}\"{o}tajate}}, + translator = {{t\~{o}lkija}{t\~{o}lkija}}, + translators = {{t\~{o}lkijad}{t\~{o}lkijad}}, + commentator = {{kommentaator}{kommentaator}}, + commentators = {{kommentaatorid}{kommentaatorid}}, + annotator = {{selityksin varustanut}{selityksin varustanut}}, + annotators = {{selityksin varustaneet}{selityksin varustaneet}}, + commentary = {{kommentaaris}{kommentaaris}}, + annotations = {{annotatsioonide}{annotatsioonide}}, + introduction = {{sissejuhatus}{sissejuhatus}}, + foreword = {{eess\~{o}na}{eess\~{o}na}}, + afterword = {{j\"{a}rels\~{o}na}{j\"{a}rels\~{o}na}}, + editortr = {{toimetaja ja t\~{o}lkija}% + {toim\adddotspace ja t\~{o}lk\adddot}}, + editorstr = {{toimetajad ja t\~{o}lkijate}% + {toim\adddotspace ja t\~{o}lk\adddot}}, + editorco = {{toimetaja ja kommentaator}% + {toimetaja ja kommentaator}}, + editorsco = {{toimetajad ja kommentaatorid}% + {toimetajad ja kommentaatorid}}, + editoran = {{toimetaja ja annotator}% + {toimetaja ja annotator}}, + editorsan = {{toimetajad ja annotators}% + {toimetajad ja annotators}}, + editorin = {{toimetaja ja sissejuhatus}% + {toimetaja ja sissejuhatus}}, + editorsin = {{toimetajad ja sissejuhatus}% + {toimetajad ja sissejuhatus}}, + editorfo = {{toimetaja ja eess\~{o}na}% + {toimetaja ja eess\~{o}na}}, + editorsfo = {{toimetajad ja eess\~{o}na}% + {toimetajad ja eess\~{o}na}}, + editoraf = {{toimetaja ja j\"{a}rels\~{o}na}% + {toimetaja ja j\"{a}rels\~{o}na}}, + editorsaf = {{toimetajad ja j\"{a}rels\~{o}na}% + {toimetajad ja j\"{a}rels\~{o}na}}, + editortrco = {{toimetaja, translator\finalandcomma\ ja kommentaator} % + {toim, \addabbrvspace trans\adddot\finalandcomma\ ja comm\adddot}}, + editorstrco = {{toimetajad, translators\finalandcomma\ ja kommentaatorid} % + {eds., \addabbrvspace trans\adddot\finalandcomma\ ja comm\adddot}}, + editortran = {{toimetaja, translator\finalandcomma\ ja annotator} % + {toim, \addabbrvspace trans\adddot\finalandcomma\ ja annot\adddot}}, + editorstran = {{toimetajad, translators\finalandcomma\ ja annotators} % + {eds., \addabbrvspace trans\adddot\finalandcomma\ ja annot\adddot}}, + editortrin = {{toimetaja, translator\finalandcomma\ ja Sissejuhatus} % + {toim, \addabbrvspace trans\adddot\finalandcomma\ ja introd\adddot}}, + editorstrin = {{toimetajad, translators\finalandcomma\ ja Sissejuhatus} % + {eds., \addabbrvspace trans\adddot\finalandcomma\ ja introd\adddot}}, + editortrfo = {{toimetaja, translator\finalandcomma\ ja eess\~{o}na} % + {toim, \addabbrvspace trans\adddot\finalandcomma\ ja forew\adddot}}, + editorstrfo = {{toimetajad, translators\finalandcomma\ ja eess\~{o}na} % + {eds., \addabbrvspace trans\adddot\finalandcomma\ ja forew\adddot}}, + editortraf = {{toimetaja, translator\finalandcomma\ ja J\"{a}rels\~{o}na} % + {toim, \addabbrvspace trans\adddot\finalandcomma\ ja afterw\adddot}}, + editorstraf = {{toimetajad, translators\finalandcomma\ ja J\"{a}rels\~{o}na} % + {eds., \addabbrvspace trans\adddot\finalandcomma\ ja afterw\adddot}}, + editorcoin = {{toimetaja, commentator\finalandcomma\ ja Sissejuhatus} % + {toim, \addabbrvspace comm\adddot\finalandcomma\ ja introd\adddot}}, + editorscoin = {{toimetajad, commentators\finalandcomma\ ja Sissejuhatus} % + {eds., \addabbrvspace comm\adddot\finalandcomma\ ja introd\adddot}}, + editorcofo = {{toimetaja, commentator\finalandcomma\ ja eess\~{o}na} % + {toim, \addabbrvspace comm\adddot\finalandcomma\ ja forew\adddot}}, + editorscofo = {{toimetajad, commentators\finalandcomma\ ja eess\~{o}na} % + {eds., \addabbrvspace comm\adddot\finalandcomma\ ja forew\adddot}}, + editorcoaf = {{toimetaja, commentator\finalandcomma\ ja J\"{a}rels\~{o}na} % + {toim, \addabbrvspace comm\adddot\finalandcomma\ ja afterw\adddot}}, + editorscoaf = {{toimetajad, commentators\finalandcomma\ ja J\"{a}rels\~{o}na} % + {eds., \addabbrvspace comm\adddot\finalandcomma\ ja afterw\adddot}}, + editoranin = {{toimetaja, annotator\finalandcomma\ ja Sissejuhatus} % + {toim, \addabbrvspace annot\adddot\finalandcomma\ ja introd\adddot}}, + editorsanin = {{toimetajad, annotators\finalandcomma\ ja Sissejuhatus} % + {eds., \addabbrvspace annot\adddot\finalandcomma\ ja introd\adddot}}, + editoranfo = {{toimetaja, annotator\finalandcomma\ ja eess\~{o}na} % + {toim, \addabbrvspace annot\adddot\finalandcomma\ ja forew\adddot}}, + editorsanfo = {{toimetajad, annotators\finalandcomma\ ja eess\~{o}na} % + {eds., \addabbrvspace annot\adddot\finalandcomma\ ja forew\adddot}}, + editoranaf = {{toimetaja, annotator\finalandcomma\ ja J\"{a}rels\~{o}na} % + {toim, \addabbrvspace annot\adddot\finalandcomma\ ja afterw\adddot}}, + editorsanaf = {{toimetajad, annotators\finalandcomma\ ja J\"{a}rels\~{o}na} % + {eds., \addabbrvspace annot\adddot\finalandcomma\ ja afterw\adddot}}, + editortrcoin = {{toimetaja, t\~{o}lkija, commentator\finalandcomma\ ja Sissejuhatus} % + {toim, \addabbrvspace trans., comm\adddot\finalandcomma\ ja introd\adddot}}, + editorstrcoin = {{toimetajad, t\~{o}lkijad, commentators\finalandcomma\ ja Sissejuhatus} % + {eds., \addabbrvspace trans., comm\adddot\finalandcomma\ ja introd\adddot}}, + editortrcofo = {{toimetaja, t\~{o}lkija, commentator\finalandcomma\ ja eess\~{o}na} % + {toim, \addabbrvspace trans., comm\adddot\finalandcomma\ ja forew\adddot}}, + editorstrcofo = {{toimetajad, t\~{o}lkijad, commentators\finalandcomma\ ja eess\~{o}na} % + {eds., \addabbrvspace trans., comm\adddot\finalandcomma\ ja forew\adddot}}, + editortrcoaf = {{toimetaja, t\~{o}lkija, commentator\finalandcomma\ ja J\"{a}rels\~{o}na} % + {toim, \addabbrvspace trans., comm\adddot\finalandcomma\ ja afterw\adddot}}, + editorstrcoaf = {{toimetajad, t\~{o}lkijad, commentators\finalandcomma\ ja J\"{a}rels\~{o}na} % + {eds., \addabbrvspace trans., comm\adddot\finalandcomma\ ja afterw\adddot}}, + editortranin = {{toimetaja, t\~{o}lkija, annotator\finalandcomma\ ja Sissejuhatus} % + {toim, \addabbrvspace trans., annot\adddot\finalandcomma\ ja introd\adddot}}, + editorstranin = {{toimetajad, t\~{o}lkijad, annotators\finalandcomma\ ja Sissejuhatus} % + {eds., \addabbrvspace trans., annot\adddot\finalandcomma\ ja introd\adddot}}, + editortranfo = {{toimetaja, t\~{o}lkija, annotator\finalandcomma\ ja eess\~{o}na} % + {toim, \addabbrvspace trans., annot\adddot\finalandcomma\ ja forew\adddot}}, + editorstranfo = {{toimetajad, t\~{o}lkijad, annotators\finalandcomma\ ja eess\~{o}na} % + {eds., \addabbrvspace trans., annot\adddot\finalandcomma\ ja forew\adddot}}, + editortranaf = {{toimetaja, t\~{o}lkija, annotator\finalandcomma\ ja J\"{a}rels\~{o}na} % + {toim, \addabbrvspace trans., annot\adddot\finalandcomma\ ja afterw\adddot}}, + editorstranaf = {{toimetajad, t\~{o}lkijad, annotators\finalandcomma\ ja J\"{a}rels\~{o}na} % + {eds., \addabbrvspace trans., annot\adddot\finalandcomma\ ja afterw\adddot}}, + translatorco = {{t\~{o}lkija ja kommentaator} % + {trans\adddot\ ja comm\adddot}}, + translatorsco = {{t\~{o}lkijate ja kommentaatorid} % + {trans\adddot\ ja comm\adddot}}, + translatoran = {{t\~{o}lkija ja annotator} % + {trans\adddot\ ja annot\adddot}}, + translatorsan = {{t\~{o}lkijate ja annotators} % + {trans\adddot\ ja annot\adddot}}, + translatorin = {{t\~{o}lkimine ja Sissejuhatus} % + {trans\adddot\ ja introd\adddot}}, + translatorsin = {{t\~{o}lkimine ja Sissejuhatus} % + {trans\adddot\ ja introd\adddot}}, + translatorfo = {{t\~{o}lkimine ja eess\~{o}na} % + {trans\adddot\ ja forew\adddot}}, + translatorsfo = {{t\~{o}lkimine ja eess\~{o}na} % + {trans\adddot\ ja forew\adddot}}, + translatoraf = {{t\~{o}lkimine ja J\"{a}rels\~{o}na} % + {trans\adddot\ ja afterw\adddot}}, + translatorsaf = {{t\~{o}lkimine ja J\"{a}rels\~{o}na} % + {trans\adddot\ ja afterw\adddot}}, + translatorcoin = {{t\~{o}lkimine, commentary\finalandcomma\ ja Sissejuhatus} % + {trans., comm\adddot\finalandcomma\ ja introd\adddot}}, + translatorscoin = {{t\~{o}lkimine, commentary\finalandcomma\ ja Sissejuhatus} % + {trans., comm\adddot\finalandcomma\ ja introd\adddot}}, + translatorcofo = {{t\~{o}lkimine, commentary\finalandcomma\ ja eess\~{o}na} % + {trans., comm\adddot\finalandcomma\ ja forew\adddot}}, + translatorscofo = {{t\~{o}lkimine, commentary\finalandcomma\ ja eess\~{o}na} % + {trans., comm\adddot\finalandcomma\ ja forew\adddot}}, + translatorcoaf = {{t\~{o}lkimine, commentary\finalandcomma\ ja J\"{a}rels\~{o}na} % + {trans., comm\adddot\finalandcomma\ ja afterw\adddot}}, + translatorscoaf = {{t\~{o}lkimine, commentary\finalandcomma\ ja J\"{a}rels\~{o}na} % + {trans., comm\adddot\finalandcomma\ ja afterw\adddot}}, + translatoranin = {{t\~{o}lkimine, annotations\finalandcomma\ ja Sissejuhatus} % + {trans., annot\adddot\finalandcomma\ ja introd\adddot}}, + translatorsanin = {{t\~{o}lkimine, annotations\finalandcomma\ ja Sissejuhatus} % + {trans., annot\adddot\finalandcomma\ ja introd\adddot}}, + translatoranfo = {{t\~{o}lkimine, annotations\finalandcomma\ ja eess\~{o}na} % + {trans., annot\adddot\finalandcomma\ ja forew\adddot}}, + translatorsanfo = {{t\~{o}lkimine, annotations\finalandcomma\ ja eess\~{o}na} % + {trans., annot\adddot\finalandcomma\ ja forew\adddot}}, + translatoranaf = {{t\~{o}lkimine, annotations\finalandcomma\ ja J\"{a}rels\~{o}na} % + {trans., annot\adddot\finalandcomma\ ja afterw\adddot}}, + translatorsanaf = {{t\~{o}lkimine, annotations\finalandcomma\ ja J\"{a}rels\~{o}na} % + {trans., annot\adddot\finalandcomma\ ja afterw\adddot}}, + byauthor = {{kirjuttanud}{kirj\adddot}}, + byeditor = {{toimittanud}{toim\adddot}}, + bycompiler = {{koontanud}{koontanud}}, + byredactor = {{redigeeritud poolt}{red\adddotspace poolt}}, + byreviser = {{l\"{a}bivaadatud poolt}{rev\adddotspace poolt}}, + byreviewer = {{vaadanud}{rev\adddotspace poolt}}, + byfounder = {{asutasid}{found\adddotspace poolt}}, + bycontinuator = {{j\"{a}tkas}{cont\adddotspace poolt}}, + bycollaborator = {{koost\"{o}\"{o}s}{in collab\adddotspace koos}}, + bytranslator = {{t\~{o}lgitud \lbx@lfromlang\ poolt}{trans\adddot\ \lbx@sfromlang\ poolt}}, + bycommentator = {{kommentaarin kirjoittanut}{kommentaarin kirjoittanut}},% FIXME: unsure + byannotator = {{selgitustega poolt}{annot\adddot\ poolt}}, + withcommentator = {{koos kommentaariga}{koos comment\adddot\ poolt}}, + withannotator = {{koos annotations poolt}{koos annots\adddot\ poolt}}, + withintroduction = {{koos tutvustus poolt}{koos poolt intro\adddot }}, + withforeword = {{mis eess\~{o}na Autor}{koos forew\adddot\ poolt}}, + withafterword = {{koos J\"{a}rels\~{o}na poolt}{koos poolt afterw\adddot }}, + byeditortr = {{redigeeritud ja t\~{o}lgitud \lbx@lfromlang\ poolt} + {toim\adddotspace ja \lbx@sfromlang k\"a\"ant\adddot}}, + byeditorco = {{toimetatud ja kommenteeritud} % + {ed\adddotspace ja comm\adddot\ poolt}}, + byeditoran = {{redigeerida ja kanda} % + {ed\adddotspace ja annot\adddot\ poolt}}, + byeditorin = {{redigeerida, tutvustus, Autor} % + {toim, \addabbrvspace koos m\~{o}ne introd. esitab}}, + byeditorfo = {{redigeerinud, eess\~{o}na, kus autor} % + {toim, \addabbrvspace koos forew., poolt}}, + byeditoraf = {{redigeerida, j\"{a}rels\~{o}na, Autor} % + {toim, koos m\~{o}ne afterw., \addabbrvspace poolt}}, + byeditortrco = {{toimetatud, \lbx@lfromlang\finalandcomma\ t\~{o}lgitud ja kommenteeritud} % + {toim, \addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ ja comm\adddot\ poolt}}, + byeditortran = {{redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja kanda} % + {toim, \addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ ja annot\adddot\ poolt}}, + byeditortrin = {{edited and translated \lbx@lfromlang, with an introduction, by} % + {ed\adddotspace ja trans\adddot\ \lbx@sfromlang, koos m\~{o}ne introd. esitab}}, + byeditortrfo = {{edited and translated \lbx@lfromlang, with a foreword, by} % + {ed\adddotspace ja trans\adddot\ \lbx@sfromlang, koos forew., poolt}}, + byeditortraf = {{edited and translated \lbx@lfromlang, with an afterword, by} % + {ed\adddotspace ja trans\adddot\ \lbx@sfromlang, koos m\~{o}ne afterw., poolt}}, + byeditorcoin = {{toimetanud ja kommenteerinud koos tutvustus,} % + {ed\adddotspace ja comm., koos m\~{o}ne introd. esitab}}, + byeditorcofo = {{toimetanud ja kommenteerinud mis eess\~{o}na,} % + {ed\adddotspace ja comm., koos forew., poolt}}, + byeditorcoaf = {{toimetanud ja kommenteerinud koos J\"{a}rels\~{o}na,} % + {ed\adddotspace ja comm., koos m\~{o}ne afterw., poolt}}, + byeditoranin = {{redigeerida ja selgitustega koos tutvustus,} % + {ed\adddotspace ja annot., koos m\~{o}ne introd. esitab}}, + byeditoranfo = {{redigeerida ja selgitustega mis eess\~{o}na,} % + {ed\adddotspace ja annot., koos forew., poolt}}, + byeditoranaf = {{redigeerida ja selgitustega koos J\"{a}rels\~{o}na,} % + {ed\adddotspace ja annot., koos m\~{o}ne afterw., poolt}}, + byeditortrcoin = {{redigeerida, \lbx@lfromlang\finalandcomma\ t\~{o}lkinud ja kommenteerinud koos tutvustus,} % + {redigeerida, \lbx@lfromlang\finalandcomma\ t\~{o}lkinud ja kommenteerinud koos tutvustus,}}, + byeditortrcofo = {{redigeerida, \lbx@lfromlang\finalandcomma\ t\~{o}lkinud ja kommenteerinud mis eess\~{o}na,} % + {redigeerida, \lbx@lfromlang\finalandcomma\ t\~{o}lkinud ja kommenteerinud mis eess\~{o}na,}}, + byeditortrcoaf = {{toimetatud, \lbx@lfromlang\finalandcomma\ t\~{o}lgitud ja kommenteeritud koos J\"{a}rels\~{o}na,} % + {toimetatud, \lbx@lfromlang\finalandcomma\ t\~{o}lgitud ja kommenteeritud koos J\"{a}rels\~{o}na,}}, + byeditortranin = {{redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega koos tutvustus,} % + {redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega koos tutvustus,}}, + byeditortranfo = {{redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega mis eess\~{o}na,} % + {redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega mis eess\~{o}na,}}, + byeditortranaf = {{redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega koos J\"{a}rels\~{o}na,} % + {redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega koos J\"{a}rels\~{o}na,}}, + bytranslatorco = {{\lbx@lfromlang\ t\~{o}lgitud ja kommenteeritud} % + {\lbx@lfromlang\ t\~{o}lgitud ja kommenteeritud}}, + bytranslatoran = {{t\~{o}lgitud \lbx@lfromlang\ ja kanda} % + {t\~{o}lgitud \lbx@lfromlang\ ja kanda}}, + bytranslatorin = {{translated \lbx@lfromlang, with an introduction, by} % + {trans\adddot\ \lbx@sfromlang, with an introd., by}}, + bytranslatorfo = {{translated \lbx@lfromlang, with a foreword, by} % + {trans\adddot\ \lbx@sfromlang, with a forew., by}}, + bytranslatoraf = {{translated \lbx@lfromlang, with an afterword, by} % + {trans\adddot\ \lbx@sfromlang, with an afterw., by}}, + bytranslatorcoin = {{\lbx@lfromlang\ t\~{o}lkinud ja kommenteerinud koos tutvustus,} % + {\lbx@lfromlang\ t\~{o}lkinud ja kommenteerinud koos tutvustus,}}, + bytranslatorcofo = {{\lbx@lfromlang\ t\~{o}lkinud ja kommenteerinud mis eess\~{o}na,} % + {\lbx@lfromlang\ t\~{o}lkinud ja kommenteerinud mis eess\~{o}na,}}, + bytranslatorcoaf = {{\lbx@lfromlang\ t\~{o}lkinud ja kommenteerinud koos J\"{a}rels\~{o}na,} % + {\lbx@lfromlang\ t\~{o}lkinud ja kommenteerinud koos J\"{a}rels\~{o}na,}}, + bytranslatoranin = {{t\~{o}lgitud \lbx@lfromlang\ ja selgitustega koos tutvustus,} % + {t\~{o}lgitud \lbx@lfromlang\ ja selgitustega koos tutvustus,}}, + bytranslatoranfo = {{t\~{o}lgitud \lbx@lfromlang\ ja selgitustega mis eess\~{o}na,} % + {t\~{o}lgitud \lbx@lfromlang\ ja selgitustega mis eess\~{o}na,}}, + bytranslatoranaf = {{t\~{o}lgitud \lbx@lfromlang\ ja selgitustega koos J\"{a}rels\~{o}na,} % + {t\~{o}lgitud \lbx@lfromlang\ ja selgitustega koos J\"{a}rels\~{o}na,}}, + and = {{ja}{ja}}, + andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + andmore = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + volume = {{k\"{o}ide}{k\"{o}ide}}, + volumes = {{k\"{o}ided}{k\"{o}idef}}, +% involumes = {{}{}},% FIXME: missing. Finnish translation of "in 5 volumes" is "5 osassa". + jourvol = {{k\"{o}ide}{k\"{o}ide}}, + jourser = {{seeria}{seeria}}, + book = {{raamat}{raamat}}, + part = {{osa}{osa}}, + issue = {{numero}{numero}}, + newseries = {{uues series}{uue ser\adddot}}, + oldseries = {{vana seeria}{vana ser\adddot}}, + edition = {{v\"{a}ljaanne}{v\"{a}ljaanne}}, + reprint = {{kordustr\"{u}kk}{kordustr\"{u}kk}}, + reprintof = {{kordustr\"{u}kk ning}{kordustr\"{u}kk ning}}, + reprintas = {{kordustr\"{u}kk nagu}{kordustr\"{u}kk nagu}}, + reprintfrom = {{kordustr\"{u}kk alates}{kordustr\"{u}kk alates}}, + reviewof = {{vahekokkuv\~{o}tte}{vahekokkuv\~{o}tte}}, + translationof = {{t\~{o}lkimine}{t\~{o}lkimine}}, + translationas = {{t\~{o}lkida kui}{t\~{o}lkida kui}}, + translationfrom = {{t\~{o}lgitud}{t\~{o}lgitud}}, + origpubas = {{algselt avaldatud nagu}{algselt avaldatud nagu}}, + origpubin = {{algselt avaldatud}{algselt avaldatud}}, + astitle = {{j\"{a}rgnevatest}{j\"{a}rgnevatest}}, + bypublisher = {{julkaissut}{julkaissut}}, + page = {{lehek\"{u}lja}{l\adddot}}, + pages = {{lehek\"{u}ljed}{l\adddot}}, + column = {{veerg}{veerg}}, + columns = {{veerud}{veerud}}, + line = {{rida}{rida}}, + lines = {{ridad}{ridad}}, + nodate = {{kuup\"{a}ev puudub}}, + verse = {{salm}{salm}}, + verses = {{salmid}{salmid}}, + section = {{jagu}{jagu}}, + sections = {{kohdat}{kohdat}}, + paragraph = {{kappale}{kappale}}, + paragraphs = {{kappaleet}{kappaleet}}, + in = {{teoksessa}{teoksessa}}, + inseries = {{sarjassa}{sarjassa}}, + ofseries = {{sarjassa}{sarjassa}}, + number = {{arv}{arv}}, + chapter = {{peat\"{u}kk}{peat\"{u}kk}}, + mathesis = {{magistrit\"{o}\"{o}}{magistrit\"{o}\"{o}}}, + phdthesis = {{doktorit\"{o}\"{o}}{doktorit\"{o}\"{o}}}, + candthesis = {{kandidaadi v\"{a}itekirja}{kandidaadi v\"{a}itekirja}},% Literal translation of "Candidate thesis". + resreport = {{tutkimusraportti}{tutkimusraportti}}, + techreport = {{uuringute raport}{uuringute raport}}, + software = {{tarkvara}{tarkvara}}, + datacd = {{CD-ROM}{CD-ROM}}, + audiocd = {{audio CD}{audio CD}}, + version = {{versioon}{versioon}}, + url = {{aadress}{aadress}}, + urlfrom = {{saadaval}{saadaval}}, + urlseen = {{k\"{u}lastas}{k\"{u}lastas}}, + inpreparation = {{ettevalmistamisel}{ettevalmistamisel}}, + submitted = {{esitatud}{esitatud}}, + forthcoming = {{tulevases}{tulevases}}, + inpress = {{ajakirjanduses}{ajakirjanduses}}, + prepublished = {{eelnevalt avaldatud} {eelnevalt avaldatud}}, + citedas = {{edaspidi viidatud kui}{edaspidi viidatud kui}}, + thiscite = {{eriti}{eriti}}, + seenote = {{vaata m\"{a}rkus}{vaata m\"{a}rkus}}, + quotedin = {{noteeritud}{noteeritud}}, + idem = {{idem}{idem}}, % It its not necessary to translate Latin phrases. + idemsm = {{idem}{idem}}, + idemsf = {{eadem}{eadem}}, + idemsn = {{idem}{idem}}, + idempm = {{eidem}{eidem}}, + idempf = {{eaedem}{eaedem}}, + idempn = {{eadem}{eadem}}, + idempp = {{eidem}{eidem}}, + ibidem = {{ibidem}{ibid\adddot}}, + opcit = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}}, + loccit = {{loc\adddotspace cit\adddot}{loc\adddotspace cit\adddot}}, + confer = {{cf\adddot}{cf\adddot}}, + sequens = {{sq\adddot}{sq\adddot}}, + sequentes = {{sqq\adddot}{sqq\adddot}}, + passim = {{passim}{pass\adddot}}, + see = {{vaata}{vaata}}, + seealso = {{allikad}{allikad}}, + backrefpage = {{viidatud lehel}{viidatud lehel}}, + backrefpages = {{viidatud lehek\"{u}ljed}{viidatud lehek\"{u}ljed}}, + january = {{jaanuar}{jaanuar}}, + february = {{veebruar}{veebruar}}, + march = {{m\"{a}rts}{m\"{a}rts}}, + april = {{aprill}{aprill}}, + may = {{mai}{mai}}, + june = {{juuni}{juuni}}, + july = {{juuli}{juuli}}, + august = {{august}{august}}, + september = {{september}{september}}, + october = {{oktoober}{oktoober}}, + november = {{november}{november}}, + december = {{detsember}{detsember}}, + basicjanuary = {{jaanuar}{jaanuar}}, + basicfebruary = {{veebruar}{veebruar}}, + basicmarch = {{m\"{a}rts}{m\"{a}rts}}, + basicapril = {{aprill}{aprill}}, + basicmay = {{mai}{mai}}, + basicjune = {{juuni}{juuni}}, + basicjuly = {{juuli}{juuli}}, + basicaugust = {{august}{august}}, + basicseptember = {{september}{september}}, + basicoctober = {{oktoober}{oktoober}}, + basicnovember = {{november}{november}}, + basicdecember = {{detsember}{detsember}}, + langamerican = {{Ameerika}{Ameerika}}, + langbrazilian = {{Brasiilia}{Brasiilia}}, + langcatalan = {{katalaani}{katalaani}}, + langcroatian = {{horvaadi}{horvaadi}}, + langczech = {{t\v{s}ehhii}{t\v{s}ehhii}}, + langdanish = {{taani}{taani}}, + langdutch = {{hollandi}{hollandi}}, + langenglish = {{inglise}{inglise}}, + langestonian = {{eesti}{eesti}}, + langfinnish = {{soome}{soome}}, + langfrench = {{prantsuse}{prantsuse}}, + langgerman = {{saksa}{saksa}}, + langgreek = {{kreeka}{kreeka}}, + langitalian = {{itaalia}{itaalia}}, + langlatin = {{ladina}{ladina}}, + langnorwegian = {{norra}{norra}}, + langpolish = {{poola}{poola}}, + langportuguese = {{portugali}{portugali}}, + langrussian = {{vene}{vene}}, + langslovene = {{sloveeni}{sloveeni}}, + langspanish = {{hispaania}{hispaania}}, + langswedish = {{rootsi}{rootsi}}, + fromamerican = {{alates USA}{alates USA}}, + frombrazilian = {{alates Brasiilia}{: Brasiilia}}, + fromcatalan = {{alates katalaani}{: Catalan}}, + fromcroatian = {{alates horvaadi}{: Horvaatia}}, + fromczech = {{alates T\v{s}ehhi}{: T\v{s}ehhi}}, + fromdanish = {{Taani}{alates Taani}}, + fromdutch = {{alates Hollandi}{: Hollandi}}, + fromenglish = {{ingliskeelsest}{ingliskeelsest}}, + fromestonian = {{eesti kielest\"a}{eesti kielest\"a}}, + fromfinnish = {{Soome}{alates Soome}}, + fromfrench = {{alates Prantsuse}{alates prantsuse}}, + fromgerman = {{, saksa keeles}{: Saksa}}, + fromgreek = {{alates Kreeka}{alates Kreeka}}, + fromitalian = {{alates Itaalia}{: Itaalia}}, + fromlatin = {{alates Ladina}{: Ladina}}, + fromnorwegian = {{alates Norra}{: Norra}}, + frompolish = {{alates Poola} {alates Poola}}, + fromportuguese = {{alates Portugali}{: Portugali}}, + fromrussian = {{alates Vene}{: vene}}, + fromslovene = {{alates sloveeni}{: sloveeni}}, + fromspanish = {{alates Hispaania}{alates Hispaania}}, + fromswedish = {{alates Rootsi}{: Rootsi}}, + countryde = {{Saksamaa}{DE}}, + countryeu = {{Euroopa Liit}{EL}}, + countryep = {{Euroopa Liidu}{EP}}, + countryfr = {{Prantsusmaa}{FR}}, + countryuk = {{Suurbritannia}{GB}}, + countryus = {{Ameerika}{US}}, + patent = {{patendi}{pat\adddot}}, + patentde = {{Saksa patendi}{Saksa pat\adddot}}, + patenteu = {{Euroopa patendi}{Euroopa pat\adddot}}, + patentfr = {{Prantsuse patent}{Prantsuse pat\adddot}}, + patentuk = {{Briti patendi}{Briti pat\adddot}}, + patentus = {{U.S\adddotspace patent}{U.S\adddotspace pat\adddot}}, + patreq = {{patendi taotluse}{pat\adddot\ req\adddot}}, + patreqde = {{Saksa patendi taotluse}{Saksa pat\adddot\ req\adddot}}, + patreqeu = {{Euroopa patendi taotluse}{Euroopa pat\adddot\ req\adddot}}, + patreqfr = {{Prantsuse patent taotluse}{Prantsuse pat\adddot\ req\adddot}}, + patrequk = {{Briti patendi taotluse}{Briti pat\adddot\ req\adddot}}, + patrequs = {{U.S\adddotspace patent request}{U.S\adddotspace pat\adddot\ req\adddot}}, + file = {{faili}{faili}}, + library = {{raamatukogu}{raamatukogu}}, + abstract = {{abstraktne}{abstraktne}}, + annotation = {{annotatsioon}{annotatsioon}}, + commonera = {{meie ajaarvamise j\"argi}{m\adddot a\adddot j}}, + beforecommonera = {{enne meie ajaarvamist}{e\adddot m\adddot a}}, + annodomini = {{p\"arast Kristust}{pKr}}, + beforechrist = {{enne Kristust}{eKr}}, +% circa = {{}{}},% FIXME: missing +% spring = {{}{}},% FIXME: missing +% summer = {{}{}},% FIXME: missing +% autumn = {{}{}},% FIXME: missing +% winter = {{}{}},% FIXME: missing + am = {{AM}{AM}}, + pm = {{PM}{PM}}, +} + +\protected\gdef\lbx@fi@mkbibmonthbasic#1{% + \ifcase0#1\relax + #1\BibliographyWarning{Month out of range}% + \or\abx@bibmonth{basicjanuary}% + \or\abx@bibmonth{basicfebruary}% + \or\abx@bibmonth{basicmarch}% + \or\abx@bibmonth{basicapril}% + \or\abx@bibmonth{basicmay}% + \or\abx@bibmonth{basicjune}% + \or\abx@bibmonth{basicjuly}% + \or\abx@bibmonth{basicaugust}% + \or\abx@bibmonth{basicseptember}% + \or\abx@bibmonth{basicoctober}% + \or\abx@bibmonth{basicnovember}% + \or\abx@bibmonth{basicdecember}% + \else + #1\BibliographyWarning{Month out of range}% + \fi}% + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx index 9d35ba43d07..6b987a3127d 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx @@ -28,7 +28,6 @@ % dashes: may be either \textendash or \textemdash \protected\def\bibrangedash{% \textendash\penalty\hyphenpenalty}% breakable dash - \protected\def\bibdatedash{\bibrangedash}% \let\finalandcomma=\empty \let\finalandsemicolon=\empty \protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}% @@ -47,19 +46,23 @@ \iffieldundef{#1}{}{\space}}% {\mkbibmonth{\thefield{#2}}% \iffieldundef{#1}{}{\space}}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% \protected\def\mkbibdateshort#1#2#3{% \iffieldundef{#3} {} - {\mkdatezeros{\thefield{#3}}\adddot + {\mkdayzeros{\thefield{#3}}\adddot \iffieldundef{#2}{}{\thinspace}}% \iffieldundef{#2} {} - {\mkdatezeros{\thefield{#2}}% + {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#1} {} {\iffieldundef{#3}{/}{\adddot\thinspace}}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% \savecommand\lbx@lfromlang \savecommand\lbx@sfromlang \def\lbx@lfromlang{% @@ -75,6 +78,38 @@ \iffieldequalstr{entrytype}{article} {} {\printtext{\bibstring{in}\intitlepunct}}}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } \UndeclareBibliographyExtras{% @@ -449,6 +484,7 @@ langdanish = {{tanska}{tanska}}, langdutch = {{hollanti}{hollanti}}, langenglish = {{englanti}{englanti}}, +% langestonian = {{}{}},% FIXME: missing langfinnish = {{suomi}{suomi}}, langfrench = {{ranska}{ranska}}, langgerman = {{saksa}{saksa}}, @@ -470,6 +506,7 @@ fromdanish = {{tanskan kielest\"a}{tanskan kielest\"a}}, fromdutch = {{hollannin kielest\"a}{hollannin kielest\"a}}, fromenglish = {{englannin kielest\"a}{englannin kielest\"a}}, +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{suomen kielest\"a}{suomen kielest\"a}}, fromfrench = {{ranskan kielest\"a}{ranskan kielest\"a}}, fromgerman = {{saksan kielest\"a}{saksan kielest\"a}}, @@ -505,6 +542,17 @@ library = {{kirjasto}{kirjasto}}, abstract = {{tiivistelm\"a}{tiivistelm\"a}}, annotation = {{selitykset}{selitykset}},% FIXME: unsure + commonera = {{j\"alkeen ajanlaskun alun}{jaa\adddot}}, + beforecommonera = {{ennen ajanlaskun alkua}{eaa\adddot}}, + annodomini = {{j\"alkeen Kristuksen syntym\"an}{jKr\adddot}}, + beforechrist = {{ennen Kristuksen syntym\"a\"a}{eKr\adddot}}, +% circa = {{}{}},% FIXME: missing +% spring = {{}{}},% FIXME: missing +% summer = {{}{}},% FIXME: missing +% autumn = {{}{}},% FIXME: missing +% winter = {{}{}},% FIXME: missing + am = {{ap\adddot}{ip\adddot}}, + pm = {{ap\adddot}{ip\adddot}}, } \protected\gdef\lbx@fi@mkbibmonthbasic#1{% diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx index 298d948840b..becb278054c 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx @@ -8,7 +8,6 @@ \DeclareBibliographyExtras{% \protected\def\bibrangedash{% \textendash\penalty\hyphenpenalty}% breakable dash - \protected\def\bibdatedash{\bibrangedash}% \let\finalandcomma=\empty \let\finalandsemicolon=\empty \def\mkbibordinal{\mkbibmascord}% @@ -27,17 +26,21 @@ {} {\mkbibmonth{\thefield{#2}}% \iffieldundef{#1}{}{\space}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% \protected\def\mkbibdateshort#1#2#3{% \iffieldundef{#3} {} - {\mkdatezeros{\thefield{#3}}% + {\mkdayzeros{\thefield{#3}}% \iffieldundef{#2}{}{/}}% \iffieldundef{#2} {} - {\mkdatezeros{\thefield{#2}}% + {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#1}{}{/}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% \providecommand*{\FDP@thinspace}{\addnbthinspace}% FDP@* -> frenchb.ldf (babel) \providecommand*{\FDP@colonspace}{\addnbspace}% \def\abx@semicolon{% @@ -63,6 +66,38 @@ \textsc{\textnohyphenation{#1}}}% \def\mkbibordedition{\mkbibfemord}% \def\mkbibordseries{\mkbibfemord}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } \UndeclareBibliographyExtras{% @@ -426,6 +461,7 @@ langdanish = {{danois}{danois}}, langdutch = {{n\'eerlandais}{n\'eerlandais}}, langenglish = {{anglais}{anglais}}, +% langestonian = {{}{}},% FIXME: missing langfinnish = {{finnois}{finnois}}, langfrench = {{fran\c{c}ais}{fran\c{c}ais}}, langgerman = {{allemand}{allemand}}, @@ -447,6 +483,7 @@ fromdanish = {{du danois}{du danois}}, fromdutch = {{du n\'eerlandais}{du n\'eerlandais}}, fromenglish = {{de l'anglais}{de l'anglais}}, +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{du finnois}{du finnois}}, fromfrench = {{du fran\c{c}ais}{du fran\c{c}ais}}, fromgerman = {{de l'allemand}{de l'allemand}}, @@ -482,6 +519,17 @@ 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}}, + annodomini = {{apr\`es J\'esus-Christ}{ap\adddotspace J\adddot-C\adddot}}, + beforechrist = {{avant J\'esus-Christ}{av\adddotspace J\adddot-C\adddot}}, +% circa = {{}{}},% FIXME: missing +% spring = {{}{}},% FIXME: missing +% summer = {{}{}},% FIXME: missing +% autumn = {{}{}},% FIXME: missing +% winter = {{}{}},% FIXME: missing + am = {{AM}{AM}}, + pm = {{PM}{PM}}, } \gdef\lbx@fr@ordinal#1#2{% diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx index c5abfb2baba..8d485fde33d 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx @@ -7,7 +7,6 @@ \DeclareCapitalPunctuation{.:!?}% \protected\def\bibrangedash{% \textendash\penalty\hyphenpenalty}% breakable dash - \protected\def\bibdatedash{\bibrangedash}% \let\finalandcomma=\empty \let\finalandsemicolon=\empty \protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}% @@ -23,19 +22,23 @@ {} {\mkbibmonth{\thefield{#2}}% \iffieldundef{#1}{}{\space}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% \protected\def\mkbibdateshort#1#2#3{% \iffieldundef{#3} {} - {\mkdatezeros{\thefield{#3}}\adddot + {\mkdayzeros{\thefield{#3}}\adddot \iffieldundef{#2}{}{\thinspace}}% \iffieldundef{#2} {} - {\mkdatezeros{\thefield{#2}}% + {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#1} {} {\iffieldundef{#3}{/}{\adddot\thinspace}}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% \savecommand\lbx@lfromlang \savecommand\lbx@sfromlang \def\lbx@lfromlang{% @@ -46,6 +49,38 @@ \iffieldundef{origlanguage} {} {\bibstring{from\thefield{origlanguage}}\space}}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } \UndeclareBibliographyExtras{% @@ -59,24 +94,24 @@ shorthands = {{Sigelverzeichnis}{Sigel}}, editor = {{Herausgeber}{Hrsg\adddot}}, editors = {{Herausgeber}{Hrsg\adddot}}, - compiler = {{Herausgeber}{Hrsg\adddot}}, - compilers = {{Herausgeber}{Hrsg\adddot}}, + compiler = {{Kompilator}{Komp\adddot}}, + compilers = {{Kompilatoren}{Komp\adddot}}, redactor = {{Bearbeiter}{Bearb\adddot}}, redactors = {{Bearbeiter}{Bearb\adddot}}, reviser = {{\"Uberarbeiter}{\"Uberarb\adddot}}, revisers = {{\"Uberarbeiter}{\"Uberarb\adddot}}, founder = {{Begr\"under}{Begr\adddot}}, founders = {{Begr\"under}{Begr\adddot}}, - continuator = {{Fortf\"urung}{Fortf\adddot}}, - continuators = {{Fortf\"urung}{Fortf\adddot}}, - collaborator = {{Mitarbeit}{Mitarb\adddot}}, - collaborators = {{Mitarbeit}{Mitarb\adddot}}, + continuator = {{Fortf\"uhrer}{Fortf\adddot}}, + continuators = {{Fortf\"uhrer}{Fortf\adddot}}, + collaborator = {{Mitarbeiter}{Mitarb\adddot}}, + collaborators = {{Mitarbeiter}{Mitarb\adddot}}, translator = {{\"Ubersetzer}{\"Ubers\adddot}}, translators = {{\"Ubersetzer}{\"Ubers\adddot}}, - commentator = {{Kommentar}{Komm\adddot}}, - commentators = {{Kommentar}{Komm\adddot}}, - annotator = {{Erl\"auterungen}{Erl\"aut\adddot}}, - annotators = {{Erl\"auterungen}{Erl\"aut\adddot}}, + commentator = {{Kommentator}{Komm\adddot}}, + commentators = {{Kommentatoren}{Komm\adddot}}, + annotator = {{Kommentator}{Komm\adddot}}, + annotators = {{Kommentatoren}{Komm\adddot}}, commentary = {{Kommentar}{Komm\adddot}}, annotations = {{Erl\"auterungen}{Erl\"aut\adddot}}, introduction = {{Einleitung}{Einl\adddot}}, @@ -86,93 +121,93 @@ {Hrsg\adddot\ und \"Ubers\adddot}}, editorstr = {{Herausgeber und \"Ubersetzer}% {Hrsg\adddot\ und \"Ubers\adddot}}, - editorco = {{Herausgeber und Kommentar}% + editorco = {{Herausgeber und Kommentator}% {Hrsg\adddot\ und Komm\adddot}}, - editorsco = {{Herausgeber und Kommentar}% + editorsco = {{Herausgeber und Kommentatoren}% {Hrsg\adddot\ und Komm\adddot}}, - editoran = {{Herausgeber und Erl\"auterungen}% - {Hrsg\adddot\ und Erl\"aut\adddot}}, - editorsan = {{Herausgeber und Erl\"auterungen}% - {Hrsg\adddot\ und Erl\"aut\adddot}}, - editorin = {{Herausgeber und Einleitung}% + editoran = {{Herausgeber und Kommentator}% + {Hrsg\adddot\ und Komm\adddot}}, + editorsan = {{Herausgeber und Kommentatoren}% + {Hrsg\adddot\ und Komm\adddot}}, + editorin = {{Herausgabe und Einleitung}% {Hrsg\adddot\ und Einl\adddot}}, editorsin = {{Herausgeber und Einleitung}% {Hrsg\adddot\ und Einl\adddot}}, editorfo = {{Herausgeber und Vorwort}% {Hrsg\adddot\ und Vorw\adddot}}, - editorsfo = {{Herausgeber und Vorwort}% + editorsfo = {{Herausgabe und Vorwort}% {Hrsg\adddot\ und Vorw\adddot}}, - editoraf = {{Herausgeber und Nachwort}% + editoraf = {{Herausgabe und Nachwort}% {Hrsg\adddot\ und Nachw\adddot}}, - editorsaf = {{Herausgeber und Nachwort}% + editorsaf = {{Herausgabe und Nachwort}% {Hrsg\adddot\ und Nachw\adddot}}, - editortrco = {{Herausgeber, \"Ubersetzer und Kommentar}% + editortrco = {{Herausgeber, \"Ubersetzer und Kommentator}% + {Hrsg., \"Ubers\adddot\ und Komm\adddot}}, + editorstrco = {{Herausgeber, \"Ubersetzer und Kommentatoren}% + {Hrsg., \"Ubers\adddot\ und Komm\adddot}}, + editortran = {{Herausgeber, \"Ubersetzer und Kommentator}% {Hrsg., \"Ubers\adddot\ und Komm\adddot}}, - editorstrco = {{Herausgeber, \"Ubersetzer und Kommentar}% + editorstran = {{Herausgeber, \"Ubersetzer und Kommentatoren}% {Hrsg., \"Ubers\adddot\ und Komm\adddot}}, - editortran = {{Herausgeber, \"Ubersetzer und Erl\"auterungen}% - {Hrsg., \"Ubers\adddot\ und Erl\"aut\adddot}}, - editorstran = {{Herausgeber, \"Ubersetzer und Erl\"auterungen}% - {Hrsg., \"Ubers\adddot\ und Erl\"aut\adddot}}, - editortrin = {{Herausgeber, \"Ubersetzer und Einleitung}% + editortrin = {{Herausgabe, \"Ubersetzung und Einleitung}% {Hrsg., \"Ubers\adddot\ und Einl\adddot}}, - editorstrin = {{Herausgeber, \"Ubersetzer und Einleitung}% + editorstrin = {{Herausgabe, \"Ubersetzung und Einleitung}% {Hrsg., \"Ubers\adddot\ und Einl\adddot}}, - editortrfo = {{Herausgeber, \"Ubersetzer und Vorwort}% + editortrfo = {{Herausgabe, \"Ubersetzung und Vorwort}% {Hrsg., \"Ubers\adddot\ und Vorw\adddot}}, - editorstrfo = {{Herausgeber, \"Ubersetzer und Vorwort}% + editorstrfo = {{Herausgabe, \"Ubersetzung und Vorwort}% {Hrsg., \"Ubers\adddot\ und Vorw\adddot}}, - editortraf = {{Herausgeber, \"Ubersetzer und Nachwort}% + editortraf = {{Herausgabe, \"Ubersetzung und Nachwort}% {Hrsg., \"Ubers\adddot\ und Nachw\adddot}}, - editorstraf = {{Herausgeber, \"Ubersetzer und Nachwort}% + editorstraf = {{Herausgabe, \"Ubersetzung und Nachwort}% {Hrsg., \"Ubers\adddot\ und Nachw\adddot}}, - editorcoin = {{Herausgeber, Kommentar und Einleitung}% + editorcoin = {{Herausgabe, Kommentar und Einleitung}% {Hrsg., Komm\adddot\ und Einl\adddot}}, - editorscoin = {{Herausgeber, Kommentar und Einleitung}% + editorscoin = {{Herausgabe, Kommentar und Einleitung}% {Hrsg., Komm\adddot\ und Einl\adddot}}, - editorcofo = {{Herausgeber, Kommentar und Vorwort}% + editorcofo = {{Herausgabe, Kommentar und Vorwort}% {Hrsg., Komm\adddot\ und Vorw\adddot}}, - editorscofo = {{Herausgeber, Kommentar und Vorwort}% + editorscofo = {{Herausgabe, Kommentar und Vorwort}% {Hrsg., Komm\adddot\ und Vorw\adddot}}, - editorcoaf = {{Herausgeber, Kommentar und Nachwort}% + editorcoaf = {{Herausgabe, Kommentar und Nachwort}% {Hrsg., Komm\adddot\ und Nachw\adddot}}, - editorscoaf = {{Herausgeber, Kommentar und Nachwort}% + editorscoaf = {{Herausgabe, Kommentar und Nachwort}% {Hrsg., Komm\adddot\ und Nachw\adddot}}, - editoranin = {{Herausgeber, Erl\"auterungen und Einleitung}% + editoranin = {{Herausgabe, Erl\"auterungen und Einleitung}% {Hrsg., Erl\"aut\adddot\ und Einl\adddot}}, - editorsanin = {{Herausgeber, Erl\"auterungen und Einleitung}% + editorsanin = {{Herausgabe, Erl\"auterungen und Einleitung}% {Hrsg., Erl\"aut\adddot\ und Einl\adddot}}, - editoranfo = {{Herausgeber, Erl\"auterungen und Vorwort}% + editoranfo = {{Herausgabe, Erl\"auterungen und Vorwort}% {Hrsg., Erl\"aut\adddot\ und Vorw\adddot}}, - editorsanfo = {{Herausgeber, Erl\"auterungen und Vorwort}% + editorsanfo = {{Herausgabe, Erl\"auterungen und Vorwort}% {Hrsg., Erl\"aut\adddot\ und Vorw\adddot}}, - editoranaf = {{Herausgeber, Erl\"auterungen und Nachwort}% + editoranaf = {{Herausgabe, Erl\"auterungen und Nachwort}% {Hrsg., Erl\"aut\adddot\ und Nachw\adddot}}, - editorsanaf = {{Herausgeber, Erl\"auterungen und Nachwort}% + editorsanaf = {{Herausgabe, Erl\"auterungen und Nachwort}% {Hrsg., Erl\"aut\adddot\ und Nachw\adddot}}, - editortrcoin = {{Herausgeber, \"Ubersetzer, Kommentar und Einleitung}% + editortrcoin = {{Herausgabe, \"Ubersetzung, Kommentar und Einleitung}% {Hrsg., \"Ubers., Komm\adddot\ und Einl\adddot}}, - editorstrcoin = {{Herausgeber, \"Ubersetzer, Kommentar und Einleitung}% + editorstrcoin = {{Herausgabe, \"Ubersetzung, Kommentar und Einleitung}% {Hrsg., \"Ubers., Komm\adddot\ und Einl\adddot}}, - editortrcofo = {{Herausgeber, \"Ubersetzer, Kommentar und Vorwort}% + editortrcofo = {{Herausgabe, \"Ubersetzung, Kommentar und Vorwort}% {Hrsg., \"Ubers., Komm\adddot\ und Vorw\adddot}}, - editorstrcofo = {{Herausgeber, \"Ubersetzer, Kommentar und Vorwort}% + editorstrcofo = {{Herausgabe, \"Ubersetzung, Kommentar und Vorwort}% {Hrsg., \"Ubers., Komm\adddot\ und Vorw\adddot}}, - editortrcoaf = {{Herausgeber, \"Ubersetzer, Kommentar und Nachwort}% + editortrcoaf = {{Herausgabe, \"Ubersetzung, Kommentar und Nachwort}% {Hrsg., \"Ubers., Komm\adddot\ und Nachw\adddot}}, - editorstrcoaf = {{Herausgeber, \"Ubersetzer, Kommentar und Nachwort}% + editorstrcoaf = {{Herausgabe, \"Ubersetzung, Kommentar und Nachwort}% {Hrsg., \"Ubers., Komm\adddot\ und Nachw\adddot}}, - editortranin = {{Herausgeber, \"Ubersetzer, Erl\"auterungen und Einleitung}% + editortranin = {{Herausgabe, \"Ubersetzung, Erl\"auterungen und Einleitung}% {Hrsg., \"Ubers., Erl\"aut\adddot\ und Einl\adddot}}, - editorstranin = {{Herausgeber, \"Ubersetzer, Erl\"auterungen und Einleitung}% + editorstranin = {{Herausgabe, \"Ubersetzung, Erl\"auterungen und Einleitung}% {Hrsg., \"Ubers., Erl\"aut\adddot\ und Einl\adddot}}, - editortranfo = {{Herausgeber, \"Ubersetzer, Erl\"auterungen und Vorwort}% + editortranfo = {{Herausgabe, \"Ubersetzung, Erl\"auterungen und Vorwort}% {Hrsg., \"Ubers., Erl\"aut\adddot\ und Vorw\adddot}}, - editorstranfo = {{Herausgeber, \"Ubersetzer, Erl\"auterungen und Vorwort}% + editorstranfo = {{Herausgabe, \"Ubersetzung, Erl\"auterungen und Vorwort}% {Hrsg., \"Ubers., Erl\"aut\adddot\ und Vorw\adddot}}, - editortranaf = {{Herausgeber, \"Ubersetzer, Erl\"auterungen und Nachwort}% + editortranaf = {{Herausgabe, \"Ubersetzung, Erl\"auterungen und Nachwort}% {Hrsg., \"Ubers., Erl\"aut\adddot\ und Nachw\adddot}}, - editorstranaf = {{Herausgeber, \"Ubersetzer, Erl\"auterungen und Nachwort}% + editorstranaf = {{Herausgabe, \"Ubersetzung, Erl\"auterungen und Nachwort}% {Hrsg., \"Ubers., Erl\"aut\adddot\ und Nachw\adddot}}, translatorco = {{\"Ubersetzung und Kommentar}% {\"Ubers\adddot\ und Komm\adddot}}, @@ -223,7 +258,7 @@ bycompiler = {{kompiliert von}{komp\adddotspace von}}, byredactor = {{bearbeitet von}{bearb\adddotspace von}}, byreviser = {{\"uberarbeitet von}{\"uberarb\adddotspace von}}, -% byreviewer = {{}{}},% FIXME: missing + byreviewer = {{rezensiert von}{rez\adddotspace von}}, byfounder = {{begr\"undet von}{begr\adddotspace von}}, bycontinuator = {{fortgef\"urt von}{fortgef\adddotspace von}}, bycollaborator = {{unter Mitarbeit von}{unter Mitarb\adddotspace von}}, @@ -308,7 +343,7 @@ andmore = {{u.\,a\adddot}{u.\,a\adddot}}, volume = {{Band}{Bd\adddot}}, volumes = {{B\"ande}{Bde\adddot}}, - involumes = {{in}{in}},% FIXME: unsure + involumes = {{in}{in}}, jourvol = {{Jahrgang}{Jg\adddot}}, jourser = {{Serie}{Ser\adddot}}, book = {{Buch}{Buch}}, @@ -320,15 +355,15 @@ reprint = {{Nachdruck}{Nachdr\adddot}}, reprintof = {{Nachdruck von}{Nachdr\adddotspace von}}, reprintas = {{Nachdruck unter dem Titel}{Nachdr\adddotspace unter dem Titel}}, -% reprintfrom = {{}{}},% FIXME: missing -% translationof = {{}{}},% FIXME: missing -% translationas = {{}{}},% FIXME: missing + reprintfrom = {{Nachdruck aus}{Nachdr\adddotspace aus}}, + translationof = {{\"Ubersetzung von}{\"Ubers\adddotspace von}}, + translationas = {{\"Ubersetzt unter dem Titel}{\"Ubers\adddotspace unter dem Titel}}, % translationfrom = {{}{}},% FIXME: missing -% reviewof = {{}{}},% FIXME: missing -% origpubas = {{}{}},% FIXME: missing -% origpubin = {{}{}},% FIXME: missing -% astitle = {{}{}},% FIXME: missing -% bypublisher = {{}{}},% FIXME: missing + reviewof = {{Rezension von}{Rez\adddotspace von}}, + origpubas = {{Zuerst publiziert als}{Zuerst publ\adddotspace als}}, + origpubin = {{Zuerst publiziert in}{Zuerst publ\adddotspace in}}, + astitle = {{unter dem Titel}{unter dem Titel}}, + bypublisher = {{von}{von}}, page = {{Seite}{S\adddot}}, pages = {{Seiten}{S\adddot}}, column = {{Spalte}{Sp\adddot}}, @@ -349,7 +384,7 @@ chapter = {{Kapitel}{Kap\adddot}}, mathesis = {{Magisterarbeit}{Magisterarb\adddot}}, phdthesis = {{Dissertation}{Diss\adddot}}, -% candthesis = {{}{}},% FIXME: missing + candthesis = {{Qualifikationsschrift}{Qualifikationsschr\adddot}}, resreport = {{Forschungsbericht}{Forschungsber\adddot}}, techreport = {{Technischer Bericht}{Techn\adddotspace Ber\adddot}}, software = {{Com\-pu\-ter-Soft\-ware}{Soft\-ware}}, @@ -357,7 +392,7 @@ audiocd = {{Audio-CD}{Audio-CD}}, version = {{Version}{Version}}, url = {{Adresse}{Adresse}}, -% urlfrom = {{}{}},% FIXME: missing + urlfrom = {{Abgerufen unter}{Abger\adddotspace unter}}, urlseen = {{besucht am}{besucht am}}, inpreparation = {{in Vorbereitung}{in Vorbereitung}}, submitted = {{eingereicht}{eingereicht}}, @@ -401,9 +436,9 @@ december = {{Dezember}{Dez\adddot}}, langamerican = {{Amerikanisch}{Amerikanisch}}, langbrazilian = {{Brasilianisch}{Brasilianisch}}, -% langcatalan = {{}{}},% FIXME: missing + langcatalan = {{Katalanisch}{Katalanisch}}, langcroatian = {{Kroatisch}{Kroatisch}}, -% langczech = {{}{}},% FIXME: missing + langczech = {{Tschechisch}{Tschechisch}}, langdanish = {{D\"anisch}{D\"anisch}}, langdutch = {{Niederl\"andisch}{Niederl\"andisch}}, langenglish = {{Englisch}{Englisch}}, @@ -414,17 +449,17 @@ langitalian = {{Italienisch}{Italienisch}}, langlatin = {{Lateinisch}{Lateinisch}}, langnorwegian = {{Norwegisch}{Norwegisch}}, -% langpolish = {{}{}},% FIXME: missing + langpolish = {{Polnisch}{Polnisch}}, langportuguese = {{Portugiesisch}{Portugiesisch}}, langrussian = {{Russisch}{Russisch}}, -% langslovene = {{}{}},% FIXME: missing + langslovene = {{Slowenisch}{Slowenisch}}, langspanish = {{Spanisch}{Spanisch}}, langswedish = {{Schwedisch}{Schwedisch}}, fromamerican = {{aus dem Amerikanischen}{aus dem Amerikanischen}}, frombrazilian = {{aus dem Brasilianischen}{aus dem Brasilianischen}}, -% fromcatalan = {{}{}},% FIXME: missing + fromcatalan = {{aus dem Katalanischen}{aus dem Katalanischen}}, fromcroatian = {{aus dem Kroatischen}{aus dem Kroatischen}}, -% fromczech = {{}{}},% FIXME: missing + fromczech = {{aus dem Tschechischen}{aus dem Tschechischen}}, fromdanish = {{aus dem D\"anischen}{aus dem D\"anischen}}, fromdutch = {{aus dem Niederl\"andischen}{aus dem Niederl\"andischen}}, fromenglish = {{aus dem Englischen}{aus dem Englischen}}, @@ -435,10 +470,10 @@ fromitalian = {{aus dem Italienischen}{aus dem Italienischen}}, fromlatin = {{aus dem Lateinischen}{aus dem Lateinischen}}, fromnorwegian = {{aus dem Norwegischen}{aus dem Norwegischen}}, -% frompolish = {{}{}},% FIXME: missing + frompolish = {{aus dem Polnischen}{aus dem Polnischen}}, fromportuguese = {{aus dem Portugiesischen}{aus dem Portugiesischen}}, fromrussian = {{aus dem Russischen}{aus dem Russischen}}, -% fromslovene = {{}{}},% FIXME: missing + fromslovene = {{aus dem Slowenischen}{aus dem Slowenischen}}, fromspanish = {{aus dem Spanischen}{aus dem Spanischen}}, fromswedish = {{aus dem Schwedischen}{aus dem Schwedischen}}, countryde = {{Deutschland}{DE}}, @@ -463,6 +498,17 @@ library = {{Bibliothek}{Bibliothek}}, abstract = {{Zusammenfassung}{Zusammenfassung}}, annotation = {{Anmerkungen}{Anmerkungen}}, + commonera = {{unserer Zeitrechnung}{u\adddotspace Z\adddot}}, + beforecommonera = {{vor unserer Zeitrechnung}{v\adddotspace u\adddotspace Z\adddot}}, + annodomini = {{n\adddotspace Chr\adddot}{n\adddotspace Chr\adddot}}, + beforechrist = {{v\adddotspace Chr\adddot}{v\adddotspace Chr\adddot}}, + circa = {{circa}{ca.}}, + spring = {{Fr\"uhling}{Fr\adddot}}, + summer = {{Sommer}{So\adddot}}, + autumn = {{Herbst}{He\adddot}}, + winter = {{Winter}{Wi\adddot}}, + am = {{vorm\adddot}{vorm\adddot}}, + pm = {{nachm\adddot}{nachm\adddot}}, } \DeclareHyphenationExceptions{% diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx index 2faa6b00ad2..f397ce37454 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx @@ -43,7 +43,6 @@ \let\finalandcomma=\empty \protected\def\bibrangedash{% \textendash\penalty\hyphenpenalty}% breakable dash - \protected\def\bibdatedash{\bibrangedash}% \let\finalandcomma=\empty \let\finalandsemicolon=\empty \protected\def\mkbibordinal{\mkbibmascord}% @@ -61,23 +60,55 @@ \iffieldundef{#1}{}{\space}}% \iffieldbibstring{#1} {\bibstring{\thefield{#1}}} - {\stripzeros{\thefield{#1}}}}% + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% \protected\def\mkbibdateshort#1#2#3{% \iffieldundef{#3} {} - {\mkdatezeros{\thefield{#3}}% + {\mkdayzeros{\thefield{#3}}% \iffieldundef{#2}{}{/}}% \iffieldundef{#2} {} - {\mkdatezeros{\thefield{#2}}% + {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#1}{}{/}}% \iffieldbibstring{#1} {\bibstring{\thefield{#1}}} - {\mkdatezeros{\thefield{#1}}}}% + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% \savecommand\mkbibordedition \savecommand\mkbibordseries \def\mkbibordedition{\mkbibfemord}% \def\mkbibordseries{\mkbibfemord}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } \UndeclareBibliographyExtras{% @@ -430,6 +461,7 @@ langdanish = {{Δανέζικα}{Δανέζικα}}, langdutch = {{Ολλανδικά}{Ολλανδικά}}, langenglish = {{Αγγλικά}{Αγγλικά}}, +% langestonian = {{}{}},% FIXME: missing % langfinnish = {{}{}},% FIXME: missing langfrench = {{Γαλλικά}{Γαλλικά}}, langgerman = {{Γερμανικά}{Γερμανικά}}, @@ -451,6 +483,7 @@ fromdanish = {{από τα Δανέζικα}{από τα Δανέζικα}}, fromdutch = {{από τα Ολλανδικά}{από τα Ολλανδικά}}, fromenglish = {{από τα Αγγλικά}{από τα Αγγλικά}}, +% fromestonian = {{}{}},% FIXME: missing % fromfinnish = {{}{}},% FIXME: missing fromfrench = {{από τα Γαλλικά}{από τα Γαλλικά}}, fromgerman = {{από τα Γερμανικά}{από τα Γερμανικά}}, @@ -498,6 +531,17 @@ library = {{βιβλιοθήκη}{βιβλιοθήκη}}, abstract = {{περίληψη}{περίληψη}}, annotation = {{σχολιασμοί}{σχολιασμοί}}, + commonera = {{Κοινή Χρονολογία}{KX}}, + beforecommonera = {{πριν από την Κοινή Χρονολογία}{π\adddot Κ\adddot Χ\adddot}}, + annodomini = {{μετά Χριστόν}{μ\adddot Χ\adddot}}, + beforechrist = {{προ Χριστού}{π\adddot Χ\adddot}}, +% circa = {{}{}},% FIXME: missing +% spring = {{}{}},% FIXME: missing +% summer = {{}{}},% FIXME: missing +% autumn = {{}{}},% FIXME: missing +% winter = {{}{}},% FIXME: missing + am = {{π\adddot μ\adddot}{π\adddot μ\adddot}}, + pm = {{μ\adddot μ\adddot}{μ\adddot μ\adddot}}, } \protected\gdef\lbx@gr@mkbibmonth#1{% diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx index 960d3ace7e4..3085110ed7f 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx @@ -13,7 +13,6 @@ \DeclareBibliographyExtras{% \protected\def\bibrangedash{% \textendash\penalty\hyphenpenalty}% breakable dash - \protected\def\bibdatedash{\bibrangedash}% \let\finalandcomma=\empty \let\finalandsemicolon=\empty \protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}% @@ -29,16 +28,20 @@ {} {\mkbibmonth{\thefield{#2}}% \iffieldundef{#1}{}{\space}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% \protected\def\mkbibdateshort#1#2#3{% \iffieldundef{#3} {} - {\mkdatezeros{\thefield{#3}}\adddot}% + {\mkdayzeros{\thefield{#3}}\adddot}% \iffieldundef{#2} {} - {\mkdatezeros{\thefield{#2}}% + {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#1}{}{\adddot}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% % Later, it would be more elegant to reverse the order of the name and the localized % bibstrings, in order to avoid problems with regard to declension. This has to be done % in a coordinated manner, however, and a lot of macros would have to be redefined @@ -52,6 +55,38 @@ % \setunit{\addspace}% % \bibstring{bytranslator}% % }}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } %\UndeclareBibliographyExtras{% @@ -349,6 +384,7 @@ langdanish = {{danska}{danska}}, langdutch = {{hollenska}{hollenska}}, langenglish = {{enska}{enska}}, +% langestonian = {{}{}},% FIXME: missing langfinnish = {{finnska}{finnska}}, langfrench = {{franska}{franska}}, langgerman = {{\th\'yska}{\th\'yska}}, @@ -370,6 +406,7 @@ fromdanish = {{\'ur d\"onsku}{\'ur d\"onsku}}, fromdutch = {{\'ur hollensku}{\'ur hollensku}}, fromenglish = {{\'ur ensku}{\'ur ensku}}, +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{\'ur finnsku}{\'ur finnsku}}, fromfrench = {{\'ur fr\"onsku}{\'ur fr\"onsku}}, fromgerman = {{\'ur \th\'ysku}{\'ur \th\'ysku}}, @@ -405,6 +442,17 @@ library = {{safn}{safn}}, abstract = {{\'utdr\'attur}{\'utdr\'attur}}, annotation = {{athugagrein}{athugagrein}}, + commonera = {{kristi\th t\'{\i}matal}{l\adddot t\adddot}}, + beforecommonera = {{fyrir kristi\th t\'{\i}matal}{f\adddot l\adddot t\adddot}}, + annodomini = {{eftir Krist}{e\adddot Kr\adddot}}, + beforechrist = {{fyrir Krist}{f\adddot Kr\adddot}}, +% circa = {{}{}},% FIXME: missing +% spring = {{}{}},% FIXME: missing +% summer = {{}{}},% FIXME: missing +% autumn = {{}{}},% FIXME: missing +% winter = {{}{}},% FIXME: missing + am = {{f\adddot h\adddot}{f\adddot h\adddot}}, + pm = {{e\adddot h\adddot}{e\adddot h\adddot}}, } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx index 5c762abc006..d039a568d6d 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx @@ -6,7 +6,6 @@ \DeclareBibliographyExtras{% \protected\def\bibrangedash{% \textendash\penalty\hyphenpenalty}% breakable dash - \protected\def\bibdatedash{\bibrangedash}% \let\finalandcomma=\empty \let\finalandsemicolon=\empty \def\mkbibordinal{\mkbibmascord}% @@ -24,21 +23,57 @@ {} {\mkbibmonth{\thefield{#2}}% \iffieldundef{#1}{}{\space}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% \protected\def\mkbibdateshort#1#2#3{% \iffieldundef{#3} {} - {\mkdatezeros{\thefield{#3}}% + {\mkdayzeros{\thefield{#3}}% \iffieldundef{#2}{}{/}}% \iffieldundef{#2} {} - {\mkdatezeros{\thefield{#2}}% + {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#1}{}{/}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% \savecommand\mkbibordedition \savecommand\mkbibordseries \def\mkbibordedition{\mkbibfemord}% \def\mkbibordseries{\mkbibfemord}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } \UndeclareBibliographyExtras{% @@ -332,6 +367,7 @@ langdanish = {{danese}{danese}}, langdutch = {{olandese}{olandese}}, langenglish = {{inglese}{inglese}}, +% langestonian = {{}{}},% FIXME: missing % langfinnish = {{}{}},% FIXME: missing langfrench = {{francese}{francese}}, langgerman = {{tedesco}{tedesco}}, @@ -353,6 +389,7 @@ fromdanish = {{dal danese}{dal danese}}, fromdutch = {{dall'olandese}{dall'olandese}}, fromenglish = {{dall'inglese}{dall'inglese}}, +% fromestonian = {{}{}},% FIXME: missing % fromfinnish = {{}{}},% FIXME: missing fromfrench = {{dal francese}{dal francese}}, fromgerman = {{dal tedesco}{dal tedesco}}, @@ -388,6 +425,15 @@ library = {{biblioteca}{biblioteca}}, 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}}, + beforechrist = {{a\adddot C\adddot}{a\adddot C\adddot}}, +% circa = {{}{}},% FIXME: missing +% spring = {{}{}},% FIXME: missing +% summer = {{}{}},% FIXME: missing +% autumn = {{}{}},% FIXME: missing +% winter = {{}{}},% FIXME: missing } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx index a00bf1cdfd5..bef64fed9a9 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx @@ -12,7 +12,17 @@ {} {\mkbibmonth{\thefield{#2}}% \iffieldundef{#1}{}{\space}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } \InheritBibliographyStrings{english} diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx index d4c9d7c3e4d..9b251e2b824 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx @@ -6,7 +6,6 @@ \DeclareBibliographyExtras{% \protected\def\bibrangedash{% \textendash\penalty\hyphenpenalty}% breakable dash - \protected\def\bibdatedash{\bibrangedash}% \let\finalandcomma=\empty \let\finalandsemicolon=\empty \protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}% @@ -22,16 +21,52 @@ {} {\mkbibmonth{\thefield{#2}}% \iffieldundef{#1}{}{\space}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% \protected\def\mkbibdateshort#1#2#3{% \iffieldundef{#3} {} - {\mkdatezeros{\thefield{#3}}\adddot}% + {\mkdayzeros{\thefield{#3}}\adddot}% \iffieldundef{#2} {} - {\mkdatezeros{\thefield{#2}}% + {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#1}{}{\adddot}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } \DeclareBibliographyStrings{% @@ -388,6 +423,7 @@ langdanish = {{dansk}{dansk}}, langdutch = {{nederlandsk}{nederlandsk}}, langenglish = {{engelsk}{engelsk}}, +% langestonian = {{}{}},% FIXME: missing langfinnish = {{finsk}{finsk}}, langfrench = {{fransk}{fransk}}, langgerman = {{tysk}{tysk}}, @@ -409,6 +445,7 @@ fromdanish = {{fra dansk}{fra dansk}}, fromdutch = {{fra nederlandsk}{fra nederlandsk}}, fromenglish = {{fra engelsk}{fra engelsk}}, +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{fra finsk}{fra finsk}}, fromfrench = {{fra fransk}{fra fransk}}, fromgerman = {{fra tysk}{fra tysk}}, @@ -449,6 +486,17 @@ library = {{bibliotek}{bibliotek}}, abstract = {{sammendrag}{sammendrag}}, annotation = {{merknad}{merknad}}, + commonera = {{etter v\aa r tidsregning}{evt\adddot}}, + beforecommonera = {{f{\o}r v\aa r tidsregning}{fvt\adddot}}, + annodomini = {{etter Kristus}{e\adddot Kr\adddot}}, + beforechrist = {{f{\o}r Kristus}{f\adddot Kr\adddot}}, +% circa = {{}{}},% FIXME: missing +% spring = {{}{}},% FIXME: missing +% summer = {{}{}},% FIXME: missing +% autumn = {{}{}},% FIXME: missing +% winter = {{}{}},% FIXME: missing + am = {{a\adddot m\adddot}{a\adddot m\adddot}}, + pm = {{p\adddot m\adddot}{p\adddot m\adddot}}, } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx index e664c1c38b1..5f2e12c24d2 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx @@ -271,6 +271,7 @@ fromdanish = {{fr{\aa} dansk}{fr{\aa} dansk}}, fromdutch = {{fr{\aa} nederlandsk}{fr{\aa} nederlandsk}}, fromenglish = {{fr{\aa} engelsk}{fr{\aa} engelsk}}, +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{fr{\aa} finsk}{fr{\aa} finsk}}, fromfrench = {{fr{\aa} fransk}{fr{\aa} fransk}}, fromgerman = {{fr{\aa} tysk}{fr{\aa} tysk}}, @@ -287,6 +288,17 @@ countryeu = {{Den europeiske unionen}{EU}}, countryep = {{Den europeiske unionen}{EP}}, abstract = {{samandrag}{samandrag}}, + commonera = {{vesterlandsk tidsrekning}{v\adddot t\adddot}}, + beforecommonera = {{f{\o}r vesterlandsk tidsrekning}{f\adddot v\adddot t\adddot}}, + annodomini = {{e\adddot Kr\adddot}{e\adddot Kr\adddot}}, + beforechrist = {{f\adddot Kr\adddot}{f\adddot Kr\adddot}}, +% circa = {{}{}},% FIXME: missing +% spring = {{}{}},% FIXME: missing +% summer = {{}{}},% FIXME: missing +% autumn = {{}{}},% FIXME: missing +% winter = {{}{}},% FIXME: missing + am = {{formiddag}{f\adddot m\adddot}}, + pm = {{ettermiddag}{e\adddot m\adddot}}, } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx index 99cdf72220b..d8a4e9566e2 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx @@ -5,7 +5,6 @@ \DeclareBibliographyExtras{% \protected\def\bibrangedash{\textendash\penalty\hyphenpenalty}% - \protected\def\bibdatedash{\addnbthinspace\textendash\addhpthinspace}% \let\finalandcomma=\empty \let\finalandsemicolon=\empty \protected\def\mkbibordinal#1{\stripzeros{#1}}% @@ -25,25 +24,57 @@ \iffieldundef{#1}{}{\space}}% \iffieldbibstring{#1} {\bibstring{\thefield{#1}}} - {\stripzeros{\thefield{#1}}}}% + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% \protected\def\mkbibdateshort#1#2#3{% \iffieldundef{#3} {} - {\mkdatezeros{\thefield{#3}}\adddot + {\mkdayzeros{\thefield{#3}}\adddot \iffieldundef{#2}{}{\thinspace}}% \iffieldundef{#2} {} - {\mkdatezeros{\thefield{#2}}% + {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#1} {} {\iffieldundef{#3}{/}{\adddot\thinspace}}}% \iffieldbibstring{#1} {\bibstring{\thefield{#1}}} - {\mkdatezeros{\thefield{#1}}}}% + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% \savecommand\mkbibordedition \savecommand\mkbibordseries \def\mkbibordedition{\mkbibneutord}% \def\mkbibordseries{\mkbibfemord}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } \UndeclareBibliographyExtras{% @@ -419,6 +450,7 @@ langdanish = {{du\'{n}ski}{du\'{n}ski}}, langdutch = {{holenderski}{holenderski}}, langenglish = {{angielski}{angielski}}, +% langestonian = {{}{}},% FIXME: missing langfinnish = {{fi\'{n}ski}{fi\'{n}ski}}, langfrench = {{francuski}{francuski}}, langgerman = {{niemiecki}{niemiecki}}, @@ -440,6 +472,7 @@ fromdanish = {{z du\'{n}skiego}{z du\'{n}\adddot}}, fromdutch = {{z niderla\'{n}skiego}{z nid\adddot}}, fromenglish = {{z angielskiego}{z ang\adddot}}, +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{z fi\'{n}skiego}{z fi\'{n}\adddot}}, fromfrench = {{z francuzkiego}{z fran\adddot}}, fromgerman = {{z niemieckiego}{z niem\adddot}}, @@ -478,6 +511,17 @@ library = {{bibloteka}{bibl\adddot}}, abstract = {{podsumowanie}{pod\adddot}}, annotation = {{adnotacja}{adn\adddot}}, + commonera = {{CE}{CE}}, + beforecommonera = {{BCE}{BCE}}, + annodomini = {{n\adddot e\adddot}{n\adddot e\adddot}}, + beforechrist = {{p\adddot n\adddot e\adddot}{p\adddot n\adddot e\adddot}}, +% circa = {{}{}},% FIXME: missing +% spring = {{}{}},% FIXME: missing +% summer = {{}{}},% FIXME: missing +% autumn = {{}{}},% FIXME: missing +% winter = {{}{}},% FIXME: missing + am = {{AM}{AM}}, + pm = {{PM}{PM}}, } \protected\gdef\lbx@pl@mkbibmonth#1{% diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx index 8058bcf86e7..453e5dccfb8 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx @@ -12,7 +12,6 @@ \DeclareBibliographyExtras{% \protected\def\bibrangedash{% \textendash\penalty\hyphenpenalty}% breakable dash - \protected\def\bibdatedash{\bibrangedash}% \let\finalandcomma=\empty \let\finalandsemicolon=\empty \def\mkbibordinal{\mkbibmascord}% @@ -30,21 +29,57 @@ {} {\mkbibmonth{\thefield{#2}}% \iffieldundef{#1}{}{\nobreakspace de\space}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% \protected\def\mkbibdateshort#1#2#3{% \iffieldundef{#3} {} - {\mkdatezeros{\thefield{#3}}% + {\mkdayzeros{\thefield{#3}}% \iffieldundef{#2}{}{/}}% \iffieldundef{#2} {} - {\mkdatezeros{\thefield{#2}}% + {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#1}{}{/}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% \savecommand\mkbibordedition \savecommand\mkbibordseries \def\mkbibordedition{\mkbibfemord}% \def\mkbibordseries{\mkbibfemord}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } \UndeclareBibliographyExtras{% @@ -405,6 +440,7 @@ langdanish = {{dinamarqu\^es}{dinamarqu\^es}}, langdutch = {{holand{\^e}s}{holand{\^e}s}}, langenglish = {{ingl\^es}{ingl\^es}}, +% langestonian = {{}{}},% FIXME: missing % langfinnish = {{}{}},% FIXME: missing langfrench = {{franc\^es}{franc\^es}}, langgerman = {{alem\~ao}{alem\~ao}}, @@ -426,6 +462,7 @@ fromdanish = {{do dinamarqu\^es}{do dinamarqu\^es}}, fromdutch = {{do holand{\^e}s}{do holand{\^e}s}}, fromenglish = {{do ingl\^es}{do ingl\^es}}, +% fromestonian = {{}{}},% FIXME: missing % fromfinnish = {{}{}},% FIXME: missing fromfrench = {{do franc\^es}{do franc\^es}}, fromgerman = {{do alem\~ao}{do alem\~ao}}, @@ -461,6 +498,17 @@ library = {{biblioteca}{biblioteca}}, abstract = {{resumo}{resumo}}, annotation = {{notas}{notas}}, + commonera = {{Era Comum}{EC}}, + beforecommonera = {{antes da Era Comum}{AEC}}, + annodomini = {{depois de Cristo}{d\adddot C\adddot}}, + beforechrist = {{antes de Cristo}{a\adddot C\adddot}}, +% circa = {{}{}},% FIXME: missing +% spring = {{}{}},% FIXME: missing +% summer = {{}{}},% FIXME: missing +% autumn = {{}{}},% FIXME: missing +% winter = {{}{}},% FIXME: missing + am = {{AM}{AM}}, + pm = {{PM}{PM}}, } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx index 9eb8472181a..0c1bde1261a 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx @@ -33,8 +33,6 @@ \DeclareBibliographyExtras{% \protected\def\bibrangedash{% \textemdash\penalty\hyphenpenalty}% breakable dash - \protected\def\bibdatedash{% - \textemdash\penalty\hyphenpenalty}% breakable dash \let\finalandcomma=\empty \let\finalandsemicolon=\empty \protected\def\mkbibordinal#1{\mkbibmascord}% @@ -52,21 +50,57 @@ {\mkbibmonth{\thefield{#2}}} {\lbx@ru@mkbibdatemonth{\thefield{#2}}}% \iffieldundef{#1}{}{\space}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% \protected\def\mkbibdateshort#1#2#3{% \iffieldundef{#3} {} - {\mkdatezeros{\thefield{#3}}% + {\mkdayzeros{\thefield{#3}}% \iffieldundef{#2}{}{\adddot}}% \iffieldundef{#2} {} - {\mkdatezeros{\thefield{#2}}% + {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#1}{}{\adddot}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% \savecommand\mkbibordedition \savecommand\mkbibordseries \def\mkbibordedition{\mkbibneutord}% \def\mkbibordseries{\mkbibfemord}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } \UndeclareBibliographyExtras{% @@ -445,6 +479,7 @@ langdanish = {{датский}{дат\adddot}}, langdutch = {{нидерландский}{нидерл\adddot}}, langenglish = {{английский}{англ\adddot}}, + langestonian = {{эстонский}{эст\adddot}}, langfinnish = {{финский}{фин\adddot}}, langfrench = {{французский}{фр\adddot}}, langgerman = {{немецкий}{нем\adddot}}, @@ -467,6 +502,7 @@ fromdanish = {{с датского}{с\addabbrvspace дат\adddot}}, fromdutch = {{с нидерландского}{с\addabbrvspace нидерл\adddot}}, fromenglish = {{с английского}{с\addabbrvspace англ\adddot}}, + fromestonian = {{с эстонского}{с\addabbrvspace эст\adddot}}, fromfinnish = {{с финского}{с\addabbrvspace фин\adddot}}, fromfrench = {{с французского}{с\addabbrvspace фр\adddot}}, fromgerman = {{с немецкого}{с\addabbrvspace нем\adddot}}, @@ -503,6 +539,17 @@ library = {{библиотека}{б-ка}}, abstract = {{резюме}{рез\adddot}}, annotation = {{аннотация}{аннот\adddot}}, + commonera = {{нашей эры}{н\adddotspace э\adddot}}, + beforecommonera = {{до нашей эры}{до н\adddotspace э\adddot}}, + annodomini = {{от Рождества Христова}{от Р\adddotspace Х\adddot}}, + beforechrist = {{до Рождества Христова}{до Р\adddotspace Х\adddot}}, + circa = {{около}{ок\adddot}}, + spring = {{весна}{весна}}, + summer = {{лето}{лето}}, + autumn = {{осень}{осень}}, + winter = {{зима}{зима}}, + am = {{ДП}{ДП}}, + pm = {{ПП}{ПП}}, } \protected\gdef\lbx@ru@mkbibdatemonth#1{% diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/slovak.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/slovak.lbx index f317b608aeb..4cb194af110 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/slovak.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/slovak.lbx @@ -22,19 +22,55 @@ {} {\mkbibmonth{\thefield{#2}}% \iffieldundef{#1}{}{\space}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% \protected\def\mkbibdateshort#1#2#3{% \iffieldundef{#3} {} - {\mkdatezeros{\thefield{#3}}\adddot + {\mkdayzeros{\thefield{#3}}\adddot \iffieldundef{#2}{}{\thinspace}}% \iffieldundef{#2} {} - {\mkdatezeros{\thefield{#2}}% + {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#1} {} {\iffieldundef{#3}{/}{\adddot\thinspace}}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } \DeclareBibliographyStrings{% @@ -536,6 +572,7 @@ {hol\adddot}}, langenglish = {{angli\v{c}tina}% {angl\adddot}}, +% langestonian = {{}{}},% FIXME: missing langfinnish = {{f\'{i}n\v{c}ina}% {f\'{i}n\adddot}}, langfrench = {{franc\'{u}z\v{s}tina}% @@ -582,6 +619,7 @@ {z\addnbspace hol\adddot}}, fromenglish = {{z\addnbspace angli\v{c}tiny}% {z\addnbspace angl\adddot}}, +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{z\addnbspace f\'{i}n\v{c}iny}% {z\addnbspace f\'{i}n\adddot}}, fromfrench = {{z\addnbspace franc\'{u}z\v{s}tiny}% @@ -656,6 +694,17 @@ {abst\adddot}}, annotation = {{anot\'{a}cia}% {anot\adddot}}, + commonera = {{n\'a\v{s}ho letopo\v{c}tu}{n\adddotspace l\adddot}}, + beforecommonera = {{pred na\v{s}\'{\i}m letopo\v{c}tom}{pred\ n\adddotspace l\adddot}}, + annodomini = {{po Kristovi}{po\ Kr\adddot}}, + beforechrist = {{pred Kristom}{pred\ Kr\adddot}}, +% circa = {{}{}},% FIXME: missing +% spring = {{}{}},% FIXME: missing +% summer = {{}{}},% FIXME: missing +% autumn = {{}{}},% FIXME: missing +% winter = {{}{}},% FIXME: missing + am = {{AM}{AM}}, + pm = {{PM}{PM}}, } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/slovene.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/slovene.lbx index 3ba5a92ddf0..1eb41919233 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/slovene.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/slovene.lbx @@ -5,7 +5,6 @@ \DeclareBibliographyExtras{% \protected\def\bibrangedash{\textendash\penalty\hyphenpenalty}% - \protected\def\bibdatedash{\addnbthinspace\textendash\addhpthinspace}% \let\finalandcomma=\empty \let\finalandsemicolon=\empty \protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}% @@ -23,7 +22,7 @@ \iffieldundef{#1}{}{\space}}% \iffieldbibstring{#1} {\bibstring{\thefield{#1}}} - {\stripzeros{\thefield{#1}}}}% + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% \protected\def\mkbibdateshort#1#2#3{% \iffieldundef{#3} {} @@ -35,11 +34,43 @@ \iffieldundef{#1}{}{\addnbthinspace}}% \iffieldbibstring{#1} {\bibstring{\thefield{#1}}} - {\stripzeros{\thefield{#1}}}}% + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% \savecommand\mkbibordedition \savecommand\mkbibordseries \def\mkbibordedition{\mkbibordinal}% \def\mkbibordseries{\mkbibfemord}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } \UndeclareBibliographyExtras{% @@ -401,6 +432,7 @@ langdanish = {{dan\v{s}\v{c}ina}{dan\adddot}}, langdutch = {{nizozem\v{s}\v{c}ina}{niz\adddot}}, langenglish = {{angle\v{s}\v{c}ina}{angl\adddot}}, +% langestonian = {{}{}},% FIXME: missing langfinnish = {{fin\v{s}\v{c}ina}{fin\adddot}}, langfrench = {{franco\v{s}\v{c}ina}{fr\adddot}}, langgerman = {{nem\v{s}\v{c}ina}{nem\adddot}}, @@ -422,6 +454,7 @@ fromdanish = {{iz dan\v{s}\v{c}ine}{iz dan\adddot}}, fromdutch = {{iz nizozem\v{s}\v{c}ine}{iz niz\adddot}}, fromenglish = {{iz angle\v{s}\v{c}ine}{iz angl\adddot}}, +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{iz fin\v{s}\v{c}ine}{iz fin\adddot}}, fromfrench = {{iz franco\v{s}\v{c}ine}{iz fr\adddot}}, fromgerman = {{iz nem\v{s}\v{c}ine}{iz nem\adddot}}, @@ -457,6 +490,17 @@ library = {{knji\v{z}nica}{knji\v{z}nica}}, abstract = {{povzetek}{povzetek}}, annotation = {{opomba}{op\adddot}}, + commonera = {{po n\adddotspace\v{s}t\adddot}{n\adddotspace\v{s}t\adddot}}, + beforecommonera = {{pred na\v{s}im \v{s}tetjem}{pr\adddotspace n\adddotspace\v{s}t\adddot}}, + annodomini = {{na\v{s}e \v{s}tetje}{po\ n\adddotspace\v{s}t\adddot}}, + beforechrist = {{pred Kristusom}{pr\adddotspace Kr\adddot}}, +% circa = {{}{}},% FIXME: missing +% spring = {{}{}},% FIXME: missing +% summer = {{}{}},% FIXME: missing +% autumn = {{}{}},% FIXME: missing +% winter = {{}{}},% FIXME: missing + am = {{dop\adddot}{dop\adddot}}, + pm = {{pop\adddot}{pop\adddot}}, } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx index 8bfd3b828f2..cd741dc846d 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx @@ -5,7 +5,6 @@ \DeclareBibliographyExtras{% \protected\def\bibrangedash{\mbox{-}}% non-breaking hyphen - \protected\def\bibdatedash{\bibrangedash}% FIXME: unsure \let\finalandcomma=\empty \let\finalandsemicolon=\empty \def\mkbibordinal{\mkbibmascord}% @@ -22,23 +21,27 @@ {} {\mkbibmonth{\thefield{#2}}% \iffieldundef{#1}{}{\nobreakspace de\space}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% \protected\def\mkbibdateshort#1#2#3{% \iffieldundef{#3} {} - {\mkdatezeros{\thefield{#3}}% + {\mkdayzeros{\thefield{#3}}% \iffieldundef{#2}{}{\mbox{-}}}% \iffieldundef{#2} {} - {\mkdatezeros{\thefield{#2}}% + {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#1}{}{\mbox{-}}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}% - \savecommand\mkbibrangeterse - \protected\def\mkbibrangeterse{% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% + \savecommand\mkdaterangeterse + \protected\def\mkdaterangeterse{% \BibliographyWarning{% Date format 'terse' not applicable to\MessageBreak Spanish dates. Using format 'short' instead}% - \mkbibrangefull{short}}% + \mkdaterangefull{short}}% \savecommand\lbx@finalnamedelim \savecommand\lbx@finallistdelim \ifnumgreater{\value{smartand}}{0} @@ -49,10 +52,42 @@ \savecommand\mkbibordseries \def\mkbibordedition{\mkbibfemord}% \def\mkbibordseries{\mkbibfemord}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } \UndeclareBibliographyExtras{% - \restorecommand\mkbibrangeterse + \restorecommand\mkdaterangeterse \restorecommand\lbx@finalnamedelim \restorecommand\lbx@finallistdelim \restorecommand\mkbibordedition @@ -324,7 +359,7 @@ see = {{v\'ease}{vid\adddot}}, seealso = {{v\'ease tambi\'en}{vid\adddotspace tambi\'en}}, backrefpage = {{v\'ease p\'agina}{vid\adddotspace p\'ag\adddot}}, - backrefpages = {{v\'ease p\'aginas}{vid\adddotspace p\'ags\adddot}}, + backrefpages = {{v\'eanse p\'aginas}{vid\adddotspace p\'ags\adddot}}, january = {{enero}{ene\adddot}}, february = {{febrero}{feb\adddot}}, march = {{marzo}{mar\adddot}}, @@ -345,6 +380,7 @@ langdanish = {{dan\'es}{dan\'es}}, langdutch = {{neerland\'es}{neerland\'es}}, langenglish = {{ingl\'es}{ingl\'es}}, +% langestonian = {{}{}},% FIXME: missing langfinnish = {{fin\'{e}s}{fin\'{e}s}}, langfrench = {{franc\'es}{franc\'es}}, langgerman = {{alem\'an}{alem\'an}}, @@ -366,6 +402,7 @@ fromdanish = {{del dan\'es}{del dan\'es}}, fromdutch = {{del neerland\'es}{del neerland\'es}}, fromenglish = {{del ingl\'es}{del ingl\'es}}, +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{del fin\'{e}s}{del fin\'{e}s}}, fromfrench = {{del franc\'es}{del franc\'es}}, fromgerman = {{del alem\'an}{del alem\'an}}, @@ -401,6 +438,17 @@ library = {{biblioteca}{bibl\adddot}}, abstract = {{resumen}{resumen}}, annotation = {{anotaci\'{o}n}{anot\adddot}}, + commonera = {{era com\'un}{e\adddotspace c\adddot}}, + beforecommonera = {{antes de la era com\'un}{a\adddotspace e\adddotspace c\adddot}}, + annodomini = {{despu\'es de Cristo}{d\adddotspace C\adddot}}, + beforechrist = {{antes de Cristo}{a\adddotspace C\adddot}}, +% circa = {{}{}},% FIXME: missing +% spring = {{}{}},% FIXME: missing +% summer = {{}{}},% FIXME: missing +% autumn = {{}{}},% FIXME: missing +% winter = {{}{}},% FIXME: missing + am = {{a\adddotspace m\adddot}{a\adddot m\adddot}}, + pm = {{p\adddotspace m\adddot}{p\adddot m\adddot}}, } \protected\gdef\lbx@es@smartand{% diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx index 7b9ee1fbdfe..6413918075a 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx @@ -26,7 +26,6 @@ \DeclareBibliographyExtras{% \protected\def\bibrangedash{% \textendash\penalty\hyphenpenalty}% breakable dash - \protected\def\bibdatedash{\bibrangedash}% \let\finalandcomma=\empty \let\finalandsemicolon=\empty \protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}% @@ -54,29 +53,65 @@ {} {\mkbibmonth{\thefield{#2}}% \iffieldundef{#1}{}{\space}}% - \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% \protected\def\mkbibdateshort#1#2#3{% \iffieldundef{#1} {} - {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}% + {\iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% \iffieldundef{#2}{}{\mbox{-}}}% \iffieldundef{#2} {} - {\mkdatezeros{\thefield{#2}}% + {\mkmonthzeros{\thefield{#2}}% \iffieldundef{#3}{}{\mbox{-}}}% \iffieldundef{#3} {} - {\mkdatezeros{\thefield{#3}}}}% - \savecommand\mkbibrangeterse - \protected\def\mkbibrangeterse{% + {\mkdayzeros{\thefield{#3}}}}% + \savecommand\mkdaterangeterse + \protected\def\mkdaterangeterse{% \BibliographyWarning{% Date format 'terse' not applicable to\MessageBreak Swedish dates. Using format 'short' instead}% - \mkbibrangefull{short}}% + \mkdaterangefull{short}}% + \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{% + \iffieldundef{#1}{} + {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}% + \iffieldundef{#2}{} + {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}% + \iffieldundef{#3}{} + {\printtext{\mktimezeros{\thefield{#3}}}}% + \setunit{}% + \iffieldundef{#4}{} + {\bibtimezonesep + \mkbibtimezone{\thefield{#4}}}}% + \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{% + \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep + \forcezerosmdt{\thefield{#2}}% + \iffieldundef{#3}{} + {\bibtimesep + \forcezeros{\thefield{#3}}}% + \space + \ifnumless{\thefield{#1}}{12} + {\bibstring{am}} + {\bibstring{pm}}% + \iffieldundef{#4}{} + {\space\bibtimezonesep + \parentext{\mkbibtimezone{\thefield{#4}}}}}% + \protected\def\mkbibseasondateshort#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% + \protected\def\mkbibseasondatelong#1#2{% + \mkbibseason{\thefield{#2}}% + \iffieldundef{#1}{}{\space}% + \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% } \UndeclareBibliographyExtras{% - \restorecommand\mkbibrangeterse + \restorecommand\mkdaterangeterse } \DeclareBibliographyStrings{% @@ -376,6 +411,7 @@ langdanish = {{danska}{danska}}, langdutch = {{nederl\"andska}{nederl\"andska}}, langenglish = {{engelska}{engelska}}, +% langestonian = {{}{}},% FIXME: missing langfinnish = {{finska}{finska}}, langfrench = {{franska}{franska}}, langgerman = {{tyska}{tyska}}, @@ -397,6 +433,7 @@ fromdanish = {{fr\aa n danska}{fr\aa n danska}}, fromdutch = {{fr\aa n nederl\"andska}{fr\aa n nederl\"andska}}, fromenglish = {{fr\aa n engelska}{fr\aa n engelska}}, +% fromestonian = {{}{}},% FIXME: missing fromfinnish = {{fr\aa n finska}{fr\aa n finska}}, fromfrench = {{fr\aa n franska}{fr\aa n franska}}, fromgerman = {{fr\aa n tyska}{fr\aa n tyska}}, @@ -432,6 +469,17 @@ library = {{bibliotek}{bibliotek}}, abstract = {{sammandrag}{sammandrag}}, annotation = {{anm\"arkning}{anm\adddot}}, + commonera = {{v\"asterl\"andsk tider\"akning}{v\adddot t\adddot}}, + beforecommonera = {{f\"ore v\"asterl\"andsk tider\"akning}{f\adddot v\adddot t\adddot}}, + annodomini = {{efter Kristus}{e\adddot Kr\adddot}}, + beforechrist = {{f\"ore Kristus}{f\adddot Kr\adddot}}, +% circa = {{}{}},% FIXME: missing +% spring = {{}{}},% FIXME: missing +% summer = {{}{}},% FIXME: missing +% autumn = {{}{}},% FIXME: missing +% winter = {{}{}},% FIXME: missing + am = {{fm}{fm}}, + pm = {{em}{em}}, } \endinput |