From 6a11d2c3656f990f59782df3b1eb5648660d8959 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 31 Aug 2011 21:32:07 +0000 Subject: biblatex-chicago (31aug11) git-svn-id: svn://tug.org/texlive/trunk@23763 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/biblatex-chicago/biblatex-chicago.sty | 10 +++-- .../latex/biblatex-chicago/chicago-authordate.bbx | 10 ++--- .../latex/biblatex-chicago/chicago-authordate.cbx | 30 +++++++++------ .../tex/latex/biblatex-chicago/chicago-notes.bbx | 4 +- .../tex/latex/biblatex-chicago/chicago-notes.cbx | 45 +++++++++++++++------- .../tex/latex/biblatex-chicago/cms-american.lbx | 6 ++- .../tex/latex/biblatex-chicago/cms-french.lbx | 6 ++- .../tex/latex/biblatex-chicago/cms-german.lbx | 6 ++- .../tex/latex/biblatex-chicago/cms-ngerman.lbx | 6 ++- 9 files changed, 79 insertions(+), 44 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-chicago') 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 e6e03ea3dfa..f6648890c80 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty @@ -13,7 +13,7 @@ % but not limited to, the implied warranties of merchantability and % fitness for a particular purpose. -\ProvidesPackage{biblatex-chicago}[2011/02/15 v 1.2a biblatex style] +\ProvidesPackage{biblatex-chicago}[2011/08/31 v 1.6 biblatex style] \RequirePackage{etoolbox} @@ -36,15 +36,17 @@ \RequirePackage[style=chicago-authordate]{biblatex}% \ExecuteBibliographyOptions{% pagetracker=true,autocite=inline,alldates=comp,labelyear=true, - uniquename=true,useeditor=true,usetranslator=true,usecompiler=true, - ibidtracker=constrict,sorting=nyt,punctfont,cmslos=true,nodates}} + uniquename=minfull,useeditor=true,usetranslator=true,usecompiler=true, + ibidtracker=constrict,sorting=nyt,punctfont,cmslos=true,nodates, + uniquelist=minyear,maxbibnames=10,minbibnames=7,sortcase=false}} \def\cms@notes{% \RequirePackage[style=chicago-notes]{biblatex}% \ExecuteBibliographyOptions{% pagetracker=true,autocite=footnote,abbreviate=false,alldates=comp, citetracker=true,ibidtracker=constrict,usetranslator=true, - usecompiler=true,loccittracker=constrict,dateabbrev=false}} + usecompiler=true,loccittracker=constrict,dateabbrev=false, + maxbibnames=10,minbibnames=7,sortcase=false}} \csuse{cms@\cms@style} \undef\cms@authordate 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 d63a666fd5f..32de9dc8a98 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx @@ -1,11 +1,11 @@ -% $Id: chicago-authordate.bbx,v 0.8 2011/02/15 14:59:29 dfussner Exp $ +% $Id: chicago-authordate15.bbx,v 0.8.1.1 2011/03/03 15:34:59 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. +% reference list formatting for the Chicago author-date style, +% _15th_ edition. - -\ProvidesFile{chicago-authordate.bbx}[2011/02/15 v 1.2a biblatex -bibliography style] +\ProvidesFile{chicago-authordate.bbx} +[2011/08/31 v 1.6 biblatex bibliography style] %%%% Initialize and format bibliography and los %%%% 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 10302cb00e6..2f9fbe24147 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx @@ -1,10 +1,11 @@ -% $Id: chicago-authordate.cbx,v 0.8.1.1 2011/02/15 17:09:04 dfussner Exp $ +% $Id: chicago-authordate15.cbx,v 0.8.1.3 2011/08/24 18:09:45 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. +% author-date style of the Chicago Manual of Style, _15th_ edition. -\ProvidesFile{chicago-authordate.cbx}[2011/02/15 v 1.2a biblatex citation style] +\ProvidesFile{chicago-authordate.cbx} +[2011/08/31 v 1.6 biblatex citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -170,11 +171,11 @@ \def\mkbibcurdinal#1{% \@tempcnta0#1 \the\@tempcnta}% -\@ifpackagelater{biblatex}{2010/08/28} +\@ifpackagelater{biblatex}{2011/01/04} {} {\PackageError{biblatex} {Outdated 'biblatex' package} - {The Chicago style requires biblatex v0.9c or later.\MessageBreak + {The Chicago style requires biblatex v1.1 or later.\MessageBreak You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak This is a fatal error. I'm aborting now.}% \endinput} @@ -1138,12 +1139,19 @@ {\bibstring{cfrom\thefield{origlanguage}}}}% {\unspace}} -\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.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx index 4fd483033ee..bb38e59a089 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx @@ -1,11 +1,11 @@ -% $Id: chicago-notes15.bbx,v 0.9.7.2 2011/03/03 18:06:56 dfussner Exp dfussner $ +% $Id: chicago-notes15.bbx,v 0.9.7.5 2011/08/23 20:25:39 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, _15th_ edition. \ProvidesFile{chicago-notes.bbx} -[2011/03/17 v 1.3 biblatex bibliography style] +[2011/08/31 v 1.6 biblatex bibliography style] %%%% Initialize and format bibliography and los %%%% 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 876f3d1193b..1b122dece49 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.2 2011/03/03 18:08:03 dfussner Exp dfussner $ +% $Id: chicago-notes15.cbx,v 0.9.7.8 2011/08/24 18:08:44 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/03/17 v 1.3 biblatex citation style] +\ProvidesFile{chicago-notes.cbx}[2011/08/31 v 1.6 biblatex citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -154,11 +154,11 @@ \def\mkbibcurdinal#1{% \@tempcnta0#1 \the\@tempcnta}% -\@ifpackagelater{biblatex}{2010/08/28} +\@ifpackagelater{biblatex}{2011/01/04} {} {\PackageError{biblatex} {Outdated 'biblatex' package} - {The Chicago style requires biblatex v0.9 or later.\MessageBreak + {The Chicago style requires biblatex v1.1 or later.\MessageBreak You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak This is a fatal error. I'm aborting now.}% \endinput} @@ -249,7 +249,9 @@ \iffieldequalstr{entrytype}{inreference}\OR% \iffieldequalstr{entrytype}{reference}}% {\iffieldequalstr{entrysubtype}{magazine}% Simplify .bib creation - {\printfield[journaltitle]{journaltitle}\isdot\newcunit}% + {\ifuseauthor% + {\printfield[journaltitle]{journaltitle}\isdot\newcunit}% + {}}% {\iffieldequalstr{entrytype}{manual}% {\printlist{organization}\isdot\newcunit}% {}}}% @@ -352,13 +354,16 @@ {\usebibmacro{cite:postnote}} \DeclareCiteCommand{\smartcite} - [\iffootnote{\mkbibparens}{\mkbibfootnote}] + [\iffootnote{}{\mkbibfootnote}] {\usebibmacro{prenote}}%\bibsentence {\usebibmacro{citeindex}% \usebibmacro{cite}} {\multicitedelim} {\usebibmacro{cite:postnote}} +\DeclareMultiCiteCommand{\smartcites}[\iffootnote{}{\mkbibfootnote}]% +{\smartcite}{\multicitedelim} + \DeclareCiteCommand{\footfullcite}[\mkbibfootnote] {\usebibmacro{prenote}}%\bibsentence {\usebibmacro{citeindex}% @@ -1181,6 +1186,7 @@ \DeclareBibliographyDriver{cite:letter}{% \usebibmacro{bibindex}% + \savefield{fullhash}{\bbx@lasthash}% \printtext[title]{% \printfield[noformat]{title}}% \newcunit\newblock% @@ -2490,12 +2496,19 @@ {\bibstring{cfrom\thefield{origlanguage}}}}% {\unspace}} -\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} @@ -2595,14 +2608,18 @@ \setunit*{\addspace}% \printlist[periodplace]{location}% \savefield{journaltitle}{\bbx@lasthash}}}% - {\usebibmacro{author}}} + {\ifuseauthor% + {\usebibmacro{author}}% + {}}} \newbibmacro*{cmag+news+author}{% \ifnameundef{author}% {\usebibmacro{journal+sub}% \setunit*{\addspace}% \printlist[periodplace]{location}}% - {\usebibmacro{author}}} + {\ifuseauthor% + {\usebibmacro{author}}% + {}}} \newbibmacro*{type+inst+year}{% \printfield{type} 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 158cf6f55c0..a4e22326340 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx @@ -1,6 +1,6 @@ -% $Id: cms-american.lbx,v 0.10.1.15 2011/03/17 17:42:21 dfussner Exp $ +% $Id: cms-american.lbx,v 0.10.1.17 2011/08/31 13:38:40 dfussner Exp $ -\ProvidesFile{cms-american.lbx}[2011/03/17 v 1.3 biblatex localization] +\ProvidesFile{cms-american.lbx}[2011/08/31 v 1.6 biblatex localization] \InheritBibliographyExtras{american} @@ -189,6 +189,7 @@ \NewBibliographyString{cfromswedish} \NewBibliographyString{partvolume} \NewBibliographyString{by} +\NewBibliographyString{of} \NewBibliographyString{afterwordto} \NewBibliographyString{forewordto} \NewBibliographyString{introductionto} @@ -250,6 +251,7 @@ introductionto = {{introduction to}{intro\adddot\space to}}, partvolume = {{\addspace bk\adddot}{\addspace bk\adddot}}, by = {{by}{by}}, + of = {{of}{of}}, compiler = {{comp\adddot}{comp\adddot}}, compilers = {{comps\adddot}{comps\adddot}}, transcompiler = {{trans\adddot\addspace and comp\adddot}% 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 683bf02c193..522ce344d7d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx @@ -1,6 +1,6 @@ -% $Id: cms-french.lbx,v 0.9.5.9 2011/03/17 17:42:04 dfussner Exp $ +% $Id: cms-french.lbx,v 0.9.5.11 2011/08/31 13:38:20 dfussner Exp $ -\ProvidesFile{cms-french.lbx}[2011/03/17 v 1.3 biblatex localization] +\ProvidesFile{cms-french.lbx}[2011/08/31 v 1.6 biblatex localization] % STATUS OF THIS FILE % - Some strings still missing @@ -203,6 +203,7 @@ \NewBibliographyString{cfromswedish} \NewBibliographyString{partvolume} \NewBibliographyString{by} +\NewBibliographyString{of} \NewBibliographyString{afterwordto} \NewBibliographyString{forewordto} \NewBibliographyString{introductionto} @@ -264,6 +265,7 @@ introductionto = {{introduction \`a}{introd\adddot\ \`a}}, partvolume = {{\unspace}{\unspace}}, by = {{par}{par}}, + of = {{de}{de}}, compiler = {{comp\adddot}{comp\adddot}}, compilers = {{comp\adddot}{comp\adddot}}, transcompiler = {{trad\adddot\ et comp\adddot}{trad\adddot\ et comp\adddot}}, 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 807274cbaae..ebb49c1e598 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx @@ -1,6 +1,6 @@ -% $Id: cms-german.lbx,v 0.9.5.9 2011/03/17 17:42:14 dfussner Exp $ +% $Id: cms-german.lbx,v 0.9.5.11 2011/08/31 13:38:30 dfussner Exp $ -\ProvidesFile{cms-german.lbx}[2011/03/17 v 1.3 biblatex localization] +\ProvidesFile{cms-german.lbx}[2011/08/31 v 1.6 biblatex localization] % STATUS OF THIS FILE % - Translated strings and formatting decisions need review by native @@ -205,6 +205,7 @@ \NewBibliographyString{cbycompileranaf} \NewBibliographyString{partvolume} \NewBibliographyString{by} +\NewBibliographyString{of} \NewBibliographyString{afterwordto} \NewBibliographyString{forewordto} \NewBibliographyString{introductionto} @@ -266,6 +267,7 @@ introductionto = {{Einleitung in}{Einl\adddot\ in}}, partvolume = {{\addspace T\adddot}{\addspace T\adddot}}, by = {{von}{von}}, + of = {{von}{von}}, compiler = {{Hrsg\adddot}{Hrsg\adddot}},% Same as editor, following compilers = {{Hrsg\adddot}{Hrsg\adddot}},% german.lbx transcompiler = {{Hrsg\adddot\addabbrvspace und \"Ubers\adddot}% 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 e8619b6090c..e361237d46a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx @@ -1,6 +1,6 @@ -% $Id: cms-ngerman.lbx,v 0.9.5.9 2011/03/17 17:42:14 dfussner Exp $ +% $Id: cms-ngerman.lbx,v 0.9.5.11 2011/08/31 13:38:30 dfussner Exp $ -\ProvidesFile{cms-ngerman.lbx}[2011/03/17 v 1.3 biblatex localization] +\ProvidesFile{cms-ngerman.lbx}[2011/08/31 v 1.6 biblatex localization] % STATUS OF THIS FILE % - Translated strings and formatting decisions need review by native @@ -205,6 +205,7 @@ \NewBibliographyString{cbycompileranaf} \NewBibliographyString{partvolume} \NewBibliographyString{by} +\NewBibliographyString{of} \NewBibliographyString{afterwordto} \NewBibliographyString{forewordto} \NewBibliographyString{introductionto} @@ -266,6 +267,7 @@ introductionto = {{Einleitung in}{Einl\adddot\ in}}, partvolume = {{\addspace T\adddot}{\addspace T\adddot}}, by = {{von}{von}}, + of = {{von}{von}}, compiler = {{Hrsg\adddot}{Hrsg\adddot}},% Same as editor, following compilers = {{Hrsg\adddot}{Hrsg\adddot}},% german.lbx transcompiler = {{Hrsg\adddot\addabbrvspace und \"Ubers\adddot}% -- cgit v1.2.3