diff options
author | Karl Berry <karl@freefriends.org> | 2017-04-20 21:10:21 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-04-20 21:10:21 +0000 |
commit | 2e69378317d597453b5549824c8dcbee6a4676d9 (patch) | |
tree | 0f8d2717d45d617cb85a4378bfc110fc80c6c767 /Master/texmf-dist/tex/latex/biblatex-chicago | |
parent | cc13eb77c29c9b0e7e88b0dff77de642caf978ea (diff) |
biblatex-chicago (20apr17)
git-svn-id: svn://tug.org/texlive/trunk@43944 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-chicago')
8 files changed, 122 insertions, 145 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty b/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty index 364211e22d5..48fe68bdc97 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty @@ -1,6 +1,6 @@ -% $Id: biblatex-chicago.sty,v 0.1.1.59 2016/06/01 12:49:51 dfussner Exp $ +% $Id: biblatex-chicago.sty,v 0.1.1.61 2017/04/19 13:08:02 dfussner Exp $ -% Copyright (c) 2009-2016 David Fussner. This package is +% Copyright (c) 2009-2017 David Fussner. This package is % author-maintained. % % This work may be copied, distributed and/or modified under the @@ -13,7 +13,7 @@ % but not limited to, the implied warranties of merchantability and % fitness for a particular purpose. -\ProvidesPackage{biblatex-chicago}[2016/06/01 v 3.4 biblatex style] +\ProvidesPackage{biblatex-chicago}[2017/04/19 v 3.7 biblatex style] \RequirePackage{etoolbox} @@ -37,13 +37,16 @@ \PassOptionsToPackage{\CurrentOption}{biblatex}}% \DeclareOption{backend=bibtex}{% - \PassOptionsToPackage{\CurrentOption}{biblatex}}% + \PassOptionsToPackage{\CurrentOption}{biblatex}% + \def\blx@sorting@cms{1}}% \DeclareOption{backend=bibtex8}{% - \PassOptionsToPackage{\CurrentOption}{biblatex}}% + \PassOptionsToPackage{\CurrentOption}{biblatex}% + \def\blx@sorting@cms{1}}% \DeclareOption{backend=bibtexu}{% - \PassOptionsToPackage{\CurrentOption}{biblatex}}% + \PassOptionsToPackage{\CurrentOption}{biblatex}% + \def\blx@sorting@cms{1}}% \ProcessOptions* @@ -62,7 +65,7 @@ pagetracker=true,autocite=footnote,abbreviate=false,alldates=comp, citetracker=true,ibidtracker=constrict,usetranslator=true, usenamec=true,loccittracker=constrict,dateabbrev=false, - maxbibnames=10,minbibnames=7,sorting=\cms@choose,sortcase=false}} + maxbibnames=10,minbibnames=7,sorting=cms,sortcase=false}} \def\cms@authordatetrad{% \RequirePackage[style=chicago-authordate-trad]{biblatex}% @@ -147,30 +150,4 @@ \ifundef\bbl@loaded{\let\bbl@loaded\@empty}{}% For old versions of babel -\@ifpackagelater{biblatex}{2012/06/30} -{\@ifpackagelater{biblatex}{2016/03/01} - {\@ifpackagelater{biblatex}{2016/05/01} - {\def\cms@choose{% - \iftoggle{blx@bibtex}% - {nty}% - {cms}}}% - {\def\cms@choose{% - \ifblx@load@version@legacy - nty% - \else - cms% - \fi}}} - {\def\cms@choose{% - \ifblx@load@version@one - nty% - \else - cms% - \fi}}} -{\def\cms@choose{% - \ifnum\blx@backend=\blx@backend@biber - cms% - \else - nty% - \fi}} - \endinput 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 9e39b625faf..eb965b42cc4 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx @@ -1,16 +1,16 @@ -% $Id: cms-american.lbx,v 0.10.1.37 2016/10/12 14:17:45 dfussner Exp $ +% $Id: cms-american.lbx,v 0.10.1.38 2017/04/20 09:02:35 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 + \savecommand\mkdaterangecomp% + \savecommand\mkdaterangeterse% + \savecommand\mkdaterangefull% + \savecommand\mkbibrangecomp% + \savecommand\mkbibrangeterse% + \savecommand\mkbibrangefull% \protected\def\mkdaterangecomp{% \lbx@cms@mkbibrangetrunc@long{long}}% \protected\def\mkdaterangeterse{% 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 6150ec53b00..0d43f7bfa25 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx @@ -1,18 +1,18 @@ -% $Id: cms-british.lbx,v 0.11 2017/03/22 18:35:48 dfussner Exp $ +% $Id: cms-british.lbx,v 0.12 2017/04/20 09:01:51 dfussner Exp $ \ProvidesFile{cms-british.lbx}[2016/06/01 v 3.4 biblatex localization] \InheritBibliographyExtras{british} \DeclareBibliographyExtras{% - \savecommand\cms@datelong - \savecommand\cms@datelongalt - \savecommand\mkdaterangecomp - \savecommand\mkdaterangeterse - \savecommand\mkdaterangefull - \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{% @@ -43,8 +43,8 @@ \def\cms@datelongalt{\printdate}}% \UndeclareBibliographyExtras{% - \restorecommand\cms@datelong - \restorecommand\cms@datelongalt + \restorecommand\cms@datelong% + \restorecommand\cms@datelongalt% \restorecommand\mkdaterangecomp% \restorecommand\mkdaterangefull% \restorecommand\mkdaterangeterse% 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 531ee84f7ec..06c71d96c27 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.8 2017/01/20 12:11:25 dfussner Exp $ +% $Id: cms-finnish.lbx,v 0.9 2017/04/20 08:48:31 dfussner Exp $ \ProvidesFile{cms-finnish.lbx}[2016/06/01 v 3.4 biblatex localization] @@ -11,32 +11,32 @@ \InheritBibliographyExtras{finnish} \DeclareBibliographyExtras{% - \savecommand\mkdaterangecomp - \savecommand\mkdaterangeterse - \savecommand\mkdaterangefull - \savecommand\mkbibrangecomp - \savecommand\mkbibrangeterse - \savecommand\mkbibrangefull - \savecommand\lbx@fromlang - \savecommand\lbx@lfromlang - \savecommand\lbx@sfromlang - \savecommand\cms@datelong - \savecommand\cms@datelongalt + \savecommand\mkdaterangecomp% + \savecommand\mkdaterangeterse% + \savecommand\mkdaterangefull% + \savecommand\mkbibrangecomp% + \savecommand\mkbibrangeterse% + \savecommand\mkbibrangefull% + \savecommand\lbx@fromlang% + \savecommand\lbx@lfromlang% + \savecommand\lbx@sfromlang% + \savecommand\cms@datelong% + \savecommand\cms@datelongalt% \def\lbx@fromlang{% - \iffieldundef{userf} - {\iffieldundef{origlanguage} + \iffieldundef{userf}% + {\iffieldundef{origlanguage}% {}% Removed \unspace here, following german.lbx {\bibstring{from\thefield{origlanguage}}\addspace}}% {}}% Removed \unspace here, as above. \def\lbx@lfromlang{% - \iffieldundef{userf} - {\iffieldundef{origlanguage} + \iffieldundef{userf}% + {\iffieldundef{origlanguage}% {}% {\bibstring{from\thefield{origlanguage}}\addspace}}% {}}% \def\lbx@sfromlang{% - \iffieldundef{userf} - {\iffieldundef{origlanguage} + \iffieldundef{userf}% + {\iffieldundef{origlanguage}% {}% {\bibstring{from\thefield{origlanguage}}\addspace}}% {}}% @@ -56,15 +56,15 @@ \lbx@cms@mkbibrangefull}}% \UndeclareBibliographyExtras{% - \restorecommand\lbx@fromlang - \restorecommand\cms@datelong - \restorecommand\cms@datelongalt + \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} + \restorecommand\mkbibrangefull}% \NewBibliographyString{bynone} % \NewBibliographyString{bycompiler} 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 29e3d133d9c..2b154187a5f 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.32 2017/01/19 14:39:59 dfussner Exp $ +% $Id: cms-french.lbx,v 0.9.5.34 2017/04/20 08:52:54 dfussner Exp $ \ProvidesFile{cms-french.lbx}[2016/06/01 v 3.4 biblatex localization] @@ -13,18 +13,18 @@ \savecommand\postvolpunct% \renewcommand{\postvolpunct}{\addcolon\addspace}% \toggletrue{cms@postposit}% - \savecommand\mkbibnamelast + \savecommand\mkbibnamelast% \protected\def\mkbibnamelast#1{#1}% No small caps for Chicago (?) - \savecommand\mkbibnamefamily + \savecommand\mkbibnamefamily% \protected\def\mkbibnamefamily#1{\textnohyphenation{#1}}% - \savecommand\cms@datelong - \savecommand\cms@datelongalt - \savecommand\mkdaterangecomp - \savecommand\mkdaterangeterse - \savecommand\mkdaterangefull - \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{% @@ -42,14 +42,14 @@ \UndeclareBibliographyExtras{% \restorecommand\postvolpunct% - \restorecommand\mkbibnamelast - \restorecommand\mkbibnamefamily - \restorecommand\cms@datelong - \restorecommand\cms@datelongalt + \restorecommand\mkbibnamelast% + \restorecommand\mkbibnamefamily% + \restorecommand\cms@datelong% + \restorecommand\cms@datelongalt% \togglefalse{cms@postposit}% \restorecommand\mkdaterangecomp% \restorecommand\mkdaterangeterse% - \restorecommand\mkdaterangefull% + \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 488276ab52b..9ae054b2822 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.30 2017/01/19 14:51:38 dfussner Exp $ +% $Id: cms-german.lbx,v 0.9.5.32 2017/04/20 08:55:30 dfussner Exp $ \ProvidesFile{cms-german.lbx}[2016/06/01 v 3.4 biblatex localization] @@ -9,32 +9,32 @@ \InheritBibliographyExtras{german} \DeclareBibliographyExtras{% - \savecommand\mkdaterangecomp - \savecommand\mkdaterangeterse - \savecommand\mkdaterangefull - \savecommand\mkbibrangecomp - \savecommand\mkbibrangeterse - \savecommand\mkbibrangefull - \savecommand\lbx@fromlang - \savecommand\lbx@lfromlang - \savecommand\lbx@sfromlang - \savecommand\cms@datelong - \savecommand\cms@datelongalt + \savecommand\mkdaterangecomp% + \savecommand\mkdaterangeterse% + \savecommand\mkdaterangefull% + \savecommand\mkbibrangecomp% + \savecommand\mkbibrangeterse% + \savecommand\mkbibrangefull% + \savecommand\lbx@fromlang% + \savecommand\lbx@lfromlang% + \savecommand\lbx@sfromlang% + \savecommand\cms@datelong% + \savecommand\cms@datelongalt% \def\lbx@fromlang{% - \iffieldundef{userf} - {\iffieldundef{origlanguage} + \iffieldundef{userf}% + {\iffieldundef{origlanguage}% {}% Removed \unspace here, following german.lbx {\bibstring{from\thefield{origlanguage}}\addspace}}% {}}% Removed \unspace here, as above. \def\lbx@lfromlang{% - \iffieldundef{userf} - {\iffieldundef{origlanguage} + \iffieldundef{userf}% + {\iffieldundef{origlanguage}% {}% {\bibstring{from\thefield{origlanguage}}\addspace}}% {}}% \def\lbx@sfromlang{% - \iffieldundef{userf} - {\iffieldundef{origlanguage} + \iffieldundef{userf}% + {\iffieldundef{origlanguage}% {}% {\bibstring{from\thefield{origlanguage}}\addspace}}% {}}% @@ -45,7 +45,7 @@ \protected\def\mkdaterangeterse{% \lbx@cms@mkbibrangetrunc{short}}% \protected\def\mkdaterangefull{% - \lbx@cms@mkbibrangefull} + \lbx@cms@mkbibrangefull}% \protected\def\mkbibrangecomp{% DATE FIX \lbx@cms@mkbibrangetrunc{long}}% \protected\def\mkbibrangeterse{% @@ -54,15 +54,15 @@ \lbx@cms@mkbibrangefull}}% \UndeclareBibliographyExtras{% - \restorecommand\lbx@fromlang - \restorecommand\cms@datelong - \restorecommand\cms@datelongalt + \restorecommand\lbx@fromlang% + \restorecommand\cms@datelong% + \restorecommand\cms@datelongalt% \restorecommand\mkdaterangecomp% \restorecommand\mkdaterangeterse% - \restorecommand\mkdaterangefull% + \restorecommand\mkdaterangefull% \restorecommand\mkbibrangecomp% DATE FIX \restorecommand\mkbibrangeterse% - \restorecommand\mkbibrangefull} + \restorecommand\mkbibrangefull}% \NewBibliographyString{bynone} \NewBibliographyString{bycompiler} 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 a21a38fb812..f8f5bd38687 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.30 2017/01/19 14:51:38 dfussner Exp $ +% $Id: cms-ngerman.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,32 +9,32 @@ \InheritBibliographyExtras{ngerman} \DeclareBibliographyExtras{% - \savecommand\mkdaterangecomp - \savecommand\mkdaterangeterse - \savecommand\mkdaterangefull - \savecommand\mkbibrangecomp - \savecommand\mkbibrangeterse - \savecommand\mkbibrangefull - \savecommand\lbx@fromlang - \savecommand\lbx@lfromlang - \savecommand\lbx@sfromlang - \savecommand\cms@datelong - \savecommand\cms@datelongalt + \savecommand\mkdaterangecomp% + \savecommand\mkdaterangeterse% + \savecommand\mkdaterangefull% + \savecommand\mkbibrangecomp% + \savecommand\mkbibrangeterse% + \savecommand\mkbibrangefull% + \savecommand\lbx@fromlang% + \savecommand\lbx@lfromlang% + \savecommand\lbx@sfromlang% + \savecommand\cms@datelong% + \savecommand\cms@datelongalt% \def\lbx@fromlang{% - \iffieldundef{userf} - {\iffieldundef{origlanguage} + \iffieldundef{userf}% + {\iffieldundef{origlanguage}% {}% Removed \unspace here, following german.lbx {\bibstring{from\thefield{origlanguage}}\addspace}}% {}}% Removed \unspace here, as above. \def\lbx@lfromlang{% - \iffieldundef{userf} - {\iffieldundef{origlanguage} + \iffieldundef{userf}% + {\iffieldundef{origlanguage}% {}% {\bibstring{from\thefield{origlanguage}}\addspace}}% {}}% \def\lbx@sfromlang{% - \iffieldundef{userf} - {\iffieldundef{origlanguage} + \iffieldundef{userf}% + {\iffieldundef{origlanguage}% {}% {\bibstring{from\thefield{origlanguage}}\addspace}}% {}}% @@ -45,7 +45,7 @@ \protected\def\mkdaterangeterse{% \lbx@cms@mkbibrangetrunc{short}}% \protected\def\mkdaterangefull{% - \lbx@cms@mkbibrangefull} + \lbx@cms@mkbibrangefull}% \protected\def\mkbibrangecomp{% DATE FIX \lbx@cms@mkbibrangetrunc{long}}% \protected\def\mkbibrangeterse{% @@ -54,15 +54,15 @@ \lbx@cms@mkbibrangefull}}% \UndeclareBibliographyExtras{% - \restorecommand\lbx@fromlang - \restorecommand\cms@datelong - \restorecommand\cms@datelongalt + \restorecommand\lbx@fromlang% + \restorecommand\cms@datelong% + \restorecommand\cms@datelongalt% \restorecommand\mkdaterangecomp% \restorecommand\mkdaterangeterse% - \restorecommand\mkdaterangefull% + \restorecommand\mkdaterangefull% \restorecommand\mkbibrangecomp% DATE FIX \restorecommand\mkbibrangeterse% - \restorecommand\mkbibrangefull} + \restorecommand\mkbibrangefull}% \NewBibliographyString{bynone} \NewBibliographyString{bycompiler} 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 0ccb2f673cb..762794d5545 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-swedish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-swedish.lbx @@ -9,14 +9,14 @@ \InheritBibliographyExtras{swedish} \DeclareBibliographyExtras{% - \savecommand\cms@datelong - \savecommand\cms@datelongalt - \savecommand\mkdaterangecomp - \savecommand\mkdaterangeterse - \savecommand\mkdaterangefull - \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{% |