diff options
Diffstat (limited to 'macros/latex/contrib/biblatex/latex/lbx/english.lbx')
-rw-r--r-- | macros/latex/contrib/biblatex/latex/lbx/english.lbx | 69 |
1 files changed, 45 insertions, 24 deletions
diff --git a/macros/latex/contrib/biblatex/latex/lbx/english.lbx b/macros/latex/contrib/biblatex/latex/lbx/english.lbx index d13bd0fd42..cf67033de1 100644 --- a/macros/latex/contrib/biblatex/latex/lbx/english.lbx +++ b/macros/latex/contrib/biblatex/latex/lbx/english.lbx @@ -78,12 +78,12 @@ canadian,australian,newzealand,USenglish,UKenglish} \iffieldundef{#4}{} {\space\bibtimezonesep \parentext{\mkbibtimezone{\thefield{#4}}}}}% - \protected\def\mkbibseasondateshort#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondateshort#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% - \protected\def\mkbibseasondatelong#1#2{% - \mkbibseason{\thefield{#2}}% + \protected\def\mkbibyeardivisiondatelong#1#2{% + \mkbibyeardivision{\thefield{#2}}% \iffieldundef{#1}{}{\space}% \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}% \savecommand\mkdaterangecomp @@ -491,9 +491,11 @@ canadian,australian,newzealand,USenglish,UKenglish} langlatin = {{Latin}{Latin}}, langlatvian = {{Latvian}{Latvian}}, langlithuanian = {{Lithuanian}{Lithuanian}}, + langmarathi = {{Marathi}{Marathi}}, langnorwegian = {{Norwegian}{Norwegian}}, langpolish = {{Polish}{Polish}}, langportuguese = {{Portuguese}{Portuguese}}, + langromanian = {{Romanian}{Romanian}}, langrussian = {{Russian}{Russian}}, langserbian = {{Serbian}{Serbian}}, langslovak = {{Slovak}{Slovak}}, @@ -524,9 +526,11 @@ canadian,australian,newzealand,USenglish,UKenglish} fromlatin = {{from the Latin}{from the Latin}}, fromlatvian = {{from the Latvian}{from the Latvian}}, fromlithuanian = {{from the Lithuanian}{from the Lithuanian}}, + frommarathi = {{from the Marathi}{from the Marathi}}, fromnorwegian = {{from the Norwegian}{from the Norwegian}}, frompolish = {{from the Polish}{from the Polish}}, fromportuguese = {{from the Portuguese}{from the Portuguese}}, + fromromanian = {{from the Romanian}{from the Romanian}}, fromrussian = {{from the Russian}{from the Russian}}, fromserbian = {{from the Serbian}{from the Serbian}}, fromslovak = {{from the Slovak}{from the Slovak}}, @@ -566,6 +570,23 @@ canadian,australian,newzealand,USenglish,UKenglish} summer = {{Summer}{Sum\adddot}}, autumn = {{Autumn}{Aut\adddot}}, winter = {{Winter}{Win\adddot}}, + springN = {{Spring (Northern Hemisphere)}{Spr\adddotspace NH}}, + summerN = {{Summer (Northern Hemisphere)}{Sum\adddotspace NH}}, + autumnN = {{Autumn (Northern Hemisphere)}{Aut\adddotspace NH}}, + winterN = {{Winter (Northern Hemisphere)}{Win\adddotspace NH}}, + springS = {{Spring (Southern Hemisphere)}{Spr\adddotspace SH}}, + summerS = {{Summer (Southern Hemisphere)}{Sum\adddotspace SH}}, + autumnS = {{Autumn (Southern Hemisphere)}{Aut\adddotspace SH}}, + winterS = {{Winter (Southern Hemisphere)}{Win\adddotspace SH}}, + Q1 = {{Quarter~1}{Q1}}, + Q2 = {{Quarter~2}{Q2}}, + Q3 = {{Quarter~3}{Q3}}, + Q4 = {{Quarter~4}{Q4}}, + QD1 = {{Quadrimester~1}{Q1}}, + QD2 = {{Quadrimester~2}{Q2}}, + QD3 = {{Quadrimester~3}{Q3}}, + S1 = {{Semestral~1}{S1}}, + S2 = {{Semestral~2}{S2}}, am = {{AM}{AM}}, pm = {{PM}{PM}}, } @@ -582,14 +603,14 @@ canadian,australian,newzealand,USenglish,UKenglish} {\blx@nounit} {\printtext[{#2date}]{% \datecircaprint - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibdate#1}{}{#2month}{#2day}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \dateeraprint{#2year}}} {\ifdateyearsequal{#2}{#2end} - {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}% + {\csuse{mkbibyeardivisiondate#1}{}{#2yeardivision}} + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}% \dateeraprint{#2year}}}% \dateuncertainprint \iffieldundef{#2endyear} @@ -598,13 +619,13 @@ canadian,australian,newzealand,USenglish,UKenglish} {\mbox{\bibdaterangesep}} {\bibdaterangesep \enddatecircaprint - \iffieldundef{#2endseason} + \iffieldundef{#2endyeardivision} {\ifdateyearsequal{#2}{#2end} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + {\csuse{mkbibyeardivisiondate#1}{#2endyear}{#2endyeardivision}}% \enddateuncertainprint \dateeraprint{#2endyear}}}}}% \endgroup} @@ -621,14 +642,14 @@ canadian,australian,newzealand,USenglish,UKenglish} {\blx@nounit} {\printtext[{#2date}]{% \datecircaprint - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibdate#1}{}{#2month}{#2day}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \dateeraprint{#2year}}} {\ifdateyearsequal{#2}{#2end} - {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}% + {\csuse{mkbibyeardivisiondate#1}{}{#2yeardivision}} + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}% \dateeraprint{#2year}}}% \dateuncertainprint \iffieldundef{#2endyear} @@ -637,9 +658,9 @@ canadian,australian,newzealand,USenglish,UKenglish} {\mbox{\bibdaterangesep}} {\bibdaterangesep \enddatecircaprint - \iffieldundef{#2endseason} + \iffieldundef{#2endyeardivision} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + {\csuse{mkbibyeardivisiondate#1}{#2endyear}{#2endyeardivision}}% \enddateuncertainprint \dateeraprint{#2endyear}}}}}% \endgroup} @@ -656,14 +677,14 @@ canadian,australian,newzealand,USenglish,UKenglish} {\blx@nounit} {\printtext[{#2date}]{% \datecircaprint - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibdate#1}{}{#2month}{#2day}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \dateeraprint{#2year}}} {\ifdateyearsequal{#2}{#2end} - {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}% + {\csuse{mkbibyeardivisiondate#1}{}{#2yeardivision}} + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}% \dateeraprint{#2year}}}% \dateuncertainprint \iffieldundef{#2endyear} @@ -673,13 +694,13 @@ canadian,australian,newzealand,USenglish,UKenglish} \mbox{\bibdaterangesep}} {\bibdaterangesep \enddatecircaprint - \iffieldundef{#2endseason} + \iffieldundef{#2endyeardivision} {\ifdateyearsequal{#2}{#2end} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + {\csuse{mkbibyeardivisiondate#1}{#2endyear}{#2endyeardivision}}% \printfield{extradate}% \enddateuncertainprint \dateeraprint{#2endyear}}}}}% @@ -697,14 +718,14 @@ canadian,australian,newzealand,USenglish,UKenglish} {\blx@nounit} {\printtext[{#2date}]{% \datecircaprint - \iffieldundef{#2season} + \iffieldundef{#2yeardivision} {\ifdateyearsequal{#2}{#2end} {\csuse{mkbibdate#1}{}{#2month}{#2day}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \dateeraprint{#2year}}} {\ifdateyearsequal{#2}{#2end} - {\csuse{mkbibseasondate#1}{}{#2season}} - {\csuse{mkbibseasondate#1}{#2year}{#2season}% + {\csuse{mkbibyeardivisiondate#1}{}{#2yeardivision}} + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}% \dateeraprint{#2year}}}% \dateuncertainprint \iffieldundef{#2endyear} @@ -714,9 +735,9 @@ canadian,australian,newzealand,USenglish,UKenglish} \mbox{\bibdaterangesep}} {\bibdaterangesep \enddatecircaprint - \iffieldundef{#2endseason} + \iffieldundef{#2endyeardivision} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + {\csuse{mkbibyeardivisiondate#1}{#2endyear}{#2endyeardivision}}% \printfield{extradate}% \enddateuncertainprint \dateeraprint{#2endyear}}}}}% |