From a23814813ddc2837007fa10e3b895a5da6dae34f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 16 May 2016 20:34:42 +0000 Subject: biblatex-chicago (16may16) git-svn-id: svn://tug.org/texlive/trunk@41200 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/biblatex-chicago/README | 6 +-- .../texmf-dist/doc/latex/biblatex-chicago/RELEASE | 7 +++ .../latex/biblatex-chicago/biblatex-chicago.pdf | Bin 961562 -> 961868 bytes .../latex/biblatex-chicago/biblatex-chicago.tex | 17 +++++-- .../latex/biblatex-chicago/cms-dates-sample.pdf | Bin 435557 -> 436313 bytes .../latex/biblatex-chicago/cms-notes-sample.pdf | Bin 315072 -> 315078 bytes .../latex/biblatex-chicago/cms-notes-sample.tex | 2 +- .../doc/latex/biblatex-chicago/cms-trad-sample.pdf | Bin 434746 -> 434755 bytes .../latex/biblatex-chicago/biblatex-chicago.sty | 21 ++++---- .../biblatex-chicago/chicago-authordate-trad.cbx | 21 ++++---- .../latex/biblatex-chicago/chicago-authordate.bbx | 47 ++++++++++-------- .../latex/biblatex-chicago/chicago-authordate.cbx | 21 ++++---- .../tex/latex/biblatex-chicago/chicago-notes.bbx | 53 +++++++++++---------- 13 files changed, 114 insertions(+), 81 deletions(-) diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/README b/Master/texmf-dist/doc/latex/biblatex-chicago/README index 4e8a28c8df6..1f84671004c 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/README +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/README @@ -1,7 +1,7 @@ IMPORTANT NOTE: This is the package formerly known as biblatex-chicago-notes-df. It -works well with the latest version (3.3) of biblatex, but has been +works well with the latest version (3.4) of biblatex, but has been most thoroughly tested against 2.9a, so it may be worth trying that version in case you run into issues I haven't seen. The package contains both the 15th- and 16th-edition Chicago style files, though I @@ -12,10 +12,10 @@ RELEASE file to find out what alterations you may need to make to your .bib files and document preambles to bring them up to date. Most particularly please note that Biber is now required for the author-date styles, and very strongly advised for the notes & -bibliography style (version 2.4 is designed for use with the latest +bibliography style (version 2.5 is designed for use with the latest biblatex). -README (version 0.9.9h, 2016-03-22): +README (version 0.9.9i, 2016-05-16): Biblatex-chicago contains five biblatex styles implementing the specifications of the Chicago Manual of Style in both its 15th and diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE b/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE index 44b1013e4c8..24205eacfb2 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE @@ -1,3 +1,10 @@ +Release notes for version 0.9.9i [2016-05-16]: + + - This is another interim release, allowing the use of biblatex 3.4 + for those who want to try it. I have also fixed one old formatting + error when "n.d." appears in author-date citations. A full + feature-release based on 3.4 is imminent. + Release notes for version 0.9.9h [2016-03-22]: - This is an interim bug-fix release, updating the styles so that diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf index e1710e0049b..ee2823d0ce5 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf and b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex index e3a3cdeeb72..8f8916cb6b5 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex @@ -63,7 +63,7 @@ Style files for biblatex \vspace{.3\baselineskip} -\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.9h (beta) \\ +\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.9i (beta) \\ \href{mailto:djf027@googlemail.com}{djf027@googlemail.com}\\ \today \end{center} @@ -158,7 +158,7 @@ release. \begin{itemize}{}{} \item Philipp Lehman's \textsf{biblatex} package, of course! The - current version(s) --- 1.7 or 3.3 at the time of writing --- work + current version(s) --- 1.7 or 3.4 at the time of writing --- work well, but the older 2.9a has been somewhat more extensively tested, so please try it if you have any issues with the latest \textsf{biblatex}. Both of these versions contain features and bug @@ -186,7 +186,7 @@ release. use the following: \item \textsf{Biber} --- the next-generation \textsc{Bib}\TeX\ replacement, which is available from SourceForge. You should use - the latest version, 2.4, to work with \textsf{biblatex} 3.3 and + the latest version, 2.5, to work with \textsf{biblatex} 3.4 and \textsf{biblatex-chicago} (or \textsf{Biber} 1.9 with \textsf{biblatex} 2.9a), and it is required for users who are either using the author-date styles or processing a .bib file in @@ -10853,7 +10853,16 @@ code for it, let me know, and I'll look into it. \section{Revision History} \label{sec:history} -\textbf{0.9.9h: Released \today} +\textbf{0.9.9i: Released \today} +\begin{itemize} +\item This is another interim release, allowing the use of + \textsf{biblatex} 3.4 for those who want to try it. I have also + fixed one old formatting error when \enquote{n.d.} appears in + author-date citations. A full feature-release based on 3.4 is + imminent. +\end{itemize} + +\textbf{0.9.9h: Released March 22, 2016} \begin{itemize} \item This is an interim bug-fix release, updating the styles so that they will work with \textsf{biblatex} 3.3. The notes \&\ diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf index a2c89af9330..0fa4027fe80 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf and b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf index 93e6352a44a..228e3589edf 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf and b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex index 23521f68aa1..6fee4a42226 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex @@ -8,7 +8,7 @@ \usepackage[notes,strict,backend=biber,autolang=other,% bibencoding=latin1,booklongxref=false,compresspages]{biblatex-chicago} %%\usepackage[osf]{mathpazo} -%\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf +\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf \usepackage{ifthen} \usepackage{setspace} \usepackage{vmargin} \setpapersize{A4} diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.pdf index 6e24993b371..4fef21d6efd 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.pdf and b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.pdf differ 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 2ef864027a6..86f8a1d82f4 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty @@ -1,4 +1,4 @@ -% $Id: biblatex-chicago.sty,v 0.1.1.55 2016/03/15 14:12:03 dfussner Exp $ +% $Id: biblatex-chicago.sty,v 0.1.1.57 2016/05/08 19:58:55 dfussner Exp $ % Copyright (c) 2009-2016 David Fussner. This package is % author-maintained. @@ -128,7 +128,7 @@ {\DeclareLanguageMapping{american}{cms-american}}% {\ifthenelse{\equal{\languagename}{english}}% {\DeclareLanguageMapping{english}{cms-american}}% - {}}}% + {\DeclareLanguageMapping{american}{cms-american}}}}% {\DeclareLanguageMapping{english}{cms-american}} \DeclareLanguageMapping{british}{cms-british} @@ -144,12 +144,17 @@ \@ifpackagelater{biblatex}{2012/06/30} {\@ifpackagelater{biblatex}{2016/03/01} - {\def\cms@choose{% - \ifblx@load@version@legacy - nty% - \else - cms% - \fi}} + {\@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% 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 7e02e710103..77f95a52929 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 @@ -1642,17 +1642,18 @@ citation style] \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}} \renewcommand*{\nameyeardelim}{% - \iffieldundef{origyear}% Is this test correct? - {\iffieldundef{year}% - {\addspace} - {\NumCheckSetup{\renewcommand{\mkbibbrackets}{\expandonce}% - \DeclareNumChars*{[?]s}}% For bracketed dates, and decades. - \iffieldnums{year}% This one works. - {\addspace}% - {\iffieldequalstr{year}{\bibstring{nodate}}% This also works. + \ifthenelse{\iffieldundef{labelyear}\OR% + \iffieldequalstr{labelyear}{nodate}}% + {\addcomma\addspace}% + {\iffieldundef{origyear}% Is this test correct? + {\iffieldundef{year}% {\addspace} - {\addcomma\addspace}}}}% - {\addspace}} + {\NumCheckSetup{\renewcommand{\mkbibbrackets}{\expandonce}% + \DeclareNumChars*{[?]s}}% For bracketed dates, and decades. + \iffieldnums{year}% This one works. + {\addspace}% + {\addcomma\addspace}}}% 16th ed. wants comma before n.d. + {\addspace}}} \newcommand{\classicpunct}{% \ifthenelse{\iffieldequalstr{entrysubtype}{classical}\OR% 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 5731d9bb75e..3db9745b33e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx @@ -144,40 +144,45 @@ bibliography style] \@ifpackagelater{biblatex}{2016/03/01}% For biblatex 3.3 {\renewbibmacro*{name:family-given}[4]{% - \ifuseprefix + \ifuseprefix% {\usebibmacro{name:delim}{#3#1}% \usebibmacro{name:hook}{#3#1}% - \ifempty{#3}{}{% - \ifcapital + \ifdefvoid{#3}{}{% + \ifcapital% {\mkbibnameprefix{\MakeCapital{#3}}\isdot} {\mkbibnameprefix{#3}\isdot}% \ifprefchar{}{\bibnamedelimc}}% - \mkbibnamefamily{#1}\isdot - \ifempty{#2}{}{\revsdnamepunct\bibnamedelimd\mkbibnamegiven{#2}\isdot}% - \ifempty{#4}{}{\revsdnamepunct\bibnamedelimd\mkbibnameaffix{#4}\isdot}}% + \mkbibnamefamily{#1}\isdot% + \ifdefvoid{#2}{}{\revsdnamepunct\bibnamedelimd\mkbibnamegiven{#2}\isdot}% + \ifdefvoid{#4}{}{\revsdnamepunct\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}% {\usebibmacro{name:delim}{#1}% \usebibmacro{name:hook}{#1}% - \mkbibnamefamily{#1}\isdot - \ifempty{#2#3}{}{\revsdnamepunct}% - \ifempty{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}% - \ifempty{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}% - \ifempty{#4}{}{\revsdnamepunct\bibnamedelimd\mkbibnameaffix{#4}\isdot}}}% + \mkbibnamefamily{#1}\isdot% + \ifboolexpr{% + test {\ifdefvoid{#2}}% + and + test {\ifdefvoid{#3}}% + }% + {}{\revsdnamepunct}% + \ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}% + \ifdefvoid{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}% + \ifdefvoid{#4}{}{\revsdnamepunct\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}}% \renewbibmacro*{name:given-family}[4]{% \usebibmacro{name:delim}{#2#3#1}% \usebibmacro{name:hook}{#2#3#1}% - \ifempty{#2}{}{\mkbibnamegiven{#2}\isdot\bibnamedelimd}% - \ifempty{#3}{}{% - \mkbibnameprefix{#3}\isdot - \ifprefchar - {} + \ifdefvoid{#2}{}{\mkbibnamegiven{#2}\isdot\bibnamedelimd}% + \ifdefvoid{#3}{}{% + \mkbibnameprefix{#3}\isdot% + \ifprefchar% + {}% {\ifuseprefix{\bibnamedelimc}{\bibnamedelimd}}}% - \mkbibnamefamily{#1}\isdot - \ifempty{#4}{}{% + \mkbibnamefamily{#1}\isdot% + \ifdefvoid{#4}{}{% \iftoggle{cms@jrcomma}% {\ifnumeral{#4}% - {\bibnamedelimd\mkbibnameaffix{#4}\isdot}% - {\revsdnamepunct\bibnamedelimd\mkbibnameaffix{#4}\isdot% + {\bibnamedelimd\mkbibnamesuffix{#4}\isdot}% + {\revsdnamepunct\bibnamedelimd\mkbibnamesuffix{#4}\isdot% \ifboolexpr{% Test needed? test{\ifnumless{\value{listcount}}{\value{listtotal}}}% and @@ -185,7 +190,7 @@ bibliography style] } {\revsdnamepunct}% {}}}% - {\bibnamedelimd\mkbibnameaffix{#4}\isdot}}}}{}% + {\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}}}{}% \newbibmacro*{author/editors/translators}{% \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}% 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 c1c1a13eb0d..bea3e54af0b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx @@ -1638,17 +1638,18 @@ citation style] \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}} \renewcommand*{\nameyeardelim}{% - \iffieldundef{origyear}% Is this test correct? - {\iffieldundef{year}% - {\addspace} - {\NumCheckSetup{\renewcommand{\mkbibbrackets}{\expandonce}% - \DeclareNumChars*{[?]s}}% For bracketed dates, and decades. - \iffieldnums{year}% This one works. - {\addspace}% - {\iffieldequalstr{year}{\bibstring{nodate}}% This also works. + \ifthenelse{\iffieldundef{labelyear}\OR% + \iffieldequalstr{labelyear}{nodate}}% + {\addcomma\addspace}% + {\iffieldundef{origyear}% Is this test correct? + {\iffieldundef{year}% {\addspace} - {\addcomma\addspace}}}}% - {\addspace}} + {\NumCheckSetup{\renewcommand{\mkbibbrackets}{\expandonce}% + \DeclareNumChars*{[?]s}}% For bracketed dates, and decades. + \iffieldnums{year}% This one works. + {\addspace}% + {\addcomma\addspace}}}% 16th ed. wants comma before n.d. + {\addspace}}} \newcommand{\classicpunct}{% \ifthenelse{\iffieldequalstr{entrysubtype}{classical}\OR% 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 60eed677dd0..66907a36043 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx @@ -192,50 +192,55 @@ {}}}% {\addlowpenspace\mkbibnameaffix{#4}\isdot}}} -\@ifpackagelater{biblatex}{2016/03/01}% For biblatex 3.3 +\@ifpackagelater{biblatex}{2016/03/01}% For biblatex 3.3/3.4 {\renewbibmacro*{name:family-given}[4]{% - \ifuseprefix + \ifuseprefix% {\usebibmacro{name:delim}{#3#1}% \usebibmacro{name:hook}{#3#1}% - \ifempty{#3}{}{% - \ifcapital - {\mkbibnameprefix{\MakeCapital{#3}}\isdot} + \ifdefvoid{#3}{}{% + \ifcapital% + {\mkbibnameprefix{\MakeCapital{#3}}\isdot}% {\mkbibnameprefix{#3}\isdot}% \ifprefchar{}{\bibnamedelimc}}% - \mkbibnamefamily{#1}\isdot - \ifempty{#2}{}{\revsdnamepunct\bibnamedelimd\mkbibnamegiven{#2}\isdot}% - \ifempty{#4}{}{\revsdnamepunct\bibnamedelimd\mkbibnameaffix{#4}\isdot}}% + \mkbibnamefamily{#1}\isdot% + \ifdefvoid{#2}{}{\revsdnamepunct\bibnamedelimd\mkbibnamegiven{#2}\isdot}% + \ifdefvoid{#4}{}{\revsdnamepunct\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}% {\usebibmacro{name:delim}{#1}% \usebibmacro{name:hook}{#1}% - \mkbibnamefamily{#1}\isdot - \ifempty{#2#3}{}{\revsdnamepunct}% - \ifempty{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}% - \ifempty{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}% - \ifempty{#4}{}{\revsdnamepunct\bibnamedelimd\mkbibnameaffix{#4}\isdot}}}% + \mkbibnamefamily{#1}\isdot% + \ifboolexpr{% + test {\ifdefvoid{#2}}% + and + test {\ifdefvoid{#3}}% + }% + {}{\revsdnamepunct}% + \ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}% + \ifdefvoid{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}% + \ifdefvoid{#4}{}{\revsdnamepunct\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}}% \renewbibmacro*{name:given-family}[4]{% \usebibmacro{name:delim}{#2#3#1}% \usebibmacro{name:hook}{#2#3#1}% - \ifempty{#2}{}{\mkbibnamegiven{#2}\isdot\bibnamedelimd}% - \ifempty{#3}{}{% - \mkbibnameprefix{#3}\isdot - \ifprefchar - {} + \ifdefvoid{#2}{}{\mkbibnamegiven{#2}\isdot\bibnamedelimd}% + \ifdefvoid{#3}{}{% + \mkbibnameprefix{#3}\isdot% + \ifprefchar% + {}% {\ifuseprefix{\bibnamedelimc}{\bibnamedelimd}}}% - \mkbibnamefamily{#1}\isdot - \ifempty{#4}{}{% + \mkbibnamefamily{#1}\isdot% + \ifdefvoid{#4}{}{% \iftoggle{cms@jrcomma}% {\ifnumeral{#4}% - {\bibnamedelimd\mkbibnameaffix{#4}\isdot}% - {\revsdnamepunct\bibnamedelimd\mkbibnameaffix{#4}\isdot% + {\bibnamedelimd\mkbibnamesuffix{#4}\isdot}% + {\revsdnamepunct\bibnamedelimd\mkbibnamesuffix{#4}\isdot% \ifboolexpr{% Test needed in notes test{\ifnumless{\value{listcount}}{\value{listtotal}}}% and test{\ifnumless{\value{listcount}}{\value{maxnames}}}% - } + }% {\revsdnamepunct}% {}}}% - {\bibnamedelimd\mkbibnameaffix{#4}\isdot}}}}{}% + {\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}}}{}% \newbibmacro*{author/editors/translators}{% \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}% -- cgit v1.2.3