biblatex-chicago (2may17)

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

1 files changed, 16 insertions, 14 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common.cbx
index d9a9eca34e2..c0473ea82a6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common.cbx
@@ -1,4 +1,4 @@
-% $Id: chicago-dates-common.cbx,v 0.9.1.31 2017/03/25 14:35:52 dfussner Exp $
+% $Id: chicago-dates-common.cbx,v 0.9.1.33 2017/05/02 14:30:17 dfussner Exp $
 
 % This is a biblatex citation style file, adapted from Lehman's
 % authoryear-comp.cbx.  It is heavily modified, and contains the
@@ -6,7 +6,7 @@
 % for the two author-date styles of the Chicago Manual of Style, 16th
 % edition.
 
-\ProvidesFile{chicago-dates-common.cbx}[2016/06/07 v 3.4 biblatex
+\ProvidesFile{chicago-dates-common.cbx}[2017/05/02 v 3.7 biblatex
 citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
@@ -81,7 +81,7 @@ citation style]
   \@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4/2.5
   {\@ifpackagelater{biblatex}{2013/03/30}% for biblatex 2.6 ff.
     {\DeclareLabeldate[music,review,suppperiodical,video]{\field{eventdate}%
-        \field{origdate} \field{date} \field{urldate}}}%
+        \field{origdate} \field{date} \field{year} \field{urldate}}}%
     {\DeclareLabelyear[music,review,suppperiodical,video]{\field{eventyear}%
         \field{origyear} \field{year} \field{urlyear}}}}%
   {\DeclareLabelyear[music,review,suppperiodical,video]%
@@ -116,10 +116,10 @@ citation style]
 \def\cms@opt@origdate@true{%
   \@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4/2.5
   {\@ifpackagelater{biblatex}{2013/03/30}% for biblatex 2.6 ff.
-    {\DeclareLabeldate{\field{origdate} \field{date}%
+    {\DeclareLabeldate{\field{origdate} \field{date} \field{year}%
         \field{eventdate} \field{urldate}}%
-      \DeclareLabeldate[patent]{\field{date} \field{eventdate}%
-        \field{origdate} \field{urldate}}}%
+      \DeclareLabeldate[patent]{\field{date} \field{year}%
+        \field{eventdate} \field{origdate} \field{urldate}}}%
     {\DeclareLabelyear{\field{origyear} \field{year}%
         \field{eventyear} \field{urlyear}}%
       \DeclareLabelyear[patent]{\field{year} \field{eventyear}%
@@ -1254,15 +1254,17 @@ citation style]
     {\usebibmacro{cmsciteyear}}}}%
 
 \newbibmacro*{cmsciteyear}{%
-  \iftoggle{cms@origlabel}%
-  {\usebibmacro{cite:origyear+labelyear}}%
-  {\iftoggle{cms@bothlabelnew}%
-    {\usebibmacro{cite:bothyear+oldstyle}}%
-    {\iftoggle{cms@bothlabelold}%
+  \ifentrytype{patent}% Fix for double year w/cmsdate
+  {\usebibmacro{cite:standard+labelyear+extrayear}}
+  {\iftoggle{cms@origlabel}%
+    {\usebibmacro{cite:origyear+labelyear}}%
+    {\iftoggle{cms@bothlabelnew}%
       {\usebibmacro{cite:bothyear+oldstyle}}%
-      {\iftoggle{cms@fulldate}%
-        {\newcunit\printdate}%
-        {\usebibmacro{cite:labelyear+extrayear}}}}}%
+      {\iftoggle{cms@bothlabelold}%
+        {\usebibmacro{cite:bothyear+oldstyle}}%
+        {\iftoggle{cms@fulldate}%
+          {\newcunit\printdate}%
+          {\usebibmacro{cite:labelyear+extrayear}}}}}}%
   \ifcsdef{@cms@tempdate}%
   {\toggletrue{\@cms@tempdate}}%
   {}}%