biblatex-chicago (29sep11)

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

1 files changed, 17 insertions, 69 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx
index 8e7b3baa131..85b918eb7c7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx
@@ -1,28 +1,24 @@
-% $Id: cms-american.lbx,v 0.10.1.21 2011/09/21 11:16:35 dfussner Exp $	
+% $Id: cms-american.lbx,v 0.10.1.23 2011/09/28 17:27:05 dfussner Exp $	
 
-\ProvidesFile{cms-american.lbx}[2011/09/21 v 1.6 biblatex localization]
+\ProvidesFile{cms-american.lbx}[2011/09/28 v 1.6 biblatex localization]
 
 \InheritBibliographyExtras{american}
 
 \DeclareBibliographyExtras{%
   \savecommand\mkbibrangecomp
-  \savecommand\mkbibrangecompextra
   \savecommand\mkbibrangeterse
-  \savecommand\mkbibrangeterseextra
+  \savecommand\mkbibrangefull
   \protected\def\mkbibrangecomp{%
     \lbx@cms@mkbibrangetrunc@long{long}}%
   \protected\def\mkbibrangeterse{%
     \lbx@cms@mkbibrangetrunc@short{short}}%
-  \protected\def\mkbibrangecompextra{%
-    \lbx@cms@mkbibrangetruncextra@long{long}}%
-  \protected\def\mkbibrangeterseextra{%
-    \lbx@cms@mkbibrangetruncextra@short{short}}}
+  \protected\def\mkbibrangefull{%
+    \lbx@cms@mkbibrangefull}}
 
 \UndeclareBibliographyExtras{%
   \restorecommand\mkbibrangecomp%
-  \restorecommand\mkbibrangecompextra%
   \restorecommand\mkbibrangeterse%
-  \restorecommand\mkbibrangeterseextra%
+  \restorecommand\mkbibrangefull%
 }
 
 \NewBibliographyString{bynone}
@@ -810,12 +806,8 @@
 \protected\gdef\lbx@cms@mkbibrangetrunc@long#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
   {}
-  \printtext{%
-    \ifboolexpr{
-      togl {cms@oneyear}
-      or
-      test {\iffieldsequal{#2year}{#2endyear}}
-    }%
+  {\printtext{%
+    \iffieldsequal{#2year}{#2endyear}
     {\csuse{mkbibdate#1}{}{#2month}{#2day}}
     {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
     \iffieldundef{#2endyear}
@@ -823,25 +815,17 @@
     {\iffieldequalstr{#2endyear}{}
       {\mbox{\bibdatedash}}
       {\bibdatedash
-        \ifboolexpr{
-          togl {cms@oneyear}
-          or
-          test {\iffieldsequal{#2year}{#2endyear}}
-        }%
+        \iffieldsequal{#2year}{#2endyear}
         {\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}}}}}}}
 
 \protected\gdef\lbx@cms@mkbibrangetrunc@short#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
   {}
   {\printtext{%
-      \ifboolexpr{
-        togl {cms@oneyear}
-        or
-        test {\iffieldsequal{#2year}{#2endyear}}
-      }%
+      \iffieldsequal{#2year}{#2endyear}
       {\csuse{mkbibdate#1}{}{#2month}{#2day}}
       {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
       \iffieldundef{#2endyear}
@@ -851,52 +835,16 @@
         {\bibdatedash
           \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
 
-\protected\gdef\lbx@cms@mkbibrangetruncextra@long#1#2{%
-  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
-  {}
-  {\printtext{%
-      \ifboolexpr{
-        togl {cms@oneyear}
-        or
-        test {\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
-          \ifboolexpr{
-            togl {cms@oneyear}
-            or
-            test {\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@cms@mkbibrangetruncextra@short#1#2{%
+\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
-  {}
+  {}%
   {\printtext{%
-      \ifboolexpr{
-        togl {cms@oneyear}
-        or
-        test {\iffieldsequal{#2year}{#2endyear}}
-      }%
-      {\csuse{mkbibdate#1}{}{#2month}{#2day}}
-      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+      \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
       \iffieldundef{#2endyear}
-      {\printfield{extrayear}}
+      {}
       {\iffieldequalstr{#2endyear}{}
-        {\printfield{extrayear}%
-          \mbox{\bibdatedash}}
+        {\mbox{\bibdatedash}}
         {\bibdatedash
-          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
-          \printfield{extrayear}}}}}}
+          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
 
 \endinput