summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/biblatex-contrib/oscola/american-oscola.lbx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/biblatex-contrib/oscola/american-oscola.lbx')
-rw-r--r--macros/latex/contrib/biblatex-contrib/oscola/american-oscola.lbx139
1 files changed, 68 insertions, 71 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/oscola/american-oscola.lbx b/macros/latex/contrib/biblatex-contrib/oscola/american-oscola.lbx
index 83ae46a8a7..1df7a04f1b 100644
--- a/macros/latex/contrib/biblatex-contrib/oscola/american-oscola.lbx
+++ b/macros/latex/contrib/biblatex-contrib/oscola/american-oscola.lbx
@@ -2,8 +2,8 @@
% Part of the OSCOLA package for biblatex: see the file
% oscola.lbx for copyright and licence information
-\ProvidesFile{english-oscola.lbx}
-[2019/01/20 v 1.6 Biblatex localisation file for OSCOLA citations]
+\ProvidesFile{american-oscola.lbx}
+[2020/03/15 v1.7 Biblatex localisation file for OSCOLA citations]
\DeclareRedundantLanguages{english,american,british}{english,american,british}
@@ -76,7 +76,7 @@
{\mkdatezeros{\thefield{#2}}%
\iffieldundef{#3}
{\iffieldundef{#1}{}{/}}
- {/}}%
+ {/}}%
\iffieldundef{#3}
{}
{\mkdatezeros{\thefield{#3}}%
@@ -94,55 +94,70 @@
\lbx@us@mkbibrangetruncextra@long{long}}%
\protected\def\mkbibrangeterseextra{%
\lbx@us@mkbibrangetruncextra@short{short}}%
- \protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
- {\mbox{\bibdatedash}}
- {\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
-\protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \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}}}}}}
-
-\protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
- \printfield{extrayear}}}}}}
+ \protected\gdef\lbx@us@mkbibrangetrunc@long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \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}}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdatedash}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \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}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \mbox{\bibdatedash}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+ \printfield{extrayear}}}}}}%
}
\UndeclareBibliographyExtras{%
@@ -530,7 +545,7 @@
abstract = {{abstract}{abstract}},
annotation = {{annotations}{annotations}},
eucase = {{Case}{Case}},
- eujoinedcases = {{Joined Cases}{Joined Cases}},
+ eujoinedcases = {{Joined Cases}{Joined Cases}},
commissiondecision = {{Commission Decision}{Commission Decision}},
article = {{article}{art}},
articles = {{articles}{arts}},
@@ -552,22 +567,4 @@
firstpublished = {{first published}{first published}},
}
-\protected\gdef\lbx@us@mkbibrangetrunc@long#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \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}}}}}}}
-
\endinput