biblatex-archaeology (20nov18)

git-svn-id: svn://tug.org/texlive/trunk@49202 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 50 insertions, 51 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-karl.lbx
index c5523de2f77..934e7468c29 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-karl.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-karl.lbx
@@ -6,6 +6,7 @@
 %%
 %% biblatex-archaeology.dtx  (with options: `newbibstrings,englishLBX')
 %% 
+
 \NewBibliographyString{articledated}
 \NewBibliographyString{auction}
 \NewBibliographyString{auctions}
@@ -38,7 +39,7 @@
 \NewBibliographyString{unpublishedmathesis}
 \NewBibliographyString{unpublishedmagisterthesis}
 \ProvidesFile{english-archaeology.lbx}
-[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+[2018/11/20 v2.1 biblatex-archaeology localization (IB)]
 \InheritBibliographyExtras{british}
 \DeclareRedundantLanguages{english}
   {english,american,british,canadian,australian,newzealand,USenglish,UKenglish}
@@ -76,7 +77,7 @@
     unpublishedmagisterthesis = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}},
     unpublishedmathesis       = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}},
     unpublishedpostdocthesis  = {{unpublished Habilitationsschrift}{unpubl. Habil.-Schr\adddot}},
-    unpublishedphdthesis      = {{unpublished PhD\addabbrvspace thesis}{unpubl. PhD\addabbrvspace thesis}},,
+    unpublishedphdthesis      = {{unpublished PhD\addabbrvspace thesis}{unpubl. PhD\addabbrvspace thesis}},
     urlfrom  = {{Online}{Online}},
 }
 \protected\gdef\lbx@us@mkdaterangetrunc@long#1#2{%
@@ -84,17 +85,17 @@
     \blx@metadateinfo{#2}%
     \iffieldundef{#2year}
       {}
-      {\datecircaprint
-       \printtext[#2date]{%
+      {\printtext[#2date]{%
+         \datecircaprint
          \iffieldundef{#2season}
-           {\iffieldsequal{#2year}{#2endyear}
+           {\ifdateyearsequal{#2}{#2end}
              {\csuse{mkbibdate#1}{}{#2month}{#2day}}
              {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
-              \dateeraprint{#2}}}
-           {\iffieldsequal{#2year}{#2endyear}
+              \dateeraprint{#2year}}}
+           {\ifdateyearsequal{#2}{#2end}
              {\csuse{mkbibseasondate#1}{}{#2season}}
-             {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
-              \dateeraprint{#2}}%
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+              \dateeraprint{#2year}}}%
          \dateuncertainprint
          \iffieldundef{#2endyear}
            {}
@@ -103,31 +104,31 @@
              {\bibdaterangesepx{#2}%
               \enddatecircaprint
               \iffieldundef{#2season}
-                {\iffieldsequal{#2year}{#2endyear}
+                {\ifdateyearsequal{#2}{#2end}
                   {\iffieldsequal{#2month}{#2endmonth}
                     {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
                     {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
-                   {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                  {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
                 {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
               \enddateuncertainprint
-              \dateeraprint{#2}}}}}%
+              \dateeraprint{#2endyear}}}}}%
   \endgroup}
 \protected\gdef\lbx@us@mkdaterangetrunc@short#1#2{%
   \begingroup
     \blx@metadateinfo{#2}%
     \iffieldundef{#2year}
       {}
-      {\datecircaprint
-       \printtext[#2date]{%
+      {\printtext[#2date]{%
+         \datecircaprint
          \iffieldundef{#2season}
-           {\iffieldsequal{#2year}{#2endyear}
+           {\ifdateyearsequal{#2}{#2end}
              {\csuse{mkbibdate#1}{}{#2month}{#2day}}
-             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}
-              \dateeraprint{#2}}}
-           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+              \dateeraprint{#2year}}}
+           {\ifdateyearsequal{#2}{#2end}
              {\csuse{mkbibseasondate#1}{}{#2season}}
-             {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
-              \dateeraprint{#2}}%
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+              \dateeraprint{#2year}}}%
          \dateuncertainprint
          \iffieldundef{#2endyear}
            {}
@@ -139,23 +140,24 @@
                  {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}
                  {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
                \enddateuncertainprint
-               \dateeraprint{#2}}}}}%
+               \dateeraprint{#2endyear}}}}}%
   \endgroup}
 \protected\gdef\lbx@us@mkdaterangetruncextra@long#1#2{%
   \begingroup
     \blx@metadateinfo{#2}%
     \iffieldundef{#2year}
       {}
-      {\datecircaprint
-       \printtext[#2date]{%
+      {\printtext[#2date]{%
+         \datecircaprint
          \iffieldundef{#2season}
-           {\iffieldsequal{#2year}{#2endyear}
+           {\ifdateyearsequal{#2}{#2end}
              {\csuse{mkbibdate#1}{}{#2month}{#2day}}
-             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}}
-           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+              \dateeraprint{#2year}}}%
+           {\ifdateyearsequal{#2}{#2end}
              {\csuse{mkbibseasondate#1}{}{#2season}}
-             {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
-              \dateeraprint{#2}}%
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+              \dateeraprint{#2year}}}%
          \dateuncertainprint
          \iffieldundef{#2endyear}
            {\printfield{extradate}}
@@ -165,7 +167,7 @@
               {\bibdaterangesepx{#2}%
                \enddatecircaprint
                \iffieldundef{#2season}
-                 {\iffieldsequal{#2year}{#2endyear}
+                 {\ifdateyearsequal{#2}{#2end}
                    {\iffieldsequal{#2month}{#2endmonth}
                       {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
                       {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
@@ -173,42 +175,39 @@
                  {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
                \printfield{extradate}%
                \enddateuncertainprint
-               \dateeraprint{#2}}}}}%
+               \dateeraprint{#2endyear}}}}}%
   \endgroup}
 \protected\gdef\lbx@us@mkdaterangetruncextra@short#1#2{%
   \begingroup
     \blx@metadateinfo{#2}%
     \iffieldundef{#2year}
       {}
-      {\datecircaprint
-       \printtext[#2date]{%
+      {\printtext[#2date]{%
+         \datecircaprint
          \iffieldundef{#2season}
-           {\iffieldsequal{#2year}{#2endyear}
+           {\ifdateyearsequal{#2}{#2end}
              {\csuse{mkbibdate#1}{}{#2month}{#2day}}
-             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}}
-           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+              \dateeraprint{#2year}}}%
+           {\ifdateyearsequal{#2}{#2end}
              {\csuse{mkbibseasondate#1}{}{#2season}}
-             {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
-              \dateeraprint{#2}}%
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+              \dateeraprint{#2year}}}%
          \dateuncertainprint
          \iffieldundef{#2endyear}
            {\printfield{extradate}}
            {\iffieldequalstr{#2endyear}{}
               {\printfield{extradate}%
-               \mbox{\bibdaterangesep}}
-              {\bibdaterangesepx{#2}%
-               \enddatecircaprint
-               \iffieldundef{#2season}
-                 {\iffieldsequal{#2year}{#2endyear}
-                   {\iffieldsequal{#2month}{#2endmonth}
-                      {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
-                      {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
-                   {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
-                 {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
-               \printfield{extradate}%
-               \enddateuncertainprint
-               \dateeraprint{#2}}}}}%
-  \endgroup}
+            \mbox{\bibdaterangesep}}
+           {\bibdaterangesepx{#2}%
+            \enddatecircaprint
+            \iffieldundef{#2season}
+              {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}
+              {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+            \printfield{extradate}%
+            \enddateuncertainprint
+            \dateeraprint{#2endyear}}}}}%
+\endgroup}
 \DeclareGenitiveApostropheChars{}
 \endinput
 %%