biblatex-chicago (26mar17)

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

1 files changed, 132 insertions, 61 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
index 140f6cb6310..141fb2c5d9a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
@@ -1,4 +1,5 @@
-% $Id: chicago-notes.cbx,v 0.9.8.36 2016/06/07 08:17:10 dfussner Exp $
+% $Id: chicago-notes.cbx,v 0.9.8.44 2017/03/22 18:41:31 dfussner Exp $
+
 % This is a biblatex citation style file, adapted from Lehman's
 % authortitle-cverb.cbx.  It is heavily modified, with the intention
 % of providing footnote citations and a bibliography formatted
@@ -29,6 +30,8 @@
 \providetoggle{cms@addendum}
 \providetoggle{cms@comprange}
 \providetoggle{cms@modpostnote}
+\providetoggle{cms@url@innotes}
+\providetoggle{cms@ukord}
 
 \providetoggle{cms@headlessnote}
 \providetoggle{cms@origcite}
@@ -42,6 +45,7 @@
 \providetoggle{cms@printshhand}
 \providetoggle{cms@fullshhand}
 \providetoggle{cms@inheritshhand}
+\providetoggle{cms@firstshort}
 \providetoggle{cms@origpublished}
 \providetoggle{cms@loccit}
 \providetoggle{cms@annotation}
@@ -130,6 +134,12 @@
   }}%
   {}}%
 
