From 9422fc520291ceb7eb36aaacb2b97c08bdb02c9e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 18 Aug 2014 22:29:05 +0000 Subject: biblatex-chicago (18aug14) git-svn-id: svn://tug.org/texlive/trunk@34969 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/biblatex-chicago/README | 25 +- .../texmf-dist/doc/latex/biblatex-chicago/RELEASE | 95 ++ .../latex/biblatex-chicago/biblatex-chicago.pdf | Bin 940745 -> 959981 bytes .../latex/biblatex-chicago/biblatex-chicago.tex | 976 +++++++++++++-------- .../latex/biblatex-chicago/biblatex-chicago15.pdf | Bin 748839 -> 748789 bytes .../latex/biblatex-chicago/biblatex-chicago15.tex | 14 +- .../latex/biblatex-chicago/cms-dates-sample.pdf | Bin 434136 -> 435606 bytes .../latex/biblatex-chicago/cms-dates-sample.tex | 22 +- .../latex/biblatex-chicago/cms-notes-sample.pdf | Bin 315168 -> 315127 bytes .../latex/biblatex-chicago/cms-notes-sample.tex | 68 +- .../doc/latex/biblatex-chicago/cms-trad-sample.pdf | Bin 433288 -> 434769 bytes .../doc/latex/biblatex-chicago/cms-trad-sample.tex | 22 +- .../latex/biblatex-chicago/cms15-dates-sample.pdf | Bin 415018 -> 415016 bytes .../latex/biblatex-chicago/cms15-dates-sample.tex | 2 +- .../latex/biblatex-chicago/cms15-notes-sample.pdf | Bin 308965 -> 308970 bytes .../doc/latex/biblatex-chicago/dates-test.bib | 44 +- .../doc/latex/biblatex-chicago/notes-test.bib | 47 +- .../latex/biblatex-chicago/biblatex-chicago.sty | 6 +- .../biblatex-chicago/chicago-authordate-trad.cbx | 255 ++++-- .../latex/biblatex-chicago/chicago-authordate.bbx | 350 ++++++-- .../latex/biblatex-chicago/chicago-authordate.cbx | 264 ++++-- .../biblatex-chicago/chicago-authordate15.bbx | 68 +- .../biblatex-chicago/chicago-authordate15.cbx | 33 +- .../tex/latex/biblatex-chicago/chicago-notes.bbx | 291 ++++-- .../tex/latex/biblatex-chicago/chicago-notes.cbx | 485 ++++++---- .../tex/latex/biblatex-chicago/chicago-notes15.bbx | 30 +- 26 files changed, 2229 insertions(+), 868 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/README b/Master/texmf-dist/doc/latex/biblatex-chicago/README index 0ca6def1b0f..d101a1b3962 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/README +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/README @@ -1,19 +1,20 @@ IMPORTANT NOTE: This is the package formerly known as biblatex-chicago-notes-df. It -works best with the latest version (2.8a) of biblatex, and may not -work well or at all with earlier versions. It contains both the 15th- -and 16th-edition Chicago style files, though I am now marking the -15th-edition styles as "strongly deprecated" and am concentrating my -development time on the 16th edition. If you have used the package -before, then you should be sure to consult the 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 1.8 is -designed for use with the latest biblatex). +works best with the latest version (2.9a) of biblatex, and may not +work well or at all with earlier (or future) versions. It contains +both the 15th- and 16th-edition Chicago style files, though I am now +marking the 15th-edition styles as "strongly deprecated" and am +concentrating my development time on the 16th edition. If you have +used the package before, then you should be sure to consult the +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 1.9 is designed for use with the latest +biblatex). -README (version 0.9.9e, 2014-01-29): +README (version 0.9.9f, 2014-08-15): 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 6ab746cfc10..0eb5d1a3b8c 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE @@ -1,3 +1,98 @@ +Release notes for version 0.9.9f [2014-08-15]: + + - I've made the alterations needed to bring the styles into line with + the latest version of biblatex (2.9a). This is the version that + has been tested most thoroughly with biblatex-chicago, so I + strongly recommend using it. + + - I fixed several inaccuracies in the presentation of abbreviated + cross-references in all the Chicago styles, and while I was working + on that portion of the code it seemed an opportune moment to + fulfill some feature requests bearing on the same area of + functionality. + + - First, following a request from Alexandre Roberts, I have added the + "inheritshorthand" option to the notes & bibliography style, which + allows child entries to inherit the "shorthand" field from their + parents. This in turn allows the shorthand itself to appear in + place of the usual abbreviated citation of parent entries + cross-referenced by several different child entries, thereby saving + some space. (This behavior was already available in the + author-date styles, so the option is unnecessary there.) You'll + need to use "skipbiblist" in the "options" field of child entries + to make the list of shorthands work correctly. Please see the + documentation of the "shorthand" field for the full explanation. + + - Second, following a request from Kenneth Pearce, I have added to + all Chicago styles the capacity to combine abbreviated + cross-references with the presentation of the original text of + translations (via the "userf" field) or of the original publication + details of an essay or chapter you are citing from a subsequent + reprint (via the "reprinttitle" field). See the documentation of + those fields, and also of "crossref," and note that you can now, + taking certain precautions as outlined in the "shorthand" docs, + combine the "userf," "crossref," and "shorthand" fields. This + mechanism contains a great many moving parts, so please report any + problems you might have with it. + + - Third, and finally, following a bug report by Mark van Atten I have + fixed all Chicago styles so that the biblatex "backref" mechanism + works properly in biblatex-chicago, including in those entries that + use abbreviated cross-references, and in those that use the "userf" + or "reprinttitle" fields. I can't see any instructions concerning + this in the Manual, so I've left the formatting of "backref" lists + in the hands of biblatex itself. If the default behavior doesn't + match your needs, let me know, as it's possible I could add some + further options for modifying it. + + - I have added a new "compresspages" option to all the Chicago + styles. If set to "true" it automatically compresses page ranges + in the "pages" and "postnote" fields, allowing you to type ranges + naturally, e.g., 101--109, and letting the package follow the + Manual's rules for you. (In this case, it would yield 101-9 in the + document.) Thanks are due to David Gohlke who brought to my + attention a discussion that took place a couple of years ago on + Stack Exchange regarding the automatic compression of page ranges. + Biblatex has long had the facilities for providing this, and though + the Manual's rules (9.60) are fairly complicated, Audrey Boruvka + fortunately provided in that discussion code that implements the + specifications. As some users may well be accustomed to + compressing page ranges themselves in their .bib files, and in + their "postnote" fields, I have made the activation of this code a + package option. + + - Several users, most recently David Gohlke, have requested a way to + alter the punctuation that appears just before the "postnote" + argument of citation commands. This allows, in the notes & + bibliography style, citations to fit better into the flow of text, + while in the author-date styles it allows you very easily to insert + comments, which follow a semi-colon, inside parenthetical text + citations. This punctuation is a complex issue in the Manual, but + as a first stab at enabling this greater flexibility, I have + introduced the "postnotepunct" package option. Set to "true," it + allows you to start the "postnote" field with a punctuation mark + (. , ; :) and have it appear as the \postnotedelim in place of + whatever the package might otherwise automatically have chosen. + Please note that this functionality relies on a very nifty macro by + Philipp Lehman which I haven't extensively tested, so I'm labeling + this option "experimental." Note also that the option only affects + the "postnote" field of citation commands, not the "pages" field in + your .bib file. Note, finally, that if you are using the new + "compresspages" option then any "postnote" field starting with a + punctuation mark will require you to do the compression of page + ranges yourself. + + - I've added a new inheritance declaration so that InCollection + entries can inherit from Book entries the same way they inherit + from MVBook. + + - I've fixed a fair number of other bugs, including two in the Ibidem + mechanism pointed out by Bernd Rellermeyer, one in the printing of + dates, and one in the \textcite command in the notes & bibliography + style, these last two pointed out by Kenneth Beesley. The + presentation of all the periodical entry types (without an + "entrysubtype") has also been made more accurate. + Release notes for version 0.9.9e [2014-01-29]: - This minor release fixes a regression in the Ibidem mechanism in 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 61b3628bd47..93656cad910 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 d0aaa942d26..1749443c14e 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.9e (beta) \\ +\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.9f (beta) \\ \href{mailto:djf027@googlemail.com}{djf027@googlemail.com}\\ \today \end{center} @@ -135,7 +135,7 @@ author-date styles produce a short, in-text citation inside parentheses --- (Author Year) --- keyed to a list of references where entries start with the same name and year. -\enlargethispage{-2\baselineskip} +\enlargethispage{-\baselineskip} \mylittlespace The documentation you are reading covers all three of these Chicago styles and their variants. Much of what follows is @@ -146,22 +146,23 @@ sections~\ref{sec:Spec} and \ref{sec:authdate}. Information provided under one style will often duplicate that found under the other, but efficiency's loss should, I hope, be clarity's gain, and much of what you learn using one style will be applicable without alteration to the -other. Within the author-date section, the -\mycolor{\textsf{authordate-trad}} information really only appears -separately in section~\ref{sec:fields:authdate}, s.v.\ -\enquote{title.} Throughout the documentation, any \mycolor{green} -text \colmarginpar{\textsf{New!}} indicates something \mycolor{new} in -this release. +other. Within the author-date section, the \textsf{authordate-trad} +information really only appears separately in +section~\ref{sec:fields:authdate}, s.v.\ \enquote{title.} Throughout +the documentation, any \mycolor{green} text +\colmarginpar{\textsf{New!}} indicates something \mycolor{new} in this +release. \mylittlespace Here's a list of things you will need in order to use \textsf{biblatex-chicago}: \begin{itemize}{}{} -\item Philipp Lehman's \textsf{biblatex} package, of course! You must - use the latest version(s) --- 1.7 or 2.8a at the time of writing --- - as my code relies on features and bug fixes only available in the - most recent release. Lehman's tools require several packages, and - he strongly recommends several more: +\item Philipp Lehman's \textsf{biblatex} package, of course! You + should use the current version(s) --- 1.7 or 2.9a at the time of + writing --- as my code has been most extensively tested with, and + relies on features and bug fixes only available in, this current + release. Lehman's tools require several packages, and he strongly + recommends several more: \begin{itemize}{}{} \item e-\TeX\ (required) \item \textsf{etoolbox} --- available from CTAN (required) @@ -184,7 +185,7 @@ this 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, 1.8, to work with \textsf{biblatex} 2.8a and + the latest version, 1.9, to work with \textsf{biblatex} 2.9a and \textsf{biblatex-chicago}, and it is required for users who are either using the author-date styles or processing a .bib file in Unicode. See \textsf{cms-dates-sample.pdf} and, for example, the @@ -202,7 +203,7 @@ this release. \end{quote} to load the author-date style, or the line: \begin{quote} - \cmd{usepackage[\mycolor{authordate-trad},% + \cmd{usepackage[authordate-trad,% backend=biber]\{biblatex-chicago\}} \end{quote} @@ -242,19 +243,19 @@ this release. fuller explanation of all the options. \item \textsf{chicago-auth\-ordate.cbx}, \textsf{chi\-cago-authordate.bbx}, - \mycolor{\textsf{chi\-cago-authordate-trad.cbx}}, - \mycolor{\textsf{chicago-auth\-ordate-trad.bbx}}, - \textsf{chicago-notes.bbx}, \textsf{chi\-cago-notes.cbx}, - \textsf{cms-am\-erican.lbx}, \textsf{cms-british.lbx}, - \textsf{cms-finnish.lbx}, \textsf{cms-french.lbx}, - \textsf{cms-ger\-man.lbx}, \textsf{cms-icelandic.lbx}, - \textsf{cms-ngerman.lbx}, \textsf{cms-norsk.lbx}, - \textsf{cms-norwe\-gian.lbx}, \textsf{cms-nynorsk.lbx}, and - \textsf{biblatex-chicago.sty}, all from \textsf{biblatex-chicago}, - installed either in a system-wide \TeX\ directory, or in the working - directory where you keep your *.tex files. (To use the 15th-edition - styles, you'll also require \textsf{chicago-notes15.bbx}, - \textsf{chicago-notes15.cbx}, \textsf{chicago-authordate15.bbx}, and + \textsf{chi\-cago-authordate-trad.cbx}, + \textsf{chicago-auth\-ordate-trad.bbx}, \textsf{chicago-notes.bbx}, + \textsf{chi\-cago-notes.cbx}, \textsf{cms-am\-erican.lbx}, + \textsf{cms-british.lbx}, \textsf{cms-finnish.lbx}, + \textsf{cms-french.lbx}, \textsf{cms-ger\-man.lbx}, + \textsf{cms-icelandic.lbx}, \textsf{cms-ngerman.lbx}, + \textsf{cms-norsk.lbx}, \textsf{cms-norwe\-gian.lbx}, + \textsf{cms-nynorsk.lbx}, and \textsf{biblatex-chicago.sty}, all + from \textsf{biblatex-chicago}, installed either in a system-wide + \TeX\ directory, or in the working directory where you keep your + *.tex files. (To use the 15th-edition styles, you'll also require + \textsf{chicago-notes15.bbx}, \textsf{chicago-notes15.cbx}, + \textsf{chicago-authordate15.bbx}, and \textsf{chicago-authordate15.cbx}.) The .zip file from CTAN contains several subdirectories to help keep the growing number of files organized, so the files listed above can be found in the @@ -285,13 +286,12 @@ this release. details on how to get started constructing your own .bib files for use with the two \textsf{biblatex-chicago} styles. \item The files \textsf{cms-notes-sample.pdf}, - \textsf{cms-dates-sample.pdf}, and - \mycolor{\textsf{cms-trad-sam\-ple.pdf}}. The first shows how my - system processes \textsf{notes-test.bib} and + \textsf{cms-dates-sample.pdf}, and \textsf{cms-trad-sam\-ple.pdf}. + The first shows how my system processes \textsf{notes-test.bib} and \textsf{cms-notes-sample.tex}, in both footnotes and bibliography, the second and third are the result of processing \textsf{dates-test.bib} with \textsf{cms-dates-sample.tex} or - \mycolor{\textsf{cms-trad-sample.tex}}. All of these files are in + \textsf{cms-trad-sample.tex}. All of these files are in \texttt{doc/examples/}. \item The file you are reading, \textsf{biblatex-chicago.pdf}, which aims to be as complete a description as possible of the rules for @@ -354,21 +354,24 @@ separating rule only after a run-on note, I've adapted from the for the \texttt{shorthandibid} option from Dominik Waßenhoven's \textsf{biblatex-dw} package. I've adapted Audrey Boruvka's \cmd{textcite} code from -\href{http://tex/stackexchange.com/questions/67837/citations-as-nouns-in-biblatex-chicago}{Stackexchange} -for the notes \&\ bibliography style. I am very grateful to -Antti-Juhani Kaijahano for the Finnish localization, to Baldur -Kristinsson for providing the Icelandic localization, and to Håkon -Malmedal for the Norwegian localizations. Kazuo Teramoto and Gildas -Hamel both sent patches to improve the package, and there may be other -\LaTeX\ code I've appropriated and forgotten, in which case please -remind me. Finally, Charles Schaum and Joseph Reagle Jr.\ were both -extremely generous with their help and advice during the development -of this package, and have both continued indefatigably to test it and -suggest needed improvements. They were particularly instrumental in -encouraging the greatest possible degree of compatibility with other -\textsf{biblatex} styles. Indeed, if the task of adapting .bib files -for use with the Chicago style seems onerous now, you should have -tried it before they got their hands on it. +\href{http://tex.stackexchange.com/questions/67837/citations-as-nouns-in-biblatex-chicago}{Stackexchange} +for the notes \&\ bibliography style, and her page-number-compression +code for both styles from the +\href{http://tex.stackexchange.com/questions/44492/biblatex-chicago-style-page-ranges}{same + site}. I am very grateful to Antti-Juhani Kaijahano for the Finnish +localization, to Baldur Kristinsson for providing the Icelandic +localization, and to Håkon Malmedal for the Norwegian localizations. +Kazuo Teramoto and Gildas Hamel both sent patches to improve the +package, and there may be other \LaTeX\ code I've appropriated and +forgotten, in which case please remind me. Finally, Charles Schaum +and Joseph Reagle Jr.\ were both extremely generous with their help +and advice during the development of this package, and have both +continued indefatigably to test it and suggest needed improvements. +They were particularly instrumental in encouraging the greatest +possible degree of compatibility with other \textsf{biblatex} styles. +Indeed, if the task of adapting .bib files for use with the Chicago +style seems onerous now, you should have tried it before they got +their hands on it. \section{Detailed Introduction} \label{sec:Intro} @@ -384,7 +387,7 @@ number of different kinds of source material, then your choice (or your publisher's choice) of the \emph{Manual} as a style guide seems set to be a happy one. -%% \enlargethispage{-\baselineskip} +%% %\enlargethispage{-\baselineskip} \mylittlespace These very strengths, however, also make the style difficult to use. Admittedly, the \emph{Manual} emphasizes @@ -449,7 +452,7 @@ with this style, that you work on a copy of any .bib files that are important to you, until you have determined that this package does what you need/want it to do. -% \enlargethispage{\baselineskip} +% %\enlargethispage{\baselineskip} \mylittlespace When I first began working on this package, I made the decision to alter as little as possible the main files from Lehman's @@ -556,10 +559,10 @@ and that page numbers are set off by a comma rather than a colon. Otherwise, the two sorts of reference have much in common. (For \textsf{article}, see \emph{Manual} 14.175--198; batson, beattie:crime, friedman:learning, garaud:gatine, garrett, hlatky:hrt, -kern, lewis, loften:hamlet, mcmillen:antebellum, warr:ellison, -white:callimachus. For \textsf{entrysubtype} \texttt{magazine}, see -14.181, 14.199--202; assocpress:gun, morgenson:market, reaves:rosen, -rozner:liberation, stenger:privacy.) +kern, lewis, loften:hamlet, mcmillen:antebellum, rozner:liberation, +saberhagen:beluga, warr:ellison, white:callimachus. For +\textsf{entrysubtype} \texttt{magazine}, see 14.181, 14.199--202; +assocpress:gun, morgenson:market, reaves:rosen, sten\-ger:privacy.) \mylittlespace It gets worse. The \emph{Manual} treats reviews (of books, plays, performances, etc.) as a sort of recognizable subset of @@ -581,7 +584,7 @@ sort of review still exists in \textsf{article}, as it was initially designed for \textsf{biblatex 0.6}, but this new arrangement is somewhat simpler and therefore, I hope, better.) -%\enlargethispage{-\baselineskip} +%%\enlargethispage{-\baselineskip} \mylittlespace In the case of a review with a specific as well as a generic title, the former goes in the \textsf{title} field, and the @@ -641,7 +644,7 @@ bibliography entry is alphabetized correctly. (See lakeforester:pushcarts and, for the sorting issue, \cmd{DeclareSortingScheme} in section~\ref{sec:formatopts} below.) -%\enlargethispage{-\baselineskip} +\enlargethispage{-\baselineskip} \mylittlespace Fourth, Bertold Schweitzer has pointed out, following the \emph{Manual} (14.192), that while an \textsf{issuetitle} often @@ -723,7 +726,7 @@ entry with the same \textsf{entrysubtype}. Such comments make particular use of the \textsf{eventdate} and of the \textsf{nameaddon} fields; please see the documentation of \textbf{review}, below. -% \enlargethispage{-\baselineskip} +% %\enlargethispage{-\baselineskip} \mylittlespace If you're still with me, allow me to recommend that you browse through \textsf{notes-test.bib} to get a feel for just how many @@ -817,7 +820,7 @@ of an archive, online or no, may best be presented in a \textbf{misc} entry with an \textsf{entrysubtype} (coolidge:speech, roosevelt:speech). -\enlargethispage{\baselineskip} +%\enlargethispage{\baselineskip} \mylittlespace Once you've accepted the analogy of composer to \textsf{author}, constructing an \textsf{audio} entry should be fairly @@ -900,7 +903,7 @@ obsolete, and any such entries in your .bib file will trigger an error. Please use the standard \textsf{biblatex} \textbf{letter} type instead. -\enlargethispage{\baselineskip} +%\enlargethispage{\baselineskip} \mybigspace This \mymarginpar{\textbf{customb}} entry type is now obsolete, and any such entries in your .bib file will trigger an @@ -935,7 +938,7 @@ key in a \cmd{nocite} command, or you can put that entry key in the \textsf{biblatex-chicago} will print the expanded abbreviation if and only if you cite the main entry. (Cf.\ \textsf{userc}, below.) -%\enlargethispage{\baselineskip} +%%\enlargethispage{\baselineskip} \mylittlespace Under ordinary circumstances, \textsf{biblatex-chicago} will connect the two parts of the cross-reference with the word @@ -1016,8 +1019,6 @@ mechanism for shortening citations of multiple pieces from the same \mycolor{\texttt{longcrossref}} in section~\ref{sec:chicpreset} for more details. -% \enlargethispage{-\baselineskip} - \mybigspace This \mymarginpar{\textbf{inreference}} entry type is aliased to \textsf{incollection} in the standard styles, but the \emph{Manual} has particular requirements, so if you are citing @@ -1069,6 +1070,8 @@ work correctly you can only put one article name in it. Despite this limitation, I hope that the current system might simplify things for users who cite numerous works of reference. +\enlargethispage{-\baselineskip} + \mylittlespace If it seems appropriate to include such a work in the bibliography, be aware that the contents of the \textsf{lista} field will also be presented there, which may not be what you want. A @@ -1175,7 +1178,7 @@ see section~\ref{sec:chicpreset}, below. To stop individual letters turning up in the bibliography, you can use the \texttt{skipbib} option in the \textsf{options} field. -% \enlargethispage{\baselineskip} +% %\enlargethispage{\baselineskip} \mybigspace This \mymarginpar{\textbf{manual}} is the second of two traditional \textsc{Bib}\TeX\ entry types that the \emph{Manual} @@ -1284,7 +1287,7 @@ date of a letter in a short note, I have provided the the citation command. (The standard \textsf{biblatex} command \cmd{printdate} will work if you need to do the same for interviews.) -%\vspace{\baselineskip} +\enlargethispage{\baselineskip} \mylittlespace As with \textsf{letter} entries, the \emph{Manual} (14.233) suggests that bibliography entries contain only the name of @@ -1511,7 +1514,7 @@ the \emph{Manual} (14.7--8) prefers, if they're available, revision dates to access dates when documenting online material. See \textsf{urldate} and \textsf{userd}, below. -%\enlargethispage{\baselineskip} +%%\enlargethispage{\baselineskip} \mybigspace The \mymarginpar{\textbf{patent}} \emph{Manual} is very brief on this subject (14.230), but very clear about which information @@ -1596,7 +1599,7 @@ entry, then the \textsf{type} field automatically defaults to report type in \textsf{note} and the \textsf{institution} in \textsf{publisher}. (See herwign:office.) -%\enlargethispage{\baselineskip} +%%\enlargethispage{\baselineskip} \mybigspace The \mymarginpar{\textbf{review}} \textsf{review} entry type was added to \textsf{biblatex 0.7}, and it certainly eases the @@ -1716,7 +1719,7 @@ depending on the context. Examples might be \enquote{\texttt{preface that unless you use a \cmd{bibstring} command in the \textsf{type} field, the resultant entry will not be portable across languages.) -\enlargethispage{\baselineskip} +\enlargethispage{-\baselineskip} \mylittlespace There are a few other rules for constructing your .bib entry. The \textsf{author} field refers to the author of the @@ -1753,7 +1756,7 @@ this purpose, and now you can use either of these, as I've added above under \textbf{review} for the full instructions on how to construct a .bib entry for such a reference. -%\enlargethispage{-\baselineskip} +%%\enlargethispage{-\baselineskip} \mybigspace The \mymarginpar{\textbf{unpublished}} \textsf{unpublished} entry type works largely as it does in standard @@ -1919,7 +1922,7 @@ for this.) do, even though the \emph{Manual} doesn't actually mention it. It may be useful for some purposes. Cf.\ \textsf{commentator}. -%\enlargethispage{\baselineskip} +%%\enlargethispage{\baselineskip} \mybigspace For \mymarginpar{\textbf{author}} the most part, I have implemented this field in a completely standard \textsc{Bib}\TeX\ @@ -2030,7 +2033,7 @@ employ, you include a cross-reference from one name to the other in the bibliography. You can do this using a \textsf{customc} entry (ashe:creasey, morton:creasey, york:creasey). -% \enlargethispage{\baselineskip} +% %\enlargethispage{\baselineskip} \mybigspace In \mymarginpar{\textbf{authortype}} \textsf{biblatex-chicago}, this field serves a function very much in @@ -2122,7 +2125,7 @@ of a book (ashbrook:brain). do, even though the \emph{Manual} doesn't actually mention it. It may be useful for some purposes. Cf.\ \textsf{annotator}. -\enlargethispage{\baselineskip} +%\enlargethispage{\baselineskip} \paragraph*{\colmarginpar{\textbf{crossref}}} \label{sec:crossref} @@ -2150,16 +2153,16 @@ backend, \textsf{biblatex} defines a series of inheritance rules for the \textsf{crossref} field which make it much more convenient to use. Appendix B of \textsf{biblatex.pdf} explains the defaults, to which \textsf{biblatex-chicago} has added several that I should mention -here: \textsf{incollection} entries can now inherit from -\textsf{mvbook} just as they do from \textsf{mvcollection} entries; -\textsf{letter} entries now inherit from \textsf{book}, -\textsf{collection}, \textsf{mvbook}, and \textsf{mvcollection} -entries the same way an \textsf{inbook} or an \textsf{incollection} -entry would; the \textsf{namea}, \textsf{nameb}, \textsf{sortname}, -\textsf{sorttitle}, and \textsf{sortyear} fields, all highly -single-entry specific, are no longer inheritable; and \textsf{date} -and \textsf{origdate} fields are not inheritable from any of the new -\textbf{mv*} entry types.) +here: \textsf{incollection} entries can now inherit from \textsf{book} +and \textsf{mvbook} just as they do from \textsf{collection} and +\textsf{mvcollection} entries; \textsf{letter} entries now inherit +from \textsf{book}, \textsf{collection}, \textsf{mvbook}, and +\textsf{mvcollection} entries the same way an \textsf{inbook} or an +\textsf{incollection} entry would; the \textsf{namea}, \textsf{nameb}, +\textsf{sortname}, \textsf{sorttitle}, and \textsf{sortyear} fields, +all highly single-entry specific, are no longer inheritable; and +\textsf{date} and \textsf{origdate} fields are not inheritable from +any of the new \textbf{mv*} entry types.) \mylittlespace Turning now to the provision of abbreviated references in \textsf{biblatex-chicago-notes}, the \emph{Manual} (14.113) @@ -2265,8 +2268,6 @@ of individual entries. See \textbf{mvbook} in section~\ref{sec:entrytypes} and \texttt{omitxrefdate} in section~\ref{sec:useropts}. -% \enlargethispage{\baselineskip} - \mylittlespace Finally, a published collection of letters also requires different treatment (14.117). If you cite more than one letter from the same collection, then the \emph{Manual} specifies that @@ -2350,11 +2351,26 @@ The \colmarginpar{\texttt{booklongxref}} second option, Please note that you can set both of these options either in the preamble or in the \textsf{options} field of individual entries, allowing you to change the settings on an entry-by-entry basis. -Please also note that the combination of \textsf{shorthand}, -\textsf{reprinttitle}, and/or \textsf{userf} fields with shortened -cross references may produce unexpected results, at least as -\textsf{biblatex-chicago-notes} currently stands. I advise caution -before doing so. + +\mylittlespace Please \colmarginpar{New!} further note that in +previous releases of \textsf{biblatex-chicago} I recommended against +using \textsf{shorthand}, \textsf{reprinttitle} and/or \textsf{userf} +fields in combination with this abbreviated cross-referencing +mechanism. I have, however, received a request from Alexandre Roberts +to allow the shorthand to appear in the place of the abbreviated +cross-reference as an additional space-saving measure, and one from +Kenneth Pearce to permit the combination of the other two fields with +\textsf{crossref}, as well. The \textsf{userf} and +\textsf{reprinttitle} fields should now just work automatically in +such circumstances, but \colmarginpar{\texttt{inheritshort\-hand}} the +\textsf{shorthand} field in parent entries needs to be enabled by +setting the \mycolor{\texttt{inheritshorthand}} package option to +\texttt{true}. There are, in addition, several other steps required +to make this function smoothly --- please see the documentation of the +\textbf{shorthand} field, below, for a full explanation. (In case it +isn't clear, the combination of \textsf{userf}, \textsf{shorthand}, +and \textsf{crossref} functionality in a single entry is now possible. +If you come across any problems or inaccuracies, please report them.) \mybigspace This \colmarginpar{\textbf{date}} field may be used to specify an item's complete date of publication, in \textsc{iso}8601 @@ -2391,6 +2407,8 @@ making the conversion, though I'm retaining the right to revoke this if the code in question demonstrably interferes with the functioning of the notes \&\ bibliography style.) +\enlargethispage{\baselineskip} + \mybigspace This \mymarginpar{\textbf{day}} field, as of \textsf{biblatex} 0.9, is obsolete, and will be ignored if you use it in your .bib files. Use \textsf{date} instead. @@ -2469,7 +2487,7 @@ performers. To specify the role, use the fields \textsf{editoratype}, \textsf{editorbtype}, and \textsf{editorctype}, which see. (Cf.\ bernstein:shostakovich, handel:messiah.) -\enlargethispage{\baselineskip} +%\enlargethispage{\baselineskip} \mybigspace Normally, \mymarginpar{\textbf{editortype}} with the exception of the \textsf{article} and \textsf{review} types, @@ -2655,7 +2673,7 @@ from the \textsf{author}. The \emph{Manual} has nothing to say on the subject, but \textsf{biblatex-chicago-notes} prints it (them), in parentheses, just after the author(s). -\enlargethispage{\baselineskip} +%\enlargethispage{\baselineskip} \mybigspace Standard \mymarginpar{\textbf{howpublished}} \textsf{biblatex} field, mainly applicable in the \textsf{booklet} @@ -2711,7 +2729,7 @@ proper place to identify the type of issue, e.g.,\ \texttt{special issue}, with the initial letter lower-cased to enable automatic contextual capitalization. -%\enlargethispage{\baselineskip} +%%\enlargethispage{\baselineskip} \mybigspace The \mymarginpar{\textbf{journalsubtitle}} subtitle for a \textsf{journaltitle} --- see next entry. @@ -2814,7 +2832,7 @@ If the place of publication is unknown, you can use \cmd{autocap\{n\}.p.}\ instead (14.138). For all cities, you should use the common English version of the name, if such exists (14.137). -%\enlargethispage{\baselineskip} +%%\enlargethispage{\baselineskip} \mylittlespace Three more details need explanation here. In \textsf{article}, \textsf{periodical}, and \textsf{review} entries, @@ -2849,7 +2867,7 @@ pelikan:chris\-tian, and plato:republic:gr.) When using a \textbf{mv*} entry types always becomes a \textsf{maintitle} in the child entry. -%\enlargethispage{\baselineskip} +%%\enlargethispage{\baselineskip} \mybigspace An \mymarginpar{\textbf{maintitleaddon}} annex to the \textsf{maintitle}, for which see previous entry. Such an annex would @@ -2968,6 +2986,8 @@ the \textsf{editor} field \textsf{biblatex} will automatically attend to alphabetization and name-replacement in the bibliography, and will also provide a name for short notes.) +\enlargethispage{\baselineskip} + \mylittlespace It might conceivably be necessary at some point to identify the compiler(s) of a \textsf{title} separate from the compiler(s) of a \textsf{booktitle} or \textsf{maintitle}, but for the @@ -3101,7 +3121,7 @@ numbers, some improvisation may be needed if you wish to include \textsf{titleaddon}, but in other entry types you may need to use the \textsf{location} field. -%\enlargethispage{\baselineskip} +%%\enlargethispage{\baselineskip} \mybigspace In \mymarginpar{\textbf{origlanguage}} keeping with the \emph{Manual}'s specifications, I have fairly thoroughly redefined @@ -3178,7 +3198,7 @@ the \textsf{origdate}, and all will be presented in long notes and bibliography. (Cf.\ \textsf{origdate}, \textsf{origlocation}, and \textsf{pubstate}; schweitzer:bach.) -\mybigspace This \mymarginpar{\textbf{pages}} is the standard +\mybigspace This \colmarginpar{\textbf{pages}} is the standard \textsf{biblatex} field for providing page references. In many \textsf{article} and \textsf{review} entries you'll find this contains something other than a page number, e.g. a section name or edition @@ -3195,6 +3215,22 @@ given \textsf{pages} field contains; and \textsf{usera} discusses a different way to present the section information pertaining to a newspaper article. +\mylittlespace David Gohlke has recently brought to my attention a +discussion that took place a couple of years ago on +\href{http://tex.stackexchange.com/questions/44492/biblatex-chicago-style-page-ranges}{Stackexchange} +regarding the automatic compression of page ranges, e.g., 101-{-}109 +in the .bib file or in the \textsf{postnote} field would become 101--9 +in the document. \textsf{Biblatex} has long had the facilities for +providing this, and though the \emph{Manual's} rules (9.60) are fairly +complicated, Audrey Boruvka fortunately provided in that discussion +code that implements the specifications. As some users may well be +accustomed to compressing page ranges themselves in their .bib files, +and in their \textsf{postnote} fields, I have made the activation of +this code a package option, so setting +\mycolor{\texttt{compresspages=true}} when loading +\textsf{biblatex-chicago} should automatically give you the +Chicago-recommended page ranges. + \mybigspace This, \mymarginpar{\textbf{pagination}} a standard \textsf{biblatex} field, allows you automatically to prefix the appropriate identifying string to information you provide in the @@ -3269,7 +3305,7 @@ will take care of everything for you. Both of these methods will now work just fine, but please choose only one per entry, otherwise the string will be printed twice. -\enlargethispage{\baselineskip} +%\enlargethispage{\baselineskip} \mylittlespace There are a couple of exceptions to this basic functionality. In \textsf{video} entries, no bibstring will be @@ -3347,7 +3383,7 @@ periodicals, see 14.195; garaud:gatine, sewall:letter.) Cf.\ \textsf{number} for more information on the \emph{Manual}'s preferences regarding the formatting of numerals. -\enlargethispage{\baselineskip} +%\enlargethispage{\baselineskip} \paragraph*{\mymarginpar{\textbf{shortauthor}}} \label{sec:shortauthor} @@ -3392,7 +3428,7 @@ most situations, but if you have set \texttt{useauthor=false} (and not only \textsf{shorteditor} will be recognized. Cf.\ \textsf{editortype}, above. -\mybigspace This \mymarginpar{\textbf{shorthand}} is +\mybigspace This \colmarginpar{\textbf{shorthand}} is \textsf{biblatex}'s mechanism for using abbreviations in place of the usual short note form, and in previous releases I left it effectively unmodified in \textsf{biblatex-chicago-notes}, apart from a few @@ -3404,17 +3440,18 @@ entry which contains a \textsf{shorthand} field will produce a normal first note, either long or short according to your package options, informing the reader that the work will hereafter be cited by this abbreviation. As in \textsf{biblatex}, the \cmd{printshorthands} -command will produce a formatted list of abbreviations for reference -purposes, a list which the \emph{Manual} suggests should be placed -either in the front matter (when using footnotes) or before the -endnotes, in case these are used. +command, now for \textsf{Biber} users at least an alias for +\cmd{printbib\-list\{shorthand\}}, will produce a formatted list of +abbreviations for reference purposes, a list which the \emph{Manual} +suggests should be placed either in the front matter (when using +footnotes) or before the endnotes, in case these are used. \mylittlespace I have provided three options to alter these defaults. First, there is a new citation command, \cmd{shorthandcite}, which will print the \textsf{shorthand} even at the first citation. I have only provided the most general form of this command, so you'll need to put it inside parentheses or in a \cmd{footnote} command yourself. -Next, I have included two \texttt{bibenvironments} for use with the +Second, I have included two \texttt{bibenvironments} for use with the \texttt{env} option to the \cmd{printshorthands} command: \texttt{losnotes} is designed to allow a list of shorthands to appear inside footnotes, while \texttt{losendnotes} does the same for @@ -3423,17 +3460,44 @@ latter case to clear up some spurious punctuation and white space that I see on my system when using endnotes. (You'll probably also want to use the option \texttt{heading=none} in order to get rid of the [oversized] default, providing your own within the \cmd{footnote} -command.) Finally, I have provided a package option, +command.) Third, I have provided a package option, \texttt{shorthandfull}, which prints entries in the list of shorthands which contain full bibliographical information, effectively allowing you to eschew the bibliography in favor of a fortified shorthand list. (See 13.65, 14.54--55, and also \textsf{biblatex.pdf} for more information.) -\mylittlespace As I mentioned above under \textbf{crossref}, extra -care is needed when using shorthands with cross-references, and I -would avoid them in all parent entries, at least in the current state -of \textsf{biblatex-chicago-notes}. +\mylittlespace Alexandre \colmarginpar{New!} Roberts has suggested a +further refinement to \textsf{shorthand} behavior, which allows for it +to appear in the place of the usual abbreviated citation of parent +entries cross-referenced by several different child entries. In such +a case, instead of the usual \enquote{\ldots\,in Author, \emph{Title}, + 24--38,} you would see instead \enquote{\ldots\,in \emph{ShrtHd}, + 24--38.} There are several steps required for enabling this +behavior. First, you need to set the new package option +\mycolor{\texttt{inheritshorthand}} to \texttt{true}, which allows +child entries to inherit the necessary fields from their +cross-referenced parents. Second, you'll probably want to use the +\textsf{shorthandintro} field somehow to clarify that the +\textsf{shorthand} applies to the \emph{parent} rather than to the +\emph{child}, as otherwise the reference will be ambiguous. Third, +you'll need to put \texttt{skipbiblist}, formerly \texttt{skiplos}, in +the \textsf{options} field of the child entries so that the +\textsf{shorthand} itself appears in the list of shorthands +\emph{only} next to the parent entry, and not also next to all of its +children. + +\mylittlespace As I mentioned above under \textbf{crossref}, I +formerly recommended against using shorthands with cross-references, +but this extension of their use makes sense as an extra space-saving +measure. I'm not certain that I've identified all the possible +drawbacks to enabling the \mycolor{\texttt{inheritshorthand}} option, +so care is still needed, at least in the current state of +\textsf{biblatex-chicago-notes}. Please report any problems you might +have with this functionality to the email address at the head of this +documentation. + +\enlargethispage{-\baselineskip} \mybigspace When \mymarginpar{\textbf{shorthandintro}} you include a \textsf{shorthand} in an entry, it will ordinarily appear the first @@ -3473,7 +3537,7 @@ lowercase letter the style will do the right thing (barcott:review, bundy:macneil, Clemens:letter, kozinn:review, ratliff:review, unsigned:ranke). -%\enlargethispage{\baselineskip} +%%\enlargethispage{\baselineskip} \mybigspace A \mymarginpar{\textbf{sortkey}} standard \textsf{biblatex} field, designed to allow you to specify how you want @@ -3619,7 +3683,7 @@ example where the \textsf{titleaddon} field, holding the name of a regular column in a newspaper, is capitalized, a situation that is handled as you would expect.) -%\enlargethispage{\baselineskip} +\enlargethispage{-\baselineskip} \mybigspace As \mymarginpar{\textbf{translator}} far as possible, I have implemented this field as \textsf{biblatex}'s standard styles do, @@ -3698,7 +3762,7 @@ do the right thing in citations. Cf.\ \textsf{artwork}, above, for all the details. (See auden:reading, bedford:photo, cleese:holygrail, leo:madonna, nytrumpet:art.) -%\enlargethispage{-\baselineskip} +%%\enlargethispage{-\baselineskip} \mybigspace A standard \mymarginpar{\textbf{url}} \textsf{biblatex} field, it holds the url of an online publication, though you can @@ -3798,7 +3862,7 @@ the latter, you may need to provide a \textsf{shorttitle} so that the short note form is also parseable. Cf.\ \textbf{language}, above. (See 14.108--110, 14.194; kern, weresz.) -%\enlargethispage{\baselineskip} +%%\enlargethispage{\baselineskip} \mybigspace This \mymarginpar{\textbf{userf}} is the last of the supplemental fields which \textsf{biblatex} provides, and is used by @@ -3877,7 +3941,7 @@ customizable, using the new command \mycolor{\cmd{postvolpunct}} \textsf{part}, and the command documentation in section~\ref{sec:formatcommands}. -%\enlargethispage{\baselineskip} +%%\enlargethispage{\baselineskip} \mybigspace Standard \colmarginpar{\textbf{volumes}} \textsf{biblatex} field. It holds the total number of volumes of a multi-volume work, @@ -4019,7 +4083,7 @@ and very nearly all need for the \cmd{autocap} command --- centinel:letters and powell:email being the only exceptions. Please see \textbf{\textbackslash autocap} above for full details. -%\enlargethispage{\baselineskip} +%%\enlargethispage{\baselineskip} \mylittlespace I should also mention here that \textsf{biblatex 0.7} introduced a new functionality which sometimes allows you simply to @@ -4062,8 +4126,6 @@ instead of \cmd{enquote} or the usual \LaTeX\ mechanisms inside their .bib files. For further details, please see the \cmd{mkbibquote} entry below. -%\enlargethispage{-\baselineskip} - \mylittlespace I have retained the code for the \cmd{custpunct} commands in \textsf{chicago-notes.cbx}, in case a particularly gnarly entry might still require them, but I have already started to re-use @@ -4092,6 +4154,8 @@ only using \cmd{headlesscites}. (There is also, by the way, a \cmd{headlessparencite(s)} command if you want to retain the long citations inside the parentheses.) +\enlargethispage{\baselineskip} + \mybigspace This \mymarginpar{\textbf{\textbackslash isdot}} is a standard \textsf{biblatex} macro, which in previous releases of \textsf{biblatex-chicago} could function as a convenient placeholder @@ -4188,6 +4252,8 @@ please note that the command only applies in this limited context, not more generally to the punctuation that appears between, e.g., a \textsf{volume} and a \textsf{part} field. +\enlargethispage{-\baselineskip} + \mybigspace This \mymarginpar{\textbf{\textbackslash reprint}} and the following 7 macros all help \textsf{biblatex-chicago-notes} cope with the fact that many bibstrings in the Chicago system differ between @@ -4224,8 +4290,6 @@ originally I intended them for use when a particular name applied only to a specific \textsf{title}, rather than to a \textsf{maintitle} or \textsf{booktitle} (cf.\ \textbf{namea} and \textbf{nameb}, above). -%\enlargethispage{\baselineskip} - \mylittlespace In the present instance, you can use \cmd{partcomp} to identify a compiler when \textsf{namec} won't do, e.g., in a \textsf{note} field or the like. In such a case, @@ -4240,6 +4304,8 @@ currently you'll need to add either \texttt{de} or \texttt{d'} after this command in your .bib files to make the references come out right. I'm working on this.) See chaucer:liferecords. +\enlargethispage{-\baselineskip} + \mybigspace As \mymarginpar{\textbf{\textbackslash partedit-\\andcomp}} before, but for use when an editor is also a compiler. @@ -4347,7 +4413,7 @@ included this multicite command to enable you to present such a list, if the need arises. Remember that you'll have to put it inside a \cmd{footnote} command manually. -\enlargethispage{\baselineskip} +%\enlargethispage{\baselineskip} \mybigspace Another \mymarginpar{\textbf{\textbackslash footfullcite}} standard \textsf{biblatex} command, modified to work properly with @@ -4615,7 +4681,7 @@ variant of the default \texttt{nty}. (You can find its definition in \textsf{chicago-notes.cbx}.) Users of all other backends will still be using \texttt{nty}. -%\enlargethispage{\baselineskip} +%%\enlargethispage{\baselineskip} \mylittlespace The advantages of this scheme are, specifically, that any entry headed by one of the supplemental name fields @@ -4663,7 +4729,7 @@ preamble, for the whole document, or on a per-entry basis in the field will always be printed, but the \texttt{only} switch will still eliminate any \textsf{url}. -% \enlargethispage{\baselineskip} +% %\enlargethispage{\baselineskip} \mylittlespace This \mymarginpar{\texttt{eprint=true}} option controls whether any \textsf{eprint} fields present in the .bib file will be @@ -4865,7 +4931,7 @@ entry, but you can't stop it turning up in the sorting algorithms. \label{sec:useropts} These are parts of the specification that not everyone will wish to -enable. All except the third can be used even if you load the +enable. All except the fourth can be used even if you load the package in the old way via a call to \textsf{biblatex}, but most users can just place the appropriate string(s) in the options to the \cmd{usepackage\{biblatex-chicago\}} call in your preamble. @@ -4881,6 +4947,14 @@ functionality is currently in a beta state, so before you use it please have a look at the documentation for the \textsf{annotation} field, on page~\pageref{sec:annote} above. +\mylittlespace When \colmarginpar{\texttt{compresspages}} set to +\texttt{true}, any page ranges in your .bib file or in the +\textsf{postnote} field of your citation commands will be compressed +in accordance with the \emph{Manual's} specifications (9.60). +Something like 321-{-}328 in your .bib file would become 321--28 in +your document. See the \textsf{pages} field in +section~\ref{sec:entryfields}, above. + \mylittlespace The \colmarginpar{\texttt{delayvolume}} presentation of \textsf{volume} information in the notes \&\ bibliography style is complicated (\emph{Manual}, 14.121--27). Depending on entry type and @@ -4916,6 +4990,16 @@ revert to the \LaTeX\ default, but of course you also lose a fair amount of other formatting, as well. See section~\ref{sec:loading}, below. +\mylittlespace Setting \colmarginpar{\texttt{inheritshort\-hand}} this +option to \texttt{true} allows child entries to inherit the +\textsf{shorthand} and \textsf{shorthandintro} fields from +cross-referenced parent entries. This in turn allows abbreviated +references to the parent entry to use the \textsf{shorthand} instead +of the usual and merely short citation, thus allowing for extra space +savings. There are several other steps required to make this all +function smoothly, so please see the documentation of the +\textbf{shorthand} field in section~\ref{sec:entryfields}, above. + \mylittlespace The \mymarginpar{\texttt{juniorcomma}} \emph{Manual} (6.47) states that \enquote{commas are not required around \emph{Jr.}\ and \emph{Sr.},} so by default \textsf{biblatex-chicago} has @@ -4969,7 +5053,27 @@ or in the \textsf{options} field of individual entries. Cf.\ harley:ancient:cart, harley:cartography, and harley:hoc; and \textsf{crossref} in section~\ref{sec:entryfields}, above. -% \enlargethispage{\baselineskip} +\mylittlespace Several +\colmarginpar{\texttt{postnotepunct}\\(experimental)} users, most +recently David Gohlke, have requested a way to alter the punctuation +that appears just before the \textsf{postnote} argument of citation +commands, usually, but perhaps not always, to allow citations to fit +better into the flow of text. This punctuation is a complex issue in +the \emph{Manual}, and I've attempted to make +\textsf{biblatex-chicago} follow the specifications closely. Still, +as a first stab at enabling the greater flexibility in punctuation +that some have requested, I have introduced the +\mycolor{\texttt{postnotepunct}} package option. Set to +\texttt{true}, it allows you to start the \textsf{postnote} field with +a punctuation mark (.\,,\,;\,:) and have it appear as the +\cmd{postnotedelim} in place of whatever the package might otherwise +automatically have chosen. Please note that this functionality relies +on a very nifty macro by Philipp Lehman which I haven't extensively +tested, so I'm labeling this option \mycolor{experimental}. Note +also that the option only affects the \textsf{postnote} field of +citation commands, not the \textsf{pages} field in your .bib file. + +% %\enlargethispage{\baselineskip} \mylittlespace This \mymarginpar{\texttt{short}} option means that your text will only use the short note form, even in the first @@ -5072,7 +5176,7 @@ preamble, a \cmd{DeclareLanguageMapping} command adapted for your setup, on which see section~\ref{sec:international} below and also §§~4.9.1 and 4.11.8 in Lehman's \textsf{biblatex.pdf}. -%\enlargethispage{-\baselineskip} +%%\enlargethispage{-\baselineskip} \mylittlespace What you \emph{will not} lose is the ability to call the package options \texttt{annotation, strict, short,} and @@ -5179,12 +5283,12 @@ latest edition now recommends \enquote{a uniform treatment for the (15.2), many of these references will in fact be to the chapter on the notes \&\ bibliography style (chap.\ 14), which chapter is, by design, considerably more detailed than that devoted to the author-date style. -The second, \mycolor{\textsf{biblatex-chicago-authordate-trad}}, -implements that same specification but with a markedly different style -of title presentation, including sentence-style capitalization and an -absence of quotation marks around the (plain-text) titles of -\textsf{article} or \textsf{incollection} entries, \emph{inter alia}. -The \textsf{trad} style is so named because older versions of the +The second, \textsf{biblatex-chicago-authordate-trad}, implements that +same specification but with a markedly different style of title +presentation, including sentence-style capitalization and an absence +of quotation marks around the (plain-text) titles of \textsf{article} +or \textsf{incollection} entries, \emph{inter alia}. The +\textsf{trad} style is so named because older versions of the \emph{Manual}, up to and including the 15th edition, recommended this plainer style for author-date titles, and the 16th edition itself suggests the possibility, when needed, of retaining such title @@ -5210,35 +5314,34 @@ examples from the \emph{Manual} which, when processed using as you see in the \emph{Manual} itself, or at least compliant output, where the specifications are vague or open to interpretation, a state of affairs which does sometimes occur. If you are using -\mycolor{\textsf{biblatex-chicago-authordate-trad}} the same basically -holds, but you'd have to keep one eye on the 15th edition of the +\textsf{biblatex-chicago-authordate-trad} the same basically holds, +but you'd have to keep one eye on the 15th edition of the \emph{Manual} (chap.\ 17) for the titles. I have provided -\textsf{cms-dates-sample.pdf} and -\mycolor{\textsf{cms-trad-sample.pdf}}, which show how my system -processes \textsf{dates-test.bib}, and I have also included the -reference keys from the latter file below in parentheses. +\textsf{cms-dates-sample.pdf} and \textsf{cms-trad-sample.pdf}, which +show how my system processes \textsf{dates-test.bib}, and I have also +included the reference keys from the latter file below in parentheses. \subsection{Entry Types} \label{sec:types:authdate} The complete list of entry types currently available in -\textsf{biblatex-chicago-authordate} and -\mycolor{\textsf{authordate-trad}}, minus the odd \textsf{biblatex} -alias, is as follows: \textbf{article}, \textbf{artwork}, -\textbf{audio}, \mycolor{\textbf{book}}, -\mycolor{\textbf{bookinbook}}, \textbf{booklet}, -\mycolor{\textbf{collection}}, \textbf{customc}, \textbf{image}, -\textbf{inbook}, \textbf{incollection}, \textbf{inproceedings}, -\textbf{inreference}, \textbf{letter}, \textbf{manual}, \textbf{misc}, -\textbf{music}, \mycolor{\textbf{mvbook}}, -\mycolor{\textbf{mvcollection}}, \mycolor{\textbf{mvproceedings}}, -\mycolor{\textbf{mvreference}}, \textbf{online} (with its alias -\textbf{www}), \textbf{patent}, \textbf{periodical}, -\mycolor{\textbf{proceedings}}, \textbf{reference}, \textbf{report} -(with its alias \textbf{techreport}), \textbf{review}, -\textbf{suppbook}, \textbf{suppcollection}, \textbf{suppperiodical}, -\textbf{thesis} (with its aliases \textbf{mastersthesis} and -\textbf{phdthesis}), \textbf{unpublished}, and \textbf{video}. +\textsf{biblatex-chicago-authordate} and \textsf{authordate-trad}, +minus the odd \textsf{biblatex} alias, is as follows: +\textbf{article}, \textbf{artwork}, \textbf{audio}, +\mycolor{\textbf{book}}, \mycolor{\textbf{bookinbook}}, +\textbf{booklet}, \mycolor{\textbf{collection}}, \textbf{customc}, +\textbf{image}, \textbf{inbook}, \textbf{incollection}, +\textbf{inproceedings}, \textbf{inreference}, \textbf{letter}, +\textbf{manual}, \textbf{misc}, \textbf{music}, +\mycolor{\textbf{mvbook}}, \mycolor{\textbf{mvcollection}}, +\mycolor{\textbf{mvproceedings}}, \mycolor{\textbf{mvreference}}, +\textbf{online} (with its alias \textbf{www}), \textbf{patent}, +\textbf{periodical}, \mycolor{\textbf{proceedings}}, +\textbf{reference}, \textbf{report} (with its alias +\textbf{techreport}), \textbf{review}, \textbf{suppbook}, +\textbf{suppcollection}, \textbf{suppperiodical}, \textbf{thesis} +(with its aliases \textbf{mastersthesis} and \textbf{phdthesis}), +\textbf{unpublished}, and \textbf{video}. \mylittlespace What follows is an attempt to specify all the differences between these types and the standard provided by @@ -5339,7 +5442,7 @@ is a generic title like \enquote{review of \ldots,} then you want to switch to the \textsf{review} type, where you can simply use the \textsf{title} field for it. -\enlargethispage{\baselineskip} +%\enlargethispage{\baselineskip} \mylittlespace No less than eight more things need explication under this heading. First, since the \emph{Manual} specifies that what goes @@ -5403,7 +5506,7 @@ with the \textsf{title} otherwise. The usual string concatenation rules still apply --- cf.\ \textsf{editor} and \textsf{editortype} in section~\ref{sec:fields:authdate}, below. -%\enlargethispage{-\baselineskip} +\enlargethispage{\baselineskip} \mylittlespace Fifth, in certain fields, just beginning your data with a lowercase letter activates the mechanism for capitalizing that @@ -5460,7 +5563,7 @@ entry with the same \textsf{entrysubtype}. Such comments make particular use of the \textsf{eventdate} and of the \textsf{nameaddon} fields; please see the documentation of \textbf{review}, below. -% \enlargethispage{-\baselineskip} +% %\enlargethispage{-\baselineskip} \mylittlespace If you're still with me, allow me to recommend that you browse through \textsf{dates-test.bib} to get a feel for just how many @@ -5647,7 +5750,7 @@ obsolete, and any such entries in your .bib file will trigger an error. Please use the standard \textsf{biblatex} \textbf{letter} type instead. -%\enlargethispage{-\baselineskip} +%%\enlargethispage{-\baselineskip} \mybigspace This \mymarginpar{\textbf{customb}} entry type is now obsolete, and any such entries in your .bib file will trigger an @@ -5704,13 +5807,18 @@ wish to include a comment inside the parentheses of a citation, as specified by the \emph{Manual} (15.23). If you have a \textsf{postnote}, then you can manually provide the punctuation and comment there, e.g., \cmd{autocite[4; the unrevised - trans.]\{stendhal:parma\}}. Without a \textsf{postnote}, you'll -need a separate \textsf{misc} or \textsf{customc} entry containing -just the text of the comment in the \textsf{title} field, + trans.]\{stendhal:parma\}}. Without a \textsf{postnote}, you now +have two choices. You can enable the new +\mycolor{\texttt{postnotepunct}} option, which allows you simply to +type \cmd{autocite[; the unrevised trans.]\\\{stendhal:parma\}}, or you +can continue to use a separate \textsf{misc} or \textsf{customc} entry +containing just the text of the comment in the \textsf{title} field, \textsf{entrysubtype} \texttt{classical}, and \textsf{options} \texttt{skipbib}. An \cmd{autocites} command calling both the main -text and the comment will do the trick, e.g., -\cmd{autocites\{chicago:manual\}\{chicago:comment\}}. +text and the comment then does the trick, e.g., +\cmd{autocites\{chicago:manual\}\{chicago:\\comment\}}. Cf.\ +\mycolor{\texttt{postnotepunct}} in section~\ref{sec:authuseropts}, +below. \mybigspace This \mymarginpar{\textbf{image}} entry type, left undefined in the standard styles, was in previous releases of @@ -5722,8 +5830,6 @@ media. This means that this entry type is now a clone of the for users migrating from the old to the new specification. (See 3.22, 8.193; bedford:photo.) -% \enlargethispage{\baselineskip} - \mybigspace These \mymarginpar{\mycolor{\textbf{inbook}}\\\textbf{incollection}} two standard \textsf{biblatex} types have very nearly identical formatting @@ -5768,6 +5874,8 @@ inclusive page numbers, not both. In-text citations, of course, require any \textsf{postnote} field to specify if it is a whole chapter to which you are referring. +\enlargethispage{-\baselineskip} + \mybigspace This \mymarginpar{\textbf{inproceedings}} entry type works pretty much as in standard \textsf{biblatex}. Indeed, the main differences between it and \textsf{incollection} are the lack of an @@ -5889,7 +5997,7 @@ the \textsf{xref} mechanism to refer to the whole published collection of references, and the \textsf{letter} entry never sees that \textsf{date} at all. -\enlargethispage{\baselineskip} +%\enlargethispage{\baselineskip} \mylittlespace If this all seems clear as mud, I'm not surprised, but let me suggest that you experiment with the different date settings to @@ -6149,6 +6257,8 @@ the correct functioning of the abbreviated references that see the documentation of the \textbf{crossref} field in section~\ref{sec:fields:authdate}, below.) +\enlargethispage{\baselineskip} + \mylittlespace On the same subject, when multi-volume works are presented in the reference apparatus, the \emph{Manual} (14.121--27, 15.39) requires that any dates presented should be appropriate to the @@ -6211,7 +6321,7 @@ the \emph{Manual} (14.7--8) prefers, if they're available, revision dates to access dates when documenting online material. See \textsf{urldate} and \textsf{userd}, below. -%\enlargethispage{\baselineskip} +%%\enlargethispage{\baselineskip} \mybigspace The \mymarginpar{\textbf{patent}} \emph{Manual} is very brief on the subject of patents (15.50), but very clear about which @@ -6298,24 +6408,23 @@ type wasn't, strictly speaking, necessary for the 15th edition author-date specification. With the major changes to the presentation of the title fields in the 16th edition, however, it has now become necessary for \textsf{authordate} users, if not -\mycolor{\textsf{authordate-trad}} users, to familiarize themselves -with it as a means of coping with the \emph{Manual}'s complicated -requirements for citing periodicals of all sorts. As its name -suggests, this entry type was designed for reviews published in -periodicals, and if you've already read the \textsf{article} -instructions above --- if you haven't, I recommend doing so now --- -you'll know that \textsf{review} serves as well for citing other sorts -of material with generic titles, like letters to the editor, -obituaries, interviews, online comments and the like. The primary -rule is that any piece that has only a generic title, like -\enquote{review of \ldots,} \enquote{interview with \ldots,} or -\enquote{obituary of \ldots,} calls for the \textsf{review} type. Any -piece that also has a specific title, e.g., \enquote{\enquote{Lost in - \textsc{Bib}\TeX,} an interview with \ldots,} requires an -\textsf{article} entry. (This assumes the text is found in a -periodical of some sort. Were it found in a book, then the -\textsf{incollection} type would serve your needs, and you could use -\textsf{title} and \textsf{titleaddon} there. While we're on the +\textsf{authordate-trad} users, to familiarize themselves with it as a +means of coping with the \emph{Manual}'s complicated requirements for +citing periodicals of all sorts. As its name suggests, this entry +type was designed for reviews published in periodicals, and if you've +already read the \textsf{article} instructions above --- if you +haven't, I recommend doing so now --- you'll know that \textsf{review} +serves as well for citing other sorts of material with generic titles, +like letters to the editor, obituaries, interviews, online comments +and the like. The primary rule is that any piece that has only a +generic title, like \enquote{review of \ldots,} \enquote{interview + with \ldots,} or \enquote{obituary of \ldots,} calls for the +\textsf{review} type. Any piece that also has a specific title, e.g., +\enquote{\enquote{Lost in \textsc{Bib}\TeX,} an interview with + \ldots,} requires an \textsf{article} entry. (This assumes the text +is found in a periodical of some sort. Were it found in a book, then +the \textsf{incollection} type would serve your needs, and you could +use \textsf{title} and \textsf{titleaddon} there. While we're on the topic of exceptions, the \emph{Manual} includes an example --- 14.221 --- where the \enquote{Interview} part of the title is considered a subtitle rather than a titleaddon, said part therefore being included @@ -6411,7 +6520,7 @@ one is present, and with the \textsf{title} otherwise. The usual string concatenation rules still apply --- cf.\ \textsf{editor} and \textsf{editortype} in section~\ref{sec:fields:authdate}, below. -%\enlargethispage{\baselineskip} +%%\enlargethispage{\baselineskip} \mybigspace This \mymarginpar{\textbf{suppbook}} is the entry type to use if the main focus of a reference is supplemental material in a @@ -6438,7 +6547,7 @@ depending on the context. Examples might be \enquote{\texttt{preface that unless you use a \cmd{bibstring} command in the \textsf{type} field, the resultant entry will not be portable across languages.) -% \enlargethispage{\baselineskip} +% %\enlargethispage{\baselineskip} \mylittlespace The other rules for constructing your .bib entry remain the same. The \textsf{author} field refers to the author of the @@ -6603,7 +6712,7 @@ undefined, and \textsf{biblatex-chicago} will do the rest. Cf.\ \textsf{foreword} and \textsf{introduction}. (See \emph{Manual} 14.91, 14.116; polakow:afterw.) -% \enlargethispage{\baselineskip} +% %\enlargethispage{\baselineskip} \mybigspace At \mymarginpar{\textbf{annotation}} the request of Emil Salim, \textsf{biblatex-chicago} has, as of version 0.9, added a @@ -6703,7 +6812,7 @@ abbreviating a \textsf{journaltitle}, a (formatted) reasonable length, though not at the expense of making it hard to find the relevant entries in the reference list. -% \enlargethispage{\baselineskip} +% %\enlargethispage{\baselineskip} \mylittlespace Recommendations concerning anonymous authors in other kinds of references have changed somewhat in the 16th edition of the @@ -6791,7 +6900,7 @@ the brackets. Assuming the strings are correct, in citations. (See the \textsf{author} docs just above. Also \emph{Manual} 15.33; cook:sotweed, horsley:prosodies.) -%\enlargethispage{-\baselineskip} +%%\enlargethispage{-\baselineskip} \mybigspace For \mymarginpar{\textbf{bookauthor}} the most part, as in \textsf{biblatex}, a \textsf{bookauthor} is the author of a @@ -6845,9 +6954,9 @@ invariably be providing information for the traditional discuss below (\textbf{crossref}). Such provision is unnecessary when using \textsf{Biber}. The \textsf{booktitle} no longer takes sentence-style capitalization in \textsf{authordate}, though it does -in \mycolor{\textsf{authordate-trad}}. +in \textsf{authordate-trad}. -%\enlargethispage{\baselineskip} +%%\enlargethispage{\baselineskip} \mybigspace An \mymarginpar{\textbf{booktitleaddon}} annex to the \textsf{booktitle}. It will be printed in the main text font, without @@ -6875,16 +6984,17 @@ inherit no data at all from their parents. For the \textsf{crossref} field, when \textsf{Biber} is the backend, \textsf{biblatex} defines a series of inheritance rules which make it much more convenient to use. Appendix B of \textsf{biblatex.pdf} explains the defaults, to which -\textsf{biblatex-chicago} has added several that I should mention here: -\textsf{incollection} entries can now inherit from \textsf{mvbook} -just as they do from \textsf{mvcollection} entries; \textsf{letter} -entries now inherit from \textsf{book}, \textsf{collection}, -\textsf{mvbook}, and \textsf{mvcollection} entries the same way an -\textsf{inbook} or an \textsf{incollection} entry would; the -\textsf{namea}, \textsf{nameb}, \textsf{sortname}, \textsf{sorttitle}, -and \textsf{sortyear} fields, all highly single-entry specific, are no -longer inheritable; and \textsf{date} and \textsf{origdate} fields are -not inheritable from any of the new \textbf{mv*} entry types. +\textsf{biblatex-chicago} has added several that I should mention +here: \textsf{incollection} entries can now inherit from \textsf{book} +and \textsf{mvbook} just as they do from \textsf{mvcollection} +entries; \textsf{letter} entries now inherit from \textsf{book}, +\textsf{collection}, \textsf{mvbook}, and \textsf{mvcollection} +entries the same way an \textsf{inbook} or an \textsf{incollection} +entry would; the \textsf{namea}, \textsf{nameb}, \textsf{sortname}, +\textsf{sorttitle}, and \textsf{sortyear} fields, all highly +single-entry specific, are no longer inheritable; and \textsf{date} +and \textsf{origdate} fields are not inheritable from any of the new +\textbf{mv*} entry types. \mylittlespace Aside from these inheritance questions, the other main function of the \textsf{crossref} and \textsf{xref} fields in @@ -6938,7 +7048,7 @@ these four entry types than for the other 4 (see below). In looking at bernhard:boris, bernhard:ritter, bernhard:themacher, harley:ancient:cart, harley:cartography, and harley:hoc. -%\enlargethispage{\baselineskip} +%%\enlargethispage{\baselineskip} \mylittlespace A published collection of letters requires a somewhat different treatment (15.40). In the author-date style, the @@ -7000,11 +7110,21 @@ The \colmarginpar{\texttt{booklongxref}} second option, Please note that you can set both of these options either in the preamble or in the \textsf{options} field of individual entries, allowing you to change the settings on an entry-by-entry basis. -Please also note that the combination of \textsf{shorthand}, -\textsf{reprinttitle}, and/or \textsf{userf} fields with shortened -cross references may produce unexpected results, at least as -\textsf{biblatex-chicago-authordate} currently stands. I advise -caution before doing so. + +\mylittlespace Please \colmarginpar{New!} further note that in +previous releases of \textsf{biblatex-chicago} I recommended against +using \textsf{shorthand}, \textsf{reprinttitle} and/or \textsf{userf} +fields in combination with this abbreviated cross-referencing +mechanism. I have, however, received a request from Alexandre Roberts +to allow the shorthand to appear in the place of the abbreviated +cross-reference as an additional space-saving measure, and one from +Kenneth Pearce to permit the combination of the other two fields with +\textsf{crossref}, as well. All three of these fields, in any +combination, should now just work in such circumstances in +\textsf{biblatex-chicago-authordate}, though if you are using a list +of shorthands then you may need to include \texttt{skipbiblist} in the +\textsf{options} field of some entries to avoid duplicates. If you +come across any problems or inaccuracies, please report them. \mybigspace Predictably, \colmarginpar{\textbf{date}} this is one of the key fields for the author-date styles, and one which, as a general @@ -7318,7 +7438,7 @@ be ignored, producing \enquote{\texttt{n.d.}}\ in the output --- you need \texttt{1968/1975} instead. If you want a more compressed year range, then you'll want to use the \textsf{year} field. -%\enlargethispage{\baselineskip} +%%\enlargethispage{\baselineskip} \mylittlespace Fourth, in the \textsf{misc} entry type the \textsf{date} field can help to distinguish between two classes of @@ -7361,7 +7481,7 @@ permanence compared to URLs, \enquote{authors should include DOIs rather than URLs for sources that make them readily available} (14.6; cf.\ 15.9). (14.184; friedman:learn\-ing). Cf.\ \textsf{url}. -%\enlargethispage{-\baselineskip} +%%\enlargethispage{-\baselineskip} \mybigspace Standard \mymarginpar{\textbf{edition}} \textsf{biblatex} field. If you enter a plain cardinal number, \textsf{biblatex} will @@ -7452,7 +7572,7 @@ compiler, then you need to put \texttt{compiler} into the \textsf{editortype} field, and \textsf{biblatex} will print the correct string after the name in the list of references. -\enlargethispage{\baselineskip} +%\enlargethispage{\baselineskip} \mylittlespace There are a few details of which you need to be aware. Because \textsf{biblatex-chicago} has added the \textsf{namea} field, @@ -7565,7 +7685,7 @@ unpublished archive. Please see section~\ref{sec:types:authdate} above under \textbf{misc} for all the details on how these citations work. -% \enlargethispage{\baselineskip} +% %\enlargethispage{\baselineskip} \mylittlespace Fourth, the field can be defined in the \textsf{artwork} entry type in order to refer to a work from antiquity @@ -7641,7 +7761,7 @@ from the \textsf{author}. The \emph{Manual} has nothing to say on the subject, but \textsf{biblatex-chicago} prints it (them), in parentheses, just after the author(s). -%\enlargethispage{\baselineskip} +%%\enlargethispage{\baselineskip} \mybigspace Standard \mymarginpar{\textbf{howpublished}} \textsf{biblatex} field, mainly applicable in the \textsf{booklet} @@ -7769,7 +7889,7 @@ language or a translation to either of the latter two, you could probably manage it with special formatting inside those fields themselves. -%\enlargethispage{\baselineskip} +%%\enlargethispage{\baselineskip} \mybigspace I \mymarginpar{\textbf{lista}} intend this field specifically for presenting citations from reference works that are @@ -7796,7 +7916,7 @@ If the place of publication is unknown, you can use \cmd{autocap\{n\}.p.}\ instead (14.138). For all cities, you should use the common English version of the name, if such exists (14.137). -%\enlargethispage{\baselineskip} +%%\enlargethispage{\baselineskip} \mylittlespace Two other uses need explanation here. In \textsf{article}, \textsf{periodical}, and \textsf{review} entries, @@ -7816,11 +7936,11 @@ provide the parentheses (14.246; ellis:blog). \mybigspace The \mymarginpar{\textbf{maintitle}} main title for a multi-volume work, e.g., \enquote{Opera} or \enquote{Collected Works.} It no longer takes sentence-style capitalization in -\textsf{authordate}, though it does in -\mycolor{\textsf{authordate-trad}}. In cross references produced -using the \textsf{crossref} field, the \textsf{title} of \textbf{mv*} -entry types always becomes a \textsf{maintitle} in the child entry. -(See donne:var, euripides:\-orestes, harley:cartography, lach:asia, +\textsf{authordate}, though it does in \textsf{authordate-trad}. In +cross references produced using the \textsf{crossref} field, the +\textsf{title} of \textbf{mv*} entry types always becomes a +\textsf{maintitle} in the child entry. (See donne:var, +euripides:\-orestes, harley:cartography, lach:asia, pelikan:chris\-tian, and plato:re\-public:gr.) \mybigspace An \mymarginpar{\textbf{maintitleaddon}} annex to the @@ -8010,7 +8130,7 @@ and below in section~\ref{sec:authuseropts}. See creel:house, eliot:pound, emerson:nature, ency:britannica, herwign:office, lecarre:quest, and maitland:canon for examples of the field in use. -% \enlargethispage{\baselineskip} +% %\enlargethispage{\baselineskip} \mybigspace A \mymarginpar{\textbf{organization}} standard \textsf{biblatex} field, retained mainly for use in the \textsf{misc}, @@ -8048,33 +8168,32 @@ instead.) \mylittlespace Because of the importance of date specifications in the author-date styles, \textsf{bibla\-tex-chicago-authordate} and -\mycolor{\textsf{authordate-trad}} provide options and automated -behaviors that allow you to emphasize the \textsf{origdate} in -citations and at the head of entries in the list of references. In -entries which have \emph{only} an \textsf{origdate} --- usually -\textsf{misc} with an \textsf{entrysubtype} --- \textsf{Biber} and the -default \cmd{DeclareLabeldate} configuration make it possible to do -without a \texttt{cmsdate} option, as the \textsf{origdate} will -automatically appear where and as it should. In \textsf{book}-like -entries with both a \textsf{date} and an \textsf{origdate}, the 16th -edition of the \emph{Manual} recommends that you present, in citations -and at the head of reference list entries, only the \textsf{date} or -both dates together. The latter is accomplished using the -\texttt{cmsdate} entry option. In some cases it may even be necessary -to reverse the two date fields, putting the earlier year in -\textsf{date} and the later in \textsf{origdate}. If your reference -apparatus contains many such instances, it may well be convenient for -you instead to use the new \colmarginpar{\texttt{cmsdate}\\\emph{in - preamble}} \texttt{cmsdate} preamble option, which I have designed -in an attempt to reduce the amount of manual intervention needed to -present lots of entries with multiple dates. In short, setting -\texttt{cmsdate} to \texttt{both} or \texttt{on} in the preamble -promotes the \textsf{origdate} to the top of the search for a -\textsf{labeldate} to use in citations and at the head of entries in -the reference list. This can solve many problems with the -\textsf{extrayear} field --- 1978\textbf{a} --- and also with sorting -in the reference list. Please see above under \textbf{date} for all -the details on how these options interact. +\textsf{authordate-trad} provide options and automated behaviors that +allow you to emphasize the \textsf{origdate} in citations and at the +head of entries in the list of references. In entries which have +\emph{only} an \textsf{origdate} --- usually \textsf{misc} with an +\textsf{entrysubtype} --- \textsf{Biber} and the default +\cmd{DeclareLabeldate} configuration make it possible to do without a +\texttt{cmsdate} option, as the \textsf{origdate} will automatically +appear where and as it should. In \textsf{book}-like entries with +both a \textsf{date} and an \textsf{origdate}, the 16th edition of the +\emph{Manual} recommends that you present, in citations and at the +head of reference list entries, only the \textsf{date} or both dates +together. The latter is accomplished using the \texttt{cmsdate} entry +option. In some cases it may even be necessary to reverse the two +date fields, putting the earlier year in \textsf{date} and the later +in \textsf{origdate}. If your reference apparatus contains many such +instances, it may well be convenient for you instead to use the new +\colmarginpar{\texttt{cmsdate}\\\emph{in preamble}} \texttt{cmsdate} +preamble option, which I have designed in an attempt to reduce the +amount of manual intervention needed to present lots of entries with +multiple dates. In short, setting \texttt{cmsdate} to \texttt{both} +or \texttt{on} in the preamble promotes the \textsf{origdate} to the +top of the search for a \textsf{labeldate} to use in citations and at +the head of entries in the reference list. This can solve many +problems with the \textsf{extrayear} field --- 1978\textbf{a} --- and +also with sorting in the reference list. Please see above under +\textbf{date} for all the details on how these options interact. \mylittlespace In the default configuration of \cmd{DeclareLabeldate}, dates for citations and for the head of reference list entries are @@ -8118,7 +8237,7 @@ numbers, some improvisation may be needed if you wish to include \textsf{titleaddon}, but in other entry types you may need to use the \textsf{location} field. -\enlargethispage{\baselineskip} +%\enlargethispage{\baselineskip} \mybigspace In \mymarginpar{\textbf{origlanguage}} keeping with the \emph{Manual}'s specifications, I have fairly thoroughly redefined @@ -8194,7 +8313,7 @@ the \textsf{origdate}, and all will be presented in long notes and bibliography. (Cf.\ \textsf{origdate}, \textsf{origlocation}, and \textsf{pubstate}; schweitzer:bach.) -\mybigspace This \mymarginpar{\textbf{pages}} is the standard +\mybigspace This \colmarginpar{\textbf{pages}} is the standard \textsf{biblatex} field for providing page references. In many \textsf{article} entries you'll find this contains something other than a page number, e.g. a section name or edition specification @@ -8210,6 +8329,22 @@ mechanisms for specifying what sort of division a given \textsf{pages} field contains; and \textsf{usera} discusses a different way to present the section information pertaining to a newspaper article. +\mylittlespace David Gohlke has recently brought to my attention a +discussion that took place a couple of years ago on +\href{http://tex.stackexchange.com/questions/44492/biblatex-chicago-style-page-ranges}{Stackexchange} +regarding the automatic compression of page ranges, e.g., 101-{-}109 +in the .bib file or in the \textsf{postnote} field would become 101--9 +in the document. \textsf{Biblatex} has long had the facilities for +providing this, and though the \emph{Manual's} rules (9.60) are fairly +complicated, Audrey Boruvka fortunately provided in that discussion +code that implements the specifications. As some users may well be +accustomed to compressing page ranges themselves in their .bib files, +and in their \textsf{postnote} fields, I have made the activation of +this code a package option, so setting +\mycolor{\texttt{compresspages=true}} when loading +\textsf{biblatex-chicago} should automatically give you the +Chicago-recommended page ranges. + \mybigspace This, \mymarginpar{\textbf{pagination}} a standard \textsf{biblatex} field, allows you automatically to prefix the appropriate identifying string to information you provide in the @@ -8296,7 +8431,7 @@ elsewhere then a recording date will be printed in the middle of the reference list entry, the original release date will be printed near the end, preceded by the appropriate string. -\enlargethispage{\baselineskip} +%\enlargethispage{\baselineskip} \mybigspace I \mymarginpar{\textbf{redactor}} have implemented this field just as \textsf{biblatex}'s standard styles do, even though the @@ -8333,7 +8468,7 @@ be \enquote{Orig.\ pub.\ in.} Please see the documentation on \textsf{userf} below for all the details on how to create .bib entries for presenting your data. -%\enlargethispage{\baselineskip} +%%\enlargethispage{\baselineskip} \mybigspace A \mymarginpar{\textbf{series}} standard \textsf{biblatex} field, usually just a number in an \textsf{article}, @@ -8403,7 +8538,7 @@ most situations, but if you have set \texttt{useauthor=false} (and not only \textsf{shorteditor} will be recognized. Cf.\ \textsf{editortype}, above. -% \enlargethispage{\baselineskip} +% %\enlargethispage{\baselineskip} \mybigspace This \mymarginpar{\textbf{shorthand}} is \textsf{biblatex}'s mechanism for using abbreviations in citations. @@ -8478,12 +8613,13 @@ list. This option will only work if used in tandem with twice. (See 15.36, 13.65, 14.54--55, and also \textsf{biblatex.pdf} for more information.) -%\enlargethispage{-\baselineskip} +%%\enlargethispage{-\baselineskip} -\mylittlespace As I mentioned above under \textbf{crossref}, extra -care is needed when using shorthands with cross-references, and I -would avoid them in all parent entries, at least in the current state -of \textsf{biblatex-chicago}. +\mylittlespace As I mentioned above under \textbf{crossref}, I believe +it is now safe to use shorthands in parent entries, as this, in the +standard configuration, gives you the shorthand itself in the child +entry's abbreviated cross-reference, which may well save space in the +list of references. \mybigspace A \mymarginpar{\textbf{shorttitle}} standard \textsf{biblatex} field, primarily used to provide an abbreviated @@ -8529,26 +8665,26 @@ present several reprinted books by the same author. See \mybigspace The \mymarginpar{\textbf{subtitle}} subtitle for a \textsf{title} --- see next entry. -\enlargethispage{\baselineskip} +%\enlargethispage{\baselineskip} -\mybigspace This \colmarginpar{\textbf{title}} release of -\textsf{biblatex-chicago} now includes the -\mycolor{\textsf{authordate-trad}} style, designed as a kind of hybrid -style according to indications contained in the 16th edition of the -\emph{Manual} (14.45). This \mycolor{\textsf{trad}} style differs -\emph{only} in the way it treats the \textsf{title} and related -fields, which retain the forms they have traditionally had in the -Chicago author-date specifications prior to the latest edition. Where -the new edition uses headline-style capitalization, the older editions -used sentence-style; where the new edition places \textsf{article} or -\textsf{incollection} \textsf{titles} within quotation marks, the -older editions presented them in plain text. If you have been using -the 15th-edition author-date style, then your \textsf{title} fields -won't need any changes for \mycolor{\textsf{authordate-trad}}, but I -shall include just below, under a separate rubric, full documentation -for \mycolor{\textsf{trad}} \textsf{title} fields for those just -coming to the package. First, though, I document the same field(s) -for the standard author-date style. +\mybigspace This \mymarginpar{\textbf{title}} release of +\textsf{biblatex-chicago} now includes the \textsf{authordate-trad} +style, designed as a kind of hybrid style according to indications +contained in the 16th edition of the \emph{Manual} (14.45). This +\textsf{trad} style differs \emph{only} in the way it treats the +\textsf{title} and related fields, which retain the forms they have +traditionally had in the Chicago author-date specifications prior to +the latest edition. Where the new edition uses headline-style +capitalization, the older editions used sentence-style; where the new +edition places \textsf{article} or \textsf{incollection} +\textsf{titles} within quotation marks, the older editions presented +them in plain text. If you have been using the 15th-edition +author-date style, then your \textsf{title} fields won't need any +changes for \textsf{authordate-trad}, but I shall include just below, +under a separate rubric, full documentation for \textsf{trad} +\textsf{title} fields for those just coming to the package. First, +though, I document the same field(s) for the standard author-date +style. \mylittlespace In the vast majority of cases, this field works just as it always has in \textsc{Bib}\TeX, and just as it does in @@ -8657,25 +8793,24 @@ assuming that such a \textsf{title} begins with a lowercase letter in your .bib database. See \textbf{\textbackslash autocap} below for more details. -% \enlargethispage{\baselineskip} - -\mybigspace When \colmarginpar{\textbf{title (trad)}} you choose the -new \mycolor{\textsf{authordate-trad}} style, your \textsf{title} and -related fields will need extra care, familiar to users of the -15th-edition author-date style. The whole point of using a -\textsc{Bib}\TeX-based system is for it to do the formatting for you, -and in most cases \mycolor{\textsf{biblatex-chicago-authordate-trad}} -does just that, capitalizing them sentence-style, italicizing them, -and sometimes both. There are two situations that require user -intervention. First, in titles that take sentence-style -capitalization, you need, as always in traditional \textsc{Bib}\TeX, -to assist the algorithms by placing anything that needs to remain -capitalized within an extra pair of curly braces. Second, when a -title is quoted within a title, you need to know some of the rules of -the Chicago style. A summary here should serve to clarify them, and -help you to understand when -\mycolor{\textsf{biblatex-chicago-authordate-trad}} might need your -help in order to comply with them. +% %\enlargethispage{\baselineskip} + +\mybigspace When \mymarginpar{\textbf{title (trad)}} you choose the +new \textsf{authordate-trad} style, your \textsf{title} and related +fields will need extra care, familiar to users of the 15th-edition +author-date style. The whole point of using a \textsc{Bib}\TeX-based +system is for it to do the formatting for you, and in most cases +\textsf{biblatex-chicago-authordate-trad} does just that, capitalizing +them sentence-style, italicizing them, and sometimes both. There are +two situations that require user intervention. First, in titles that +take sentence-style capitalization, you need, as always in traditional +\textsc{Bib}\TeX, to assist the algorithms by placing anything that +needs to remain capitalized within an extra pair of curly braces. +Second, when a title is quoted within a title, you need to know some +of the rules of the Chicago style. A summary here should serve to +clarify them, and help you to understand when +\textsf{biblatex-chicago-authordate-trad} might need your help in +order to comply with them. \mylittlespace With regard to sentence-style capitalization, the rules of the Chicago \textsf{authordate-trad} style are fairly simple: @@ -8872,7 +9007,7 @@ translator's name, behavior that can be controlled with the \textsf{author}, \textsf{editor}, \textsf{namea}, \textsf{nameb}, and \textsf{namec}. -%\enlargethispage{\baselineskip} +%%\enlargethispage{\baselineskip} \mybigspace This \mymarginpar{\textbf{type}} is a standard \textsf{biblatex} field, and in its normal usage serves to identify @@ -8932,7 +9067,7 @@ sirosh:visualcortex, wikiped:bibtex). In the default setting of \textsf{urldate} to find a year for citations and the list of references (grove:sibelius, wikiped:bibtex). -% \enlargethispage{\baselineskip} +% %\enlargethispage{\baselineskip} \mybigspace A \mymarginpar{\textbf{usera}} supplemental \textsf{biblatex} field which functions in \textsf{biblatex-chicago} @@ -9014,7 +9149,7 @@ can translate the title and use that translation in your \textbf{language}, above. (See 14.108--110, 14.194; kern, pirumova:russian, weresz.) -%\enlargethispage{-\baselineskip} +%%\enlargethispage{-\baselineskip} \mybigspace This \mymarginpar{\textbf{userf}} is the last of the supplemental fields which \textsf{biblatex} provides, and is used by @@ -9229,7 +9364,7 @@ though I have added the last, style-specific, one. If Lehman generalizes it still further in a future release, I shall do the same, if possible. -\enlargethispage{-2\baselineskip} +%\enlargethispage{-2\baselineskip} \mybigspace This \mymarginpar{\textbf{\textbackslash mkbibquote}} is the standard \textsf{biblatex} command, which requires attention here @@ -9327,7 +9462,7 @@ intended them for use when a particular name applied only to a specific \textsf{title}, rather than to a \textsf{maintitle} or \textsf{booktitle} (cf.\ \textbf{namea} and \textbf{nameb}, above). -% \enlargethispage{\baselineskip} +% %\enlargethispage{\baselineskip} \mylittlespace In the present instance, you can use \cmd{partcomp} to identify a compiler when \textsf{namec} (or \textsf{editortype}) won't @@ -9369,9 +9504,9 @@ whose name doesn't conveniently fit into the usual fields The \textsf{biblatex} package is particularly rich in citation commands, most of which, in \textsf{biblatex-chicago-authordate} and -\mycolor{\textsf{authordate-trad}}, function as they do in the -standard author-date styles. If you are getting unexpected behavior -when using them please have a look in your .log file. A command like +\textsf{authordate-trad}, function as they do in the standard +author-date styles. If you are getting unexpected behavior when using +them please have a look in your .log file. A command like \cmd{supercite}, listed in §~3.6.2 of the \textsf{biblatex} manual but not defined by \textsf{biblatex-chicago-authordate} or by core \textsf{biblatex}, defaults to \cmd{cite}, and leaves a warning in the @@ -9416,9 +9551,8 @@ you the \textsf{biblatex} defaults unless you redefine them yourself inside the square brackets. \mylittlespace \textsf{Biblatex-chicago-authordate} -\mymarginpar{\texttt{autocite=\\inline}} and -\mycolor{\textsf{authordate-trad}} place references in parentheses by -default. +\mymarginpar{\texttt{autocite=\\inline}} and \textsf{authordate-trad} +place references in parentheses by default. \mybigspace The \mymarginpar{\texttt{citetracker=\\true}} citetracker for the \cmd{ifciteseen} test is enabled globally. @@ -9451,7 +9585,7 @@ cite command provides a postnote --- from this release of parentheses, but you will get another standard citation, which may add too much clutter. -%\enlargethispage{\baselineskip} +%%\enlargethispage{\baselineskip} \mylittlespace This \mymarginpar{\texttt{labelyear=\\true}} option tells \textsf{biblatex} to provide the special \textsf{labelyear} and @@ -9500,8 +9634,8 @@ two such entries have the same \textsf{year} (15.28). The option is \textsf{Biber}-only, like the following, which means that this next-generation \textsc{Bib}\TeX\ replacement is required for the author-date styles. Please see \textsf{cms-dates-sample.pdf} (or -\mycolor{\textsf{cms-trad-sample.pdf}}) and -section~\ref{sec:otherhints:auth}, below, for further details. +\textsf{cms-trad-sample.pdf}) and section~\ref{sec:otherhints:auth}, +below, for further details. \mylittlespace This \mymarginpar{\texttt{uniquename=\\minfull}} enables the package to distinguish different authors who share a @@ -9509,6 +9643,8 @@ surname, using initials in the first instance, and whole names if initials aren't enough (15.21). The option is \textsf{Biber}-only, like the previous one. +\enlargethispage{\baselineskip} + \mylittlespace This \mymarginpar{\texttt{usetranslator\\=true}} enables automatic use of the \textsf{translator} at the head of entries in the absence of an \textsf{author} or an \textsf{editor}. @@ -9685,7 +9821,7 @@ whether any \textsf{isan}, \textsf{isbn}, \textsf{ismn}, true, and can be set to false either in the preamble, for the whole document, or on a per-entry basis, in the \textsf{options} field. -%\enlargethispage{-\baselineskip} +%%\enlargethispage{-\baselineskip} \mylittlespace Once \mymarginpar{\texttt{numbermonth=\\true}} again at the request of Scot Becker, I have included this option, which @@ -9848,7 +9984,7 @@ and \textsf{proceedings} entries, please see \mycolor{\texttt{booklongxref}}, above, and also the documentation of \textsf{crossref} in section~\ref{sec:fields:authdate}. -\enlargethispage{\baselineskip} +%\enlargethispage{\baselineskip} \mylittlespace This \mymarginpar{\texttt{nodates=true}} option means that for all entry types except \textsf{inreference}, \textsf{misc}, @@ -9879,9 +10015,9 @@ and \texttt{useeditor=false} do remove the \textsf{author} and \label{sec:authuseropts} These are parts of the specification that not everyone will wish to -enable. All except the third can be used even if you load the package -in the old way via a call to \textsf{biblatex}, but most users can -just place the appropriate string(s) in the options to the +enable. All except the fourth can be used even if you load the +package in the old way via a call to \textsf{biblatex}, but most users +can just place the appropriate string(s) in the options to the \cmd{usepackage\{biblatex-chicago\}} call in your preamble. \mylittlespace At \mymarginpar{\texttt{annotation}} the request of @@ -9974,6 +10110,14 @@ some reason you want to set it to true without any of the other effects of the \texttt{cmsdate} option, then you can. The effects may surprise. +\mylittlespace When \colmarginpar{\texttt{compresspages}} set to +\texttt{true}, any page ranges in your .bib file or in the +\textsf{postnote} field of your citation commands will be compressed +in accordance with the \emph{Manual's} specifications (9.60). +Something like 321-{-}328 in your .bib file would become 321--28 in +your document. See the \textsf{pages} field in +section~\ref{sec:fields:authdate}, above. + \mylittlespace Although \mymarginpar{\texttt{footmarkoff}} the \emph{Manual} (14.19) recommends specific formatting for footnote (and endnote) marks, i.e., superscript in the text and in-line in foot- or @@ -9989,21 +10133,21 @@ once again footnote marks will revert to the \LaTeX\ default, but of course you also lose a fair amount of other formatting, as well. See section~\ref{sec:loading:auth}, below. -%\enlargethispage{\baselineskip} - \mylittlespace Several \mymarginpar{\texttt{headline}\\\texttt{(trad only)}} users requested an option that turned off the automatic transformations that produce sentence-style capitalization in the title fields of the 15th-edition author-date style. I have, -therefore, also included it in \mycolor{\textsf{authordate-trad}}. If -you set this option, the word case in your title fields will not be -changed in any way, that is, this doesn't automatically transform your -titles into headline-style, but rather allows the .bib file to -determine capitalization. It works by redefining the command +therefore, also included it in \textsf{authordate-trad}. If you set +this option, the word case in your title fields will not be changed in +any way, that is, this doesn't automatically transform your titles +into headline-style, but rather allows the .bib file to determine +capitalization. It works by redefining the command \cmd{MakeSentenceCase}, so in the unlikely event you are using the latter anywhere in your document please be aware that it will also be turned off there. +\enlargethispage{\baselineskip} + \mylittlespace The \mymarginpar{\texttt{juniorcomma}} \emph{Manual} (6.47) states that \enquote{commas are not required around \emph{Jr.}\ and \emph{Sr.},} so by default \textsf{biblatex-chicago} has @@ -10048,6 +10192,28 @@ use the \cmd{citereset} command, allied possibly with the \textsf{biblatex}\ \texttt{citereset} option, on which see \textsf{biblatex.pdf} §3.1.2.1. +\mylittlespace Originally +\colmarginpar{\texttt{postnotepunct}\\(experimental)} designed for the +notes \&\ bibliography style, this option may in fact be more useful in +the \textsf{authordate} styles. If set to \texttt{true}, it allows +you to alter the punctuation that appears just before the +\textsf{postnote} argument of citation commands, simplifying in +particular the provision of comments within parenthetical citations. +In previous releases, you either needed to include the comment after a +page number, e.g., \cmd{autocite[16; some comment]\{citekey\}}, or +provide a separate .bib entry using the \textsf{customc} entry type, +e.g., \cmd{autocites\{chicago:man\-ual\}\{chicago:comment\}}. Now, with +this option enabled, \cmd{autocite[; some comment]\{citekey\}} will +do. More generally, the \mycolor{\texttt{postnotepunct}} option +allows you to start the \textsf{postnote} field with a punctuation +mark (.\,,\,;\,:) and have it appear as the \cmd{postnotedelim} in +place of whatever the package might otherwise automatically have +chosen. Please note that this functionality relies on a very nifty +macro by Philipp Lehman which I haven't extensively tested, so I'm +labeling this option \mycolor{experimental}. Note also that the +option only affects the \textsf{postnote} field of citation commands, +not the \textsf{pages} field in your .bib file. + \mylittlespace Kenneth Pearce \mymarginpar{\texttt{shorthandfull}} has suggested that, in some fields of study, a list of shorthands providing full bibliographical information may replace the list of @@ -10172,13 +10338,12 @@ and you may, if your .bib entry is a complete one, also need \subsubsection{Loading the Styles} \label{sec:loading:auth} -With the addition of the \mycolor{\textsf{authordate-trad}} style to -the package, there are now three keys for choosing which style to -load, \texttt{notes}, \texttt{authordate}, and -\mycolor{\textsf{authordate-trad}}, one of which you put in the -options to the \cmd{usepackage} command. With early versions of -\textsf{biblatex-chicago}, the standard way of loading the package was -via a call to \textsf{biblatex}, e.g.: +With the addition of the \textsf{authordate-trad} style to the +package, there are now three keys for choosing which style to load, +\texttt{notes}, \texttt{authordate}, and \textsf{authordate-trad}, one +of which you put in the options to the \cmd{usepackage} command. With +early versions of \textsf{biblatex-chicago}, the standard way of +loading the package was via a call to \textsf{biblatex}, e.g.: \begin{quote} \cmd{usepackage[style=chicago-authordate,strict,backend=biber,\%\\ babel=other,bibencoding=inputenc]\{biblatex\}} @@ -10297,7 +10462,7 @@ reevaluate how much information you're providing. I've tried to make data-rich citations, but there may be instances where you can save yourself some typing by keeping it simple. -% \enlargethispage{\baselineskip} +% %\enlargethispage{\baselineskip} \mylittlespace Scot Becker has pointed out to me that the inverse problem not only exists but may well become increasingly common, to @@ -10454,12 +10619,12 @@ This is, I believe, the simpler conversion, as most well-constructed nonetheless: \begin{enumerate} -\item \textbf{NB:} Unless you are using - \mycolor{\textsf{authordate-trad}}, the formatting of titles in the - two styles is now the same, which means you would no longer need to - worry about extra curly brackets and their affects on - capitalization. If you are using \textsf{authordate-trad}, please - see the caveats in the documentation of the \textsf{title} field in +\item \textbf{NB:} Unless you are using \textsf{authordate-trad}, the + formatting of titles in the two styles is now the same, which means + you would no longer need to worry about extra curly brackets and + their effects on capitalization. If you are using + \textsf{authordate-trad}, please see the caveats in the + documentation of the \textsf{title} field in section~\ref{sec:fields:authdate}, above. \item You may need to reevaluate your use of shorthands, given that by default the author-date styles use them in place of authors rather @@ -10501,7 +10666,7 @@ of the things you may need to address: in their use than the notes \&\ bibliography style. (Cf.\ 14.179.) The bibstrings mechanism and package options sort much of this out automatically, but not all. -\item The \textsf{shorttitle} field is used extensively in notes \& +\item The \textsf{shorttitle} field is used extensively in notes \&\ bibliography to keep short notes short, so you may find that you need to add a fair number of these to an author-date database. In general this field is ignored by the latter style, so this, too, @@ -10568,14 +10733,14 @@ package. This release implements the 16th edition of the \emph{Chicago Manual of Style}. It now also contains a version of the author-date style -(\mycolor{\textsf{authordate-trad}}) with traditional title -formatting, alongside the \textsf{authordate} code which unifies the -treatment of titles between itself and the notes \&\ bibliography -style. I hope that users will migrate to one of these styles -implementing the most recent specification, as I am focusing my -development and testing time there. With the current release, I am -calling the 15th-edition styles \enquote{strongly deprecated,} but if -you still have urgent feature requests for them, I'll do what I can. +(\textsf{authordate-trad}) with traditional title formatting, +alongside the \textsf{authordate} code which unifies the treatment of +titles between itself and the notes \&\ bibliography style. I hope +that users will migrate to one of these styles implementing the most +recent specification, as I am focusing my development and testing time +there. With the current release, I am calling the 15th-edition styles +\enquote{strongly deprecated,} but if you still have urgent feature +requests for them, I'll do what I can. \mylittlespace Regardless of which edition you are considering, there are a number of things I haven't implemented. The solution in @@ -10640,14 +10805,18 @@ above, but it's possible the package may need some changes to cope with all the permutations. Please let me know if you find something that looks like a bug. +\mylittlespace Speaking of \textsf{dates}, now that there's an option +for the automatic compression of page ranges, something similar could +perhaps be provided for year ranges. I shall be looking into this. + \mylittlespace Roger Hart, Pierric Sans, and a number of other users have reported a bug in the formatting of title fields. This, as far as I can tell, has to do with the interaction between \cmd{MakeSentenceCase} and certain characters at the start of the title, particularly Unicode ones. If you are using -\mycolor{\textsf{authordate-trad}}, it may help for the moment to put -an empty set of curly braces \{\}\ at the start of the field, but I -shall look into this further. +\textsf{authordate-trad}, it may help for the moment to put an empty +set of curly braces \{\}\ at the start of the field, but I shall look +into this further. \mylittlespace Roger Hart has requested that I incorporate some means of changing the punctuation before \textsf{titleaddon} fields, perhaps @@ -10657,6 +10826,8 @@ provide this in the next release. He has also requested, despite the \texttt{Idem} and \texttt{Ibid.}\ in notes. I shall look into this for the next major release. +\enlargethispage{-4\baselineskip} + \mylittlespace This release fixes the formatting errors of which I am aware, though users writing in French should be aware of problems with the \cmd{partedit} command in section~\ref{sec:formatcommands} above. @@ -10679,7 +10850,101 @@ code for it, let me know, and I'll look into it. \section{Revision History} \label{sec:history} -\textbf{0.9.9e: Released \today} +\textbf{0.9.9f: Released \today} +\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} + (2.9a). This is the version that has been tested most thoroughly + with \textsf{biblatex-chicago}, so I strongly recommend using it. +\item I fixed several inaccuracies in the presentation of abbreviated + cross-referen\-ces in all the Chicago styles, and while I was working + on that portion of the code it seemed an opportune moment to fulfill + some feature requests bearing on the same area of functionality. +\item First, following a request from Alexandre Roberts, I have added + the \mycolor{\texttt{inher\-itshorthand}} option to the notes \&\ + bibliography style, which allows child entries to inherit the + \textsf{shorthand} field from their parents. This in turn allows + the \textsf{shorthand} itself to appear in place of the usual + abbreviated citation of parent entries cross-referenced by several + different child entries, thereby saving some space. (This behavior + was already available in the author-date styles, so the option is + unnecessary there.) You'll need to use \texttt{skipbiblist} in the + \textsf{options} field of child entries to make the list of + shorthands work correctly. Please see the documentation of the + \textsf{shorthand} field for the full explanation. +\item Second, following a request from Kenneth Pearce, I have added to + all Chicago styles the capacity to combine abbreviated + cross-references with the presentation of the original text of + translations (via the \textsf{userf} field) or of the original + publication details of an essay or chapter you are citing from a + subsequent reprint (via the \textsf{reprinttitle} field). See the + documentation of those fields, and also of \textsf{crossref}, and + note that you can now, taking certain precautions as outlined in the + \textsf{shorthand} docs, combine the \textsf{userf}, + \textsf{crossref}, and \textsf{shorthand} fields. This mechanism + contains a great many moving parts, so please report any problems + you might have with it. +\item Third, and finally, following a bug report by Mark van Atten I + have fixed all Chicago styles so that the \textsf{biblatex} + \texttt{backref} mechanism works properly in + \textsf{biblatex-chicago}, including in those entries that use + abbreviated cross-references, and in those that use the + \textsf{userf} or \textsf{reprinttitle} fields. I can't see any + instructions concerning this in the \emph{Manual}, so I've left the + formatting of \texttt{backref} lists in the hands of + \textsf{biblatex} itself. If the default behavior doesn't match + your needs, let me know, as it's possible I could add some further + options for modifying it. +\item I have added a new \mycolor{\texttt{compresspages}} option to + all the Chicago styles. If set to \texttt{true} it automatically + compresses page ranges in the \textsf{pages} and \textsf{postnote} + fields, allowing you to type ranges naturally, e.g., 101-{-}109, and + letting the package follow the \emph{Manual's} rules for you. (In + this case, it would yield 101--9 in the document.) Thanks are due + to David Gohlke who brought to my attention a discussion that took + place a couple of years ago on + \href{http://tex.stackexchange.com/questions/44492/biblatex-chicago-style-page-ranges}{Stackexchange} + regarding the automatic compression of page ranges. + \textsf{Biblatex} has long had the facilities for providing this, + and though the \emph{Manual's} rules (9.60) are fairly complicated, + Audrey Boruvka fortunately provided in that discussion code that + implements the specifications. As some users may well be accustomed + to compressing page ranges themselves in their .bib files, and in + their \textsf{postnote} fields, I have made the activation of this + code a package option. +\item Several users, most recently David Gohlke, have requested a way + to alter the punctuation that appears just before the + \textsf{postnote} argument of citation commands. This allows, in + the notes \&\ bibliography style, citations to fit better into the + flow of text, while in the \textsf{authordate} styles it allows you + very easily to insert comments, which follow a semi-colon, inside + parenthetical text citations. This punctuation is a complex issue + in the \emph{Manual}, but as a first stab at enabling this greater + flexibility, I have introduced the \mycolor{\texttt{postnotepunct}} + package option. Set to \texttt{true}, it allows you to start the + \textsf{postnote} field with a punctuation mark (.\,,\,;\,:) and + have it appear as the \cmd{postnotedelim} in place of whatever the + package might otherwise automatically have chosen. Please note that + this functionality relies on a very nifty macro by Philipp Lehman + which I haven't extensively tested, so I'm labeling this option + \mycolor{experimental}. Note also that the option only affects the + \textsf{postnote} field of citation commands, not the \textsf{pages} + field in your .bib file. Note, finally, that if you are using the + new \mycolor{\texttt{compresspages}} option then any + \textsf{postnote} field starting with a punctuation mark will + require you to do the compression of page ranges yourself. +\item I've added a new inheritance declaration so that + \textbf{incollection} entries can inherit from \textbf{book} entries + the same way they inherit from \textbf{mvbook}. +\item I've fixed a fair number of other bugs, including two in the + \emph{Ibidem} mechanism pointed out by Bernd Rellermeyer, one in the + printing of dates, and one in the \cmd{textcite} command in the + notes \&\ bibliography style, these last two pointed out by Kenneth + Beesley. The presentation of all the periodical entry types + (without an \textsf{entrysubtype}) has also been made more accurate. +\end{itemize} + +\textbf{0.9.9e: Released January 29, 2014} \begin{itemize} \item This minor release fixes a regression in the \emph{Ibidem} mechanism in the notes \&\ bibliography style, spotted by Harold @@ -10750,7 +11015,7 @@ code for it, let me know, and I'll look into it. of your document to redefine the new \mycolor{\cmd{foottextcite}} and \mycolor{\cmd{foottextcites}} commands to change this formatting. See section~\ref{sec:formatcommands}, above. -\enlargethispage{\baselineskip} +%\enlargethispage{\baselineskip} \item This release includes support, in all styles, for \textsf{biblatex's} multi-volume entry types: \textbf{mvbook}, \textbf{mvcollection}, \textbf{mvproceedings}, and @@ -10925,11 +11190,10 @@ code for it, let me know, and I'll look into it. \textbf{0.9.9b: Released December 6, 2012} \begin{itemize} -\item This release \label{deprec:obsol} contains a new variant of the - author-date style, available as the - \mycolor{\texttt{authordate-trad}} option when loading - \textsf{biblatex-chicago}. This provides the traditional, plain, - pre-16th-edition Chicago title handling --- sentence-style +\item This release contains a new variant of the author-date style, + available as the \mycolor{\texttt{authordate-trad}} option when + loading \textsf{biblatex-chicago}. This provides the traditional, + plain, pre-16th-edition Chicago title handling --- sentence-style capitalization, absence of quotation marks in \textsf{article} titles and the like --- but in all other respects follows the 16th-edition specification, as suggested by the \emph{Manual} @@ -10979,7 +11243,7 @@ code for it, let me know, and I'll look into it. \textsf{postnote} field, then only that will appear. \end{itemize} -%\enlargethispage{-2\baselineskip} +%%\enlargethispage{-2\baselineskip} \textbf{0.9.9a: Released July 30, 2012} \begin{itemize} @@ -11030,7 +11294,7 @@ Edition: \item In \textbf{suppbook} entries, the \emph{Manual} now requires you to provide the page range (in the \textsf{pages} field) for the specific part you are citing, e.g., an introduction, foreword, or - afterword.%\enlargethispage{-2\baselineskip} + afterword.%%\enlargethispage{-2\baselineskip} \item In \textbf{patent} entries, the \emph{Manual} now prefers sentence-style capitalization for titles, which you'll need to provide yourself by hand. @@ -11746,7 +12010,7 @@ Other New Features: field if you would like to test this functionality. \end{itemize} -%\enlargethispage{-3\baselineskip} +%%\enlargethispage{-3\baselineskip} \textbf{0.8.9a: Released July 5, 2009} \begin{itemize} diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf index 7e4f9ee3969..b8ee77328bd 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf and b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf differ 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 5151136ea1b..cb0815fbe02 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.9e (beta) \\ +\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.9f (beta) \\ \href{mailto:djf027@googlemail.com}{djf027@googlemail.com}\\ \today \end{center} @@ -143,7 +143,7 @@ release. \begin{itemize}{}{} \item Philipp Lehman's \textsf{biblatex} package, of course! You - should use the latest version(s) --- 1.7 or 2.8a --- as those + should use the latest version(s) --- 1.7 or 2.9a --- as those versions have been tested more thoroughly than any other, meaning that these style files may well not function properly with earlier iterations of \textsf{biblatex}. Lehman's tools require several @@ -168,7 +168,7 @@ release. following: \item \textsf{Biber} --- the next-generation \textsc{Bib}\TeX\ replacement, which is available from SourceForge. You should use - the latest version, 1.8, to work with \textsf{biblatex} 2.8a, and + the latest version, 1.9, to work with \textsf{biblatex} 2.9a, and it is required for users who are either using the author-date style or processing a .bib file in Unicode. See \textsf{cms15-dates-sample.pdf} for more details. @@ -8565,7 +8565,13 @@ code for it, let me know, and I'll look into it. \section{Revision History} \label{sec:history} -\textbf{0.9.9e: Released \today} +\textbf{0.9.9f: Released \today} +\begin{itemize} +\item Small changes to both styles so that they compile with the + latest \textsf{biblatex} (2.9a). No other fixes. +\end{itemize} + +\textbf{0.9.9e: Released January 29, 2014} \begin{itemize} \item No changes to the 15th-edition styles. \end{itemize} 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 6f86f492870..08bd6675a95 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-dates-sample.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex index 97d51bb1cca..a21ef1cc008 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex @@ -7,7 +7,7 @@ \usepackage[autostyle]{csquotes} %\usepackage[document]{ragged2e} \usepackage[authordate,backend=biber,autolang=hyphen,booklongxref=false,% -bibencoding=latin1,strict]{biblatex-chicago} +bibencoding=latin1,postnotepunct,compresspages,strict]{biblatex-chicago} % \usepackage[style=chicago-authordate,backend=biber,usecompiler=true,% % babel=hyphen,bibencoding=auto,sorting=nyt,cmslos,autocite=inline]{biblatex} %\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf @@ -64,8 +64,8 @@ Starting with \textsf{biblatex} version 1.5, in order to adhere to the author-date specification you will need to use \textsf{Biber} to process your .bib files, as \textsc{Bib}\TeX\ (and its more recent variants) will no longer provide all the features the style requires. -For this release, you really need the latest versions of -\textsf{Biber} (1.8) and \textsf{biblatex} (2.8a), which contain +For this release, you really need the current versions of +\textsf{Biber} (1.9) and \textsf{biblatex} (2.9a), which contain features and bug-fixes on which my own code relies. The advice that follows in this document assumes that you are using \textsf{Biber}; if you wish to continue using \textsc{Bib}\TeX\ then you need @@ -318,7 +318,7 @@ in standard author-date format.) A \cmd{cite*} or \cmd{autocite*} command will, in such a case, produce the title rather than the year. Some examples should make this clearer: -\enlargethispage{-\baselineskip} +%\enlargethispage{-\baselineskip} Classical works: without abbreviation: \autocite{aristotle:metaphy:trans}; with abbreviation: @@ -343,11 +343,15 @@ it will need to be separated by a semicolon \autocite[15.23]{chicago:manual}. If you have a \textsf{postnote}, then you can manually provide the punctuation and comment in that field, e.g., \autocite[4; the unrevised trans.]{stendhal:parma}. -Without a \textsf{postnote}, you'll need a separate \textsf{Misc} or -\textsf{CustomC} entry containing just the text of the comment in the -\textsf{title} field, \textsf{entrysubtype} \texttt{classical}, and -\textsf{options} \texttt{skipbib}. An \cmd{autocites} command calling -both the main text and the comment will do the trick, e.g., +Without a \textsf{postnote}, you now have two choices. You can enable +the new \texttt{postnotepunct} package option, which allows you simply +to type \cmd{autocite[; the unrevised trans.]\{stendhal:parma\}} +\citereset\autocite[; the unrevised trans.]{stendhal:parma}, or you +can continue to use a separate \textsf{Misc} or \textsf{CustomC} entry +containing just the text of the comment in the \textsf{title} field, +\textsf{entrysubtype} \texttt{classical}, and \textsf{options} +\texttt{skipbib}. An \cmd{autocites} command calling both the main +text and the comment will then do the trick, e.g., \autocites{chicago:manual}{chicago:comment}. \subsubsection*{Multiple authors} 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 aa155f785b3..1790f58cc97 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 8b5be60a39b..23521f68aa1 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 @@ -6,7 +6,7 @@ \usepackage[autostyle]{csquotes} \usepackage[document]{ragged2e} \usepackage[notes,strict,backend=biber,autolang=other,% -bibencoding=latin1,booklongxref=false]{biblatex-chicago} +bibencoding=latin1,booklongxref=false,compresspages]{biblatex-chicago} %%\usepackage[osf]{mathpazo} %\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf \usepackage{ifthen} @@ -67,7 +67,7 @@ note\autocite{beattie:crime} note\autocite{brown:bremer} note\autocite{beethoven:sonata29} note\autocite{bernhard:ritter} note\autocite{bernstein:shostakovich} note\autocite{bernhard:boris} note\autocite{boxer:china} note\autocite{browning:aurora} -note\autocite[pt.\ 2:55]{brown:bremer} note\autocite{bundy:macneil} +note\autocite[pt.\ 2, 55]{brown:bremer} note\autocite{bundy:macneil} note\autocite{centinel:letters}. Note\autocite{chaucer:liferecords} note\autocite{browning:aurora} @@ -187,46 +187,48 @@ note\autocite{rodman:walk} note\autocite{roosevelt:speech} note\autocite{ross:thesis} note\autocite{ratliff:review} note\autocite{rozner:liberation} note\autocite{rubinstein:chopin}. -Note\autocite{schellinger:novel} note\autocite{reaves:rosen} -note\autocite{schubert:muellerin} note\autocite{rodman:walk} -note\autocite{schweitzer:bach} note\autocite{roosevelt:speech} -note\autocite{ross:thesis} note\autocite{rozner:liberation} -note\autocite{rubinstein:chopin} note\autocite{sechzer:women} -note\autocite{schellinger:novel} note\autocite{sereny:cries} -note\autocite{schubert:muellerin} note\autocite{schweitzer:bach} -note.\footnote{\headlessfullcite{sewall:letter}.} +Note\autocite{saberhagen:beluga} note\autocite{schellinger:novel} +note\autocite{reaves:rosen} note\autocite{schubert:muellerin} +note\autocite{rodman:walk} note\autocite{schweitzer:bach} +note\autocite{roosevelt:speech} note\autocite{ross:thesis} +note\autocite{rozner:liberation} note\autocite{rubinstein:chopin} +note\autocite{sechzer:women} note\autocite{schellinger:novel} +note\autocite{sereny:cries} note\autocite{schubert:muellerin} +note\autocite{saberhagen:beluga}. -Note\autocite{shapey:partita} note\autocite{sechzer:women} +Note\autocite{schweitzer:bach} +note\footnote{\headlessfullcite{sewall:letter}.} +note\autocite{shapey:partita} note\autocite{sechzer:women} note\autocite{sirosh:visualcortex} note\autocite{sereny:cries} note\autocite{silver:gawain} note\footnote{\headlesscite{sewall:letter}.} note\autocite{soltes:georgia} note\autocite{sirosh:visualcortex} -note\autocite{spock:interview} note\autocite{shapey:partita} -note\autocite{stenger:privacy} note\autocite{silver:gawain}. +note\autocite{spock:interview} note\autocite{shapey:partita}. -Note\autocite{tillich:system} note\autocite{soltes:georgia} +Note\autocite{stenger:privacy} note\autocite{silver:gawain} +note\autocite{tillich:system} note\autocite{soltes:georgia} note\autocite{spock:interview} note\autocite{times:guide} note\autocite{twain:audio} note\autocite{virginia:plantation} note\autocite{stenger:privacy} note\autocite{chicago:manual} -note\autocite{twain:audio} note\autocite[2:45]{tillich:system} -note\autocite[police ranks]{times:guide} -note\autocite{virginia:plantation}. - -Note\autocite{chicago:manual} note\autocite{unsigned:ranke} -note\autocite{herwign:office} note\autocite{verdi:corsaro} -note\autocite{wallraff:word} note\autocite{unsigned:ranke} -note\autocite{warr:ellison} note\autocite{herwign:office} -note\autocite{wallraff:word} note\autocite{verdi:corsaro} -note\autocite{wauchope:ceramics} note\autocite{weed:flatiron} -note\autocite{weresz}. - -Note\autocite{white:callimachus} note\autocite{white:ross:memo}. +note\autocite{twain:audio} note\autocite[2:45]{tillich:system}. + +Note\autocite[police ranks]{times:guide} +note\autocite{virginia:plantation} note\autocite{chicago:manual} +note\autocite{unsigned:ranke} note\autocite{herwign:office} +note\autocite{verdi:corsaro} note\autocite{wallraff:word} +note\autocite{unsigned:ranke} note\autocite{warr:ellison} +note\autocite{herwign:office} note\autocite{wallraff:word} +note\autocite{verdi:corsaro} note\autocite{wauchope:ceramics}. + +Note\autocite{weed:flatiron} note\autocite{weresz}. +note\autocite{white:callimachus} note\autocite{white:ross:memo} note\autocite{warr:ellison} note\autocite{weed:flatiron} note\autocite{wikiped:bibtex} note\autocite{will:cohere} note\autocite{wauchope:ceramics}. As \textcite{zukowsky:chicago} -says, note\autocite{weresz} note\autocite{white:russ}. +says. -Note\autocite{white:callimachus} note\autocite{white:ross:memo} +Note\autocite{weresz} note\autocite{white:russ} +note\autocite{white:callimachus} note\autocite{white:ross:memo} note\autocite{white:russ} note\autocite[BibTeX]{wikiped:bibtex} note\autocite{will:cohere} note\footnote{\textcite{zukowsky:chicago} makes a similar point.} @@ -234,11 +236,11 @@ note\autocites[See][3.2.996b5--8]{aristotle:metaphy:gr}[360e--361b] {plato:republic:gr}[and also][for additional information]{white:callimachus} note\autocite{aristotle:metaphy:trans} note\autocites[See][]{mchugh:wake}[and][569]{warr:ellison} -note\footnote{\citetitles{warr:ellison}{mchugh:wake}.} -note\footnote{\Citetitle{powell:email}.} -note.\footnote{\headlessfullcite[3:126]{meredith:letters}.} +note.\footnote{\citetitles{warr:ellison}{mchugh:wake}.} -Note\autocite[3:126]{meredith:letters} note\footfullcite[2]{weresz} +Note\footnote{\Citetitle{powell:email}.} +note\footnote{\headlessfullcite[3:126]{meredith:letters}.} +note\autocite[3:126]{meredith:letters} note\footfullcite[2]{weresz} note\autocite[2]{weresz} note\footnote{\fullcite{zukowsky:chicago}.} note.\footnote{\cite*{zukowsky:chicago}.} 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 da41bb3fa18..9e03d784874 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/doc/latex/biblatex-chicago/cms-trad-sample.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.tex index 09f04c22122..dbcbf724bb5 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.tex +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.tex @@ -7,7 +7,7 @@ \usepackage[autostyle]{csquotes} %\usepackage[document]{ragged2e} \usepackage[authordate-trad,backend=biber,autolang=hyphen,booklongxref=false,% -bibencoding=latin1,strict]{biblatex-chicago} +bibencoding=latin1,postnotepunct,compresspages,strict]{biblatex-chicago} % \usepackage[style=chicago-authordate,backend=biber,usecompiler=true,% % babel=hyphen,bibencoding=auto,sorting=nyt,cmslos,autocite=inline]{biblatex} %\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf @@ -64,8 +64,8 @@ Starting with \textsf{biblatex} version 1.5, in order to adhere to the author-date specification you will need to use \textsf{Biber} to process your .bib files, as \textsc{Bib}\TeX\ (and its more recent variants) will no longer provide all the features the style requires. -For this release, you really need the latest versions of -\textsf{Biber} (1.8) and \textsf{biblatex} (2.8a), which contain +For this release, you really need the current versions of +\textsf{Biber} (1.9) and \textsf{biblatex} (2.9a), which contain features and bug-fixes on which my own code relies. The advice that follows in this document assumes that you are using \textsf{Biber}; if you wish to continue using \textsc{Bib}\TeX\ then you need @@ -319,7 +319,7 @@ in standard author-date format.) A \cmd{cite*} or \cmd{autocite*} command will, in such a case, produce the title rather than the year. Some examples should make this clearer: -\enlargethispage{-\baselineskip} +%\enlargethispage{-\baselineskip} Classical works: without abbreviation: \autocite{aristotle:metaphy:trans}; with abbreviation: @@ -344,11 +344,15 @@ it will need to be separated by a semicolon \autocite[15.23]{chicago:manual}. If you have a \textsf{postnote}, then you can manually provide the punctuation and comment in that field, e.g., \autocite[4; the unrevised trans.]{stendhal:parma}. -Without a \textsf{postnote}, you'll need a separate \textsf{Misc} or -\textsf{CustomC} entry containing just the text of the comment in the -\textsf{title} field, \textsf{entrysubtype} \texttt{classical}, and -\textsf{options} \texttt{skipbib}. An \cmd{autocites} command calling -both the main text and the comment will do the trick, e.g., +Without a \textsf{postnote}, you now have two choices. You can enable +the new \texttt{postnotepunct} package option, which allows you simply +to type \cmd{autocite[; the unrevised trans.]\{stendhal:parma\}} +\citereset\autocite[; the unrevised trans.]{stendhal:parma}, or you +can continue to use a separate \textsf{Misc} or \textsf{CustomC} entry +containing just the text of the comment in the \textsf{title} field, +\textsf{entrysubtype} \texttt{classical}, and \textsf{options} +\texttt{skipbib}. An \cmd{autocites} command calling both the main +text and the comment will then do the trick, e.g., \autocites{chicago:manual}{chicago:comment}. \subsubsection*{Multiple authors} diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.pdf index 8cacb5b0304..6bd44cf58e9 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.pdf and b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.tex index 1d614b2e938..89af085b628 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.tex +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.tex @@ -64,7 +64,7 @@ process your .bib files, as \textsc{Bib}\TeX\ (and its more recent variants) will no longer provide all the features you need. I highly recommend, therefore, that you upgrade either to \textsf{Biber} 0.9.9 and to \textsf{biblatex} 1.7, which are designed to work together, or -to \textsf{Biber} 1.8 and \textsf{biblatex} 2.8a, which latter two are +to \textsf{Biber} 1.9 and \textsf{biblatex} 2.9a, which latter two are the newest releases and are likewise designed to work as a matched pair. The advice that follows in this document assumes that you are using \textsf{Biber}; if you wish to continue using \textsc{Bib}\TeX\ diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-notes-sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-notes-sample.pdf index f2383b25f5f..ddd4915ef6c 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-notes-sample.pdf and b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-notes-sample.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib b/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib index 526ed2bd72a..ffb02cb2e34 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib @@ -345,7 +345,7 @@ journaltitle = {American Psychologist}, volume = 45, date = {1990-03}, - pages = {336--46}, + pages = {336--346}, annotation = {Very typical Article entry, but notice the placement of the subtitle in the title field, in order to avoid the printing of the colon usually separating @@ -784,7 +784,7 @@ volume = 99, editor = {Good, Thomas~L.}, number = 5, - pages = {131--46}, + pages = {131--146}, annotation = {An Article that is part of a special issue of a journal. The title of the issue goes in issuetitle, the editor of the issue in editor, and the sort of @@ -802,7 +802,7 @@ journaltitle = {Water Research}, date = 1982, volume = 16, - pages = {1313--17}, + pages = {1313--1317}, annotation = {An article with italicized words in the title.} } @@ -825,7 +825,7 @@ journaltitle = {Philosophical Transactions of the Royal Society}, date = 1998, volume = {B 353}, - pages = {327--45}, + pages = {327--345}, annotation = {An article in a journal which appears in different series, here "B" for Biological, which information can be given in the volume field.}} @@ -1088,7 +1088,7 @@ author = {Ellet, Elizabeth~F.~L.}, title = {By Rail and Stage to {Galena}}, crossref = {prairie:state}, - pages = {271--79}, + pages = {271--279}, annotation = {First of three InCollection entries cross-referencing the same Collection. Cf. keating:dearborn and lippincott:chicago. All @@ -1465,7 +1465,7 @@ year = 1999, volume = 110, number = 1, - pages = {140--164}, + pages = {140--64}, titleaddon = {\bibstring{reviewof} \mkbibemph{The sources of normativity}, \bibstring{by} {Christine M. Korsgaard}}, annotation = {A book review as an Article. It has a specific @@ -1956,7 +1956,7 @@ year = 1938, volume = 78, hyphenation = {dutch}, - pages = {271--73}, + pages = {271--273}, annotation = {An Article with a Dutch title that may need translating for a significant portion of your readership. You give the translation in the usere @@ -2134,7 +2134,7 @@ author = {Lippincott, Sarah Clarke}, title = {Chicago}, crossref = {prairie:state}, - pages = {362--70}, + pages = {362--370}, annotation = {Third and last of the InCollection entries referring to the same Collection. The reference list entries of all three are abbreviated. Cf. ellet:galena @@ -2197,7 +2197,7 @@ journaltitle = {PMLA}, date = 1960, volume = 75, - pages = {149--51}, + pages = {149--151}, annote = {_16th edition only_ An article entry with a quoted title within its title} } @@ -2663,7 +2663,7 @@ subtitle = {Diary of a Battle}, booktitle = {The Other Side of Time}, booksubtitle = {A Combat Surgeon in {World War II}\@}, - pages = {117--63}, + pages = {117--163}, publisher = {Little, Brown}, year = 1987, address = {Boston}, @@ -2953,20 +2953,16 @@ @Article{rozner:liberation, journaltitle = {Voprosy istorii}, year = 1979, - entrysubtype = {magazine}, author = {Rozner, I.~G.}, title = {The War of Liberation of the {Ukrainian} People in 1648--1654 and {Russia}}, number = 4, language = {russian}, pages = {51--64}, - annotation = {This is a Russian journal, with its issues defined - not by volume number but by year. For the - 16th-edition style you need a "magazine" - entrysubtype. The journaltitle is in transliterated - Russian, but the article title is translated into - English, hence the original language must be - provided in the language field.} + annotation = {This is a Russian journal, and its journaltitle is + in transliterated Russian, while its article title + is translated into English, hence the original + language provided in the language field.} } @Music{rubinstein:chopin, @@ -3004,7 +3000,7 @@ hyphenation = {german}, date = 1975, volume = 56, - pages = {191--98}, + pages = {191--198}, annotation = {An article in German with the title left untranslated. The hyphenation field means you don't need additional curly braces in the title to @@ -3086,7 +3082,7 @@ journaltitle = {Proceedings of the Massachusetts Historical Society}, date = {1896-01}, volume = 10, - pages = {412--15}, + pages = {412--415}, series = 2, annotation = {A letter presented as an article in a scholarly journal, hence the Article entry. Note plain number @@ -3236,7 +3232,7 @@ journaltitle = {BioScience}, date = 1974, volume = 24, - pages = {715--22}, + pages = {715--722}, annotation = {A standard Article entry.}} @Book{thompson:making, @@ -3253,7 +3249,7 @@ @Book{tillich:system, title = {Systematic Theology}, - year = {1951\---63}, + year = {1951\bibdatedash 63}, author = {Tillich, Paul}, publisher = uchp, volumes = 3, @@ -3431,7 +3427,7 @@ date = {2000-11}, volume = 106, number = 3, - pages = {551--78}, + pages = {551--578}, url = {http://www.journals.uchicago.edu/AJS/journal/issues/v106n3/050125/050125.html}, annotation = {An Article with an online version.} } @@ -3506,7 +3502,7 @@ journaltitle = {Classical Philology}, date = {1999-04}, volume = 94, - pages = {168--81}, + pages = {168--181}, annotation = {A standard Article entry with a formatted title quoted in the title field.} } diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib b/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib index 3ce3ba6b6b8..0025e7aa68a 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib @@ -216,7 +216,7 @@ journaltitle = {American Psychologist}, date = {1990-03}, volume = 45, - pages = {336--46}, + pages = {336--346}, shorttitle = {How Social Is the Animal?}, annote = {Very typical Article entry, but notice the placement of the subtitle in the title field, in order to @@ -579,7 +579,7 @@ volume = 99, editor = {Good, Thomas~L.}, number = 5, - pages = {131--46}, + pages = {131--146}, shorttitle = {Fifth-Grade Boys' Decisions}, annote = {An Article that is part of a special issue of a journal. Title of the issue goes in issuetitle, @@ -842,7 +842,7 @@ author = {Ellet, Elizabeth~F.~L.}, title = {By Rail and Stage to Galena}, crossref = {prairie:state}, - pages = {271--79}, + pages = {271--279}, annote = {First of three InCollection entries cross-referencing the same Collection. Since it is cited first in my example file, its long note @@ -1015,7 +1015,7 @@ publisher = {Oxford University Press}, address = {Oxford}, year = {2009}, - pages = {183-207}, + pages = {183--207}, annote = {A standard inproceedings entry.} } @@ -1501,7 +1501,7 @@ journaltitle = {Tijdschrift voor Indische taal-, land- en volkenkunde}, year = 1938, volume = 78, - pages = {271--73}, + pages = {271--273}, shorttitle = {Pigafetta}, annote = {An Article with a Dutch title that may need translating for a significant portion of your @@ -1661,7 +1661,7 @@ author = {Lippincott, Sarah Clarke}, title = {Chicago}, crossref = {prairie:state}, - pages = {362--70}, + pages = {362--370}, annote = {Third and last of the InCollection entries referring to the same Collection. The first, long note will have abbreviated data for the collection, because @@ -1748,7 +1748,7 @@ year = 1994, volume = 60, number = 3, - pages = {513--32}, + pages = {513--532}, shorttitle = {Antebellum Southern Fathers}, annote = {Standard Article entry, with a number as well as a volume.} @@ -2088,7 +2088,7 @@ subtitle = {Diary of a Battle}, booktitle = {The Other Side of Time}, booksubtitle = {A Combat Surgeon in World War II\@}, - pages = {117--63}, + pages = {117--163}, publisher = {Little, Brown}, year = 1987, address = {Boston}, @@ -2313,7 +2313,6 @@ @Article{rozner:liberation, journaltitle = {Voprosy istorii}, - entrysubtype = {magazine}, year = 1979, author = {Rozner, I.~G.}, title = {The War of Liberation of the Ukrainian People in @@ -2322,13 +2321,10 @@ language = {russian}, pages = {51--64}, shorttitle = {War of Liberation}, - annote = {This is a Russian journal, with its issues defined - not by volume number but by year, hence for the - purposes of biblatex-chicago-df it's an Article with - a "magazine" entrysubtype. The journaltitle is in - transliterated Russian, but the article title is + annote = {This is a Russian journal and while its journaltitle + is in transliterated Russian, its title is translated into English, hence the original language - must be provided in the language field.} + provided in the language field.} } @Music{rubinstein:chopin, @@ -2344,6 +2340,21 @@ Cf. floyd:atom.} } +@Article{saberhagen:beluga, + author = {Saberhagen, Kelvin}, + title = {Lake Superior Beluga?}, + journaltitle = {Sturgeon Review}, + date = 1928, + issue = {Winter}, + pages = {21--45}, + annote = {This is an Article entry with no volume or number, + so the date becomes the indispensable identifying + detail. When printed, it will look rather like an + Article with "magazine" entrysubtype, but the + package provides this formatting with no manual + intervention from the user.} +} + @Book{schellinger:novel, title = {Encyclopedia of the Novel}, publisher = {Fitzroy Dearborn}, @@ -2420,7 +2431,7 @@ journaltitle = {Proceedings of the Massachusetts Historical Society}, date = {1896-01}, volume = 10, - pages = {412--15}, + pages = {412--415}, series = 2, annote = {A letter presented as an article in a scholarly journal, hence the Article entry. You can use the @@ -2680,7 +2691,7 @@ date = {2000-11}, volume = 106, number = 3, - pages = {551--78}, + pages = {551--578}, url = {http://www.journals.uchicago.edu/AJS/journal/issues/v106n3/050125/050125.html}, annote = {An Article with an online version.} } @@ -2741,7 +2752,7 @@ journaltitle = {Classical Philology}, volume = 94, date = {1999-04}, - pages = {168--81}, + pages = {168--181}, annote = {A standard Article entry with a formatted title quoted in the title field.} } 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 90984961343..8ec06e36667 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.53 2013/10/29 14:10:24 dfussner Exp $ +% $Id: biblatex-chicago.sty,v 0.1.1.54 2014/08/15 13:51:57 dfussner Exp $ -% Copyright (c) 2009-2013 David Fussner. This package is +% Copyright (c) 2009-2014 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}[2013/10/29 v 2.8 biblatex style] +\ProvidesPackage{biblatex-chicago}[2014/08/15 v 2.9a biblatex style] \RequirePackage{etoolbox} 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 34c817312f4..8360287b050 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,10 +1,10 @@ -% $Id: chicago-authordate-trad.cbx,v 0.8.1.42 2013/10/29 14:03:58 dfussner Exp $ +% $Id: chicago-authordate-trad.cbx,v 0.8.2.3 2014/08/15 09:44: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 % author-date style of the Chicago Manual of Style, 16th edition. -\ProvidesFile{chicago-authordate-trad.cbx}[2013/10/29 v 2.8 biblatex +\ProvidesFile{chicago-authordate-trad.cbx}[2014/08/15 v 2.9a biblatex citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -26,6 +26,8 @@ citation style] \providetoggle{cms@ordate} \providetoggle{cms@nodates} \providetoggle{cms@authorparens} +\providetoggle{cms@datedash} +\providetoggle{cms@modpostnote} \providetoggle{cms@url}% These are for the field-exclusion options \providetoggle{cms@doi} @@ -35,6 +37,7 @@ citation style] \providetoggle{cms@numbermonth} \providetoggle{cms@bookpages} \providetoggle{cms@hidevolumes}% Modify Volume fix +\providetoggle{cms@comprange} \providetoggle{cms@jrcomma}% Comma after Jr./Sr. @@ -147,6 +150,25 @@ citation style] \DeclareBibliographyOption{noibid}[true]{% \global\toggletrue{cms@noibid}} +\DeclareBibliographyOption{compresspages}[true]{% + \ifcsdef{cms@opt@crange@#1}% + {\csuse{cms@opt@crange@#1}}% + {\blx@err@invopt{compresspages=#1}{}}}% +\def\cms@opt@crange@true{% + \global\toggletrue{cms@comprange}% + \setcounter{mincomprange}{100}% + \setcounter{mincompwidth}{10}% +}% +\def\cms@opt@crange@false{}% + +\DeclareBibliographyOption{postnotepunct}[true]{% + \ifcsdef{cms@opt@ppunct@#1}% + {\csuse{cms@opt@ppunct@#1}}% + {\blx@err@invopt{postnotepunct=#1}{}}}% +\def\cms@opt@ppunct@true{% + \global\toggletrue{cms@modpostnote}}% +\def\cms@opt@ppunct@false{}% + \DeclareBibliographyOption{usecompiler}[true]{% \settoggle{cms@usecompiler}{#1}} @@ -268,6 +290,10 @@ citation style] {\ExecuteBibliographyOptions{labeldate=true}}% {\ExecuteBibliographyOptions{labelyear=true}}% +\@ifpackagelater{biblatex}{2014/02/20}% For biblatex 2.9 ff. +{\global\toggletrue{cms@datedash}}% +{\global\togglefalse{cms@datedash}}% + \DeclareDataInheritance{collection}{suppcollection}{% \inherit{title}{title} \inherit{subtitle}{subtitle} @@ -283,6 +309,16 @@ citation style] \noinherit{indexsorttitle} } +\DeclareDataInheritance{book}{incollection}{% + \inherit{title}{booktitle} + \inherit{subtitle}{booksubtitle} + \inherit{titleaddon}{booktitleaddon} + \noinherit{shorttitle} + \noinherit{sorttitle} + \noinherit{indextitle} + \noinherit{indexsorttitle} +} + \DeclareDataInheritance{book,collection}{letter}{% \inherit{title}{booktitle} \inherit{subtitle}{booksubtitle} @@ -440,6 +476,11 @@ citation style] \global\undef\cbx@lasthash \global\undef\cbx@lastyear} +\newbibmacro*{backref+check}{% + \ifbibliography% + {\backtrackerfalse}% + {}} + \newbibmacro*{cite}{% \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}}% @@ -671,7 +712,7 @@ citation style] \iffieldundef{postnote}% {}% {\savefield{namehash}{\cbx@lastyear}% - \setunit{\postnotedelim}% + \setunit{\postnotewrapper}% \printfield{postnote}}% \ifthenelse{\value{multicitecount}=\value{multicitetotal}}% {\setunit{}% @@ -743,15 +784,15 @@ citation style] \ifthenelse{\iffieldundef{labelyear}\OR% \iffieldequalstr{labelyear}{nodate}}% {\ifboolexpr{ - test {\ifentrytype{misc}} + test {\ifentrytype{misc}}% or - test {\ifentrytype{inreference}} + test {\ifentrytype{inreference}}% or - test {\ifentrytype{reference}} + test {\ifentrytype{reference}}% or - test {\ifentrytype{mvreference}} + test {\ifentrytype{mvreference}}% or - not togl {cms@nodates} + not togl {cms@nodates}% }% {}% {\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS? @@ -766,7 +807,11 @@ citation style] \printfield{extrayear}}% \iffieldundef{urlendyear}% {}% - {\iffieldequalstr{urlendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{urlendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}% {\printfield{labelyear}% @@ -776,7 +821,11 @@ citation style] \printfield{extrayear}}% \iffieldundef{origendyear}% {}% - {\iffieldequalstr{origendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{origendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}} {\printfield{labelyear}% @@ -786,7 +835,11 @@ citation style] \printfield{extrayear}}% \iffieldundef{eventendyear}% {}% - {\iffieldequalstr{eventendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{eventendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}} {\printfield{labelyear}% @@ -796,7 +849,11 @@ citation style] \printfield{extrayear}}% \iffieldundef{endyear}% DATE FIX {}% - {\iffieldequalstr{endyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{endyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}}}} @@ -804,15 +861,15 @@ citation style] \ifthenelse{\iffieldundef{labelyear}\OR% \iffieldequalstr{labelyear}{nodate}}% {\ifboolexpr{ - test {\ifentrytype{misc}} + test {\ifentrytype{misc}}% or - test {\ifentrytype{inreference}} + test {\ifentrytype{inreference}}% or - test {\ifentrytype{reference}} + test {\ifentrytype{reference}}% or - test {\ifentrytype{mvreference}} + test {\ifentrytype{mvreference}}% or - not togl {cms@nodates} + not togl {cms@nodates}% }% {}% {\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS? @@ -827,7 +884,11 @@ citation style] \printfield{extrayear}}% \iffieldundef{urlendyear}% {}% - {\iffieldequalstr{urlendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{urlendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}% {\printfield{labelyear}% @@ -837,7 +898,11 @@ citation style] \printfield{extrayear}}% \iffieldundef{eventendyear}% {}% - {\iffieldequalstr{eventendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{eventendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}} {\printfield{labelyear}% @@ -847,7 +912,11 @@ citation style] \printfield{extrayear}}% \iffieldundef{endyear}% {}% - {\iffieldequalstr{endyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{endyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}} {\printfield{labelyear}% @@ -857,7 +926,11 @@ citation style] \printfield{extrayear}}% \iffieldundef{origendyear}% DATE FIX {}% - {\iffieldequalstr{origendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{origendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}}}} @@ -865,15 +938,15 @@ citation style] \ifthenelse{\iffieldundef{labelyear}\OR% \iffieldequalstr{labelyear}{nodate}}% {\ifboolexpr{ - test {\ifentrytype{misc}} + test {\ifentrytype{misc}}% or - test {\ifentrytype{inreference}} + test {\ifentrytype{inreference}}% or - test {\ifentrytype{reference}} + test {\ifentrytype{reference}}% or - test {\ifentrytype{mvreference}} + test {\ifentrytype{mvreference}}% or - not togl {cms@nodates} + not togl {cms@nodates}% }% {}% {\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS? @@ -888,7 +961,11 @@ citation style] \printfield{extrayear}}% \iffieldundef{urlendyear}% {}% - {\iffieldequalstr{urlendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{urlendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}% {\printfield{labelyear}% @@ -898,7 +975,11 @@ citation style] \printfield{extrayear}}% \iffieldundef{endyear}% {}% - {\iffieldequalstr{endyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{endyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}} {\printfield{labelyear}% @@ -908,7 +989,11 @@ citation style] \printfield{extrayear}}% \iffieldundef{origendyear}% {}% - {\iffieldequalstr{origendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{origendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}} {\printfield{labelyear}% @@ -918,22 +1003,26 @@ citation style] \printfield{extrayear}}% \iffieldundef{eventendyear}% DATE FIX {}% - {\iffieldequalstr{eventendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{eventendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}}}} \newbibmacro*{cmscitesortdate}{% Attempt to solve date-related problems \ifboolexpr{% - test {\iffieldundef{origyear}} + test {\iffieldundef{origyear}}% or - not test {\iffieldint{origyear}} + not test {\iffieldint{origyear}}% }% {\usebibmacro{cmsciteyear}}% {\iffieldint{year}% {\ifboolexpr{% Needed for date ranges test {\iffieldundef{endyear}}% or - not test {\iffieldnum{endyear}} + not test {\iffieldnum{endyear}}% }% {\ifthenelse{\thefield{origyear}>\thefield{year}}% {\toggletrue{cms@switchdates}% @@ -1138,7 +1227,8 @@ citation style] {\footcitetext}{\setunit{\multicitedelim}} \DeclareCiteCommand{\bibxrefcite} - {\usebibmacro{cite:init}}%\usebibmacro{clearalmostall}} (?) +{\usebibmacro{cite:init}% + \usebibmacro{backref+check}}%\usebibmacro{clearalmostall}} (?) {\usebibmacro{xref-in:}% \blx@ibidreset% For authordate style \usebibmacro{cite}} @@ -1146,27 +1236,31 @@ citation style] {} \DeclareCiteCommand{\origfullcite} - {\nopunct\unspace% +{\usebibmacro{backref+check}% + \nopunct\unspace% \savebibmacro{cmsbibsortdate}% \renewbibmacro*{cmsbibsortdate}{}}% {\usedriver {\DeclareNameAlias{sortname}{default}\clearfield{postnote} \clearname{author}\clearfield{userf}%\toggletrue{cms@fullnote}% \toggletrue{cms@headlessnote}\frenchspacing}% - {\thefield{entrytype}}}% + {\thefield{entrytype}}% + \iflistundef{pageref}{}{\newunit\usebibmacro{pageref}}}% {\multicitedelim}% {\restorebibmacro{cmsbibsortdate}} \DeclareCiteCommand{\origpublcite}% Similar to above, w/o title. - {\nopunct\unspace% - \savebibmacro{cmsbibsortdate}% - \renewbibmacro*{cmsbibsortdate}{}}% +{\usebibmacro{backref+check}% + \nopunct\unspace% + \savebibmacro{cmsbibsortdate}% + \renewbibmacro*{cmsbibsortdate}{}}% {\usedriver {\DeclareNameAlias{sortname}{default}\clearfield{postnote}% \usebibmacro{clearpublin}% \toggletrue{cms@headlessnote}%\toggletrue{cms@fullnote}% \toggletrue{cms@origpublished}\frenchspacing}% - {\thefield{entrytype}}}% + {\thefield{entrytype}}% + \iflistundef{pageref}{}{\newunit\usebibmacro{pageref}}}% {\multicitedelim}% {\restorebibmacro{cmsbibsortdate}} @@ -1267,20 +1361,43 @@ citation style] \DeclareFieldFormat{prenote}{\ifcapital{\MakeCapital{#1}}{#1}} -\DeclareFieldFormat{postnote}{% Removed \isdots -- required - \iffieldundef{pagination}% elsewhere also? - {#1}% - {\mkpageprefix[pagination]{#1}}} +\iftoggle{cms@comprange}% Audrey Boruvka's code from StackExchange +{\patchcmd{\blx@comprange@check}% + {\blx@comprange@comp{#1}{#2}}% + {\blx@tempcnta=#1% + \divide\blx@tempcnta100% + \multiply\blx@tempcnta100% + \ifnumequal{\blx@tempcnta}{#1}% + {\blx@range@out@value{#1\bibrangedash#2}}% + {\blx@comprange@comp{#1}{#2}}}% + {}{}}{}% + +\DeclareFieldFormat{postnote}{% Changed for page compression option + \iftoggle{cms@comprange}% + {\iffieldundef{pagination}% + {\mkcomprange{#1}}% + {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}% + {\iffieldundef{pagination}% + {#1}% + {\mkpageprefix[pagination]{#1}}}}% \DeclareFieldFormat[inreference]{postnote}{% - \iffieldundef{pagination}% - {s\adddot v\adddot\addspace\mkbibquote{#1}} - {\mkpageprefix[pagination]{#1}}}% Removed \isdots here, also. + \iftoggle{cms@comprange}% + {\iffieldundef{pagination}% + {s\adddot v\adddot\addspace\mkbibquote{#1}}% + {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}% + {\iffieldundef{pagination}% + {s\adddot v\adddot\addspace\mkbibquote{#1}}% + {\mkpageprefix[pagination]{#1}}}}% \DeclareFieldFormat{pages}{% - \iffieldundef{bookpagination}% - {#1\isdot}% - {\mkpageprefix[bookpagination]{#1}}} + \iftoggle{cms@comprange}% + {\iffieldundef{bookpagination}% + {\mkcomprange{#1}\isdot}% + {\mkcomprange[{\mkpageprefix[bookpagination]}]{#1}}}% + {\iffieldundef{bookpagination}% + {#1\isdot}% + {\mkpageprefix[bookpagination]{#1}}}}% \DeclareFieldFormat{bibnote}{\MakeCapital{#1}} @@ -1483,9 +1600,9 @@ citation style] \DeclareFieldFormat{journum}{% Revised for 0.9.5 \ifboolexpr{% - test {\ifnumerals{#1}} + test {\ifnumerals{#1}}% and - not test {\ifnumeral{#1}} + not test {\ifnumeral{#1}}% }% {\bibstring{numbers}\addspace #1}% {\bibstring{number}\addspace #1}} @@ -1601,6 +1718,34 @@ citation style] {\addcomma\addspace}}% {\addcomma\addspace}}} +\newcommand*{\postnotewrapper}{% + \iftoggle{cms@modpostnote}% + {\ifboolexpr{% + test {\iffieldstart{postnote}{,}}% + or + test {\iffieldstart{postnote}{\bibrangessep}}% + }% + {\addcomma}% w/ or w/o \addspace? + {\ifboolexpr{% + test {\iffieldstart{postnote}{;}}% + or + test {\iffieldstart{postnote}{:}}% + or + test {\iffieldstart{postnote}{.}}% + }% + {}{\postnotedelim}}}% + {\postnotedelim}}% + +\newrobustcmd*{\iffieldstart}[2]{% Philipp Lehman's code, from + \begingroup% comp.text.tex + \edef\@tempa{% + \long\def\noexpand\iffieldstart@i####1\detokenize{#2}####2}% + \@tempa\@nil{\endgroup\ifblank{##1}}% + \savefield*{#1}{\@tempa}% + \expandafter\iffieldstart@i\detokenize + \expandafter\expandafter\expandafter{% + \expandafter\@tempa\detokenize{#2}}\@nil} + \newcommand*{\editordelim}{% Otherwise you get an inaccurate comma. \iffieldequalstr{editortype}{none}% {\addperiod\addspace}% @@ -1773,9 +1918,9 @@ citation style] {\iflistundef{organization}% {\let\bbx@lasthash\undefined}% {\ifboolexpr{ - test {\iflistequals{organization}{\bbx@lasthash}} + test {\iflistequals{organization}{\bbx@lasthash}}% and - not test {\iffirstonpage} + not test {\iffirstonpage}% }% {\bibnamedash\addperiod\addspace}% {\iftoggle{cms@authorparens}% @@ -2337,7 +2482,7 @@ citation style] \renewbibmacro*{postnote}{% \iffieldundef{postnote}% {}% - {\setunit{\postnotedelim}% + {\setunit{\postnotewrapper}% \printfield{postnote}}} \newbibmacro*{part+editor+translator}{% 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 c60c053a134..631ace42640 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx @@ -1,10 +1,9 @@ -% $Id: chicago-authordate.bbx,v 0.8.1.49 2013/10/29 14:04:23 dfussner Exp $ +% $Id: chicago-authordate.bbx,v 0.8.2.7 2014/08/15 09:45:18 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. - -\ProvidesFile{chicago-authordate.bbx}[2013/10/29 v 2.8 biblatex +\ProvidesFile{chicago-authordate.bbx}[2014/08/15 v 2.9a biblatex bibliography style] %%%% Initialize and format bibliography and los %%%% @@ -23,7 +22,20 @@ bibliography style] {\endlist} {\item} -\defbibenvironment{shorthands} +\defbibenvironment{shorthands}% biblatex < 2.9 + {\list + {\printfield[shorthandwidth]{shorthand}}% + {\setlength{\labelwidth}{\shorthandwidth}% + \setlength{\leftmargin}{\labelwidth}% + \setlength{\labelsep}{\biblabelsep}% + \addtolength{\leftmargin}{\labelsep}% + \setlength{\itemsep}{\lositemsep}% + \setlength{\parsep}{\bibparsep}% + \renewcommand*{\makelabel}[1]{##1\hss}}} + {\endlist} + {\item} + +\defbibenvironment{shorthand} {\list {\printfield[shorthandwidth]{shorthand}}% {\setlength{\labelwidth}{\shorthandwidth}% @@ -122,9 +134,9 @@ bibliography style] {\addlowpenspace\mkbibnameaffix{#4}\isdot}% {\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot% \ifboolexpr{ - test{\ifnumless{\value{listcount}}{\value{listtotal}}} + test{\ifnumless{\value{listcount}}{\value{listtotal}}}% and - test{\ifnumless{\value{listcount}}{\value{maxnames}}} + test{\ifnumless{\value{listcount}}{\value{maxnames}}}% } {\addcomma}% {}}}% @@ -336,7 +348,34 @@ bibliography style] %%%% Drivers for Bibliography entries and Shorthands %%%% -\DeclareBibliographyDriver{shorthands}{% +\DeclareBibliographyDriver{shorthand}{% + \iftoggle{cms@los}% + {\ifnameundef{labelname} + {\mkbibemph{\bibstring{see}}% + \addspace% + \usebibmacro{shorthand:label}}% + {\mkbibemph{\bibstring{see}}% + \addspace% + \usebibmacro{author/editor}}% + \finentry}% + {\iftoggle{cms@fullshhand}% + {\usedriver{\frenchspacing}% + {\thefield{entrytype}}% + \finentry}% + {\ifnameundef{labelname} + {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT% + \ifentrytype{periodical}}% + {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}% + \newcunit}}% + {\ifentrytype{manual}% + {\printtext[bibhyperref]{\printlist{organization}\newcunit}}% + {}}} + {\usebibmacro{author/editor}% + \setunit{\addcomma\space}}% + \printfield[lostitle]{title}% + \finentry}}} + +\DeclareBibliographyDriver{shorthands}{% biblatex < 2.9 \iftoggle{cms@los}% {\ifnameundef{labelname} {\mkbibemph{\bibstring{see}}% @@ -637,13 +676,31 @@ bibliography style] \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% + \usebibmacro{bibprexref}% \bibxrefcite{\thefield{xref}} \usebibmacro{bibpostxref}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% + \usebibmacro{bibprexref}% \bibxrefcite{\thefield{crossref}}% \usebibmacro{bibpostxref}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{bookinbook}{% @@ -715,13 +772,31 @@ bibliography style] \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% + \usebibmacro{bibprexref}% \bibxrefcite{\thefield{xref}} \usebibmacro{bibpostxref}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% + \usebibmacro{bibprexref}% \bibxrefcite{\thefield{crossref}}% \usebibmacro{bibpostxref}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{booklet}{% @@ -811,13 +886,31 @@ bibliography style] \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% + \usebibmacro{bibprexref}% \bibxrefcite{\thefield{xref}} \usebibmacro{bibpostxref}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% + \usebibmacro{bibprexref}% \bibxrefcite{\thefield{crossref}}% \usebibmacro{bibpostxref}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{customc}{% @@ -932,13 +1025,31 @@ bibliography style] \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% + \usebibmacro{bibprexref}% \bibxrefcite{\thefield{xref}} \usebibmacro{bibpostxref}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% + \usebibmacro{bibprexref}% \bibxrefcite{\thefield{crossref}}% \usebibmacro{bibpostxref}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{incollection}{% @@ -1002,13 +1113,31 @@ bibliography style] \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% + \usebibmacro{bibprexref}% \bibxrefcite{\thefield{xref}} \usebibmacro{bibpostxref}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% + \usebibmacro{bibprexref}% \bibxrefcite{\thefield{crossref}}% \usebibmacro{bibpostxref}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{inproceedings}{% @@ -1065,13 +1194,31 @@ bibliography style] \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% + \usebibmacro{bibprexref}% \bibxrefcite{\thefield{xref}} \usebibmacro{bibpostxref}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% + \usebibmacro{bibprexref}% \bibxrefcite{\thefield{crossref}}% \usebibmacro{bibpostxref}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{inreference}{% @@ -1198,17 +1345,31 @@ bibliography style] \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% -{\ifpunctmark{*}% Attempt to fix issues with n.d. Changed for 0.9. - {\setunit{\nopunct\addspace\bibsentence}}% - {}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\newunit}% + \usebibmacro{bibprexref}% \bibxrefcite{\thefield{xref}} \usebibmacro{bibpostxref}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}}% -{\ifpunctmark{*}% Likewise. - {\setunit{\nopunct\addspace\bibsentence}}% - {}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\newunit}% + \usebibmacro{bibprexref}% \bibxrefcite{\thefield{crossref}}% \usebibmacro{bibpostxref}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{manual}{% @@ -1640,13 +1801,31 @@ bibliography style] \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% + \usebibmacro{bibprexref}% \bibxrefcite{\thefield{xref}} \usebibmacro{bibpostxref}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% + \usebibmacro{bibprexref}% \bibxrefcite{\thefield{crossref}}% \usebibmacro{bibpostxref}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{reference}{% @@ -2097,13 +2276,13 @@ bibliography style] \ifthenelse{\iffieldundef{labelyear}\OR% \iffieldequalstr{labelyear}{nodate}}% or new declaration ??? {\ifboolexpr{ - test {\ifentrytype{misc}} + test {\ifentrytype{misc}}% or - test {\ifentrytype{inreference}} + test {\ifentrytype{inreference}}% or - test {\ifentrytype{reference}} + test {\ifentrytype{reference}}% or - test {\ifentrytype{mvreference}} + test {\ifentrytype{mvreference}}% or not togl {cms@nodates}}% {}% @@ -2118,7 +2297,11 @@ bibliography style] \printfield{extrayear}}% \iffieldundef{urlendyear}% {\clearfield{urlyear}}% - {\iffieldequalstr{urlendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{urlendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}% \clearfield{urlyear}}% {\iffieldundef{urlmonth}% @@ -2133,7 +2316,11 @@ bibliography style] \printfield{extrayear}}% \iffieldundef{origendyear}% {\clearfield{origyear}}% - {\iffieldequalstr{origendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{origendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}% \clearfield{origyear}}% {\iffieldundef{origmonth}% @@ -2148,7 +2335,11 @@ bibliography style] \printfield{extrayear}}% \iffieldundef{eventendyear}% {\clearfield{eventyear}}% - {\iffieldequalstr{eventendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{eventendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}% \clearfield{eventyear}}% {\iffieldundef{eventmonth}% @@ -2163,7 +2354,11 @@ bibliography style] \printfield{extrayear}}% \iffieldundef{endyear}% DATE FIX {\clearfield{year}}% - {\iffieldequalstr{endyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{endyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}% \clearfield{year}}% {\iffieldundef{month}% @@ -2176,13 +2371,13 @@ bibliography style] \ifthenelse{\iffieldundef{labelyear}\OR% \iffieldequalstr{labelyear}{nodate}}% {\ifboolexpr{ - test {\ifentrytype{misc}} + test {\ifentrytype{misc}}% or - test {\ifentrytype{inreference}} + test {\ifentrytype{inreference}}% or - test {\ifentrytype{reference}} + test {\ifentrytype{reference}}% or - test {\ifentrytype{mvreference}} + test {\ifentrytype{mvreference}}% or not togl {cms@nodates}}% {}% @@ -2197,7 +2392,11 @@ bibliography style] \printfield{extrayear}}% \iffieldundef{urlendyear}% {\clearfield{urlyear}}% - {\iffieldequalstr{urlendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{urlendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}% \clearfield{urlyear}}% {\iffieldundef{urlmonth}% @@ -2212,7 +2411,11 @@ bibliography style] \printfield{extrayear}}% \iffieldundef{eventendyear}% {\clearfield{eventyear}}% - {\iffieldequalstr{eventendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{eventendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}% \clearfield{eventyear}}% {\iffieldundef{eventmonth}% @@ -2227,7 +2430,11 @@ bibliography style] \printfield{extrayear}}% \iffieldundef{endyear}% {\clearfield{year}}% - {\iffieldequalstr{endyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{endyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}% \clearfield{year}}% {\iffieldundef{month}% @@ -2242,7 +2449,11 @@ bibliography style] \printfield{extrayear}}% \iffieldundef{origendyear}% DATE FIX {\clearfield{origyear}}% - {\iffieldequalstr{origendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{origendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}% \clearfield{origyear}}% {\iffieldundef{origmonth}% @@ -2255,13 +2466,13 @@ bibliography style] \ifthenelse{\iffieldundef{labelyear}\OR% \iffieldequalstr{labelyear}{nodate}}% {\ifboolexpr{ - test {\ifentrytype{misc}} + test {\ifentrytype{misc}}% or - test {\ifentrytype{inreference}} + test {\ifentrytype{inreference}}% or - test {\ifentrytype{reference}} + test {\ifentrytype{reference}}% or - test {\ifentrytype{mvreference}} + test {\ifentrytype{mvreference}}% or not togl {cms@nodates}}% {}% @@ -2276,7 +2487,11 @@ bibliography style] \printfield{extrayear}}% \iffieldundef{urlendyear}% {\clearfield{urlyear}}% - {\iffieldequalstr{urlendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{urlendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}% \clearfield{urlyear}}% {\iffieldundef{urlmonth}% @@ -2291,7 +2506,11 @@ bibliography style] \printfield{extrayear}}% \iffieldundef{endyear}% {\clearfield{year}}% - {\iffieldequalstr{endyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{endyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}% \clearfield{year}}% {\iffieldundef{month}% @@ -2306,7 +2525,11 @@ bibliography style] \printfield{extrayear}}% \iffieldundef{origendyear}% {\clearfield{origyear}}% - {\iffieldequalstr{origendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{origendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}% \clearfield{origyear}}% {\iffieldundef{origmonth}% @@ -2321,7 +2544,11 @@ bibliography style] \printfield{extrayear}}% \iffieldundef{eventendyear}% DATE FIX {\clearfield{eventyear}}% - {\iffieldequalstr{eventendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{eventendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}% \clearfield{eventyear}}% {\iffieldundef{eventmonth}% @@ -2352,9 +2579,9 @@ bibliography style] \newbibmacro*{cmsbibsortdate}{% Attempt to solve date-related problems \ifboolexpr{% - test {\iffieldundef{origyear}} + test {\iffieldundef{origyear}}% or - not test {\iffieldint{origyear}} + not test {\iffieldint{origyear}}% }% {\usebibmacro{cmsbibyear}}% {\iffieldint{year}% @@ -2522,6 +2749,9 @@ bibliography style] \newunit% \printfield{volumes}}}}% +\newbibmacro*{bibprexref}{% For back references + \iflistundef{pageref}{}{\savelist{pageref}{\cbx@incollpgref}}}% + \newbibmacro*{bibpostxref}{% Volume fix \iffieldundef{chapter}% {\iffieldundef{pages}% @@ -2577,7 +2807,13 @@ bibliography style] \printfield{part}% \newcunit% \printfield{pages}}}}}}% - {\newcunit\printfield{chapter}}} + {\newcunit\printfield{chapter}}% + \ifcsdef{cbx@incollpgref}% Here we print and clear the child's + {\restorelist{pageref}{\cbx@incollpgref}% backrefs + \newunit% + \usebibmacro{pageref}% + \global\let\cbx@incollpgref\undefined}% + {}} \newbibmacro*{volume+or+volumes}{% Volume fix (modified) \iffieldundef{maintitle}% @@ -2693,7 +2929,8 @@ bibliography style] \setunit{\addspace}% \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month} \AND\iffieldundef{number}}% - {\iffieldundef{bookpagination}% Removed kludge for French colon spacing? + {\ifthenelse{\iffieldundef{bookpagination}\AND\NOT% + \iffieldundef{volume}}% Removed kludge for French colon spacing? {\setunit{\postvolpunct}}% {\setunit{\addcolon\addspace}}}% This may not be universally correct. {\printtext[parens]{% Perhaps if it's wrong use magazine subtype? @@ -2712,7 +2949,8 @@ bibliography style] \setunit{\addspace}% \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month} \AND\iffieldundef{number}}% - {\iffieldundef{bookpagination}% Removed kludge for French ??? + {\ifthenelse{\iffieldundef{bookpagination}\AND\NOT% + \iffieldundef{volume}}% Removed kludge for French ??? {\setunit{\postvolpunct}}% {\setunit{\addcolon\addspace}}}% {\printtext[parens]{% 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 08a623d20db..5b865d75d64 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.57 2013/10/29 14:04:11 dfussner Exp $ +% $Id: chicago-authordate.cbx,v 0.8.2.5 2014/08/15 09:45:07 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, 16th edition. -\ProvidesFile{chicago-authordate.cbx}[2013/10/29 v 2.8 biblatex citation style] +\ProvidesFile{chicago-authordate.cbx}[2014/08/15 v 2.9a biblatex +citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -25,6 +26,8 @@ \providetoggle{cms@ordate} \providetoggle{cms@nodates} \providetoggle{cms@authorparens} +\providetoggle{cms@datedash} +\providetoggle{cms@modpostnote} \providetoggle{cms@url}% These are for the field-exclusion options \providetoggle{cms@doi} @@ -34,6 +37,7 @@ \providetoggle{cms@numbermonth} \providetoggle{cms@bookpages} \providetoggle{cms@hidevolumes}% Modify Volume fix +\providetoggle{cms@comprange} \providetoggle{cms@jrcomma}% Comma after Jr./Sr. @@ -146,6 +150,25 @@ \DeclareBibliographyOption{noibid}[true]{% \global\toggletrue{cms@noibid}} +\DeclareBibliographyOption{compresspages}[true]{% + \ifcsdef{cms@opt@crange@#1}% + {\csuse{cms@opt@crange@#1}}% + {\blx@err@invopt{compresspages=#1}{}}}% +\def\cms@opt@crange@true{% + \global\toggletrue{cms@comprange}% + \setcounter{mincomprange}{100}% + \setcounter{mincompwidth}{10}% +}% +\def\cms@opt@crange@false{}% + +\DeclareBibliographyOption{postnotepunct}[true]{% + \ifcsdef{cms@opt@ppunct@#1}% + {\csuse{cms@opt@ppunct@#1}}% + {\blx@err@invopt{postnotepunct=#1}{}}}% +\def\cms@opt@ppunct@true{% + \global\toggletrue{cms@modpostnote}}% +\def\cms@opt@ppunct@false{}% + \DeclareBibliographyOption{usecompiler}[true]{% \settoggle{cms@usecompiler}{#1}} @@ -264,6 +287,10 @@ {\ExecuteBibliographyOptions{labeldate=true}}% {\ExecuteBibliographyOptions{labelyear=true}}% +\@ifpackagelater{biblatex}{2014/02/20}% For biblatex 2.9 ff. +{\global\toggletrue{cms@datedash}}% +{\global\togglefalse{cms@datedash}}% + \DeclareDataInheritance{collection}{suppcollection}{% \inherit{title}{title} \inherit{subtitle}{subtitle} @@ -279,6 +306,16 @@ \noinherit{indexsorttitle} } +\DeclareDataInheritance{book}{incollection}{% + \inherit{title}{booktitle} + \inherit{subtitle}{booksubtitle} + \inherit{titleaddon}{booktitleaddon} + \noinherit{shorttitle} + \noinherit{sorttitle} + \noinherit{indextitle} + \noinherit{indexsorttitle} +} + \DeclareDataInheritance{book,collection}{letter}{% \inherit{title}{booktitle} \inherit{subtitle}{booksubtitle} @@ -436,6 +473,11 @@ \global\undef\cbx@lasthash \global\undef\cbx@lastyear} +\newbibmacro*{backref+check}{% + \ifbibliography% + {\backtrackerfalse}% + {}} + \newbibmacro*{cite}{% \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}}% @@ -667,7 +709,7 @@ \iffieldundef{postnote}% {}% {\savefield{namehash}{\cbx@lastyear}% - \setunit{\postnotedelim}% + \setunit{\postnotewrapper}%delim}% \printfield{postnote}}% \ifthenelse{\value{multicitecount}=\value{multicitetotal}}% {\setunit{}% @@ -739,15 +781,15 @@ \ifthenelse{\iffieldundef{labelyear}\OR% \iffieldequalstr{labelyear}{nodate}}% {\ifboolexpr{ - test {\ifentrytype{misc}} + test {\ifentrytype{misc}}% or - test {\ifentrytype{inreference}} + test {\ifentrytype{inreference}}% or - test {\ifentrytype{reference}} + test {\ifentrytype{reference}}% or - test {\ifentrytype{mvreference}} + test {\ifentrytype{mvreference}}% or - not togl {cms@nodates} + not togl {cms@nodates}% }% {}% {\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS? @@ -762,7 +804,11 @@ \printfield{extrayear}}% \iffieldundef{urlendyear}% {}% - {\iffieldequalstr{urlendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{urlendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}% {\printfield{labelyear}% @@ -772,7 +818,11 @@ \printfield{extrayear}}% \iffieldundef{origendyear}% {}% - {\iffieldequalstr{origendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{origendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}} {\printfield{labelyear}% @@ -782,7 +832,11 @@ \printfield{extrayear}}% \iffieldundef{eventendyear}% {}% - {\iffieldequalstr{eventendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{eventendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}} {\printfield{labelyear}% @@ -792,7 +846,11 @@ \printfield{extrayear}}% \iffieldundef{endyear}% DATE FIX {}% - {\iffieldequalstr{endyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{endyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}}}} @@ -800,15 +858,15 @@ \ifthenelse{\iffieldundef{labelyear}\OR% \iffieldequalstr{labelyear}{nodate}}% {\ifboolexpr{ - test {\ifentrytype{misc}} + test {\ifentrytype{misc}}% or - test {\ifentrytype{inreference}} + test {\ifentrytype{inreference}}% or - test {\ifentrytype{reference}} + test {\ifentrytype{reference}}% or - test {\ifentrytype{mvreference}} + test {\ifentrytype{mvreference}}% or - not togl {cms@nodates} + not togl {cms@nodates}% }% {}% {\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS? @@ -823,7 +881,11 @@ \printfield{extrayear}}% \iffieldundef{urlendyear}% {}% - {\iffieldequalstr{urlendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{urlendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}% {\printfield{labelyear}% @@ -833,7 +895,11 @@ \printfield{extrayear}}% \iffieldundef{eventendyear}% {}% - {\iffieldequalstr{eventendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{eventendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}} {\printfield{labelyear}% @@ -843,7 +909,11 @@ \printfield{extrayear}}% \iffieldundef{endyear}% {}% - {\iffieldequalstr{endyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{endyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}} {\printfield{labelyear}% @@ -853,7 +923,11 @@ \printfield{extrayear}}% \iffieldundef{origendyear}% DATE FIX {}% - {\iffieldequalstr{origendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{origendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}}}} @@ -861,15 +935,15 @@ \ifthenelse{\iffieldundef{labelyear}\OR% \iffieldequalstr{labelyear}{nodate}}% {\ifboolexpr{ - test {\ifentrytype{misc}} + test {\ifentrytype{misc}}% or - test {\ifentrytype{inreference}} + test {\ifentrytype{inreference}}% or - test {\ifentrytype{reference}} + test {\ifentrytype{reference}}% or - test {\ifentrytype{mvreference}} + test {\ifentrytype{mvreference}}% or - not togl {cms@nodates} + not togl {cms@nodates}% }% {}% {\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS? @@ -884,7 +958,11 @@ \printfield{extrayear}}% \iffieldundef{urlendyear}% {}% - {\iffieldequalstr{urlendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{urlendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}% {\printfield{labelyear}% @@ -894,7 +972,11 @@ \printfield{extrayear}}% \iffieldundef{endyear}% {}% - {\iffieldequalstr{endyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{endyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}} {\printfield{labelyear}% @@ -904,7 +986,11 @@ \printfield{extrayear}}% \iffieldundef{origendyear}% {}% - {\iffieldequalstr{origendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{origendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}} {\printfield{labelyear}% @@ -914,22 +1000,26 @@ \printfield{extrayear}}% \iffieldundef{eventendyear}% DATE FIX {}% - {\iffieldequalstr{eventendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{eventendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}}}} \newbibmacro*{cmscitesortdate}{% Attempt to solve date-related problems \ifboolexpr{% - test {\iffieldundef{origyear}} + test {\iffieldundef{origyear}}% or - not test {\iffieldint{origyear}} + not test {\iffieldint{origyear}}% }% {\usebibmacro{cmsciteyear}}% {\iffieldint{year}% {\ifboolexpr{% Needed for date ranges test {\iffieldundef{endyear}}% or - not test {\iffieldnum{endyear}} + not test {\iffieldnum{endyear}}% }% {\ifthenelse{\thefield{origyear}>\thefield{year}}% {\toggletrue{cms@switchdates}% @@ -1134,7 +1224,8 @@ {\footcitetext}{\setunit{\multicitedelim}} \DeclareCiteCommand{\bibxrefcite} - {\usebibmacro{cite:init}}%\usebibmacro{clearalmostall}} (?) + {\usebibmacro{cite:init}% + \usebibmacro{backref+check}}%\usebibmacro{clearalmostall}} (?) {\usebibmacro{xref-in:}% \blx@ibidreset% For authordate style \usebibmacro{cite}} @@ -1142,19 +1233,22 @@ {} \DeclareCiteCommand{\origfullcite} - {\nopunct\unspace% - \savebibmacro{cmsbibsortdate}% - \renewbibmacro*{cmsbibsortdate}{}}% + {\usebibmacro{backref+check}% + \nopunct\unspace% + \savebibmacro{cmsbibsortdate}% + \renewbibmacro*{cmsbibsortdate}{}}% {\usedriver {\DeclareNameAlias{sortname}{default}\clearfield{postnote} \clearname{author}\clearfield{userf}%\toggletrue{cms@fullnote}% \toggletrue{cms@headlessnote}\frenchspacing}% - {\thefield{entrytype}}}% + {\thefield{entrytype}}% + \iflistundef{pageref}{}{\newunit\usebibmacro{pageref}}}% {\multicitedelim}% {\restorebibmacro{cmsbibsortdate}} \DeclareCiteCommand{\origpublcite}% Similar to above, w/o title. - {\nopunct\unspace% + {\usebibmacro{backref+check}% + \nopunct\unspace% \savebibmacro{cmsbibsortdate}% \renewbibmacro*{cmsbibsortdate}{}}% {\usedriver @@ -1162,7 +1256,8 @@ \usebibmacro{clearpublin}% \toggletrue{cms@headlessnote}%\toggletrue{cms@fullnote}% \toggletrue{cms@origpublished}\frenchspacing}% - {\thefield{entrytype}}}% + {\thefield{entrytype}}% + \iflistundef{pageref}{}{\newunit\usebibmacro{pageref}}}% {\multicitedelim}% {\restorebibmacro{cmsbibsortdate}} @@ -1263,20 +1358,43 @@ \DeclareFieldFormat{prenote}{\ifcapital{\MakeCapital{#1}}{#1}} -\DeclareFieldFormat{postnote}{% Removed \isdots -- required - \iffieldundef{pagination}% elsewhere also? - {#1}% - {\mkpageprefix[pagination]{#1}}} +\iftoggle{cms@comprange}% Audrey Boruvka's code from StackExchange +{\patchcmd{\blx@comprange@check}% + {\blx@comprange@comp{#1}{#2}}% + {\blx@tempcnta=#1% + \divide\blx@tempcnta100% + \multiply\blx@tempcnta100% + \ifnumequal{\blx@tempcnta}{#1}% + {\blx@range@out@value{#1\bibrangedash#2}}% + {\blx@comprange@comp{#1}{#2}}}% + {}{}}{}% + +\DeclareFieldFormat{postnote}{% Changed for page compression option + \iftoggle{cms@comprange}% + {\iffieldundef{pagination}% + {\mkcomprange{#1}}% + {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}% + {\iffieldundef{pagination}% + {#1}% + {\mkpageprefix[pagination]{#1}}}}% \DeclareFieldFormat[inreference]{postnote}{% - \iffieldundef{pagination}% - {s\adddot v\adddot\addspace\mkbibquote{#1}} - {\mkpageprefix[pagination]{#1}}}% Removed \isdots here, also. + \iftoggle{cms@comprange}% + {\iffieldundef{pagination}% + {s\adddot v\adddot\addspace\mkbibquote{#1}}% + {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}% + {\iffieldundef{pagination}% + {s\adddot v\adddot\addspace\mkbibquote{#1}}% + {\mkpageprefix[pagination]{#1}}}}% \DeclareFieldFormat{pages}{% - \iffieldundef{bookpagination}% - {#1\isdot}% - {\mkpageprefix[bookpagination]{#1}}}% Removed \isdot. + \iftoggle{cms@comprange}% + {\iffieldundef{bookpagination}% + {\mkcomprange{#1}\isdot}% + {\mkcomprange[{\mkpageprefix[bookpagination]}]{#1}}}% + {\iffieldundef{bookpagination}% + {#1\isdot}% + {\mkpageprefix[bookpagination]{#1}}}}% \DeclareFieldFormat{bibnote}{\MakeCapital{#1}} @@ -1478,9 +1596,9 @@ \DeclareFieldFormat{journum}{% Revised for 0.9.5 \ifboolexpr{% - test {\ifnumerals{#1}} + test {\ifnumerals{#1}}% and - not test {\ifnumeral{#1}} + not test {\ifnumeral{#1}}% }% {\bibstring{numbers}\addspace #1}% {\bibstring{number}\addspace #1}} @@ -1596,6 +1714,34 @@ {\addcomma\addspace}}% {\addcomma\addspace}}} +\newcommand*{\postnotewrapper}{% + \iftoggle{cms@modpostnote}% + {\ifboolexpr{% + test {\iffieldstart{postnote}{,}}% + or + test {\iffieldstart{postnote}{\bibrangessep}}% + }% + {\addcomma}% w/ or w/o \addspace? + {\ifboolexpr{% + test {\iffieldstart{postnote}{;}}% + or + test {\iffieldstart{postnote}{:}}% + or + test {\iffieldstart{postnote}{.}}% + }% + {}{\postnotedelim}}}% + {\postnotedelim}}% + +\newrobustcmd*{\iffieldstart}[2]{% Philipp Lehman's code, from + \begingroup% comp.text.tex + \edef\@tempa{% + \long\def\noexpand\iffieldstart@i####1\detokenize{#2}####2}% + \@tempa\@nil{\endgroup\ifblank{##1}}% + \savefield*{#1}{\@tempa}% + \expandafter\iffieldstart@i\detokenize + \expandafter\expandafter\expandafter{% + \expandafter\@tempa\detokenize{#2}}\@nil} + \newcommand*{\editordelim}{% Otherwise you get an inaccurate comma. \iffieldequalstr{editortype}{none}% {\addperiod\addspace}% @@ -1768,9 +1914,9 @@ {\iflistundef{organization}% {\let\bbx@lasthash\undefined}% {\ifboolexpr{ - test {\iflistequals{organization}{\bbx@lasthash}} + test {\iflistequals{organization}{\bbx@lasthash}}% and - not test {\iffirstonpage} + not test {\iffirstonpage}% }% {\bibnamedash\addperiod\addspace}% {\iftoggle{cms@authorparens}% @@ -2215,14 +2361,14 @@ \newcommand*{\cms@datelong}{% Modified for 0.9 \iffieldundef{origmonth}% {\printfield{origyear}}% - {\printfield[letterday]{origday}\setunit{\nobreakspace}% + {\printfield[letterday]{origday}\setunit*{\nobreakspace}% \mkbibmonth{\thefield{origmonth}}\setunit{\nobreakspace}% \printfield{origyear}}}% \newcommand*{\cms@datelongalt}{% Modified for 0.9 \iffieldundef{month}% {\printfield{year}}% - {\printfield[letterday]{day}\setunit{\nobreakspace}% + {\printfield[letterday]{day}\setunit*{\nobreakspace}% \mkbibmonth{\thefield{month}}\setunit{\nobreakspace}% \printfield{year}}}% @@ -2232,14 +2378,14 @@ {}% {\iffieldundef{month}% {\printfield{year}}% - {\printfield[letterday]{day}\setunit{\nobreakspace}% + {\printfield[letterday]{day}\setunit*{\nobreakspace}% \mkbibmonth{\thefield{month}}\setunit{\nobreakspace}% \printfield{year}}}}% {\iffieldundef{origyear}% {}% {\iffieldundef{origmonth}% {\printfield{origyear}}% - {\printfield[letterday]{origday}\setunit{\nobreakspace}% + {\printfield[letterday]{origday}\setunit*{\nobreakspace}% \mkbibmonth{\thefield{origmonth}}\setunit{\nobreakspace}% \printfield{origyear}}}}}% @@ -2332,7 +2478,7 @@ \renewbibmacro*{postnote}{% \iffieldundef{postnote}% {}% - {\setunit{\postnotedelim}% + {\setunit{\postnotewrapper}%delim}% \printfield{postnote}}} \newbibmacro*{part+editor+translator}{% diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.bbx index 7364ef99492..5c6563948d0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.bbx @@ -1,11 +1,11 @@ -% $Id: chicago-authordate15.bbx,v 0.8.1.17 2013/10/21 14:51:44 dfussner Exp $ +% $Id: chicago-authordate15.bbx,v 0.8.1.18 2014/08/14 14:11:21 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, % _15th_ edition. \ProvidesFile{chicago-authordate15.bbx} -[2013/10/21 v 2.8 biblatex bibliography style] +[2014/08/15 v 2.9a biblatex bibliography style] %%%% Initialize and format bibliography and los %%%% @@ -36,6 +36,19 @@ {\endlist} {\item} +\defbibenvironment{shorthand} + {\list + {\printfield[shorthandwidth]{shorthand}}% + {\setlength{\labelwidth}{\shorthandwidth}% + \setlength{\leftmargin}{\labelwidth}% + \setlength{\labelsep}{\biblabelsep}% + \addtolength{\leftmargin}{\labelsep}% + \setlength{\itemsep}{\lositemsep}% + \setlength{\parsep}{\bibparsep}% + \renewcommand*{\makelabel}[1]{##1\hss}}} + {\endlist} + {\item} + \defbibenvironment{losnotes} {\list {\printfield[shorthandwidth]{shorthand}}% @@ -346,6 +359,33 @@ \printfield[lostitle]{title}% \finentry}}} +\DeclareBibliographyDriver{shorthand}{% + \iftoggle{cms@los}% + {\ifnameundef{labelname} + {\mkbibemph{\bibstring{see}}% + \addspace% + \usebibmacro{shorthand:label}}% + {\mkbibemph{\bibstring{see}}% + \addspace% + \usebibmacro{author/editor}}% + \finentry}% + {\iftoggle{cms@fullshhand}% + {\usedriver{\frenchspacing}% + {\thefield{entrytype}}% + \finentry}% + {\ifnameundef{labelname} + {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT% + \iffieldequalstr{entrytype}{periodical}}% + {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}% + \newcunit}}% + {\iffieldequalstr{entrytype}{manual}% + {\printtext[bibhyperref]{\printlist{organization}\newcunit}}% + {}}} + {\usebibmacro{author/editor}% + \setunit{\addcomma\space}}% + \printfield[lostitle]{title}% + \finentry}}} + \DeclareBibliographyDriver{article}{% \iffieldequalstr{entrysubtype}{magazine}% {\usebibmacro{bibindex}% @@ -2129,7 +2169,11 @@ \printfield{extrayear}}% \iffieldundef{urlendyear}% {\clearfield{urlyear}}% - {\iffieldequalstr{urlendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{urlendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}% \clearfield{urlyear}}% {\iffieldundef{urlmonth}% @@ -2144,7 +2188,11 @@ \printfield{extrayear}}% \iffieldundef{origendyear}% {\clearfield{origyear}}% - {\iffieldequalstr{origendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{origendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}% \clearfield{origyear}}% {\iffieldundef{origmonth}% @@ -2159,7 +2207,11 @@ \printfield{extrayear}}% \iffieldundef{eventendyear}% {\clearfield{eventyear}}% - {\iffieldequalstr{eventendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{eventendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}% \clearfield{eventyear}}% {\iffieldundef{eventmonth}% @@ -2174,7 +2226,11 @@ \printfield{extrayear}}% \iffieldundef{endyear}% DATE FIX {\clearfield{year}}% - {\iffieldequalstr{endyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{endyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}% \clearfield{year}}% {\iffieldundef{month}% diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx index 318c5f68121..3cc6554a665 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx @@ -1,11 +1,11 @@ -% $Id: chicago-authordate15.cbx,v 0.8.1.21 2013/10/21 14:51:16 dfussner Exp $ +% $Id: chicago-authordate15.cbx,v 0.8.1.22 2014/08/14 14:11:29 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. \ProvidesFile{chicago-authordate15.cbx} -[2013/10/21 v 2.8 biblatex citation style] +[2014/08/15 v 2.9a biblatex citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -22,6 +22,7 @@ \providetoggle{cms@switchdates} \providetoggle{cms@los} \providetoggle{cms@nodates} +\providetoggle{cms@datedash} \providetoggle{cms@url}% These are for the field-exclusion options \providetoggle{cms@doi} @@ -161,6 +162,10 @@ {\ExecuteBibliographyOptions{labeldate=true}}% {\ExecuteBibliographyOptions{labelyear=true}}% +\@ifpackagelater{biblatex}{2014/02/20}% For biblatex 2.9 ff. +{\global\toggletrue{cms@datedash}}% +{\global\togglefalse{cms@datedash}}% + \DeclareDataInheritance{collection}{suppcollection}{% \inherit{title}{title} \inherit{subtitle}{subtitle} @@ -623,7 +628,11 @@ \printfield{extrayear}}% \iffieldundef{urlendyear}% {}% - {\iffieldequalstr{urlendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{urlendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}% {\printfield{labelyear}% @@ -633,7 +642,11 @@ \printfield{extrayear}}% \iffieldundef{origendyear}% {}% - {\iffieldequalstr{origendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{origendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}} {\printfield{labelyear}% @@ -643,7 +656,11 @@ \printfield{extrayear}}% \iffieldundef{eventendyear}% {}% - {\iffieldequalstr{eventendyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{eventendyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}} {\printfield{labelyear}% @@ -653,7 +670,11 @@ \printfield{extrayear}}% \iffieldundef{endyear}% DATE FIX {}% - {\iffieldequalstr{endyear}{}% + {\ifboolexpr{ + test {\iffieldequalstr{endyear}{}}% + and + not togl {cms@datedash}% + } {\mbox{\bibdatedash}}% {}}}}}} 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 a9f4d864a7d..ee20a01d713 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx @@ -1,10 +1,10 @@ -% $Id: chicago-notes.bbx,v 0.9.7.50 2013/10/29 12:32:21 dfussner Exp $ +% $Id: chicago-notes.bbx,v 0.9.7.62 2014/08/15 09:27:26 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. -\ProvidesFile{chicago-notes.bbx}[2013/10/29 v 2.8 biblatex bibliography style] +\ProvidesFile{chicago-notes.bbx}[2014/08/15 v 2.9a biblatex bibliography style] %%%% Initialize and format bibliography and los %%%% @@ -22,10 +22,23 @@ {\endlist} {\item} -\defbibenvironment{shorthands} +\defbibenvironment{shorthand}% {\list - {\printfield[shorthandwidth]{shorthand}}% - {\setlength{\labelwidth}{\shorthandwidth}% + {\printfield[shorthandwidth]{shorthand}}% + {\setlength{\labelwidth}{\shorthandwidth}% + \setlength{\leftmargin}{\labelwidth}% + \setlength{\labelsep}{\biblabelsep}% + \addtolength{\leftmargin}{\labelsep}% + \setlength{\itemsep}{\lositemsep}% + \setlength{\parsep}{\bibparsep}% + \renewcommand*{\makelabel}[1]{##1\hss}}} + {\endlist} + {\item} + +\defbibenvironment{shorthands}% For biblatex < 2.9 + {\list + {\printfield[shorthandwidth]{shorthand}}% + {\setlength{\labelwidth}{\shorthandwidth}% \setlength{\leftmargin}{\labelwidth}% \setlength{\labelsep}{\biblabelsep}% \addtolength{\leftmargin}{\labelsep}% @@ -75,16 +88,22 @@ {\toggletrue{cms@reprint}}% {\togglefalse{cms@reprint}}% \ifboolexpr{% - test {\iffieldundef{origyear}} + test {\iffieldundef{origyear}}% or - test {\iffieldundef{year}} + test {\iffieldundef{year}}% or - not test {\iffieldint{year}} + not test {\iffieldint{year}}% or - togl {cms@switchdates} + not test {\iffieldint{origyear}}% + or + togl {cms@switchdates}% }% {}% - {\iffieldundef{endyear}% + {\ifboolexpr{% Needed for open-ended ranges + test {\iffieldundef{endyear}}% + or + not test {\iffieldnum{endyear}}% + }% {\ifthenelse{\thefield{origyear}>\thefield{year}}% {\toggletrue{cms@switchdates}}% {}}% @@ -97,16 +116,22 @@ {\toggletrue{cms@reprint}}% {\togglefalse{cms@reprint}}% \ifboolexpr{% - test {\iffieldundef{origyear}} + test {\iffieldundef{origyear}}% + or + test {\iffieldundef{year}}% or - test {\iffieldundef{year}} + not test {\iffieldint{year}}% or - not test {\iffieldint{year}} + not test {\iffieldint{origyear}}% or - togl {cms@switchdates} + togl {cms@switchdates}% }% {}% - {\iffieldundef{endyear}% + {\ifboolexpr{% Needed for open-ended ranges + test {\iffieldundef{endyear}}% + or + not test {\iffieldnum{endyear}}% + }% {\ifthenelse{\thefield{origyear}>\thefield{year}}% {\toggletrue{cms@switchdates}}% {}}% @@ -159,9 +184,9 @@ {\addlowpenspace\mkbibnameaffix{#4}\isdot}% {\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot% \ifboolexpr{ - test{\ifnumless{\value{listcount}}{\value{listtotal}}} + test{\ifnumless{\value{listcount}}{\value{listtotal}}}% and - test{\ifnumless{\value{listcount}}{\value{maxnames}}} + test{\ifnumless{\value{listcount}}{\value{maxnames}}}% } {\addcomma}% {}}}% @@ -243,7 +268,7 @@ \newbibmacro*{justauthor}{% \ifnameundef{author} - {\let\bbx@lasthash\undefined} + {\iftoggle{cms@origcite}{}{\let\bbx@lasthash\undefined}}% {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT \iffirstonpage} {\iffieldundef{nameaddon}% @@ -337,9 +362,9 @@ \newbibmacro*{compiler}{% \ifboolexpr{ - test {\ifnameundef{namec}} + test {\ifnameundef{namec}}% or - not togl {cms@usecompiler} + not togl {cms@usecompiler}% }% {\let\bbx@lasthash\undefined} {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT @@ -357,14 +382,32 @@ %%%% Drivers for Bibliography entries and Shorthands %%%% -\DeclareBibliographyDriver{shorthands}{% +\DeclareBibliographyDriver{shorthand}{% \iftoggle{cms@fullshhand}% {\usedriver{\frenchspacing}% {\thefield{entrytype}}% \finentry}% {\ifnameundef{labelname}% {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT% - \ifentrytype{periodical}}% + \ifentrytype{periodical}}% + {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}% + \newcunit}}% + {\ifentrytype{manual}% + {\printtext[bibhyperref]{\printlist{organization}\newcunit}}% + {}}}% + {\usebibmacro{author/editor}% + \setunit{\addcomma\space}}% + \printfield[lostitle]{title}% + \finentry}} + +\DeclareBibliographyDriver{shorthands}{% For biblatex < 2.9 + \iftoggle{cms@fullshhand}% + {\usedriver{\frenchspacing}% + {\thefield{entrytype}}% + \finentry}% + {\ifnameundef{labelname}% + {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT% + \ifentrytype{periodical}}% {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}% \newcunit}}% {\ifentrytype{manual}% @@ -619,15 +662,31 @@ \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \bookbibxrefcite{\thefield{xref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \bookbibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{bookinbook}{% @@ -694,15 +753,31 @@ \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \bookbibxrefcite{\thefield{xref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \bookbibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{booklet}{% @@ -780,15 +855,31 @@ \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \bookbibxrefcite{\thefield{xref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \bookbibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{customc}{% @@ -891,17 +982,33 @@ \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \bibxrefcite{\thefield{xref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\newunit}% \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \bibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{incollection}{% @@ -960,17 +1067,33 @@ \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \bibxrefcite{\thefield{xref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \bibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{inproceedings}{% @@ -1020,17 +1143,33 @@ \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \bibxrefcite{\thefield{xref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \bibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{inreference}{% @@ -1146,21 +1285,33 @@ \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% -{\ifpunctmark{*}% Attempt to fix issues with n.d. Changed for 0.9. - {\setunit{\nopunct\addspace\bibsentence}}% - {}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\newunit}% \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \bibxrefcite{\thefield{xref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}}% -{\ifpunctmark{*}% Likewise. - {\setunit{\nopunct\addspace\bibsentence}}% - {}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\newunit}% \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \bibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{manual}{% @@ -1517,15 +1668,31 @@ \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \bookbibxrefcite{\thefield{xref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \bookbibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{reference}{% @@ -2010,11 +2177,11 @@ \newbibmacro*{journal+issue+year+pages}{% \usebibmacro{cjournal+ser+vol+num}% \ifboolexpr{% 16th ed. - test {\iffieldundef{issue}} + test {\iffieldundef{issue}}% and - test {\iffieldundef{year}} + test {\iffieldundef{year}}% and - not togl {cms@switchdates} + not togl {cms@switchdates}% }% {\iffieldundef{number}% {\iffieldundef{bookpagination}% @@ -2022,24 +2189,32 @@ {\setunit{\addcolon\addspace}}% \printfield{pages}}% {\newcunit\printfield{pages}}}% - {\setunit{\addspace}% + {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{number}}% 16th ed. + {\newcunit% + \iffieldundef{issue} + {\usebibmacro{number+or+month}}% + {\printfield{issue}% + \setunit{\addspace}% + \usebibmacro{cmsyear}}% + \newcunit\printfield{pages}}% + {\setunit{\addspace}% \printtext[parens]{% \iffieldundef{issue} {\usebibmacro{number+or+month}}% {\printfield{issue}% \setunit{\addspace}% \usebibmacro{cmsyear}}}% - \setunit{\addcolon\addspace} - \printfield{pages}}} + \setunit{\addcolon\addspace}% + \printfield{pages}}}} \newbibmacro*{periodical+issue+year+pages}{% \usebibmacro{cperiodical+ser+vol+num}% \ifboolexpr{% 16th ed. - test {\iffieldundef{issue}} + test {\iffieldundef{issue}}% and - test {\iffieldundef{year}} + test {\iffieldundef{year}}% and - not togl {cms@switchdates} + not togl {cms@switchdates}% }% {\iffieldundef{number}% {\iffieldundef{bookpagination}% @@ -2047,15 +2222,23 @@ {\setunit{\addcolon\addspace}}% \printfield{pages}}% {\newcunit\printfield{pages}}}% - {\setunit{\addspace}% + {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{number}}% 16th ed. + {\newcunit% + \iffieldundef{issue} + {\usebibmacro{number+or+month}}% + {\printfield{issue}% + \setunit{\addspace}% + \usebibmacro{cmsyear}}% + \newcunit\printfield{pages}}% + {\setunit{\addspace}% \printtext[parens]{% \iffieldundef{issue} {\usebibmacro{number+or+month}}% {\printfield{issue}% \setunit{\addspace}% \usebibmacro{cmsyear}}}% - \setunit{\addcolon\addspace} - \printfield{pages}}} + \setunit{\addcolon\addspace}% + \printfield{pages}}}} \newbibmacro*{bycompiler}{% \ifnameundef{namec} 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 4f4cc556a58..83013a2a7f3 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.95 2014/01/29 11:26:57 dfussner Exp $ +% $Id: chicago-notes.cbx,v 0.9.7.112 2014/08/15 09:27:37 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/01/29 v 2.8a biblatex citation style] +\ProvidesFile{chicago-notes.cbx}[2014/08/15 v 2.9a biblatex citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -27,8 +27,12 @@ \providetoggle{cms@bookseries} \providetoggle{cms@notefield} \providetoggle{cms@addendum} +\providetoggle{cms@comprange} +\providetoggle{cms@modpostnote} +\providetoggle{cms@crspace} \providetoggle{cms@headlessnote} +\providetoggle{cms@origcite} \providetoggle{cms@fullnote} \providetoggle{cms@shortnote} \providetoggle{cms@allshort} @@ -37,6 +41,7 @@ \providetoggle{cms@shorthandibid} \providetoggle{cms@printshhand} \providetoggle{cms@fullshhand} +\providetoggle{cms@inheritshhand} \providetoggle{cms@origpublished} \providetoggle{cms@loccit} \providetoggle{cms@annotation} @@ -67,6 +72,8 @@ or not test {\iffieldint{year}}% or + not test {\iffieldint{origyear}}% + or togl {cms@switchdates}% }% {}% @@ -97,6 +104,34 @@ \DeclareBibliographyOption{shorthandfull}[true]{% \settoggle{cms@fullshhand}{#1}} +\DeclareBibliographyOption{inheritshorthand}[true]{% + \settoggle{cms@inheritshhand}{#1} + \iftoggle{cms@inheritshhand}% + {\DeclareDataInheritance{*}{*}{% + \inherit{shorthand}{shorthand} + \inherit{shorthandintro}{shorthandintro} + }}% + {}} + +\DeclareBibliographyOption{compresspages}[true]{% + \ifcsdef{cms@opt@crange@#1}% + {\csuse{cms@opt@crange@#1}}% + {\blx@err@invopt{compresspages=#1}{}}}% +\def\cms@opt@crange@true{% + \global\toggletrue{cms@comprange}% + \setcounter{mincomprange}{100}% + \setcounter{mincompwidth}{10}% +}% +\def\cms@opt@crange@false{}% + +\DeclareBibliographyOption{postnotepunct}[true]{% + \ifcsdef{cms@opt@ppunct@#1}% + {\csuse{cms@opt@ppunct@#1}}% + {\blx@err@invopt{postnotepunct=#1}{}}}% +\def\cms@opt@ppunct@true{% + \global\toggletrue{cms@modpostnote}}% +\def\cms@opt@ppunct@false{}% + \DeclareBibliographyOption{usecompiler}[true]{% \settoggle{cms@usecompiler}{#1}} @@ -368,7 +403,7 @@ \ifboolexpr{% togl {cms@allshort}% or - test {\ifbibliography} + test {\ifbibliography}% }% {\printtext[bibhyperref]{% \printfield[citetitle]{labeltitle}}}% @@ -394,16 +429,20 @@ \printfield{shorthandintro}}}} \newbibmacro*{cite:ibid}{% - \iftoggle{cms@noibid} + \ifboolexpr{% + togl {cms@noibid}% + or + test {\ifbibliography}% Needed for inheritshorthand option + }% {\global\toggletrue{cms@shortnote}% \global\togglefalse{cms@fullnote}% \usebibmacro{cite:short}% \usebibmacro{cite:save}}% {\iftoggle{cms@allshort}% {\printtext[bibhyperref]{% - \bibstring[\mkibid]{ibidem}}} + \bibstring[\mkibid]{ibidem}}}% {\printtext[cmshyperlink]{% - \bibstring[\mkibid]{ibidem}}} + \bibstring[\mkibid]{ibidem}}}% \ifboolexpr{% test {\ifloccit}% or @@ -411,6 +450,8 @@ test {\ifciteibid}% and test {\iffieldequalcs{postnote}{cms@pnsaved}}% + and + not test {\ifdefvoid{\blx@loccittracker}}% Package option=false ) }% {\global\toggletrue{cms@loccit}}% @@ -497,8 +538,8 @@ {}{}{}{}% \DeclareCiteCommand{\bibxrefcite} - {}%\usebibmacro{clearalmostall}} (?) - {\usebibmacro{cms-in:}% + {\usebibmacro{backref+check}}% So cites in biblio don't turn up + {\usebibmacro{cms-in:}% in backref list \ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT% \(\ifentrytype{collection}\OR\ifentrytype{proceedings}\OR% \ifentrytype{mvcollection}\OR\ifentrytype{mvproceedings}\)}% @@ -508,13 +549,19 @@ {}% \toggletrue{cms@shortnote}% \togglefalse{cms@fullnote}% - \usebibmacro{cite:short}} + \ifboolexpr{ + togl {cms@inheritshhand}% + and + not test {\iffieldundef{shorthand}}% + } + {\usebibmacro{cite}}% + {\usebibmacro{cite:short}}}% Would {cite} be better? {} {\usebibmacro{crossref:volume+postnote}}% Volume fix \DeclareCiteCommand{\bookbibxrefcite} - {}%\usebibmacro{clearalmostall}} (?) - {\iffieldequals{fullhash}{\bbx@lasthash}% + {\usebibmacro{backref+check}}% So cites in biblio don't turn up + {\iffieldequals{fullhash}{\bbx@lasthash}% in backref list {\ifthenelse{\ifentrytype{collection}\OR% \ifentrytype{proceedings}\OR\ifentrytype{mvcollection}\OR% \ifentrytype{mvproceedings}}% @@ -528,8 +575,14 @@ \toggletrue{cms@shortnote}% \togglefalse{cms@fullnote}% \usebibmacro{bibxref-in:}% - \usebibmacro{cite:short}} - {} + \ifboolexpr{ + togl {cms@inheritshhand}% + and + not test {\iffieldundef{shorthand}}% + } + {\usebibmacro{cite}}% + {\usebibmacro{cite:short}}}% + {}% {\usebibmacro{crossref:volume+postnote}}% Volume fix \DeclareCiteCommand*{\cite} @@ -587,21 +640,24 @@ {} \DeclareCiteCommand{\origfullcite} - {\ifhyperref% + {\usebibmacro{backref+check}% + \ifhyperref% {\hypertarget{cite.\the\c@refsection @\abx@field@entrykey}{}}% {}% \nopunct\unspace}% Put \nopunct and \unspace here for 0.8e. {\usedriver {\DeclareNameAlias{sortname}{default}\clearfield{postnote}% - \clearname{author}\clearfield{userf}\clearfield{shorthand}% + \usebibmacro{clearorigin}\clearfield{userf}\clearfield{shorthand}% \toggletrue{cms@fullnote}\toggletrue{cms@headlessnote}% \frenchspacing}% - {cite:\thefield{entrytype}}}% + {cite:\thefield{entrytype}}% + \iflistundef{pageref}{}{\newunit\usebibmacro{pageref}}}% {\multicitedelim}% {\finentry}% Helps with annotated bibliographies (?) \DeclareCiteCommand{\origpublcite}% Similar to above, w/o title. - {\ifhyperref% + {\usebibmacro{backref+check}% + \ifhyperref% {\hypertarget{cite.\the\c@refsection @\abx@field@entrykey}{}}% {}% \nopunct\unspace}% Put \nopunct and \unspace here for 0.8e. @@ -610,7 +666,8 @@ \usebibmacro{clearpublin}\clearfield{shorthand}% \toggletrue{cms@fullnote}\toggletrue{cms@headlessnote}% \toggletrue{cms@origpublished}\frenchspacing}% - {cite:\thefield{entrytype}}}% + {cite:\thefield{entrytype}}% + \iflistundef{pageref}{}{\newunit\usebibmacro{pageref}}}% {\multicitedelim}% {\finentry} @@ -664,9 +721,9 @@ {\usebibmacro{prenote}}%\usebibmacro{hlcprenote}} {\usebibmacro{citeindex}% \ifboolexpr{% - test {\ifciteseen} + test {\ifciteseen}% or - togl {cms@allshort} + togl {cms@allshort}% }% {\usebibmacro{cite:short}} {\toggletrue{cms@headlessnote}% @@ -767,8 +824,11 @@ \protected@xappto\cbx@footcite@args{% [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}% \iflastcitekey - {\protected@xappto\cbx@textcite@args{\thefield{postpunct}}% Switch - \protected@xappto\cbx@footcite@args{\nopunct}}% these two? + {\iffootnote + {\protected@xappto\cbx@textcite@args{\nopunct}% + \protected@xappto\cbx@footcite@args{\thefield{postpunct}}}% + {\protected@xappto\cbx@textcite@args{\thefield{postpunct}}% Switch + \protected@xappto\cbx@footcite@args{\nopunct}}}% these two? {}} {}} {} @@ -907,7 +967,6 @@ \usebibmacro{institution+organization}% \newcunit\newblock \printlist{location}% - \newcunit\newblock \usebibmacro{caddendum}% \usebibmacro{fullpostnote}% \newcunit\newblock @@ -1042,7 +1101,6 @@ \iftoggle{cms@bookpages}% {}% {\clearfield{pages}}% - \newcunit\newblock \usebibmacro{caddendum}% \usebibmacro{volfullpostnote}% \newcunit\newblock @@ -1059,14 +1117,18 @@ \usebibmacro{pageref}% \usebibmacro{finentry}% \usebibmacro{book:xref+finentry}}% - {\ifterm{\addspace\bibsentence}% - {\addcomma\addspace}% + {\ifpunctmark{.}% This seems to work. + {\ifbibliography% + {\setunit{\bibsentence}}{\addspace\bibsentence}}% + {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!? \usebibmacro{xrefprenote}% Volume fix \bookbibxrefcite{\thefield{xref}}% Removed \addspace from each. \usebibmacro{xrefpostnote}% \usebibmacro{finentry}}}% - {\ifterm{\addspace\bibsentence}% - {\addcomma\addspace}% + {\ifpunctmark{.}% This seems to work. + {\ifbibliography% + {\setunit{\bibsentence}}{\addspace\bibsentence}}% + {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!? \usebibmacro{xrefprenote}% Volume fix \bookbibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% @@ -1116,7 +1178,6 @@ \usebibmacro{cnotefield}% \newcunit\newblock \usebibmacro{cpubl+loc+year}% - \newcunit\newblock \usebibmacro{caddendum}% \usebibmacro{volfullpostnote}% \newcunit\newblock @@ -1131,14 +1192,18 @@ \usebibmacro{pageref}% \usebibmacro{finentry}% \usebibmacro{book:xref+finentry}}% - {\ifterm{\addspace\bibsentence}% - {\addcomma\addspace}% + {\ifpunctmark{.}% This seems to work. + {\ifbibliography% + {\setunit{\bibsentence}}{\addspace\bibsentence}}% + {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!? \usebibmacro{xrefprenote}% Volume fix \bookbibxrefcite{\thefield{xref}}% Removed \addspace from each. \usebibmacro{xrefpostnote}% \usebibmacro{finentry}}}% - {\ifterm{\addspace\bibsentence}% - {\addcomma\addspace}% + {\ifpunctmark{.}% This seems to work. + {\ifbibliography% + {\setunit{\bibsentence}}{\addspace\bibsentence}}% + {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!? \usebibmacro{xrefprenote}% Volume fix \bookbibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% @@ -1158,7 +1223,6 @@ \setunit{\addspace}\newblock% \printtext[parens]{% \usebibmacro{howpubl+loc+year}}% - \newcunit\newblock \usebibmacro{caddendum}% \usebibmacro{fullpostnote}% \newcunit\newblock @@ -1208,7 +1272,6 @@ \usebibmacro{cnotefield}% \newcunit\newblock \usebibmacro{cpubl+loc+year}% - \newcunit\newblock \usebibmacro{caddendum}% \usebibmacro{volfullpostnote}% \newcunit\newblock @@ -1223,14 +1286,18 @@ \usebibmacro{pageref}% \usebibmacro{finentry}% \usebibmacro{book:xref+finentry}}% - {\ifterm{\addspace\bibsentence}% - {\addcomma\addspace}% + {\ifpunctmark{.}% This seems to work. + {\ifbibliography% + {\setunit{\bibsentence}}{\addspace\bibsentence}}% + {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!? \usebibmacro{xrefprenote}% Volume fix \bookbibxrefcite{\thefield{xref}}% Removed \addspace from each. \usebibmacro{xrefpostnote}% \usebibmacro{finentry}}}% - {\ifterm{\addspace\bibsentence}% - {\addcomma\addspace}% + {\ifpunctmark{.}% This seems to work. Only with Vol? + {\ifbibliography% + {\setunit{\bibsentence}}{\addspace\bibsentence}}% + {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!? \usebibmacro{xrefprenote}% Volume fix \bookbibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% @@ -1270,7 +1337,6 @@ \usebibmacro{institution+organization}% \newcunit\newblock \printlist{location}% - \newcunit\newblock \usebibmacro{caddendum}% \usebibmacro{fullpostnote}% \newcunit\newblock @@ -1326,7 +1392,6 @@ \usebibmacro{cnotefield}% \newcunit\newblock \usebibmacro{cpubl+loc+year}% - \newcunit\newblock \usebibmacro{caddendum}% \usebibmacro{volfullpostnote}% \newcunit\newblock @@ -1341,21 +1406,15 @@ \usebibmacro{pageref}% \usebibmacro{finentry}% \usebibmacro{cite:xref+finentry}}% -{\ifterm{\iffieldundef{chapter}% New test needed to cope with - {\addspace\bibsentence}% new chapter citing system. - {\setunit{\addspace\bibsentence}}}% All altered for 0.9c. - {\addcomma\addspace}% Perhaps need to alter it back +{\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed. \usebibmacro{xrefprenote}% Volume fix - \usebibmacro{chapincoll}% + \usebibmacro{xrefchapincoll}% \bibxrefcite{\thefield{xref}}% Removed \addspace from each. \usebibmacro{xrefpostnote}% \usebibmacro{finentry}}}% - {\ifterm{\iffieldundef{chapter}% New test needed to cope with - {\addspace\bibsentence}% new chapter citing system. - {\setunit{\addspace\bibsentence}}}% - {\addcomma\addspace}% + {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed. \usebibmacro{xrefprenote}% Volume fix - \usebibmacro{chapincoll}% + \usebibmacro{xrefchapincoll}% \bibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% \usebibmacro{finentry}}} @@ -1405,7 +1464,6 @@ \usebibmacro{cnotefield}% \newcunit\newblock \usebibmacro{cpubl+loc+year}% - \newcunit\newblock \usebibmacro{caddendum}% \usebibmacro{volfullpostnote}% \newcunit\newblock @@ -1420,21 +1478,15 @@ \usebibmacro{pageref}% \usebibmacro{finentry}% \usebibmacro{cite:xref+finentry}}% - {\ifterm{\iffieldundef{chapter}% New test needed to cope with - {\addspace\bibsentence}% new chapter citing system. - {\setunit{\addspace\bibsentence}}}% All altered for 0.9c. - {\addcomma\addspace}% Perhaps need to alter it back + {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed. \usebibmacro{xrefprenote}% Volume fix - \usebibmacro{chapincoll}% + \usebibmacro{xrefchapincoll}% \bibxrefcite{\thefield{xref}}% Removed \addspace from each. \usebibmacro{xrefpostnote}% \usebibmacro{finentry}}}% - {\ifterm{\iffieldundef{chapter}% New test needed to cope with - {\addspace\bibsentence}% new chapter citing system. - {\setunit{\addspace\bibsentence}}}% - {\addcomma\addspace}% + {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed. \usebibmacro{xrefprenote}% Volume fix - \usebibmacro{chapincoll}% + \usebibmacro{xrefchapincoll}% \bibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% \usebibmacro{finentry}}} @@ -1478,7 +1530,6 @@ \setunit{\addspace}\newblock% \printtext[parens]{% \usebibmacro{org+publ+loc+year}}% - \newcunit\newblock \usebibmacro{caddendum}% \usebibmacro{volfullpostnote}% \newcunit\newblock @@ -1493,21 +1544,15 @@ \usebibmacro{pageref}% \usebibmacro{finentry}% \usebibmacro{cite:xref+finentry}}% - {\ifterm{\iffieldundef{chapter}% New test needed to cope with - {\addspace\bibsentence}% new chapter citing system. - {\setunit{\addspace\bibsentence}}}% See incollection - {\addcomma\addspace}% + {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed. \usebibmacro{xrefprenote}% Volume fix - \usebibmacro{chapincoll}% + \usebibmacro{xrefchapincoll}% \bibxrefcite{\thefield{xref}}% \usebibmacro{xrefpostnote}% \usebibmacro{finentry}}}% - {\ifterm{\iffieldundef{chapter}% New test needed to cope with - {\addspace\bibsentence}% new chapter citing system. - {\setunit{\addspace\bibsentence}}}% - {\addcomma\addspace}% + {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed. \usebibmacro{xrefprenote}% Volume fix - \usebibmacro{chapincoll}% + \usebibmacro{xrefchapincoll}% \bibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% \usebibmacro{finentry}}} @@ -1540,7 +1585,6 @@ \usebibmacro{cnotefield}% \newcunit\newblock \usebibmacro{cpubl+loc+year}% - \newcunit\newblock \usebibmacro{caddendum}% \usebibmacro{inreffullpostnote}% \newcunit\newblock%setunit{\addspace}% 16th ed @@ -1607,7 +1651,6 @@ \usebibmacro{cnotefield}% \newcunit\newblock \usebibmacro{cpubletter+loc+year}% - \newcunit\newblock \usebibmacro{caddendum}% \usebibmacro{volfullpostnote}% \newcunit\newblock @@ -1622,21 +1665,15 @@ \usebibmacro{pageref}% \usebibmacro{finentry}% \usebibmacro{cite:xref+finentry}}% - {\ifterm{\iffieldundef{chapter}% New test needed to cope with - {\addspace\bibsentence}% new chapter citing system. - {\setunit{\addspace\bibsentence}}}% - {\addcomma\addspace}% + {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed. \usebibmacro{xrefprenote}% Volume fix - \usebibmacro{chapincoll}% + \usebibmacro{xrefchapincoll}% \bibxrefcite{\thefield{xref}}% \usebibmacro{xrefpostnote}% \usebibmacro{finentry}}}% - {\ifterm{\iffieldundef{chapter}% New test needed to cope with - {\addspace\bibsentence}% new chapter citing system. - {\setunit{\addspace\bibsentence}}}% - {\addcomma\addspace}% + {\ifpunctmark{.}{\setunit{\addspace\bibsentence}}{\newcunit}% 16th ed. \usebibmacro{xrefprenote}% Volume fix - \usebibmacro{chapincoll}% + \usebibmacro{xrefchapincoll}% \bibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% \usebibmacro{finentry}}} @@ -1661,7 +1698,6 @@ \setunit{\addspace}\newblock% \printtext[parens]{% \usebibmacro{org+publ+loc+year}}% - \newcunit\newblock \usebibmacro{caddendum}% \usebibmacro{fullpostnote}% \newcunit\newblock @@ -1713,7 +1749,6 @@ {\newcunit\newblock \usebibmacro{date}}% {}% - \newcunit\newblock \usebibmacro{caddendum}% \usebibmacro{fullpostnote}% \newcunit\newblock @@ -1889,7 +1924,6 @@ \setunit{\addcomma\addspace\bibstring{and}% \addspace\bibstring{patentissued}\addspace}% \usebibmacro{date}}% - \newcunit% \usebibmacro{caddendum}}% \usebibmacro{fullpostnote}% \newcunit\newblock @@ -1995,7 +2029,6 @@ \setunit{\addspace}\newblock% \printtext[parens]{% \usebibmacro{org+publ+loc+year}}% - \newcunit\newblock \usebibmacro{caddendum}% \usebibmacro{volfullpostnote}% \newcunit\newblock @@ -2010,14 +2043,18 @@ \usebibmacro{pageref}% \usebibmacro{finentry}% \usebibmacro{book:xref+finentry}}% - {\ifterm{\addspace\bibsentence}% - {\addcomma\addspace}% + {\ifpunctmark{.}% This seems to work. + {\ifbibliography% + {\setunit{\bibsentence}}{\addspace\bibsentence}}% + {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!? \usebibmacro{xrefprenote}% Volume fix \bookbibxrefcite{\thefield{xref}}% Removed \addspace from each. \usebibmacro{xrefpostnote}% \usebibmacro{finentry}}}% - {\ifterm{\addspace\bibsentence}% - {\addcomma\addspace}% + {\ifpunctmark{.}% This seems to work. + {\ifbibliography% + {\setunit{\bibsentence}}{\addspace\bibsentence}}% + {\ifbibliography{\unspace}{\addcomma\addspace}}% ?!? \usebibmacro{xrefprenote}% Volume fix \bookbibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% @@ -2051,7 +2088,6 @@ \usebibmacro{cnotefield}% \newcunit\newblock \usebibmacro{cpubl+loc+year}% - \newcunit\newblock \usebibmacro{caddendum}% \usebibmacro{volfullpostnote}% \newcunit\newblock @@ -2086,7 +2122,6 @@ \setunit{\addspace}\newblock% \printtext[parens]{% \usebibmacro{inst+loc+year}}% - \newcunit\newblock \usebibmacro{caddendum}% \usebibmacro{fullpostnote}% \newcunit\newblock @@ -2179,7 +2214,6 @@ \newcunit\newblock \usebibmacro{cpubl+loc+year}% \clearfield{pages}% ?? For 16th ed. - \newcunit\newblock \usebibmacro{caddendum}% \usebibmacro{volfullpostnote}% \newcunit\newblock @@ -2214,7 +2248,6 @@ \setunit{\addspace}% \printtext[parens]{% \usebibmacro{type+inst+year}}% - \newcunit\newblock \usebibmacro{caddendum}% \usebibmacro{fullpostnote}% \newcunit\newblock @@ -2247,7 +2280,6 @@ \printlist{location}% \newcunit\newblock \usebibmacro{date}}% - \newcunit\newblock \usebibmacro{caddendum}% \usebibmacro{fullpostnote}% \newcunit\newblock @@ -2429,20 +2461,43 @@ \DeclareFieldFormat{prenote}{\ifcapital{\MakeCapital{#1}}{#1}} -\DeclareFieldFormat{postnote}{% Removed \isdots -- required - \iffieldundef{pagination}% elsewhere also? - {#1}% - {\mkpageprefix[pagination]{#1}}} +\iftoggle{cms@comprange}% Audrey Boruvka's code from StackExchange +{\patchcmd{\blx@comprange@check}% + {\blx@comprange@comp{#1}{#2}}% + {\blx@tempcnta=#1% + \divide\blx@tempcnta100% + \multiply\blx@tempcnta100% + \ifnumequal{\blx@tempcnta}{#1}% + {\blx@range@out@value{#1\bibrangedash#2}}% + {\blx@comprange@comp{#1}{#2}}}% + {}{}}{}% + +\DeclareFieldFormat{postnote}{% Changed for page compression option + \iftoggle{cms@comprange}% + {\iffieldundef{pagination}% + {\mkcomprange{#1}}% + {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}% + {\iffieldundef{pagination}% + {#1}% + {\mkpageprefix[pagination]{#1}}}}% \DeclareFieldFormat[inreference]{postnote}{% - \iffieldundef{pagination}% - {s\adddot v\adddot\addspace\mkbibquote{#1}} - {\mkpageprefix[pagination]{#1}}}% Removed \isdots here, also. + \iftoggle{cms@comprange}% + {\iffieldundef{pagination}% + {s\adddot v\adddot\addspace\mkbibquote{#1}}% + {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}% + {\iffieldundef{pagination}% + {s\adddot v\adddot\addspace\mkbibquote{#1}}% + {\mkpageprefix[pagination]{#1}}}}% \DeclareFieldFormat{pages}{% - \iffieldundef{bookpagination}% - {#1\isdot}% - {\mkpageprefix[bookpagination]{#1}}} + \iftoggle{cms@comprange}% + {\iffieldundef{bookpagination}% + {\mkcomprange{#1}\isdot}% + {\mkcomprange[{\mkpageprefix[bookpagination]}]{#1}}}% + {\iffieldundef{bookpagination}% + {#1\isdot}% + {\mkpageprefix[bookpagination]{#1}}}}% \DeclareFieldFormat{edlang}{% \ifbibstring{#1} @@ -2653,9 +2708,9 @@ \DeclareFieldFormat{journum}{% Revised for 0.9.5 \ifboolexpr{% - test {\ifnumerals{#1}} + test {\ifnumerals{#1}}% and - not test {\ifnumeral{#1}} + not test {\ifnumeral{#1}}% }% {\bibstring{numbers}\addspace #1}% {\bibstring{number}\addspace #1}} @@ -2715,7 +2770,7 @@ test {\ifentrytype{inproceedings}}% ) and - not togl {cms@citecrossref} + not togl {cms@citecrossref}% ) }% {\bibhyperlink{\thefield{xref}}{#1}}% @@ -2743,7 +2798,7 @@ test {\ifentrytype{inproceedings}}% ) and - not togl {cms@citecrossref} + not togl {cms@citecrossref}% ) }% {\bibhyperlink{\thefield{crossref}}{#1}}% @@ -2908,8 +2963,40 @@ {\addcomma\addspace}}% {\addcomma\addspace}}}% +\newcommand*{\postnotewrapper}{% + \iftoggle{cms@modpostnote}% + {\ifboolexpr{% + test {\iffieldstart{postnote}{,}}% + or + test {\iffieldstart{postnote}{\bibrangessep}}% + }% + {\addcomma}% w/ or w/o \addspace? + {\ifboolexpr{% + test {\iffieldstart{postnote}{;}}% + or + test {\iffieldstart{postnote}{:}}% + or + test {\iffieldstart{postnote}{.}}% + }% + {}{\postnotedelim}}}% + {\postnotedelim}}% + +\newrobustcmd*{\iffieldstart}[2]{% Philipp Lehman's code, from + \begingroup% comp.text.tex + \edef\@tempa{% + \long\def\noexpand\iffieldstart@i####1\detokenize{#2}####2}% + \@tempa\@nil{\endgroup\ifblank{##1}}% + \savefield*{#1}{\@tempa}% + \expandafter\iffieldstart@i\detokenize + \expandafter\expandafter\expandafter{% + \expandafter\@tempa\detokenize{#2}}\@nil} + \newcommand*{\editordelim}{% - \iffieldequalstr{editortype}{none}% + \ifboolexpr{% + test {\iffieldequalstr{editortype}{none}}% + and + not togl {cms@fullnote}% + }% {\addperiod\addspace}% {\addcomma\addspace}} @@ -3130,9 +3217,9 @@ {\iflistundef{organization}% {}% {\ifboolexpr{ - test {\iflistequals{organization}{\bbx@lasthash}} + test {\iflistequals{organization}{\bbx@lasthash}}% and - not test {\iffirstonpage} + not test {\iffirstonpage}% }% {\bibnamedash\addperiod\addspace}% {\printlist{organization}% @@ -3347,8 +3434,8 @@ \newbibmacro*{cms-in:}{% Fix for 0.9a compat. \iftoggle{cms@origpublished}% - {} - {\bibstring{in}% + {}% The following is needed for userf + crossref inside bib. + {\iftoggle{cms@crspace}{\addspace}{}\bibstring{in}% ?!? \setunit{\addspace}}} \newbibmacro*{bibxref-in:}{% @@ -3369,7 +3456,8 @@ \setunit{\addspace}% \bibstring{ofseries}% \setunit{\addspace}}% - {\usebibmacro{cms-in:}}}% + {\toggletrue{cms@crspace}\usebibmacro{cms-in:}% + \togglefalse{cms@crspace}}}% {\iffieldundef{part}% {\ifcsdef{cbx@incollpart}% {\restorefield{part}{\cbx@incollpart}\toggletrue{cms@xrefpart}}% @@ -3383,7 +3471,8 @@ \setunit{\addspace}% \bibstring{ofseries}% \setunit{\addspace}}% - {\usebibmacro{cms-in:}}}}% + {\toggletrue{cms@crspace}\usebibmacro{cms-in:}% + \togglefalse{cms@crspace}}}}% {\iffieldundef{part}% {\ifcsdef{cbx@incollpart}% {\restorefield{part}{\cbx@incollpart}\toggletrue{cms@xrefpart}}% @@ -3400,7 +3489,8 @@ \setunit{\addspace}% \bibstring{ofseries}% \setunit{\addspace}}% - {\usebibmacro{cms-in:}}}}% + {\toggletrue{cms@crspace}\usebibmacro{cms-in:}% + \togglefalse{cms@crspace}}}}% \newbibmacro*{chapincoll}{% \iffieldundef{chapter}% @@ -3408,6 +3498,12 @@ {\printfield{chapter}\addspace% \clearfield{chapter}}} +\newbibmacro*{xrefchapincoll}{% + \iffieldundef{chapter}% + {\printtext{\relax}} + {\printfield{chapter}\addspace% + \clearfield{chapter}}} + \newbibmacro*{chapinscore}{% \iffieldundef{chapter}% {\ifthenelse{\ifentrytype{music}% 16th ed. @@ -3419,8 +3515,12 @@ \clearfield{chapter}}} \newbibmacro*{caddendum}{% New macros for 16th ed. field exclusion - \iftoggle{cms@addendum}% - {\printfield{addendum}}% + \ifboolexpr{% + togl {cms@addendum}% + and + not test {\iffieldundef{addendum}}% + }% + {\newcunit\printfield{addendum}}% {}}% \newbibmacro*{cnotefield}{% @@ -3547,9 +3647,9 @@ \newbibmacro*{publ+loc+year}{% Revised for reprint \ifboolexpr{ - togl {cms@reprint} + togl {cms@reprint}% and - not test {\ifentrytype{video}} + not test {\ifentrytype{video}}% }% {\bibstring{reprint}% \newcunit}% @@ -3605,13 +3705,13 @@ \newbibmacro*{cpubl+loc+year}{% Revised for reprint \ifboolexpr{ - test {\iflistundef{location}} + test {\iflistundef{location}}% and - test {\iflistundef{publisher}} + test {\iflistundef{publisher}}% and - test {\iffieldundef{year}} + test {\iffieldundef{year}}% and - not togl {cms@reprint} + not togl {cms@reprint}% }% {}% {\setunit{\addspace}% @@ -3619,9 +3719,9 @@ \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printfield{origyear}% \setunit*{\addsemicolon\addspace}% \ifboolexpr{ - togl {cms@reprint} + togl {cms@reprint}% and - not test{\ifentrytype{video}} + not test{\ifentrytype{video}}% }% {\bibsstring{reprint}% \newcunit}% @@ -3636,11 +3736,11 @@ \newbibmacro*{cpubletter+loc+year}{% \ifboolexpr{ - test {\iflistundef{location}} + test {\iflistundef{location}}% and - test {\iflistundef{publisher}} + test {\iflistundef{publisher}}% and - test {\iffieldundef{year}} + test {\iffieldundef{year}}% }% {}% {\setunit{\addspace}% @@ -3703,11 +3803,11 @@ \newbibmacro*{cjournal+issue+year+pages}{% \usebibmacro{cjournal+ser+vol+num}% \ifboolexpr{% 16th ed. - test {\iffieldundef{issue}} + test {\iffieldundef{issue}}% and - test {\iffieldundef{year}} + test {\iffieldundef{year}}% and - not togl {cms@switchdates} + not togl {cms@switchdates}% }% {\iffieldundef{number}% {\ifthenelse{\iffieldundef{pagination}\AND% @@ -3715,22 +3815,30 @@ {\setunit{\postvolpunct}}% {\setunit{\addcolon\addspace}}}% {\addcomma\addspace}}% - {\setunit{\addspace}% + {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{number}}% 16th ed. + {\newcunit% + \iffieldundef{issue} + {\usebibmacro{number+or+month}}% + {\printfield{issue}% + \setunit{\addspace}% + \usebibmacro{cmsyear}}% + \addcomma\addspace}% + {\setunit{\addspace}% \printtext[parens]{% parens is the default here \iffieldundef{issue} {\usebibmacro{number+or+month}}% {\printfield{issue}% \setunit{\addspace}% - \usebibmacro{cmsyear}}}}} + \usebibmacro{cmsyear}}}}}} \newbibmacro*{cperiodical+issue+year+pages}{% For periodicals, \usebibmacro{cperiodical+ser+vol+num}% subtype article \ifboolexpr{% 16th ed. - test {\iffieldundef{issue}} + test {\iffieldundef{issue}}% and - test {\iffieldundef{year}} + test {\iffieldundef{year}}% and - not togl {cms@switchdates} + not togl {cms@switchdates}% }% {\iffieldundef{number}% {\ifthenelse{\iffieldundef{pagination}\AND% @@ -3738,13 +3846,21 @@ {\setunit{\postvolpunct}}% {\setunit{\addcolon\addspace}}}% {\addcomma\addspace}}% - {\setunit{\addspace}% + {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{number}}% 16th ed. + {\newcunit% + \iffieldundef{issue} + {\usebibmacro{number+or+month}}% + {\printfield{issue}% + \setunit{\addspace}% + \usebibmacro{cmsyear}}% + \addcomma\addspace}% + {\setunit{\addspace}% \printtext[parens]{% parens is the default here \iffieldundef{issue} {\usebibmacro{number+or+month}}% {\printfield{issue}% \setunit{\addspace}% - \usebibmacro{cmsyear}}}}} + \usebibmacro{cmsyear}}}}}} \newbibmacro*{letter+date}{% New for 0.9 \iflistundef{origlocation}% @@ -3828,7 +3944,7 @@ or test {\iffieldundef{xref}}% or - test {\iffieldundef{maintitle}} + test {\iffieldundef{maintitle}}% or (( test {\iffieldundef{year}}% @@ -3867,14 +3983,14 @@ \newcommand*{\cms@datelong}{% Modified for 0.9 \iffieldundef{origmonth}% {\printfield{origyear}}% - {\printfield[letterday]{origday}\setunit{\nobreakspace}% + {\printfield[letterday]{origday}\setunit*{\nobreakspace}% Bug fix \mkbibmonth{\thefield{origmonth}}\setunit{\nobreakspace}% \printfield{origyear}}}% \newcommand*{\cms@datelongalt}{% Modified for 0.9 \iffieldundef{month}% {\printfield{year}}% - {\printfield[letterday]{day}\setunit{\nobreakspace}% + {\printfield[letterday]{day}\setunit*{\nobreakspace}% \mkbibmonth{\thefield{month}}\setunit{\nobreakspace}% \printfield{year}}}% @@ -3884,14 +4000,14 @@ {}% {\iffieldundef{month}% {\printfield{year}}% - {\printfield[letterday]{day}\setunit{\nobreakspace}% + {\printfield[letterday]{day}\setunit*{\nobreakspace}% \mkbibmonth{\thefield{month}}\setunit{\nobreakspace}% \printfield{year}}}}% {\iffieldundef{origyear}% {}% {\iffieldundef{origmonth}% {\printfield{origyear}}% - {\printfield[letterday]{origday}\setunit{\nobreakspace}% + {\printfield[letterday]{origday}\setunit*{\nobreakspace}% \mkbibmonth{\thefield{origmonth}}\setunit{\nobreakspace}% \printfield{origyear}}}}}% @@ -4061,6 +4177,11 @@ \newcunit \printfield{maintitleaddon}}}} +\newbibmacro*{backref+check}{% + \ifbibliography% + {\backtrackerfalse}% + {}} + \newbibmacro*{cite:postnote}{% \iftoggle{cms@loccit}% {}% @@ -4087,12 +4208,12 @@ \global\togglefalse{cms@shortnote}% \global\togglefalse{cms@fullnote}}} {\iffieldundef{shorthand} - {\postnotedelim% + {\postnotewrapper%delim% \usebibmacro{semel:postnote}% \global\togglefalse{cms@printshhand}% \global\togglefalse{cms@shortnote}% \global\togglefalse{cms@fullnote}} - {\postnotedelim% + {\postnotewrapper%delim% \usebibmacro{semel:postnote}% \usebibmacro{cms:shorthandintro}% \global\togglefalse{cms@printshhand}% @@ -4101,7 +4222,7 @@ {\iffieldundef{postnote}% {\global\togglefalse{cms@shortnote}% \global\togglefalse{cms@fullnote}} - {\postnotedelim% + {\postnotewrapper%delim% \usebibmacro{semel:postnote}% \global\togglefalse{cms@shortnote}% \global\togglefalse{cms@fullnote}}}}}% @@ -4115,7 +4236,7 @@ \printfield{pages}}}% {\postnotedelim% \printfield{chapter}}}% - {\postnotedelim% Don't need \ifbibliography test w/ following + {\postnotewrapper%delim% Don't need \ifbibliography test w/ following \usebibmacro{semel:postnote}}} \newbibmacro*{volfullpostnote}{% @@ -4348,7 +4469,7 @@ \printfield{pages}}}% {\postnotedelim% \printfield{chapter}}}% - {\postnotedelim% + {\postnotewrapper%delim% \usebibmacro{semel:postnote}}} \newbibmacro*{xrefprenote}{% @@ -4357,9 +4478,16 @@ \iffieldundef{part}{}{\savefield{part}{\cbx@incollpart}}% \iffieldundef{pagination}{}{\savefield{pagination}{\cbx@incollpgn}}% \iffieldundef{bookpagination}{}{\savefield{bookpagination}% - {\cbx@incollbkpgn}}} + {\cbx@incollbkpgn}}% The next line saves the child's backrefs + \iflistundef{pageref}{}{\savelist{pageref}{\cbx@incollpgref}}} \newbibmacro*{xrefpostnote}{% + \ifcsdef{cbx@incollpgref}% Here we print and clear the child's + {\restorelist{pageref}{\cbx@incollpgref}% backrefs + \newunit% + \usebibmacro{pageref}% + \global\let\cbx@incollpgref\undefined}% + {}% \togglefalse{cms@xrefvol}% \togglefalse{cms@xrefpart}% \global\togglefalse{cms@usedvol}% @@ -4380,9 +4508,9 @@ {\bibsentence}% Needed for Ibid to be capitalized. {\printfield{prenote}% \ifboolexpr{% - test {\ifciteseen} + test {\ifciteseen}% or - togl {cms@allshort} + togl {cms@allshort}% }% {\addspace}% {\nopunct}}}% Do we need \unspace here? @@ -4411,9 +4539,9 @@ {\printnames{labelname}\newcunit% \usebibmacro{transstrg}}% {\ifboolexpr{% - not test {\ifnameundef{namec}} + not test {\ifnameundef{namec}}% and - togl {cms@usecompiler} + togl {cms@usecompiler}% }% {\printnames[labelname]{namec}\newcunit% \usebibmacro{compilestrg}}% @@ -4431,9 +4559,9 @@ {\ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{translator}}% {\printnames{labelname}}% {\ifboolexpr{% - not test {\ifnameundef{namec}} + not test {\ifnameundef{namec}}% and - togl {cms@usecompiler} + togl {cms@usecompiler}% }% {\printnames[labelname]{namec}}% {}}}}}}}% @@ -4470,6 +4598,16 @@ \noinherit{indexsorttitle} } +\DeclareDataInheritance{book}{incollection}{% + \inherit{title}{booktitle} + \inherit{subtitle}{booksubtitle} + \inherit{titleaddon}{booktitleaddon} + \noinherit{shorttitle} + \noinherit{sorttitle} + \noinherit{indextitle} + \noinherit{indexsorttitle} +} + \DeclareDataInheritance{mvbook,mvcollection}{letter}{% \inherit{title}{maintitle} \inherit{subtitle}{mainsubtitle} @@ -4661,8 +4799,33 @@ {\bibstring{editor}}}}}% \clearname{namea}} +\newbibmacro*{clearorigin}{% + \toggletrue{cms@origcite}% + \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}% + {\ifnameundef{bookauthor}% + {\savefield{fullhash}{\bbx@lasthash}% + \clearname{author}}% + {\ifnamesequal{author}{bookauthor}% + {\clearname{bookauthor}% + \savefield{fullhash}{\bbx@lasthash}% + \clearname{author}}% + {\savefield{fullhash}{\bbx@lasthash}% + \clearname{author}}}}% + {\clearname{author}}}% + \newbibmacro*{clearpublin}{% - \clearname{author}% + \toggletrue{cms@origcite}% + \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}% + {\ifnameundef{bookauthor}% + {\savefield{fullhash}{\bbx@lasthash}% + \clearname{author}}% + {\ifnamesequal{author}{bookauthor}% + {\clearname{bookauthor}% + \savefield{fullhash}{\bbx@lasthash}% + \clearname{author}}% + {\savefield{fullhash}{\bbx@lasthash}% + \clearname{author}}}}% + {\clearname{author}}% \clearname{namea}% \clearname{nameb}% \clearfield{nameaddon}% diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.bbx index 4000aed9950..f9947981869 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.bbx @@ -1,11 +1,11 @@ -% $Id: chicago-notes15.bbx,v 0.9.7.14 2012/12/06 12:15:47 dfussner Exp $ +% $Id: chicago-notes15.bbx,v 0.9.7.15 2014/08/14 14:30:19 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-notes15.bbx} -[2012/12/06 v 2.4 biblatex bibliography style] +[2014/08/15 v 2.9a biblatex bibliography style] %%%% Initialize and format bibliography and los %%%% @@ -36,6 +36,19 @@ {\endlist} {\item} +\defbibenvironment{shorthand} + {\list + {\printfield[shorthandwidth]{shorthand}}% + {\setlength{\labelwidth}{\shorthandwidth}% + \setlength{\leftmargin}{\labelwidth}% + \setlength{\labelsep}{\biblabelsep}% + \addtolength{\leftmargin}{\labelsep}% + \setlength{\itemsep}{\lositemsep}% + \setlength{\parsep}{\bibparsep}% + \renewcommand*{\makelabel}[1]{##1\hss}}} + {\endlist} + {\item} + \AtBeginBibliography{% \togglefalse{cms@headlessnote}% \togglefalse{cms@shortnote}% @@ -323,6 +336,19 @@ \printfield[lostitle]{title}% \finentry} +\DeclareBibliographyDriver{shorthand}{% + \ifnameundef{labelname} + {\iffieldequalstr{entrysubtype}{magazine}% + {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}% + \newcunit}}% + {\iffieldequalstr{entrytype}{manual}% + {\printtext[bibhyperref]{\printlist{organization}\newcunit}}% + {}}}% + {\usebibmacro{author/editor}% + \setunit{\addcomma\space}}% + \printfield[lostitle]{title}% + \finentry} + \DeclareBibliographyDriver{article}{% \iffieldequalstr{entrysubtype}{magazine}% {\usebibmacro{bibindex}% -- cgit v1.2.3