summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/biblatex/latex/lbx/english.lbx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/biblatex/latex/lbx/english.lbx')
-rw-r--r--macros/latex/contrib/biblatex/latex/lbx/english.lbx42
1 files changed, 26 insertions, 16 deletions
diff --git a/macros/latex/contrib/biblatex/latex/lbx/english.lbx b/macros/latex/contrib/biblatex/latex/lbx/english.lbx
index 109014dafb..1ade8c7f81 100644
--- a/macros/latex/contrib/biblatex/latex/lbx/english.lbx
+++ b/macros/latex/contrib/biblatex/latex/lbx/english.lbx
@@ -50,13 +50,17 @@ canadian,australian,newzealand,USenglish,UKenglish}
{\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{#1}
+ {}
+ {\mktimezeros{\thefield{#1}}%
+ \iffieldundef{#2}{}{\bibtimesep}}%
+ \iffieldundef{#2}
+ {}
+ {\mktimezeros{\thefield{#2}}%
+ \iffieldundef{#3}{}{\bibtimesep}}%
+ \iffieldundef{#3}
+ {}
+ {\mktimezeros{\thefield{#3}}}%
\iffieldundef{#4}{}
{\bibtimezonesep
\mkbibtimezone{\thefield{#4}}}}%
@@ -329,11 +333,11 @@ canadian,australian,newzealand,USenglish,UKenglish}
byeditortrcoaf = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented, with an afterword, by}%
{ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and comm., with an afterw., by}},
byeditortranin = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated, with an introduction, by}%
- {ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot, with an introd., by}},
+ {ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot., with an introd., by}},
byeditortranfo = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated, with a foreword, by}%
- {ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot, with a forew., by}},
+ {ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot., with a forew., by}},
byeditortranaf = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated, with an afterword, by}%
- {ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot, with an afterw., by}},
+ {ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot., with an afterw., by}},
bytranslatorco = {{translated \lbx@lfromlang\ and commented by}%
{trans\adddot\ \lbx@sfromlang\ and comm\adddot\ by}},
bytranslatoran = {{translated \lbx@lfromlang\ and annotated by}%
@@ -485,14 +489,17 @@ canadian,australian,newzealand,USenglish,UKenglish}
langjapanese = {{Japanese}{Japanese}},
langlatin = {{Latin}{Latin}},
langlatvian = {{Latvian}{Latvian}},
+ langlithuanian = {{Lithuanian}{Lithuanian}},
langnorwegian = {{Norwegian}{Norwegian}},
langpolish = {{Polish}{Polish}},
langportuguese = {{Portuguese}{Portuguese}},
langrussian = {{Russian}{Russian}},
+ langserbian = {{Serbian}{Serbian}},
langslovak = {{Slovak}{Slovak}},
langslovene = {{Slovene}{Slovene}},
langspanish = {{Spanish}{Spanish}},
langswedish = {{Swedish}{Swedish}},
+ langturkish = {{Turkish}{Turkish}},
langukrainian = {{Ukrainian}{Ukrainian}},
fromamerican = {{from the American}{from the American}},
frombrazilian = {{from the Brazilian}{from the Brazilian}},
@@ -514,14 +521,17 @@ canadian,australian,newzealand,USenglish,UKenglish}
fromjapanese = {{from the Japanese}{from the Japanese}},
fromlatin = {{from the Latin}{from the Latin}},
fromlatvian = {{from the Latvian}{from the Latvian}},
+ fromlithuanian = {{from the Lithuanian}{from the Lithuanian}},
fromnorwegian = {{from the Norwegian}{from the Norwegian}},
frompolish = {{from the Polish}{from the Polish}},
fromportuguese = {{from the Portuguese}{from the Portuguese}},
fromrussian = {{from the Russian}{from the Russian}},
+ fromserbian = {{from the Serbian}{from the Serbian}},
fromslovak = {{from the Slovak}{from the Slovak}},
fromslovene = {{from the Slovene}{from the Slovene}},
fromspanish = {{from the Spanish}{from the Spanish}},
fromswedish = {{from the Swedish}{from the Swedish}},
+ fromturkish = {{from the Turkish}{from the Turkish}},
fromukrainian = {{from the Ukrainian}{from the Ukrainian}},
countryde = {{Germany}{DE}},
countryeu = {{European Union}{EU}},
@@ -568,7 +578,7 @@ canadian,australian,newzealand,USenglish,UKenglish}
\blx@metadateinfo{#2}%
\iffieldundef{#2year}
{\blx@nounit}
- {\printtext[#2date]{%
+ {\printtext[{#2date}]{%
\datecircaprint
\iffieldundef{#2season}
{\ifdateyearsequal{#2}{#2end}
@@ -607,7 +617,7 @@ canadian,australian,newzealand,USenglish,UKenglish}
\blx@metadateinfo{#2}%
\iffieldundef{#2year}
{\blx@nounit}
- {\printtext[#2date]{%
+ {\printtext[{#2date}]{%
\datecircaprint
\iffieldundef{#2season}
{\ifdateyearsequal{#2}{#2end}
@@ -637,12 +647,12 @@ canadian,australian,newzealand,USenglish,UKenglish}
{\mkdaterangefullextra{#1}{#2}}
{\lbx@us@mkdaterangetruncextra@long@i{#1}{#2}}}
-\protected\gdef\lbx@us@mkdaterangetruncextra@long#1#2{%
+\protected\gdef\lbx@us@mkdaterangetruncextra@long@i#1#2{%
\begingroup
\blx@metadateinfo{#2}%
\iffieldundef{#2year}
{\blx@nounit}
- {\printtext[#2date]{%
+ {\printtext[{#2date}]{%
\datecircaprint
\iffieldundef{#2season}
{\ifdateyearsequal{#2}{#2end}
@@ -678,12 +688,12 @@ canadian,australian,newzealand,USenglish,UKenglish}
{\mkdaterangefullextra{#1}{#2}}
{\lbx@us@mkdaterangetruncextra@short@i{#1}{#2}}}
-\protected\gdef\lbx@us@mkdaterangetruncextra@short#1#2{%
+\protected\gdef\lbx@us@mkdaterangetruncextra@short@i#1#2{%
\begingroup
\blx@metadateinfo{#2}%
\iffieldundef{#2year}
{\blx@nounit}
- {\printtext[#2date]{%
+ {\printtext[{#2date}]{%
\datecircaprint
\iffieldundef{#2season}
{\ifdateyearsequal{#2}{#2end}