1 files changed, 244 insertions, 48 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
index 307197f8141..a9f4d864a7d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
@@ -1,10 +1,10 @@
-% $Id: chicago-notes.bbx,v 0.9.7.34 2013/03/12 12:07:20 dfussner Exp $
+% $Id: chicago-notes.bbx,v 0.9.7.50 2013/10/29 12:32:21 dfussner Exp $
 % This is a biblatex style file, adapted mainly from Lehman's standard.bbx
 % It provides the bibliography formatting for the Chicago notes + 
 % bibliography style.
 
 
-\ProvidesFile{chicago-notes.bbx}[2013/03/12 v 2.5 biblatex bibliography style]
+\ProvidesFile{chicago-notes.bbx}[2013/10/29 v 2.8 biblatex bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
 
@@ -364,10 +364,10 @@
     \finentry}%
   {\ifnameundef{labelname}%
     {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
-      \iffieldequalstr{entrytype}{periodical}}%
+      \ifentrytype{periodical}}%
       {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}%
           \newcunit}}%
-      {\iffieldequalstr{entrytype}{manual}%
+      {\ifentrytype{manual}%
         {\printtext[bibhyperref]{\printlist{organization}\newcunit}}%
         {}}}%
     {\usebibmacro{author/editor}%
@@ -505,7 +505,7 @@
   \newunit% ??? Editorpunct maybe not right here?
   \iffieldundef{maintitle}
   {}
-  {\iffieldundef{volume}
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
     {\usebibmacro{cms-in:}%
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
@@ -559,6 +559,8 @@
   \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{italtitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{bib:xref+date}%
   \newunit\newblock
   \iffieldundef{maintitle}%
   {\iffieldundef{edition}%
@@ -566,11 +568,21 @@
     {\usebibmacro{edition}}}%
   {}%
   \newunit\newblock% 16th ed.
-  \usebibmacro{byauthor}
+  \usebibmacro{byauthor}%
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
   \newunit\newblock
-  \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bookbibxref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bookbibxref}%
+    }%
+  {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
   \newcunit
   \iffieldundef{edition}%
   {}%
@@ -606,7 +618,17 @@
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
+  \usebibmacro{finentry}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{xref}}%
+  \usebibmacro{xrefpostnote}%
+  \usebibmacro{finentry}}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{crossref}}%
+  \usebibmacro{xrefpostnote}%
+  \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{bookinbook}{%
   \usebibmacro{bibindex}%
@@ -615,6 +637,8 @@
   \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{italtitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{bib:xref+date}%
   \newunit\newblock
   \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
   {\iffieldundef{edition}%
@@ -626,8 +650,17 @@
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
   \setunit*{\addperiod\addspace}%
-  \usebibmacro{cms-in:}%
-  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
+  \ifboolexpr{
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bookbibxref}%
+  }
+  {\ifboolexpr{
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bookbibxref}%
+    }
+  {\usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
   {}%
@@ -660,7 +693,17 @@
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
+  \usebibmacro{finentry}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{xref}}%
+  \usebibmacro{xrefpostnote}%
+  \usebibmacro{finentry}}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{crossref}}%
+  \usebibmacro{xrefpostnote}%
+  \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{booklet}{%
   \usebibmacro{bibindex}%
@@ -694,8 +737,20 @@
   \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{italtitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{bib:xref+date}%
   \newunit\newblock
-  \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bookbibxref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bookbibxref}%
+    }%
+  {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
   \usebibmacro{editorpunct}%
   \iffieldundef{edition}%
   {}%
@@ -724,7 +779,17 @@
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
+  \usebibmacro{finentry}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{xref}}%
+  \usebibmacro{xrefpostnote}%
+  \usebibmacro{finentry}}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{crossref}}%
+  \usebibmacro{xrefpostnote}%
+  \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{customc}{%
   \usebibmacro{bibindex}%
@@ -783,9 +848,18 @@
   \usebibmacro{byauthor}%
   \setunit{\addperiod\addspace}%
   \usebibmacro{part+editor+translator}%
-  \setunit{\addperiod\addspace}%
+  \ifboolexpr{
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bibcrossref}%
+  }
+  {\ifboolexpr{
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bibcrossref}%
+    }
+  {\setunit{\addperiod\addspace}%
   \usebibmacro{chapincoll}%
-  \usebibmacro{cms-in:}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -817,6 +891,18 @@
   \newunit\newblock
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \usebibmacro{chapincoll}%
+  \bibxrefcite{\thefield{xref}}%
+  \usebibmacro{xrefpostnote}%
+  \usebibmacro{finentry}}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \usebibmacro{chapincoll}%
+  \bibxrefcite{\thefield{crossref}}%
+  \usebibmacro{xrefpostnote}%
+  \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{incollection}{%
   \usebibmacro{bibindex}%
@@ -831,11 +917,18 @@
   \usebibmacro{byauthor}%
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
-  \iffieldundef{crossref}%
-  {\iffieldundef{xref}%
+  \ifboolexpr{
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bibcrossref}%
+  }
+  {\ifboolexpr{
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bibcrossref}%
+    }
   {\newunit\newblock
   \usebibmacro{chapincoll}%
-  \usebibmacro{cms-in:}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -893,11 +986,18 @@
   \usebibmacro{byauthor}%
   \setunit{\addperiod\addspace}%
   \usebibmacro{part+editor+translator}%
-  \iffieldundef{crossref}%
-  {\iffieldundef{xref}%
+  \ifboolexpr{
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bibcrossref}%
+  }
+  {\ifboolexpr{
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bibcrossref}%
+    }
   {\setunit{\addperiod\addspace}%
-    \usebibmacro{chapincoll}%
-    \usebibmacro{cms-in:}%
+  \usebibmacro{chapincoll}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit\newblock
   \usebibmacro{volume+pages}%
@@ -945,7 +1045,6 @@
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
   \setunit*{\addperiod\addspace}% need asterisk?
-  \usebibmacro{alt-in:}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -1007,10 +1106,17 @@
   \newunit\newblock%\bibsentence
   \usebibmacro{part+editor+translator}%
   \setunit*{\addperiod\addspace}%
-  \iffieldundef{crossref}%
-  {\iffieldundef{xref}%
+  \ifboolexpr{
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bibcrossref}%
+  }
+  {\ifboolexpr{
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bibcrossref}%
+    }
   {\usebibmacro{chapincoll}%
-  \usebibmacro{cms-in:}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -1165,7 +1271,7 @@
   \newunit% ??? Editorpunct maybe not right here?
   \iffieldundef{maintitle}
   {}
-  {\iffieldundef{volume}
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
     {\usebibmacro{cms-in:}%
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
@@ -1222,6 +1328,14 @@
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
+\DeclareBibliographyAlias{mvbook}{book}
+
+\DeclareBibliographyAlias{mvcollection}{collection}
+
+\DeclareBibliographyAlias{mvproceedings}{proceedings}
+
+\DeclareBibliographyAlias{mvreference}{reference}
+
 \DeclareBibliographyDriver{online}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
@@ -1368,8 +1482,20 @@
   \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{italtitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{bib:xref+date}%
   \newunit\newblock
-  \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bookbibxref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bookbibxref}%
+    }%
+  {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
   \newunit\newblock
   \usebibmacro{volume+or+volumes}%
   \newunit\newblock
@@ -1390,7 +1516,17 @@
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
+  \usebibmacro{finentry}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{xref}}%
+  \usebibmacro{xrefpostnote}%
+  \usebibmacro{finentry}}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{crossref}}%
+  \usebibmacro{xrefpostnote}%
+  \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{reference}{%
   \usebibmacro{bibindex}%
@@ -1404,7 +1540,6 @@
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
   \setunit*{\addperiod\addspace}% need asterisk?
-  \usebibmacro{alt-in:}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -1610,6 +1745,8 @@
   \newunit%usebibmacro{byauthorpunct}% Why does this work?  No idea.
   \usebibmacro{byauthor}% Same in thesis type, as well. 16th ed.
   \setunit{\addperiod\addspace}%
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock%
   \printfield{howpublished}%
   \setunit*{\addcomma\addspace}\newblock%
   \printfield{note}%
@@ -1662,7 +1799,7 @@
   \newunit% ??? Editorpunct maybe not right here?
   \iffieldundef{maintitle}
   {}
-  {\iffieldundef{volume}
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
     {\usebibmacro{cms-in:}%
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
@@ -1736,19 +1873,69 @@
   {\printfield{url}}%
   {}}%
 
-\newbibmacro*{volume+pages}{% Volume fix
-  \iffieldundef{maintitle}%
-  {\iffieldundef{volume}%
+\newbibmacro{bib:xref+date}{% Experiment for xrefs
+  \ifboolexpr{
+    togl {cms@omitxrefdate}%
+    or
+    togl {cms@bookbibxref}%
+    or
+    test {\iffieldundef{crossref}}%
+    or
+    test {\iffieldundef{maintitle}}%
+    or
+    ((
+    test {\iffieldundef{year}}%
+    or
+    togl {cms@switchdates}%
+    )
+    and
+    (test {\iffieldundef{origyear}}%
+    or
+    not togl {cms@switchdates}%
+    ))
+  }
+  {\ifboolexpr{
+      togl {cms@omitxrefdate}%
+      or
+      togl {cms@bookbibxref}%
+      or
+      test {\iffieldundef{xref}}%
+      or
+      test {\iffieldundef{maintitle}}%
+      or
+      ((
+      test {\iffieldundef{year}}%
+      or
+      togl {cms@switchdates}%
+      )
+      and
+      (test {\iffieldundef{origyear}}%
+      or
+      not togl {cms@switchdates}%
+      ))
+    }
+    {}%
+    {\printtext[parens]{\usebibmacro{date}}}}%
+  {\printtext[parens]{\usebibmacro{date}}}}
+
+\newbibmacro*{volume+pages}{% Volume fix (modified)
+  \ifboolexpr{
+    test {\iffieldundef{maintitle}}%
+    or
+    togl {cms@vol}%
+  }%
+  {\global\togglefalse{cms@vol}%
+    \ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
     {\printfield{pages}%
       \newunit%
       \printfield{volumes}}%
     {\iffieldundef{part}%
       {\iffieldundef{pages}%
-        {}%
+        {\printfield{volume}}% Still print this w/o part or pages???
         {\ifthenelse{\iffieldnums{pages}\AND%
-            \iffieldundef{bookpagination}}%
+            \iffieldundef{bookpagination}\AND\iffieldnums{volume}}%
           {\printfield[default]{volume}%
-            \addcolon%
+            \postvolpunct%
             \printfield{pages}}%
           {\printfield{volume}%
             \addcomma\addspace%
@@ -1757,14 +1944,24 @@
         \printfield{part}%
         \newcunit%
         \printfield{pages}}}}%
-  {\printfield{pages}%
-    \newunit%
-    \printfield{volumes}}}%
+  {\ifboolexpr{
+      togl {cms@hidevolumes}%
+      and
+      (
+      not test {\iffieldundef{volume}}%
+      or
+      not test {\iffieldundef{part}}%
+      )
+    }%
+    {\printfield{pages}}%
+    {\printfield{pages}%
+      \newunit%
+      \printfield{volumes}}}}%
 
 \newbibmacro*{mtitle+mstitle+vol+part+title+stitle}{%
   \iffieldundef{maintitle}
   {}
-  {\iffieldundef{volume}
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
     {\usebibmacro{cms-in:}% 16th ed (Also 15th?)
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
@@ -1786,19 +1983,18 @@
 
 \newbibmacro*{mtitle+mstitle+vol+part+btitle+bstitle}{%
   \usebibmacro{btitle+bstitle}%
-  \iffieldundef{booktitle}
-  {\setunit{\addperiod\addspace}}% Fix customc?
-  {\setunit{\addcomma\addspace}}%
   \iffieldundef{maintitle}
   {}%
-  {\iffieldundef{volume}
+  {\ifthenelse{\(\iffieldundef{volume}\AND\iffieldundef{part}\)\OR%
+      \(\iffieldundef{booktitle}\AND\NOT\ifentrytype{bookinbook}\)}% ???
     {\usebibmacro{cms-in:}% 16th ed (also 15th?)
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
         \setunit{\addcolon\addspace}%
         \printfield[noformat]{mainsubtitle}}%
       \newcunit
-      \printfield{maintitleaddon}}
+      \printfield{maintitleaddon}%
+      \toggletrue{cms@vol}}% InIn fix
     {\printfield{volume}%
       \printfield{part}%
       \setunit{\addspace}
@@ -1822,7 +2018,7 @@
   }%
   {\iffieldundef{number}%
     {\iffieldundef{bookpagination}%
-      {\setunit{\addcolon}}%
+      {\setunit{\postvolpunct}}%
       {\setunit{\addcolon\addspace}}%
       \printfield{pages}}%
     {\newcunit\printfield{pages}}}%
@@ -1847,7 +2043,7 @@
   }%
   {\iffieldundef{number}%
     {\iffieldundef{bookpagination}%
-      {\setunit{\addcolon}}%
+      {\setunit{\postvolpunct}}%
       {\setunit{\addcolon\addspace}}%
       \printfield{pages}}%
     {\newcunit\printfield{pages}}}%