diff options
author | Karl Berry <karl@freefriends.org> | 2014-08-22 21:07:18 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-08-22 21:07:18 +0000 |
commit | 44bb765d19eddeae2ed7e74052b1e75a4e12123b (patch) | |
tree | 267ab7f12f758913aeec3870dc3a38769c948fe7 /Master/texmf-dist | |
parent | 9655d464f79faee56fa49acca8a92b80899c3a8a (diff) |
biblatex-chicago (22aug14)
git-svn-id: svn://tug.org/texlive/trunk@35015 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/latex/biblatex-chicago/README | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE | 8 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf | bin | 959981 -> 960429 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex | 24 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf | bin | 748789 -> 748836 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.tex | 9 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf | bin | 315127 -> 315118 bytes | |||
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx | 38 |
8 files changed, 55 insertions, 26 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/README b/Master/texmf-dist/doc/latex/biblatex-chicago/README index d101a1b3962..71b7b5bb523 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/README +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/README @@ -14,7 +14,7 @@ author-date styles, and very strongly advised for the notes & bibliography style (version 1.9 is designed for use with the latest biblatex). -README (version 0.9.9f, 2014-08-15): +README (version 0.9.9g, 2014-08-21): 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 0eb5d1a3b8c..071f57c4d7e 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE @@ -1,3 +1,11 @@ +Release notes for version 0.9.9g [2014-08-21]: + + - Alexandre Roberts found a showstopper in the functionality related + to the new "inheritshorthand" option in the notes & bibliography + style, and I found an unpleasant bug in the formatting of + abbreviated cross-references in the same style. This release, I + hope, fixes both, but is in all other respects identical to 0.9.9f. + Release notes for version 0.9.9f [2014-08-15]: - I've made the alterations needed to bring the styles into line with diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf Binary files differindex 93656cad910..032a7ac1367 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf 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 1749443c14e..b0156d3ae5a 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.9f (beta) \\ +\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.9g (beta) \\ \href{mailto:djf027@googlemail.com}{djf027@googlemail.com}\\ \today \end{center} @@ -1470,7 +1470,7 @@ you must be using \textsf{Biber} for the settings to apply. See harley:ancient:cart, harley:cartography, and harley:hoc for how this might look. -\paragraph*{\mymarginpar{\textbf{online}}} +\paragraph*{\protect\mymarginpar{\textbf{online}}} \label{sec:online} The \emph{Manual}'s scattered instructions (14.4--13, 14.166--169, @@ -1896,7 +1896,7 @@ undefined, and \textsf{biblatex-chicago-notes} will do the rest. Cf.\ \textsf{foreword} and \textsf{introduction}. (See \emph{Manual} 14.91, 14.116; polakow:afterw.) -\paragraph*{\mymarginpar{\textbf{annotation}}} +\paragraph*{\protect\mymarginpar{\textbf{annotation}}} \label{sec:annote} At the request of Emil Salim, \textsf{biblatex-chicago-notes} has, as @@ -2127,7 +2127,7 @@ be useful for some purposes. Cf.\ \textsf{annotator}. %\enlargethispage{\baselineskip} -\paragraph*{\colmarginpar{\textbf{crossref}}} +\paragraph*{\protect\colmarginpar{\textbf{crossref}}} \label{sec:crossref} This field is the standard \textsc{Bib}\TeX\ cross-referencing @@ -2570,7 +2570,7 @@ identify a particular article. Only applicable to the \textsf{article} entry type. Not typically required by the \emph{Manual}. -\paragraph*{\mymarginpar{\textbf{entrysubtype}}} +\paragraph*{\protect\mymarginpar{\textbf{entrysubtype}}} \label{sec:entrysub} Standard and very powerful \textsf{biblatex} field, left undefined by @@ -3385,7 +3385,7 @@ preferences regarding the formatting of numerals. %\enlargethispage{\baselineskip} -\paragraph*{\mymarginpar{\textbf{shortauthor}}} +\paragraph*{\protect\mymarginpar{\textbf{shortauthor}}} \label{sec:shortauthor} This is a standard \textsf{biblatex} field, but @@ -10850,7 +10850,17 @@ code for it, let me know, and I'll look into it. \section{Revision History} \label{sec:history} -\textbf{0.9.9f: Released \today} +\textbf{0.9.9g: Released \today} +\begin{itemize} +\item Alexandre Roberts found a showstopper in the functionality + related to the new \mycolor{\texttt{inheritshorthand}} option in the + notes \&\ bibliography style, and I found an unpleasant bug in the + formatting of abbreviated cross-references in the same style. This + release, I hope, fixes both, but is in all other respects identical + to 0.9.9f. +\end{itemize} + +\textbf{0.9.9f: Released August 15, 2014} \begin{itemize} \item I've \label{deprec:obsol} made the alterations needed to bring the styles into line with the latest version of \textsf{biblatex} diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf Binary files differindex b8ee77328bd..32e48cf7a3c 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.tex index cb0815fbe02..4e6d3952e76 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.tex +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.tex @@ -56,7 +56,7 @@ 15th-edition style files for biblatex \vspace{.3\baselineskip} -\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.9f (beta) \\ +\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.9g (beta) \\ \href{mailto:djf027@googlemail.com}{djf027@googlemail.com}\\ \today \end{center} @@ -8565,7 +8565,12 @@ code for it, let me know, and I'll look into it. \section{Revision History} \label{sec:history} -\textbf{0.9.9f: Released \today} +\textbf{0.9.9g: Released \today} +\begin{itemize} +\item No changes to the 15th-edition styles. +\end{itemize} + +\textbf{0.9.9f: Released August 15. 2014} \begin{itemize} \item Small changes to both styles so that they compile with the latest \textsf{biblatex} (2.9a). No other fixes. 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 Binary files differindex 1790f58cc97..151aba708e9 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf 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 83013a2a7f3..b446b548796 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx @@ -1,10 +1,10 @@ -% $Id: chicago-notes.cbx,v 0.9.7.112 2014/08/15 09:27:37 dfussner Exp $ +% $Id: chicago-notes.cbx,v 0.9.7.114 2014/08/21 16:25:50 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. -\ProvidesFile{chicago-notes.cbx}[2014/08/15 v 2.9a biblatex citation style] +\ProvidesFile{chicago-notes.cbx}[2014/08/21 v 2.9a biblatex citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -29,7 +29,6 @@ \providetoggle{cms@addendum} \providetoggle{cms@comprange} \providetoggle{cms@modpostnote} -\providetoggle{cms@crspace} \providetoggle{cms@headlessnote} \providetoggle{cms@origcite} @@ -349,7 +348,17 @@ \newbibmacro*{cite}{% \ifciteseen% - {\iffieldundef{shorthand}% + {\ifboolexpr{ + test {\iffieldundef{shorthand}}% + or + ( + togl {blx@skipbiblist}% + and + togl {cms@inheritshhand}% + and + not test {\iffieldundef{crossref}}% + ) + } {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}% {\usebibmacro{cite:ibid}}% {\global\toggletrue{cms@shortnote}% @@ -575,11 +584,11 @@ \toggletrue{cms@shortnote}% \togglefalse{cms@fullnote}% \usebibmacro{bibxref-in:}% - \ifboolexpr{ + \ifboolexpr{% togl {cms@inheritshhand}% and not test {\iffieldundef{shorthand}}% - } + }% {\usebibmacro{cite}}% {\usebibmacro{cite:short}}}% {}% @@ -3434,8 +3443,8 @@ \newbibmacro*{cms-in:}{% Fix for 0.9a compat. \iftoggle{cms@origpublished}% - {}% The following is needed for userf + crossref inside bib. - {\iftoggle{cms@crspace}{\addspace}{}\bibstring{in}% ?!? + {}% Removed the cms@crspace test -- fixed a bug I had introduced + {\bibstring{in}% \setunit{\addspace}}} \newbibmacro*{bibxref-in:}{% @@ -3456,8 +3465,7 @@ \setunit{\addspace}% \bibstring{ofseries}% \setunit{\addspace}}% - {\toggletrue{cms@crspace}\usebibmacro{cms-in:}% - \togglefalse{cms@crspace}}}% + {\usebibmacro{cms-in:}}}% {\iffieldundef{part}% {\ifcsdef{cbx@incollpart}% {\restorefield{part}{\cbx@incollpart}\toggletrue{cms@xrefpart}}% @@ -3471,8 +3479,7 @@ \setunit{\addspace}% \bibstring{ofseries}% \setunit{\addspace}}% - {\toggletrue{cms@crspace}\usebibmacro{cms-in:}% - \togglefalse{cms@crspace}}}}% + {\usebibmacro{cms-in:}}}}% {\iffieldundef{part}% {\ifcsdef{cbx@incollpart}% {\restorefield{part}{\cbx@incollpart}\toggletrue{cms@xrefpart}}% @@ -3489,8 +3496,7 @@ \setunit{\addspace}% \bibstring{ofseries}% \setunit{\addspace}}% - {\toggletrue{cms@crspace}\usebibmacro{cms-in:}% - \togglefalse{cms@crspace}}}}% + {\usebibmacro{cms-in:}}}}% \newbibmacro*{chapincoll}{% \iffieldundef{chapter}% @@ -4180,7 +4186,7 @@ \newbibmacro*{backref+check}{% \ifbibliography% {\backtrackerfalse}% - {}} + {}}% \newbibmacro*{cite:postnote}{% \iftoggle{cms@loccit}% @@ -4479,7 +4485,7 @@ \iffieldundef{pagination}{}{\savefield{pagination}{\cbx@incollpgn}}% \iffieldundef{bookpagination}{}{\savefield{bookpagination}% {\cbx@incollbkpgn}}% The next line saves the child's backrefs - \iflistundef{pageref}{}{\savelist{pageref}{\cbx@incollpgref}}} + \iflistundef{pageref}{}{\savelist{pageref}{\cbx@incollpgref}}}% \newbibmacro*{xrefpostnote}{% \ifcsdef{cbx@incollpgref}% Here we print and clear the child's |