biblatex-chicago (15nov11)

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

2 files changed, 63 insertions, 29 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
index e2db39d622e..76c4808b341 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
@@ -1,11 +1,11 @@
-% $Id: chicago-authordate15.cbx,v 0.8.1.8 2011/10/10 18:03:45 dfussner Exp $
+% $Id: chicago-authordate15.cbx,v 0.8.1.9 2011/11/15 10:44:41 dfussner Exp $
 % This is a biblatex citation style file, adapted from Lehman's
 % authoryear-comp.cbx.  It is heavily modified, with the intention of
 % providing inline citations (and a reference list) for the
 % author-date style of the Chicago Manual of Style, _15th_ edition.
 
 \ProvidesFile{chicago-authordate.cbx}
-[2011/10/12 v 1.6 biblatex citation style]
+[2011/11/15 v 1.7 biblatex citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
 
@@ -785,7 +785,7 @@
 
 \DeclareFieldAlias[book]{citetitle}[book]{title}
 
-\DeclareFieldFormat[book]{title}{%
+\DeclareFieldFormat[book]{lostitle}{%
   \mkbibemph{\MakeSentenceCase*{#1}}\isdot}
 
 \DeclareFieldAlias[bookinbook]{title}[book]{title}
@@ -1193,19 +1193,26 @@
     {\bibstring{cfrom\thefield{origlanguage}}}}%
   {\unspace}}
 
-\@ifpackagelater{biblatex}{2011/07/28}
-{\newcommand*{\lbx@fromlang}{%
-    \iffieldundef{userf}
-    {\iffieldundef{origlanguage}
-      {\unspace}
-      {\bibstring{from\thefield{origlanguage}}}}%
-    {\unspace}}}
+\@ifpackagelater{biblatex}{2011/11/12}
 {\renewcommand*{\lbx@fromlang}{%
     \iffieldundef{userf}
     {\iffieldundef{origlanguage}
       {\unspace}
       {\bibstring{from\thefield{origlanguage}}}}%
     {\unspace}}}
+{\@ifpackagelater{biblatex}{2011/07/28}
+  {\newcommand*{\lbx@fromlang}{%
+      \iffieldundef{userf}
+      {\iffieldundef{origlanguage}
+        {\unspace}
+        {\bibstring{from\thefield{origlanguage}}}}%
+      {\unspace}}}%
+  {\renewcommand*{\lbx@fromlang}{%
+      \iffieldundef{userf}
+      {\iffieldundef{origlanguage}
+        {\unspace}
+        {\bibstring{from\thefield{origlanguage}}}}%
+      {\unspace}}}}
 
 \renewcommand*{\lbx@lfromlang}{%
   \iffieldundef{userf}
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 84dcff0df5d..86ee1ef255c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
@@ -1,11 +1,11 @@
-% $Id: chicago-notes15.cbx,v 0.9.7.13 2011/10/12 13:23:11 dfussner Exp $
+% $Id: chicago-notes15.cbx,v 0.9.7.15 2011/11/15 16:13:16 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
 % according to the specifications of the Chicago Manual of Style,
 % _15th_ edition.
 
-\ProvidesFile{chicago-notes.cbx}[2011/10/12 v 1.6 biblatex citation style]
+\ProvidesFile{chicago-notes.cbx}[2011/11/15 v 1.7 biblatex citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
 
@@ -269,12 +269,22 @@
         \bibrightbracket\classicpunct}%
       {\printnames{labelname}%
         \isdot\classicpunct}}}%
-  \printtext[bibhyperlink]{%
-    \printfield[citetitle]{labeltitle}}}%:\thefield{entrytype}?
+  \ifboolexpr{%
+    togl {cms@allshort}%
+    or
+    test {\ifbibliography}
+  }%
+  {\printtext[bibhyperref]{%
+    \printfield[citetitle]{labeltitle}}}%
+  {\printtext[bibhyperlink]{%
+    \printfield[citetitle]{labeltitle}}}}%:\thefield{entrytype}?
 
 \newbibmacro*{cite:shorthand}{%
-  \printtext[bibhyperlink]{%
-    \printfield{shorthand}}}
+  \iftoggle{cms@allshort}%
+  {\printtext[bibhyperref]{%
+      \printfield{shorthand}}}%
+  {\printtext[bibhyperlink]{%
+      \printfield{shorthand}}}}
 
 \newbibmacro*{cms:shorthandintro}{% For changing the citedas phrase
   \iffieldundef{shorthandintro}%
@@ -290,8 +300,11 @@
     \global\togglefalse{cms@fullnote}%
     \usebibmacro{cite:short}%
     \usebibmacro{cite:save}}%
