summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-chicago
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-03-26 21:47:10 +0000
committerKarl Berry <karl@freefriends.org>2017-03-26 21:47:10 +0000
commitf8762324153348fa9bf6b30db072f810d5fa0469 (patch)
treefba075f36239a37ca39bc4cc8952ae15fa1f44ea /Master/texmf-dist/tex/latex/biblatex-chicago
parentf281d730a5b02f4c9ddd75caf59c2bdb2b2f4b43 (diff)
biblatex-chicago (26mar17)
git-svn-id: svn://tug.org/texlive/trunk@43607 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-chicago')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx3
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx39
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx3
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common.cbx144
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx193
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx28
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx28
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx28
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx28
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx28
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-swedish.lbx18
16 files changed, 450 insertions, 160 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx
index 296810b80e9..6cdc32a3563 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx
@@ -1,4 +1,5 @@
-% $Id: chicago-authordate-trad.cbx,v 0.8.3.9 2016/06/07 09:29:05 dfussner Exp $
+% $Id: chicago-authordate-trad.cbx,v 0.8.3.10 2017/03/22 13:52:18 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
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
index f864ea55b06..a44568292f9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
@@ -1,4 +1,5 @@
-% $Id: chicago-authordate.bbx,v 0.8.2.22 2016/06/07 08:46:51 dfussner Exp $
+% $Id: chicago-authordate.bbx,v 0.8.2.24 2017/03/25 14:08:25 dfussner Exp $
+
% This is a biblatex style file, adapted mainly from Lehman's
% standard.bbx and from chicago-notes.bbx. It provides the
% reference list formatting for the Chicago author-date style.
@@ -2690,7 +2691,8 @@ bibliography style]
{\clearfield{urlyear}}%
{\iffieldsequal{urlyear}{urlendyear}%
{\clearfield{urlyear}\clearfield{urlendyear}}%
- {}}}}}%
+ {}}%
+ \usebibmacro{cms@test@labelend}}}}%
{\printfield{labelyear}%
\iffieldundef{extrayear}%
{}%
@@ -2709,7 +2711,8 @@ bibliography style]
{\clearfield{origyear}}%
{\iffieldsequal{origyear}{origendyear}%
{\clearfield{origyear}\clearfield{origendyear}}%
- {}}}}}}%
+ {}}%
+ \usebibmacro{cms@test@labelend}}}}}%
{\printfield{labelyear}%
\iffieldundef{extrayear}%
{}%
@@ -2728,7 +2731,8 @@ bibliography style]
{\clearfield{eventyear}}%
{\iffieldsequal{eventyear}{eventendyear}%
{\clearfield{eventyear}\clearfield{eventendyear}}%
- {}}}}}}%
+ {}}%
+ \usebibmacro{cms@test@labelend}}}}}%
{\printfield{labelyear}%
\iffieldundef{extrayear}%
{}%
@@ -2747,7 +2751,8 @@ bibliography style]
{\clearfield{year}}%
{\iffieldsequal{year}{endyear}%
{\clearfield{year}\clearfield{endyear}}%
- {}}}}}}}%
+ {}}%
+ \usebibmacro{cms@test@labelend}}}}}}%
\newbibmacro*{origfirst+labelyear+extrayear}{%
\ifthenelse{\iffieldundef{labelyear}\OR%
@@ -2785,7 +2790,8 @@ bibliography style]
{\clearfield{urlyear}}%
{\iffieldsequal{urlyear}{urlendyear}%
{\clearfield{urlyear}\clearfield{urlendyear}}%
- {}}}}}%
+ {}}%
+ \usebibmacro{cms@test@labelend}}}}%
{\printfield{labelyear}%
\iffieldundef{extrayear}%
{}%
@@ -2804,7 +2810,8 @@ bibliography style]
{\clearfield{eventyear}}%
{\iffieldsequal{eventyear}{eventendyear}%
{\clearfield{eventyear}\clearfield{eventendyear}}%
- {}}}}}}%
+ {}}%
+ \usebibmacro{cms@test@labelend}}}}}%
{\printfield{labelyear}%
\iffieldundef{extrayear}%
{}%
@@ -2823,7 +2830,8 @@ bibliography style]
{\clearfield{year}}%
{\iffieldsequal{year}{endyear}%
{\clearfield{year}\clearfield{endyear}}%
- {}}}}}}%
+ {}}%
+ \usebibmacro{cms@test@labelend}}}}}%
{\printfield{labelyear}%
\iffieldundef{extrayear}%
{}%
@@ -2842,7 +2850,8 @@ bibliography style]
{\clearfield{origyear}}%
{\iffieldsequal{origyear}{origendyear}%
{\clearfield{origyear}\clearfield{origendyear}}%
- {}}}}}}}%
+ {}}%
+ \usebibmacro{cms@test@labelend}}}}}}%
\newbibmacro*{av+labelyear+extrayear}{%
\ifthenelse{\iffieldundef{labelyear}\OR%
@@ -2880,7 +2889,8 @@ bibliography style]
{\clearfield{urlyear}}%
{\iffieldsequal{urlyear}{urlendyear}%
{\clearfield{urlyear}\clearfield{urlendyear}}%
- {}}}}}%
+ {}}%
+ \usebibmacro{cms@test@labelend}}}}%
{\printfield{labelyear}%
\iffieldundef{extrayear}%
{}%
@@ -2899,7 +2909,8 @@ bibliography style]
{\clearfield{year}}%
{\iffieldsequal{year}{endyear}%
{\clearfield{year}\clearfield{endyear}}%
- {}}}}}}%
+ {}}%
+ \usebibmacro{cms@test@labelend}}}}}%
{\printfield{labelyear}%
\iffieldundef{extrayear}%
{}%
@@ -2918,7 +2929,8 @@ bibliography style]
{\clearfield{origyear}}%
{\iffieldsequal{origyear}{origendyear}%
{\clearfield{origyear}\clearfield{origendyear}}%
- {}}}}}}%
+ {}}%
+ \usebibmacro{cms@test@labelend}}}}}%
{\printfield{labelyear}%
\iffieldundef{extrayear}%
{}%
@@ -2937,7 +2949,8 @@ bibliography style]
{\clearfield{eventyear}}%
{\iffieldsequal{eventyear}{eventendyear}%
{\clearfield{eventyear}\clearfield{eventendyear}}%
- {}}}}}}}%
+ {}}%
+ \usebibmacro{cms@test@labelend}}}}}}%
\newbibmacro*{origyear+endyear}{%
\printfield{origyear}%
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 df02300309f..b6b25b969a2 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
@@ -1,4 +1,5 @@
-% $Id: chicago-authordate.cbx,v 0.8.3.12 2016/06/07 09:26:22 dfussner Exp $
+% $Id: chicago-authordate.cbx,v 0.8.3.13 2017/03/22 13:40:56 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
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 c0b4b338168..d9a9eca34e2 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,5 @@
-% $Id: chicago-dates-common.cbx,v 0.9.1.21 2016/06/07 09:00:02 dfussner Exp $
+% $Id: chicago-dates-common.cbx,v 0.9.1.31 2017/03/25 14:35:52 dfussner Exp $
+
% This is a biblatex citation style file, adapted from Lehman's
% authoryear-comp.cbx. It is heavily modified, and contains the
% common code for providing inline citations (and a reference list)
@@ -29,6 +30,7 @@ citation style]
\providetoggle{cms@authorparens}
\providetoggle{cms@datedash}
\providetoggle{cms@modpostnote}
+\providetoggle{cms@ukord}
\providetoggle{cms@url}% These are for the field-exclusion options
\providetoggle{cms@doi}
@@ -78,8 +80,8 @@ citation style]
\def\cms@opt@avdate@true{%
\@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{eventyear}%
- \field{origyear} \field{year} \field{urlyear}}}%
+ {\DeclareLabeldate[music,review,suppperiodical,video]{\field{eventdate}%
+ \field{origdate} \field{date} \field{urldate}}}%
{\DeclareLabelyear[music,review,suppperiodical,video]{\field{eventyear}%
\field{origyear} \field{year} \field{urlyear}}}}%
{\DeclareLabelyear[music,review,suppperiodical,video]%
@@ -114,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{origyear} \field{year}%
- \field{eventyear} \field{urlyear}}%
- \DeclareLabeldate[patent]{\field{year} \field{eventyear}%
- \field{origyear} \field{urlyear}}}%
+ {\DeclareLabeldate{\field{origdate} \field{date}%
+ \field{eventdate} \field{urldate}}%
+ \DeclareLabeldate[patent]{\field{date} \field{eventdate}%
+ \field{origdate} \field{urldate}}}%
{\DeclareLabelyear{\field{origyear} \field{year}%
\field{eventyear} \field{urlyear}}%
\DeclareLabelyear[patent]{\field{year} \field{eventyear}%
@@ -286,6 +288,9 @@ citation style]
\DeclareEntryOption[boolean]{related}[true]{%
\settoggle{cms@related}{#1}}%
+\DeclareBibliographyOption[boolean]{ordinalgb}[true]{%
+ \settoggle{cms@ukord}{#1}}%
+
% Controlling punctuation before titleaddon fields %
\DeclareBibliographyOption[string]{ptitleaddon}[period]{%
@@ -406,13 +411,17 @@ citation style]
\ExecuteBibliographyOptions{includeall,hidevolumes,booklongxref,related,%
ctitleaddon,ptitleaddon,journalabbrev=notes}%
-\@ifpackagelater{biblatex}{2013/03/30}% For biblatex 2.6 ff.
-{\ExecuteBibliographyOptions{labeldate=true}}%
-{\ExecuteBibliographyOptions{labelyear=true}}%
+\@ifpackagelater{biblatex}{2016/09/01}% For biblatex 2.6 ff.
+{\ExecuteBibliographyOptions{labeldateparts=true}}%
+{\@ifpackagelater{biblatex}{2013/03/30}
+ {\ExecuteBibliographyOptions{labeldate=true}}
+ {\ExecuteBibliographyOptions{labelyear=true}}}%
-\@ifpackagelater{biblatex}{2014/02/20}% For biblatex 2.9 ff.
-{\global\toggletrue{cms@datedash}}%
-{\global\togglefalse{cms@datedash}}%
+\@ifpackagelater{biblatex}{2016/09/01}% For biblatex 3.5 ff.
+{\global\togglefalse{cms@datedash}}
+{\@ifpackagelater{biblatex}{2014/02/20}% For biblatex 2.9 ff.
+ {\global\toggletrue{cms@datedash}}%
+ {\global\togglefalse{cms@datedash}}}%
\DeclareDataInheritance{collection}{suppcollection}{%
\inherit{title}{title}
@@ -491,7 +500,7 @@ citation style]
% More authordate options %
-\DeclareSortingScheme{cms}{
+\DeclareSortingScheme{cms}{% Updated to >2.0 format
\sort{
\field{presort}
}
@@ -499,16 +508,16 @@ citation style]
\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{
@@ -739,7 +748,7 @@ citation style]
togl {cms@gencite}%
and
(
- test {\iflastcitekey}%
+ test {\iffinalcitedelim}%
or
togl {cms@genallnames}%
)
@@ -758,7 +767,7 @@ citation style]
togl {cms@gencite}%
and
(
- test {\iflastcitekey}%
+ test {\iffinalcitedelim}%
or
togl {cms@genallnames}%
)
@@ -780,7 +789,7 @@ citation style]
togl {cms@gencite}%
and
(
- test {\iflastcitekey}%
+ test {\iffinalcitedelim}%
or
togl {cms@genallnames}%
)
@@ -843,7 +852,11 @@ citation style]
\ifboolexpr{%
togl {cms@gencite}%
and
- test {\iflastcitekey}%
+ (
+ test {\iffinalcitedelim}%
+ or
+ togl {cms@genallnames}%
+ )
}%
{\thegen}%
{}%
@@ -860,7 +873,11 @@ citation style]
\ifboolexpr{%
togl {cms@gencite}%
and
- test {\iflastcitekey}%
+ (
+ test {\iffinalcitedelim}%
+ or
+ togl {cms@genallnames}%
+ )
}%
{\thegen}%
{}%
@@ -1007,7 +1024,7 @@ citation style]
not togl {cms@datedash}%
}%
{\mbox{\bibdatedash}}%
- {}}}%
+ {\usebibmacro{cms@test@labelend}}}}%
{\printfield{labelyear}%
\iffieldundef{extrayear}%
{}%
@@ -1021,7 +1038,7 @@ citation style]
not togl {cms@datedash}%
}%
{\mbox{\bibdatedash}}%
- {}}}}%
+ {\usebibmacro{cms@test@labelend}}}}}%
{\printfield{labelyear}%
\iffieldundef{extrayear}%
{}%
@@ -1035,7 +1052,7 @@ citation style]
not togl {cms@datedash}%
}%
{\mbox{\bibdatedash}}%
- {}}}}%
+ {\usebibmacro{cms@test@labelend}}}}}%
{\printfield{labelyear}%
\iffieldundef{extrayear}%
{}%
@@ -1049,7 +1066,7 @@ citation style]
not togl {cms@datedash}%
}%
{\mbox{\bibdatedash}}%
- {}}}}}}%
+ {\usebibmacro{cms@test@labelend}}}}}}}%
\newbibmacro*{cite:origfirst+labelyear+extrayear}{%
\ifthenelse{\iffieldundef{labelyear}\OR%
@@ -1084,7 +1101,7 @@ citation style]
not togl {cms@datedash}%
}%
{\mbox{\bibdatedash}}%
- {}}}%
+ {\usebibmacro{cms@test@labelend}}}}%
{\printfield{labelyear}%
\iffieldundef{extrayear}%
{}%
@@ -1098,7 +1115,7 @@ citation style]
not togl {cms@datedash}%
}%
{\mbox{\bibdatedash}}%
- {}}}}%
+ {\usebibmacro{cms@test@labelend}}}}}%
{\printfield{labelyear}%
\iffieldundef{extrayear}%
{}%
@@ -1112,7 +1129,7 @@ citation style]
not togl {cms@datedash}%
}%
{\mbox{\bibdatedash}}%
- {}}}}%
+ {\usebibmacro{cms@test@labelend}}}}}%
{\printfield{labelyear}%
\iffieldundef{extrayear}%
{}%
@@ -1126,7 +1143,7 @@ citation style]
not togl {cms@datedash}%
}%
{\mbox{\bibdatedash}}%
- {}}}}}}%
+ {\usebibmacro{cms@test@labelend}}}}}}}%
\newbibmacro*{cite:av+labelyear+extrayear}{%
\ifthenelse{\iffieldundef{labelyear}\OR%
@@ -1161,7 +1178,7 @@ citation style]
not togl {cms@datedash}%
}%
{\mbox{\bibdatedash}}%
- {}}}%
+ {\usebibmacro{cms@test@labelend}}}}%
{\printfield{labelyear}%
\iffieldundef{extrayear}%
{}%
@@ -1175,7 +1192,7 @@ citation style]
not togl {cms@datedash}%
}%
{\mbox{\bibdatedash}}%
- {}}}}%
+ {\usebibmacro{cms@test@labelend}}}}}%
{\printfield{labelyear}%
\iffieldundef{extrayear}%
{}%
@@ -1189,7 +1206,7 @@ citation style]
not togl {cms@datedash}%
}%
{\mbox{\bibdatedash}}%
- {}}}}%
+ {\usebibmacro{cms@test@labelend}}}}}%
{\printfield{labelyear}%
\iffieldundef{extrayear}%
{}%
@@ -1203,7 +1220,15 @@ citation style]
not togl {cms@datedash}%
}%
{\mbox{\bibdatedash}}%
- {}}}}}}%
+ {\usebibmacro{cms@test@labelend}}}}}}}%
+
+\newbibmacro*{cms@test@labelend}{% For printing year ranges in 3.5 ff.
+ \iffieldundef{labelendyear}%
+ {}%
+ {\ifthenelse{\iffieldequalstr{labelendyear}{}\OR%
+ \iffieldsequal{labelyear}{labelendyear}}%
+ {}%
+ {\bibdatedash\printfield{labelendyear}}}}%
\newbibmacro*{cmscitesortdate}{% Attempt to solve date-related problems
\ifboolexpr{%
@@ -1887,10 +1912,43 @@ citation style]
\newcommand{\parttrans}{%
{\bibstring{bytranslator}\space}}%
-\newcommand{\partedit}{%
- \iftoggle{cms@postposit}% Kludge to make it work in French.
- {\bibstring{byeditoralt}\addspace}%
- {\bibstring{byeditor}\addspace}}%
+% \newcommand{\partedit}{%
+% \iftoggle{cms@postposit}% Kludge to make it work in French.
+% {\bibstring{byeditoralt}\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}{\bibstring{byeditor}\addspace}%
\newcommand{\partcomp}{%
{\bibstring{bycompiler}\space}}%
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{
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 7f20c9bff08..9e39b625faf 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx
@@ -1,13 +1,22 @@
-% $Id: cms-american.lbx,v 0.10.1.36 2016/06/01 11:02:59 dfussner Exp $
+% $Id: cms-american.lbx,v 0.10.1.37 2016/10/12 14:17:45 dfussner Exp $
\ProvidesFile{cms-american.lbx}[2016/06/01 v 3.4 biblatex localization]
\InheritBibliographyExtras{american}
\DeclareBibliographyExtras{%
+ \savecommand\mkdaterangecomp
+ \savecommand\mkdaterangeterse
+ \savecommand\mkdaterangefull
\savecommand\mkbibrangecomp
\savecommand\mkbibrangeterse
\savecommand\mkbibrangefull
+ \protected\def\mkdaterangecomp{%
+ \lbx@cms@mkbibrangetrunc@long{long}}%
+ \protected\def\mkdaterangeterse{%
+ \lbx@cms@mkbibrangetrunc@short{short}}%
+ \protected\def\mkdaterangefull{%
+ \lbx@cms@mkbibrangefull}%
\protected\def\mkbibrangecomp{%
\lbx@cms@mkbibrangetrunc@long{long}}%
\protected\def\mkbibrangeterse{%
@@ -16,6 +25,9 @@
\lbx@cms@mkbibrangefull}}%
\UndeclareBibliographyExtras{%
+ \restorecommand\mkdaterangecomp%
+ \restorecommand\mkdaterangeterse%
+ \restorecommand\mkdaterangefull%
\restorecommand\mkbibrangecomp%
\restorecommand\mkbibrangeterse%
\restorecommand\mkbibrangefull%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx
index 4e6e0927947..6150ec53b00 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx
@@ -1,4 +1,4 @@
-% $Id: cms-british.lbx,v 0.8 2016/06/01 11:06:59 dfussner Exp $
+% $Id: cms-british.lbx,v 0.11 2017/03/22 18:35:48 dfussner Exp $
\ProvidesFile{cms-british.lbx}[2016/06/01 v 3.4 biblatex localization]
@@ -7,21 +7,47 @@
\DeclareBibliographyExtras{%
\savecommand\cms@datelong
\savecommand\cms@datelongalt
+ \savecommand\mkdaterangecomp
+ \savecommand\mkdaterangeterse
+ \savecommand\mkdaterangefull
\savecommand\mkbibrangecomp
\savecommand\mkbibrangeterse
\savecommand\mkbibrangefull
+ \protected\def\mkdaterangecomp{%
+ \lbx@cms@mkbibrangetrunc{long}}%
+ \protected\def\mkdaterangeterse{%
+ \lbx@cms@mkbibrangetrunc{short}}%
+ \protected\def\mkdaterangefull{%
+ \lbx@cms@mkbibrangefull}%
\protected\def\mkbibrangecomp{%
\lbx@cms@mkbibrangetrunc{long}}%
\protected\def\mkbibrangeterse{%
\lbx@cms@mkbibrangetrunc{short}}%
\protected\def\mkbibrangefull{%
\lbx@cms@mkbibrangefull}%
+ \protected\def\mkbibdatelong#1#2#3{%
+ \iffieldundef{#3}%
+ {}%
+ {\iftoggle{cms@ukord}%
+ {\mkbibordinal{\thefield{#3}}}%
+ {\stripzeros{\thefield{#3}}}%
+ \iffieldundef{#2}{}{\nobreakspace}}%
+ \iffieldundef{#2}%
+ {}%
+ {\mkbibmonth{\thefield{#2}}%
+ \iffieldundef{#1}{}{\space}}%
+ \iffieldbibstring{#1}%
+ {\bibstring{\thefield{#1}}}%
+ {\stripzeros{\thefield{#1}}}}% FIXME: dateeraprintpre{#1}
\def\cms@datelong{\printorigdate}%
\def\cms@datelongalt{\printdate}}%
\UndeclareBibliographyExtras{%
\restorecommand\cms@datelong
\restorecommand\cms@datelongalt
+ \restorecommand\mkdaterangecomp%
+ \restorecommand\mkdaterangefull%
+ \restorecommand\mkdaterangeterse%
\restorecommand\mkbibrangecomp%
\restorecommand\mkbibrangefull%
\restorecommand\mkbibrangeterse}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx
index 7383f84b5f8..531ee84f7ec 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx
@@ -1,4 +1,4 @@
-% $Id: cms-finnish.lbx,v 0.7 2016/06/01 11:09:39 dfussner Exp $
+% $Id: cms-finnish.lbx,v 0.8 2017/01/20 12:11:25 dfussner Exp $
\ProvidesFile{cms-finnish.lbx}[2016/06/01 v 3.4 biblatex localization]
@@ -11,6 +11,9 @@
\InheritBibliographyExtras{finnish}
\DeclareBibliographyExtras{%
+ \savecommand\mkdaterangecomp
+ \savecommand\mkdaterangeterse
+ \savecommand\mkdaterangefull
\savecommand\mkbibrangecomp
\savecommand\mkbibrangeterse
\savecommand\mkbibrangefull
@@ -39,6 +42,12 @@
{}}%
\def\cms@datelong{\printorigdate}%
\def\cms@datelongalt{\printdate}%
+ \protected\def\mkdaterangecomp{% DATE FIX
+ \lbx@cms@mkbibrangetrunc{long}}%
+ \protected\def\mkdaterangeterse{%
+ \lbx@cms@mkbibrangetrunc{short}}%
+ \protected\def\mkdaterangefull{%
+ \lbx@cms@mkbibrangefull}%
\protected\def\mkbibrangecomp{% DATE FIX
\lbx@cms@mkbibrangetrunc{long}}%
\protected\def\mkbibrangeterse{%
@@ -50,6 +59,9 @@
\restorecommand\lbx@fromlang
\restorecommand\cms@datelong
\restorecommand\cms@datelongalt
+ \restorecommand\mkdaterangecomp% DATE FIX
+ \restorecommand\mkdaterangeterse%
+ \restorecommand\mkdaterangefull%
\restorecommand\mkbibrangecomp% DATE FIX
\restorecommand\mkbibrangeterse%
\restorecommand\mkbibrangefull}
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx
index e9447443c5f..29e3d133d9c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx
@@ -1,4 +1,4 @@
-% $Id: cms-french.lbx,v 0.9.5.30 2016/06/01 17:16:43 dfussner Exp $
+% $Id: cms-french.lbx,v 0.9.5.32 2017/01/19 14:39:59 dfussner Exp $
\ProvidesFile{cms-french.lbx}[2016/06/01 v 3.4 biblatex localization]
@@ -19,9 +19,18 @@
\protected\def\mkbibnamefamily#1{\textnohyphenation{#1}}%
\savecommand\cms@datelong
\savecommand\cms@datelongalt
+ \savecommand\mkdaterangecomp
+ \savecommand\mkdaterangeterse
+ \savecommand\mkdaterangefull
\savecommand\mkbibrangecomp
\savecommand\mkbibrangeterse
\savecommand\mkbibrangefull
+ \protected\def\mkdaterangecomp{%
+ \lbx@cms@mkbibrangetrunc{long}}%
+ \protected\def\mkdaterangeterse{%
+ \lbx@cms@mkbibrangetrunc{short}}%
+ \protected\def\mkdaterangefull{%
+ \lbx@cms@mkbibrangefull}%
\protected\def\mkbibrangecomp{%
\lbx@cms@mkbibrangetrunc{long}}%
\protected\def\mkbibrangeterse{%
@@ -38,6 +47,9 @@
\restorecommand\cms@datelong
\restorecommand\cms@datelongalt
\togglefalse{cms@postposit}%
+ \restorecommand\mkdaterangecomp%
+ \restorecommand\mkdaterangeterse%
+ \restorecommand\mkdaterangefull%
\restorecommand\mkbibrangecomp%
\restorecommand\mkbibrangefull%
\restorecommand\mkbibrangeterse}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx
index ed7f10237df..488276ab52b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx
@@ -1,4 +1,4 @@
-% $Id: cms-german.lbx,v 0.9.5.29 2016/06/01 11:15:48 dfussner Exp $
+% $Id: cms-german.lbx,v 0.9.5.30 2017/01/19 14:51:38 dfussner Exp $
\ProvidesFile{cms-german.lbx}[2016/06/01 v 3.4 biblatex localization]
@@ -9,6 +9,9 @@
\InheritBibliographyExtras{german}
\DeclareBibliographyExtras{%
+ \savecommand\mkdaterangecomp
+ \savecommand\mkdaterangeterse
+ \savecommand\mkdaterangefull
\savecommand\mkbibrangecomp
\savecommand\mkbibrangeterse
\savecommand\mkbibrangefull
@@ -37,6 +40,12 @@
{}}%
\def\cms@datelong{\printorigdate}%
\def\cms@datelongalt{\printdate}%
+ \protected\def\mkdaterangecomp{% DATE FIX
+ \lbx@cms@mkbibrangetrunc{long}}%
+ \protected\def\mkdaterangeterse{%
+ \lbx@cms@mkbibrangetrunc{short}}%
+ \protected\def\mkdaterangefull{%
+ \lbx@cms@mkbibrangefull}
\protected\def\mkbibrangecomp{% DATE FIX
\lbx@cms@mkbibrangetrunc{long}}%
\protected\def\mkbibrangeterse{%
@@ -48,6 +57,9 @@
\restorecommand\lbx@fromlang
\restorecommand\cms@datelong
\restorecommand\cms@datelongalt
+ \restorecommand\mkdaterangecomp%
+ \restorecommand\mkdaterangeterse%
+ \restorecommand\mkdaterangefull%
\restorecommand\mkbibrangecomp% DATE FIX
\restorecommand\mkbibrangeterse%
\restorecommand\mkbibrangefull}
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx
index 05f0a826771..1effa853728 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx
@@ -1,4 +1,4 @@
-% $Id: cms-icelandic.lbx,v 0.11 2016/06/01 11:19:41 dfussner Exp $
+% $Id: cms-icelandic.lbx,v 0.12 2017/01/20 12:22:28 dfussner Exp $
\ProvidesFile{cms-icelandic.lbx}[2016/06/01 v 3.4 biblatex localization]
@@ -18,11 +18,20 @@
\InheritBibliographyExtras{icelandic}
\DeclareBibliographyExtras{%
- \savecommand\cms@datelong
- \savecommand\cms@datelongalt
- \savecommand\mkbibrangecomp
- \savecommand\mkbibrangeterse
- \savecommand\mkbibrangefull
+ \savecommand\cms@datelong%
+ \savecommand\cms@datelongalt%
+ \savecommand\mkdaterangecomp%
+ \savecommand\mkdaterangeterse%
+ \savecommand\mkdaterangefull%
+ \savecommand\mkbibrangecomp%
+ \savecommand\mkbibrangeterse%
+ \savecommand\mkbibrangefull%
+ \protected\def\mkdaterangecomp{%
+ \lbx@cms@mkbibrangetrunc{long}}%
+ \protected\def\mkdaterangeterse{%
+ \lbx@cms@mkbibrangetrunc{short}}%
+ \protected\def\mkdaterangefull{%
+ \lbx@cms@mkbibrangefull}%
\protected\def\mkbibrangecomp{%
\lbx@cms@mkbibrangetrunc{long}}%
\protected\def\mkbibrangeterse{%
@@ -33,8 +42,11 @@
\def\cms@datelongalt{\printdate}}%
\UndeclareBibliographyExtras{%
- \restorecommand\cms@datelong
- \restorecommand\cms@datelongalt
+ \restorecommand\cms@datelong%
+ \restorecommand\cms@datelongalt%
+ \restorecommand\mkdaterangecomp%
+ \restorecommand\mkdaterangefull%
+ \restorecommand\mkdaterangeterse%
\restorecommand\mkbibrangecomp%
\restorecommand\mkbibrangefull%
\restorecommand\mkbibrangeterse}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx
index 101815445d5..a21a38fb812 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx
@@ -1,4 +1,4 @@
-% $Id: cms-german.lbx,v 0.9.5.29 2016/06/01 11:15:48 dfussner Exp $
+% $Id: cms-german.lbx,v 0.9.5.30 2017/01/19 14:51:38 dfussner Exp $
\ProvidesFile{cms-ngerman.lbx}[2016/06/01 v 3.4 biblatex localization]
@@ -9,6 +9,9 @@
\InheritBibliographyExtras{ngerman}
\DeclareBibliographyExtras{%
+ \savecommand\mkdaterangecomp
+ \savecommand\mkdaterangeterse
+ \savecommand\mkdaterangefull
\savecommand\mkbibrangecomp
\savecommand\mkbibrangeterse
\savecommand\mkbibrangefull
@@ -37,6 +40,12 @@
{}}%
\def\cms@datelong{\printorigdate}%
\def\cms@datelongalt{\printdate}%
+ \protected\def\mkdaterangecomp{% DATE FIX
+ \lbx@cms@mkbibrangetrunc{long}}%
+ \protected\def\mkdaterangeterse{%
+ \lbx@cms@mkbibrangetrunc{short}}%
+ \protected\def\mkdaterangefull{%
+ \lbx@cms@mkbibrangefull}
\protected\def\mkbibrangecomp{% DATE FIX
\lbx@cms@mkbibrangetrunc{long}}%
\protected\def\mkbibrangeterse{%
@@ -48,6 +57,9 @@
\restorecommand\lbx@fromlang
\restorecommand\cms@datelong
\restorecommand\cms@datelongalt
+ \restorecommand\mkdaterangecomp%
+ \restorecommand\mkdaterangeterse%
+ \restorecommand\mkdaterangefull%
\restorecommand\mkbibrangecomp% DATE FIX
\restorecommand\mkbibrangeterse%
\restorecommand\mkbibrangefull}
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx
index 848884d4d30..87fec55270e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx
@@ -1,4 +1,4 @@
-% $Id: cms-norsk.lbx,v 1.7 2016/06/01 11:22:00 dfussner Exp $
+% $Id: cms-norsk.lbx,v 1.8 2017/01/20 12:27:00 dfussner Exp $
\ProvidesFile{cms-norsk.lbx}[2016/06/01 v 3.4 biblatex localization]
@@ -9,11 +9,20 @@
\InheritBibliographyExtras{norsk}
\DeclareBibliographyExtras{%
- \savecommand\cms@datelong
- \savecommand\cms@datelongalt
- \savecommand\mkbibrangecomp
- \savecommand\mkbibrangeterse
- \savecommand\mkbibrangefull
+ \savecommand\cms@datelong%
+ \savecommand\cms@datelongalt%
+ \savecommand\mkdaterangecomp%
+ \savecommand\mkdaterangeterse%
+ \savecommand\mkdaterangefull%
+ \savecommand\mkbibrangecomp%
+ \savecommand\mkbibrangeterse%
+ \savecommand\mkbibrangefull%
+ \protected\def\mkdaterangecomp{%
+ \lbx@cms@mkbibrangetrunc{long}}%
+ \protected\def\mkdaterangeterse{%
+ \lbx@cms@mkbibrangetrunc{short}}%
+ \protected\def\mkdaterangefull{%
+ \lbx@cms@mkbibrangefull}%
\protected\def\mkbibrangecomp{%
\lbx@cms@mkbibrangetrunc{long}}%
\protected\def\mkbibrangeterse{%
@@ -24,8 +33,11 @@
\def\cms@datelongalt{\printdate}}%
\UndeclareBibliographyExtras{%
- \restorecommand\cms@datelong
- \restorecommand\cms@datelongalt
+ \restorecommand\cms@datelong%
+ \restorecommand\cms@datelongalt%
+ \restorecommand\mkdaterangecomp%
+ \restorecommand\mkdaterangefull%
+ \restorecommand\mkdaterangeterse%
\restorecommand\mkbibrangecomp%
\restorecommand\mkbibrangefull%
\restorecommand\mkbibrangeterse}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx
index 83de0f3ddd1..612ae96e0e2 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx
@@ -1,4 +1,4 @@
-% $Id: cms-norwegian.lbx,v 1.7 2016/06/01 11:03:14 dfussner Exp $
+% $Id: cms-norwegian.lbx,v 1.8 2017/01/20 13:28:24 dfussner Exp $
\ProvidesFile{cms-norwegian.lbx}[2016/06/01 v 3.4 biblatex localization]
@@ -9,11 +9,20 @@
\InheritBibliographyExtras{norwegian}
\DeclareBibliographyExtras{%
- \savecommand\cms@datelong
- \savecommand\cms@datelongalt
- \savecommand\mkbibrangecomp
- \savecommand\mkbibrangeterse
- \savecommand\mkbibrangefull
+ \savecommand\cms@datelong%
+ \savecommand\cms@datelongalt%
+ \savecommand\mkdaterangecomp%
+ \savecommand\mkdaterangeterse%
+ \savecommand\mkdaterangefull%
+ \savecommand\mkbibrangecomp%
+ \savecommand\mkbibrangeterse%
+ \savecommand\mkbibrangefull%
+ \protected\def\mkdaterangecomp{%
+ \lbx@cms@mkbibrangetrunc{long}}%
+ \protected\def\mkdaterangeterse{%
+ \lbx@cms@mkbibrangetrunc{short}}%
+ \protected\def\mkdaterangefull{%
+ \lbx@cms@mkbibrangefull}%
\protected\def\mkbibrangecomp{%
\lbx@cms@mkbibrangetrunc{long}}%
\protected\def\mkbibrangeterse{%
@@ -24,8 +33,11 @@
\def\cms@datelongalt{\printdate}}%
\UndeclareBibliographyExtras{%
- \restorecommand\cms@datelong
- \restorecommand\cms@datelongalt
+ \restorecommand\cms@datelong%
+ \restorecommand\cms@datelongalt%
+ \restorecommand\mkdaterangecomp%
+ \restorecommand\mkdaterangefull%
+ \restorecommand\mkdaterangeterse%
\restorecommand\mkbibrangecomp%
\restorecommand\mkbibrangefull%
\restorecommand\mkbibrangeterse}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx
index e58c034877f..72269bd99ae 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx
@@ -1,4 +1,4 @@
-% $Id: cms-nynorsk.lbx,v 1.7 2016/06/01 11:25:40 dfussner Exp $
+% $Id: cms-nynorsk.lbx,v 1.8 2017/01/20 13:31:25 dfussner Exp $
\ProvidesFile{cms-nynorsk.lbx}[2016/06/01 v 3.4 biblatex localization]
@@ -9,11 +9,20 @@
\InheritBibliographyExtras{nynorsk}
\DeclareBibliographyExtras{%
- \savecommand\cms@datelong
- \savecommand\cms@datelongalt
- \savecommand\mkbibrangecomp
- \savecommand\mkbibrangeterse
- \savecommand\mkbibrangefull
+ \savecommand\cms@datelong%
+ \savecommand\cms@datelongalt%
+ \savecommand\mkdaterangecomp%
+ \savecommand\mkdaterangeterse%
+ \savecommand\mkdaterangefull%
+ \savecommand\mkbibrangecomp%
+ \savecommand\mkbibrangeterse%
+ \savecommand\mkbibrangefull%
+ \protected\def\mkdaterangecomp{%
+ \lbx@cms@mkbibrangetrunc{long}}%
+ \protected\def\mkdaterangeterse{%
+ \lbx@cms@mkbibrangetrunc{short}}%
+ \protected\def\mkdaterangefull{%
+ \lbx@cms@mkbibrangefull}%
\protected\def\mkbibrangecomp{%
\lbx@cms@mkbibrangetrunc{long}}%
\protected\def\mkbibrangeterse{%
@@ -24,8 +33,11 @@
\def\cms@datelongalt{\printdate}}%
\UndeclareBibliographyExtras{%
- \restorecommand\cms@datelong
- \restorecommand\cms@datelongalt
+ \restorecommand\cms@datelong%
+ \restorecommand\cms@datelongalt%
+ \restorecommand\mkdaterangecomp%
+ \restorecommand\mkdaterangefull%
+ \restorecommand\mkdaterangeterse%
\restorecommand\mkbibrangecomp%
\restorecommand\mkbibrangefull%
\restorecommand\mkbibrangeterse}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-swedish.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-swedish.lbx
index 6f9d26c70c8..0ccb2f673cb 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-swedish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-swedish.lbx
@@ -11,9 +11,18 @@
\DeclareBibliographyExtras{%
\savecommand\cms@datelong
\savecommand\cms@datelongalt
+ \savecommand\mkdaterangecomp
+ \savecommand\mkdaterangeterse
+ \savecommand\mkdaterangefull
\savecommand\mkbibrangecomp
\savecommand\mkbibrangeterse
- \savecommand\mkbibrangefull
+ \savecommand\mkbibrangefull
+ \protected\def\mkdaterangecomp{%
+ \lbx@cms@mkbibrangetrunc{long}}%
+ \protected\def\mkdaterangeterse{%
+ \lbx@cms@mkbibrangetrunc{short}}%
+ \protected\def\mkdaterangefull{%
+ \lbx@cms@mkbibrangefull}%
\protected\def\mkbibrangecomp{%
\lbx@cms@mkbibrangetrunc{long}}%
\protected\def\mkbibrangeterse{%
@@ -24,8 +33,11 @@
\def\cms@datelongalt{\printdate}}%
\UndeclareBibliographyExtras{%
- \restorecommand\cms@datelong
- \restorecommand\cms@datelongalt
+ \restorecommand\cms@datelong%
+ \restorecommand\cms@datelongalt%
+ \restorecommand\mkdaterangecomp%
+ \restorecommand\mkdaterangefull%
+ \restorecommand\mkdaterangeterse%
\restorecommand\mkbibrangecomp%
\restorecommand\mkbibrangefull%
\restorecommand\mkbibrangeterse}%