+\DeclareBibliographyOption[boolean]{shorthandfirst}[true]{%
+  \settoggle{cms@firstshort}{#1}}
+
+\DeclareEntryOption[boolean]{shorthandfirst}[true]{%
+  \settoggle{cms@firstshort}{#1}}
+
 \DeclareBibliographyOption{compresspages}[true]{%
   \ifcsdef{cms@opt@crange@#1}%
   {\csuse{cms@opt@crange@#1}}%
@@ -258,8 +268,17 @@
       Please see biblatex-chicago.pdf for valid\MessageBreak
       option keys}}}%
 
+\DeclareBibliographyOption[boolean]{ordinalgb}[true]{%
+  \settoggle{cms@ukord}{#1}}%
+
 % The field-exclusion options %
 
+\DeclareBibliographyOption[boolean]{urlnotes}[true]{%
+  \settoggle{cms@url@innotes}{#1}}%
+
+\DeclareEntryOption[boolean]{urlnotes}[true]{%
+  \settoggle{cms@url@innotes}{#1}}%
+
 \DeclareBibliographyOption{isbn}[true]{%
   \settoggle{cms@isbn}{#1}}%
 \DeclareBibliographyOption{url}[true]{%
@@ -460,7 +479,7 @@
         option keys}}}%
 
 \ExecuteBibliographyOptions{includeall,completenotes,hidevolumes,%
-  related,booklongxref,ptitleaddon,ctitleaddon,shorthandpunct}
+  related,booklongxref,ptitleaddon,ctitleaddon,shorthandpunct,urlnotes}
 
 % For author-date compatibility %
 
@@ -563,16 +582,24 @@
          {\usebibmacro{cite:shorthand}%
            \usebibmacro{cite:save}%
            \global\toggletrue{cms@noidem}}}}%
-    {\iftoggle{cms@allshort}%
-      {\global\toggletrue{cms@shortnote}%
-        \global\togglefalse{cms@fullnote}%
-        \global\toggletrue{cms@printshhand}%
-        \usebibmacro{cite:short}%
-        \usebibmacro{cite:save}}%
-      {\global\toggletrue{cms@fullnote}%
-        \global\togglefalse{cms@shortnote}%
-        \usebibmacro{cite:full}%
-        \usebibmacro{cite:save}}}}%
+     {\ifboolexpr{%
+         togl{cms@firstshort}%
+         and
+         not test {\iffieldundef{shorthand}}%
+       }%
+       {\usebibmacro{cite:shorthand}%
+         \usebibmacro{cite:save}%
+         \global\toggletrue{cms@noidem}}%
+       {\iftoggle{cms@allshort}%
+         {\global\toggletrue{cms@shortnote}%
+           \global\togglefalse{cms@fullnote}%
+           \global\toggletrue{cms@printshhand}%
+           \usebibmacro{cite:short}%
+           \usebibmacro{cite:save}}%
+         {\global\toggletrue{cms@fullnote}%
+           \global\togglefalse{cms@shortnote}%
+           \usebibmacro{cite:full}%
+           \usebibmacro{cite:save}}}}}%
 
 \newbibmacro*{cite:full}{%
   \printtext[bibhypertarget]{%
@@ -1007,11 +1034,17 @@
 \DeclareCiteCommand{\headlessparenshortcite}[\mkbibparens]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
-    \toggletrue{cms@headlessnote}%
-    \toggletrue{cms@shortnote}%
-    \togglefalse{cms@fullnote}%
-    \clearname{labelname}%
-    \usebibmacro{cite:short}%
+    \ifboolexpr{%
+      togl{cms@firstshort}%
+      and
+      not test {\iffieldundef{shorthand}}%
+    }%
+    {\usebibmacro{cite:shorthand}}%
+    {\toggletrue{cms@headlessnote}%
+      \toggletrue{cms@shortnote}%
+      \togglefalse{cms@fullnote}%
+      \clearname{labelname}%
+      \usebibmacro{cite:short}}%
     \global\toggletrue{cms@noidem}}
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
@@ -3510,14 +3543,50 @@
   {\bibstring{cbytranslator}\addspace}%
   {\bibstring{bytranslator}\addspace}}%
 
-\newcommand{\partedit}{%
-  \iftoggle{cms@postposit}% Kludge to make it work in French.
-  {\iftoggle{cms@fullnote}%
-    {\bibstring{cbyeditoralt}\addspace}%
-    {\bibstring{byeditoralt}\addspace}}%
-  {\iftoggle{cms@fullnote}%
-    {\bibstring{cbyeditor}\addspace}%
-    {\bibstring{byeditor}\addspace}}}%
+% \newcommand{\partedit}{%
+%   \iftoggle{cms@postposit}% Kludge to make it work in French.
+%   {\iftoggle{cms@fullnote}%
+%     {\bibstring{cbyeditoralt}\addspace}%
+%     {\bibstring{byeditoralt}\addspace}}%
+%   {\iftoggle{cms@fullnote}%
+%     {\bibstring{cbyeditor}\addspace}%
+%     {\bibstring{byeditor}\addspace}}}%
+
+\protected\def\partedit#1{%
+  \ifcat\noexpand~\noexpand#1%
+  \ifundef{\cms@tempb}{}{\appto{\cms@tempb}{#1}}%
+  \def\cms@tempa{\futurelet\cms@tempa\partedit}%
+  \else%
+  \ifx\addnbspace#1%
+  \ifundef{\cms@tempb}{}{\appto{\cms@tempb}{#1}}%
+  \def\cms@tempa{\futurelet\cms@tempa\partedit}%
+  \else%
+  \ifx\addspace#1%
+  \ifundef{\cms@tempb}{}{\appto{\cms@tempb}{#1}}%
+  \def\cms@tempa{\futurelet\cms@tempa\partedit}%
+  \else%
+  \if#1H%
+  \appto{\cms@tempb}{#1}%
+  \def\cms@tempa{\futurelet\cms@tempa\partedit}%
+  \else%
+  \if#1h%
+  \appto{\cms@tempb}{#1}%
+  \def\cms@tempa{\futurelet\cms@tempa\partedit}%
+  \else%
+  \def\cms@tempa{\part@edit@i\lbx@initnamehook{#1}%
+    \csuse{cms@tempb}#1\csundef{cms@tempb}}%
+  \fi%
+  \fi%
+  \fi%
+  \fi%
+  \fi%
+  \cms@tempa%
+}%
+
+\newcommand{\part@edit@i}{%
+  \iftoggle{cms@fullnote}%
+  {\bibstring{cbyeditor}\addspace}%
+  {\bibstring{byeditor}\addspace}}%
 
 \newcommand{\partcomp}{%
   \iftoggle{cms@fullnote}%
@@ -4796,37 +4865,39 @@
           \printfield[sjtnoformat]{journalsubtitle}}}}}%
 
 \newbibmacro*{cite+doi+url}{% 16th ed.
-  \iffieldundef{urlyear}%
-  {}%
-  {\printurldate}% Date fix
-  \newcunit\newblock
-  \iftoggle{cms@doionly}%
-  {\iffieldundef{doi}%
+  \iftoggle{cms@url@innotes}%
+  {\iffieldundef{urlyear}%
     {}%
-    {\printfield{doi}%
-      \clearfield{url}}}%
-  {\ifboolexpr{%
-      togl {cms@doi}%
+    {\printurldate}% Date fix
+    \newcunit\newblock
+    \iftoggle{cms@doionly}%
+    {\iffieldundef{doi}%
+      {}%
+      {\printfield{doi}%
+        \clearfield{url}}}%
+    {\ifboolexpr{%
+        togl {cms@doi}%
+        and
+        not test {\iffieldundef{doi}}%
+      }%
+      {\printfield{doi}}%
+      {}}%
+    \newcunit\newblock
+    \ifboolexpr{%
+      togl {cms@eprint}%
       and
-      not test {\iffieldundef{doi}}%
+      not test {\iffieldundef{eprint}}%
     }%
-    {\printfield{doi}}%
+    {\usebibmacro{eprint}}%
+    {}%
+    \newcunit\newblock
+    \ifboolexpr{%
+      togl {cms@url}%
+      and
+      not test {\iffieldundef{url}}%
+    }%
+    {\printfield{url}}%
     {}}%
-  \newcunit\newblock
-  \ifboolexpr{%
-    togl {cms@eprint}%
-    and
-    not test {\iffieldundef{eprint}}%
-  }%
-  {\usebibmacro{eprint}}%
-  {}%
-  \newcunit\newblock
-  \ifboolexpr{%
-    togl {cms@url}%
-    and
-    not test {\iffieldundef{url}}%
-  }%
-  {\printfield{url}}%
   {}}%
 
 \newbibmacro*{chap+pag}{%
@@ -5411,7 +5482,7 @@
   \noinherit{origendmonth}
   \noinherit{origendday}}
 
-\DeclareSortingScheme{cms}{
+\DeclareSortingScheme{cms}{% Updated for biblatex > 2.0
   \sort{
     \field{presort}
   }
@@ -5419,16 +5490,16 @@
     \field{sortkey}
   }
   \sort{
-    \name{sortname}
-    \name{author}
-    \name{namea}
-    \name{editor}
-    \name{nameb}
-    \name{translator}
-    \name{namec}
+    \field{sortname}
+    \field{author}
+    \field{namea}
+    \field{editor}
+    \field{nameb}
+    \field{translator}
+    \field{namec}
     \field{sorttitle}
     \field{journaltitle}
-    \list{organization}
+    \field{organization}
     \field{title}
   }
   \sort{