-  {\printtext[bibhyperlink]{%
-      \bibstring[\mkibid]{ibidem}}
+  {\iftoggle{cms@allshort}%
+    {\printtext[bibhyperref]{%
+        \bibstring[\mkibid]{ibidem}}}%
+    {\printtext[bibhyperlink]{%
+        \bibstring[\mkibid]{ibidem}}}%
     \ifloccit
     {\global\toggletrue{cms@loccit}}%
     {}}}
@@ -421,7 +434,10 @@
   {}
 
 \DeclareCiteCommand{\origfullcite}
-  {\nopunct\unspace}% Put \nopunct and \unspace here for 0.8e.
+  {\ifhyperref%
+    {\hypertarget{cite.\the\c@refsection @\abx@field@entrykey}{}}%
+    {}%
+    \nopunct\unspace}% Put \nopunct and \unspace here for 0.8e.
   {\usedriver
     {\DeclareNameAlias{sortname}{default}\clearfield{postnote}
       \clearname{author}\clearfield{userf}\toggletrue{cms@fullnote}%
@@ -431,7 +447,10 @@
   {\finentry}% Helps with annotated bibliographies (?)
 
 \DeclareCiteCommand{\origpublcite}% Similar to above, w/o title.
-  {\nopunct\unspace}% Put \nopunct and \unspace here for 0.8e.
+  {\ifhyperref%
+    {\hypertarget{cite.\the\c@refsection @\abx@field@entrykey}{}}%
+    {}%
+    \nopunct\unspace}% Put \nopunct and \unspace here for 0.8e.
   {\usedriver
     {\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
       \usebibmacro{clearpublin}%
@@ -443,11 +462,12 @@
 
 \DeclareCiteCommand{\headlessfullcite}
   {\usebibmacro{hlprenote}}%
-  {\usedriver
+  {\printtext[bibhypertarget]{%
+      \usedriver
      {\DeclareNameAlias{sortname}{default}\clearname{author}%
        \toggletrue{cms@fullnote}\toggletrue{cms@headlessnote}%
        \usebibmacro{cite:save}}%
-     {cite:\thefield{entrytype}}}%
+     {cite:\thefield{entrytype}}}}%
   {\multicitedelim}%
   {}%\usebibmacro{finentry}}
 
@@ -2563,19 +2583,26 @@
     {\bibstring{cfrom\thefield{origlanguage}}}}%
   {\unspace}}
 
-\@ifpackagelater{biblatex}{2011/07/28}
-{\newcommand*{\lbx@fromlang}{%
-    \iffieldundef{userf}
-    {\iffieldundef{origlanguage}
-      {\unspace}
-      {\bibstring{from\thefield{origlanguage}}}}%
-    {\unspace}}}
+\@ifpackagelater{biblatex}{2011/11/12}
 {\renewcommand*{\lbx@fromlang}{%
     \iffieldundef{userf}
     {\iffieldundef{origlanguage}
       {\unspace}
       {\bibstring{from\thefield{origlanguage}}}}%
     {\unspace}}}
+{\@ifpackagelater{biblatex}{2011/07/28}
+  {\newcommand*{\lbx@fromlang}{%
+      \iffieldundef{userf}
+      {\iffieldundef{origlanguage}
+        {\unspace}
+        {\bibstring{from\thefield{origlanguage}}}}%
+      {\unspace}}}%
+  {\renewcommand*{\lbx@fromlang}{%
+      \iffieldundef{userf}
+      {\iffieldundef{origlanguage}
+        {\unspace}
+        {\bibstring{from\thefield{origlanguage}}}}%
+      {\unspace}}}}
 
 \renewcommand*{\lbx@lfromlang}{%
   \iffieldundef{userf}