diff options
Diffstat (limited to 'Master')
37 files changed, 6731 insertions, 2840 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/README b/Master/texmf-dist/doc/latex/biblatex-chicago/README index 1d5981b885c..3397afd8af6 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/README +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/README @@ -1,18 +1,19 @@ IMPORTANT NOTE: This is the package formerly known as biblatex-chicago-notes-df. It -has now been upgraded to work with version 2.5 of biblatex. It -contains both the 15th- and 16th-edition Chicago style files, though I -am now marking the 15th-edition styles as "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 style (version 1.5 if you are using the latest biblatex, -0.9.8 or 0.9.9 if you are still using biblatex 1.7). +works best with the latest version (2.8) 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). -README (version 0.9.9c, 2013-03-15): +README (version 0.9.9d, 2013-10-30): Biblatex-chicago contains five biblatex styles implementing the specifications of the Chicago Manual of Style in both its 15th and @@ -33,9 +34,11 @@ the new, traditional author-date style ("authordate-trad"), which provides these features while in all other respects following the 16th-edition specifications. I encourage all users to upgrade to one of these three up-to-date styles, which should now cater to nearly all -needs. If you wish to continue using the 15th-edition files, you'll -need to specify "notes15" or "authordate15" in the options when -loading biblatex-chicago. +needs. The 15th-edition styles will be marked "obsolete" in the next +major release, and I shall cease all work on them. If, in the +meantime, you wish to continue using them, you'll need to specify +"notes15" or "authordate15" in the options when loading +biblatex-chicago. This is a beta release, but its feature set is already fairly extensive. If you have used the package before you may, after diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE b/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE index 5cfa81434ee..b281a16cabd 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE @@ -1,3 +1,171 @@ +Release notes for version 0.9.9d [2013-10-30]: + + - I am marking the 15th-edition styles as "strongly deprecated." I + recommend that you switch to one of the 16th-edition styles as soon + as is practicable. The older styles still work, but in the next + major release I shall mark them as "obsolete," and cease updating + them. + +There are four changes in this release that may, depending on various +factors, require alterations in your documents or .bib files: + + - Following requests by Kenneth L. Pearce and Bertold Schweitzer, I + have modified and extended the mechanism for creating abbreviated + citations when several parts of the same collection are included in + a reference apparatus. To the InCollection, InProceedings, and + Letter entries of previous releases, I have added InBook, Book, + BookInBook, Collection, and Proceedings entries. Only InBook + entries join the former three in having this functionality turned + on by default --- if you don't want this, it will require + intervention either in the preamble or in the "options" field of + individual entries. This intervention will be via the new + "longcrossref" option, which controls the behavior of the four + essay-like entry types and defaults to "false," while the new + "booklongxref" option controls the four book-like types and + defaults to "true." The useful settings for the options differ + slightly between the author-date and the notes & bibliography + specifications, so please see all the details in the docs of the + "crossref" field in sections 4.2 and 5.2 of biblatex-chicago.pdf. + + - On the same subject, in the notes & bibliography style, I should + mention that in the first, full citation of one part of a + collection in a note, the code no longer uses a separate citation + of the parent entry to supply parts of what you see printed. (This + led to numerous inaccuracies.) If your setup uses a side-effect of + the old code to print data that hasn't even been inherited by the + child, you may find that you need to change some "xref" fields to + "crossref" fields to make it work correctly now. This situation + will, I imagine, be very rare, but you can look at white:ross:memo + in notes-test.bib to see an example. + + - In the author-date styles, several users have been frustrated by + the lack of an approved way of setting the "cmsdate" option in the + preambles of their documents, and Kenneth L. Pearce requested that + I attempt to ease the burden on users by looking at this again. + With this release, you can now set "cmsdate" either to "both" or + "on" in the preamble, and it will affect all entries (except Music, + Review, and Video) with multiple dates. You can still change this + setting in the "options" field of individual entries, but what you + won't be able to change there is the new call to \DeclareLabeldate + which puts the "origdate" first in the list of dates when Biber + searches for a "labelyear" to use in citations and in the list of + references. If you have been using the "switchdates" mechanism to + get the "origdate" as the "labeldate," your .bib files may need + some editing in order to use the new preamble options. Please see + the documentation of the "date" field in section 5.2 of + biblatex-chicago.pdf for all the (voluminous) details. + + - Following a request by Rasmus Pank Rouland, I adapted new biblatex + code in the \textcite(s) commands in all styles to make them fit + more elegantly in the flow of text. Upon reconsideration of the + commands in the notes & bibliography style, I slightly modified + them, but _only_ when used inside a foot- or endnote. In this + context, by default, for both \textcite and \textcites, you'll now + get the author's name(s) followed by a headless _short_ citation + (or citations) placed within parentheses. You can use + \renewcommand in the preamble of your document to redefine the new + \foottextcite and \foottextcites commands to change this + formatting. See section 4.3.1 of biblatex-chicago.pdf. + +Other New Features: + + - This release includes support, in all styles, for biblatex's + multi-volume entry types: MVBook, MVCollection, MVProceedings, and + MVReference. + + - If you use Biber, I have added several new inheritance schemes to + all styles to make cross-referenced entries work more smoothly: + InCollection entries can now inherit from MVBook just as they do + from MVCollection entries; Letter entries now inherit from Book, + Collection, MVBook, and MVCollection entries the same way an InBook + or an InCollection entry would; the "namea," "nameb," "sortname," + "sorttitle," and "sortyear" fields, all highly single-entry + specific, are no longer inheritable; and the "date" and "origdate" + fields of any MV* entry will _not_ be inherited by any other entry + type. + + - Following a bug report by Henry D. Hollithron, I've added to + Unpublished entries in all styles the possibility of including an + "editor," "translator," etc. + + - Thanks to bug reports from Denis Maier and Bertold Schweitzer, I + corrected inaccuracies and outright bugs in many entry types in all + Chicago styles that appeared when there was a "booktitle" and not a + "maintitle" or vice versa. This also involved another rewrite of + the code handling the "volume" field and other related fields in + all non-periodical entry types that use them. + + - On the subject of the "volume" field, I added a new preamble and + entry option, "delayvolume," to the notes & bibliography style. In + long notes where this data isn't printed before a "maintitle," this + option allows you to print it _after_ the publication information + rather than _before_ it, as may sometimes help clarify things, + according to the Manual. This applies to the non-periodical entry + types only. + + - On the same subject, in all styles, I have added a new preamble and + entry option, "hidevolumes." This controls whether, in entries + where a "volume" has been printed before a "maintitle," any + "volumes" field present will also be printed, in this case _after_ + the "maintitle." By default, this is set to "true," so that the + "volumes" field won't appear in such circumstances. + + - On the same subject, I have modified, in all styles, the field + format for the "part" field, so that if the field contains + something other than a number, biblatex-chicago will print it as + is, capitalizing it if necessary, rather than supplying the usual + bibstring, thus providing a mechanism for altering the string to + your liking. I have also decoupled the "part" field from the + "volume" field, allowing it to be printed even in the absence of + the latter, thereby providing a means to refer to segments of a + larger work that don't easily fit the established schemes. The + iso:electrodoc entry in dates-test.bib shows an example of how this + might work. + + - There is a new "omitxrefdate" preamble and entry option in the + notes & bibliography style. It turns off the printing of the + child's "date" next to its "title" in abbreviated book-like entries + _only_, in both notes and bibliography. + + - Clea F. Rees requested a way to customize the punctuation when a + volume and a page number appear together like so: "2:204." You can + use \renewcommand in your preamble to redefine the new + \postvolpunct command to achieve this, in all styles. If your + document language is French, cms-french.lbx redefines this already + and prints something like "2 : 204." + + - I extended, in all styles, the functions of the "userd" field, + allowing it to modify a "date" field if it hasn't already been + captured by another date specification in the entry. + + - A bug report from Mathias Legrand helped clear up inaccuracies in + the presentation of ordinal numbers in all styles. + + - For the author-date styles, another bug report by Kenneth Pearce + resulted in the addition of the "labelyear" to the default "cms" + sorting scheme so that more entries in the reference list are + sorted properly without further user intervention. + + - George Pigman found an odd punctuation-tracking bug in the + author-date styles. This has been fixed. + + - Marc Sommer found a bug in the presentation of the "prenote" field + in the author-date styles. This has been fixed. + + - In the notes & bibliography style, I improved the behavior of + abbreviated foot- and endnotes when using the hyperref package. + + - I modified the date-presentation code in all the language files + (cms-*.lbx) provided by the package. Now, if an entry contains a + "(*)year" and an "(*)endyear" that are exactly the same, and there + aren't any further month or day specifications, then the "(*)year" + alone will be printed. This allows for the clearing of spurious + "(*)endyears" inherited from parent entries. + + - I discovered some unpleasant side effects of my arrangement of the + .lbx files devoted to Norwegian, and reverted to the arrangement as + originally provided by Håkon Malmedal. + Release notes for version 0.9.9c [2013-03-15]: - I am marking the 15th-edition styles as "deprecated." I recommend diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf Binary files differindex 86363fb84a6..8d1161bb82e 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex index 9fa80b0ab1d..dbc00cbe217 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex @@ -56,7 +56,7 @@ Style files for biblatex \vspace{.3\baselineskip} -\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.9c (beta) \\ +\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.9d (beta) \\ \href{mailto:djf027@googlemail.com}{djf027@googlemail.com}\\ \today \end{center} @@ -75,19 +75,23 @@ and is unlikely to require wholesale changes to styles written for it. The \textsf{biblatex-chicago} package has, for the last few releases, implemented the 16th edition of the \emph{Chicago Manual - of Style}. I shall continue, for the moment, to maintain the - 15th-edition files for those who need or want them, but I am now - marking them as \enquote{deprecated,} and I encourage all users to - switch to the newer specification, which is receiving nearly all of - my development time. If the title-formatting changes in the - author-date style have been an obstacle, please note that the new + of Style}. I am, at the moment, barely maintaining the + 15th-edition files for those who need or want them. I have marked + them as \enquote{strongly deprecated,} and I encourage all users to + switch to the newer specification, which is receiving just about all + of my development time. If the title-formatting changes in the + author-date style have been an obstacle, please note that the \textsf{authordate-trad} style keeps the traditional title formatting but switches everything else to the 16th-edition spec. I have summarized the changes between the two editions in section~\ref{sec:history} below, especially the ones that may require alterations to your .bib files. (The 15th-edition documentation is still available, also, in - \textsf{biblatex-chicago15.pdf}.) \mylittlespace\\ + \textsf{biblatex-chicago15.pdf}.) I also strongly encourage all + users who haven't already done so to switch to \textsf{Biber} as + their backend; it has long been a requirement for the author-date + styles, but it is now becoming indispensable for accessing all the + features of the notes \&\ bibliography style, as well.\mylittlespace\\ I have tried to implement as much of the \emph{Manual's} specification as possible, though undoubtedly some gaps remain. One user has recently argued that I should attempt to include legal @@ -108,8 +112,6 @@ read on. \section{Quickstart} \reversemarginpar -\enlargethispage{-3\baselineskip} - The \textsf{biblatex-chicago} package is designed for writers who wish to use \LaTeX\ and \textsf{biblatex}, and who either want or need to format their references according to one of the specifications defined @@ -126,6 +128,8 @@ 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} + \mylittlespace The documentation you are reading covers all three of these Chicago styles and their variants. Much of what follows is relevant to all users, but I have decided, after some experimentation, @@ -146,13 +150,11 @@ this release. \textsf{biblatex-chicago}: \begin{itemize}{}{} -\item Philipp Lehman's \textsf{biblatex} package, of course! You - should use the latest version(s) --- 1.7 or 2.5 at the time of - writing --- as those versions have been tested more thoroughly than - any other, meaning that these style files may well not function - properly with some earlier iterations of \textsf{biblatex}. Lehman's - tools require several packages, and he strongly recommends several - more: +\item Philipp Lehman's \textsf{biblatex} package, of course! You must + use the latest version(s) --- 1.7 or 2.8 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: \begin{itemize}{}{} \item e-\TeX\ (required) \item \textsf{etoolbox} --- available from CTAN (required) @@ -169,15 +171,18 @@ this release. non-ASCII entries. It is available from CTAN, but please be aware that this database parser no longer suffices if you are using the Chicago author-date style with any version of \textsf{biblatex} - from version 1.5 onwards. For that style you must use the - following: + from version 1.5 onwards. For that style, and to take full + advantage of all the features of the notes \&\ bibliography style, + in particular its enhanced handling of cross references, you must + use the following: \item \textsf{Biber} --- the next-generation \textsc{Bib}\TeX\ - replacement, called \textsf{Biber}, which is available from - SourceForge. You should use the latest version, 1.5, to work with - \textsf{biblatex-chicago} and \textsf{biblatex} 2.5, or 0.9.9 with - \textsf{biblatex} 1.7, 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} for more details. + replacement, which is available from SourceForge. You should use + the latest version, 1.8, to work with \textsf{biblatex} 2.8 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 + \textsf{crossref} documentation in section~\ref{sec:entryfields}, + below, for more details. \end{itemize} \item The line: \begin{quote} @@ -220,20 +225,21 @@ this release. \textsf{keyval} error. Please see sections~\ref{sec:useropts} and \ref{sec:authuseropts}, below. \item By far the simplest setup is to use \textsf{babel}, and to have - \texttt{american} as the main text language. As before, + \texttt{american} as the main text language. (\textsf{Polyglossia} + should work, too, but I haven't tested it.) As before, \textsf{babel}-less setups, and also those choosing \texttt{english} as the main text language, should work out of the box. \textsf{Biblatex-chicago} also now provides (at least partial) - support for British, \mycolor{Finnish}, French, German, Icelandic, - and Norwegian. Please see below (section~\ref{sec:international}) - for a fuller explanation of all the options. + support for British, Finnish, French, German, Icelandic, and + Norwegian. Please see below (section~\ref{sec:international}) for a + 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}, - \mycolor{\textsf{cms-finnish.lbx}}, \textsf{cms-french.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 @@ -371,7 +377,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 @@ -385,7 +391,7 @@ style, the numerous differences in punctuation (and strings identifying translators, editors, and the like) between footnotes and bibliographies and the sometimes unusual location of page numbers; in both styles the distinction between \enquote{journal} and -\enquote{magazine,} and the formatting differences between (e.g.) a +\enquote{magazine,} and the formatting differences between (e.g.)\ a work from antiquity and one from the Renaissance, all of these tend to overburden the writer who wants to comply with the standard. Many of these complexities, in truth, make the specification very nearly @@ -436,7 +442,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 @@ -486,16 +492,20 @@ from the latter file below in parentheses. The complete list of entry types currently available in \textsf{biblatex-chicago-notes}, minus the odd \textsf{biblatex} -alias, is as follows: \mycolor{\textbf{article}}, \textbf{artwork}, -\textbf{audio}, \textbf{book}, \textbf{bookinbook}, \textbf{booklet}, -\textbf{collection}, \textbf{customc}, \textbf{image}, -\textbf{inbook}, \textbf{incollection}, \textbf{inproceedings}, -\textbf{inreference}, \textbf{letter}, \textbf{manual},\textbf{misc}, -\textbf{music}, \textbf{online} (with its alias \textbf{www}), -\textbf{patent}, \textbf{periodical}, \textbf{proceedings}, +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}, +\mycolor{\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}), \mycolor{\textbf{review}}, \textbf{suppbook}, -\textbf{suppcollection}, \textbf{suppperiodical}, \textbf{thesis} +\textbf{techreport}), \textbf{review}, \textbf{suppbook}, +\textbf{supp\-collection}, \textbf{suppperiodical}, \textbf{thesis} (with its aliases \textbf{mastersthesis} and \textbf{phdthesis}), \textbf{unpublished}, and \textbf{video}. @@ -510,8 +520,8 @@ very few fields when you use \textsf{biblatex-chicago-notes}, so it seemed to me better to gather information pertaining to fields in the next section. -\mybigspace The \colmarginpar{\textbf{article}} \emph{Chicago Manual - of Style} (14.170) recognizes three different sorts of periodical +\mybigspace The \mymarginpar{\textbf{article}} \emph{Chicago Manual of + Style} (14.170) recognizes three different sorts of periodical publication, \enquote{journals,} \enquote{magazines,} and \enquote{newspapers.} The first (14.172) includes \enquote{scholarly or professional periodicals available mainly by subscription,} while @@ -626,20 +636,20 @@ lakeforester:pushcarts and, for the sorting issue, %\enlargethispage{-\baselineskip} -\mylittlespace Fourth, \colmarginpar{New!} Bertold Schweitzer has -pointed out, following the \emph{Manual} (14.192), that while an -\textsf{issuetitle} often has an \textsf{editor}, it is not too -unusual for a \textsf{title} to have, e.g., an \textsf{editor} and/or -a \textsf{translator}. In order to allow as many permutations as -possible on this theme, I have brought the \textsf{article} entry type -into line with most of the other types in allowing the use of the -\textsf{namea} and \textsf{nameb} fields in order to associate an -editor or a translator specifically with the \textsf{title}. The -\textsf{editor} and \textsf{translator} fields, in strict homology -with other entry types, are associated with the \textsf{issuetitle} if -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:entryfields}, below. +\mylittlespace Fourth, Bertold Schweitzer has pointed out, following +the \emph{Manual} (14.192), that while an \textsf{issuetitle} often +has an \textsf{editor}, it is not too unusual for a \textsf{title} to +have, e.g., an \textsf{editor} and/or a \textsf{translator}. In order +to allow as many permutations as possible on this theme, I have +brought the \textsf{article} entry type into line with most of the +other types in allowing the use of the \textsf{namea} and +\textsf{nameb} fields in order to associate an editor or a translator +specifically with the \textsf{title}. The \textsf{editor} and +\textsf{translator} fields, in strict homology with other entry types, +are associated with the \textsf{issuetitle} if 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:entryfields}, below. \mylittlespace Fifth, if you've been using \textsf{biblatex-chicago-notes} for a while, you may remember using @@ -800,7 +810,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 @@ -819,15 +829,33 @@ from a cycle. If the medium in question needs specifying, the \textsf{biblatex-chicago} provides no automated handling, e.g., a librettist (verdi:corsaro). -\mybigspace This \mymarginpar{\textbf{bookinbook}} type provides the +\mybigspace This \colmarginpar{\textbf{book}} is the standard +\textsf{biblatex} and \textsc{Bib}\TeX\ entry type, but with this +release the package can now provide automatically abbreviated +references in notes and bibliography when you use a \textsf{crossref} +or an \textsf{xref} field. The functionality is not enabled by +default, but you can enable it in the preamble or in the +\textsf{options} field using the new \mycolor{\texttt{booklongxref}} +option. Please see \textbf{crossref} in section~\ref{sec:entryfields} +and \texttt{booklongxref} in section~\ref{sec:chicpreset}, below. +Cf.\ harley:ancient:cart, harley:cartography, and harley:hoc for how +this might look. + +\mybigspace This \colmarginpar{\textbf{bookinbook}} type provides the means of referring to parts of books that are considered, in other contexts, themselves to be books, rather than chapters, essays, or articles. Such an entry can have a \textsf{title} and a \textsf{maintitle}, but it can also contain a \textsf{booktitle}, all three of which will be italicized when printed. In general usage it is, therefore, rather like the traditional \textsf{inbook} type, only -with its \textsf{title} in italics rather than in quotation marks. -(See \emph{Manual} 14.114, 14.127, 14.130; bernard:boris, +with its \textsf{title} in italics rather than in quotation marks. As +with the \textsf{book} type, you can now enable automatically +abbreviated references in notes and bibliography, though this isn't +the default. Please see \textbf{crossref} in +section~\ref{sec:entryfields} and \mycolor{\texttt{booklongxref}} in +section~\ref{sec:chicpreset}, below. (Cf.\ \emph{Manual} 14.114, +14.127, 14.130; bernhard:boris, bernhard:ritter, and +bernhard:themacher for the new abbreviating functionality; also euripides:orestes, plato:republic:gr.) \mylittlespace \textbf{NB}: The Euripides play receives slightly @@ -848,12 +876,24 @@ uses the \textsf{howpublished} field instead of a standard \textsf{howpublished} field should instead go in \textsf{publisher}. (See clark:mesopot.) +\mybigspace This \colmarginpar{\textbf{collection}} is the standard +\textsf{biblatex} entry type, but with this release the package can +now provide automatically abbreviated references in notes and +bibliography when you use a \textsf{crossref} or an \textsf{xref} +field. The functionality is not enabled by default, but you can +enable it in the preamble or in the \textsf{options} field using the +new \mycolor{\texttt{booklongxref}} option. Please see +\textbf{crossref} in section~\ref{sec:entryfields} and +\texttt{booklongxref} in section~\ref{sec:chicpreset}, below. See +harley:ancient:cart, harley:cartography, and harley:hoc for how this +might look. + \mybigspace This \mymarginpar{\textbf{customa}} entry type is now 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 @@ -907,39 +947,41 @@ 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.) -\mybigspace These \mymarginpar{\textbf{inbook}\\\textbf{incollection}} -two standard \textsf{biblatex} types have very nearly identical -formatting requirements as far as the Chicago specification is -concerned, but I have retained both of them for compatibility. -\textsf{Biblatex.pdf} (§~2.1.1) intends the first for \enquote{a part - of a book which forms a self-contained unit with its own title,} -while the second would hold \enquote{a contribution to a collection - which forms a self-contained unit with a distinct author and its own - title.} The \textsf{title} of both sorts will be placed within -quotation marks, and in general you can use either type for most -material falling into these categories. There is, however, an -important difference between them, as it is only in -\textsf{incollection} entries that I implement the \emph{Manual's} +\mybigspace These +\mymarginpar{\mycolor{\textbf{inbook}}\\\textbf{incollection}} two +standard \textsf{biblatex} types have very nearly identical formatting +requirements as far as the Chicago specification is concerned, but I +have retained both of them for compatibility. \textsf{Biblatex.pdf} +(§~2.1.1) intends the first for \enquote{a part of a book which forms + a self-contained unit with its own title,} while the second would +hold \enquote{a contribution to a collection which forms a + self-contained unit with a distinct author and its own title.} The +\textsf{title} of both sorts will be placed within quotation marks, +and in general you can use either type for most material falling into +these categories. There was an important difference between them, as +in previous releases of \textsf{biblatex-chicago} it was only in +\textsf{incollection} entries that I implemented the \emph{Manual's} recommendations for space-saving abbreviations in notes and bibliography when you cite multiple pieces from the same -\textsf{collection}. These abbreviations are activated when you use -the \textsf{crossref} or \textsf{xref} field in \textsf{incollection} -entries, and not in \textsf{inbook} entries, mainly because the -\emph{Manual} (14.113) here specifies a \enquote{multiauthor book.} -(For more on this mechanism see \textbf{crossref}, below, and note -that it is also active in \textsf{letter} and \textsf{inproceedings} -entries. There is, of course, nothing to prevent you from using the -mechanism when referring to, e.g., chapters from a single-author book, -but you'll have to use \textsf{incollection} instead of -\textsf{inbook}.) If the part of a book to which you are referring -has had a separate publishing history as a book in its own right, then -you may wish to use the \textsf{bookinbook} type, instead, on which -see above. (See \emph{Manual} 14.111--114; \textsf{inbook}: -ashbrook:brain, phibbs:diary, will:cohere; \textsf{incollection}: -centinel:letters, contrib:contrib, sirosh:visualcortex; ellet:galena, -keating:dearborn, and lippincott:chicago [and the \textsf{collection} -entry prairie:state] demonstrate the use of the \textsf{crossref} -field with its attendant abbreviations in notes and bibliography.) +\textsf{collection}. These abbreviations are now activated by default +when you use the \textsf{crossref} or \textsf{xref} field in +\textsf{incollection} entries \emph{and} in \textsf{inbook} entries, +because although the \emph{Manual} (14.113) here specifies a +\enquote{multiauthor book,} I believe the distinction between the two +is fine enough to encourage similar treatments. (For more on this +mechanism see \textbf{crossref} in section~\ref{sec:entryfields}, +below, and the new option \mycolor{\texttt{longcrossref}} in +section~\ref{sec:chicpreset}. Please note that it is also active by +default in \textsf{letter} and \textsf{inproceedings} entries.) If +the part of a book to which you are referring has had a separate +publishing history as a book in its own right, then you may wish to +use the \textsf{bookinbook} type, instead, on which see above. (See +\emph{Manual} 14.111--114; \textsf{inbook}: ashbrook:brain, +phibbs:diary, will:cohere; \textsf{incollection}: centinel:letters, +contrib:contrib, sirosh:visualcortex; ellet:galena, keating:dearborn, +and lippincott:chicago [and the \textsf{collection} entry +prairie:state] demonstrate the use of the \textsf{crossref} field with +its attendant abbreviations in notes and bibliography.) \mylittlespace \textbf{NB}: The \emph{Manual} suggests that, when referring to a chapter, one use either a chapter number or the @@ -962,10 +1004,12 @@ even though the \emph{Manual} doesn't specify its use (14.226). Please note, also, that the \textsf{crossref} and \textsf{xref} mechanism for shortening citations of multiple pieces from the same \textsf{proceedings} is operative here, just as it is in -\textsf{incollection} entries. See \textbf{crossref}, below, for more -details. +\textsf{incollection} and \textsf{inbook} entries. See +\textbf{crossref} in section~\ref{sec:entryfields} and the new option +\mycolor{\texttt{longcrossref}} in section~\ref{sec:chicpreset} for +more details. -\enlargethispage{-\baselineskip} +% \enlargethispage{-\baselineskip} \mybigspace This \mymarginpar{\textbf{inreference}} entry type is aliased to \textsf{incollection} in the standard styles, but the @@ -994,12 +1038,11 @@ own set of quotation marks (ency:britannica). In a typical here. First of all, you should present any well-known works \emph{only} in notes, not in a bibliography, as your readers are assumed to know where to go for such a reference. You can use the -\texttt{skipbib} option or the \textsf{keywords} mechanism I discuss -below under \textbf{crossref} and \textbf{keywords}. For such works, -and given how little information will be present even in a full note, -you may wish to use \cmd{fullcite} or \cmd{footfullcite} in place of -the short form, especially if, for example, you are citing different -versions of an article appearing in different editions. +\texttt{skipbib} option to achieve this. For such works, and given +how little information will be present even in a full note, you may +wish to use \cmd{fullcite} or \cmd{footfullcite} in place of the short +form, especially if, for example, you are citing different versions of +an article appearing in different editions. \mylittlespace If the work is slightly less well known, it may be that full publication details are appropriate (times:guide), but this makes @@ -1060,8 +1103,8 @@ specific letter, then you'll need to use the \textsf{letter} entry type, which attempts to simplify for you the \emph{Manual}'s rather complicated rules for formatting such references. (See 14.117; jackson:paulina:letter, white:ross:memo, white:russ [a completely -fictitious entry to show the \textsf{xref} mechanism], white:total [a -\textsf{book} entry, for the bibliography]). +fictitious entry to show the \textsf{crossref} mechanism], white:total +[a \textsf{book} entry, for the bibliography]). \mylittlespace To start, the name of the letter writer goes in the \textsf{author} field, while the \textsf{title} field contains both @@ -1077,24 +1120,23 @@ specify where a letter was written, then you can also use this field, and, if both are present, remember to separate the location from the type with a comma, like so: \texttt{memorandum, London}. Alternatively, you can put the place of writing into the -\mycolor{\textsf{origlocation}} field. Most importantly, the date of -the letter itself goes in the \textsf{origdate} field -(\texttt{year-month-day}), which now allows a full date specification, -while the publishing date of the whole collection goes in the -\textsf{date} field, instead of in the obsolete \textsf{origyear}. As -in other entry types, then, the \textsf{date} field now has its -ordinary meaning of \enquote{date of publication.} (You may have -noticed here that the presentation of the \textsf{origdate} in this -sort of reference is different from the date format required elsewhere -by the \emph{Manual}. This appears to result from some recent changes -to the specification, and it may be that we could get away with -choosing one or the other format for all occurrences [6.45], but for -the moment I hope this mixed solution will suffice.) Another -difficulty arises when producing the short footnote form, which -requires you to provide a \textsf{shorttitle} field of the form -\enquote{\texttt{to Recipient},} the latter name as short as possible -while avoiding ambiguity. The remaining fields are fairly self -explanatory, but do remember that the title of the published +\textsf{origlocation} field. Most importantly, the date of the letter +itself goes in the \textsf{origdate} field (\texttt{year-month-day}), +which now allows a full date specification, while the publishing date +of the whole collection goes in the \textsf{date} field, instead of in +the obsolete \textsf{origyear}. As in other entry types, then, the +\textsf{date} field now has its ordinary meaning of \enquote{date of + publication.} (You may have noticed here that the presentation of +the \textsf{origdate} in this sort of reference is different from the +date format required elsewhere by the \emph{Manual}. This appears to +result from some recent changes to the specification, and it may be +that we could get away with choosing one or the other format for all +occurrences [6.45], but for the moment I hope this mixed solution will +suffice.) Another difficulty arises when producing the short footnote +form, which requires you to provide a \textsf{shorttitle} field of the +form \enquote{\texttt{to Recipient},} the latter name as short as +possible while avoiding ambiguity. The remaining fields are fairly +self explanatory, but do remember that the title of the published collection belongs in \textsf{booktitle} rather than in \textsf{title}. @@ -1105,20 +1147,26 @@ rather than to each individual letter, while the form of footnotes would remain the same. This should be possible using \textsc{Bib}\TeX's standard \textsf{crossref} field, with each \textsf{letter} entry pointing to a \textsf{collection} or -\textsf{book} entry, for example. I shall discuss cross references at -length later (\textbf{crossref} and \textbf{xref}, below), but I -should mention here that \textsf{letter} is one of the entry types in -which a \textsf{crossref} or an \textsf{xref} field automatically -results in special shortened forms in notes and bibliography if more -than one piece from a single collection is cited. (The other entry -types are \textsf{incollection} and \textsf{inproceedings}; see 14.113 -for the \emph{Manual}'s specification.) This ordinarily won't be an -issue for \textsf{letter} entries in the bibliography, as individual -letters aren't included there, but it is operative in notes, where you -can disable it simply by not using a \textsf{crossref} or an -\textsf{xref} field. In the \textsf{crossref} docs, below, I -recommend a way of keeping the individual letters from turning up in -the bibliography, involving the use of the \textsf{keywords} field. +\textsf{book} entry, for example. (If you are using \textsf{Biber}, +then \textsf{letter} entries now correctly inherit fields from +\textsf{book} and \textsf{collection} entries, and also from the new +\textsf{mvbook} and \textsf{mvcollection} types --- \textsf{titles} +from the former provide a \textsf{booktitle} and from the latter a +\textsf{maintitle}.) I shall discuss cross references at length later +(see esp.\ \textbf{crossref} in section~\ref{sec:entryfields}, below), +but I should mention here that \textsf{letter} is one of the entry +types in which a \textsf{crossref} or an \textsf{xref} field +automatically results in special shortened forms in notes and +bibliography if more than one piece from a single collection is cited. +(The other entry types are \textsf{inbook}, \textsf{incollection}, and +\textsf{inproceedings}; see 14.113 for the \emph{Manual}'s +specification.) This ordinarily won't be an issue for \textsf{letter} +entries in the bibliography, as individual letters aren't included +there, but it is operative in notes, where you can disable it by +setting the new \mycolor{\texttt{longcrossref=true}} option, on which +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} @@ -1235,13 +1283,12 @@ the citation command. (The standard \textsf{biblatex} command (14.233) suggests that bibliography entries contain only the name of the manuscript collection, unless only one item from that collection is cited. The \textsf{crossref} field can be used, as well as the -\textsf{keywords} mechanism (or \texttt{skipbib} option) for -preventing the individual items from turning up in the bibliography. -Obviously, this is a matter for your discretion, and if you're using -only short notes (see the \texttt{short} option, -section~\ref{sec:useropts} below), you may feel the need to include -more information in the note if the bibliography doesn't contain a -full reference to an individual item. +\texttt{skipbib} option, for preventing the individual items from +turning up in the bibliography. Obviously, this is a matter for your +discretion, and if you're using only short notes (see the +\texttt{short} option, section~\ref{sec:useropts} below), you may feel +the need to include more information in the note if the bibliography +doesn't contain a full reference to an individual item. \mylittlespace Finally, if the \textsf{misc} entry isn't a letter, remember that, as in \textsf{article} and \textsf{review} entries, @@ -1348,13 +1395,13 @@ equivalences. date. The style will automatically prepend the bibstring \texttt{recorded} to the \textsf{eventdate} or, in the absence of this \textsf{pubstate} mechanism, to the \textsf{origdate}, or even - to both, but you can modify what is printed there using the new + to both, but you can modify what is printed there using the \mycolor{\textsf{userd}} field, which acts as a sort of date type modifier. In \textsf{music} entries, \textsf{userd} will be prepended to an \textsf{eventdate} if there is one, barring that to - the \textsf{origdate}, and to a possible \textsf{urldate} absent - those two, the latter behavior being the standard across most other - entry types. (See floyd:atom, nytrumpet:art.) + the \textsf{origdate}, barring that to a \textsf{urldate}, and + absent those three to the \textsf{date}. (See floyd:atom, + nytrumpet:art.) \item[type:] As in all the audiovisual entry types, the \textsf{type} field holds the medium of the recording, e.g., vinyl, 33 rpm, 8-track tape, cassette, compact disc, mp3, ogg vorbis. @@ -1373,6 +1420,46 @@ course, be entertained. (Cf. 14.276--77; \textsf{eventdate}, bernstein:shostakovich, floyd:atom, holiday:fool, nytrumpet:art, rubinstein:chopin.) +\mybigspace All \colmarginpar{\textbf{mvbook}\\\textbf{mvcollection}% + \\\textbf{mvproceedings}\\\textbf{mvreference}} four of these entry +types are new to \textsf{biblatex-chicago}, and all function more or +less as in standard \textsf{biblatex}. I would like, however, to +emphasize a couple of things. First, each is aliased to the entry +type that results from removing the \enquote{mv} from their names. +Second, assuming you are using \textsf{Biber} and not +\textsc{Bib}\TeX, each has an important role as the target of +cross-references from other entries, the \textsf{title} of the +\textbf{mv*} entry \emph{always} providing a \textsf{maintitle} for +the entry referencing it. If you want to provide a \textsf{booktitle} +for the referencing entry, please use another entry type, e.g., +\textbf{collection} for \textbf{incollection} or \textbf{book} for +\textbf{inbook}. (These distinctions are particularly important to the +correct functioning of the abbreviated references that +\textsf{biblatex-chicago}, in various circumstances, provides. Please +see the documentation of the \textbf{crossref} field in +section~\ref{sec:entryfields}, below.) + +\mylittlespace On the same subject, when multi-volume works are +presented in the reference apparatus, the \emph{Manual} (14.121--27) +requires that any dates presented should be appropriate to the +specific nature of the citation. In short, this means that a date +range that is right for the presentation of a multi-volume work in its +entirety isn't right for citing, e.g., a single volume of that work +which appeared in one of the years contained in the date range. +Because child entries will by default inherit all the date fields from +their parent (including the \textsf{endyear} of a date range), I have +turned off the inheritance of \textsf{date} and \textsf{origdate} +fields from all of the \textbf{mv*} entry types to any other entry +type. When the dates of the parent and of the child in such a +situation are exactly the same, then this unfortunately requires an +extra field in the child's .bib entry. When they're not the same, as +will, I believe, often be the case, this arrangement saves a lot of +annoying work in the child entry to suppress wrongly-inherited fields. +Other sorts of parent entries aren't affected by this, and of course +you must be using \textsf{Biber} for the settings to apply. See +harley:ancient:cart, harley:cartography, and harley:hoc for how this +might look. + \mybigspace The \mymarginpar{\textbf{online}} \emph{Manual}'s scattered instructions (14.4--13, 14.166--169, 14.184--185, 14.200, 14.223, 14.243--246) for citing online materials are slightly @@ -1458,6 +1545,16 @@ place for identifying strings like \enquote{special issue,} with its initial lowercase letter to activate the automatic capitalization routines. (See \emph{Manual} 14.187; good:wholeissue.) +\mybigspace This \colmarginpar{\textbf{proceedings}} is the standard +\textsf{biblatex} and \textsc{Bib}\TeX\ entry type, but with this +release the package can now provide automatically abbreviated +references in notes and bibliography when you use a \textsf{crossref} +or an \textsf{xref} field. The functionality is not enabled by +default, but you can enable it in the preamble or in the +\textsf{options} field using the new \mycolor{\texttt{booklongxref}} +option. Please see \textbf{crossref} in section~\ref{sec:entryfields} +and \texttt{booklongxref} in section~\ref{sec:chicpreset}, below. + \mybigspace This \mymarginpar{\textbf{reference}} entry type is aliased to \textsf{collection} by the standard \textsf{biblatex} styles, but I intend it to be used in cases where you need to cite a @@ -1492,7 +1589,7 @@ report type in \textsf{note} and the \textsf{institution} in %\enlargethispage{\baselineskip} -\mybigspace The \colmarginpar{\textbf{review}} \textsf{review} entry +\mybigspace The \mymarginpar{\textbf{review}} \textsf{review} entry type was added to \textsf{biblatex 0.7}, and it certainly eases the task of coping with the \emph{Manual}'s complicated requirements for citing periodicals of all sorts, though it doesn't, I admit, eliminate @@ -1564,31 +1661,28 @@ mentioned above, blogs are best treated as \textsf{articles} with blogs --- or on any similar sort of online content --- need the \textsf{review} type with the same \textsf{entrysubtype}. What they will frequently also need is a date of some sort closely associated -with the comment (14.246; ac:comment), so I have now included the -\mycolor{\textsf{eventdate}} in \textsf{review} entries for just this -purpose. It will be printed just after the \textsf{author} and before -the \textsf{title}. If you need a timestamp in addition, then the +with the comment (14.246; ac:comment), so I have included the +\textsf{eventdate} in \textsf{review} entries for just this purpose. +It will be printed just after the \textsf{author} and before the +\textsf{title}. If you need a timestamp in addition, then the \textsf{nameaddon} field is the place for it, but you'll have to provide your own parentheses, in order to preserve the possibility of providing pseudonyms in square brackets that is the standard function of this field in all other entry types, and possibly in the the \textsf{review} type as well. -\mylittlespace For the \colmarginpar{New!} reasons I explained in the -\textsf{article} docs above, I have brought the \textsf{article} and -\textsf{review} entry types into line with most of the other types in -allowing the use of the \textsf{namea} and \textsf{nameb} fields in -order to associate an editor or a translator specifically with the -\textsf{title}. The \textsf{editor} and \textsf{translator} fields, -in strict homology with other entry types, are associated with the -\textsf{issuetitle} if 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:entryfields}, below. - -%\enlargethispage{-\baselineskip} +\mylittlespace For the reasons I explained in the \textsf{article} +docs above, I have brought the \textsf{article} and \textsf{review} +entry types into line with most of the other types in allowing the use +of the \textsf{namea} and \textsf{nameb} fields in order to associate +an editor or a translator specifically with the \textsf{title}. The +\textsf{editor} and \textsf{translator} fields, in strict homology +with other entry types, are associated with the \textsf{issuetitle} if +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:entryfields}, below. -\mybigspace This \marginpar{\textbf{suppbook}} is the entry type to +\mybigspace This \mymarginpar{\textbf{suppbook}} is the entry type to use if the main focus of a reference is supplemental material in a book or in a collection, e.g., an introduction, afterword, or forward, either by the same or a different author. In previous releases of @@ -1613,6 +1707,8 @@ 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} + \mylittlespace There are a few other rules for constructing your .bib entry. The \textsf{author} field refers to the author of the introduction or afterword, while \textsf{bookauthor} refers to the @@ -1656,8 +1752,11 @@ construct a .bib entry for such a reference. lowercase letter at the start of your \textsf{note} field (or perhaps an\ \cmd{autocap} command in the somewhat contradictory \textsf{howpublished}, if you have one) for material that wouldn't -ordinarily be capitalized except at the beginning of a sentence -(14.228; nass:address). +ordinarily be capitalized except at the beginning of a sentence. +Thanks to a bug report by Henry D. Hollithron, such entries will now +print information about any \textsf{editor}, \textsf{translator}, +\textsf{compiler}, etc., that you include in the .bib file (14.228; +nass:address). \mybigspace This \mymarginpar{\textbf{video}} is the last of the three audiovisual entry types, and as its name suggests it is intended for @@ -1712,16 +1811,16 @@ by \textsf{biblatex}. Here are the main correspondences: either the broadcast date of a particular TV program, or the recording/performance date of, for example, an opera on DVD. The style will automatically prepend the bibstring \texttt{broadcast} to - such a date, though you can use the new field \textsf{userd} to - change the string printed there. (Absent an \textsf{eventdate}, the - \textsf{userd} field in \textsf{video} entries will revert to - modifying the \textsf{urldate}, the standard behavior in all but - these and \textsf{music} entries.) The \textsf{origdate} has more - or less the same function, and appears in the same places, as it - does in standard book-like entries, providing the date of first - release of a film, though there isn't any \texttt{reprint} string - associated with it in this entry type. Cf.\ friends:leia, - handel:messiah, hitchcock:nbynw. + such a date, though you can use the \mycolor{\textsf{userd}} field + to change the string printed there. (Absent an \textsf{eventdate}, + the \textsf{userd} field in \textsf{video} entries will modify the + \textsf{urldate}, and absent those two it will modify the + \textsf{date}.) The \textsf{origdate} has more or less the same + function, and appears in the same places, as it does in standard + book-like entries, providing the date of first release of a film, + though there isn't any \texttt{reprint} string associated with it in + this entry type. Cf.\ friends:leia, handel:messiah, + hitchcock:nbynw. \item[type:] As in all the audiovisual entry types, the \textsf{type} field holds the medium of the \textsf{title}, e.g., 8 mm, VHS, DVD, Blu-ray, MPEG. @@ -1743,7 +1842,7 @@ I shall include references to the numbered paragraphs of the reference to other, related fields. In such cases, cross references should allow you to find the information you need. -\mybigspace As \colmarginpar{\textbf{addendum}} in standard +\mybigspace As \mymarginpar{\textbf{addendum}} in standard \textsf{biblatex}, this field allows you to add miscellaneous information to the end of an entry, after publication data but, with the single exception of the \textsf{online} entry type, before any @@ -1920,7 +2019,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 @@ -1990,9 +2089,10 @@ is perfectly possible for one .bib file entry to contain all three sorts of title (euripides:orestes, plato:republic:gr). You may also find a \textsf{booktitle} in other sorts of entries (e.g., \textsf{book} or \textsf{collection}), but there it will almost -invariably be providing information for the \textsc{Bib}\TeX\ -cross-referencing apparatus (prairie:state), which I discuss below -(\textbf{crossref}). +invariably be providing information for the traditional +\textsc{Bib}\TeX\ cross-referencing apparatus, which I discuss below +(\textbf{crossref}). This provision is unnecessary if you are using +\textsf{Biber}. \mybigspace An \mymarginpar{\textbf{booktitleaddon}} annex to the \textsf{booktitle}. It will be printed in the main text font, without @@ -2001,8 +2101,6 @@ ordinarily only be capitalized at the beginning of a sentence, then simply ensure that that word is in lowercase, and \textsf{biblatex-chicago-notes} will automatically do the right thing. -%\enlargethispage{\baselineskip} - \mybigspace This \mymarginpar{\textbf{chapter}} field holds the chapter number, mainly useful only in an \textsf{inbook} or an \textsf{incollection} entry where you wish to cite a specific chapter @@ -2013,126 +2111,239 @@ 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}. -\mybigspace \textsf{Biblatex} \mymarginpar{\textbf{crossref}} uses the -standard \textsc{Bib}\TeX\ cross-referencing mechanism, and has also -introduced a modified one of its own (\textsf{xref}). The -\textsf{crossref} field works exactly the same as it always has, while -\textsf{xref} attempts to remedy some of the deficiencies of the usual -mechanism by ensuring that child entries will inherit no data at all -from their parents. Having said all that, a few further instructions -may be in order for users of both \textsf{biblatex} and -\textsf{biblatex-chicago}. First, remember that fields in a -\textsf{collection} entry, for example, differ from those in an -\textsf{incollection} entry. In order for the latter to inherit the -\textsf{booktitle} field from the former, the former needs to have -such a field defined, even though a \textsf{collection} entry has no -use itself for such an entry (see ellet:galena, keating:dearborn, -lippincott:chicago, and prairie:state). Note also that an entry with -a \textsf{crossref} field will mechanically try to inherit all -applicable fields from the entry it cross-references. In the case of -ellet:galena et al., you can see that this includes the -\textsf{subtitle} field found in prairie:state, which would then, -quite incorrectly, be added to the \textsf{title} of ellet:galena. In -cases like these, you could just make sure that prairie:state didn't -contain such a field, by placing the entire title + subtitle in the -\textsf{title} field, separated by a colon. You'd certainly need to -provide a \textsf{shorttitle} field for short footnotes, if you chose -this solution. Alternatively, as you can see in ellet:galena, you can -just define an empty \textsf{subtitle} field to prevent it inheriting -the unwanted subtitle from prairie:state. - -\mylittlespace Turning now more narrowly to -\textsf{biblatex-chicago-notes}, the \emph{Manual} (14.113) specifies -that if you cite several contributions to the same collection, all -(including the collection itself) may be listed separately in the -bibliography, which the package does automatically, using the default -inclusion threshold of 2 in the case both of \textsf{crossref}'ed and -\textsf{xref}'ed entries. (The familiar \cmd{nocite} command may also -help in some circumstances.) In footnotes the specification suggests -that, after a citation of any one contribution to the collection, all -subsequent contributions may, even in the first, long footnote, be -cited using a slightly shortened form, thus \enquote{avoiding - clutter.} In the bibliography the abbreviated form is appropriate -for all the child entries. The current version of -\textsf{biblatex-chicago-notes} implements these instructions, but -only if you use a \textsf{crossref} or an \textsf{xref} field, and -only in \textsf{incollection}, \textsf{inproceedings}, or -\textsf{letter} entries (on the last named, see just below). If you -look at ellet:galena, keating:dearborn, lippincott:chicago, and -prairie:state you'll see this mechanism in action in both notes and -bibliography. If you wish to disable this, then simply don't use a -\textsf{crossref} or \textsf{xref} field in your entries. - -\mylittlespace There is a subtlety involved in this mechanism that I -should address here. Andrew Goldstone has pointed out to me some -inaccuracies in the package's treatment of these abbreviated -citations, both in notes and bibliography. Most of the changes I've -made won't affect users in any way, only the actual printed output, -but if you refer separately to chapters in a single-author -\textsf{book}, then the shortened part of the reference, to the whole -book, won't repeat the author's name before the title of the whole. -If, however, you refer separately to parts of a \textsf{collection} or -\textsf{proceedings}, even when the \textsf{editor} of the -\textsf{collection} is the same as the \textsf{author} of an essay in -the collection, you will see the name repeated before the abbreviated -part referencing the whole parent volume. Because the code tests for -entry type, if you don't use \textsf{collection} or -\textsf{proceedings} for the whole volume, you'll not get the repeated -name, so there may be corner cases where careful choice of the parent -entry type gets you what you want. +\enlargethispage{\baselineskip} + +\mybigspace This \colmarginpar{\textbf{crossref}} field is the +standard \textsc{Bib}\TeX\ cross-referencing mechanism, and +\textsf{biblatex} has adopted it while also introducing a modified one +of its own (\textsf{xref}). If you are using \textsc{Bib}\TeX\ (or +\textsf{bibtex8)} the \textsf{crossref} field works exactly the same +as it always has, while \textsf{xref} attempts to remedy some of the +deficiencies of the usual mechanism by ensuring that child entries +will inherit no data at all from their parents. Section~2.4.1.1 of +\textsf{biblatex.pdf} contains useful notes on the intricacies of +managing cross-referenced entries with these traditional backends, and +for the most part these backends are still usable, if inconvenient. +New functionality, discussed below, for abbreviating references in +\textsf{book}, \textsf{bookinbook}, \textsf{collection}, and +\textsf{proceedings} entries, and for using the new +\mycolor{\textsf{mv*}} entry types to do so, will prove extremely +difficult with the older backends, so if you plan on lots of +cross-referencing in \textsf{biblatex-chicago-notes} then I strongly +recommend you use \textsf{Biber}. + +\mylittlespace (One reason for this is that when \textsf{Biber} is the +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.) + +\mylittlespace Turning now to the provision of abbreviated references +in \textsf{biblatex-chicago-notes}, the \emph{Manual} (14.113) +specifies that if you cite several contributions to the same +collection, all (including the collection itself) may be listed +separately in the bibliography, which the package does automatically, +using the default inclusion threshold of 2 in the case both of +\textsf{crossref}'ed and \textsf{xref}'ed entries. (The familiar +\cmd{nocite} command may also help in some circumstances.) In +footnotes the specification suggests that, after a citation of any one +contribution to the collection, all subsequent contributions may, even +in the first, long footnote, be cited using a slightly shortened form, +thus \enquote{avoiding clutter.} In the bibliography the abbreviated +form is appropriate for all the child entries. The +\textsf{biblatex-chicago-notes} package has always implemented these +instructions, but only if you use a \textsf{crossref} or an +\textsf{xref} field, and only in \textsf{incollection}, +\textsf{inproceedings}, or \textsf{letter} entries (on the last named, +see just below). With this release, I \colmarginpar{New!} have +considerably extended this functionality. + +\mylittlespace First, I have added five new entry types --- +\mycolor{\textbf{book}}, \mycolor{\textbf{bookinbook}}, +\mycolor{\textbf{collection}}, \mycolor{\textbf{inbook}}, and +\mycolor{\textbf{proceedings}} --- to the list of those which use +shortened cross references, and I have added two new options --- +\mycolor{\texttt{longcrossref}} and \mycolor{\texttt{booklongxref}}, +on which more below --- which you can use in the preamble or in the +\textsf{options} field of an entry to enable or disable the automatic +provision of abbreviated references. (The \textsf{crossref} or +\textsf{xref} field are still necessary for this provision, but they +are no longer sufficient on their own.) The \textsf{inbook} type +works exactly like \textsf{incollection} or \textsf{inproceedings}; in +previous releases, you could use \textsf{inbook} instead of +\textsf{incollection} to avoid the automatic abbreviation, the two +types being otherwise identical. Now that you can use an option to +turn off abbreviated references even in the presence of a +\textsf{crossref} or \textsf{xref} field, I have thought it sensible +to include this entry type alongside the others. (Cf.\ ellet:galena, +keating:dearborn, lippincott:chicago, and prairie:state to see this +mechanism in action in both notes and bibliography.) + +\mylittlespace The inclusion of \textbf{book}, \textbf{bookinbook}, +\textbf{collection}, and \textbf{proceedings} entries fulfills a +request made by Kenneth L. Pearce, and allows you to obtain shortened +references to, for example, separate volumes within a multi-volume +work, or to different book-length works collected inside a single +volume. Such references are not an explicit part of the +\emph{Manual's} specification, but they are a logical extension of it, +so the system of options for turning on this functionality behaves +differently for these four entry types than for the other 4 (see +below). In \textsf{notes-test.bib} you can get a feel for how this +works by looking at bernhard:boris, bernhard:ritter, +bernhard:themacher, harley:ancient:cart, harley:cartography, and +har\-ley:hoc. + +\mylittlespace Before discussing the new package options, I should say +a little about some subtleties involved in this mechanism. First, and +especially for \textsf{book}, \textsf{bookinbook}, +\textsf{collection}, and \textsf{proceedings} entries, it is much +simpler if your backend is \textsf{Biber}, which allows you to provide +\textsf{maintitles} by cross-referencing an \textbf{mv*} entry, and +\textsf{booktitles} by cross-referencing \textsf{book} or +\textsf{collection} entries. Second, where and when to print +\textsf{volume} information in these references is extremely complex, +and I confess that I designed the tests primarily with \textsf{Biber} +in mind. If you can't get it to work using \textsc{Bib}\TeX, or if +you find something that looks wrong to you, please let me know. +Third, Andrew Goldstone long ago identified some other difficulties in +the package's treatment of abbreviated citations, both in notes and +bibliography, difficulties exacerbated now by the extension of the +mechanism to book-like entries. If you refer separately to chapters +in a single-author \textsf{book}, then the shortened part of the +reference, to the whole book, won't repeat the author's name before +the title of the whole. If, however, you refer separately to parts of +a \textsf{collection} or \textsf{proceedings}, even when the +\textsf{editor} of the \textsf{collection} is the same as the +\textsf{author} of an essay in the collection, you will see the name +repeated before the abbreviated part referencing the whole parent +volume. + +\mylittlespace Shortened references to book-like entries require, I +believe, a somewhat different treatment. Here, repeated +\textsf{editors} are avoided if the abbreviated reference is to a +\textsf{collection} or \textsf{proceedings} entry, or to either of +their \textsf{mv*} versions, while for other entry types repeated +\textsf{authors} are avoided. Because the code in these situations +tests for entry type, there may be corner cases where careful choice +of the parent entry type gets you what you want. Likewise, judicious +use of the \textsf{editor} and \textsf{editortype} fields may also +help, in some circumstances, to clear names that are repeated +unnecessarily. Also, because of the way dates are handled by the +\textsf{mv*} entry types, and by child entries cross-referenced to +such entry types, I thought it might help in these abbreviated +book-like entries to provide a date for the \textsf{title} when it's +part of a \textsf{maintitle}, though not when it's only part of a +\textsf{booktitle}. If dates appear in shortened references where +you'd rather not have them, I have provided the new +\mycolor{\texttt{omitxrefdate}} option +\colmarginpar{\texttt{omitxrefdate}} to turn them off, either in the +preamble for the document as a whole or in the \textsf{options} field +of individual entries. See \textbf{mvbook} in +section~\ref{sec:entrytypes} and \texttt{omitxrefdate} in +section~\ref{sec:useropts}. % \enlargethispage{\baselineskip} -\mylittlespace A published collection of letters requires somewhat -different treatment (14.117). If you cite more than one letter from -the same collection, then the \emph{Manual} specifies that only the -collection itself should appear in the bibliography. In footnotes, -you can use the \textsf{letter} entry type, documented above, for each -individual letter, while the collection as a whole may well require a -\textsf{book} entry. I have, after some consideration, implemented -the system of shortened references in \textsf{letter} entries, even -though the \emph{Manual} doesn't explicitly require it. As with -\textsf{incollection} and \textsf{inproceedings}, mere use of a -\textsf{crossref} or \textsf{xref} field will activate this mechanism, -while avoidance of said fields will disable it. (See white:ross:memo, -white:russ, and white:total, for examples of the \textsf{xref} field -in action in this way, and please note that the second of these -entries is entirely fictitious, provided merely for the sake of -example.) How then to keep the individual letters from appearing in -the bibliography? The simplest mechanism is one provided by -\textsf{biblatex}, which involves the \textsf{keywords} field. Choose -a keyword for any entry you wish excluded from the bibliography --- -I've chosen \texttt{original}, for reasons that will become clearer -later --- then in the optional argument to the \cmd{printbibliography} -command in your document include, e.g., \texttt{notkeyword=original}. -(Cf.\ \textbf{keywords} and \textbf{userf}.) +\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 +only the collection itself should appear in the bibliography. In +footnotes, you can use the \textsf{letter} entry type, documented +above, for each individual letter, while the collection as a whole may +well require a \textsf{book} entry. I have, after some consideration, +implemented the system of shortened references in \textsf{letter} +entries, even though the \emph{Manual} doesn't explicitly require it. +(See white:ross:memo, white:russ, and white:total, for examples of the +\textsf{crossref} and \textsf{xref} field in action in this way, and +please note that the second of these entries is entirely fictitious, +provided merely for the sake of example.) How then to keep the +individual letters from appearing in the bibliography? The simplest +mechanism is probably just to use \enquote{\texttt{skipbib}} in the +\textsf{options} field. \mylittlespace If you look closely at the .bib entries for -white:ross:memo and white:russ, you'll see that, despite using -\textsf{xref} instead of \textsf{crossref}, the notes referring to -them inherit data from the parent (white:total). The citation -mechanism is making a separate call to the parent's .bib entry, +white:ross:memo and white:russ, you'll see that, despite the latter +using \textsf{xref} instead of \textsf{crossref}, the first note +referring to it inherits data from the parent (white:total). In the +abbreviated note and in abbreviated bibliography entries \emph{only}, +the driver is making a separate call to the parent's .bib entry, formatting the information there to fill out the bare data provided by -the child, but this only happens in \textsf{letter}, -\textsf{incollection}, and \textsf{inproceedings} entries. It is -perfectly possible that other sorts of entries may make use of -\textsf{crossref} or \textsf{xref} fields --- \textsf{inbook} and -\textsf{bookinbook} come to mind --- but such entries will not result in -the activation of shortened references in notes and bibliography, nor, -when using \textsf{xref}, in the inheritance I have just pointed out. -This is how I interpret the specification, though I'm open to -persuasion on this score. - -\mylittlespace I should also take this opportunity to mention that you -need to be careful when using the \textsf{shorthand} field in -conjunction with the \textsf{crossref} or \textsf{xref} fields, -bearing in mind the complicated questions of inheritance posed by all -such cross-references, most especially in \textsf{letter}, -\textsf{incollection}, and \textsf{inproceedings} entries. A -\textsf{shorthand} field in a parent entry is, at least in the current -state of \textsf{biblatex-chicago-notes}, a bad idea. - -\mybigspace This \mymarginpar{\textbf{date}} field may be used to +the child. For the first white:ross:memo note, which contains the +full bibliographical information for the collection as a whole, I have +used \textsf{crossref} because this unabbreviated note no longer makes +a separate call to the parent's entry --- or, technically, it no +longer makes a call that prints anything at all. This is a change +from all previous releases of \textsf{biblatex-chicago}, so if your +documents have come to rely on the side effects of this separate +citation for providing data that haven't been inherited by the child, +please be aware that it will no longer work as before. (You could see +this by citing white:russ \emph{before} white:ross:memo.) This change +only affects the eight entry types that provide the abbreviated +cross-references, a provision that is now dependent on the settings of +two new preamble and entry options. + +\mylittlespace Those \colmarginpar{\texttt{longcrossref}} options +function asymmetrically. The first, \mycolor{\texttt{longcrossref}}, +generally controls the settings for the entry types more-or-less +authorized by the \emph{Manual}: \textsf{inbook}, +\textsf{incollection}, \textsf{inproceedings}, and \textsf{letter}. + +\begin{description} +\item[\qquad false:] This is the default. If you use + \textsf{crossref} or \textsf{xref} fields in the four mentioned + entry types, you'll get the abbreviated references in both notes and + bibliography. +\item[\qquad true:] You'll get no abbreviated references in these + entry types, either in notes or in the bibliography. +\item[\qquad notes:] The abbreviated references will not appear in + notes, but only in the bibliography. +\item[\qquad bib:] The abbreviated references will not appear in the + bibliography, but only in notes. +\item[\qquad none:] This switch is special, allowing you with one + setting to provide abbreviated references not just to the four entry + types mentioned but also to \textsf{book}, \textsf{bookinbook}, + \textsf{collection}, and \textsf{proceedings} entries, both in notes + and in the bibliography. +\end{description} + +The \colmarginpar{\texttt{booklongxref}} second option, +\mycolor{\texttt{booklongxref}}, controls the settings for +\textsf{book}, \textsf{bookinbook}, \textsf{collection}, and +\textsf{proceedings} entries: + +\begin{description} +\item[\qquad true:] This is the default. If you use \textsf{crossref} + or \textsf{xref} fields in these entry types, by default you will + \emph{not} get any abbreviated references, either in notes or + bibliography. +\item[\qquad false:] You'll get abbreviated references in these entry + types both in notes and in the bibliography. +\item[\qquad notes:] The abbreviated references will not appear in + notes, but only in the bibliography. +\item[\qquad bib:] The abbreviated references will not appear in the + bibliography, but only in notes. +\end{description} + +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. + +\mybigspace This \colmarginpar{\textbf{date}} field may be used to specify an item's complete date of publication, in \textsc{iso}8601 format, i.e., \texttt{yyyy-mm-dd}. It may also be used to specify a date range, according to Lehman's instructions in §~2.3.8 of @@ -2149,6 +2360,13 @@ in section~\ref{sec:entrytypes} above for how to use this field to distinguish between two classes of archival material. See also \textsf{origdate} and \textsf{urldate}. +\mylittlespace With \colmarginpar{New!} this release, you can now in +most entry types qualify a \textsf{date} with the \textsf{userd} +field, assuming that the entry contains no \textsf{urldate}. For +\textsf{music} and \textsf{video} entries, there are several other +requirements --- please see the documentation of \textsf{userd}, +below. + \mylittlespace (Users of the Chicago author-date style who wish to minimize the labor needed to convert a .bib database for the notes \&\ bibliography style should be aware that, in this release, the latter @@ -2238,7 +2456,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, @@ -2276,7 +2494,7 @@ for an \textsf{editor}. When the \textsf{editor} field is used, its \textsf{labelname} mechanism, meaning that a shortened form of the \textsf{editor} will be used in the short note form. If, however, the \textsf{namea} field provides the name, and you are not using -\textsf{biber}, then your .bib entry will need to have a +\textsf{Biber}, then your .bib entry will need to have a \textsf{sortkey} field to aid in alphabetizing, and it will also need a \textsf{shorteditor} defined to help with the short note form, not a \textsf{shortauthor}, ruled out because \texttt{useauthor=false}. @@ -2422,7 +2640,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} @@ -2500,7 +2718,7 @@ idea of how this works. \textsf{biblatex}'s extremely powerful and flexible technique for filtering bibliography entries, allowing you to subdivide a bibliography according to just about any criteria you care to invent. -See \textsf{biblatex.pdf} (3.10.4) for thorough documentation. In +See \textsf{biblatex.pdf} (3.11.4) for thorough documentation. In \textsf{biblatex-chicago}, the field can provide a convenient means to exclude certain entries from making their way into a bibliography. We have already seen (\textbf{letter}, above) how the \emph{Manual} @@ -2517,11 +2735,10 @@ aristotle:metaphy:trans, aristotle:metaphy:gr). Finally, citations of well-known reference works (like the \emph{Encyclopaedia Britannica}, for example), need only be presented in notes, and not in the bibliography (14.247--248; ency:britannica, wikiped:bibtex; see -\textsf{inreference}, above). In all these cases, I have suggested the -inclusion of \texttt{original} in the \textsf{keywords} field, along -with a \texttt{notkeyword=original} in the optional argument to the -\cmd{printbibliography} command, though of course you can choose any -key you wish. +\textsf{inreference}, above). A \textsf{keywords} field can be a +convenient way to exclude all such entries from appearing in a +bibliography, though of course including \texttt{skipbib} in the +\textsf{options} field works, too. \mybigspace A \mymarginpar{\textbf{language}} standard \textsf{biblatex} field, designed to allow you to specify the @@ -2612,7 +2829,10 @@ the \textsf{note} field (emerson:nature). \mybigspace The \mymarginpar{\textbf{maintitle}} main title for a multi-volume work, e.g., \enquote{Opera} or \enquote{Collected Works.} (See donne:var, euripides:orestes, harley:cartography, lach:asia, -pelikan:chris\-tian, and plato:republic:gr.) +pelikan:chris\-tian, and plato:republic:gr.) When using a +\textsf{crossref} field and \textsf{Biber}, the \textsf{title} of +\textbf{mv*} entry types always becomes a \textsf{maintitle} in the +child entry. %\enlargethispage{\baselineskip} @@ -2637,13 +2857,16 @@ the \textsf{editor} would be associated with one of these latter fields (donne:var). (In \textsf{article} and \textsf{review} entries, \textsf{namea} applies to the \textsf{title} instead of the \textsf{issuetitle}, should the latter be present.) You should -present names in this field exactly as you would those in an +present names in the field exactly as you would those in an \textsf{author} or \textsf{editor} field, and the package will concatenate this field with \textsf{nameb} if they are identical. See -under \textbf{editor} above for the full details. Cf.\ also -\textsf{nameb}, \textsf{namec}, \textsf{translator}, and the macros -\cmd{partedit}, \cmd{parttrans}, \cmd{parteditandtrans}, -\cmd{partcomp}, \cmd{parteditandcomp}, \cmd{parttransandcomp}, and +under \textbf{editor} above for the full details. Please note that, +as the field is highly single-entry specific, if you are using +\textsf{Biber} \textsf{namea} isn't inherited from a +\textsf{crossref}'ed parent entry. Cf.\ also \textsf{nameb}, +\textsf{namec}, \textsf{translator}, and the macros \cmd{partedit}, +\cmd{parttrans}, \cmd{parteditandtrans}, \cmd{partcomp}, +\cmd{parteditandcomp}, \cmd{parttransandcomp}, and \cmd{partedittransand\-comp}, for which see section~\ref{sec:formatcommands}. @@ -2688,12 +2911,15 @@ entries, \textsf{nameb} applies to the \textsf{title} instead of the present names in this field exactly as you would those in an \textsf{author} or \textsf{translator} field, and the package will concatenate this field with \textsf{namea} if they are identical. See -under the \textbf{translator} field below for the full details. Cf.\ -also \textsf{namea}, \textsf{namec}, \textsf{origlanguage}, -\textsf{translator}, \textsf{userf} and the macros \cmd{partedit}, -\cmd{parttrans}, \cmd{parteditandtrans}, \cmd{partcomp}, -\cmd{parteditandcomp}, \cmd{parttransandcomp}, and -\cmd{partedittransandcomp} in section~\ref{sec:formatcommands}. +under the \textbf{translator} field below for the full details. +Please note that, as the field is highly single-entry specific, if you +are using \textsf{Biber} \textsf{nameb} isn't inherited from a +\textsf{crossref}'ed parent entry. Cf.\ also \textsf{namea}, +\textsf{namec}, \textsf{origlanguage}, \textsf{translator}, +\textsf{userf} and the macros \cmd{partedit}, \cmd{parttrans}, +\cmd{parteditandtrans}, \cmd{partcomp}, \cmd{parteditandcomp}, +\cmd{parttransandcomp}, and \cmd{partedittransandcomp} in +section~\ref{sec:formatcommands}. \mybigspace The \mymarginpar{\textbf{namec}} \emph{Manual} (14.87) specifies that works without an author may be listed under an editor, @@ -2910,8 +3136,6 @@ writing, be one of \texttt{american}, \texttt{brazilian}, \texttt{norwegian}, \texttt{portuguese}, \texttt{spanish}, or \texttt{swedish}, to which I've added \texttt{russian}. -%\enlargethispage{-\baselineskip} - \mybigspace The \mymarginpar{\textbf{origlocation}} 16th edition of the \emph{Manual} has somewhat clarified issues pertaining to the documentation of reprint editions and their corresponding originals @@ -2965,7 +3189,7 @@ appropriate identifying string to information you provide in the all the details on this functionality, as aside from the difference just mentioned the two fields are equivalent. -\mybigspace Standard \mymarginpar{\textbf{part}} \textsf{biblatex} +\mybigspace Standard \colmarginpar{\textbf{part}} \textsf{biblatex} field, which identifies physical parts of a single logical volume in \textsf{book}-like entries, not in periodicals. It has the same purpose in \textsf{biblatex-chicago-notes}, but because the @@ -2973,8 +3197,15 @@ purpose in \textsf{biblatex-chicago-notes}, but because the \enquote{part,} the string printed in notes and bibliography will, at least in English, be \enquote{\texttt{bk.}\hspace{-2pt}}\ instead of the plain dot between volume number and part number -(harley:cartography, lach:asia). This field should only be used in -association with a \textsf{volume} number, so if you need to identify +(harley:cartography, lach:asia). If the field contains something +other than a number, \textsf{biblatex-chicago} will print it as is, +capitalizing it if necessary, rather than supplying the usual +bibstring, so this provides a mechanism for altering the string to +your liking. The field will be printed in the same place in any entry +as would a \textsf{volume} number, and although it will most usually +be associated with such a number, it can also, as of this release, +function independently, allowing you to identify parts of works that +don't fit into the standard scheme. If you need to identify \enquote{parts} or \enquote{books} that are part of a published \textsf{series}, for example, then you'll need to use a different field, (which in this case would be \textsf{number} @@ -3023,6 +3254,8 @@ 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} + \mylittlespace There are a couple of exceptions to this basic functionality. In \textsf{video} entries, no bibstring will be printed, as it's not appropriate there, so in effect the @@ -3099,6 +3332,8 @@ 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} + \mybigspace This \mymarginpar{\textbf{shortauthor}} is a standard \textsf{biblatex} field, but \textsf{biblatex-chicago-notes} makes considerably grea\-ter use of it than the standard styles. For the @@ -3130,8 +3365,6 @@ need to provide these strings in such a citation, then you'll have to do so by hand in the \textsf{shortauthor} field, or in the \textsf{shorteditor} field, whichever you are using. -%\enlargethispage{\baselineskip} - \mybigspace Like \mymarginpar{\textbf{shorteditor}} \textsf{shortauthor}, a field to provide a name for a short footnote, in this case for, e.g., a \textsf{collection} entry that typically @@ -3158,26 +3391,26 @@ 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 new options to alter these -defaults. First, there is a new citation command, -\mycolor{\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 new -\texttt{bibenvironments} for use with the \texttt{env} option to the -\cmd{printshorthands} command: \mycolor{\texttt{losnotes}} is designed -to allow a list of shorthands to appear inside footnotes, while -\mycolor{\texttt{losendnotes}} does the same for endnotes. Their main -effect is to change the font size, and in the 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 new package option, \mycolor{\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 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 +\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 +endnotes. Their main effect is to change the font size, and in the +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, +\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 @@ -3498,7 +3731,7 @@ entry in the bibliography to which the cross-reference will point. (See 14.84, 14.86; creasey:ashe:blast, creasey:morton:hide, creasey:york:death, lecarre:quest.) -\mybigspace The \mymarginpar{\textbf{userd}} \textsf{userd} field, +\mybigspace The \colmarginpar{\textbf{userd}} \textsf{userd} field, recently added to the package, acts as a sort of \enquote{\textsf{datetype}} field, allowing you in most entry types to identify whether a \textsf{urldate} is an access date or a revision @@ -3509,7 +3742,10 @@ been the default in \textsf{biblatex} and in way, what you include in \textsf{userd} will be printed \emph{before} the \textsf{urldate}, so phrases like \enquote{\texttt{last modified}} or \enquote{\texttt{last revised}} are what the field will typically -contain (14.7--8; wikiped:bibtex). +contain (14.7--8; wikiped:bibtex). In \colmarginpar{New!} the absence +of a \textsf{urldate}, you can now, in most entry types, include a +\textsf{userd} field to qualify a \textsf{date} in the same way it +would have modified a \textsf{urldate}. \mylittlespace Because of the rather specialized needs of some audio-visual references, this basic schema changes for \textsf{music} @@ -3517,9 +3753,11 @@ and \textsf{video} entries. In \textsf{music} entries where an \textsf{eventdate} is present, \textsf{userd} will modify that date instead of any \textsf{urldate} that may also be present, and it will modify an \textsf{origdate} if it is present and there is no -\textsf{eventdate}. In \textsf{video} entries it will modify an +\textsf{eventdate}. It will modify a \textsf{date} only in the +absence of the other three. In \textsf{video} entries it will modify an \textsf{eventdate} if it is present, and in its absence the -\textsf{urldate}. Please see the documentation of the \textsf{music} +\textsf{urldate}. In the absence of those two, it can modify a +\textsf{date}. Please see the documentation of the \textsf{music} and \textsf{video} entry types, and especially of the \textsf{eventdate}, \textsf{origdate}, and \textsf{urldate} fields, above (14.276--279; nytrumpet:art). @@ -3561,21 +3799,21 @@ just as you normally would. The mechanism works for any entry type, and the two entries need not be of the same type. In the entry for the \emph{translation}, you put the cite key of the original into the \textsf{userf} field. In the \emph{original's} entry, you need to -include a toggle in the \textsf{keywords} field that will prevent that -entry from being printed separately in the bibliography --- I have -chosen the string \texttt{original}, and use -\texttt{notkeyword=original} in the \cmd{printbibliography} command, -though you can use anything you want. In this standard case, the data -for the translation will be printed first, followed by the string -\texttt{originally published as}, followed by the original, author -omitted, in what amounts to the same format that the \emph{Manual} -uses for long footnotes (furet:passing:eng, furet:passing:fr). As -explained above (\textbf{origlanguage}), I have also included a way to -modify the string printed before the original. In the entry for the -\emph{translation}, you put the original's language in -\textsf{origlanguage}, and instead of \texttt{originally published - as}, you'll get \texttt{French edition:} or \texttt{Latin edition:}, -etc.\ (aristotle:metaphy:gr, aristotle:metaphy:trans). +include something that will prevent the entry from being printed +separately in the bibliography --- \texttt{skipbib} in the +\textsf{options} field will work, as would something in the +\textsf{keywords} field in conjunction with a \texttt{notkeyword=} +switch in the \cmd{printbibliography} command. In this standard case, +the data for the translation will be printed first, followed by the +string \texttt{originally published as}, followed by the original, +author omitted, in what amounts to the same format that the +\emph{Manual} uses for long footnotes (furet:passing:eng, +furet:passing:fr). As explained above (\textbf{origlanguage}), I have +also included a way to modify the string printed before the original. +In the entry for the \emph{translation}, you put the original's +language in \textsf{origlanguage}, and instead of \texttt{originally + published as}, you'll get \texttt{French edition:} or \texttt{Latin + edition:}, etc.\ (aristotle:metaphy:gr, aristotle:metaphy:trans). \mybigspace Standard \mymarginpar{\textbf{venue}} \textsf{biblatex} offers this field for use in \textsf{proceedings} and @@ -3588,11 +3826,38 @@ instead. Anything in a \textsf{venue} field will be ignored. field, currently only available in \textsf{misc} and \textsf{patent} entries in \textsf{biblatex-chicago-notes}. -\mybigspace Standard \mymarginpar{\textbf{volume}} \textsf{biblatex} +\mybigspace Standard \colmarginpar{\textbf{volume}} \textsf{biblatex} field. It holds the volume of a \textsf{journaltitle} in \textsf{article} (and some \textsf{review}) entries, and also the -volume of a multi-volume work in many other sorts of entry. Cf.\ -\textsf{part}. +volume of a multi-volume work in many other sorts of entry. The +treatment and placement of \textsf{volume} information in +\textsf{book}-like entries is rather complicated in the \emph{Manual} +(14.121--27). In bibliography entries, the \textsf{volume} appears +either before the \textsf{maintitle} or before the publication +information. In long notes, the same applies, but with the additional +possibility of this information appearing \emph{after} the publication +data, just before page numbers. In the past, if you wanted the volume +information to appear here, you had to leave that information out of +your .bib entry and give it in the \textsf{pages} or \textsf{postnote} +field. Now, you can use the new \textsf{biblatex-chicago} option +\mycolor{\texttt{delayvolume}} \colmarginpar{\texttt{delayvolume}} in +your preamble or in the \textsf{options} field of an entry to ensure +that any \textsf{volume} information that would normally have appeared +just before the publication data in a long note appears after it. + +\mylittlespace The \textsf{volume} information in both books and +periodicals, and in both the bibliography and long notes, can appear +\emph{immediately before} the page number(s). In such a case, the +\emph{Manual} prescribes the same treatment for both sorts of sources, +that is, that \enquote{a colon separates the volume number from the + page number with no intervening space.} I have implemented this, +but at the request of Clea~F.\ Rees I have made this punctuation +customizable, using the new command \mycolor{\cmd{postvolpunct}} +\colmarginpar{\cmd{postvolpunct}}. By default it prints +\cmd{addcolon}, but you can use \cmd{renewcommand\{\textbackslash + postvolpunct\}\{\ldots\}} in your preamble to redefine it. Cf.\ +\textsf{part}, and the command documentation in +section~\ref{sec:formatcommands}. %\enlargethispage{\baselineskip} @@ -3603,10 +3868,20 @@ odd changes to the punctuation of short notes (14.159; meredith:letters). If both a \textsf{volume} and a \textsf{volumes} field are present, as may occur particularly in cross-referenced entries, then \textsf{biblatex-chicago} will ordinarily suppress the -\textsf{volumes} field, unless a \textsf{maintitle} is present. +\textsf{volumes} field in the list of references, except in some +instances when a \textsf{maintitle} is present. In this latter case, +if the \textsf{volume} appears before the \textsf{maintitle}, the new +option \mycolor{\texttt{hidevolumes}}, +\colmarginpar{\texttt{hidevolumes}} set to \texttt{true} by default, +controls whether to print the \textsf{volumes} field after that title +or not. Set it to \texttt{false} either in the preamble or in the +\textsf{options} field of your entry to have it appear after the +\textsf{maintitle}. See the option's documentation in +section~\ref{sec:chicpreset}, below. \mybigspace A \mymarginpar{\textbf{xref}} modified \textsf{crossref} -field provided by \textsf{biblatex}. See \textbf{crossref}, above. +field provided by \textsf{biblatex}, which prevents inheritance of any +data from the parent entry. See \textbf{crossref}, above. \mybigspace Standard \mymarginpar{\textbf{year}} \textsf{biblatex} field. It usually identifies the year of publication, though unlike @@ -3673,6 +3948,9 @@ complete list of fields where this functionality is active: as you expect them to here.) \item The \textbf{maintitleaddon} field in all entry types. \item The \textbf{note} field in all entry types. +\item The \mycolor{\textbf{part}} field in entry types that use it. +\item The \mycolor{\textbf{prenote}} field prefixed to citation + commands. \item The \textbf{shorttitle} field in the \textsf{review} (\textsf{suppperiodical}) entry type and in the \textsf{misc} type, in the latter case, however, only when there is an @@ -3775,7 +4053,28 @@ the \textsf{type} field, which formerly served as a switch for \cmd{custpunct}, in other contexts (see \textbf{artwork}, \textbf{image}, and \textbf{suppbook} above). -\mybigspace This \colmarginpar{\textbf{\textbackslash isdot}} is a +\mybigspace These \colmarginpar{\textbf{\textbackslash + foottextcite\\\textbackslash foottextcites}} two commands look +like citation commands, but are in fact wrappers for customizing the +behavior of the \cmd{textcite} and \cmd{textcites} citation commands +when they are used inside a foot- or an endnote. By default, in such +a context these commands print the name of the \textsf{author(s)} +followed by the \emph{short} citation or citations, i.e., usually +\textsf{title} only, enclosed within parentheses. You can change the +way the citation part is presented by using \cmd{renewcommand} in your +preamble. The default definitions are: \texttt{\{\textbackslash + addspace\textbackslash headlessparenshortcite\}} and +\texttt{\{\textbackslash addspace\textbackslash + headlessparenshortcites\}}. If you wanted to return to the default +behavior of the previous release of \textsf{biblatex-chicago}, for +example, you could change the first to: \texttt{\{\textbackslash + newcunit\textbackslash bibstring\{in\}\textbackslash + addspace\textbackslash headlesscite\}}, and the second similarly, +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.) + +\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 in entry fields that, for one reason or another, you may have wanted @@ -3851,6 +4150,26 @@ the latter isn't strictly necessary in texts using an American style, to which \textsf{biblatex} defaults when \textsf{csquotes} isn't loaded. +\mybigspace The \colmarginpar{\textbf{\textbackslash postvolpunct}} +\emph{Manual} (14.121) unequivocally prescribes that when a +\textsf{volume} number appears immediately before a page number, +\enquote{the abbreviation \emph{vol.}\ is omitted and a colon + separates the volume number from the page number with no intervening + space.} The treatment is basically the same whether the citation is +of a book or of a periodical, and it appears to be a surprising and +unwelcome feature for many users, conflicting as it may do with +established typographic traditions in a number of contexts. Clea~ F.\ +Rees has requested a way to customize this, so I have provided the new +\cmd{postvolpunct} command, which prints the punctuation between a +\textsf{volume} number and a page number. It is set to \cmd{addcolon} +by default, except when the current language of the entry is French, +in which case it defaults to \cmd{addcolon\textbackslash addspace}. +You can use \cmd{renewcommand\{\textbackslash + postvolpunct\}\{\ldots\}} in your preamble to redefine it, but +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. + \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 @@ -3911,19 +4230,19 @@ compiler. partedit-\\andtrans}} before, but for when when an editor is also a translator (ratliff:review). -\mybigspace As \mymarginpar{\textbf{\textbackslash +\vspace{1.3\baselineskip} As \mymarginpar{\textbf{\textbackslash partedit-\\transandcomp}} before, but for when an editor is also a translator and a compiler. +\vspace{1.4\baselineskip} As \mymarginpar{\textbf{\textbackslash + parttrans-\\andcomp}} before, but for when a translator is also a +compiler. + \vspace{1.3\baselineskip} As \mymarginpar{\textbf{\textbackslash parttrans}} before, but for use when identifying a translator whose name doesn't conveniently fit into the usual fields (\textsf{translator} and \textsf{nameb}). -\mybigspace As \mymarginpar{\textbf{\textbackslash - parttrans-\\andcomp}} before, but for when a translator is also a -compiler. - \subsubsection{Citation Commands} \label{sec:citecommands} @@ -3951,7 +4270,7 @@ to use the \cmd{cite} command within a \cmd{footnote} command, the solution is to use \cmd{Cite} instead. Alternatively, don't use a \cmd{footnote} macro at all, rather try \cmd{footcite} or \cmd{autocite} with the optional prenote and postnote arguments. Cf.\ -\cmd{Citetitle} below, and also section~3.6 of \textsf{biblatex.pdf}. +\cmd{Citetitle} below, and also section~3.7 of \textsf{biblatex.pdf}. \mybigspace I \mymarginpar{\textbf{\textbackslash autocite}} haven't adapted this in the slightest, but I thought it worth pointing out @@ -3981,7 +4300,7 @@ Thuc.\ 2.40.2--3 (14.258). You'll need to put it inside a \cmd{footnote} command manually. (Cf.\ also \textsf{entrysubtype} in section~\ref{sec:entryfields}, above.) -\mybigspace This \colmarginpar{\textbf{\textbackslash citejournal}} +\mybigspace This \mymarginpar{\textbf{\textbackslash citejournal}} command provides an alternative short form when citing journal \textsf{articles}, giving the \textsf{journaltitle} and \textsf{volume} number instead of the article \textsf{title} after the @@ -4010,6 +4329,8 @@ 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} + \mybigspace Another \mymarginpar{\textbf{\textbackslash footfullcite}} standard \textsf{biblatex} command, modified to work properly with \textsf{biblatex-chicago-notes}, and provided in case you find @@ -4025,8 +4346,6 @@ is a standard command, and it too provides a full citation, but unlike the previous command it doesn't automatically place it in a footnote. It may be useful within long textual notes. -%\enlargethispage{-\baselineskip} - \mybigspace Matthew \mymarginpar{\textbf{\textbackslash headlesscite}} Lundin requested a more generalized \cmd{headlesscite} macro, suppressing the author's name in specific contexts while allowing @@ -4077,28 +4396,37 @@ notes this falls back to the standard format, but in long notes it simply omits the given names of the \textsf{author} and provides only the surname, along with the full data of the entry. (Cf.\ 14.52.) -\mybigspace Norman \mymarginpar{\textbf{\textbackslash textcite}} Gray -started a discussion on +\mybigspace Norman \colmarginpar{\textbf{\textbackslash textcite}} +Gray started a discussion on \href{http://tex.stackexchange.com/questions/67837/citations-as-nouns-in-biblatex-chicago}{Stackexchange} which established both that \textsf{biblatex} had begun including a \cmd{textcite} command in its verbose styles and that \textsf{biblatex-chicago-notes} hadn't kept up. In that thread Audrey Boruvka provided some code, adapted from \textsf{verbose.cbx}, to provide such a command for the Chicago notes \&\ bibliography style. -I'm still not entirely certain how best to accommodate this request -within the package, but there are now at least commands +More recently, Rasmus Pank Rouland pointed out some changes in +\textsf{biblatex} that made the \cmd{textcites} command fit more +elegantly into the flow of text. I've adapted this solution in this +release. I'm still not entirely certain how best to accommodate this +request within the package, but there are now at least commands (\cmd{textcite} and \cmd{textcites}) for users to test. Their functionality is a little complicated. In the main text, they will -provide an \textsf{author's} name, followed immediately by a foot- or -endnote which contains the full (or short) reference, following the -usual rules. If you use \cmd{textcite} inside a foot- or endnote, -then you'll get the \textsf{author's} name followed by the bibstring -\enquote{\texttt{in},} then the headless citation. This latter usage -is slightly awkward when the citation is a full one, but works -reasonably well for short notes, and I'm as yet unconvinced that -putting the citation inside parentheses, generally discouraged by the -\emph{Manual} (14.33), helps this situation much. If you disagree, -please let me know. +provide an \textsf{author's} name(s), followed immediately by a foot- +or endnote which contains the full (or short) reference, following the +usual rules. If you use \cmd{textcite} inside \colmarginpar{New!} a +foot- or endnote, then the default behavior has changed for this +release, but I've made that behavior configurable, so you can tailor +it to your needs. Now, by default, for both \cmd{textcite} and +\cmd{textcites}, you'll get the \textsf{author's} name(s) followed by +a headless \emph{short} citation (or citations) placed within +parentheses. Such parentheses are generally discouraged by the +\emph{Manual} (14.33), but are nonetheless somewhat better than other +solutions for smoothing the syntax of sentences that include such a +citation. I have made the citation short, i.e., \textsf{title} only, +because this again seems likely to be the least awkward solution +syntactically. If you want to configure this behavior for either +citation command, please see \mycolor{\cmd{foottextcite}} and +\mycolor{\cmd{foottextcites}} in section~\ref{sec:formatcommands}. \mylittlespace If you look at \textsf{chicago-notes.cbx}, you'll see a number of other citation commands, but those are intended for internal @@ -4150,7 +4478,7 @@ command to disable this functionality in any given reference, or indeed one of the \texttt{fullcite} commands if you need the long note form for any reason. -\mylittlespace This \marginpar{\texttt{loccittracker\\=constrict}} +\mylittlespace This \mymarginpar{\texttt{loccittracker\\=constrict}} allows the package to determine whether two consecutive citations of the same source also cite the same page of that source. In such a case, \texttt{Ibid} alone will be printed, without the page reference, @@ -4290,34 +4618,34 @@ need a \textsf{sortkey} or else it will be alphabetized by \subsubsection{{Pre-Set \textsf{chicago} Options}} \label{sec:chicpreset} -At \mymarginpar{\texttt{bookpages=\\true}} the request of Scot -Becker, I have included this rather specialized option, which controls -the printing of the \textsf{pages} field in \textsf{book} entries. -Some bibliographic managers, apparently, place the total page count in -that field by default, and this option allows you to stop the printing -of this information in notes and bibliography. It defaults to true, -which means the field is printed, but it can be set to false either in -the preamble, for the whole document, or on a per-entry basis in the -\textsf{options} field (though rather than use this latter method it -would make sense to eliminate the \textsf{pages} field from the -affected entries). +At \mymarginpar{\texttt{bookpages=\\true}} the request +of Scot Becker, I have included this rather specialized option, which +controls the printing of the \textsf{pages} field in \textsf{book} +entries. Some bibliographic managers, apparently, place the total +page count in that field by default, and this option allows you to +stop the printing of this information in notes and bibliography. It +defaults to true, which means the field is printed, but it can be set +to false either in the preamble, for the whole document, or on a +per-entry basis in the \textsf{options} field (though rather than use +this latter method it would make sense to eliminate the \textsf{pages} +field from the affected entries). \mylittlespace This \mymarginpar{\texttt{doi=true}} option controls whether any \textsf{doi} fields present in the .bib file will be printed in notes and bibliography. At the request of Daniel Possenriede, and keeping in mind the \emph{Manual's} preference for this field instead of a \textsf{url} (14.6), I have added a third -switch, \mycolor{\texttt{only}}, which prints the \textsf{doi} if it -is present and the \textsf{url} only if there is no \textsf{doi}. The -package default remains the same, however --- it defaults to true, -which will print both \textsf{doi} and \textsf{url} if both are -present. The option can be set to \texttt{only} or to \texttt{false} -either in the preamble, for the whole document, or on a per-entry -basis in the \textsf{options} field. In \textsf{online} entries, the -\textsf{doi} field will always be printed, but the \texttt{only} -switch will still eliminate any \textsf{url}. +switch, \texttt{only}, which prints the \textsf{doi} if it is present +and the \textsf{url} only if there is no \textsf{doi}. The package +default remains the same, however --- it defaults to true, which will +print both \textsf{doi} and \textsf{url} if both are present. The +option can be set to \texttt{only} or to \texttt{false} either in the +preamble, for the whole document, or on a per-entry basis in the +\textsf{options} field. In \textsf{online} entries, the \textsf{doi} +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 @@ -4404,6 +4732,91 @@ you can change it either in the preamble for the whole document or, for specific fields, in the \textsf{options} field of individual entries. +\mylittlespace At \colmarginpar{\texttt{booklongxref=\\true}} the +request of Bertold Schweitzer, I have included two new options for +controlling whether and where \textsf{biblatex-chicago} will print +abbreviated references when you cite more than one part of a given +collection or series. This option controls whether multiple +\textsf{book}, \textsf{bookinbook}, \textsf{collection}, and +\textsf{proceedings} entries which are part of the same collection +will appear in this space-saving format. The parent collection itself +will usually be presented in, e.g., a \textsf{book}, +\textsf{bookinbook}, \textsf{mvbook}, \textsf{mvcollection}, or +\textsf{mvproceedings} entry, and using \textsf{crossref} or +\textsf{xref} in the child entries will allow such presentation +depending on the value of the option: + +\begin{description} +\item[\qquad true:] This is the default. If you use \textsf{crossref} + or \textsf{xref} fields in these entry types, by default you will + \emph{not} get any abbreviated references, either in notes or + bibliography. +\item[\qquad false:] You'll get abbreviated references in these entry + types both in notes and in the bibliography. +\item[\qquad notes:] The abbreviated references will not appear in + notes, but only in the bibliography. +\item[\qquad bib:] The abbreviated references will not appear in the + bibliography, but only in notes. +\end{description} + +This option can be set either in the preamble or in the +\textsf{options} field of individual entries. For controlling the +behavior of \textsf{inbook}, \textsf{incollection}, +\textsf{inproceedings}, and \textsf{letter} entries, please see +\mycolor{\texttt{longcrossref}}, below, and also the documentation of +\textsf{crossref} in section~\ref{sec:entryfields}. + +\mylittlespace If \colmarginpar{\texttt{hidevolumes=\\true}} both a +\textsf{volume} and a \textsf{volumes} field are present, as may occur +particularly in cross-referenced entries, then +\textsf{biblatex-chicago} will ordinarily suppress the +\textsf{volumes} field. In some instances, when a \textsf{maintitle} +is present, this may not be the desired result. In this latter case, +if the \textsf{volume} appears before the \textsf{maintitle}, this new +option, set to \texttt{true} by default, controls whether to print the +\textsf{volumes} field after that title or not. Set it to +\texttt{false} either in the preamble or in the \textsf{options} field +of your entry to have it appear after the \textsf{maintitle}. + +\mylittlespace This \colmarginpar{\texttt{longcrossref=\\false}} is +the second option, requested by Bertold Schweitzer, for controlling +whether and where \textsf{biblatex-chicago} will print abbreviated +references when you cite more than one part of a given collection or +series. It controls the settings for the entry types more-or-less +authorized by the \emph{Manual}, i.e., \textsf{inbook}, +\textsf{incollection}, \textsf{inproceedings}, and \textsf{letter}. +The mechanism itself is enabled by multiple \textsf{crossref} or +\textsf{xref} references to the same parent, whether that be, e.g., a +\textsf{collection}, an \textsf{mvcollection}, a \textsf{proceedings}, +or an \textsf{mvproceedings} entry. Given these multiple cross +references, the presentation in the reference apparatus will be +governed by the following options: + +\begin{description} +\item[\qquad false:] This is the default. If you use + \textsf{crossref} or \textsf{xref} fields in the four mentioned + entry types, you'll get the abbreviated references in both notes and + bibliography. +\item[\qquad true:] You'll get no abbreviated references in these + entry types, either in notes or in the bibliography. +\item[\qquad notes:] The abbreviated references will not appear in + notes, but only in the bibliography. +\item[\qquad bib:] The abbreviated references will not appear in the + bibliography, but only in notes. +\item[\qquad none:] This switch is special, allowing you with one + setting to provide abbreviated references not just to the four entry + types mentioned but also to \textsf{book}, \textsf{bookinbook}, + \textsf{collection}, and \textsf{proceedings} entries, both in notes + and in the bibliography. +\end{description} + +This option can be set either in the preamble or in the +\textsf{options} field of individual entries. For controlling the +behavior of \textsf{book}, \textsf{bookinbook}, \textsf{collection}, +and \textsf{proceedings} entries, please see +\mycolor{\texttt{booklongxref}}, above, and also the documentation of +\textsf{crossref} in section~\ref{sec:entryfields}. + \mylittlespace This \mymarginpar{\texttt{usecompiler=\\true}} option enables automatic use of the name of the compiler (in the \textsf{namec} field) at the head of an entry, usually in the absence @@ -4434,7 +4847,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 second can be used even if you load the +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 \cmd{usepackage\{biblatex-chicago\}} call in your preamble. @@ -4445,11 +4858,30 @@ produce annotated bibliographies. If you turn this option on then the contents of your \textsf{annotation} (or \textsf{annote}) field will be printed after the bibliographical reference. (You can also use external files to store annotations -- please see -\textsf{biblatex.pdf} §~3.10.7 for details on how to do this.) This +\textsf{biblatex.pdf} §~3.11.8 for details on how to do this.) This 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 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 +on the presence or absence of a \textsf{booktitle} or a +\textsf{maintitle}, \textsf{volume} data will be presented, in the +bibliography, either before a \textsf{maintitle} or after a +\textsf{booktitle} or \textsf{maintitle}, that is, just before +publication information. This, so far, is handled for you +automatically by \textsf{biblatex-chicago-notes}. In long notes, the +same options apply, but it is also sometimes better to place +\textsf{volume} information \emph{after} the publication information +and just before any page numbers, so I have included this option, +which you can set either for the whole document or on a per-entry +basis, to allow you to move \textsf{volume} data to the end of a long +note. Please note that this doesn't affect any \textsf{volume} data +printed \emph{before} a \textsf{maintitle}, but only data that would, +without this option, be printed \emph{after} a \textsf{booktitle} or +\textsf{maintitle}. Cf.\ also \mycolor{\cmd{postvolpunct}}, below. + \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 @@ -4507,7 +4939,19 @@ form. For more fine-grained control of individual citations you'll probably want to use specialized citation commands, instead. See section \ref{sec:citecommands}. -\enlargethispage{\baselineskip} +\mylittlespace As \colmarginpar{\texttt{omitxrefdate}} part of the new +abbreviated cross-referencing functionality for \textsf{book}, +\textsf{bookinbook}, \textsf{collection}, and \textsf{proceedings} +entries, I have thought it helpful to include, in the abbreviated +references only, a date for any \textsf{title} that's part of a +\textsf{maintitle}, though not for those that are only part of +\textsf{booktitle}. If these dates annoy you, you can use this option +to turn them off, either in the preamble for the document as a whole +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 This \mymarginpar{\texttt{short}} option means that your text will only use the short note form, even in the first @@ -4553,20 +4997,20 @@ rule intervenes to emphasize this continuation. I haven't tested this code very thoroughly, and it's possible that frequent use of floats might interfere with it. Let me know if it causes problems. - \subsection{General Usage Hints} \label{sec:hints} \subsubsection{Loading the Style} \label{sec:loading} -With the addition of the author-date style to the package, I have -provided two keys for choosing which style to load, \texttt{notes} and -\texttt{authordate}, one of which you put in the options to the -\cmd{usepackage} command. The default way of loading the notes + -bibliography style has therefore slightly changed. With early -versions of \textsf{biblatex-chicago-notes}, the standard way of -loading the package was via a call to \textsf{biblatex}, e.g.: +With the addition of the author-date styles to the package, I have +provided 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. The default way +of loading the notes + bibliography style has therefore slightly +changed. With early versions of \textsf{biblatex-chicago-notes}, the +standard way of loading the package was via a call to +\textsf{biblatex}, e.g.: \begin{quote} \cmd{usepackage[style=chicago-notes,strict,backend=bibtex8,\%\\ babel=other,bibencoding=inputenc]\{biblatex\}} @@ -4575,7 +5019,7 @@ Now, the default way to load the style, and one that will in the vast majority of standard cases produce the same results as the old invocation, will look like this: \begin{quote} - \cmd{usepackage[notes,strict,backend=bibtex8,babel=other,\%\\ + \cmd{usepackage[notes,strict,backend=biber,autolang=other,\%\\ bibencoding=inputenc]\{biblatex-chicago\}} \end{quote} @@ -4608,7 +5052,7 @@ footnotes. Also in this file is the code that calls Chicago-specific bibstrings I've defined unless you provide, in your 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.7 in Lehman's \textsf{biblatex.pdf}. +§§~4.9.1 and 4.11.8 in Lehman's \textsf{biblatex.pdf}. %\enlargethispage{-\baselineskip} @@ -4692,9 +5136,17 @@ after the author's initials in a bibliography, usually in a provide such formatting elsewhere, please let me know. \mylittlespace Finally, allow me to reiterate what Philipp Lehman says -in \textsf{biblatex.pdf}, to wit, use \textsf{bibtex8}, rather than -standard \textsc{Bib}\TeX, and avoid the cryptic errors that ensue -when your .bib file gets to a certain size. +in \textsf{biblatex.pdf}, to wit, use \textsf{Biber} if you can. It's +not absolutely required for the notes \&\ bibliography style, but it is +required for an increasing amount of very useful functionality in all +\textsf{biblatex} styles. In this release, for example, the new +\mycolor{\textbf{mv*}} entry types can help streamline your .bib +database, particularly when used as \textsf{crossref} targets, but +this utility is severely limited if you are using one of the older +backends. If you have to use one of these older backends, then Lehman +advises using \textsf{bibtex8}, rather than standard \textsc{Bib}\TeX, +to avoid the cryptic errors that ensue when your .bib file gets to a +certain size. \section{The Specification: Author-Date} \label{sec:authdate} @@ -4722,7 +5174,7 @@ presentation in combination with its own recommendations for other parts of the reference apparatus (15.45). In practice, the differences between the two styles necessitate separate discussions of the \textsf{title} field and one extra package option -(\mycolor{\texttt{headline}}), and that's about it. +(\texttt{headline}), and that's about it. \mylittlespace Generally, then, the following documentation covers both Chicago author-date styles, and attempts to explain all the parts @@ -4754,18 +5206,21 @@ reference keys from the latter file below in parentheses. 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: \mycolor{\textbf{article}}, \textbf{artwork}, -\textbf{audio}, \textbf{book}, \textbf{bookinbook}, \textbf{booklet}, -\textbf{collection}, \textbf{customc}, \textbf{image}, +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}, \textbf{online} (with its alias \textbf{www}), -\textbf{patent}, \textbf{periodical}, \textbf{proceedings}, -\textbf{reference}, \textbf{report} (with its alias -\textbf{techreport}), \mycolor{\textbf{review}}, \textbf{suppbook}, -\textbf{suppcollection}, \textbf{suppperiodical}, \textbf{thesis} -(with its aliases \textbf{mastersthesis} and \textbf{phdthesis}), -\textbf{unpublished}, and \textbf{video}. +\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 @@ -4778,7 +5233,7 @@ very few fields when you use \textsf{biblatex-chicago-authordate}, so it seemed to me better to gather information pertaining to fields in the next section. -\mybigspace The \colmarginpar{\textbf{article}} \emph{Chicago Manual of +\mybigspace The \mymarginpar{\textbf{article}} \emph{Chicago Manual of Style} (14.170) recognizes three different sorts of periodical publication, \enquote{journals,} \enquote{magazines,} and \enquote{newspapers.} The first (14.172) includes \enquote{scholarly @@ -4821,14 +5276,13 @@ date of publication in a parenthetical reference, including any other information in the main text (14.206), thereby obviating the need to present such an entry in the list of references. To utilize this method in the author-date styles, in addition to a \texttt{magazine} -\textsf{entrysubtype}, you'll need to place -\mycolor{\texttt{cmsdate=full}} into the \textsf{options} field, -including \texttt{skipbib} there as well to stop the entry printing in -the list of references. If the entry only contains a \textsf{date} -and \textsf{journaltitle} that's enough, but if it's a fuller entry -also containing an \textsf{author} then you'll also need -\texttt{useauthor=false} in the \textsf{options} field. Other surplus -fields will be ignored. (See osborne:poison.) +\textsf{entrysubtype}, you'll need to place \texttt{cmsdate=full} into +the \textsf{options} field, including \texttt{skipbib} there as well +to stop the entry printing in the list of references. If the entry +only contains a \textsf{date} and \textsf{journaltitle} that's enough, +but if it's a fuller entry also containing an \textsf{author} then +you'll also need \texttt{useauthor=false} in the \textsf{options} +field. Other surplus fields will be ignored. (See osborne:poison.) \mylittlespace If you are familiar with the notes \&\ bibliography style, you'll know that the \emph{Manual} treats reviews (of books, @@ -4853,8 +5307,6 @@ notice that the code for formatting any sort of review still exists in 0.6}, but this new arrangement is somewhat simpler and therefore, I hope, better.) -%\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 latter in the \textsf{titleaddon} field. Standard \textsf{biblatex} @@ -4869,6 +5321,8 @@ 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} + \mylittlespace No less than eight more things need explication under this heading. First, since the \emph{Manual} specifies that what goes into the \textsf{titleaddon} field of \textsf{article} entries stays @@ -4889,7 +5343,7 @@ generic title, then you want the \textsf{review} entry type. (See \mylittlespace Third, the 16th edition of the \emph{Manual} suggests that \enquote{unsigned newspaper articles or features are best dealt with in text \ldots} (14.207). As with newspaper or magazine -articles in general, you can place \mycolor{\texttt{cmsdate=full}} and +articles in general, you can place \texttt{cmsdate=full} and \texttt{skipbib} into the \textsf{options} field to produce an augmented in-text citation whilst keeping this material out of the reference list. If you do use the reference list, then the standard @@ -4899,11 +5353,11 @@ of the missing author. Just to clarify: in \textsf{article} or \textsf{review} entries, \textsf{entrysubtype} \texttt{magazine}, a missing \textsf{author} field results in the name of the periodical (in the \textsf{journaltitle} field) being used as the missing author. -Without an \colmarginpar{New!} \textsf{entrysubtype}, and assuming -that no name whatsoever can be found to put at the head of the entry, -the \textsf{title} will be used, not the \textsf{journaltitle}, or so -I interpret the \emph{Manual} (14.175). The new default sorting -scheme in \textsf{biblatex-chicago-authordate} considers the +Without an \textsf{entrysubtype}, and assuming that no name whatsoever +can be found to put at the head of the entry, the \textsf{title} will +be used, not the \textsf{journaltitle}, or so I interpret the +\emph{Manual} (14.175). The new default sorting scheme in +\textsf{biblatex-chicago-authordate} considers the \textsf{journaltitle} before the \textsf{title}, so if the latter heads an entry you'll need a \textsf{sortkey}, just as you will if you retain the definite or indefinite article at the beginning of the @@ -4916,20 +5370,20 @@ go, as usual, in \textsf{shorttitle}. (See section~\ref{sec:authformopts}, below; lakeforester:pushcarts, nyt:trevorobit, unsigned:ranke.) -\mylittlespace Fourth, \colmarginpar{New!} Bertold Schweitzer has -pointed out, following the \emph{Manual} (14.192), that while an -\textsf{issuetitle} often has an \textsf{editor}, it is not too -unusual for a \textsf{title} to have, e.g., an \textsf{editor} and/or -a \textsf{translator}. In order to allow as many permutations as -possible on this theme, I have brought the \textsf{article} entry type -into line with most of the other types in allowing the use of the -\textsf{namea} and \textsf{nameb} fields in order to associate an -editor or a translator specifically with the \textsf{title}. The -\textsf{editor} and \textsf{translator} fields, in strict homology -with other entry types, are associated with the \textsf{issuetitle} if -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. +\mylittlespace Fourth, Bertold Schweitzer has pointed out, following +the \emph{Manual} (14.192), that while an \textsf{issuetitle} often +has an \textsf{editor}, it is not too unusual for a \textsf{title} to +have, e.g., an \textsf{editor} and/or a \textsf{translator}. In order +to allow as many permutations as possible on this theme, I have +brought the \textsf{article} entry type into line with most of the +other types in allowing the use of the \textsf{namea} and +\textsf{nameb} fields in order to associate an editor or a translator +specifically with the \textsf{title}. The \textsf{editor} and +\textsf{translator} fields, in strict homology with other entry types, +are associated with the \textsf{issuetitle} if 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} @@ -4988,7 +5442,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 @@ -5112,18 +5566,34 @@ from a cycle. If the medium in question needs specifying, the \textsf{biblatex-chicago} provides no automated handling, e.g., a librettist (verdi:corsaro). -\mybigspace This \mymarginpar{\textbf{bookinbook}} type provides the +\mybigspace This \colmarginpar{\textbf{book}} is the standard +\textsf{biblatex} and \textsc{Bib}\TeX\ entry type, but with this +release the package can now provide automatically abbreviated +references in the reference list when you use a \textsf{crossref} or +an \textsf{xref} field. The functionality is not enabled by default, +but you can enable it in the preamble or in the \textsf{options} field +using the new \mycolor{\texttt{booklongxref}} option. Please see +\textbf{crossref} in section~\ref{sec:fields:authdate} and +\texttt{booklongxref} in section~\ref{sec:authpreset}, below. Also, +cf.\ harley:ancient:cart, harley:cartography, and harley:hoc for how +this might look. + +\mybigspace This \colmarginpar{\textbf{bookinbook}} type provides the means of referring to parts of books that are considered, in other contexts, themselves to be books, rather than chapters, essays, or -articles. (Older versions of \textsf{biblatex-chicago} used -\textbf{customb} for this purpose, but this is now deprecated.) Such -an entry can have a \textsf{title} and a \textsf{maintitle}, but it -can also contain a \textsf{booktitle}, all three of which will be -italicized in the reference matter. In general usage it is, -therefore, rather like the traditional \textsf{inbook} type, only with -its \textsf{title} in italics rather than in quotation marks. (See -\emph{Manual} 14.114, 14.127, 14.130; bernard:boris, euripides:orestes, -plato:republic:gr.) +articles. Such an entry can have a \textsf{title} and a +\textsf{maintitle}, but it can also contain a \textsf{booktitle}, all +three of which will be italicized in the reference matter. In general +usage it is, therefore, rather like the traditional \textsf{inbook} +type, only with its \textsf{title} in italics rather than in quotation +marks. As with the \textsf{book} type, you can now enable +automatically abbreviated references in the reference list, though +this isn't the default. Please see \textbf{crossref} in +section~\ref{sec:fields:authdate} and \mycolor{\texttt{booklongxref}} +in section~\ref{sec:preset:authdate}, below. (Cf.\ \emph{Manual} +14.114, 14.127, 14.130; bernhard:boris, bernhard:ritter, and +bernhard:themacher for the new abbreviating functionality; also +euripides:orestes, plato:republic:gr.) \mylittlespace \textbf{NB}: The Euripides play receives slightly different presentations in 14.127 and 14.130. Although the @@ -5143,6 +5613,17 @@ which uses the \textsf{howpublished} field instead of a standard \textsf{howpublished} field should instead go in \textsf{publisher}. (See clark:mesopot.) +\mybigspace This \colmarginpar{\textbf{collection}} is the standard +\textsf{biblatex} entry type, but with this release the package can +now provide automatically abbreviated references in the reference list +when you use a \textsf{crossref} or an \textsf{xref} field. The +functionality is not enabled by default, but you can enable it in the +preamble or in the \textsf{options} field using the new +\mycolor{\texttt{booklongxref}} option. Please see \textbf{crossref} +in section~\ref{sec:fields:authdate} and \texttt{booklongxref} in +section~\ref{sec:authpreset}, below. See harley:ancient:cart, +harley:cartography, and harley:hoc for how this might look. + \mybigspace This \mymarginpar{\textbf{customa}} entry type is now obsolete, and any such entries in your .bib file will trigger an error. Please use the standard \textsf{biblatex} \textbf{letter} type @@ -5223,44 +5704,45 @@ 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} +% \enlargethispage{\baselineskip} -\mybigspace These \mymarginpar{\textbf{inbook}\\\textbf{incollection}} -two standard \textsf{biblatex} types have very nearly identical -formatting requirements as far as the Chicago specification is -concerned, but I have retained both of them for compatibility. -\textsf{Biblatex.pdf} (§~2.1.1) intends the first for \enquote{a part - of a book which forms a self-contained unit with its own title,} -while the second would hold \enquote{a contribution to a collection - which forms a self-contained unit with a distinct author and its own - title.} The \textsf{title} of both sorts will be placed within -quotation marks, and in general you can use either type for most -material falling into these categories. There is, however, an -important difference between them, as it is only in -\textsf{incollection} entries that I implement the \emph{Manual's} -recommendations for space-saving abbreviations in the list of -references when you cite multiple pieces from the same -\textsf{collection}. These abbreviations are activated when you use -the \textsf{crossref} or \textsf{xref} field in \textsf{incollection} -entries, and not in \textsf{inbook} entries, mainly because the -\emph{Manual} (14.113) specifies a \enquote{multiauthor book,} at -least in the chapter devoted to the notes \&\ bibliography style. The -author-date chapter (15.37) is less clear, but the intent seems -similar. (For more on this mechanism see \textbf{crossref}, below, -and note that it is also active in \textsf{letter} and -\textsf{inproceedings} entries. There is, of course, nothing to -prevent you from using the mechanism when referring to, e.g., chapters -from a single-author book, but you'll have to use -\textsf{incollection} instead of \textsf{inbook}.) If the part of a -book to which you are referring has had a separate publishing history -as a book in its own right, then you may wish to use the -\textsf{bookinbook} type, instead, on which see above. (See -\emph{Manual} 14.111--114, 15.37; \textsf{inbook}: ashbrook:brain, -phibbs:diary, will:cohere; \textsf{incollection}: centinel:letters, -contrib:contrib, sirosh:visualcortex; ellet:galena, keating:dearborn, -and lippincott:chicago [and the \textsf{collection} entry -prairie:state] demonstrate the use of the \textsf{crossref} field with -its attendant abbreviations in the list of references.) +\mybigspace These +\mymarginpar{\mycolor{\textbf{inbook}}\\\textbf{incollection}} two +standard \textsf{biblatex} types have very nearly identical formatting +requirements as far as the Chicago specification is concerned, but I +have retained both of them for compatibility. \textsf{Biblatex.pdf} +(§~2.1.1) intends the first for \enquote{a part of a book which forms + a self-contained unit with its own title,} while the second would +hold \enquote{a contribution to a collection which forms a + self-contained unit with a distinct author and its own title.} The +\textsf{title} of both sorts will be placed within quotation marks, +and in general you can use either type for most material falling into +these categories. There was an important difference between them, as +in previous releases of \textsf{biblatex-chicago} it was only in +\textsf{incollection} entries that I implemented the \emph{Manual's} +recommendations for space-saving abbreviations in the reference list +when you cite multiple pieces from the same \textsf{collection}. +These abbreviations are now activated by default when you use the +\textsf{crossref} or \textsf{xref} field in \textsf{incollection} +entries \emph{and} in \textsf{inbook} entries, because although the +\emph{Manual} (14.113) here specifies a \enquote{multiauthor book,} at +least for the notes \&\ bibliography style, I believe the distinction +between the two is fine enough, and the author-date discussion in +15.37 general enough, to encourage similar treatments. (For more on +this mechanism see \textbf{crossref} in +section~\ref{sec:fields:authdate}, below, and the new option +\mycolor{\texttt{longcrossref}} in section~\ref{sec:authpreset}. +Please note that it is also active by default in \textsf{letter} and +\textsf{inproceedings} entries.) If the part of a book to which you +are referring has had a separate publishing history as a book in its +own right, then you may wish to use the \textsf{bookinbook} type, +instead, on which see above. (See \emph{Manual} 14.111--114, 15.37; +\textsf{inbook}: ashbrook:brain, phibbs:diary, will:cohere; +\textsf{incollection}: centinel:letters, contrib:contrib, +sirosh:visualcortex; ellet:galena, keating:dearborn, and +lippincott:chicago [and the \textsf{collection} entry prairie:state] +demonstrate the use of the \textsf{crossref} field with its attendant +abbreviations in the list of references.) \mylittlespace \textbf{NB}: The \emph{Manual} suggests that, when referring to a chapter, one use either a chapter number or the @@ -5277,8 +5759,10 @@ even though the \emph{Manual} doesn't specify its use (14.226). Please note, also, that the \textsf{crossref} and \textsf{xref} mechanism for shortening citations of multiple pieces from the same \textsf{proceedings} is operative here, just as it is in -\textsf{incollection} entries. See \textbf{crossref}, below, for more -details. +\textsf{incollection} and \textsf{inbook} entries. See +\textbf{crossref} in section~\ref{sec:fields:authdate} and the new +option \mycolor{\texttt{longcrossref}} in +section~\ref{sec:authpreset}, below, for more details. \mybigspace This \mymarginpar{\textbf{inreference}} entry type is aliased to \textsf{incollection} in the standard styles, but the @@ -5379,7 +5863,7 @@ and \textsf{biblatex} will use the \textsf{origyear} as the citation, and also ensuring that the letters \texttt{a,b,c} are appended to disambiguate the two sources. You no longer need anything in the \textsf{options} field at all, thanks to the way -\cmd{DeclareLabelyear} works through the possibilities and finds a +\cmd{DeclareLabeldate} works through the possibilities and finds a date to head the entry. In this case, it works because we are using the \textsf{xref} mechanism to refer to the whole published collection (white:total), so a separate citation of that entry provides the @@ -5387,6 +5871,8 @@ 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} + \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 see what kinds of effects they have on the final result, and also read @@ -5604,10 +6090,9 @@ equivalences. printed here using the new \mycolor{\textsf{userd}} field, which acts as a sort of date type modifier. In \textsf{music} entries, \textsf{userd} will be prepended to an \textsf{eventdate} if there - is one, barring that to the \textsf{origdate}, and to a possible - \textsf{urldate} absent those two, the latter behavior being the - standard across most other entry types. (See holiday:fool, - nytrumpet:art.) + is one, barring that to the \textsf{origdate}, barring that to a + \textsf{urldate}, and absent those three to a \textsf{date}. (See + holiday:fool, nytrumpet:art.) \item[type:] As in all the audiovisual entry types, the \textsf{type} field holds the medium of the recording, e.g., vinyl, 33 rpm, 8-track tape, cassette, compact disc, mp3, ogg vorbis. @@ -5622,12 +6107,50 @@ formatting choices there, from which I have made selections for variations were rules as opposed to possibilities, so I've ignored some of them in the code. Arguments as to why I'm wrong will, of course, be entertained. (Cf. 14.276--77, 15.53; \textsf{eventdate}, -\textsf{origdate}, \textsf{userd}; \cmd{DeclareLabelyear} in +\textsf{origdate}, \textsf{userd}; \cmd{DeclareLabeldate} in section~\ref{sec:authformopts} and \texttt{avdate} in section~\ref{sec:authpreset}; auden:reading, beethoven:sonata29, bernstein:shostakovich, floyd:atom, holiday:fool, nytrumpet:art, rubinstein:chopin.) +\mybigspace All \colmarginpar{\textbf{mvbook}\\\textbf{mvcollection}% + \\\textbf{mvproceedings}\\\textbf{mvreference}} four of these entry +types are new to \textsf{biblatex-chicago}, and all function more or +less as in standard \textsf{biblatex}. I would like, however, to +emphasize a couple of things. First, each is aliased to the entry +type that results from removing the \enquote{\textbf{mv}} from their +names. Second, each has an important role as the target of +cross-references from other entries, the \textsf{title} of the +\textbf{mv*} entry \emph{always} providing a \textsf{maintitle} for +the entry referencing it. If you want to provide a \textsf{booktitle} +for the referencing entry, please use another entry type, e.g., +\textbf{collection} for \textbf{incollection} or \textbf{book} for +\textbf{inbook}. (These distinctions are particularly important to +the correct functioning of the abbreviated references that +\textsf{biblatex-chicago}, in various circumstances, provides. Please +see the documentation of the \textbf{crossref} field in +section~\ref{sec:fields:authdate}, below.) + +\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 +specific nature of the citation. In short, this means that a date +range that is right for the presentation of a multi-volume work in its +entirety isn't right for citing, e.g., a single volume of that work +which appeared in one of the years contained in the date range. +Because child entries will by default inherit all the date fields from +their parent (including the \textsf{endyear} of a date range), I have +turned off the inheritance of \textsf{date} and \textsf{origdate} +fields from all of the \textbf{mv*} entry types to any other entry +type. When the dates of the parent and of the child in such a +situation are exactly the same, then this unfortunately requires an +extra field in the child's .bib entry. When they're not the same, as +will, I believe, often be the case, this arrangement saves a lot of +annoying work in the child entry to suppress wrongly-inherited fields. +Other sorts of parent entries aren't affected by this. See +harley:ancient:cart, harley:cartography, and harley:hoc for how this +might look. + \mybigspace The \mymarginpar{\textbf{online}} \emph{Manual}'s scattered instructions (14.4--13, 14.166--169, 14.184--185, 14.200, 14.223, 14.243--246, 15.4, 15.9) for citing online materials are @@ -5713,6 +6236,16 @@ initial lowercase letter to activate the automatic capitalization routines, though this isn't strictly necessary in the author-date styles. (See \emph{Manual} 14.187; good:wholeissue.) +\mybigspace This \colmarginpar{\textbf{proceedings}} is the standard +\textsf{biblatex} and \textsc{Bib}\TeX\ entry type, but with this +release the package can now provide automatically abbreviated +references in the reference list when you use a \textsf{crossref} or +an \textsf{xref} field. The functionality is not enabled by default, +but you can enable it in the preamble or in the \textsf{options} field +using the new \mycolor{\texttt{booklongxref}} option. Please see +\textbf{crossref} in section~\ref{sec:fields:authdate} and +\texttt{booklongxref} in section~\ref{sec:authpreset}, below. + \mybigspace This \mymarginpar{\textbf{reference}} entry type is aliased to \textsf{collection} by the standard \textsf{biblatex} styles, but I intend it to be used in cases where you need to cite a @@ -5742,7 +6275,7 @@ then the \textsf{type} field automatically defaults to report type in \textsf{note} and the \textsf{institution} in \textsf{publisher}. (See herwign:office.) -\mybigspace The \colmarginpar{\textbf{review}} \textsf{review} entry +\mybigspace The \mymarginpar{\textbf{review}} \textsf{review} entry 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 @@ -5798,28 +6331,26 @@ date of publication in a parenthetical reference, including any other information in the main text (14.206), thereby obviating the need to present such an entry in the list of references. To utilize this method in the author-date styles, in addition to a \texttt{magazine} -\textsf{entrysubtype}, you'll need to place -\mycolor{\texttt{cmsdate=full}} into the \textsf{options} field, -including \texttt{skipbib} there as well to stop the entry printing in -the list of references. If the entry only contains a \textsf{date} -and \textsf{journaltitle} that's enough, but if it's a fuller entry -also containing an \textsf{author} then you'll also need -\texttt{useauthor=false} in the \textsf{options} field. Other surplus -fields will be ignored. (See osborne:poison.) +\textsf{entrysubtype}, you'll need to place \texttt{cmsdate=full} into +the \textsf{options} field, including \texttt{skipbib} there as well +to stop the entry printing in the list of references. If the entry +only contains a \textsf{date} and \textsf{journaltitle} that's enough, +but if it's a fuller entry also containing an \textsf{author} then +you'll also need \texttt{useauthor=false} in the \textsf{options} +field. Other surplus fields will be ignored. (See osborne:poison.) \mylittlespace Most of the onerous details are the same as I described them in the \textbf{article} section above, but I'll repeat some of them briefly here. If anything in the \textsf{title} needs formatting, you need to provide those instructions yourself, as the default is completely plain. \textsf{Author}-less \textsf{reviews} -are treated just like similar \textsf{articles} --- with -\colmarginpar{New!} an \textsf{entrysubtype}, the -\textsf{journaltitle} replaces the author in citations and heads the -entry in the list of references, without an \textsf{entrysubtype} the -\textsf{title} does the same. In the former case, \textsf{Biber} -handles the sorting for you, but in the latter you'll need a -\textsf{sortkey} because \textsf{journaltitle} comes before -\textsf{title} in the sorting scheme. (14.175, 14.217; +are treated just like similar \textsf{articles} --- with an +\textsf{entrysubtype}, the \textsf{journaltitle} replaces the author +in citations and heads the entry in the list of references, without an +\textsf{entrysubtype} the \textsf{title} does the same. In the former +case, \textsf{Biber} handles the sorting for you, but in the latter +you'll need a \textsf{sortkey} because \textsf{journaltitle} comes +before \textsf{title} in the sorting scheme. (14.175, 14.217; gourmet:052006, nyt:trevorobit, unsigned:ranke, and see \cmd{DeclareSortingScheme} in section~\ref{sec:authformopts}, below.). As in \textsf{misc} entries with an \textsf{entrysubtype}, words like @@ -5837,31 +6368,30 @@ whereas comments on those blogs --- or on any similar sort of online content --- need the \textsf{review} type with the same \textsf{entrysubtype}. What they will frequently also need is a date of some sort closely associated with the comment (14.246; ac:comment), -so I have now included the \mycolor{\textsf{eventdate}} in -\textsf{review} entries for just this purpose. The \textsf{eventyear} -will appear in citations and at the head of the reference list entry, -while the remainder of the \textsf{eventdate} will be printed just -after the \textsf{title}. If, in addition, you need an identifying -timestamp, then the \textsf{nameaddon} field is the place for it, but -you'll have to provide your own parentheses, in order to preserve the -possibility of providing pseudonyms in square brackets that is the -standard function of this field in all other entry types, and possibly -in the the \textsf{review} type as well. (Cf.\ the documentation of +so I have included the \textsf{eventdate} in \textsf{review} entries +for just this purpose. The \textsf{eventyear} will appear in +citations and at the head of the reference list entry, while the +remainder of the \textsf{eventdate} will be printed just after the +\textsf{title}. If, in addition, you need an identifying timestamp, +then the \textsf{nameaddon} field is the place for it, but you'll have +to provide your own parentheses, in order to preserve the possibility +of providing pseudonyms in square brackets that is the standard +function of this field in all other entry types, and possibly in the +the \textsf{review} type as well. (Cf.\ the documentation of \textsf{eventdate} in section~\ref{sec:fields:authdate}, -\cmd{DeclareLabelyear} in section~\ref{sec:authformopts}, and +\cmd{DeclareLabeldate} in section~\ref{sec:authformopts}, and \texttt{avdate} in section~\ref{sec:authpreset}.) -\mylittlespace For the \colmarginpar{New!} reasons I explained in the -\textsf{article} docs above, I have brought the \textsf{article} and -\textsf{review} entry types into line with most of the other types in -allowing the use of the \textsf{namea} and \textsf{nameb} fields in -order to associate an editor or a translator specifically with the -\textsf{title}. The \textsf{editor} and \textsf{translator} fields, -in strict homology with other entry types, are associated with the -\textsf{issuetitle} if 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. +\mylittlespace For the reasons I explained in the \textsf{article} +docs above, I have brought the \textsf{article} and \textsf{review} +entry types into line with most of the other types in allowing the use +of the \textsf{namea} and \textsf{nameb} fields in order to associate +an editor or a translator specifically with the \textsf{title}. The +\textsf{editor} and \textsf{translator} fields, in strict homology +with other entry types, are associated with the \textsf{issuetitle} if +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} @@ -5890,7 +6420,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 @@ -5982,20 +6512,20 @@ by \textsf{biblatex}. Here are the main correspondences: commonly present either the broadcast date of a particular TV program, or the recording/performance date of, for example, an opera on DVD. The style will automatically prepend the bibstring - \texttt{broadcast} to such a date, though you can use the new field - \textsf{userd} to change the string printed there. (Absent an - \textsf{eventdate}, the \textsf{userd} field in \textsf{video} - entries will revert to modifying the \textsf{urldate}, the standard - behavior in all but these and \textsf{music} entries.) Typically, - any given \textsf{video} entry will only need an \textsf{eventdate} - \emph{or} an \textsf{origdate}, and it is this date that will appear - in citations and at the head of the entry in the reference list. - It's conceivable that you may need all three dates, in which case - you can also use the standard \textsf{pubstate} field with - \texttt{reprint} in it to control the printing of the - \textsf{origdate} at the end of the entry, though I have altered the - string that is printed there. Cf.\ friends:leia, handel:messiah, - hitchcock:nbynw; \textsf{pubstate}, below. + \texttt{broadcast} to such a date, though you can use the + \mycolor{\textsf{userd}} field to change the string printed there. + (Absent an \textsf{eventdate}, the \textsf{userd} field in + \textsf{video} entries will modify the \textsf{urldate}, and absent + those two it will modify the \textsf{date}.) Typically, any given + \textsf{video} entry will only need an \textsf{eventdate} \emph{or} + an \textsf{origdate}, and it is this date that will appear in + citations and at the head of the entry in the reference list. It's + conceivable that you may need all three dates, in which case you can + also use the standard \textsf{pubstate} field with \texttt{reprint} + in it to control the printing of the \textsf{origdate} at the end of + the entry, though I have altered the string that is printed there. + Cf.\ friends:leia, handel:messiah, hitchcock:nbynw; + \textsf{pubstate}, below. \item[entrysubtype:] With the changes to the date fields detailed just above, this field is no longer needed for \textsf{video} entries, and will be ignored. @@ -6007,7 +6537,7 @@ by \textsf{biblatex}. Here are the main correspondences: As with the \textsf{music} type, entries in \textsf{dates-test.bib} should at least give you a good idea of how all this works. (Cf.\ 14.279--80; \textsf{eventdate}, \textsf{origdate}, \textsf{userd}; -\cmd{DeclareLabelyear} in section~\ref{sec:authformopts}, and +\cmd{DeclareLabeldate} in section~\ref{sec:authformopts}, and \texttt{avdate} in section~\ref{sec:authpreset}; cleese:holygrail, friends:leia, handel:messiah, hitchcock:nbynw, loc:city.) @@ -6055,7 +6585,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 @@ -6155,7 +6685,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 @@ -6292,9 +6822,10 @@ is perfectly possible for one .bib file entry to contain all three sorts of title (euripides:orestes, plato:republic:gr). You may also find a \textsf{booktitle} in other sorts of entries (e.g., \textsf{book} or \textsf{collection}), but there it will almost -invariably be providing information for the \textsc{Bib}\TeX\ -cross-referencing apparatus (prairie:state), which I discuss below -(\textbf{crossref}). The \textsf{booktitle} no longer takes +invariably be providing information for the traditional +\textsc{Bib}\TeX\ cross-referencing apparatus (prairie:state), which I +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}}. @@ -6317,50 +6848,77 @@ 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}. -\mybigspace \textsf{Biblatex} \mymarginpar{\textbf{crossref}} uses the -standard \textsc{Bib}\TeX\ cross-referencing mechanism, and has also -introduced a modified one of its own (\textsf{xref}). The -\textsf{crossref} field works exactly the same as it always has, while -\textsf{xref} attempts to remedy some of the deficiencies of the usual -mechanism by ensuring that child entries will inherit no data at all -from their parents. Having said all that, a few further instructions -may be in order for users of both \textsf{biblatex} and -\textsf{biblatex-chicago}. First, remember that fields in a -\textsf{collection} entry, for example, differ from those in an -\textsf{incollection} entry. In order for the latter to inherit the -\textsf{booktitle} field from the former, the former needs to have -such a field defined, even though a \textsf{collection} entry has no -use itself for such an entry (see ellet:galena, keating:dearborn, -lippincott:chicago, and prairie:state). Note also that an entry with -a \textsf{crossref} field will mechanically try to inherit all -applicable fields from the entry it cross-references. In the case of -ellet:galena et al., you can see that this includes the -\textsf{subtitle} field found in prairie:state, which would then, -quite incorrectly, be added to the \textsf{title} of ellet:galena. In -cases like these, you could just make sure that prairie:state didn't -contain such a field, by placing the entire title + subtitle in the -\textsf{title} field, separated by a colon. Alternatively, as you can -see in ellet:galena, you can just define an empty \textsf{subtitle} -field to prevent it inheriting the unwanted subtitle from -prairie:state. - -\mylittlespace Turning now more narrowly to \textsf{biblatex-chicago}, -the \emph{Manual} (15.37) specifies that if you cite several -contributions to the same collection, all (including the collection -itself) may be listed separately in the list of references, which the -package does automatically, using the default inclusion threshold of 2 -in the case both of \textsf{crossref}'ed and \textsf{xref}'ed entries. -(The familiar \cmd{nocite} command may also help in some -circumstances.) In the list of references an abbreviated form will be -appropriate for all the child entries. The current version of -\textsf{biblatex-chicago-authordate} implements these instructions, -but only if you use a \textsf{crossref} or an \textsf{xref} field, and -only in \textsf{incollection}, \textsf{inproceedings}, or -\textsf{letter} entries (on the last named, see just below). If you -look at ellet:galena, keating:dearborn, lippincott:chicago, and -prairie:state you'll see this mechanism in action in the list of -references. If you wish to disable this, then simply don't use a -\textsf{crossref} or \textsf{xref} field in your entries. +\mybigspace \textsf{Biblatex} \colmarginpar{\textbf{crossref}} uses +the standard \textsc{Bib}\TeX\ cross-referencing mechanism, and has +also introduced a modified one of its own (\textsf{xref}). The latter +works as it always has, attempting to remedy some of the deficiencies +of the traditional mechanism by ensuring that child entries will +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. + +\mylittlespace Aside from these inheritance questions, the other main +function of the \textsf{crossref} and \textsf{xref} fields in +\textsf{biblatex-chicago} is as a trigger for the provision of +abbreviated entries in the list of references. The \emph{Manual} +(15.37) specifies that if you cite several contributions to the same +collection, all (including the collection itself) may be listed +separately in the list, which the package does automatically, using +the default inclusion threshold of 2 in the case both of +\textsf{crossref}'ed and \textsf{xref}'ed entries. (The familiar +\cmd{nocite} command may also help in some circumstances.) In the +reference list an abbreviated form will be appropriate for all the +child entries. The \textsf{biblatex-chicago-authordate} package has +always implemented these instructions, but only if you use a +\textsf{crossref} or an \textsf{xref} field, and only in +\textsf{incollection}, \textsf{inproceedings}, or \textsf{letter} +entries (on the last named, see just below). With this release, I +\colmarginpar{New!} have considerably extended this functionality. + +\mylittlespace First, I have added five new entry types --- +\mycolor{\textbf{book}}, \mycolor{\textbf{bookinbook}}, +\mycolor{\textbf{collection}}, \mycolor{\textbf{inbook}}, and +\mycolor{\textbf{proceedings}} --- to the list of those which use +shortened cross references, and I have added two new options --- +\mycolor{\texttt{longcrossref}} and \mycolor{\texttt{booklongxref}}, +on which more below --- which you can use in the preamble or in the +\textsf{options} field of an entry to enable or disable the automatic +provision of abbreviated references. (The \textsf{crossref} or +\textsf{xref} field are still necessary for this provision, but they +are no longer sufficient on their own.) The \textsf{inbook} type +works exactly like \textsf{incollection} or \textsf{inproceedings}; in +previous releases, you could use \textsf{inbook} instead of +\textsf{incollection} to avoid the automatic abbreviation, the two +types being otherwise identical. Now that you can use an option to +turn off abbreviated references even in the presence of a +\textsf{crossref} or \textsf{xref} field, I have thought it sensible +to include this entry type alongside the others. (Cf.\ ellet:galena, +keating:dearborn, lippincott:chicago, and prairie:state to see this +mechanism in action in the reference list.) + +\mylittlespace The inclusion of \textbf{book}, \textbf{bookinbook}, +\textbf{collection}, and \textbf{proceedings} entries fulfills a +request made by Kenneth L. Pearce, and allows you to obtain shortened +references to, for example, separate volumes within a multi-volume +work, or to different book-length works collected inside a single +volume. Such references are not part of the \emph{Manual's} +specification, but they are a logical extension of it, so the system +of options for turning on this functionality behaves differently for +these four entry types than for the other 4 (see below). In +\textsf{dates-test.bib} you can get a feel for how this works by +looking at bernhard:boris, bernhard:ritter, bernhard:themacher, +harley:ancient:cart, harley:cartography, and harley:hoc. %\enlargethispage{\baselineskip} @@ -6373,22 +6931,62 @@ have special reason to do so, however, you can still present individual published letters there (using the \textsf{letter} entry type), and they too can use the system of shortened references just outlined, even though the \emph{Manual} doesn't explicitly require it. -As with \textsf{incollection} and \textsf{inproceedings}, mere use of -a \textsf{crossref} or \textsf{xref} field will activate this -mechanism, while avoidance of said fields will disable it. (See +As with \textsf{book}, \textsf{bookinbook}, \textsf{collection}, +\textsf{inbook}, \textsf{incollection}, \textsf{inproceedings}, and +\textsf{proceedings} entries, the use of a \textsf{crossref} or +\textsf{xref} field will activate this mechanism, assuming the new +preamble and entry options are set to enable it. (See white:ross:memo, white:russ, and white:total, for examples of the \textsf{xref} field in action in this way, and please note that the second of these entries is entirely fictitious, provided merely for the sake of example.) -\mylittlespace I should also take this opportunity to mention that you -need to be careful when using the \textsf{shorthand} field in -conjunction with the \textsf{crossref} or \textsf{xref} fields, -bearing in mind the complicated questions of inheritance posed by all -such cross-references, most especially in \textsf{letter}, -\textsf{incollection}, and \textsf{inproceedings} entries. A -\textsf{shorthand} field in a parent entry is, at least in the current -state of \textsf{biblatex-chicago}, a bad idea. +\mylittlespace These \colmarginpar{\texttt{longcrossref}} new options +function asymmetrically. The first, \mycolor{\texttt{longcrossref}}, +generally controls the settings for the entry types more-or-less +authorized by the \emph{Manual}: \textsf{inbook}, +\textsf{incollection}, \textsf{inproceedings}, and \textsf{letter}. + +\begin{description} +\item[\qquad false:] This is the default. If you use + \textsf{crossref} or \textsf{xref} fields in the four mentioned + entry types, you'll get the abbreviated entries in the reference + list. +\item[\qquad true:] You'll get no abbreviated citations of these entry + types in the reference list. +\item[\qquad none:] This switch is special, allowing you with one + setting to provide abbreviated citations not just of the four entry + types mentioned but also of \textsf{book}, \textsf{bookinbook}, + \textsf{collection}, and \textsf{proceedings} entries. +\item[\qquad notes,bib:] These two options are carried over from the + notes \&\ bibliography style; here they are synonymous with + \texttt{false} and \textsf{true}, respectively. +\end{description} + +The \colmarginpar{\texttt{booklongxref}} second option, +\mycolor{\texttt{booklongxref}}, controls the settings for +\textsf{book}, \textsf{bookinbook}, \textsf{collection}, and +\textsf{proceedings} entries: + +\begin{description} +\item[\qquad true:] This is the default. If you use \textsf{crossref} + or \textsf{xref} fields in these entry types, by default you will + \emph{not} get any abbreviated citations in the reference list. +\item[\qquad false:] You'll get abbreviated citations in these entry + types in the reference list. +\item[\qquad notes,bib:] These two options are carried over from the + notes \&\ bibliography style; here they are synonymous with + \texttt{false} and \textsf{true}, respectively. +\end{description} + +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. \mybigspace Predictably, \colmarginpar{\textbf{date}} this is one of the key fields for the author-date styles, and one which, as a general @@ -6400,96 +6998,101 @@ is no date otherwise provided (15.41); citations will look like Author, Firstname.\ n.d. This seems simple enough, but there are a surprising number of complications which require attention. -\mylittlespace First, with \textsf{Biber}, an absent \textsf{date} -will automatically provoke it into searching for other sorts of dates -in the entry, in the order \textsf{date, eventdate, origdate, - urldate}. (In \textsf{music} and \textsf{video} entries, the -default order has been changed, in the 16th edition, to -\textsf{eventdate, origdate, date, urldate}.) Only when it finds no -year at all will it fall back on \cmd{bibstring\{nodate\}}. You can -eliminate some of these dates from the running, or change the search -order, using the \cmd{DeclareLabelyear} command in your preamble, but -please be aware that I have hard-coded this order into the author-date -styles in order to cope with some tricky corners of the specification. -If you reorder these dates, and your references enter these tricky -corners, the results might be surprising. (Cf.\ section~4.5.2 in -\textsf{biblatex.pdf} for the \cmd{DeclareLabelyear} command, and -\texttt{avdate} in section~\ref{sec:authpreset}, below.) Second, the -entry types in which this automatic provision is turned off are -\textsf{inreference}, \textsf{misc}, and \textsf{reference}, none of -which may be expected in the standard case to have a date provided. -In all other entry types \enquote{\texttt{n.d.}}\ will appear if no -date is provided, though you can turn this off throughout the document -in all entry types with the option \texttt{nodates=false} when loading +\mylittlespace To start, in each entry, \textsf{Biber} attempts to +find something which it can designate a \textsf{labeldate}, which +will, in general and ideally, be the year printed both in citations +and at the head of the entry in the list of references. The search +for the \textsf{labeldate} is governed by instances of the declaration +\cmd{DeclareLabeldate}, which cannot be set on an entry-by-entry +basis, but rather only in a document preamble (or in files used by +\textsf{biblatex} or its styles, like \textsf{biblatex-chicago}). The +declaration can set a different search order according to entry type, +but other differentiations are not currently possible. In all cases, +guided by the instructions given by the \cmd{DeclareLabeldate} +instances, \textsf{Biber} will search each entry in the declared +order, and the first match will provide the \textsf{labeldate}. Only +when it finds no match at all will it fall back on +\cmd{bibstring\{nodate\}}. Now, the entry types in which this +automatic provision is turned off are \textsf{inreference}, +\textsf{misc}, and \textsf{reference}, none of which may be expected +in the standard case to have a date provided. In all other entry +types \enquote{\texttt{n.d.}}\ will appear if no date is provided, +though you can turn this off throughout the document in all entry +types with the option \texttt{nodates=false} when loading \textsf{biblatex-chicago} in your preamble. (See -section~\ref{sec:authpreset}, below.) Third, if you wish to provide -the \enquote{\texttt{n.d.}}\ yourself in the \textsf{year} field, -please instead put \cmd{bibstring\{nodate\}} there, as otherwise the -punctuation in citations will come out (subtly) wrong. Fourth, while -we're on the subject, the \textsf{year} field is also the place for -things like \enquote{\texttt{forthcoming},} though you should use the -\cmd{autocap} macro there to make sure the word comes out correctly in -both citations and the list of references. The reason for this is -that the \textsf{date} field accepts only numerical data, in -\textsc{iso}8601 format (\texttt{yyyy-mm-dd}), whereas \textsf{year} -can, conveniently, hold just about anything. It may be worth noting -here that \textsf{Biber} is somewhat more exacting when parsing the -\textsf{date} field than \textsc{Bib}\TeX, so a field looking like -\texttt{1968/75} will simply 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. - -\mylittlespace Fifth, for most entry types, only a year is really -necessary, and in most situations only the year --- or year range --- -will be printed in text citations and at the head of entries in the -list of references. More specific \textsf{date} fields are often -present, however, in \textsf{article}, \textsf{misc}, \textsf{music}, -\textsf{online}, \textsf{patent}, \textsf{unpublished}, and -\textsf{video} entries, for all of which any day or month provided -will be printed later in the reference list entry. If you follow the -recommendations of the 16th edition of the \emph{Manual} and present -newspaper and magazine articles \enquote{entirely within the text} -(15.47), then the citations need to contain the complete \textsf{date} -along with the \textsf{journaltitle}. Placing \texttt{cmsdate=full} -(and \texttt{skipbib}) in the \textsf{options} field of an -\textsf{article} or a \textsf{review} entry, alongside a possible -\texttt{useauthor=false}, should allow you to achieve this. While -we're on this subject, the \emph{Manual} is flexible (in both -specifications) on abbreviating the names of months (14.180). By -default, \textsf{biblatex-chicago-authordate} uses the full names, -which you can change by setting the option \texttt{dateabbrev=true} in -your document preamble. (Cf.\ assocpress:gun, barcott:review, batson, -creel:house, friends:leia, holiday:fool, nass:address, -petroff:\-impurity, powell:email.) - -\mylittlespace Sixth, the 16th edition of the \emph{Manual} (15.38) -has simplified the options for when a particular entry --- a reprinted -edition, say --- has more than one date, and -\textsf{biblatex-chicago-authordate} allows you to tailor the -presentation on an entry-by-entry basis. (\textsf{Music} and -\textsf{video} entries have their own rules, and their own version of -\cmd{DeclareLabelyear}, so please see their documentation above in -section~\ref{sec:types:authdate} for the details of how multiple dates -will be treated in such entries.) The user interface is a little more -streamlined than in previous releases, and I shall attempt to explain -it here as clearly as I can. If a reprinted book, say, has both a -\textsf{date} of publication for the reprint edition and an -\textsf{origdate} for the original edition, then by default -\textsf{biblatex-chicago-authordate} will use the \textsf{date} in -citations and at the head of the entry in the reference list. If you -inform \textsf{biblatex-chicago} that the book is a reprint by putting -the string \texttt{reprint} in the \textsf{pubstate} field, then a -notice will be printed at the end of the entry saying \enquote{First - published 1898.} With no \textsf{pubstate} field (and no -\texttt{cmsdate} option), the algorithms will ignore the -\textsf{origdate}. - -\mylittlespace If, for any reason, you wish the \textsf{origdate} to -appear at the head of the entry, then you need to use the -\texttt{cmsdate} toggle in the \textsf{options} field. This has 3 +section~\ref{sec:authpreset}, below. If you wish to provide the +\enquote{\texttt{n.d.}}\ yourself in the \textsf{year} field, please +instead put \cmd{bibstring\{nodate\}} there, as otherwise the +punctuation in citations will come out [subtly] wrong.) + +\mylittlespace The thing to keep in mind is that \emph{only} for a +\textsf{labelyear} will \textsf{biblatex} provide what it calls the +\textsf{extrayear} field, which means the alphabetical suffix +(1978\textbf{a}) to differentiate entries with the same author and +year. A style can print any year it wants in a citation, but only the +\textsf{labelyear} comes equipped with an \textsf{extrayear}. (It is +also, by the way, the field that the sorting algorithm will use for +ordering the list of references.) So the challenge, in a style +wherein entries can contain more than one date, is to allow different +dates to appear in citations and at the head of reference list +entries, but to ensure that, as often as is possible, that date +\emph{is} the \textsf{labeldate}. In previous releases of +\textsf{biblatex-chicago-authordate}, the search for a +\textsf{labeldate} could occur in two possible orders: in +\textsf{music}, \textsf{review}, and \textsf{video} entries, the +default order was \textsf{eventdate, origdate, date, urldate}, while +in all other entry types the order was \textsf{date, eventdate, + origdate, urldate}. This, I believe, still works well for reference +lists that contain relatively few entries with multiple dates, where +using, e.g., an \textsf{origdate} at the head of an entry, even if it +wasn't the \textsf{labeldate}, would rarely cause problems, because it +was unlikely that there would be another entry by the same author with +the same date (or \textsf{origdate}) requiring the \textsf{extrayear} +field. Judging from the feedback I've received, I significantly +overestimated the likelihood that most reference lists would be so +cooperative. Users could always eliminate some of these dates from +the running, or change the search order, using \cmd{DeclareLabeldate} +in their preamble, but I had to hard-code the default order(s) into +the author-date styles in order to cope with some tricky corners of +the specification. If users modified \cmd{DeclareLabeldate}, and +their references entered these tricky corners, the results could be +surprising. + +\mylittlespace With \colmarginpar{New!} this release, therefore, I +have included a new means of coping with multiple dates in database +entries, while retaining the old mechanisms for those for whom they +work well. These old mechanisms include the \texttt{avdate} option, +set to \texttt{true} by default, which treats as \emph{sui generis} +\textsf{music}, \textsf{review}, and \textsf{video} entries. They +have their own rules, and their own version of \cmd{DeclareLabeldate} +(\textsf{eventdate, origdate, date, urldate}), so please see their +documentation above in section~\ref{sec:types:authdate} for the +details of how multiple dates will be treated in such entries, and +also see \texttt{avdate} in section~\ref{sec:authpreset}, below. If +you don't alter the \textsf{avdate} settings, the other settings I +describe below don't apply to such entries. + +\mylittlespace For other entry types, the 16th edition of the +\emph{Manual} (15.38) presents a fairly simple scheme for when a +particular entry has more than one date, but I have been unable to +make its implementation quite as straightforward. If a reprinted +book, say, has both a \textsf{date} of publication for the reprint +edition and an \textsf{origdate} for the original edition, then by +default \textsf{biblatex-chicago-authordate} will use the +\textsf{date} in citations and at the head of the entry in the +reference list. If you inform \textsf{biblatex-chicago} that the book +is a reprint by putting the string \texttt{reprint} in the +\textsf{pubstate} field, then a notice will be printed at the end of +the entry saying \enquote{First published 1898.} With no +\textsf{pubstate} field (and no \texttt{cmsdate} option), the +algorithms will ignore the \textsf{origdate}. + +\mylittlespace If, \colmarginpar{\texttt{cmsdate}\\\emph{in entry}} +for any reason, you wish the \textsf{origdate} to appear at the head +of the entry, then your first option is to use the \texttt{cmsdate} +toggle in the \textsf{options} field of the entry itself. This has 3 possible states relevant to this context, though there is a fourth -state (\texttt{full}) which I've discussed two paragraphs up: +state (\texttt{full}) which I shall discuss below: \begin{enumerate} \item \texttt{cmsdate=both} prints both the \textsf{origdate} and the @@ -6500,12 +7103,12 @@ state (\texttt{full}) which I've discussed two paragraphs up: (Author 1952). \item \texttt{cmsdate=on} prints the \textsf{origdate} at the head of the entry in the list of references and in citations: (Author 1898). - \textbf{NB: The \emph{Manual} no longer includes this among the - acceptable options.} If you want to present the \textsf{origdate} - at the head of an entry, then generally speaking you should use - \texttt{cmsdate=both}. I have retained this option for corner cases - where it might be useful. The 15th-edition options \texttt{new} and - \texttt{old} now work like \texttt{both}. + NB: The \emph{Manual} no longer includes this among the approved + options. If you want to present the \textsf{origdate} at the head + of an entry, then generally speaking you should probably use + \texttt{cmsdate=both}. I have nevertheless retained this option for + certain cases where it has proved useful. The 15th-edition options + \texttt{new} and \texttt{old} now work like \texttt{both}. \end{enumerate} In the first and third cases, if you put the string \texttt{reprint} @@ -6518,35 +7121,44 @@ publication data will also include the date of the modern reprint. \mylittlespace Let us imagine, however, that your list of references contains another book by the same author, also a reprint edition: (Author [1896] 1974). How will these two works be ordered in the list -of references? By whatever appears in the \textsf{date} field, which -appears first in the default definition of \cmd{DeclareLabelyear}, and -which in this case will be wrong, because the entries should always be -ordered by the \emph{first} date to appear there, in this case the -contents of \textsf{origdate}. In this example, the solution can be -as simple as a \textsf{sortyear} field set to something earlier than -the date of the other work, e.g., \texttt{1951}. - -\mylittlespace And if the reprint dates of the two works are the same? -Just as when it is ordering entries, \textsf{biblatex} will always -first process the contents of the \textsf{date} field when it is -deciding whether to add the alphabetical suffix (\texttt{a,b,c} etc.)\ -to the year to distinguish different works by the same author -published in the same year. Our hypothetical examples would look like +of references? By the \textsf{labelyear}, in this case the +\textsf{year} field, which appears first in the default definition +(\textsf{date, eventdate, origdate, urldate}) of +\cmd{DeclareLabeldate}, and which in this case will be wrong, because +the entries should always be ordered by the \emph{first} date to +appear there, in this case the contents of \textsf{origdate}. In this +example, the solution can be as simple as a \textsf{sortyear} field +set to something earlier than the date of the other work, e.g., +\texttt{1951}. + +\mylittlespace And if the reprint dates --- in the \textsf{date} field +--- of the two works were the same? Just as when it is ordering +entries, \textsf{biblatex} will always first process the contents of +the \textsf{labelyear} field when it is deciding whether to add the +\textsf{extrayear} alphabetical suffix (\texttt{a,b,c} etc.)\ to the +year to distinguish different works by the same author published in +the same year. Our current hypothetical examples would look like this: ([1896] 1974a) and ([1898] 1974b), with the suffixes unnecessary, strictly-speaking, either for ordering or for -disambiguating the entries. If the original publication dates are the -same, and the reprint dates different, you may prefer citations of the -two works to read, e.g., (Author [1898a] 1952) and (Author [1898b] -1974), when they in fact read (Author [1898] 1952) and (Author [1898] -1974). These latter forms aren't ambiguous, and even if the reprints -themselves appeared in the same year then the alphabetical suffix -would appear attached to the \textsf{date}, again avoiding ambiguity. -The \emph{Manual} doesn't give clear instructions for how to cope with -these situations, but \textsf{biblatex-chicago-authordate} provides -help. You can't manually put the alphabetical suffix on an -\textsf{origdate} yourself because that field only accepts numerical -data. Indeed, we are forced to resort to an unusual expedient, which -amounts to switching the two date fields, placing the earlier date in +disambiguating the entries. If the original publication dates --- in +the \textsf{origdate} field --- are the same, and the reprint dates +different, you may prefer citations of the two works to read, e.g., +(Author [1898a] 1952) and (Author [1898b] 1974), when they in fact +read (Author [1898] 1952) and (Author [1898] 1974). These latter +forms aren't ambiguous, and even if the reprints themselves appeared +in the same year then the alphabetical suffix would appear attached to +the \textsf{date} --- (Author [1898] 1974a) and (Author [1898] 1974b) +--- again avoiding ambiguity. + +\mylittlespace The \emph{Manual} doesn't give clear instructions for +how to cope with these situations, but +\textsf{biblatex-chicago-authordate} provides help. You can't +manually put the alphabetical suffix on an \textsf{origdate} yourself +because that field only accepts numerical data. Instead, we can now +choose between two solutions. The old way +\colmarginpar{\texttt{cmsdate}\\\emph{in entry} + \\+ \texttt{switchdates}} is an unusual expedient, which amounts to +switching the two date fields, placing the earlier date in \textsf{date} and the later one in \textsf{origdate}. The style tests for this condition using a simple arithmetical comparison between the two years, then prints the two dates according to the state of the @@ -6558,8 +7170,8 @@ follows: \item \texttt{cmsdate=off} (the default) and \texttt{cmsdate=on} \emph{both} print the \textsf{date} at the head of the entry in the list of references and in citations: (Author 1898a), (Author 1898b). - As noted above, \textbf{this style is no longer recommended by the - 16th edition of the \emph{Manual}}. + As noted above, this style is no longer recommended by the 16th + edition of the \emph{Manual}, but it is still useful in some cases. \item \texttt{cmsdate=both} prints both the \textsf{date} and the \textsf{origdate}, using the \emph{Manual's}\ preferred format: (Author [1898a] 1952), (Author [1898b] 1974). The 15th-edition @@ -6573,15 +7185,70 @@ white:russ), or perhaps in a reprint edition that hasn't yet appeared in print (preventing the comparison between a year and the word \enquote{forthcoming}), then you can use the per-entry option \texttt{switchdates} in the \textsf{options} field to achieve the -required effects. It's difficult to imagine these date-switching -options often being required, but their presence at least should allow -maximum flexibility in reference lists that contain a lot of -\textsf{origdates}. - -\mylittlespace Bertold Schweitzer \colmarginpar{New!} has brought to -my attention certain difficult corner cases involving cross-referenced -works with more than one date. In order to facilitate the accurate -presentation of such sources, I have made a slight change to the way +required effects. + +\mylittlespace The \mycolor{new} +\colmarginpar{\texttt{cmsdate}\\\emph{in preamble}} method of +simplifying the creation of databases with a great many multi-date +entries is to use the \texttt{cmsdate} option \emph{in the preamble}. +Despite warnings in previous releases, users have plainly already been +setting this option in their preambles, so I thought I might at least +attempt to make it work as \enquote{correctly} as I can. The switches +for this option are the same as for the entry-only option, that is: + +\begin{enumerate} +\item \texttt{cmsdate=off} is the default: (Author 1952). +\item \texttt{cmsdate=both} prints both the \textsf{origdate} and the + \textsf{date}, using the \emph{Manual's}\ standard format: (Author + [1898] 1952) in parenthetical citations, Author (1898) 1952 outside + parentheses, e.g., in the reference list. +\item \texttt{cmsdate=on} prints the \textsf{origdate} at the head of + the entry in the list of references and in citations: (Author 1898). + NB: The \emph{Manual} no longer includes this among the approved + options. If you want to present the \textsf{origdate} at the head + of an entry, then generally speaking you should probably use + \texttt{cmsdate=both}. I have nevertheless retained this option for + certain cases where it has proved useful. The 15th-edition options + \texttt{new} and \texttt{old} now work like \texttt{both}. +\end{enumerate} + +The important change for the user is that, when you set this option in +your preamble to \texttt{on} or \texttt{both} (or to the 15th-edition +synonyms for the latter, \texttt{new} or \texttt{old}), then +\textsf{biblatex-chicago-authordate} will now change the default +\cmd{DeclareLa\-bel\-date} definition so that the \textsf{labelyear} +search order will be \mycolor{\textsf{origdate, date, eventdate, + urldate}}. This means that for entry types not covered by the +\texttt{avdate} option, and for those types as well if you turn off +that option, the \textsf{labelyear} will, in any entry containing an +\textsf{origdate}, be that very date. If you want \emph{every} such +entry to present its \textsf{origdate} in citations and at the head of +reference list entries, then setting the option this way makes sense, +as you should automatically get the proper \textsf{extrayear} and the +correct sorting, without having to switch dates around +counter-intuitively in your .bib file. A few clarifications may yet +be in order. + +\mylittlespace Obviously, any entry with only a \textsf{date} should +behave as usual. Also, since \textsf{patent} entries have fairly +specialized needs, I have exempted them from this change to +\cmd{DeclareLabeldate}. Third, the per-entry \texttt{cmsdate} options +will still affect which dates are printed in citations and at the head +of reference list entries, but they cannot change the search order for +the \textsf{labeldate}. This will be fixed by the preamble option. +Fourth, if you have been used to switching the \textsf{date} and the +\textsf{origdate} to get the correct results, then you should be aware +that this mechanism may actually still be useful when using the +\texttt{on} switch to \texttt{cmsdate} in the preamble, but it +produces incorrect results when the \texttt{cmsdate} option is +\texttt{both} in the preamble and the individual entry. The preamble +option is designed to make the need for this switching as rare as +possible, so some editing of existing databases may be necessary. + +\mylittlespace Finally, Bertold Schweitzer has brought to my attention +certain difficult corner cases involving cross-referenced works with +more than one date. In order to facilitate the accurate presentation +of such sources, I made a slight change to the way the entry-only \texttt{cmsdate=on} and \texttt{cmsdate=both} work. If, and only if, a work has only one date, and there is no \texttt{switchdates} in the \textsf{options} field, then \texttt{cmsdate=on} and @@ -6589,31 +7256,81 @@ a work has only one date, and there is no \texttt{switchdates} in the \textsf{extrayear} field in that entry, that is, the year will no longer be printed with its following lowercase letter used to distinguish works by the same \textsf{author} published in the same -year. +year. Obviously, if the same options are set in the preamble, this +behavior is turned off, so that single-date entries will still work +properly without manual intervention. + +\mylittlespace There are several more general remarks about the +\textsf{date} field that may be helpful to users. First, for most +entry types, only a year is really necessary, and in most situations +only the year --- or year range --- will be printed in text citations +and at the head of entries in the list of references. More specific +\textsf{date} fields are often present, however, in \textsf{article}, +\textsf{misc}, \textsf{music}, \textsf{online}, \textsf{patent}, +\textsf{unpublished}, and \textsf{video} entries, for all of which any +day or month provided will be printed later in the reference list +entry. If you follow the recommendations of the 16th edition of the +\emph{Manual} and present newspaper and magazine articles +\enquote{entirely within the text} (15.47), then the citations need to +contain the complete \textsf{date} along with the +\textsf{journaltitle}. Placing \mymarginpar{\texttt{cmsdate=full}} +\texttt{cmsdate=full} (and \texttt{skipbib}) in the \textsf{options} +field of an \textsf{article} or a \textsf{review} entry, alongside a +possible \texttt{useauthor=false}, should allow you to achieve this. +While we're on this subject, the \emph{Manual} is flexible (in both +specifications) on abbreviating the names of months (14.180). By +default, \textsf{biblatex-chicago-authordate} uses the full names, +which you can change by setting the option \texttt{dateabbrev=true} in +your document preamble. (Cf.\ assocpress:gun, barcott:review, batson, +creel:house, friends:leia, holiday:fool, nass:address, +petroff:\-impurity, powell:email.) + +\mylittlespace Second, when you need to indicate that a work is +\enquote{\texttt{forthcoming},} the \textsf{year} field, instead of +the \textsf{date} field, is the place for it, though you should use +the \cmd{autocap} macro there to make sure the word comes out +correctly in both citations and the list of references. The reason +for the field switch is that the \textsf{date} field accepts only +numerical data, in \textsc{iso}8601 format (\texttt{yyyy-mm-dd}), +whereas \textsf{year} can, conveniently, hold just about anything. +Third, it may be worth noting here that \textsf{Biber} is somewhat +more exacting when parsing the \textsf{date} field than +\textsc{Bib}\TeX, so a field looking like \texttt{1968/75} will simply +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} -\mylittlespace Finally, in the \textsf{misc} entry type this field can -help to distinguish between two classes of archival material, letters -and \enquote{letter-like} sources using \textsf{origdate} while others -(interviews, wills, contracts) use \textsf{date}. (See \textsf{misc} -in section~\ref{sec:types:authdate} for the details.) If such an -entry, as may well occur, contains only an \textsf{origdate}, as can -also be the case in the \textsf{letter} entries I mentioned in the -previous paragraph, \textsf{Biber} and the default -\cmd{DeclareLabelyear} definition now make it possible to do without a -\texttt{cmsdate} option, as \textsf{biblatex} will in such a case use -the \textsf{origdate} to order the entries in a reference list, and -will also append the alphabetical suffix if more than one entry by the -same author has the same \textsf{origyear}. I recommend that you have -a look through \textsf{dates-test.bib} to see how all these -complications will affect the construction of your .bib database, -especially at aristotle:metaphy:gr, creel:house, emerson:nature, -james:ambassadors, maitland:canon, maitland:equity, schweit\-zer:bach, -spock:in\-terview, white:ross:me\-mo, and white:russ. Cf.\ also -\textsf{origdate} and \textsf{year}, below, and the \texttt{cmsdate}, -\texttt{nodates}, and \texttt{switchdates} options in -sections~\ref{sec:preset:authdate} and \ref{sec:authentryopts}. +\mylittlespace Fourth, in the \textsf{misc} entry type the +\textsf{date} field can help to distinguish between two classes of +archival material, letters and \enquote{letter-like} sources using +\textsf{origdate} while others (interviews, wills, contracts) use +\textsf{date}. (See \textsf{misc} in section~\ref{sec:types:authdate} +for the details.) If such an entry, as may well occur, contains only +an \textsf{origdate}, as can also be the case in \textsf{letter} +entries, then \textsf{Biber} and either \cmd{DeclareLabeldate} +definition will make it work without further intervention. Fifth, and +finally, with \colmarginpar{New!} this release, you can now in most +entry types qualify a \textsf{date} with the \textsf{userd} field, +assuming that the entry contains no \textsf{urldate}. For +\textsf{music} and \textsf{video} entries, there are several other +requirements --- please see the documentation of \textsf{userd}, +below. + +\mylittlespace I recommend that you have a look through +\textsf{dates-test.bib} to see how all these complications will affect +the construction of your .bib database, especially at the following: +aristotle:metaphy:gr, creel:house, emerson:nature, +james:ambas\-sa\-dors, mait\-land:canon, mait\-land:equity, +schweit\-zer:bach, spock:in\-terview, white:\\ross:me\-mo, and +white:russ. Cf.\ also \textsf{origdate} and \textsf{year}, below; the +\texttt{cmsdate}, \texttt{nodates}, and \texttt{switchdates} options +in sections~\ref{sec:preset:authdate}, \ref{sec:authuseropts}, and +\ref{sec:authentryopts}; and section~4.5.8 in \textsf{biblatex.pdf}, +and section~\ref{sec:authformopts}, below, for the +\cmd{DeclareLabeldate} command + \mybigspace This \mymarginpar{\textbf{day}} field, as of \textsf{biblatex} 0.9, is obsolete, and will be ignored if you use it @@ -6717,6 +7434,8 @@ 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} + \mylittlespace There are a few details of which you need to be aware. Because \textsf{biblatex-chicago} has added the \textsf{namea} field, which gives you the ability to identify the editor specifically of a @@ -6769,8 +7488,6 @@ styles do, and they have now found a use particularly in \textsf{music} and \textsf{video} entries. Cf.\ bernstein:shostakovich, handel:messiah. -%\enlargethispage{\baselineskip} - \mybigspace Standard \mymarginpar{\textbf{eid}} \textsf{biblatex} field, providing a string or number some journals use uniquely to identify a particular article. Only applicable to the @@ -6830,7 +7547,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 @@ -6867,18 +7584,19 @@ date, but you can change this string using the new \textsf{userd} field, something you'll definitely want to do for filmed musical performances (friends:leia, handel:messiah, holiday:fool). -\mylittlespace In the default configuration of \cmd{DeclareLabelyear}, +\mylittlespace In the default configuration of \cmd{DeclareLabeldate}, dates for citations and for the head of reference list entries are searched for in the order \textsf{date, eventdate, origdate, urldate}. This suits the Chicago author-date styles very well, except for \textsf{music} and \textsf{video} entries, where the general rule is to emphasize the earliest date, whether that be, for example, the recording date or original release date (15.53). For these two entry -types, then, \cmd{DeclareLabelyear} uses the order \textsf{eventdate, - origdate, date, urldate}. +types, then, \cmd{DeclareLabeldate} uses the order \textsf{eventdate, + origdate, date, urldate}. (See the \texttt{avdate} option in +section~\ref{sec:authpreset}, below.) \mylittlespace For \textsf{review} entries I use the same, custom -definition of \cmd{DeclareLabelyear}, but for somewhat different +definition of \cmd{DeclareLabeldate}, but for somewhat different reasons. In general, such an entry will only have a \textsf{date}, but an \textsf{eventdate} can be used to identify a particular comment within an online thread. The year of the comment will therefore @@ -6981,7 +7699,7 @@ idea of how this works. \textsf{biblatex}'s extremely powerful and flexible technique for filtering entries in a list of references, allowing you to subdivide it according to just about any criteria you care to invent. See -\textsf{biblatex.pdf} (3.10.4) for thorough documentation. In +\textsf{biblatex.pdf} (3.11.4) for thorough documentation. In \textsf{biblatex-chicago}, the field provides one convenient means to exclude certain entries from making their way into a list of references, though the toggle \texttt{skipbib} in the \textsf{options} @@ -7081,8 +7799,10 @@ provide the parentheses (14.246; ellis:blog). 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}}. (See donne:var, -euripides:\-orestes, harley:cartography, lach:asia, +\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, pelikan:chris\-tian, and plato:re\-public:gr.) \mybigspace An \mymarginpar{\textbf{maintitleaddon}} annex to the @@ -7110,7 +7830,9 @@ present names in this field exactly as you would those in an \textsf{author} or \textsf{editor} field, and the package will concatenate this field with \textsf{nameb} if they are identical. See under \textbf{editor} and \textbf{editortype} above for the full -details. Cf.\ also \textsf{nameb}, \textsf{namec}, +details. Please note that, as the field is highly single-entry +specific, \textsf{namea} isn't inherited from a \textsf{crossref}'ed +parent entry. Cf.\ also \textsf{nameb}, \textsf{namec}, \textsf{translator}, and the macros \cmd{partedit}, \cmd{parttrans}, \cmd{parteditandtrans}, \cmd{partcomp}, \cmd{parteditandcomp}, \cmd{parttransandcomp}, and \cmd{partedittransand\-comp}, for which @@ -7158,11 +7880,13 @@ entries, \textsf{nameb} applies to the \textsf{title} instead of the present names in this field exactly as you would those in an \textsf{author} or \textsf{translator} field, and the package will concatenate this field with \textsf{namea} if they are identical. See -under the \textbf{translator} field below for the full details. Cf.\ -also \textsf{namea}, \textsf{namec}, \textsf{origlanguage}, -\textsf{translator}, \textsf{userf} and the macros \cmd{partedit}, -\cmd{parttrans}, \cmd{parteditandtrans}, \cmd{partcomp}, -\cmd{parteditandcomp}, \cmd{parttransandcomp}, and +under the \textbf{translator} field below for the full details. +Please note that, as the field is highly single-entry specific, +\textsf{nameb} isn't inherited from a \textsf{crossref}'ed parent +entry. Cf.\ also \textsf{namea}, \textsf{namec}, +\textsf{origlanguage}, \textsf{translator}, \textsf{userf} and the +macros \cmd{partedit}, \cmd{parttrans}, \cmd{parteditandtrans}, +\cmd{partcomp}, \cmd{parteditandcomp}, \cmd{parttransandcomp}, and \cmd{partedittransandcomp} in section~\ref{sec:formatting:authdate}. \mybigspace The \mymarginpar{\textbf{namec}} \emph{Manual} (15.35) @@ -7279,7 +8003,7 @@ organization sponsoring a conference in a \textsf{proceedings} or \textsf{inproceedings} entry, and I have retained this as a possibility, though the \emph{Manual} is silent on the matter. -\mybigspace This \mymarginpar{\textbf{origdate}} is a standard +\mybigspace This \colmarginpar{\textbf{origdate}} is a standard \textsf{biblatex} field which allows more than one full date specification for those references which need to provide more than just one. As with the analogous \textsf{date} field, you provide the @@ -7311,27 +8035,39 @@ 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{DeclareLabelyear} configuration now make it possible to -do without a \texttt{cmsdate} option, as the \textsf{origdate} will +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}, and this -has \colmarginpar{New!} changed from the 15th edition, the 16th +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}. Please see above -under \textbf{date} for all the details on how these options interact. - -\mylittlespace In the default configuration of \cmd{DeclareLabelyear}, +\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 searched for in the order \textsf{date, eventdate, origdate, urldate}. -This suits the Chicago author-date styles very well, except for -\textsf{music} and \textsf{video} entries, and, exceptionally, some -\textsf{review} entries. Here the general rule is to emphasize the -earliest date. For these three entry types, then, -\cmd{DeclareLabelyear} uses the order \textsf{eventdate, origdate, +If you set the \texttt{cmsdate} preamble options I've just mentioned, +this changes to \textsf{origdate, date, eventdate, urldate}. These +generally cover the needs of the Chicago author-date styles well, +except for \textsf{music} and \textsf{video} entries, and, +exceptionally, some \textsf{review} entries. Here the general rule is +to emphasize the earliest date. For these three entry types, then, +\cmd{DeclareLabeldate} uses the order \textsf{eventdate, origdate, date, urldate}. In \textsf{music} entries, you can use the \textsf{origdate} in two separate but related ways. First, it can identify the recording date of an entire disc, rather than of one @@ -7348,12 +8084,13 @@ In both these two entry types, the style will, depending on the context, automatically prepend appropriate bibstrings to the \textsf{origdate}. You can, assuming you've not activated the \textsf{pubstate} mechanism in a \textsf{music} entry, choose a -different string using the new \mycolor{\textsf{userd}} field, but -please be aware that if an entry also has an \textsf{eventdate}, then -\textsf{userd} will apply to that, instead, and you'll be forced to -accept the default string. (Compare friends:leia with -hitchcock:nbynw; 15.53, 14.279-280; cf.\ \cmd{DeclareLabelyear} below -in section~\ref{sec:authformopts}, and \texttt{avdate} in +different string using the \textsf{userd} field, but please be aware +that if an entry also has an \textsf{eventdate}, then \textsf{userd} +will apply to that, instead, and you'll be forced to accept the +default string. (Compare friends:leia with hitchcock:nbynw; 15.53, +14.279-280; cf.\ \texttt{cmsdate} in sections~\ref{sec:authuseropts} +and \ref{sec:authentryopts}, \cmd{DeclareLabeldate} in +section~\ref{sec:authformopts}, and \texttt{avdate} in section~\ref{sec:authpreset}.) \mylittlespace Because the \textsf{origdate} field only accepts @@ -7363,7 +8100,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 @@ -7416,12 +8153,11 @@ I've added \texttt{russian}. \mybigspace The \mymarginpar{\textbf{origlocation}} 16th edition of the \emph{Manual} has somewhat clarified issues pertaining to the documentation of reprint editions and their corresponding originals -(14.166, 15.38). Starting with this release of -\textsf{biblatex-chicago}, you can provide both an -\textsf{origlocation} and an \textsf{origpublisher} to go along with -the \textsf{origdate}, should you so wish, and all of this information -will be printed in the reference list. You can now also use this -field in a \textsf{letter} or \textsf{misc} (with +(14.166, 15.38). In \textsf{biblatex-chicago} you can now provide +both an \textsf{origlocation} and an \textsf{origpublisher} to go +along with the \textsf{origdate}, should you so wish, and all of this +information will be printed in the reference list. You can now also +use this field in a \textsf{letter} or \textsf{misc} (with \textsf{entrysubtype}) entry to give the place where a published or unpublished letter was written (14.117). (Jonathan Robinson has suggested that the \textsf{origlocation} may in some circumstances @@ -7431,8 +8167,6 @@ different cities. The new functionality should make this simple to achieve. Cf.\ \textsf{origdate}, \textsf{origpublisher} and \textsf{pubstate}; schweitzer:bach.) -\enlargethispage{\baselineskip} - \mybigspace As \mymarginpar{\textbf{origpublisher}} with the \textsf{origlocation} field just above, the 16th edition of the \emph{Manual} has clarified issues pertaining to reprint editions and @@ -7467,7 +8201,7 @@ appropriate identifying string to information you provide in the all the details on this functionality, as aside from the difference just mentioned the two fields are equivalent. -\mybigspace Standard \mymarginpar{\textbf{part}} \textsf{biblatex} +\mybigspace Standard \colmarginpar{\textbf{part}} \textsf{biblatex} field, which identifies physical parts of a single logical volume in \textsf{book}-like entries, not in periodicals. It has the same purpose in \textsf{biblatex-chicago}, but because the \emph{Manual} @@ -7475,8 +8209,15 @@ purpose in \textsf{biblatex-chicago}, but because the \emph{Manual} the string printed in the list of references will, at least in English, be \enquote{\texttt{bk.}\hspace{-2pt}}\ instead of the plain dot between volume number and part number (harley:cartography, -lach:asia). This field should only be used in association with a -\textsf{volume} number, so if you need to identify \enquote{parts} or +lach:asia). If the field contains something other than a number, +\textsf{biblatex-chicago} will print it as is, capitalizing it if +necessary, rather than supplying the usual bibstring, so this provides +a mechanism for altering the string to your liking. The field will be +printed in the same place in any entry as would a \textsf{volume} +number, and although it will most usually be associated with such a +number, it can also, as of this release, function independently, +allowing you to identify parts of works that don't fit into the +standard scheme. If you need to identify \enquote{parts} or \enquote{books} that are part of a published \textsf{series}, for example, then you'll need to use a different field, (which in the case of a series would be \textsf{number} [palmatary:pottery]). Cf.\ @@ -7537,6 +8278,8 @@ 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} + \mybigspace I \mymarginpar{\textbf{redactor}} have implemented this field just as \textsf{biblatex}'s standard styles do, even though the \emph{Manual} doesn't actually mention it. It may be useful for some @@ -7610,7 +8353,7 @@ the author's last name from the \textsf{author} field and uses it in such a reference, and if there is no \textsf{author} it will search \textsf{namea}, \textsf{editor}, \textsf{nameb}, \textsf{translator}, and \textsf{namec}, in that order. The current versions of -\textsf{biblatex} and \textsf{biber} will now automatically +\textsf{biblatex} and \textsf{Biber} will now automatically alphabetize by any of these names if they appear at the head of an entry. If, in an author-less \textsf{article} entry (\textsf{entrysubtype} \texttt{magazine}), you allow @@ -7642,7 +8385,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. @@ -7667,19 +8410,19 @@ to you just above (cf.\ \textbf{shortauthor}), but for this to work the abbreviation must either be instantly recognizable to your readership or at least easily parseable by them. -\mylittlespace The \colmarginpar{New!} \emph{Manual's} recommendation -(15.36), and this has changed for the 16th edition, involves using an -abbreviation for long institutional names, an abbreviation which will -appear not only in citations but also at the head of the entry in the -list of references. Such an entry should therefore be alphabetized by -the abbreviation, which will be expanded within the same entry and -placed (inside parentheses) between the abbreviation and the date. -This new formatting can be produced in one of two ways: either you can -provide a specially-formatted \textsf{author} field (for the reference -list, and including both the abbreviation and the parenthesized -expansion) + a \textsf{shortauthor} (for the citations), or you can -use a normal \textsf{author} field + a \textsf{shorthand}, in which -case \textsf{biblatex-chicago-authordate} will automatically use the +\mylittlespace The \emph{Manual's} recommendation (15.36), and this +has changed for the 16th edition, involves using an abbreviation for +long institutional names, an abbreviation which will appear not only +in citations but also at the head of the entry in the list of +references. Such an entry should therefore be alphabetized by the +abbreviation, which will be expanded within the same entry and placed +(inside parentheses) between the abbreviation and the date. This new +formatting can be produced in one of two ways: either you can provide +a specially-formatted \textsf{author} field (for the reference list, +and including both the abbreviation and the parenthesized expansion) + +a \textsf{shortauthor} (for the citations), or you can use a normal +\textsf{author} field + a \textsf{shorthand}, in which case +\textsf{biblatex-chicago-authordate} will automatically use the \textsf{shorthand} in text citations and also place it at the head of the reference list entry, followed by the \textsf{author} within parentheses. This method is simpler and more compatible with other @@ -7768,7 +8511,7 @@ 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 @@ -7887,8 +8630,6 @@ retains them when the surrounding title is quoted or plain (14.104, 14.177; lewis). A word or phrase in quotation marks, but that isn't a quotation, retains those marks in all title types (kimluu:diethyl). - - \mylittlespace Finally, please note that in all \textsf{review} (and \textsf{suppperiodical}) entries, and in \textsf{misc} entries with an \textsf{entrysubtype}, and only in those entries, @@ -7898,7 +8639,7 @@ 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} +% \enlargethispage{\baselineskip} \mybigspace When \colmarginpar{\textbf{title (trad)}} you choose the new \mycolor{\textsf{authordate-trad}} style, your \textsf{title} and @@ -8033,7 +8774,7 @@ but that isn't a quotation, retains those marks in all title types (kimluu:diethyl). \mylittlespace Finally, please note that there is also a preamble -option --- \mycolor{\texttt{headline}} --- that disables the automatic +option --- \texttt{headline} --- that disables the automatic sentence-style capitalization routines 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 @@ -8163,17 +8904,17 @@ edition of the \emph{Manual} prefers DOIs to URLs; in the latter case it allows the use of access dates, particularly in contexts that require it, but prefers that you use revision dates, if these are available. To enable you to specify which date is at stake, I have -provided the \mycolor{\textbf{userd}} field, documented below. If an -entry doesn't have a \textsf{userd}, then the \textsf{urldate} will be +provided the \textbf{userd} field, documented below. If an entry +doesn't have a \textsf{userd}, then the \textsf{urldate} will be treated, as before, as an access date (14.6--8, 14.184, 15.9; evanston:library, grove:sibelius, hlatky:hrt, osborne:poison, sirosh:visualcortex, wikiped:bibtex). In the default setting of -\cmd{DeclareLabelyear}, any entry without a \textsf{date}, +\cmd{DeclareLabeldate}, any entry without a \textsf{date}, \textsf{eventdate}, or \textsf{origdate} will now use the \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} @@ -8205,18 +8946,21 @@ latter case, \textsf{biblatex-chicago} will call \cmd{nocite} for you when you cite the main entry. (See 14.84, 14.86; creasey:ashe:blast, creasey:morton:hide, creasey:york:death, lecarre:quest.) -\mybigspace The \mymarginpar{\textbf{userd}} \textsf{userd} field, -new in this release, acts as a sort of \enquote{\textsf{datetype}} -field, allowing you in most entry types to identify whether a -\textsf{urldate} is an access date or a revision date. The general -usage is fairly simple. If this field is absent, then a -\textsf{urldate} will be treated as an access date, as has long been -the default in \textsf{biblatex} and in \textsf{biblatex-chicago}. If -you need to identify it in any other way, what you include in -\textsf{userd} will be printed \emph{before} the \textsf{urldate}, so -phrases like \enquote{\texttt{last modified}} or \enquote{\texttt{last - revised}} are what the field will typically contain (14.7--8; -wikiped:bibtex). +\mybigspace The \colmarginpar{\textbf{userd}} \textsf{userd} field, +recently added to the package, acts as a sort of +\enquote{\textsf{datetype}} field, allowing you in most entry types to +identify whether a \textsf{urldate} is an access date or a revision +date. The general usage is fairly simple. If this field is absent, +then a \textsf{urldate} will be treated as an access date, as has long +been the default in \textsf{biblatex} and in +\textsf{biblatex-chicago}. If you need to identify it in any other +way, what you include in \textsf{userd} will be printed \emph{before} +the \textsf{urldate}, so phrases like \enquote{\texttt{last modified}} +or \enquote{\texttt{last revised}} are what the field will typically +contain (14.7--8; wikiped:bibtex). In \colmarginpar{New!} the absence +of a \textsf{urldate}, you can now, in most entry types, include a +\textsf{userd} field to qualify a \textsf{date} in the same way it +would have modified a \textsf{urldate}. \mylittlespace Because of the rather specialized needs of some audio-visual references, this basic schema changes for \textsf{music} @@ -8224,9 +8968,11 @@ and \textsf{video} entries. In \textsf{music} entries where an \textsf{eventdate} is present, \textsf{userd} will modify that date instead of any \textsf{urldate} that may also be present, and it will modify an \textsf{origdate} if it is present and there is no -\textsf{eventdate}. In \textsf{video} entries it will modify an -\textsf{eventdate} if it is present, and in its absence the -\textsf{urldate}. In all these cases, \textsf{userd} will modify what +\textsf{eventdate}. It will modify a \textsf{date} only in the +absence of the other three. In \textsf{video} entries it will modify +an \textsf{eventdate} if it is present, and in its absence the +\textsf{urldate}. Given the absence of those two, it can modify a +\textsf{date}. In all these cases, \textsf{userd} will modify what remains of any date, i.e., the month and the day, if that date's year has been printed at the head of the entry. Please see the documentation of the \textsf{music} and \textsf{video} entry types, @@ -8296,11 +9042,30 @@ instead. Anything in a \textsf{venue} field will be ignored. field, currently only available in \textsf{misc} and \textsf{patent} entries in \textsf{biblatex-chicago}. -\mybigspace Standard \mymarginpar{\textbf{volume}} \textsf{biblatex} +\mybigspace Standard \colmarginpar{\textbf{volume}} \textsf{biblatex} field. It holds the volume of a \textsf{journaltitle} in \textsf{article} entries, and also the volume of a multi-volume work -in many other sorts of entry. Cf.\ \textsf{part}; conway:evolution -shows how sometimes this field may hold series information, as well. +in many other sorts of entry. The treatment and placement of +\textsf{volume} information in \textsf{book}-like entries is rather +complicated in the \emph{Manual} (14.121--27, 15.39). In the +reference list, the \textsf{volume} appears either before the +\textsf{maintitle} or before the publication information, while in +citations you may need to provide it in the \textsf{postnote} field +--- see the \textsf{volumes} field, just below. In a number of these +contexts, and in both books and periodicals, \textsf{volume} +information can appear \emph{immediately before} the page number(s). +In such a case, the \emph{Manual} (14.121) prescribes the same +treatment for both sorts of sources, that is, that \enquote{a colon + separates the volume number from the page number with no intervening + space.} I have implemented this, but at the request of Clea~F.\ +Rees I have made this punctuation customizable, using the new command +\mycolor{\cmd{postvolpunct}} \colmarginpar{\cmd{postvolpunct}}. By +default it prints \cmd{addcolon}, but you can use +\cmd{renewcommand\{\textbackslash postvolpunct\}\{\ldots\}} in your +preamble to redefine it. Cf.\ \textsf{part}, and the command +documentation in section~\ref{sec:formatting:authdate}; +conway:evolution shows how sometimes this field may hold series +information, as well. \mybigspace Standard \colmarginpar{\textbf{volumes}} \textsf{biblatex} field. It holds the total number of volumes of a multi-volume work, @@ -8318,11 +9083,19 @@ a multi-volume work, so you would no longer need to give the volume in any \textsf{postnote} field when citing it. If both a \textsf{volume} and a \textsf{volumes} field are present, as may occur particularly in cross-referenced entries, then \textsf{biblatex-chicago} will -ordinarily suppress the \textsf{volumes} field, unless a -\textsf{maintitle} is present. +ordinarily suppress the \textsf{volumes} field, except in some cases +when a \textsf{maintitle} is present. In this latter case, if the +\textsf{volume} appears before the \textsf{maintitle}, the new option +\mycolor{\texttt{hidevolumes}}, \colmarginpar{\texttt{hidevolumes}} +set to \texttt{true} by default, controls whether to print the +\textsf{volumes} field after that title or not. Set it to +\texttt{false} either in the preamble or in the \textsf{options} field +of your entry to have it appear after the \textsf{maintitle}. See the +option's documentation in section~\ref{sec:authpreset}, below. \mybigspace A \mymarginpar{\textbf{xref}} modified \textsf{crossref} -field provided by \textsf{biblatex}. See \textbf{crossref}, above. +field provided by \textsf{biblatex}, which prevents inheritance of any +data from the parent entry. See \textbf{crossref}, above. \mybigspace Standard \mymarginpar{\textbf{year}} \textsf{biblatex} field, especially important for the author-date specification. Please @@ -8393,6 +9166,9 @@ active: as you expect them to here.) \item The \textbf{maintitleaddon} field in all entry types. \item The \textbf{note} field in all entry types. +\item The \mycolor{\textbf{part}} field in entry types that use it. +\item The \mycolor{\textbf{prenote}} field prefixed to citation + commands. \item The \textbf{shorttitle} field in the \textsf{review} (\textsf{suppperiodical}) entry type and in the \textsf{misc} type, in the latter case, however, only when there is an @@ -8435,7 +9211,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{-3\baselineskip} +\enlargethispage{-2\baselineskip} \mybigspace This \mymarginpar{\textbf{\textbackslash mkbibquote}} is the standard \textsf{biblatex} command, which requires attention here @@ -8479,11 +9255,12 @@ what follows by a period in the list of references, then the final quotation marks, like so: \emph{Annotations to \enquote{Finnegans Wake.}} -\mylittlespace Note in both cases how you no longer need to be careful -with the capitalization inside the curly brackets, as the 16th edition -of the \textsf{Manual} has unified the title formatting of both its -styles, which means that all lower- and uppercase letters remain as -they are typed in your .bib file. +\mylittlespace Note in both cases that you only need to be careful +with the capitalization inside the curly brackets if you are using +\textsf{authordate-trad}, as the 16th edition of the \textsf{Manual} +has unified the title formatting for the two remaining styles, which +means that, for them, all lower- and uppercase letters remain as they +are typed in your .bib file. \mylittlespace Let me also add that this command interacts well with Lehman's \textsf{csquotes} package, which I highly recommend, though @@ -8491,6 +9268,26 @@ the latter isn't strictly necessary in texts using an American style, to which \textsf{biblatex} defaults when \textsf{csquotes} isn't loaded. +\mybigspace The \colmarginpar{\textbf{\textbackslash postvolpunct}} +\emph{Manual} (14.121) unequivocally prescribes that when a +\textsf{volume} number appears immediately before a page number, +\enquote{the abbreviation \emph{vol.}\ is omitted and a colon + separates the volume number from the page number with no intervening + space.} The treatment is basically the same whether the citation is +of a book or of a periodical, and it appears to be a surprising and +unwelcome feature for many users, conflicting as it may do with +established typographic traditions in a number of contexts. Clea~F.\ +Rees has requested a way to customize this, so I have provided the new +\cmd{postvolpunct} command, which prints the punctuation between a +\textsf{volume} number and a page number. It is set to \cmd{addcolon} +by default, except when the current language of the entry is French, +in which case it defaults to \cmd{addcolon\textbackslash addspace}. +You can use \cmd{renewcommand\{\textbackslash + postvolpunct\}\{\ldots\}} in your preamble to redefine it, but +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. + \mybigspace This \mymarginpar{\textbf{\textbackslash partcomp}} and the following 6 macros were all designed to help \textsf{biblatex-chicago} cope with the fact that many bibstrings in @@ -8512,7 +9309,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 @@ -8536,19 +9333,19 @@ compiler. partedit-\\andtrans}} before, but for when when an editor is also a translator (ratliff:review). -\mybigspace As \mymarginpar{\textbf{\textbackslash +\vspace{1.3\baselineskip} As \mymarginpar{\textbf{\textbackslash partedit-\\transandcomp}} before, but for when an editor is also a translator and a compiler. +\vspace{1.4\baselineskip} As \mymarginpar{\textbf{\textbackslash + parttrans-\\andcomp}} before, but for when a translator is also a +compiler. + \vspace{1.3\baselineskip} As \mymarginpar{\textbf{\textbackslash parttrans}} before, but for use when identifying a translator whose name doesn't conveniently fit into the usual fields (\textsf{translator} and \textsf{nameb}). -\mybigspace As \mymarginpar{\textbf{\textbackslash - parttrans-\\andcomp}} before, but for when a translator is also a -compiler. - \subsubsection{Citation Commands} \label{sec:cite:authordate} @@ -8672,7 +9469,7 @@ which the \emph{Manual} doesn't appear to recommend. \mylittlespace This \mymarginpar{\texttt{sorting=cms}} setting takes advantage of the \cmd{DeclareSortingScheme} command provided by -\textsf{biblatex} and \textsf{biber}, in effect implementing a default +\textsf{biblatex} and \textsf{Biber}, in effect implementing a default sorting order in the list of references tailored to comply with the Chicago author-date specification. Please see the documentation of \cmd{DeclareSortingScheme} in section~\ref{sec:authformopts}, below. @@ -8753,7 +9550,9 @@ to you for presenting and formatting the list of shorthands. enhanced functionality in many areas, three of which I've implemented in this release. If the default definitions don't work well for you, you can redefine all of them in your document preamble --- see -\textsf{biblatex.pdf} §§4.5.1 and 4.5.2. +\textsf{biblatex.pdf} §§4.5.8 and 4.5.5. + +\enlargethispage{\baselineskip} \mylittlespace This \mymarginpar{\cmd{Declare-}\\\texttt{Labelname}} option allows you to add name fields for consideration when @@ -8766,25 +9565,31 @@ currently is \texttt{\{shortauthor,author,\\shorteditor,namea,editor,nameb,% translator,namec\}}. -\mylittlespace This \mymarginpar{\cmd{Declare-}\\\texttt{Labelyear}} +\mylittlespace This \colmarginpar{\cmd{Declare-}\\\texttt{Labeldate}} option allows you to alter the order in which \textsf{Biber} and \textsf{biblatex} search for the year to use both in citations and at -the head of entries in the list of references. (This will also be the +the head of entries in the list of references. This will also be the year to which an alphabetical suffix will be appended when an author -has published more than one work in the same year.) In the default +has published more than one work in the same year, and the year by +which works will be sorted in the list of references. In the default configuration, a year will be searched for in the order \textsf{date, - eventdate, origdate, urldate}. This suits the Chicago author-date -styles very well, except for \textsf{music} and \textsf{video} entries, -and, exceptionally, some \textsf{review} entries. Here the general -rule is to emphasize the earliest date. For these three entry types, -then, \cmd{DeclareLabelyear} uses the order \textsf{eventdate, - origdate, date, urldate}. See \texttt{avdate} in -section~\ref{sec:authpreset}, just below. - -\enlargethispage{\baselineskip} + eventdate, origdate, urldate}. This generally suits the Chicago +author-date styles well, except for two situations. First, when a +reference apparatus contains many entries with multiple dates, it may +be simplest to promote the \textsf{origdate} to the head of the list, +which you can do using the new \mycolor{\texttt{cmsdate} preamble} +option. This changes the order to \mycolor{\textsf{origdate, date, + eventdate, urldate}}. Second, in \textsf{music} and +\textsf{video} entries, and, exceptionally, some \textsf{review} +entries, the general rule is to emphasize the earliest date. For +these three entry types, then, \cmd{DeclareLabeldate} uses the order +\textsf{eventdate, origdate, date, urldate}. See \texttt{avdate} in +section~\ref{sec:authpreset}, \texttt{cmsdate} in +section~\ref{sec:authuseropts}, and the \textbf{date} docs in +section~\ref{sec:fields:authdate}. \mylittlespace The -\mymarginpar{\cmd{Declare-}\\\texttt{SortingScheme}} third +\colmarginpar{\cmd{Declare-}\\\texttt{SortingScheme}} third \textsf{Biber} enhancement I have implemented allows you to include almost any field whatsoever in \textsf{biblatex's} sorting algorithms for the list of references, so that a great many more entries will be @@ -8793,7 +9598,10 @@ intervention in the form of a \textsf{sortkey} field or the like. Code in \textsf{biblatex-chicago.sty} sets the \textsf{biblatex} option \texttt{sorting=cms}, which is a custom scheme, basically a Chicago-specific variant of the default \texttt{nyt}. You can find -its definition in \textsf{chicago-authordate.cbx}. +its definition in \textsf{chicago-authordate.cbx}. (Please note that +it now uses the \textsf{labelyear} as its main year component, which +should help improve the automatic sorting of entries by the same +\textsf{author}.) \mylittlespace The advantages of this scheme are, specifically, that any entry headed by one of the supplemental name fields @@ -8835,15 +9643,15 @@ whether any \textsf{doi} fields present in the .bib file will be printed in the reference list. At the request of Daniel Possenriede, and keeping in mind the \emph{Manual's} preference for this field instead of a \textsf{url} (15.9), I have added a third switch, -\mycolor{\texttt{only}}, which prints the \textsf{doi} if it is -present and the \textsf{url} only if there is no \textsf{doi}. The -package default remains the same, however --- it defaults to true, -which will print both \textsf{doi} and \textsf{url} if both are -present. The option can be set to \texttt{only} or to \texttt{false} -either in the preamble, for the whole document, or on a per-entry -basis in the \textsf{options} field. In \textsf{online} entries, the -\textsf{doi} field will always be printed, but the \texttt{only} -switch will still eliminate any \textsf{url}. +\texttt{only}, which prints the \textsf{doi} if it is present and the +\textsf{url} only if there is no \textsf{doi}. The package default +remains the same, however --- it defaults to true, which will print +both \textsf{doi} and \textsf{url} if both are present. The option +can be set to \texttt{only} or to \texttt{false} either in the +preamble, for the whole document, or on a per-entry basis in the +\textsf{options} field. In \textsf{online} entries, the \textsf{doi} +field will always be printed, but the \texttt{only} switch will still +eliminate any \textsf{url}. \mylittlespace This \mymarginpar{\texttt{eprint=true}} option controls whether any \textsf{eprint} fields present in the .bib file will be @@ -8901,7 +9709,7 @@ and \textsf{video} entries, the 16th edition of the \emph{Manual} (15.53) strongly recommends both that you provide a recording, release, or broadcast date for your references and also that this earlier date should appear in citations and at the head of reference -list entries. In the default setting of \cmd{DeclareLabelyear}, +list entries. In the default setting of \cmd{DeclareLabeldate}, \textsf{biblatex} searches for dates in the following order: \textsf{year, eventyear, origyear, urlyear}. This option changes the default ordering in \textsf{music} and \textsf{video} entries to the @@ -8911,17 +9719,49 @@ needs, so the same reordering applies to that entry type, too. If you simply want to apply the defaults to these three entry types, you can use \texttt{avdate=false} in the options when loading \textsf{biblatex-chicago}. If, however, you want to tailor the -algorithm to your own needs, then you can use \cmd{DeclareLabelyear} +algorithm to your own needs, then you can use \cmd{DeclareLabeldate} commands in your preamble. Please be aware, however, that some parts of the style hard-code the search syntax, and although they take account of the \texttt{avdate} setting, if you use your own -definitions of \cmd{DeclareLabelyear} the results may, in some corner +definitions of \cmd{DeclareLabeldate} the results may, in some corner cases, surprise. Please see \textsf{music}, \textsf{review}, and \textsf{video} in section~\ref{sec:types:authdate}; \textsf{date}, \textsf{eventdate}, \textsf{origdate}, and \textsf{urldate} in -section~\ref{sec:fields:authdate}; and \cmd{DeclareLabelyear} in +section~\ref{sec:fields:authdate}; and \cmd{DeclareLabeldate} in section~\ref{sec:authformopts}. +\mylittlespace At \colmarginpar{\texttt{booklongxref=\\true}} the +request of Bertold Schweitzer, I have included two new options for +controlling whether and where \textsf{biblatex-chicago} will print +abbreviated references when you cite more than one part of a given +collection or series. This option controls whether multiple +\textsf{book}, \textsf{bookinbook}, \textsf{collection}, and +\textsf{proceedings} entries which are part of the same collection +will appear in this space-saving format. The parent collection itself +will usually be presented in, e.g., a \textsf{book}, +\textsf{bookinbook}, \textsf{mvbook}, \textsf{mvcollection}, or +\textsf{mvproceedings} entry, and using \textsf{crossref} or +\textsf{xref} in the child entries will allow such presentation +depending on the value of the option: + +\begin{description} +\item[\qquad true:] This is the default. If you use \textsf{crossref} + or \textsf{xref} fields in these entry types, by default you will + \emph{not} get any abbreviated citations in the reference list. +\item[\qquad false:] You'll get abbreviated citations in these entry + types in the reference list. +\item[\qquad notes,bib:] These two options are carried over from the + notes \&\ bibliography style; here they are synonymous with + \texttt{false} and \textsf{true}, respectively. +\end{description} + +This option can be set either in the preamble or in the +\textsf{options} field of individual entries. For controlling the +behavior of \textsf{inbook}, \textsf{incollection}, +\textsf{inproceedings}, and \textsf{letter} entries, please see +\mycolor{\texttt{longcrossref}}, below, and also the documentation of +\textsf{crossref} in section~\ref{sec:fields:authdate}. + \mylittlespace This \mymarginpar{\texttt{cmslos=true}} option alters \textsf{biblatex's} standard behavior when processing the \textsf{shorthand} field. Chicago's author-date style only seems to @@ -8941,6 +9781,57 @@ document preamble. Cf.\ section~\ref{sec:fields:authdate}, s.v. \enquote{\textbf{shorthand}} above, and also \textsf{cms-dates-sample.pdf}. +\mylittlespace If \colmarginpar{\texttt{hidevolumes=\\true}} both a +\textsf{volume} and a \textsf{volumes} field are present, as may occur +particularly in cross-referenced entries, then +\textsf{biblatex-chicago} will ordinarily suppress the +\textsf{volumes} field. In some instances, when a \textsf{maintitle} +is present, this may not be the desired result. In this latter case, +if the \textsf{volume} appears before the \textsf{maintitle}, this new +option, set to \texttt{true} by default, controls whether to print the +\textsf{volumes} field after that title or not. Set it to +\texttt{false} either in the preamble or in the \textsf{options} field +of your entry to have it appear after the \textsf{maintitle}. + +\mylittlespace This \colmarginpar{\texttt{longcrossref=\\false}} is +the second option, requested by Bertold Schweitzer, for controlling +whether and where \textsf{biblatex-chicago} will print abbreviated +references when you cite more than one part of a given collection or +series. It controls the settings for the entry types more-or-less +authorized by the \emph{Manual}, i.e., \textsf{inbook}, +\textsf{incollection}, \textsf{inproceedings}, and \textsf{letter}. +The mechanism itself is enabled by multiple \textsf{crossref} or +\textsf{xref} references to the same parent, whether that be, e.g., a +\textsf{collection}, an \textsf{mvcollection}, a \textsf{proceedings}, +or an \textsf{mvproceedings} entry. Given these multiple cross +references, the presentation in the reference apparatus will be +governed by the following options: + +\begin{description} +\item[\qquad false:] This is the default. If you use + \textsf{crossref} or \textsf{xref} fields in the four mentioned + entry types, you'll get the abbreviated entries in the reference + list. +\item[\qquad true:] You'll get no abbreviated citations of these entry + types in the reference list. +\item[\qquad none:] This switch is special, allowing you with one + setting to provide abbreviated citations not just of the four entry + types mentioned but also of \textsf{book}, \textsf{bookinbook}, + \textsf{collection}, and \textsf{proceedings} entries. +\item[\qquad notes,bib:] These two options are carried over from the + notes \&\ bibliography style; here they are synonymous with + \texttt{false} and \textsf{true}, respectively. +\end{description} + +This option can be set either in the preamble or in the +\textsf{options} field of individual entries. For controlling the +behavior of \textsf{book}, \textsf{bookinbook}, \textsf{collection}, +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} + \mylittlespace This \mymarginpar{\texttt{nodates=true}} option means that for all entry types except \textsf{inreference}, \textsf{misc}, and \textsf{reference}, \textsf{biblatex-chicago} will automatically @@ -8970,9 +9861,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 second 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 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 \cmd{usepackage\{biblatex-chicago\}} call in your preamble. \mylittlespace At \mymarginpar{\texttt{annotation}} the request of @@ -8981,11 +9872,90 @@ the ability to produce annotated reference lists. If you turn this option on then the contents of your \textsf{annotation} (or \textsf{annote}) field will be printed after the reference. (You can also use external files to store annotations -- please see -\textsf{biblatex.pdf} §~3.10.7 for details on how to do this.) This +\textsf{biblatex.pdf} §~3.11.8 for details on how to do this.) This functionality is currently in a beta state, so before you use it please have a look at the documentation for the \textsf{annotation} field, in section~\ref{sec:fields:authdate} above. +\mylittlespace With \colmarginpar{\texttt{cmsdate}} this release, I am +providing a new method for simplifying the creation of databases with +a great many multi-date entries: the \texttt{cmsdate} option \emph{in + the preamble}. Despite warnings in previous releases, users have +plainly already been setting this option in their preambles, so I +thought I might at least attempt to make it work as +\enquote{correctly} as I can. The switches for this option are +basically the same as for the entry-only option, that is, assuming an +entry presents a reprinted edition of a work by Smith, first published +in 1926 (the \textsf{origdate}) and reprinted in 1985 (the +\textsf{date}): + +\begin{enumerate} +\item \texttt{cmsdate=off} is the default: (Smith 1985). +\item \texttt{cmsdate=both} prints both the \textsf{origdate} and the + \textsf{date}, using the \emph{Manual's}\ standard format: (Author + [1926] 1985) in parenthetical citations, Author (1926) 1985 outside + parentheses, e.g., in the reference list. +\item \texttt{cmsdate=on} prints the \textsf{origdate} at the head of + the entry in the list of references and in citations: (Author 1926). + NB: The \emph{Manual} no longer includes this among the approved + options. If you want to present the \textsf{origdate} at the head + of an entry, then generally speaking you should probably use + \texttt{cmsdate=both}. I have nevertheless retained this option for + certain cases where it has proved useful. The 15th-edition options + \texttt{new} and \texttt{old} now work like \texttt{both}. +\end{enumerate} + +The important change for the user is that, when you set this option in +your preamble to \texttt{on} or \texttt{both} (or to the 15th-edition +synonyms for the latter, \texttt{new} or \texttt{old}), then +\textsf{biblatex-chicago-authordate} (and \textsf{authordate-trad}) +will now change the default \cmd{DeclareLabel\-date} definition so +that the \textsf{labelyear} search order will be +\mycolor{\textsf{origdate, date, eventdate, urldate}}. This means +that for entry types not covered by the \texttt{avdate} option, and +for those types as well if you turn off that option, the +\textsf{labelyear} will, in any entry containing an \textsf{origdate}, +be that very date. If you want \emph{every} such entry to present its +\textsf{origdate} in citations and at the head of reference list +entries, then setting the option this way makes sense, as you should +automatically get the proper \textsf{extrayear} letter +(1926\textbf{a}) and the correct sorting, without having to use the +counter-intuitive .bib file date switching that sometimes accompanied +the entry-only \texttt{cmsdate} option. A few clarifications may yet +be in order. + +\mylittlespace Obviously, any entry with only a \textsf{date} should +behave as usual. Also, since \textsf{patent} entries have fairly +specialized needs, I have exempted them from this change to +\cmd{DeclareLabeldate}. Third, the per-entry \texttt{cmsdate} options +will still affect which dates are printed in citations and at the head +of reference list entries, but they cannot change the search order for +the \textsf{labeldate}. This will be fixed by the preamble option. +Fourth, if you have been used to switching the \textsf{date} and the +\textsf{origdate} to get the correct results, then you should be aware +that this mechanism may actually still be useful when using the +\texttt{on} switch to \texttt{cmsdate} in the preamble, but it +produces incorrect results when the \texttt{cmsdate} option is +\texttt{both} in the preamble and the individual entry. The preamble +option is designed to make the need for this switching as rare as +possible, so some editing of existing databases may be necessary. +Fifth, the entry-only option \texttt{full} has no effect at all when +used in the preamble; you must set it in individual entries. Finally, +please see the documentation of the \textbf{date} field in +section~\ref{sec:fields:authdate} for the fullest discussion of date +presentation in the \textsf{authordate} styles. + +\mylittlespace Although \colmarginpar{\texttt{cmsorigdate}} I can't +currently think of any reason why anyone would want to use it on its +own, I should nonetheless mention that the \texttt{cmsorigdate} option +in your preamble will change the default \cmd{DeclareLabeldate} +settings to \mycolor{\textsf{origdate, date, eventdate, urldate}}. +Setting \texttt{cmsdate} to \texttt{on} or \texttt{both} in the +preamble --- see the previous option --- sets this to true, but if for +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 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 @@ -9003,7 +9973,7 @@ section~\ref{sec:loading:auth}, below. %\enlargethispage{\baselineskip} -\mylittlespace Several \colmarginpar{\texttt{headline}\\\texttt{(trad +\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, @@ -9097,16 +10067,15 @@ reprinted edition of a work by Smith, first published in 1926 (the \textsf{origdate}) and reprinted in 1985 (the \textsf{date}): \begin{description} -\item[\qquad \textbf{off}:] This is the default. The citation will - look like (Smith 1985). -\item[\qquad \textbf{both}:] The citation will look like (Smith [1926] - 1985). -\item[\qquad \textbf{on}:] The citation will look like (Smith 1926). - \textbf{NB: The \emph{Manual} no longer includes this among the - acceptable options.} If you want to present the \textsf{origdate} - at the head of an entry, then generally speaking you should use - \texttt{cmsdate=both}. I have retained this option for corner cases - where it might be useful. The 15th-edition options \texttt{new} and +\item[\qquad off:] This is the default. The citation will look like + (Smith 1985). +\item[\qquad both:] The citation will look like (Smith [1926] 1985). +\item[\qquad on:] The citation will look like (Smith 1926). NB: The + \emph{Manual} no longer includes this among the approved options. + If you want to present the \textsf{origdate} at the head of an + entry, then generally speaking you should probably use + \texttt{cmsdate=both}. I have retained the option because in some + cases it is still useful. The 15th-edition options \texttt{new} and \texttt{old} now work like \texttt{both}. \end{description} @@ -9123,48 +10092,55 @@ switch, and given the same reprinted work as above, the results will be as follows: \begin{description} -\item[\qquad \textbf{off}:] This is the default. The citation will - look like (Smith 1926a). \textbf{This style is no longer - recommended by the 16th edition of the \emph{Manual}}. -\item[\qquad \textbf{both}:] The citation will look like (Smith - [1926a] 1985). The 15th-edition options \texttt{old} and - \texttt{new} are now synonyms for this. -\item[\qquad \textbf{on}:] The citation will look like (Smith 1926a). - As noted above, \textbf{this style is no longer recommended by the - 16th edition of the \emph{Manual}}. +\item[\qquad off:] This is the default. The citation will look like + (Smith 1926a). This style is no longer recommended by the 16th + edition of the \emph{Manual}. +\item[\qquad both:] The citation will look like (Smith [1926a] 1985). + The 15th-edition options \texttt{old} and \texttt{new} are now + synonyms for this. +\item[\qquad on:] The citation will look like (Smith 1926a). As noted + above, this style is no longer recommended by the 16th edition of + the \emph{Manual}. \end{description} If, \mymarginpar{\texttt{switchdates}} for any reason, simply switching the \textsf{date} and the \textsf{origdate} isn't possible in a given entry, then you can put \texttt{switchdates} in the -\textsf{options} field to achieve the same result. Please take a look -at the full documentation of the \textbf{date} field to which I -referred just above, and also at \textsf{cms-dates-sample.pdf} and -\textsf{dates-test.bib} for examples of how all this works. - -\mylittlespace Bertold Schweitzer \colmarginpar{New!} has brought to -my attention certain difficult corner cases involving cross-referenced -works with more than one date. In order to facilitate the accurate -presentation of such sources, I have made a slight change to the way -\texttt{cmsdate=on} and \texttt{cmsdate=both} work. If, and only if, -a work has only one date, and there is no \texttt{switchdates} in the -\textsf{options} field, then \texttt{cmsdate=on} and -\texttt{cmsdate=both} will both result in the suppression of the -\textsf{extrayear} field in that entry. - -\mylittlespace The \colmarginpar{New!} 16th edition of the -\emph{Manual} now specifies that it is \enquote{usually sufficient to - cite newspaper and magazine articles entirely within the text} -(15.47). This will apply mainly to \textsf{article} and -\textsf{review} entries with \textsf{entrysubtype} \texttt{magazine}, -and involves a parenthetical citation giving the \textsf{journaltitle} -and then the full \textsf{date}, not just the year, with any other -relevant identifying information incorporated into running text. -(Cf.\ 14.206.)\ In order to facilitate this, I have added a further -switch to the \texttt{cmsdate} option -\colmarginpar{\mycolor{\texttt{cmsdate=full}}} --- -\mycolor{\textbf{full}} --- which \emph{only} affects the presentation -of citations, and causes the printing of the full date specification +\textsf{options} field to achieve the same result. Also, now you can +use the new preamble version \colmarginpar{\texttt{cmsdate}\\\emph{in + preamble}} of \mycolor{\texttt{cmsdate}} to change the default +order of \cmd{DeclareLabeldate}, generally making this date-switching +in your .bib file unnecessary. Please take a look at the full +documentation of the \textbf{date} field to which I referred just +above, at the preamble \texttt{cmsdate} documentation in +section~\ref{sec:authuseropts}, and also at +\textsf{cms-dates-sample.pdf} and \textsf{dates-test.bib} for examples +of how all this works. + +\mylittlespace Bertold Schweitzer has brought to my attention certain +difficult corner cases involving cross-referenced works with more than +one date. In order to facilitate the accurate presentation of such +sources, I made a slight change to the way \texttt{cmsdate=on} +and \texttt{cmsdate=both} work. If, and only if, a work has only one +date, and there is no \texttt{switchdates} in the \textsf{options} +field, then \texttt{cmsdate=on} and \texttt{cmsdate=both} will both +result in the suppression of the \textsf{extrayear} field in that +entry. Obviously, if the same options are set in the preamble, this +behavior is turned off, so that single-date entries will still work +properly without manual intervention. + +\mylittlespace The 16th edition of the \emph{Manual} now specifies +that it is \enquote{usually sufficient to cite newspaper and magazine + articles entirely within the text} (15.47). This will apply mainly +to \textsf{article} and \textsf{review} entries with +\textsf{entrysubtype} \texttt{magazine}, and involves a parenthetical +citation giving the \textsf{journaltitle} and then the full +\textsf{date}, not just the year, with any other relevant identifying +information incorporated into running text. (Cf.\ 14.206.)\ In order +to facilitate this, I have added a further switch to the +\texttt{cmsdate} option \mymarginpar{\texttt{cmsdate=full}} --- +\texttt{full} --- which \emph{only} affects the presentation of +citations, and causes the printing of the full date specification there. You can use the standard \textsf{biblatex} \texttt{skipbib} option to keep such entries from appearing in the list of references, and you may, if your .bib entry is a complete one, also need @@ -9172,12 +10148,6 @@ and you may, if your .bib entry is a complete one, also need \textsf{journaltitle} appears in the citations rather than the \textsf{author}. -\mylittlespace As a final note, I should point out that the code in -\textsf{chicago-authordate.cbx} allows \texttt{cmsdate} to be used in -the document preamble as a general setting. This leads to a world of -pain, so I very strongly advise against it, though I'm leaving it in -for testing purposes. - \subsection{General Usage Hints} \label{sec:hints:auth} @@ -9199,7 +10169,7 @@ Now, the default way to load the style, and one that will in the vast majority of standard cases produce the same results as the old invocation, will look like this: \begin{quote} - \cmd{usepackage[authordate,strict,backend=biber,babel=other,\%\\ + \cmd{usepackage[authordate,strict,backend=biber,autolang=other,\%\\ bibencoding=inputenc]\{biblatex-chicago\}} \end{quote} @@ -9228,7 +10198,7 @@ package's localization files, which means that you'll lose all the Chicago-specific bibstrings I've defined unless you provide, in your preamble, a \cmd{DeclareLanguageMapping} command, or several, adapted for your setup, on which see section~\ref{sec:international} below and -also §§~4.9.1 and 4.11.7 in Lehman's \textsf{biblatex.pdf}. +also §§~4.9.1 and 4.11.8 in Lehman's \textsf{biblatex.pdf}. \mylittlespace What you \emph{will not} lose is the ability to call the package options \texttt{annotation, strict, cmslos=false} and @@ -9309,7 +10279,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 @@ -9331,7 +10301,7 @@ in \textsf{biblatex.pdf}, to wit, if you aren't going to use \textsc{Bib}\TeX, and avoid the cryptic errors that ensue when your .bib file gets to a certain size. -\section{\mycolor{Internationalization}} +\section{Internationalization} \label{sec:international} Several users have requested that, in line with analogous provisions @@ -9341,8 +10311,8 @@ for producing a Chicago-like style in other languages. I have supplied three lbx files, \textsf{cms-german.lbx}, its clone \textsf{cms-ngerman.lbx}, and \textsf{cms-french.lbx}, in at least partial fulfillment of this request. For this release, Antti-Juhani -Kaijahano has very kindly provided \mycolor{\textsf{cms-finnish.lbx}} -for speakers of that language, thereby adding to the generous +Kaijahano has very kindly provided \textsf{cms-finnish.lbx} for +speakers of that language, thereby adding to the generous contributions of Baldur Kristinsson (\textsf{cms-icelandic.lbx}) and Håkon Malmedal (\textsf{cms-norsk.lbx}, \textsf{cms-norwegian.lbx}, and \textsf{cms-nynorsk.lbx}). I include \textsf{cms-british.lbx} in @@ -9371,8 +10341,8 @@ American-style punctuation tracking, when you: \item Do not load \textsf{babel} at all. \end{enumerate} (This last is a change from the \textsf{biblatex} defaults --- cp.\ -§~3.9.1 in \textsf{biblatex.pdf} --- but it seems to me reasonable, in -an American citation style, to expect this arrangement to work well +§~3.10.1 in \textsf{biblatex.pdf} --- but it seems to me reasonable, +in an American citation style, to expect this arrangement to work well for the majority of users.) \mylittlespace If, for whatever reason, you wanted to use @@ -9389,8 +10359,8 @@ or Norwegian strings in the reference apparatus, then you can load \texttt{german}, \texttt{icelandic}, \texttt{ngerman}, \texttt{norsk}, or \texttt{nynorsk} as the main document language. You no longer need any calls to \cmd{DeclareLanguageMapping} in your document preamble, -since \textsf{bib\-latex-chicago.sty} now automatically provides these -if you load the package in the standard way. +since \textsf{bib\-latex-chicago.sty} automatically provides these if +you load the package in the standard way. \mylittlespace You can also define which bibstrings to use on an entry-by-entry basis by using the \textsf{hyphenation} field in your @@ -9461,12 +10431,12 @@ These may well be incomplete, so any additions are welcome. \label{sec:conv:notesauth} This is, I believe, the simpler conversion, as most well-constructed -.bib entries for the notes \& bibliography style will nearly +.bib entries for the notes \&\ bibliography style will nearly \enquote{just work} in author-date, but here are a few caveats nonetheless: \begin{enumerate} -\item \mycolor{\textbf{NB:}} Unless you are using +\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 @@ -9479,14 +10449,14 @@ nonetheless: \textsf{cmslos=false} may help, but this may leave your document out-of-spec. \item The potential problem with multiple author lists containing more - than three names doesn't arise in the notes \& bibliography style, + than three names doesn't arise in the notes \&\ bibliography style, so the \textsf{shortauthor} fields in such entries may need alteration according to the instructions in section~\ref{sec:otherhints:auth} above. -\item Date presentation is relatively simple in notes \& bibliography, - so you'll need to contemplate the \texttt{cmsdate} options from - section~\ref{sec:authentryopts} when doing the conversion to - author-date. +\item Date presentation is relatively simple in notes \&\ + bibliography, so you'll need to contemplate the \texttt{cmsdate} + options from sections~\ref{sec:authuseropts} and + \ref{sec:authentryopts} when doing the conversion to author-date. \end{enumerate} \subsection{Author-date -> Notes} @@ -9494,7 +10464,7 @@ nonetheless: It is my impression that an author-date .bib database is somewhat easier to construct in the first instance, but subsequently converting -it to notes \& bibliography is a little more onerous. Here are some +it to notes \&\ bibliography is a little more onerous. Here are some of the things you may need to address: \begin{enumerate} @@ -9502,7 +10472,7 @@ of the things you may need to address: friends from section~\ref{sec:formatting:authdate} above, commands not strictly necessary for author-date, you'll need to insert them now. -\item In general, you need to be more careful in notes \& bibliography +\item In general, you need to be more careful in notes \&\ bibliography about capitalization issues. Fields which only appear once in author-date --- in the list of references --- may appear in both long notes and in the bibliography, in different syntactic contexts, @@ -9558,7 +10528,7 @@ package, but in this case a simple workaround is to load \textsf{biblatex} \emph{after} you've loaded \textsf{ragged2e} in your document preamble. -%\enlargethispage{\baselineskip} +\enlargethispage{\baselineskip} \mylittlespace Nick \mymarginpar{\textbf{Xe\LaTeX}} Andrewes alerted me to problems that appeared when he used the Xe\LaTeX\ engine to @@ -9586,8 +10556,8 @@ 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{deprecated,} but if you still -have urgent feature requests for them, I'll do what I can. +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 @@ -9612,6 +10582,14 @@ it seems to me that the available entry types could be pressed into service to address the vast majority of them. If this optimism proves misguided, please let me know. +\mylittlespace I haven't yet explored the possible uses in +\textsf{biblatex-chicago} for the new(-ish) \textsf{biblatex} fields +\textsf{related}, \textsf{relatedtype}, and \textsf{relatedstring}. +It's possible they will solve some issues more simply and elegantly +than my own kludges do, so I hope to address this for the next +release. The same holds for the \textsf{datelabelsource} field, new +in \textsf{biblatex} 2.8. + \mylittlespace Kenneth L. Pearce has reported a bug that appears when using multiple citation commands inside the \textsf{annotation} field of annotated bibliographies. As late as I am with the file for the @@ -9620,11 +10598,6 @@ you run into this problem, he suggests placing all the citations together in parentheses at the end of the annotation, though on my machine this doesn't always work too well, either. -\mylittlespace The same user has requested a way to provide shortened -citations not just of essays in one \textsf{collection}, but also of -multiple books in, for example, a collected works. I shall be looking -into this for future releases. - \mylittlespace Version 1.5 of \textsf{biblatex} revised the way the package deals with breaking long URLs and DOIs across lines. The new code is designed to deal as elegantly as possible with as wide a @@ -9658,15 +10631,6 @@ title, particularly Unicode ones. If you are using an empty set of curly braces \{\}\ at the start of the field, but I shall look into this further. -\mylittlespace Recent versions of \textsf{biblatex} have introduced -some new entry types for citing multi-volume works. These are largely -aimed at those already using \textsf{Biber}, which provides -much-improved functionality for the \textsf{crossref} field compared -to standard \textsc{Bib}\TeX\ or \textsf{bibtex8}. Depending upon the -time required to implement the changes for the 16th edition, these -types may make it into the package for the next major release, or they -may have to wait until the one after. - \mylittlespace Roger Hart has requested that I incorporate some means of changing the punctuation before \textsf{titleaddon} fields, perhaps using a customizable command like \cmd{titleaddonpunct}. I hope to @@ -9675,8 +10639,6 @@ 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{\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. @@ -9699,7 +10661,168 @@ code for it, let me know, and I'll look into it. \section{Revision History} \label{sec:history} -\textbf{0.9.9c: Released \today} +\textbf{0.9.9d: Released \today} +\begin{itemize} +\item Following requests by Kenneth~L.\ Pearce and Bertold Schweitzer, + I have modified and extended the mechanism for creating abbreviated + citations when several parts of the same collection are included in + a reference apparatus. To the \textbf{incollection}, + \textbf{inproceedings}, and \textbf{letter} entries of previous + releases, I have added \textbf{inbook}, \textbf{book}, + \textbf{bookinbook}, \textbf{collection}, and \textbf{proceedings} + entries. Only \textbf{inbook} entries join the former three in + having this functionality turned on by default --- if you don't want + this, it will require intervention either in the preamble or in the + \texttt{options} field of individual entries. This intervention + will be via the new \mycolor{\texttt{longcrossref}} option, which + controls the behavior of the four essay-like entry types and + defaults to \texttt{false}, while the new + \mycolor{\texttt{booklongxref}} option controls the four book-like + types and defaults to \texttt{true}. The useful settings for the + options differ slightly between the author-date and the notes \&\ + bibliography specifications, so please see all the details in the + docs of the \textsf{crossref} field in + sections~\ref{sec:entryfields} and \ref{sec:fields:authdate}, above. +\item On the same subject, in the notes \&\ bibliography style, I + should mention that in the first, full citation of one part of a + collection in a note, the code no longer uses a separate citation of + the parent entry to supply parts of what you see printed. (This led + to numerous inaccuracies.) If your setup uses a side-effect of the + old code to print data that hasn't even been inherited by the child, + you may find that you need to change some \textsf{xref} fields to + \textsf{crossref} fields to make it work correctly now. This + situation will, I imagine, be very rare, but you can look at + white:ross:memo in \textsf{notes-test.bib} to see an example. +\item In the author-date styles, several users have been frustrated by + the lack of an approved way of setting the \texttt{cmsdate} option + in the preambles of their documents, and Kenneth~L.\ Pearce + requested that I attempt to ease the burden on users by looking at + this again. With this release, you can now set \texttt{cmsdate} + either to \texttt{both} or \texttt{on} in the preamble, and it will + affect all entries (except \textbf{music}, \textbf{review}, and + \textbf{video}) with multiple dates. You can still change this + setting in the \texttt{options} field of individual entries, but + what you won't be able to change there is the new call to + \cmd{DeclareLabeldate} which puts the \textsf{origdate} first in the + list of dates when \textsf{Biber} searches for a \textsf{labelyear} + to use in citations and in the list of references. If you have been + using the \texttt{switchdates} mechanism to get the + \textsf{origdate} as the \textsf{labeldate}, your .bib files may + need some editing in order to use the new preamble options. Please + see the documentation of the \textsf{date} field in + section~\ref{sec:fields:authdate} above for all the (voluminous) + details. +\item Following a request by Rasmus Pank Rouland, I adapted new + \textsf{biblatex} code in the \cmd{textcite(s)} commands in all + styles to make them fit more elegantly in the flow of text. Upon + reconsideration of the commands in the notes \&\ bibliography style, + I slightly modified them, but \emph{only} when used inside a foot- + or endnote. In this context, by default, for both \cmd{textcite} + and \cmd{textcites}, you'll now get the \textsf{author's} name(s) + followed by a headless \emph{short} citation (or citations) placed + within parentheses. You can use \cmd{renewcommand} in the preamble + 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} +\item This release includes support, in all styles, for + \textsf{biblatex's} multi-volume entry types: \textbf{mvbook}, + \textbf{mvcollection}, \textbf{mvproceedings}, and + \textbf{mvreference}. See sections~\ref{sec:entrytypes} and + \ref{sec:types:authdate}. +\item If you use \textsf{Biber}, I have added several new inheritance + schemes to all styles to make cross-referenced entries work more + smoothly: \textbf{incollection} entries can now inherit from + \textbf{mvbook} just as they do from \textbf{mvcollection} entries; + \textbf{letter} entries now inherit from \textbf{book}, + \textbf{collection}, \textbf{mvbook}, and \textbf{mvcollection} + entries the same way an \textbf{inbook} or an \textbf{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 the + \textsf{date} and \textsf{origdate} fields of any \textbf{mv*} entry + will \emph{not} be inherited by any other entry type. +\item Following a bug report by Henry~D.\ Hollithron, I've added to + \textbf{unpublished} entries in all styles the possibility of + including an \textsf{editor}, \textsf{translator}, etc. +\item Thanks to bug reports from Denis Maier and Bertold Schweitzer, I + corrected inaccuracies and outright bugs in many entry types in all + Chicago styles that appeared when there was a \textsf{booktitle} and + not a \textsf{maintitle} or vice versa. This also involved another + rewrite of the code handling the \textsf{volume} field and other + related fields in all non-periodical entry types that use them. +\item On the subject of the \textsf{volume} field, I added a new + preamble and entry option, \mycolor{\texttt{delayvolume}}, to the + notes \&\ bibliography style. In long notes where this data isn't + printed before a \textsf{maintitle}, this option allows you to print + it \emph{after} the publication information rather than + \emph{before} it, as may sometimes help clarify things, according to + the \emph{Manual}. This applies to the non-periodical entry types + only. See section~\ref{sec:useropts}. +\item On the same subject, in all styles, I have added a new preamble + and entry option, \mycolor{\texttt{hidevolumes}}. This controls + whether, in entries where a \textsf{volume} has been printed before + a \textsf{maintitle}, any \textsf{volumes} field present will also + be printed, in this case \emph{after} the \textsf{maintitle}. By + default, this is set to \texttt{true}, so that the \textsf{volumes} + field won't appear in such circumstances. See + sections~\ref{sec:chicpreset} and \ref{sec:authpreset}. +\item On the same subject, I have modified, in all styles, the field + format for the \textbf{part} field, so that if the field contains + something other than a number, \textsf{biblatex-chicago} will print + it as is, capitalizing it if necessary, rather than supplying the + usual bibstring, thus providing a mechanism for altering the string + to your liking. I have also decoupled the \textsf{part} field from + the \textsf{volume} field, allowing it to be printed even in the + absence of the latter, thereby providing a means to refer to + segments of a larger work that don't easily fit the established + schemes. The iso:electrodoc entry in \textsf{dates-test.bib} shows + an example of how this might work. +\item There is a new \mycolor{\texttt{omitxrefdate}} preamble and + entry option in the notes \&\ bibliography style. It turns off the + printing of the child's \textsf{date} next to its \textsf{title} in + abbreviated book-like entries \emph{only}, in both notes and + bibliography. See section~\ref{sec:useropts}. +\item Clea~F.\ Rees requested a way to customize the punctuation when + a \textsf{volume} and a \textsf{page} number appear together like + so: \enquote{2:204.} You can use \cmd{renewcommand} in your + preamble to redefine the new \mycolor{\cmd{postvolpunct}} command to + achieve this, in all styles. If your document language is French, + \textsf{cms-french.lbx} redefines this already and prints something + like \enquote{2 : 204.} See sections~\ref{sec:formatcommands} and + \ref{sec:formatting:authdate}. +\item I extended, in all styles, the functions of the \textsf{userd} + field, allowing it to modify a \textsf{date} field if it hasn't + already been captured by another date specification in the entry. + See the documentation of the field in sections~\ref{sec:entryfields} + and \ref{sec:fields:authdate}. +\item A bug report from Mathias Legrand helped clear up inaccuracies + in the presentation of ordinal numbers in all styles. +\item For the author-date styles, another bug report by Kenneth Pearce + resulted in the addition of the \textsf{labelyear} to the default + \texttt{cms} sorting scheme so that more entries in the reference + list are sorted properly without further user intervention. +\item George Pigman found an odd punctuation-tracking bug in the + author-date styles. This has been fixed. +\item Marc Sommer found a bug in the presentation of the + \textsf{prenote} field in the author-date styles. This has been + fixed. +\item In the notes \&\ bibliography style, I improved the behavior of + abbreviated foot- and endnotes when using the \textsf{hyperref} + package. +\item I modified the date-presentation code in all the language files + (\textsf{cms-*.lbx}) provided by the package. Now, if an entry + contains a \textsf{(*)year} and an \textsf{(*)endyear} that are + exactly the same, and there aren't any further month or day + specifications, then the \textsf{year} alone will be printed. This + allows for the clearing of spurious \textsf{endyears} inherited from + parent entries. +\item I discovered some unpleasant side effects of my arrangement of + the \textsf{.lbx} files devoted to Norwegian, and reverted to the + arrangement as originally provided by Håkon Malmedal. +\end{itemize} + +\textbf{0.9.9c: Released March 15, 2013} \begin{itemize} \item Antti-Juhani Kaijahano has very kindly provided a new Finnish @@ -10234,7 +11357,7 @@ Other New Features: \begin{itemize} \item Fixed the \cmd{smartcite} citation command in, and added a \cmd{smartcites} command to, \textsf{chicago-notes.cbx}, so that the - notes \& bibliography style no longer prints parentheses around + notes \&\ bibliography style no longer prints parentheses around citations produced using \cmd{autocite(s)} commands inside \cmd{footnote} commands. Many thanks to Louis-Dominique Dubeau for pointing out this error. diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf Binary files differindex 39e6c3e395c..1523ee4ae40 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.tex index 44ebde49325..285958d58dc 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.9c (beta) \\ +\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.9d (beta) \\ \href{mailto:djf027@googlemail.com}{djf027@googlemail.com}\\ \today \end{center} @@ -76,13 +76,14 @@ \textsf{biblatex-chicago.pdf}. There may still be some users, however, who wish to continue using the 15th-edition styles, so I am continuing to provide them, though I am now marking them as - \enquote{deprecated.} They have received no backported fixes in - this release cycle, though my test files do still compile correctly. - The main reason to continue using these files is perhaps a desire - not to interrupt a work-in-progress. Given how little attention - they are currently receiving, however, I encourage all users of both - the \textsf{authordate15} and \textsf{notes15} styles to upgrade to - the current release of the 16th-edition styles as soon as may be + \enquote{strongly deprecated,} and will soon mark them as + \enquote{obsolete.} I have included very few fixes in this release + cycle, enough so that my test files do still compile correctly. The + main reason to continue using these files is perhaps a desire not to + interrupt a work-in-progress. Given how little attention they are + currently receiving, however, I encourage all users of both the + \textsf{authordate15} and \textsf{notes15} styles to upgrade to the + current release of the 16th-edition styles as soon as may be practicable. If the changes to the author-date style's treatment of titles has thus far discouraged you from upgrading, please be aware that the new \mycolor{\textsf{authordate-trad}} style retains the @@ -142,11 +143,11 @@ release. \begin{itemize}{}{} \item Philipp Lehman's \textsf{biblatex} package, of course! You - should use the latest version(s) --- 1.7 or 2.5 --- as those + should use the latest version(s) --- 1.7 or 2.8 --- as those versions have been tested more thoroughly than any other, meaning - that these style files may well not function properly with some - earlier iterations of \textsf{biblatex}. Lehman's tools require - several packages, and he strongly recommends several more: + that these style files may well not function properly with earlier + iterations of \textsf{biblatex}. 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) @@ -166,12 +167,11 @@ release. from version 1.5 onwards. For that style you must use the following: \item \textsf{Biber} --- the next-generation \textsc{Bib}\TeX\ - replacement, called \textsf{Biber}, which is available from - SourceForge. You should use the latest version, 1.5, to work with - \textsf{biblatex} 2.5, or 0.9.9 with \textsf{biblatex} 1.7, and it - is required for users who are either using the author-date style - or processing a .bib file in Unicode. See - \textsf{cms-dates-sample.pdf} for more details. + replacement, which is available from SourceForge. You should use + the latest version, 1.8, to work with \textsf{biblatex} 2.8, 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. \end{itemize} \item The line: \begin{quote} @@ -8565,7 +8565,18 @@ code for it, let me know, and I'll look into it. \section{Revision History} \label{sec:history} -\textbf{0.9.9c: Released \today} +\textbf{0.9.9d: Released \today} +\begin{itemize} +\item I have made just enough changes to the styles to ensure they + compile the test files correctly, but I am marking them as + \enquote{strongly deprecated,} and encourage all users to upgrade as + soon as is practicable to the 16th-edition styles. In the next + release, I shall mark them as \enquote{obsolete,} and they will + receive no further updates. + +\end{itemize} + +\textbf{0.9.9c: Released March 15, 2013} \begin{itemize} \item No changes to either style, but I am marking them as \enquote{deprecated,} and encourage all users to upgrade as soon as 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 Binary files differindex 7bbff5bed5f..dca6ab662a6 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf 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 b0d74ad50e0..1ca60d94f03 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 @@ -6,13 +6,10 @@ \usepackage[german,french,american]{babel} \usepackage[autostyle]{csquotes} %\usepackage[document]{ragged2e} -\usepackage[authordate,backend=biber,babel=hyphen,% +\usepackage[authordate,backend=biber,autolang=hyphen,booklongxref=false,% bibencoding=latin1,strict]{biblatex-chicago} % \usepackage[style=chicago-authordate,backend=biber,usecompiler=true,% % babel=hyphen,bibencoding=auto,sorting=nyt,cmslos,autocite=inline]{biblatex} -%\DeclareLanguageMapping{german}{cms-german} -%\DeclareLanguageMapping{american}{cms-american} -%\DeclareLanguageMapping{french}{cms-french} %\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf \usepackage{ifthen} \usepackage{setspace} @@ -41,7 +38,7 @@ bibencoding=latin1,strict]{biblatex-chicago} \usepackage{url} \urlstyle{rm} \appto\bibsetup{\sloppy} -\hyphenation{evans-ton clem-ens} +\hyphenation{evans-ton clem-ens mc-hugh} \setlength{\dimen\footins}{9.5in} \setlength{\parindent}{0pt} \setlength{\parskip}{5pt} @@ -66,17 +63,16 @@ plainpages=false,breaklinks=true]{hyperref} 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 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.5 and \textsf{biblatex} 2.5, 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\ -then you need \textsf{biblatex} version 1.4c and -\textsf{biblatex-chicago} 0.9.7a. (Please contact me at the email -address in \textsf{biblatex-chicago.pdf} if you have any difficulty -obtaining a copy of this earlier release.) +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.8), 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 +\textsf{biblatex} version 1.4c and \textsf{biblatex-chicago} 0.9.7a. +(Please contact me at the email address in +\textsf{biblatex-chicago.pdf} if you have any difficulty obtaining a +copy of this earlier release.) \subsection*{Editions} \label{editions} @@ -92,13 +88,13 @@ envisaged by the \emph{Manual} \autocite*[15.45]{chicago:manual}, grafts the traditional Chicago author-date title formatting onto the current recommendations for the remainder of the reference apparatus. Please consult \textsf{cms-trad-sample.pdf} to see how this looks in -practice. You can also still use the 15th-edition style files from +practice. You can also still use the 15th-edition styles from \textsf{biblatex-chicago}, which have been updated with some improvements borrowed from the 16th edition, but which are now -deprecated. (See \textsf{biblatex-chicago15.pdf} and +strongly deprecated. (See \textsf{biblatex-chicago15.pdf} and \textsf{cms15-dates-sample.pdf}.) I would encourage all users to switch to one of the 16th-edition styles as soon as possible, as I am -concentrating nearly all of my development time there. +concentrating all of my development time there. \subsection*{Usage} \label{usage} @@ -190,22 +186,34 @@ known or can be guessed: \autocite{horsley:prosodies}; edition is less than enthusiastic about the use of \enquote{\texttt{Anon.}}\ as author. -With \textsf{Biber}, in most entry types, an absent \textsf{date} will -automatically provoke it into searching for other sorts of dates in -the entry, in the order \textsf{year, eventyear, origyear, urlyear}: -e.g., \autocite{evanston:library}, which only has a \textsf{urlyear}. -In three entry types --- \textsf{Music}, \textsf{Review}, and -\textsf{Video} --- this search order is \textsf{eventyear, origyear, - year, urlyear}, as in these types the earliest year should take -precedence (cf.\ page~\pageref{sec:audiovisual}, below). You can +By default, in most entry types, an absent \textsf{date} will +automatically provoke \textsf{Biber} into searching for other sorts of +dates in the entry, in the order \textsf{year, eventyear, origyear, + urlyear}: e.g., \autocite{evanston:library}, which only has a +\textsf{urlyear}. In three entry types --- \textsf{Music}, +\textsf{Review}, and \textsf{Video} --- this search order is +\textsf{eventyear, origyear, year, urlyear}, as in these types the +earliest year should take precedence (cf.\ +page~\pageref{sec:audiovisual}, below). Beginning with this release, +you can change the default search order, for all but the three types +just mentioned, by using the \texttt{cmsdate} option in the preamble +of your document, instead of (or in addition to) using it in the +\textsf{options} field of individual entries. Setting that option in +the preamble either to \enquote{\texttt{both}} or +\enquote{\texttt{on}} makes the document-wide search order: +\textsf{origyear, year, eventyear, urlyear}. This may be useful for +documents that contain many entries with multiple dates, and where you +want \emph{always} to present the earlier (i.e., \textsf{orig}) dates +at the head of reference list entries and in citations. You can eliminate some of these dates from the running, or change the search -order, using the \cmd{DeclareLabelyear} command in your preamble, but -please be aware that I have hard-coded this order into the author-date -style in order to cope with some tricky corners of the specification. -If you reorder these dates, and your references enter these tricky -corners, the results might be surprising. (Cf.\ section~4.5.2 in -\textsf{biblatex.pdf} and section~5.2, s.v.\ \enquote{date} in -\textsf{biblatex-chicago.pdf} for the details.) +order, using the \cmd{DeclareLabeldate} command in your preamble, but +please be aware that I have hard-coded the possibilities above into +the author-date style in order to cope with some tricky corners of the +specification. If you reorder these dates, and your references enter +these tricky corners, the results might be surprising. (Cf.\ +section~4.5.8 in \textsf{biblatex.pdf} and especially section~5.2, +s.v.\ \enquote{\textsf{date}} in \textsf{biblatex-chicago.pdf} for the +gory details.) In most entry types, the absence of all four possible dates will automatically produce \mbox{\enquote{\texttt{n.d.}\hspace{-2pt}}} @@ -214,30 +222,31 @@ yourself in the form \cmd{bibstring\{nodate\}}: \autocite{ross:thesis}. A date that can be guessed should appear within square brackets: \autocite{clark:mesopot}. Forthcoming works are straightforward, assuming you remember to use the \cmd{autocap} -macro so that the word appears correctly in both citations and the -list of references: \autocite{author:forthcoming}; -\autocite{contrib:contrib}. +macro and the \textsf{year} (instead of the \textsf{date}) field, so +that the word appears correctly in both citations and the list of +references: \autocite{author:forthcoming}; \autocite{contrib:contrib}. The 16th edition of the \emph{Manual} has changed the rules for entries with more than one date \autocite[15.38]{chicago:manual}. -First, \textsf{Music} and \textsf{Video} entries have their own rules, -which are applied automatically. (Once again, see -page~\pageref{sec:audiovisual}, below.) For other entry types, there -are two options, corresponding to two different states of the -\texttt{cmsdate} entry option. The default is \texttt{cmsdate=off}: -\autocite{maitland:equity}. Here, setting the \textsf{pubstate} field -to \texttt{reprint} ensures that a notice of the original publication -date will be printed at the end of the reference list entry. -Alternatively, you can use \texttt{cmsdate=both}: -\autocite{emerson:nature}; \autocite{maitland:canon}. -\texttt{cmsdate=new} and \texttt{cmsdate=old} are both now synonyms of -\texttt{both}, while \texttt{cmsdate=on} is still available even -though it falls outside the specification: -\autocite{james:ambassadors}. These options, in combination with -others available in your .bib files, can cover a wide range of -difficult cases. Please see the next section below, the documentation -in \textsf{biblatex-chicago.pdf}, and also the following entries in -\textsf{dates-test.bib}: +First, \textsf{Music}, \textsf{Review}, and \textsf{Video} entries +have their own rules, which are applied automatically. (Once again, +see page~\pageref{sec:audiovisual}, below.) For other entry types, +there are two options, corresponding to two different states of the +\texttt{cmsdate} entry (or preamble) option. The default is +\texttt{cmsdate=off}: \autocite{maitland:equity}. Here, setting the +\textsf{pubstate} field to \texttt{reprint} ensures that a notice of +the original publication date will be printed at the end of the +reference list entry. Alternatively, you can use +\texttt{cmsdate=both}: \autocite{emerson:nature}; +\autocite{maitland:canon}. \texttt{cmsdate=new} and +\texttt{cmsdate=old} are both now synonyms of \texttt{both}, while +\texttt{cmsdate=on} is still available even though it falls outside +the specification: \autocite{james:ambassadors}. These options, in +combination with others available in your .bib files, can cover a wide +range of difficult cases. Please see the next section below, the +documentation in \textsf{biblatex-chicago.pdf}, particularly in +section~5.2, s.v.\ \enquote{\textsf{date},} and also the following +entries in \textsf{dates-test.bib}: \autocites{schweitzer:bach}{white:russ}{white:ross:memo}. \subsection*{Corners of the specification} @@ -309,6 +318,8 @@ 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} + Classical works: without abbreviation: \autocite{aristotle:metaphy:trans}; with abbreviation: \autocite{aristotle:metaphy:gr}; \autocite{plato:republic:gr}; using @@ -433,29 +444,30 @@ Book: \autocite{barrows:reading}; \autocite{churchill:letters}; \autocite{creasey:ashe:blast}; \autocite{creasey:morton:hide}; \autocite{creasey:york:death}; \autocite{davenport:attention}; \autocite{feydeau:farces}; \autocite{furet:passing:eng}; -\autocite{furet:passing:fr}; \autocite{harley:cartography}; -\autocite{hopp:attalid}; \autocite{howell:marriage}; -\autocite{lach:asia}; \autocite{lecarre:quest}; -\autocite{levistrauss:savage}; \autocite{lynch:webstyle}; -\autocite{maisonneuve:relations}; \autocite{mchugh:wake}; -\autocite{menchu:crossing}; \autocite{meredith:letters}; -\autocite{michelangelo:poems}; \autocite{mla:style}; -\autocite{natrecoff:camera}; \autocite{palmatary:pottery}; -\autocite{pelikan:christian}; \autocite{rodman:walk}; -\autocite{schellinger:novel}; \autocite{sechzer:women}; -\autocite{sereny:cries}; \autocite{soltes:georgia}; -\autocite{stendhal:parma}; \autocite{suangtho:tectona}; -\autocite{thompson:making}; \autocite{tillich:system}; -\autocite{times:guide}; \autocite{turabian:manual}; -\autocite{walker:columbia}; \autocite{wauchope:ceramics}; -\autocite{weber:saugetiere}; \autocite{weresz}; -\autocite{white:total}; \autocite{wright:evolution}; -\autocite{wright:theory}. - -BookInBook: \autocite{bernard:boris}. - -Collection: \autocite{brush:ornithology}; \autocite{kamrany:economic}; -\autocite{prairie:state}; \autocite{zukowsky:chicago}. +\autocite{furet:passing:fr}; \autocite{hopp:attalid}; +\autocite{howell:marriage}; \autocite{lach:asia}; +\autocite{lecarre:quest}; \autocite{levistrauss:savage}; +\autocite{lynch:webstyle}; \autocite{maisonneuve:relations}; +\autocite{mchugh:wake}; \autocite{menchu:crossing}; +\autocite{meredith:letters}; \autocite{michelangelo:poems}; +\autocite{mla:style}; \autocite{natrecoff:camera}; +\autocite{palmatary:pottery}; \autocite{pelikan:christian}; +\autocite{rodman:walk}; \autocite{schellinger:novel}; +\autocite{sechzer:women}; \autocite{sereny:cries}; +\autocite{soltes:georgia}; \autocite{stendhal:parma}; +\autocite{suangtho:tectona}; \autocite{thompson:making}; +\autocite{tillich:system}; \autocite{times:guide}; +\autocite{turabian:manual}; \autocite{walker:columbia}; +\autocite{wauchope:ceramics}; \autocite{weber:saugetiere}; +\autocite{weresz}; \autocite{white:total}; +\autocite{wright:evolution}; \autocite{wright:theory}. + +BookInBook: \autocite{bernhard:boris}; \autocite{bernhard:ritter}. + +Collection: \autocite{brush:ornithology}; +\autocite{harley:cartography}; \autocite{harley:ancient:cart}; +\autocite{kamrany:economic}; \autocite{prairie:state}; +\autocite{zukowsky:chicago}. Image: \autocite{bedford:photo}. diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf Binary files differindex 1a609ab414c..fd9dcf8c4e4 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex index 33c59badf64..8b5be60a39b 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 @@ -5,8 +5,8 @@ \usepackage[american]{babel} \usepackage[autostyle]{csquotes} \usepackage[document]{ragged2e} -\usepackage[notes,strict,backend=biber,babel=other,% -bibencoding=latin1]{biblatex-chicago} +\usepackage[notes,strict,backend=biber,autolang=other,% +bibencoding=latin1,booklongxref=false]{biblatex-chicago} %%\usepackage[osf]{mathpazo} %\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf \usepackage{ifthen} @@ -55,187 +55,190 @@ note\autocite{author:forthcoming} note\autocite{assocpress:gun} note\autocite{babb:peru}. Note\autocite{author:forthcoming} note\autocite{auden:reading} -note\autocite{barcott:review} note\autocite{batson}. +note\autocite{barcott:review} note\autocite{batson} note\autocite{babb:peru} note\autocite{barcott:review} note\autocite[339]{batson} note\autocite{beattie:crime} note\autocite{bedford:photo} note\autocite{babb:peru} -note\autocite{beethoven:sonata29} note\autocite{bernard:boris} -note\autocite{bernstein:shostakovich}. +note\autocite{beethoven:sonata29} note\autocite{bernhard:boris} +note\autocite{bernhard:ritter}. -Note\autocite{boxer:china} note\autocite{beattie:crime}. -note\autocite{brown:bremer} note\autocite{beethoven:sonata29} -note\autocite{bernstein:shostakovich} note\autocite{bernard:boris} +Note\autocite{bernstein:shostakovich} note\autocite{boxer:china} +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{centinel:letters} note\autocite{chaucer:liferecords} -note\autocite{browning:aurora}. - -Note\autocite[\printdate]{bundy:macneil} -note\autocite[29]{centinel:letters} note\autocite{chaucer:alt}. - -Note\autocite{clark:mesopot} note\autocite{chaucer:liferecords} -note\autocite{cleese:holygrail} note\autocite{Clemens:letter} -note\autocite{cohen:schiff} note\autocite{Clemens:letter} -note\autocite{clark:mesopot} note\autocite{cleese:holygrail} -note\autocite{cohen:schiff} note\autocite{chaucer:alt} -note\autocite{conley:fifthgrade} note\autocite{contrib:contrib} -note\autocite{conley:fifthgrade}. - -Note\autocite{contrib:contrib} note\autocite{cook:sotweed} -note\autocite{cotton:manufacture} note\autocite{coolidge:speech} -note\autocite{cook:sotweed} note\autocite{creasey:ashe:blast} -note\autocite{creasey:york:death} note\autocite{cotton:manufacture} -note\autocite{creasey:morton:hide} note\autocite{coolidge:speech} -note\autocite{creasey:ashe:blast} -note\footnote{\headlessfullcite{creel:house}.} -note\autocite{davenport:attention}. - -Note\autocite{creasey:york:death} note\autocite{creasey:morton:hide} +note\autocite{centinel:letters}. + +Note\autocite{chaucer:liferecords} note\autocite{browning:aurora} +note\autocite[\printdate]{bundy:macneil} +note\autocite[29]{centinel:letters}. + +Note\autocite{chaucer:alt} note\autocite{clark:mesopot} +note\autocite{chaucer:liferecords} note\autocite{cleese:holygrail} +note\autocite{Clemens:letter} note\autocite{cohen:schiff} +note\autocite{Clemens:letter} note\autocite{clark:mesopot} +note\autocite{cleese:holygrail} note\autocite{cohen:schiff} +note\autocite{chaucer:alt} note\autocite{conley:fifthgrade} +note\autocite{contrib:contrib}. + +Note\autocite{conley:fifthgrade} note\autocite{contrib:contrib} +note\autocite{cook:sotweed} note\autocite{cotton:manufacture} +note\autocite{coolidge:speech} note\autocite{cook:sotweed} +note\autocite{creasey:ashe:blast} note\autocite{creasey:york:death} +note\autocite{cotton:manufacture} note\autocite{creasey:morton:hide} +note\autocite{coolidge:speech} note\autocite{creasey:ashe:blast} +note.\footnote{\headlessfullcite{creel:house}.} + +Note\autocite{davenport:attention} note\autocite{creasey:york:death} +note\autocite{creasey:morton:hide} note\footnote{\headlesscite[\letterdatelong]{creel:house}.} note\autocite{dinkel:agassiz} note\autocite{donne:var} note\autocite{davenport:attention} note\autocite{dunn:revolutions} note\autocite{dyna:browser} note\autocite{dinkel:agassiz} note\autocite{eliot:pound} note\autocite{ellet:galena} note\autocite{donne:var} note\autocite{dyna:browser}. -note\autocite{ellis:blog} note\autocite{emerson:nature}. -Note\footfullcite{ency:britannica} note\autocite{dunn:revolutions} +Note\autocite{ellis:blog} note\autocite{emerson:nature} +note\footfullcite{ency:britannica} note\autocite{dunn:revolutions} note\autocite{eliot:pound} note\autocite{euripides:orestes} note\autocite{ellet:galena} note\autocite{ellis:blog} note\autocite{emerson:nature} note\autocite{evanston:library} note\footnote{\headlessfullcite[3]{feydeau:farces}.} -note\autocite{floyd:atom} note\autocite{euripides:orestes} -note\autocite{frede:inproc} note\autocite{friedman:learning}. +note\autocite{floyd:atom} note\autocite{euripides:orestes}. +Note\autocite{frede:inproc} note\autocite{friedman:learning} note\autocite{evanston:library} note\autocite{feydeau:farces} note\autocite{floyd:atom} note\autocite{frede:inproc} note\autocite{friedman:learning} note\autocite{friends:leia} note\autocite{furet:passing:eng} note\autocite{garaud:gatine} -note\autocite{garrett} note\autocite{gibbard} -note\autocite{friends:leia} note\autocite{furet:passing:eng}. +note\autocite{garrett} note\autocite{gibbard}. -Note\autocite{garrett} note\autocite{good:wholeissue} +Note\autocite{friends:leia} note\autocite{furet:passing:eng} +note\autocite{garrett} note\autocite{good:wholeissue} note\autocite{gourmet:052006} note\autocite{garaud:gatine} note\autocite{greek:filmstrip} note\autocite{grove:sibelius} note\autocite{handel:messiah} note\autocite{harley:cartography} -note\autocite{harwood:biden} note\autocite{gibbard} -note\autocite{hitchcock:nbynw} note\autocite{good:wholeissue} -note\autocite{hlatky:hrt}. +note\autocite{harley:ancient:cart} note\autocite{harwood:biden} +note\autocite{gibbard} note\autocite{hitchcock:nbynw}. -Note\autocite{greek:filmstrip} note\autocite{gourmet:052006} +Note\autocite{good:wholeissue} note\autocite{hlatky:hrt} +note\autocite{greek:filmstrip} note\autocite{gourmet:052006} note\autocite{handel:messiah} note\autocite{harwood:biden} note\autocite[Sibelius, Jean]{grove:sibelius} note\autocite{hitchcock:nbynw} note\autocite{holiday:fool} note\autocite{horsley:prosodies} note\autocite{harley:cartography} -note\autocite{horowitz:youtube} note\autocite{jackson:paulina:letter} -note\autocite{hlatky:hrt}. +note\autocite{horowitz:youtube}. -Note\autocite{james:ambassadors} note\autocite{holiday:fool} +Note\autocite{harley:ancient:cart} +note\autocite{jackson:paulina:letter} note\autocite{hlatky:hrt} +note\autocite{james:ambassadors} note\autocite{holiday:fool} note\autocite{horowitz:youtube} note\autocite{horsley:prosodies} note\autocite{keating:dearborn} note\autocite{jackson:paulina:letter} note\autocite{kern} note\autocite{james:ambassadors} -note\autocite{kimluu:diethyl} note\autocite{keating:dearborn} -note\autocite{kozinn:review} note\autocite{kern}. - -Note\autocite{lach:asia} note\autocite{kimluu:diethyl} -note\autocite{lakeforester:pushcarts} note\autocite{kozinn:review} -note\autocite{levistrauss:savage} note\autocite{lach:asia} -note\autocite{leo:madonna} note\autocite{lewis} -note\autocite{lakeforester:pushcarts} +note\autocite{kimluu:diethyl}. + +Note\autocite{keating:dearborn} note\autocite{kozinn:review} +note\autocite{kern} note\autocite{lach:asia} +note\autocite{kimluu:diethyl} note\autocite{lakeforester:pushcarts} +note\autocite{kozinn:review} note\autocite{levistrauss:savage} +note\autocite{lach:asia} note\autocite{leo:madonna} +note\autocite{lewis} note\autocite{lakeforester:pushcarts} note\autocite{levistrauss:savage} note\autocite{lecarre:quest} note\autocite[29]{lewis} note\autocite{lecarre:quest} -note\autocite{lippincott:chicago} note\autocite{loften:hamlet} -note\autocite{maisonneuve:relations} note\autocite{lippincott:chicago} -note\autocite{loften:hamlet} note\autocite{mchugh:wake}. +note\autocite{lippincott:chicago}. -Note\autocite{mcmillen:antebellum} +Note\autocite{loften:hamlet} note\autocite{maisonneuve:relations} +note\autocite{lippincott:chicago} note\autocite{loften:hamlet} +note\autocite{mchugh:wake} note\autocite{mcmillen:antebellum} note\autocite{maisonneuve:relations} note\footnote{\headlessfullcite[2:218]{meredith:letters}.} note\autocite{mchugh:wake} note\autocite[6.9.4]{mla:style} -note\autocite{morgenson:market} note\autocite{mozart:figaro} -note\autocite{murphy:silent} note\autocite{nasa:db} +note\autocite{morgenson:market} note\autocite{mozart:figaro}. + +Note\autocite{murphy:silent} note\autocite{nasa:db} note\autocite{nass:address} note\autocite{mcmillen:antebellum} -note\autocite{natrecoff:camera}. - -Note\autocite[2:25]{meredith:letters} note\autocite[6.9.5]{mla:style} -note\autocite{morgenson:market} note\autocite{murphy:silent} -note\autocite{mozart:figaro} note\autocite{nasa:db} -note\autocite{nass:address} note\autocite{nyt:obittrevor} -note\autocite{nyt:trevorobit} note\autocite{nytrumpet:art} -note\autocite{osborne:poison} note\autocite{oed:cdrom}. - -Note\autocite{natrecoff:camera} note\autocite{palmatary:pottery} -note\autocite{nyt:obittrevor} note\autocite{nyt:trevorobit} -note\autocite[arithmetical]{oed:cdrom} note\autocite{nytrumpet:art} -note\autocite{pelikan:christian} note\autocite{petroff:impurity} -note\autocite{osborne:poison} note\autocite{phibbs:diary} -note\autocite{palmatary:pottery} note\autocite{pirumova} +note\autocite{natrecoff:camera} note\autocite[2:25]{meredith:letters} +note\autocite[6.9.5]{mla:style} note\autocite{morgenson:market} +note\autocite{murphy:silent} note\autocite{mozart:figaro} +note\autocite{nasa:db} note\autocite{nass:address}. + +Note\autocite{nyt:obittrevor} note\autocite{nyt:trevorobit} +note\autocite{nytrumpet:art} note\autocite{osborne:poison} +note\autocite{oed:cdrom} note\autocite{natrecoff:camera} +note\autocite{palmatary:pottery} note\autocite{nyt:obittrevor} +note\autocite{nyt:trevorobit} note\autocite[arithmetical]{oed:cdrom} +note\autocite{nytrumpet:art} note\autocite{pelikan:christian} +note\autocite{petroff:impurity} note\autocite{osborne:poison} +note\autocite{phibbs:diary}. + +Note\autocite{palmatary:pottery} note\autocite{pirumova} note\autocite{pelikan:christian} note\autocite{petroff:impurity} -note\autocite{plato:republic:gr}. - -Note\autocite{polakow:afterw} note\autocite{phibbs:diary} +note\autocite{plato:republic:gr} note\autocite{polakow:afterw} +note\autocite{phibbs:diary} note\autocite[360e--361b]{plato:republic:gr} note\autocite{pirumova} note\autocite{polakow:afterw} note\autocite{pollan:plant} +note\autocite{powell:email}. + +Note\autocite{prose:intro} note\autocite{ratliff:review} +note\autocite{reaves:rosen} note\autocite{pollan:plant} note\autocite{powell:email} note\autocite{prose:intro} -note\autocite{ratliff:review} note\autocite{reaves:rosen} -note\autocite{pollan:plant} note\autocite{powell:email}. - -Note\autocite{prose:intro} 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{shapey:partita} note\autocite{sechzer:women} -note\autocite{sirosh:visualcortex}. - -Note\autocite{sereny:cries} note\autocite{silver:gawain} +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{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{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{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{warr:ellison} note\autocite{weed:flatiron} -note\autocite{wikiped:bibtex} note\autocite{will:cohere}. +note\autocite{wikiped:bibtex} note\autocite{will:cohere} +note\autocite{wauchope:ceramics}. As \textcite{zukowsky:chicago} +says, note\autocite{weresz} note\autocite{white:russ}. -Note\autocite{wauchope:ceramics}. As \textcite{zukowsky:chicago} -says, note\autocite{weresz} note\autocite{white:russ} -note\autocite{white:callimachus} note\autocite{white:ross:memo} +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}.} - -Note\autocites[See][3.2.996b5--8]{aristotle:metaphy:gr}[360e--361b] +note\autocite{will:cohere} note\footnote{\textcite{zukowsky:chicago} + makes a similar point.} +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\autocite[3:126]{meredith:letters} note\footfullcite[2]{weresz} +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 Binary files differindex 2f28293369b..fddd9cb30dd 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.pdf 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 73a880674e1..d4ece985d32 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 @@ -6,13 +6,10 @@ \usepackage[german,french,american]{babel} \usepackage[autostyle]{csquotes} %\usepackage[document]{ragged2e} -\usepackage[authordate-trad,backend=biber,babel=hyphen,% +\usepackage[authordate-trad,backend=biber,autolang=hyphen,booklongxref=false,% bibencoding=latin1,strict]{biblatex-chicago} % \usepackage[style=chicago-authordate,backend=biber,usecompiler=true,% % babel=hyphen,bibencoding=auto,sorting=nyt,cmslos,autocite=inline]{biblatex} -%\DeclareLanguageMapping{german}{cms-german} -%\DeclareLanguageMapping{american}{cms-american} -%\DeclareLanguageMapping{french}{cms-french} %\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf \usepackage{ifthen} \usepackage{setspace} @@ -41,7 +38,7 @@ bibencoding=latin1,strict]{biblatex-chicago} \usepackage{url} \urlstyle{rm} \appto\bibsetup{\sloppy} -\hyphenation{evans-ton clem-ens} +\hyphenation{evans-ton clem-ens mc-hugh} \setlength{\dimen\footins}{9.5in} \setlength{\parindent}{0pt} \setlength{\parskip}{5pt} @@ -66,17 +63,16 @@ plainpages=false,breaklinks=true]{hyperref} 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 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.5 and \textsf{biblatex} 2.5, 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\ -then you need \textsf{biblatex} version 1.4c and -\textsf{biblatex-chicago} 0.9.7a. (Please contact me at the email -address in \textsf{biblatex-chicago.pdf} if you have any difficulty -obtaining a copy of this earlier release.) +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.8), 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 +\textsf{biblatex} version 1.4c and \textsf{biblatex-chicago} 0.9.7a. +(Please contact me at the email address in +\textsf{biblatex-chicago.pdf} if you have any difficulty obtaining a +copy of this earlier release.) \subsection*{Editions} \label{editions} @@ -93,12 +89,13 @@ most un-book-like entries, enclosed in quotation marks. I have implemented the \textsf{authordate-trad} style for such users. To compare it with the standard style, please see \textsf{cms-dates-sample.pdf}. You can also still use the -15th-edition style files from \textsf{biblatex-chicago}, which have -been updated with some improvements borrowed from the 16th edition, -but which are now deprecated. (See \textsf{biblatex-chicago15.pdf} -and \textsf{cms15-dates-sample.pdf}.) I would encourage all users to -switch to one of the 16th-edition styles as soon as possible, as I am -concentrating nearly all of my development time there. +15th-edition styles from \textsf{biblatex-chicago}, which have been +updated with some improvements borrowed from the 16th edition, but +which are now strongly deprecated. (See +\textsf{biblatex-chicago15.pdf} and \textsf{cms15-dates-sample.pdf}.) +I would encourage all users to switch to one of the 16th-edition +styles as soon as possible, as I am concentrating all of my +development time there. \subsection*{Usage} \label{usage} @@ -190,22 +187,34 @@ known or can be guessed: \autocite{horsley:prosodies}; edition is less than enthusiastic about the use of \enquote{\texttt{Anon.}}\ as author. -With \textsf{Biber}, in most entry types, an absent \textsf{date} will -automatically provoke it into searching for other sorts of dates in -the entry, in the order \textsf{year, eventyear, origyear, urlyear}: -e.g., \autocite{evanston:library}, which only has a \textsf{urlyear}. -In three entry types --- \textsf{Music}, \textsf{Review}, and -\textsf{Video} --- this search order is \textsf{eventyear, origyear, - year, urlyear}, as in these types the earliest year should take -precedence (cf.\ page~\pageref{sec:audiovisual}, below). You can +By default, in most entry types, an absent \textsf{date} will +automatically provoke \textsf{Biber} into searching for other sorts of +dates in the entry, in the order \textsf{year, eventyear, origyear, + urlyear}: e.g., \autocite{evanston:library}, which only has a +\textsf{urlyear}. In three entry types --- \textsf{Music}, +\textsf{Review}, and \textsf{Video} --- this search order is +\textsf{eventyear, origyear, year, urlyear}, as in these types the +earliest year should take precedence (cf.\ +page~\pageref{sec:audiovisual}, below). Beginning with this release, +you can change the default search order, for all but the three types +just mentioned, by using the \texttt{cmsdate} option in the preamble +of your document, instead of (or in addition to) using it in the +\textsf{options} field of individual entries. Setting that option in +the preamble either to \enquote{\texttt{both}} or +\enquote{\texttt{on}} makes the document-wide search order: +\textsf{origyear, year, eventyear, urlyear}. This may be useful for +documents that contain many entries with multiple dates, and where you +want \emph{always} to present the earlier (i.e., \textsf{orig}) dates +at the head of reference list entries and in citations. You can eliminate some of these dates from the running, or change the search -order, using the \cmd{DeclareLabelyear} command in your preamble, but -please be aware that I have hard-coded this order into the author-date -style in order to cope with some tricky corners of the specification. -If you reorder these dates, and your references enter these tricky -corners, the results might be surprising. (Cf.\ section~4.5.2 in -\textsf{biblatex.pdf} and section~5.2, s.v.\ \enquote{date} in -\textsf{biblatex-chicago.pdf} for the details.) +order, using the \cmd{DeclareLabeldate} command in your preamble, but +please be aware that I have hard-coded the possibilities above into +the author-date style in order to cope with some tricky corners of the +specification. If you reorder these dates, and your references enter +these tricky corners, the results might be surprising. (Cf.\ +section~4.5.8 in \textsf{biblatex.pdf} and especially section~5.2, +s.v.\ \enquote{\textsf{date}} in \textsf{biblatex-chicago.pdf} for the +gory details.) In most entry types, the absence of all four possible dates will automatically produce \mbox{\enquote{\texttt{n.d.}\hspace{-2pt}}} @@ -214,30 +223,31 @@ yourself in the form \cmd{bibstring\{nodate\}}: \autocite{ross:thesis}. A date that can be guessed should appear within square brackets: \autocite{clark:mesopot}. Forthcoming works are straightforward, assuming you remember to use the \cmd{autocap} -macro so that the word appears correctly in both citations and the -list of references: \autocite{author:forthcoming}; -\autocite{contrib:contrib}. +macro and the \textsf{year} (instead of the \textsf{date}) field, so +that the word appears correctly in both citations and the list of +references: \autocite{author:forthcoming}; \autocite{contrib:contrib}. The 16th edition of the \emph{Manual} has changed the rules for entries with more than one date \autocite[15.38]{chicago:manual}. -First, \textsf{Music} and \textsf{Video} entries have their own rules, -which are applied automatically. (Once again, see -page~\pageref{sec:audiovisual}, below.) For other entry types, there -are two options, corresponding to two different states of the -\texttt{cmsdate} entry option. The default is \texttt{cmsdate=off}: -\autocite{maitland:equity}. Here, setting the \textsf{pubstate} field -to \texttt{reprint} ensures that a notice of the original publication -date will be printed at the end of the reference list entry. -Alternatively, you can use \texttt{cmsdate=both}: -\autocite{emerson:nature}; \autocite{maitland:canon}. -\texttt{cmsdate=new} and \texttt{cmsdate=old} are both now synonyms of -\texttt{both}, while \texttt{cmsdate=on} is still available even -though it falls outside the specification: -\autocite{james:ambassadors}. These options, in combination with -others available in your .bib files, can cover a wide range of -difficult cases. Please see the next section below, the documentation -in \textsf{biblatex-chicago.pdf}, and also the following entries in -\textsf{dates-test.bib}: +First, \textsf{Music}, \textsf{Review}, and \textsf{Video} entries +have their own rules, which are applied automatically. (Once again, +see page~\pageref{sec:audiovisual}, below.) For other entry types, +there are two options, corresponding to two different states of the +\texttt{cmsdate} entry (or preamble) option. The default is +\texttt{cmsdate=off}: \autocite{maitland:equity}. Here, setting the +\textsf{pubstate} field to \texttt{reprint} ensures that a notice of +the original publication date will be printed at the end of the +reference list entry. Alternatively, you can use +\texttt{cmsdate=both}: \autocite{emerson:nature}; +\autocite{maitland:canon}. \texttt{cmsdate=new} and +\texttt{cmsdate=old} are both now synonyms of \texttt{both}, while +\texttt{cmsdate=on} is still available even though it falls outside +the specification: \autocite{james:ambassadors}. These options, in +combination with others available in your .bib files, can cover a wide +range of difficult cases. Please see the next section below, the +documentation in \textsf{biblatex-chicago.pdf}, particularly in +section~5.2, s.v.\ \enquote{\textsf{date},} and also the following +entries in \textsf{dates-test.bib}: \autocites{schweitzer:bach}{white:russ}{white:ross:memo}. \subsection*{Corners of the specification} @@ -309,6 +319,8 @@ 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} + Classical works: without abbreviation: \autocite{aristotle:metaphy:trans}; with abbreviation: \autocite{aristotle:metaphy:gr}; \autocite{plato:republic:gr}; using @@ -355,7 +367,7 @@ Chicago author-date specification. However, if \enquote{a reference be abbreviated as [\enquote{Hlatky et al.}] but whose coauthors are different persons or listed in a different order, the text citations must distinguish between them} \autocite[15.28]{chicago:manual}. -The new (\textsf{Biber}-only) \textsf{biblatex} option +The (\textsf{Biber}-only) \textsf{biblatex} option \texttt{uniquelist}, set for you in \textsf{biblatex-chicago.sty}, will automatically handle many of these situations for you, but it is as well to understand that it does so by temporarily suspending the @@ -434,29 +446,30 @@ Book: \autocite{barrows:reading}; \autocite{churchill:letters}; \autocite{creasey:ashe:blast}; \autocite{creasey:morton:hide}; \autocite{creasey:york:death}; \autocite{davenport:attention}; \autocite{feydeau:farces}; \autocite{furet:passing:eng}; -\autocite{furet:passing:fr}; \autocite{harley:cartography}; -\autocite{hopp:attalid}; \autocite{howell:marriage}; -\autocite{lach:asia}; \autocite{lecarre:quest}; -\autocite{levistrauss:savage}; \autocite{lynch:webstyle}; -\autocite{maisonneuve:relations}; \autocite{mchugh:wake:15}; -\autocite{menchu:crossing}; \autocite{meredith:letters}; -\autocite{michelangelo:poems}; \autocite{mla:style}; -\autocite{natrecoff:camera}; \autocite{palmatary:pottery}; -\autocite{pelikan:christian}; \autocite{rodman:walk}; -\autocite{schellinger:novel}; \autocite{sechzer:women}; -\autocite{sereny:cries}; \autocite{soltes:georgia}; -\autocite{stendhal:parma}; \autocite{suangtho:tectona}; -\autocite{thompson:making}; \autocite{tillich:system}; -\autocite{times:guide}; \autocite{turabian:manual}; -\autocite{walker:columbia}; \autocite{wauchope:ceramics}; -\autocite{weber:saugetiere}; \autocite{weresz}; -\autocite{white:total}; \autocite{wright:evolution}; -\autocite{wright:theory}. - -BookInBook: \autocite{bernard:boris}. - -Collection: \autocite{brush:ornithology}; \autocite{kamrany:economic}; -\autocite{prairie:state}; \autocite{zukowsky:chicago}. +\autocite{furet:passing:fr}; \autocite{hopp:attalid}; +\autocite{howell:marriage}; \autocite{lach:asia}; +\autocite{lecarre:quest}; \autocite{levistrauss:savage}; +\autocite{lynch:webstyle}; \autocite{maisonneuve:relations}; +\autocite{mchugh:wake:15}; \autocite{menchu:crossing}; +\autocite{meredith:letters}; \autocite{michelangelo:poems}; +\autocite{mla:style}; \autocite{natrecoff:camera}; +\autocite{palmatary:pottery}; \autocite{pelikan:christian}; +\autocite{rodman:walk}; \autocite{schellinger:novel}; +\autocite{sechzer:women}; \autocite{sereny:cries}; +\autocite{soltes:georgia}; \autocite{stendhal:parma}; +\autocite{suangtho:tectona}; \autocite{thompson:making}; +\autocite{tillich:system}; \autocite{times:guide}; +\autocite{turabian:manual}; \autocite{walker:columbia}; +\autocite{wauchope:ceramics}; \autocite{weber:saugetiere}; +\autocite{weresz}; \autocite{white:total}; +\autocite{wright:evolution}; \autocite{wright:theory}. + +BookInBook: \autocite{bernhard:boris}; \autocite{bernhard:ritter}. + +Collection: \autocite{brush:ornithology}; +\autocite{harley:cartography}; \autocite{harley:ancient:cart}; +\autocite{kamrany:economic}; \autocite{prairie:state}; +\autocite{zukowsky:chicago}. Image: \autocite{bedford:photo}. 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 Binary files differindex dfefe02a823..ee5b0e0025e 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.pdf 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 10bb7e492d1..bbf5784cc50 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 @@ -6,13 +6,10 @@ \usepackage[german,french,american]{babel} \usepackage[autostyle]{csquotes} %\usepackage[document]{ragged2e} -\usepackage[authordate15,backend=biber,babel=hyphen,% +\usepackage[authordate15,backend=biber,autolang=hyphen,% bibencoding=latin1,strict]{biblatex-chicago} % \usepackage[style=chicago-authordate,backend=biber,usecompiler=true,% % babel=hyphen,bibencoding=auto,sorting=nyt,cmslos,autocite=inline]{biblatex} -%\DeclareLanguageMapping{german}{cms-german} -%\DeclareLanguageMapping{american}{cms-american} -%\DeclareLanguageMapping{french}{cms-french} %\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf \usepackage{ifthen} \usepackage{setspace} @@ -67,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.5 and \textsf{biblatex} 2.5, which latter two are +to \textsf{Biber} 1.8 and \textsf{biblatex} 2.8, 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\ @@ -404,7 +401,7 @@ Book: \autocite{barrows:reading}; \autocite{churchill:letters}; \autocite{white:total}; \autocite{wright:evolution}; \autocite{wright:theory}. -BookInBook: \autocite{bernard:boris}. +BookInBook: \autocite{bernhard:boris}. Collection: \autocite{brush:ornithology}; \autocite{kamrany:economic}; \autocite{prairie:state}; \autocite{zukowsky:chicago}. 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 Binary files differindex 2c29d47d368..9c0957b8120 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-notes-sample.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-notes-sample.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-notes-sample.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-notes-sample.tex index b360f86ace8..5b31fe706f7 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-notes-sample.tex +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-notes-sample.tex @@ -5,7 +5,7 @@ \usepackage[american]{babel} \usepackage[autostyle]{csquotes} \usepackage[document]{ragged2e} -\usepackage[notes15,strict,backend=biber,babel=other,% +\usepackage[notes15,strict,backend=biber,autolang=other,% bibencoding=latin1]{biblatex-chicago} %%\usepackage[osf]{mathpazo} %\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf @@ -56,12 +56,12 @@ Note\autocite{barcott:review} note\autocite{batson}. note\autocite{babb:peru} note\autocite{barcott:review} note\autocite[339]{batson} note\autocite{beattie:crime} note\autocite{bedford:photo} note\autocite{babb:peru} -note\autocite{beethoven:sonata29} note\autocite{bernard:boris} +note\autocite{beethoven:sonata29} note\autocite{bernhard:boris} note\autocite{bernstein:shostakovich} note\autocite{boxer:china} note\autocite{beattie:crime}. Note\autocite{brown:bremer} note\autocite{beethoven:sonata29} -note\autocite{bernstein:shostakovich} note\autocite{bernard:boris} +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{centinel:letters} note\autocite{chaucer:liferecords} 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 d80d9067665..526ed2bd72a 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib @@ -410,21 +410,53 @@ particularly in the author-date style.)} } -@BookInBook{bernard:boris, - author = {Bernard, Thomas}, +@BookInBook{bernhard:boris, + author = {Bernhard, Thomas}, title = {A Party for {Boris}}, - booktitle = {Histrionics}, - booksubtitle = {Three Plays}, - translator = {Jansen, Peter~K. and Northcott, Kenneth}, - publisher = uchp, + crossref = {bernhard:themacher}, + sorttitle = {Party}, year = 1990, - location = {Chicago}, - annotation = {A typical BookInBook entry, presenting part of a - book that could in other contexts be a book in its - own right. The title here will therefore be - italicized. Notice especially the use of booktitle - in such an entry, which makes it a "book within a - book."} + annotation = {A BookInBook entry, presenting part of a book that + could in other contexts be a book in its own right. + The title here will therefore be italicized. This + example shows the new abbreviated references + available in this entry type when a crossref or xref + is used, assuming the booklongxref option is set + properly - which it isn't by default - either in the + preamble or in the options field. Such treatment, I + note, isn't explicitly condoned by the Chicago + specification. See the next entry.} +} + +@BookInBook{bernhard:ritter, + title = {{Ritter, Dene, Voss}}, + date = 1990, + author = {Bernhard, Thomas}, + crossref = {bernhard:themacher}, + annotation = {This entry presents a second play by the same author + contained in the same volume as the previous entry. + With the crossref field present and the booklongxref + set properly - which it isn't by default - you'll + get abbreviated references to both in the list of + references.} +} + +@Book{bernhard:themacher, + title = {Histrionics}, + translator = {Jansen, Peter~K. and Northcott, Kenneth}, + subtitle = {Three Plays}, + date = 1990, + author = {Bernhard, Thomas}, + publisher = uchp, + location = {Chicago}, + annotation = {This entry provides the booktitle for the previous + two. It will be printed in the list of references, + and the entries there for its two children - + bernhard:boris and bernhard:ritter - will be + abbreviated references to it, assuming the + booklongxref option is set properly, which it isn't + by default. Biber automatically converts the title + of the Book to the booktitle of the BookInBook.} } @Music{bernstein:shostakovich, @@ -1057,15 +1089,15 @@ title = {By Rail and Stage to {Galena}}, crossref = {prairie:state}, pages = {271--79}, - subtitle = {}, annotation = {First of three InCollection entries cross-referencing the same Collection. Cf. keating:dearborn and lippincott:chicago. All three entries will have an abbreviated form in the list of references. If you don't want this - space-saving measure, don't use crossref or xref. - Also, note empty subtitle field, to prevent - inheritance from parent entry.} + space-saving measure, you can, for example, set + longcrossref=true in the options field. With Biber, + an empty subtitle field is no longer necessary to + prevent inheritance from a parent entry.} } @Article{ellis:blog, @@ -1576,19 +1608,56 @@ The usual type field identifies the medium.} } -@Book{harley:cartography, +@Collection{harley:ancient:cart, + title = {Cartography in Prehistoric, Ancient, and Medieval + {Europe} and the {Mediterranean}}, + crossref = {harley:hoc}, + date = {1987}, + volume = 1, + annotation = {A Collection entry, with the maintitle coming from + the MVCollection entry cited in the crossref field. + With the booklongxref option set properly, and not + by default, this and the next entry will now produce + abbreviated references in the list of references. + Cf. lach:asia.}, +} + +@Collection{harley:cartography, title = {Cartography in the Traditional {East and Southeast Asian} Societies}, + crossref = {harley:hoc}, year = 1994, - maintitle = {The History of Cartography}, volume = {2}, part = {2}, - editor = {Harley, J.~B. and Woodward, David}, - publisher = uchp, - location = {Chicago}, - annotation = {A Book entry, with its maintitle's logical volumes - published in separate physical parts, hence a volume - and a part number. Cf. lach:asia.} + annotation = {A Collection entry, with its maintitle's logical + volumes published in separate physical parts, hence + a volume and a part number. The maintitle itself + comes from the MVCollection entry cited in the + crossref field. With the booklongxref option set + properly, and not by default, this and the previous + entry will now produce abbreviated references in the + list of references. Cf. lach:asia.} +} + +@MVCollection{harley:hoc, + title = {The History of Cartography}, + date = {1987/}, + editor = {Harley, J.~B. and Woodward, David}, + volumes = {3}, + publisher = uchp, + location = {Chicago}, + annotation = {This entry shows the new MVCollection type used as + the parent to two child Collection entries -- + harley:ancient:cart and harley:cartography. It will + be presented in the list of references when more + than one of its children are cited, and those + children's entries will be abbreviated in the list + as well, assuming the option booklongxref is set + properly (it won't be by default). Biber + automatically transforms the title of this entry + into a maintitle for the children. Please note that + this treatment isn't explicitly allowed in the + Chicago specification.} } @Online{harwood:biden, @@ -1790,7 +1859,7 @@ @Book{iso:electrodoc, title = {Electronic Documents or Parts thereof. {Excerpts} from {International Standard ISO} 690-2}, - titleaddon = {Part 2 of\nopunct}, + part = {part 2}, date = 2001, maintitle = {Information and Documentation}, mainsubtitle = {Bibliographic References}, @@ -1801,18 +1870,18 @@ address = {Ottawa}, url = {http://www.nlc-bnc.ca/iso/tc46sc9/standard/690-2e.htm}, annote = {A book with a maintitle and an organizational - author. You can use the titleaddon field to - identify how the title relates to the maintitle, + author. You can now use the part field on its own + to define how the title relates to the maintitle, assuming that the usual volume and part fields don't - provide an appropriate solution. The nopunct - command suppresses the following punctuation. The - shorthand for the organization will appear in the - in-text citations, and in the 16th edition will also - appear at the head of the reference list entry, - followed by its expansion (the author) in - parentheses. The sortname ensures that the entry is - alphabetized by the first thing that appears there, - that is, the shorthand. See next entry.} + provide an appropriate solution. Any non-numeric + part field will be printed as-is. The shorthand for + the organization will appear in the in-text + citations, and in the 16th edition will also appear + at the head of the reference list entry, followed by + its expansion (the author) in parentheses. The + sortname ensures that the entry is alphabetized by + the first thing that appears there, that is, the + shorthand. See next entry.} } @Book{iso:electrodoc:15, @@ -1873,7 +1942,6 @@ author = {Keating, William~H.}, title = {{Fort Dearborn and Chicago}}, crossref = {prairie:state}, - subtitle = {}, pages = {84--87}, annotation = {Second of three InCollection pieces from the same Collection, using the crossref field. The entry in @@ -2065,7 +2133,6 @@ @InCollection{lippincott:chicago, author = {Lippincott, Sarah Clarke}, title = {Chicago}, - subtitle = {}, crossref = {prairie:state}, pages = {362--70}, annotation = {Third and last of the InCollection entries referring 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 120ad5b3b11..3ce3ba6b6b8 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib @@ -280,21 +280,51 @@ the absence of a date doesn't help, either.)} } -@BookInBook{bernard:boris, - author = {Bernard, Thomas}, +@BookInBook{bernhard:boris, title = {A Party for Boris}, - booktitle = {Histrionics}, - booksubtitle = {Three Plays}, - translator = {Jansen, Peter~K. and Northcott, Kenneth}, - publisher = uchp, - year = 1990, - location = {Chicago}, - annote = {A typical BookInBook entry, presenting part of a - book that could in other contexts be a book in its - own right. The title here will therefore be - italicized. Notice especially the use of booktitle - in such an entry, which makes it a "book within a - book."} + sorttitle = {Party}, + crossref = {bernhard:themacher}, + annote = {A BookInBook entry, presenting part of a book that + could in other contexts be a book in its own right. + The title here will therefore be italicized. This + example shows the new abbreviated references + available in this entry type when a crossref or xref + is used, assuming the booklongxref option is set + properly - which it isn't by default - either in the + preamble or in the options field. Such treatment, I + note, isn't explicitly condoned by the Chicago + specification. See the next entry.} +} + +@BookInBook{bernhard:ritter, + title = {Ritter, Dene, Voss}, + crossref = {bernhard:themacher}, + annote = {This entry presents a second play by the same author + contained in the same volume as the previous entry. + With the crossref field present and the booklongxref + set properly - which it isn't by default - you'll + get abbreviated references to both in the + bibliography and in long notes (after the first).} +} + +@Book{bernhard:themacher, + title = {Histrionics}, + translator = {Jansen, Peter~K. and Northcott, Kenneth}, + subtitle = {Three Plays}, + date = 1990, + author = {Bernhard, Thomas}, + publisher = uchp, + location = {Chicago}, + annote = {This entry provides the booktitle for the previous + two. It will be printed in the bibliography, and + the entries for its two children -- bernhard:boris + and bernhard:ritter -- will be abbreviated + references to it, assuming the booklongxref option + is set properly, which it isn't by default. Please + note that this style of cross-reference, with the + title of the Book automatically converted to the + booktitle of the BookInBook, is only available with + Biber as your backend.} } @Music{bernstein:shostakovich, @@ -813,7 +843,6 @@ title = {By Rail and Stage to Galena}, crossref = {prairie:state}, pages = {271--79}, - subtitle = {}, annote = {First of three InCollection entries cross-referencing the same Collection. Since it is cited first in my example file, its long note @@ -823,9 +852,10 @@ Collection. Cf. keating:dearborn and lippincott:chicago. All three have an abbreviated reference in the bibliography. If you don't want - this space-saving measure, don't use crossref or - xref. Also, note empty subtitle field, to prevent - inheritance from parent entry.} + this space-saving measure, then you can, for + example, set longcrossref=true in the options field. + With Biber, an empty subtitle field is no longer + necessary to prevent inheritance from parent entry.} } @Article{ellis:blog, @@ -1199,20 +1229,60 @@ just what sort of eventdate it is.} } -@Book{harley:cartography, +@Collection{harley:ancient:cart, + title = {Cartography in Prehistoric, Ancient, and Medieval + Europe and the Mediterranean}, + crossref = {harley:hoc}, + date = {1987}, + volume = 1, + annote = {A Collection entry, with the maintitle coming from + the MVCollection entry cited in the crossref field. + With the booklongxref option set properly, and not + by default, this and the next entry will now produce + abbreviated references in the bibliography and in + long notes (after the first). Cf. lach:asia.}, +} + +@Collection{harley:cartography, title = {Cartography in the Traditional East and Southeast Asian Societies}, year = 1994, - maintitle = {The History of Cartography}, + crossref = {harley:hoc}, volume = {2}, part = {2}, - editor = {Harley, J.~B. and Woodward, David}, - publisher = uchp, - location = {Chicago}, shorttitle = {Cartography in East and Southeast Asia}, - annote = {A Book entry, with its maintitle's logical volumes - published in separate physical parts, hence a volume - and a part number. Cf. lach:asia.} + annote = {A Collection entry, with its maintitle's logical + volumes published in separate physical parts, hence + a volume and a part number. The maintitle itself + comes from the MVCollection entry cited in the + crossref field. With the booklongxref option set + properly, and not by default, this and the previous + entry will now produce abbreviated references in the + bibliography and in long notes (after the first). + Cf. lach:asia.} +} + +@MVCollection{harley:hoc, + title = {The History of Cartography}, + date = {1987/}, + editor = {Harley, J.~B. and Woodward, David}, + volumes = {3}, + publisher = uchp, + location = {Chicago}, + annote = {This entry shows the new MVCollection type used as + the parent to two child Collection entries -- + harley:ancient:cart and harley:cartography. It will + be presented in the bibliography when more than one + of its children are cited, and those children's + entries will be abbreviated in the bibliography and + in long notes (after the first), assuming the option + booklongxref is set properly (it won't be by + default). Please note that this treatment isn't + explicitly allowed in the Chicago specification, and + also that this style of cross-referencing, where the + title of the MVCollection automatically becomes the + maintitle of the Collection, is only available with + Biber as your backend.} } @Online{harwood:biden, @@ -1416,7 +1486,6 @@ author = {Keating, William~H.}, title = {Fort Dearborn and Chicago}, crossref = {prairie:state}, - subtitle = {}, pages = {84--87}, annote = {Second of three InCollection pieces from the same Collection, using the crossref field. Even in the @@ -1591,7 +1660,6 @@ @InCollection{lippincott:chicago, author = {Lippincott, Sarah Clarke}, title = {Chicago}, - subtitle = {}, crossref = {prairie:state}, pages = {362--70}, annote = {Third and last of the InCollection entries referring @@ -2683,7 +2751,7 @@ title = {EBW to Harold Ross}, titleaddon = {memorandum}, keywords = {original}, - xref = {white:total}, + crossref = {white:total}, pages = 273, origdate = {1946-05-02}, shorthand = {EBWMemo}, @@ -2694,17 +2762,20 @@ letters alone will be printed in the bibliography, so we use the keywords field to stop this entry from appearing there. Since Chicago's mechanism for - shortened cross-references is operative in Letter - entries using crossref or xref (as in InCollection - and InProceedings entries), the first long citation - to any letter in the collection will present the - parent's full data, whereas subsequent long - citations will abbreviate it. Note the usual Letter - form of the title and shorttitle, the letter's date - in origdate, and the descriptive term "memorandum" - in the titleaddon, with its initial lowercase - letter. I've also provided a shorthand field just to - give a glimpse of how it looks.} + shortened cross-references is by default operative + in Letter entries using crossref or xref (as in + InBook, InCollection, and InProceedings entries), + the first long citation to any letter in the + collection will present the parent's full data, + whereas subsequent long citations will abbreviate + it. Due to changes in the code implementing this, + the current entry needs a crossref field rather than + an xref. Note the usual Letter form of the title + and shorttitle, the letter's date in origdate, and + the descriptive term "memorandum" in the titleaddon, + with its initial lowercase letter. I've also + provided a shorthand field just to give a glimpse of + how it looks.} } @Letter{white:russ, 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 c36619ae7f8..90984961343 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty @@ -1,4 +1,4 @@ -% $Id: biblatex-chicago.sty,v 0.1.1.48 2013/03/12 14:19:12 dfussner Exp $ +% $Id: biblatex-chicago.sty,v 0.1.1.53 2013/10/29 14:10:24 dfussner Exp $ % Copyright (c) 2009-2013 David Fussner. This package is % author-maintained. @@ -13,7 +13,7 @@ % but not limited to, the implied warranties of merchantability and % fitness for a particular purpose. -\ProvidesPackage{biblatex-chicago}[2013/03/12 v 2.5 biblatex style] +\ProvidesPackage{biblatex-chicago}[2013/10/29 v 2.8 biblatex style] \RequirePackage{etoolbox} @@ -50,7 +50,7 @@ \def\cms@authordate{% \RequirePackage[style=chicago-authordate]{biblatex}% \ExecuteBibliographyOptions{% - pagetracker=true,autocite=inline,alldates=comp,labelyear=true, + pagetracker=true,autocite=inline,alldates=comp, uniquename=minfull,useeditor=true,usetranslator=true,usecompiler=true, ibidtracker=constrict,sorting=cms,punctfont,cmslos=true,nodates, uniquelist=minyear,maxbibnames=10,minbibnames=7,sortcase=false, @@ -67,7 +67,7 @@ \def\cms@authordatetrad{% \RequirePackage[style=chicago-authordate-trad]{biblatex}% \ExecuteBibliographyOptions{% - pagetracker=true,autocite=inline,alldates=comp,labelyear=true, + pagetracker=true,autocite=inline,alldates=comp, uniquename=minfull,useeditor=true,usetranslator=true,usecompiler=true, ibidtracker=constrict,sorting=cms,punctfont,cmslos=true,nodates, uniquelist=minyear,maxbibnames=10,minbibnames=7,sortcase=false, @@ -76,7 +76,7 @@ \def\cms@authordateold{% \RequirePackage[style=chicago-authordate15]{biblatex}% \ExecuteBibliographyOptions{% - pagetracker=true,autocite=inline,alldates=comp,labelyear=true, + pagetracker=true,autocite=inline,alldates=comp, uniquename=minfull,useeditor=true,usetranslator=true,usecompiler=true, ibidtracker=constrict,sorting=cms,punctfont,cmslos=true,nodates, uniquelist=minyear,maxbibnames=10,minbibnames=7,sortcase=false}} 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 c1db18e73e8..34c817312f4 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.32 2013/03/12 12:40:45 dfussner Exp $ +% $Id: chicago-authordate-trad.cbx,v 0.8.1.42 2013/10/29 14:03:58 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/03/12 v 2.5 biblatex +\ProvidesFile{chicago-authordate-trad.cbx}[2013/10/29 v 2.8 biblatex citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -23,6 +23,7 @@ citation style] \providetoggle{cms@los} %\providetoggle{cms@oneyear} \providetoggle{cms@avdate} +\providetoggle{cms@ordate} \providetoggle{cms@nodates} \providetoggle{cms@authorparens} @@ -33,6 +34,7 @@ citation style] \providetoggle{cms@isbn} \providetoggle{cms@numbermonth} \providetoggle{cms@bookpages} +\providetoggle{cms@hidevolumes}% Modify Volume fix \providetoggle{cms@jrcomma}% Comma after Jr./Sr. @@ -42,7 +44,10 @@ citation style] \providetoggle{cms@origpublished}% Keep \providetoggle{cms@annotation}% Keep \providetoggle{cms@postposit}% Keep -\providetoggle{cms@fullshhand} +\providetoggle{cms@fullshhand}% +\providetoggle{cms@vol}% +\providetoggle{cms@crossref}% +\providetoggle{cms@bookcrossref} \AtEveryCitekey{% \iffieldundef{userc}% @@ -57,18 +62,55 @@ citation style] {\csuse{cms@opt@avdate@#1}} {\blx@err@invopt{avdate=#1}{}}} \def\cms@opt@avdate@true{% - \@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4 - {\DeclareLabelyear[music,review,video]{\field{eventyear}% - \field{origyear} \field{year} \field{urlyear}}}% + \@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4/2.5 + {\@ifpackagelater{biblatex}{2013/03/30}% for biblatex 2.6 ff. + {\DeclareLabeldate[music,review,video]{\field{eventyear}% + \field{origyear} \field{year} \field{urlyear}}}% + {\DeclareLabelyear[music,review,video]{\field{eventyear}% + \field{origyear} \field{year} \field{urlyear}}}}% {\DeclareLabelyear[music,review,video]{eventyear,origyear,year,urlyear}}% \toggletrue{cms@avdate}}% \def\cms@opt@avdate@false{% \togglefalse{cms@avdate}} -\DeclareBibliographyOption{cmsdate}{% Trying to implement origyear as - \ifcsdef{cms@opt@cmsdate@#1}% labelyear. Sorting will be an issue. - {\csuse{cms@opt@cmsdate@#1}} +\DeclareBibliographyOption{cmsdate}[off]{% Trying to implement origyear as + \ifcsdef{cms@global@cmsdate@#1}% labelyear. Sorting will be an issue. + {\csuse{cms@global@cmsdate@#1}} {\blx@err@invopt{cmsdate=#1}{}}} +\def\cms@global@cmsdate@on{% + \toggletrue{cms@origlabel}% + \ExecuteBibliographyOptions{cmsorigdate=true}} +\def\cms@global@cmsdate@new{% + \toggletrue{cms@bothlabelnew}% + \ExecuteBibliographyOptions{cmsorigdate=true}} +\def\cms@global@cmsdate@old{% + \toggletrue{cms@bothlabelold}% + \ExecuteBibliographyOptions{cmsorigdate=true}} +\def\cms@global@cmsdate@both{% + \toggletrue{cms@bothlabelold}% + \ExecuteBibliographyOptions{cmsorigdate=true}} +\def\cms@global@cmsdate@full{}% +\def\cms@global@cmsdate@off{} + +\DeclareBibliographyOption{cmsorigdate}[true]{% ??? Also need new macros + \ifcsdef{cms@opt@origdate@#1}% for printing dates. Worth it ??? + {\csuse{cms@opt@origdate@#1}}% + {\blx@err@invopt{cmsorigdate=#1}{}}} +\def\cms@opt@origdate@true{% + \@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4/2.5 + {\@ifpackagelater{biblatex}{2013/03/30}% for biblatex 2.6 ff. + {\DeclareLabeldate{\field{origyear} \field{year}% + \field{eventyear} \field{urlyear}}% + \DeclareLabeldate[patent]{\field{year} \field{eventyear}% + \field{origyear} \field{urlyear}}}% + {\DeclareLabelyear{\field{origyear} \field{year}% + \field{eventyear} \field{urlyear}}% + \DeclareLabelyear[patent]{\field{year} \field{eventyear}% + \field{origyear} \field{urlyear}}}}% + {\DeclareLabelyear{origyear,year,eventyear,urlyear}% + \DeclareLabelyear[patent]{year,eventyear,origyear,urlyear}}% + \global\toggletrue{cms@ordate}}% +\def\cms@opt@origdate@false{\togglefalse{cms@ordate}}% \DeclareEntryOption{cmsdate}[off]{% Trying to implement origyear as \ifcsdef{cms@opt@cmsdate@#1}% labelyear. Sorting will be an issue. @@ -126,6 +168,45 @@ citation style] \DeclareBibliographyOption{headline}[true]{% \renewcommand{\MakeSentenceCase}{\@ifstar\relax\relax}} +\DeclareBibliographyOption{longcrossref}[false]{% + \ifcsdef{cms@opt@lxref@#1}% + {\csuse{cms@opt@lxref@#1}} + {\blx@err@invopt{longcrossref=#1}{}}} +\def\cms@opt@lxref@none{% + \togglefalse{cms@crossref}% + \togglefalse{cms@bookcrossref}}% +\def\cms@opt@lxref@true{% + \toggletrue{cms@crossref}}% +\def\cms@opt@lxref@false{% + \togglefalse{cms@crossref}}% +\def\cms@opt@lxref@notes{% + \togglefalse{cms@crossref}}% +\def\cms@opt@lxref@bib{% + \toggletrue{cms@crossref}}% + +\DeclareEntryOption{longcrossref}[false]{% + \ifcsdef{cms@opt@doi@#1}% + {\csuse{cms@opt@doi@#1}} + {\blx@err@invopt{doi=#1}{}}} + +\DeclareBibliographyOption{booklongxref}[true]{% + \ifcsdef{cms@opt@bklxref@#1}% + {\csuse{cms@opt@bklxref@#1}} + {\blx@err@invopt{booklongxref=#1}{}}}% +\def\cms@opt@bklxref@true{% + \toggletrue{cms@bookcrossref}}% +\def\cms@opt@bklxref@false{% + \togglefalse{cms@bookcrossref}}% +\def\cms@opt@bklxref@notes{% + \togglefalse{cms@bookcrossref}}% +\def\cms@opt@bklxref@bib{% + \toggletrue{cms@bookcrossref}}% + +\DeclareEntryOption{booklongxref}[true]{% + \ifcsdef{cms@opt@bklxref@#1}% + {\csuse{cms@opt@bklxref@#1}} + {\blx@err@invopt{booklongxref=#1}{}}}% + % The field-exclusion options % \DeclareBibliographyOption{isbn}[true]{% @@ -155,6 +236,8 @@ citation style] \settoggle{cms@eprint}{#1}% \settoggle{cms@numbermonth}{#1}% \settoggle{cms@bookpages}{#1}} +\DeclareBibliographyOption{hidevolumes}[true]{% + \settoggle{cms@hidevolumes}{#1}} \DeclareEntryOption{isbn}[true]{% \settoggle{cms@isbn}{#1}} @@ -176,8 +259,71 @@ citation style] \settoggle{cms@numbermonth}{#1}} \DeclareEntryOption{bookpages}[true]{% \settoggle{cms@bookpages}{#1}} +\DeclareEntryOption{hidevolumes}[true]{% + \settoggle{cms@hidevolumes}{#1}} + +\ExecuteBibliographyOptions{includeall,hidevolumes,booklongxref}% + +\@ifpackagelater{biblatex}{2013/03/30}% For biblatex 2.6 ff. +{\ExecuteBibliographyOptions{labeldate=true}}% +{\ExecuteBibliographyOptions{labelyear=true}}% + +\DeclareDataInheritance{collection}{suppcollection}{% + \inherit{title}{title} + \inherit{subtitle}{subtitle} + \inherit{titleaddon}{titleaddon}} + +\DeclareDataInheritance{mvbook}{incollection}{% + \inherit{title}{maintitle} + \inherit{subtitle}{mainsubtitle} + \inherit{titleaddon}{maintitleaddon} + \noinherit{shorttitle} + \noinherit{sorttitle} + \noinherit{indextitle} + \noinherit{indexsorttitle} +} -\ExecuteBibliographyOptions{includeall}% +\DeclareDataInheritance{book,collection}{letter}{% + \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} + \inherit{titleaddon}{maintitleaddon} + \noinherit{shorttitle} + \noinherit{sorttitle} + \noinherit{indextitle} + \noinherit{indexsorttitle} +} + +\DeclareDataInheritance{*}{*}{% + \noinherit{namea} + \noinherit{nameb} + \noinherit{sortyear} + \noinherit{sortname} + \noinherit{sorttitle}} + +\DeclareDataInheritance{mvbook,mvcollection,mvproceedings,mvreference}% +{*}{% ??? + \noinherit{year} + \noinherit{month} + \noinherit{day} + \noinherit{endyear} + \noinherit{endmonth} + \noinherit{endday} + \noinherit{origyear} + \noinherit{origmonth} + \noinherit{origday} + \noinherit{origendyear} + \noinherit{origendmonth} + \noinherit{origendday}} % More authordate options % @@ -203,7 +349,9 @@ citation style] } \sort{ \field{sortyear} + \field{labelyear} \field{year} + \field{origyear} } \sort{ \field{sorttitle} @@ -298,8 +446,9 @@ citation style] {\iffieldequalstr{entrysubtype}{classical}% Similar to notes+bib {\iffieldundef{shorthand}% {\ifthenelse{\ifnameundef{labelname}\OR - \iffieldequalstr{entrytype}{inreference}\OR - \iffieldequalstr{entrytype}{reference}}% Simplified for CMS + \ifentrytype{inreference}\OR + \ifentrytype{reference}\OR + \ifentrytype{mvreference}}% Simplified for CMS {\usebibmacro{cite:label}% \setunit{\addspace}% \usebibmacro{cite:reinit}} @@ -311,7 +460,7 @@ citation style] {\iffieldequals{namehash}{\cbx@lastyear}% {}% {\usebibmacro{cmsbracketname}% For names in [] - \iffieldequalstr{entrytype}{customc}% + \ifentrytype{customc}% {\newcunit}% {\setunit{\addspace}}}% \usebibmacro{cite:label}% @@ -321,8 +470,9 @@ citation style] {\usebibmacro{cite:shorthand+title}}} {\iffieldundef{shorthand}% {\ifthenelse{\ifnameundef{labelname}\OR - \iffieldequalstr{entrytype}{inreference}\OR - \iffieldequalstr{entrytype}{reference}}% Simplified for CMS + \ifentrytype{inreference}\OR + \ifentrytype{reference}\OR + \ifentrytype{mvreference}}% Simplified for CMS {\usebibmacro{cite:label}% \setunit{\addspace}% \usebibmacro{cmscitesortdate}% @@ -405,8 +555,9 @@ citation style] {\usebibmacro{cmscitesortdate}}}% {\iffieldundef{shorthand} {\ifthenelse{\ifnameundef{labelname}\OR - \iffieldequalstr{entrytype}{inreference}\OR - \iffieldequalstr{entrytype}{reference}}% + \ifentrytype{inreference}\OR + \ifentrytype{reference}\OR + \ifentrytype{mvreference}}% {\iffieldequalstr{entrysubtype}{classical}% {\setunit{% \global\booltrue{cbx:parens}% @@ -444,12 +595,13 @@ citation style] \iffieldequalstr{entrysubtype}{classical}% {\usebibmacro{cite:label}} {\usebibmacro{cmscitesortdate}}% - \savefield{namehash}{\cbx@lasthash}}}% + \savefield{namehash}{\cbx@lasthash}}% + \stepcounter{textcitecount}}% Added ??? \setunit{% \ifbool{cbx:parens}% {\bibcloseparen\global\boolfalse{cbx:parens}}% {}% - \multicitedelim}} + \textcitedelim}}% Not \multicitedelim ??? \newbibmacro*{textcite:citeshort}{% \iffieldequals{namehash}{\cbx@lasthash} @@ -472,8 +624,9 @@ citation style] \printtext[bibhyperref]{% \printfield{shorthand}}}}% {\ifthenelse{\ifnameundef{labelname}\OR - \iffieldequalstr{entrytype}{inreference}\OR - \iffieldequalstr{entrytype}{reference}}% + \ifentrytype{inreference}\OR + \ifentrytype{reference}\OR + \ifentrytype{mvreference}}% {\iffieldundef{shorthand} {\iffieldequalstr{entrysubtype}{classical}% {\setunit{% @@ -506,12 +659,13 @@ citation style] {\usebibmacro{cmscitesortdate}}}% {\printtext[bibhyperref]{% \printfield{shorthand}}}% - \savefield{namehash}{\cbx@lasthash}}}% + \savefield{namehash}{\cbx@lasthash}}% + \stepcounter{textcitecount}}% Added ??? \setunit{% \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}}% {}% - \multicitedelim}} + \textcitedelim}}% Not \multicitedelim ??? \newbibmacro*{textcite:postnote}{% \iffieldundef{postnote}% @@ -523,13 +677,13 @@ citation style] {\setunit{}% \printtext{% \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}}% {}}}% {\setunit{% \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}}% {}% - \multicitedelim}}} + \textcitedelim}}}% Not \multicitedelim ??? \newbibmacro*{cite:shorthand}{% \iftoggle{cms@los}% @@ -562,35 +716,40 @@ citation style] \newbibmacro*{cite:label}{% Test this \iffieldundef{label}% {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT% - \iffieldequalstr{entrytype}{periodical}}% Simplifies .bib creation + \ifentrytype{periodical}}% Simplifies .bib creation {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}}}% - {\iffieldequalstr{entrytype}{manual}% + {\ifentrytype{manual}% {\printtext[bibhyperref]{\printlist{organization}}}% {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}}}% {\printtext[bibhyperref]{\printfield{label}}}} \newbibmacro*{cite:labelyear+extrayear}{% \ifboolexpr{ ( - test {\iffieldequalstr{entrytype}{music}}% + test {\ifentrytype{music}}% or - test {\iffieldequalstr{entrytype}{review}}% + test {\ifentrytype{review}}% or - test {\iffieldequalstr{entrytype}{video}}% + test {\ifentrytype{video}}% ) and - togl {cms@avdate} + togl {cms@avdate}% }% {\usebibmacro{cite:av+labelyear+extrayear}}% - {\usebibmacro{cite:standard+labelyear+extrayear}}} + {\iftoggle{cms@ordate}% + {\usebibmacro{cite:origfirst+labelyear+extrayear}}% + {\usebibmacro{cite:standard+labelyear+extrayear}}}} \newbibmacro*{cite:standard+labelyear+extrayear}{% - \iffieldundef{labelyear} + \ifthenelse{\iffieldundef{labelyear}\OR% + \iffieldequalstr{labelyear}{nodate}}% {\ifboolexpr{ - test {\iffieldequalstr{entrytype}{misc}} + test {\ifentrytype{misc}} + or + test {\ifentrytype{inreference}} or - test {\iffieldequalstr{entrytype}{inreference}} + test {\ifentrytype{reference}} or - test {\iffieldequalstr{entrytype}{reference}} + test {\ifentrytype{mvreference}} or not togl {cms@nodates} }% @@ -641,14 +800,78 @@ citation style] {\mbox{\bibdatedash}}% {}}}}}} +\newbibmacro*{cite:origfirst+labelyear+extrayear}{% + \ifthenelse{\iffieldundef{labelyear}\OR% + \iffieldequalstr{labelyear}{nodate}}% + {\ifboolexpr{ + test {\ifentrytype{misc}} + or + test {\ifentrytype{inreference}} + or + test {\ifentrytype{reference}} + or + test {\ifentrytype{mvreference}} + or + not togl {cms@nodates} + }% + {}% + {\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS? + {\printtext[bibhyperref]{% + \iffieldundef{origyear}% + {\iffieldundef{year} + {\iffieldundef{eventyear}% + {\printfield{labelyear}% + \iffieldundef{extrayear}% + {}% + {\setunit*{}% + \printfield{extrayear}}% + \iffieldundef{urlendyear}% + {}% + {\iffieldequalstr{urlendyear}{}% + {\mbox{\bibdatedash}}% + {}}}% + {\printfield{labelyear}% + \iffieldundef{extrayear}% + {}% + {\setunit*{}% + \printfield{extrayear}}% + \iffieldundef{eventendyear}% + {}% + {\iffieldequalstr{eventendyear}{}% + {\mbox{\bibdatedash}}% + {}}}} + {\printfield{labelyear}% + \iffieldundef{extrayear}% + {}% + {\setunit*{}% + \printfield{extrayear}}% + \iffieldundef{endyear}% + {}% + {\iffieldequalstr{endyear}{}% + {\mbox{\bibdatedash}}% + {}}}} + {\printfield{labelyear}% + \iffieldundef{extrayear}% + {}% + {\setunit*{}% + \printfield{extrayear}}% + \iffieldundef{origendyear}% DATE FIX + {}% + {\iffieldequalstr{origendyear}{}% + {\mbox{\bibdatedash}}% + {}}}}}} + \newbibmacro*{cite:av+labelyear+extrayear}{% - \iffieldundef{labelyear} + \ifthenelse{\iffieldundef{labelyear}\OR% + \iffieldequalstr{labelyear}{nodate}}% {\ifboolexpr{ - test {\iffieldequalstr{entrytype}{misc}} + test {\ifentrytype{misc}} + or + test {\ifentrytype{inreference}} or - test {\iffieldequalstr{entrytype}{inreference}} + test {\ifentrytype{reference}} or - test {\iffieldequalstr{entrytype}{reference}} + test {\ifentrytype{mvreference}} or not togl {cms@nodates} }% @@ -737,28 +960,67 @@ citation style] {}} \newbibmacro*{cite:origyear+labelyear}{% - \iftoggle{cms@switchdates}% - {\usebibmacro{cite:labelyear+extrayear}} - {\iffieldundef{origyear}% - {\clearfield{extrayear}\usebibmacro{cite:labelyear+extrayear}}% - {\printtext[bibhyperref]{% - \usebibmacro{origyear+endyear}}}}} + \ifboolexpr{ ( + test {\ifentrytype{music}}% + or + test {\ifentrytype{review}}% + or + test {\ifentrytype{video}}% + ) + and + togl {cms@avdate}% + } + {\usebibmacro{cite:av+labelyear+extrayear}}% + {\iftoggle{cms@switchdates}% + {\usebibmacro{cite:labelyear+extrayear}} + {\iffieldundef{origyear}% + {\iftoggle{cms@ordate}% ??? + {}% + {\clearfield{extrayear}}% + \usebibmacro{cite:standard+labelyear+extrayear}}% + {\iftoggle{cms@ordate}% + {\usebibmacro{cite:origfirst+labelyear+extrayear}}% + {\printtext[bibhyperref]{% + \usebibmacro{origyear+endyear}}}}}}} \newbibmacro*{cite:bothyear+oldstyle}{% - \iftoggle{cms@switchdates}% - {\printtext[bibhyperref]{% - \bibopenparen% - \usebibmacro{cite:labelyear+extrayear}% - \bibcloseparen% - \addspace\usebibmacro{origyear+endyear}}}% - {\iffieldundef{origyear}% - {\clearfield{extrayear}\usebibmacro{cite:labelyear+extrayear}}% + \ifboolexpr{ ( + test {\ifentrytype{music}}% + or + test {\ifentrytype{review}}% + or + test {\ifentrytype{video}}% + ) + and + togl {cms@avdate}% + } + {\usebibmacro{cite:av+labelyear+extrayear}}% + {\iftoggle{cms@switchdates}% {\printtext[bibhyperref]{% \bibopenparen% - \usebibmacro{origyear+endyear}% + \usebibmacro{cite:labelyear+extrayear}% \bibcloseparen% - \clearfield{extrayear}\addspace% - \usebibmacro{cite:labelyear+extrayear}}}}} + \addspace\usebibmacro{origyear+endyear}}}% + {\iffieldundef{origyear}% ??? + {\iftoggle{cms@ordate}% + {}% + {\clearfield{extrayear}}% + \usebibmacro{cite:standard+labelyear+extrayear}}% + {\iftoggle{cms@ordate}% Added test for year field ??? + {\iffieldundef{year}% + {\usebibmacro{cite:origfirst+labelyear+extrayear}}% + {\printtext[bibhyperref]{% + \bibopenparen% + \usebibmacro{cite:origfirst+labelyear+extrayear}% + \bibcloseparen% + \setunit{\addspace}%\addspace% ??? + \usebibmacro{year+endyear}}}}% + {\printtext[bibhyperref]{% + \bibopenparen% + \usebibmacro{origyear+endyear}% + \bibcloseparen% + \clearfield{extrayear}\addspace% + \usebibmacro{cite:standard+labelyear+extrayear}}}}}}} \newbibmacro*{cite:save}{% \savefield{entrykey}{\cbx@lastkey}} @@ -825,13 +1087,45 @@ citation style] {} {\usebibmacro{postnote}} -\DeclareCiteCommand{\textcite} +%%% Textcite commands taken verbatim from authoryear-comp.cbx %%% + +\DeclareCiteCommand{\cbx@textcite} {\usebibmacro{cite:init}} {\usebibmacro{citeindex}% - \usebibmacro{textcite}} + \usebibmacro{textcite}} {} {\usebibmacro{textcite:postnote}} +\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite] + {\gdef\cbx@savedkeys{}% + \citetrackerfalse% + \pagetrackerfalse% + \DeferNextCitekeyHook% + \usebibmacro{cite:init}} + {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0} + {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}% + \global\clearfield{multipostnote}} + {}% + \xappto\cbx@savedkeys{\thefield{entrykey},}% + \iffieldequals{namehash}{\cbx@lasthash} + {} + {\stepcounter{textcitetotal}% + \savefield{namehash}{\cbx@lasthash}}} + {} + {\protected@xappto\cbx@savedcites{% + [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}} + +\newrobustcmd{\cbx@textcite@init}[2]{% + \setcounter{textcitetotal}{0}% + \setcounter{textcitecount}{0}% + \def\cbx@savedcites{#1}#2\cbx@savedcites\empty} + +\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{} +\DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{} + +\let\cbx@textcites@init\cbx@textcite@init +\pretocmd{\cbx@textcites@init}{\UseNextMultiCiteHook}{}{} + \DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}} \DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}% @@ -843,11 +1137,9 @@ citation style] \DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]% {\footcitetext}{\setunit{\multicitedelim}} -\DeclareMultiCiteCommand{\textcites}{\textcite}{} - \DeclareCiteCommand{\bibxrefcite} {\usebibmacro{cite:init}}%\usebibmacro{clearalmostall}} (?) - {\usebibmacro{cms-in:}% + {\usebibmacro{xref-in:}% \blx@ibidreset% For authordate style \usebibmacro{cite}} {} @@ -927,16 +1219,28 @@ citation style] %%%% Field Formats -- Title, Citetitle, Lostitle %%%% -\DeclareFieldFormat[article]{title}{% +\DeclareFieldFormat{title}{\mkbibemph{\MakeSentenceCase*{#1}}\isdot} + +\DeclareFieldFormat{citetitle}{\mkbibemph{\MakeSentenceCase*{#1}}\isdot} + +\DeclareFieldFormat{lostitle}{\mkbibemph{\MakeSentenceCase*{#1}}\isdot} + +\DeclareFieldFormat +[article,inbook,incollection,inproceedings,online,patent,thesis,unpublished] +{title}{% \iffieldundef{title}% {}% {\MakeSentenceCase*{#1}}} -\DeclareFieldAlias[article]{citetitle}[article]{lostitle} +\DeclareFieldFormat +[article,inbook,incollection,inproceedings,online,patent,thesis,unpublished] +{citetitle}{\MakeSentenceCase*{#1}} -\DeclareFieldFormat[article]{lostitle}{\MakeSentenceCase*{#1}} +\DeclareFieldFormat +[article,inbook,incollection,inproceedings,online,patent,thesis,unpublished] +{lostitle}{\MakeSentenceCase*{#1}} -\DeclareFieldFormat[artwork]{title}{% +\DeclareFieldFormat[artwork,image]{title}{% \iffieldundef{entrysubtype}% {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}% {\MakeSentenceCase*{#1}\isdot}} @@ -945,54 +1249,15 @@ citation style] \DeclareFieldAlias[artwork]{lostitle}[artwork]{title} -\DeclareFieldFormat[book]{title}{% - \mkbibemph{\MakeSentenceCase*{#1}}\isdot} - -\DeclareFieldAlias[book]{citetitle}[book]{title} - -\DeclareFieldAlias[book]{lostitle}[book]{title} - -\DeclareFieldAlias[bookinbook]{title}[book]{title} - -\DeclareFieldAlias[bookinbook]{citetitle}[book]{title} - -\DeclareFieldAlias[bookinbook]{lostitle}[book]{title} - -\DeclareFieldAlias[collection]{title}[book]{title} - -\DeclareFieldAlias[collection]{citetitle}[book]{title} - -\DeclareFieldAlias[collection]{lostitle}[book]{lostitle} - \DeclareFieldFormat[periodical]{title}{\mkbibemph{#1}\isdot} \DeclareFieldFormat[periodical]{citetitle}{\mkbibemph{#1}\isdot} \DeclareFieldFormat[periodical]{lostitle}{\mkbibemph{#1}\isdot} -\DeclareFieldAlias[image]{title}[artwork]{title} - \DeclareFieldAlias[image]{citetitle}[artwork]{title} -\DeclareFieldAlias[image]{lostitle}[artwork]{lostitle} - -\DeclareFieldAlias[incollection]{title}[article]{title}% Change article? - -\DeclareFieldAlias[incollection]{citetitle}[article]{title} - -\DeclareFieldAlias[incollection]{lostitle}[article]{lostitle} - -\DeclareFieldAlias[inreference]{title}[book]{title} - -\DeclareFieldAlias[inreference]{citetitle}[book]{title} - -\DeclareFieldAlias[inreference]{lostitle}[book]{lostitle} - -\DeclareFieldAlias[reference]{title}[book]{title} - -\DeclareFieldAlias[reference]{citetitle}[book]{title} - -\DeclareFieldAlias[reference]{lostitle}[book]{lostitle} +\DeclareFieldAlias[image]{lostitle}[artwork]{title} \DeclareFieldFormat[letter]{title}{#1\isdot} @@ -1000,29 +1265,7 @@ citation style] \DeclareFieldFormat[letter]{lostitle}{#1\isdot} -\DeclareFieldAlias[inproceedings]{title}[article]{title}% As above - -\DeclareFieldAlias[inproceedings]{citetitle}[article]{title} - -\DeclareFieldAlias[inproceedings]{lostitle}[article]{lostitle} - -\DeclareFieldAlias[thesis]{title}[article]{title} - -\DeclareFieldAlias[thesis]{citetitle}[article]{title} - -\DeclareFieldAlias[thesis]{lostitle}[article]{lostitle} - -\DeclareFieldAlias[patent]{title}[article]{lostitle}% 16th ed. - -\DeclareFieldAlias[patent]{citetitle}[article]{title} - -\DeclareFieldAlias[patent]{lostitle}[article]{lostitle} - -\DeclareFieldAlias[unpublished]{title}[article]{title} - -\DeclareFieldAlias[unpublished]{citetitle}[article]{citetitle} - -\DeclareFieldAlias[unpublished]{lostitle}[article]{lostitle} +\DeclareFieldFormat{prenote}{\ifcapital{\MakeCapital{#1}}{#1}} \DeclareFieldFormat{postnote}{% Removed \isdots -- required \iffieldundef{pagination}% elsewhere also? @@ -1048,18 +1291,12 @@ citation style] {\bibstring{ed#1}} {\ifcapital{\MakeCapital{#1}}{#1}}}} -\DeclareFieldAlias[inbook]{title}[article]{title} - -\DeclareFieldAlias[inbook]{citetitle}[article]{title} - -\DeclareFieldAlias[inbook]{lostitle}[article]{lostitle} - -\DeclareFieldFormat[suppbook]{title}{% +\DeclareFieldFormat[suppbook,suppcollection]{title}{% \mkbibemph{\MakeSentenceCase*{#1}}\isdot} \DeclareFieldAlias[suppbook]{citetitle}[suppbook]{lostitle} -\DeclareFieldFormat[suppbook]{lostitle}{% +\DeclareFieldFormat[suppbook,suppcollection]{lostitle}{% \usebibmacro{inforaft}% \addspace% \mkbibemph{\MakeSentenceCase*{#1}}\isdot} @@ -1080,30 +1317,8 @@ citation style] #1}% {\printfield{nameaddon}\addspace #1}}} -\DeclareFieldAlias[suppcollection]{title}[suppbook]{title} - \DeclareFieldAlias[suppcollection]{citetitle}[suppbook]{lostitle} -\DeclareFieldAlias[suppcollection]{lostitle}[suppbook]{lostitle} - -\DeclareFieldAlias[booklet]{title}[book]{title} - -\DeclareFieldAlias[booklet]{citetitle}[book]{citetitle} - -\DeclareFieldAlias[booklet]{lostitle}[book]{lostitle} - -\DeclareFieldAlias[manual]{title}[book]{title} - -\DeclareFieldAlias[manual]{citetitle}[book]{citetitle} - -\DeclareFieldAlias[manual]{lostitle}[book]{lostitle} - -\DeclareFieldAlias[report]{title}[book]{title} - -\DeclareFieldAlias[report]{citetitle}[book]{citetitle} - -\DeclareFieldAlias[report]{lostitle}[book]{lostitle} - \DeclareFieldFormat[misc]{title}{% \iffieldundef{entrysubtype}% {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}% @@ -1113,7 +1328,7 @@ citation style] \DeclareFieldAlias[misc]{lostitle}[misc]{title} -\DeclareFieldFormat[review]{title}{% +\DeclareFieldFormat[review,suppperiodical]{title}{% \ifcapital{\MakeCapital{#1\isdot}}% {#1\isdot}} @@ -1121,23 +1336,15 @@ citation style] \DeclareFieldAlias[review]{citetitle}[review]{title} -\DeclareFieldAlias[suppperiodical]{title}[review]{title} - \DeclareFieldAlias[suppperiodical]{citetitle}[review]{title} \DeclareFieldAlias[suppperiodical]{lostitle}[review]{title} -\DeclareFieldAlias[online]{title}[article]{title} - -\DeclareFieldAlias[online]{citetitle}[article]{title} - -\DeclareFieldAlias[online]{lostitle}[article]{lostitle} - \DeclareFieldFormat{booktitle}{\mkbibemph{\MakeSentenceCase*{#1}}} \DeclareFieldFormat{maintitle}{\mkbibemph{\MakeSentenceCase*{#1}}} -\DeclareFieldFormat[video]{title}{% +\DeclareFieldFormat[audio,music,video]{title}{% \iffieldundef{booktitle}% {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}% {\MakeSentenceCase*{#1}\isdot}} @@ -1146,14 +1353,10 @@ citation style] \DeclareFieldAlias[video]{lostitle}[video]{title} -\DeclareFieldAlias[music]{title}[video]{title} - \DeclareFieldAlias[music]{citetitle}[video]{title} \DeclareFieldAlias[music]{lostitle}[video]{title} -\DeclareFieldAlias[audio]{title}[video]{title} - \DeclareFieldAlias[audio]{citetitle}[video]{title} \DeclareFieldAlias[audio]{lostitle}[video]{title} @@ -1167,36 +1370,20 @@ citation style] \DeclareFieldFormat{note}{% \ifcapital{\MakeCapital{#1}}{#1}}% -\DeclareFieldFormat[suppbook]{type}{% +\DeclareFieldFormat +[audio,manual,music,patent,report,suppbook,suppcollection,video] +{type}{% \ifbibstring{#1}% {\bibstring{#1}}% {\ifcapital% {\MakeCapital{#1}}% {#1}}} -\DeclareFieldFormat[artwork]{type}{% +\DeclareFieldFormat[artwork,image]{type}{% \ifcapital% {\MakeCapital{#1}}% {#1}} -\DeclareFieldAlias[patent]{type}[suppbook]{type} - -\DeclareFieldAlias[manual]{type}[suppbook]{type} - -\DeclareFieldAlias[thesis]{type}[suppbook]{type} - -\DeclareFieldAlias[report]{type}[suppbook]{type} - -\DeclareFieldAlias[image]{type}[artwork]{type} - -\DeclareFieldAlias[suppcollection]{type}[suppbook]{type} - -\DeclareFieldAlias[video]{type}[suppbook]{type} - -\DeclareFieldAlias[music]{type}[suppbook]{type} - -\DeclareFieldAlias[audio]{type}[suppbook]{type} - \DeclareFieldFormat{url}{\url{#1}} \DeclareFieldFormat{doi}{% @@ -1205,6 +1392,26 @@ citation style] {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}} {\nolinkurl{#1}}} +\DeclareFieldFormat[music]{date}{% Generalize userd ??? + \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}% + \OR\NOT\iffieldundef{eventyear}\OR\NOT\iffieldundef{origyear}% + \OR\NOT\iffieldundef{urlmonth}\OR\NOT\iffieldundef{eventmonth}% + \OR\NOT\iffieldundef{origmonth}}% + {#1}% + {\printfield{userd}\addspace #1}} + +\DeclareFieldFormat[video]{date}{% Generalize userd ??? + \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}% + \OR\NOT\iffieldundef{eventyear}\OR\NOT\iffieldundef{urlmonth}% + \OR\NOT\iffieldundef{eventmonth}}% + {#1}% + {\printfield{userd}\addspace #1}} + +\DeclareFieldFormat{date}{% Generalize userd ??? + \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}}% + {#1}% + {\printfield{userd}\addspace #1}} + \DeclareFieldFormat{urldate}{% 16th ed. \iffieldundef{userd}% {\bibstring{urlseen}\space #1}% @@ -1251,7 +1458,7 @@ citation style] \DeclareFieldFormat{edition}{% New in 0.8 \ifinteger{#1} - {\mkbibordinal{#1}~\bibstring{edition}}% + {\mkbibordedition{#1}~\bibstring{edition}}% {\ifcapital {\MakeCapital{#1\isdot}}% {#1\isdot}}} @@ -1269,7 +1476,7 @@ citation style] \DeclareFieldFormat{jourser}{% \ifinteger{#1}% - {\mkbibordinal{#1}% + {\mkbibordseries{#1}% \addnbspace% \bibstring{jourser}}% {\ifbibstring{#1}{\bibstring{#1}}{#1}}} @@ -1296,7 +1503,10 @@ citation style] \DeclareFieldFormat{annotation}{\par\nobreak \vskip \bibitemsep #1} -\DeclareFieldFormat{part}{\addcomma\bibstring{partvolume}~#1} +\DeclareFieldFormat{part}{% + \ifnumerals{#1}% + {\addcomma\addspace\bibstring{partvolume}~#1}% + {\addcomma\addspace\ifcapital{\MakeCapital{#1}}{#1}}} \DeclareFieldAlias[review]{volume}[article]{volume} @@ -1311,6 +1521,9 @@ citation style] \renewcommand*{\multicitedelim}{\addsemicolon\space} +\renewcommand*{\iffinalcitedelim}{% + \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}} + \renewcommand*{\nameyeardelim}{% \iffieldundef{origyear}% Is this test correct? {\iffieldundef{year}% @@ -1326,10 +1539,12 @@ citation style] \newcommand{\classicpunct}{% \ifthenelse{\iffieldequalstr{entrysubtype}{classical}\OR% - \iffieldequalstr{entrytype}{letter}}% + \ifentrytype{letter}}% {\setunit*{\addspace}}% {\setunit*{\addcomma\addspace}}} +\newcommand{\postvolpunct}{\addcolon}% + \newcommand{\parttrans}{% {\bibstring{bytranslator}\space}}% @@ -1375,7 +1590,10 @@ citation style] \renewcommand*{\postnotedelim}{% \iftoggle{cms@inlineibid}% - {\togglefalse{cms@inlineibid}}% + {\togglefalse{cms@inlineibid}% + \iffieldundef{prenote}% Bug fix + {}% + {\addspace}}% {\iffieldequalstr{entrysubtype}{classical}% For Notes+Bib, too? {\NumCheckSetup{\DeclareNumChars*{abcdeABCDE}}% \iffieldpages{postnote}% @@ -1480,7 +1698,7 @@ citation style] \iffieldundef{maintitle}\AND\iffieldundef{issuetitle}\)% \OR\iffieldsequal{booktitle}{title}% Changed these for crossrefed \OR\iffieldsequal{maintitle}{title}}% entries. Create problems? - {\iffieldequalstr{entrytype}{video}% + {\ifentrytype{video}% {\newcunit\newblock}% {\newunit\newblock}}% {\newcunit\newblock}} @@ -1769,11 +1987,10 @@ citation style] {\bibstring{in}% \setunit{\addspace}}} -\newbibmacro*{alt-in:}{% - \iffieldundef{booktitle}% - {} - {\bibstring{in}% - \setunit{\addspace}}} +\newbibmacro*{xref-in:}{% + \iffieldundef{volume}{}{\savefield{volume}{\cbx@incollvol}}% + \iffieldundef{part}{}{\savefield{part}{\cbx@incollpart}}% + \usebibmacro{cms-in:}} \newbibmacro*{chapincoll}{% \iffieldundef{chapter}% @@ -1782,7 +1999,7 @@ citation style] \newbibmacro*{chapinscore}{% \iffieldundef{chapter}% - {\ifthenelse{\iffieldequalstr{entrytype}{music}% + {\ifthenelse{\ifentrytype{music}% \AND\NOT\iffieldundef{booktitle}}% {\bibstring{on}\setunit{\addspace}}% {}}% @@ -1860,9 +2077,9 @@ citation style] \newbibmacro*{issuetitle}{% \iffieldundef{issuetitle}% {} - {\ifthenelse{\iffieldequalstr{entrytype}{article}\OR% - \iffieldequalstr{entrytype}{review}\OR% - \iffieldequalstr{entrytype}{suppperiodical}}% This test is for + {\ifthenelse{\ifentrytype{article}\OR% + \ifentrytype{review}\OR% + \ifentrytype{suppperiodical}}% This test is for {\usebibmacro{cms-in:}}% periodical entries {}% \printtext{% @@ -1870,16 +2087,6 @@ citation style] \setunit{\addcolon\addspace}% \printfield[issuetitle]{issuesubtitle}}}} -\newbibmacro*{btitle+bstitle}{% - \iffieldundef{booktitle} - {} - {\printtext{% - \printfield{booktitle}% - \setunit{\addcolon\addspace}% - \printfield[booktitle]{booksubtitle}}% - \newcunit - \printfield{booktitleaddon}}} - \newbibmacro*{publ+loc+year}{% \printlist{location}% \iflistundef{publisher}% @@ -2041,32 +2248,6 @@ citation style] \mkbibmonth{\thefield{origmonth}}\setunit{\nobreakspace}% \printfield{origyear}}}}}% -\newbibmacro*{cjournal+ser+vol+num}{% - \usebibmacro{journal+sub}% - \setunit*{\addspace}% - \printlist[periodplace]{location}% - \setunit*{\addspace}% - \iffieldundef{series} - {} - {\newcunit - \printfield[jourser]{series}% - \newcunit}%\setunit*{\addspace}? - \ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}% - {\iffieldundef{volume}% - {\newcunit% - \printfield[journum]{number}% - \clearfield{number}% - \setunit{\addcomma\addspace}} - {\printfield[jourvol]{volume}% - \setunit{\addcomma\addspace}}}% - {\printfield[jourvol]{volume}% - \newcunit% - \printfield[journum]{number}% - \clearfield{number}% - \setunit{\addcomma\addspace}}% need * here? - \printfield{eid}% - \newunit} - \newbibmacro*{cperiodical+ser+vol+num}{% For periodical entries, \printtext{% article subtype \printfield{title}% @@ -2153,52 +2334,6 @@ citation style] \newcunit\newblock \usebibmacro{date+issue}} -\newbibmacro*{cmtitle+mstitle+vol+part+title+stitle}{% - \iffieldundef{maintitle} - {} - {\iffieldundef{volume} - {\printtext{% - \printfield{maintitle}% - \setunit{\addcolon\addspace}% - \printfield[maintitle]{mainsubtitle}}% - \newcunit - \printfield{maintitleaddon}} - {\printfield{volume}% - \printfield{part}% - \setunit{\addspace} - \bibstring{ofseries}% - \setunit{\addspace} - \printtext{% - \printfield{maintitle}% - \setunit{\addcolon\addspace}% - \printfield[maintitle]{mainsubtitle}}% - \newcunit - \printfield{maintitleaddon}}}} - -\newbibmacro*{cmtitle+mstitle+vol+part+btitle+bstitle}{% - \usebibmacro{btitle+bstitle}% - \newcunit - \iffieldundef{maintitle} - {} - {\iffieldundef{volume} - {\printtext{% - \printfield{maintitle}% - \setunit{\addcolon\addspace}% - \printfield[maintitle]{mainsubtitle}}% - \newcunit - \printfield{maintitleaddon}} - {\printfield{volume}% - \printfield{part}% - \setunit{\addspace} - \bibstring{ofseries}% - \setunit{\addspace} - \printtext{% - \printfield{maintitle}% - \setunit{\addcolon\addspace}% - \printfield[maintitle]{mainsubtitle}}% - \newcunit - \printfield{maintitleaddon}}}} - \renewbibmacro*{postnote}{% \iffieldundef{postnote}% {}% @@ -2318,9 +2453,13 @@ citation style] \clearname{namea}% \clearname{nameb}% \clearfield{nameaddon}% - \clearfield{title}% - \clearfield{subtitle}% - \clearfield{titleaddon}% + \ifthenelse{\ifentrytype{periodical}\OR\ifentrytype{mvbook}\OR% + \ifentrytype{mvcollection}\OR\ifentrytype{mvproceedings}\OR% + \ifentrytype{mvreference}}% + {}% + {\clearfield{title}% + \clearfield{subtitle}% + \clearfield{titleaddon}}% \clearfield{reprinttitle}% \clearfield{usere}% \clearlist{language}% 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 6d3cfe411a8..c60c053a134 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,10 @@ -% $Id: chicago-authordate.bbx,v 0.8.1.29 2013/03/13 19:05:02 dfussner Exp $ +% $Id: chicago-authordate.bbx,v 0.8.1.49 2013/10/29 14:04:23 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/03/12 v 2.5 biblatex +\ProvidesFile{chicago-authordate.bbx}[2013/10/29 v 2.8 biblatex bibliography style] %%%% Initialize and format bibliography and los %%%% @@ -222,10 +222,10 @@ bibliography style] \savefield{fullhash}{\bbx@lasthash}}}}}} \newbibmacro*{moreauthor}{% - \ifnameundef{author} - {\usebibmacro{pickeditor}} - {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT - \iffirstonpage} + \ifnameundef{author}% + {\usebibmacro{pickeditor}}% + {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT% + \iffirstonpage}% {\iffieldundef{nameaddon}% {\bibnamedash\addperiod\addspace}% {\bibnamedash\addspace}}% @@ -352,10 +352,10 @@ bibliography style] \finentry}% {\ifnameundef{labelname} {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT% - \iffieldequalstr{entrytype}{periodical}}% + \ifentrytype{periodical}}% {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}% \newcunit}}% - {\iffieldequalstr{entrytype}{manual}% + {\ifentrytype{manual}% {\printtext[bibhyperref]{\printlist{organization}\newcunit}}% {}}} {\usebibmacro{author/editor}% @@ -379,7 +379,6 @@ bibliography style] \usebibmacro{part+editor+translator}% \newunit\newblock% \usebibmacro{bibreprint}% -% \newunit\newblock% \usebibmacro{issuetitle}% \setunit*{\addcomma\addspace}% \usebibmacro{byeditor+others}% @@ -421,7 +420,6 @@ bibliography style] \usebibmacro{part+editor+translator}% \newunit\newblock% \usebibmacro{bibreprint}% -% \newunit\newblock \usebibmacro{issuetitle}% \setunit*{\addcomma\addspace}% \usebibmacro{byeditor+others}% @@ -464,7 +462,6 @@ bibliography style] \usebibmacro{byeditor+others}% \newunit\newblock \usebibmacro{bibreprint}% -% \newunit\newblock \printfield{howpublished}% \newunit\newblock \printfield{type}% @@ -518,7 +515,7 @@ bibliography style] \newunit% ??? Editorpunct maybe not right here? \iffieldundef{maintitle} {} - {\iffieldundef{volume} + {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}% {\usebibmacro{cms-in:}% \printtext{% \printfield{maintitle}% @@ -590,7 +587,17 @@ bibliography style] \newunit\newblock \usebibmacro{part+editor+translator}% \newunit\newblock - \usebibmacro{mtitle+mstitle+vol+part+title+stitle}% + \ifboolexpr{% + test {\iffieldundef{crossref}}% + or + togl {cms@bookcrossref}% + }% + {\ifboolexpr{% + test {\iffieldundef{xref}}% + or + togl {cms@bookcrossref}% + }% + {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}% \newcunit \iffieldundef{edition}% {}% @@ -612,7 +619,6 @@ bibliography style] \printfield{note}% \newunit\newblock \usebibmacro{bibreprint}% -% \setunit*{\addcomma\addspace}\newblock \usebibmacro{publ+loc+year}% \newcunit\newblock \printlist[][-\value{listtotal}]{lista}% @@ -630,7 +636,15 @@ bibliography style] \usebibmacro{pageref}% \newunit\newblock \usebibmacro{originally+published+as}% - \usebibmacro{finentry}} + \usebibmacro{finentry}}% +{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \bibxrefcite{\thefield{xref}} + \usebibmacro{bibpostxref}% + \usebibmacro{finentry}}}% +{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \bibxrefcite{\thefield{crossref}}% + \usebibmacro{bibpostxref}% + \usebibmacro{finentry}}} \DeclareBibliographyDriver{bookinbook}{% \usebibmacro{bibindex}% @@ -654,8 +668,17 @@ bibliography style] \newunit\newblock \usebibmacro{part+editor+translator}% \setunit*{\addperiod\addspace}% - \usebibmacro{cms-in:}% - \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}% + \ifboolexpr{% + test {\iffieldundef{crossref}}% + or + togl {cms@bookcrossref}% + }% + {\ifboolexpr{% + test {\iffieldundef{xref}}% + or + togl {cms@bookcrossref}% + }% + {\usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}% \newcunit \iffieldundef{edition}% {}% @@ -676,7 +699,6 @@ bibliography style] \printfield{note}% \newunit\newblock \usebibmacro{bibreprint}% -% \newunit\newblock \usebibmacro{publ+loc+year}% \newunit\newblock \usebibmacro{pubstate}% @@ -692,7 +714,15 @@ bibliography style] \usebibmacro{pageref}% \newunit\newblock \usebibmacro{originally+published+as}% - \usebibmacro{finentry}} + \usebibmacro{finentry}}% +{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \bibxrefcite{\thefield{xref}} + \usebibmacro{bibpostxref}% + \usebibmacro{finentry}}}% +{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \bibxrefcite{\thefield{crossref}}% + \usebibmacro{bibpostxref}% + \usebibmacro{finentry}}} \DeclareBibliographyDriver{booklet}{% \usebibmacro{bibindex}% @@ -711,7 +741,6 @@ bibliography style] \printfield{note}% \newunit\newblock \usebibmacro{bibreprint}% -% \newunit\newblock \usebibmacro{howpubl+loc+year}% \newunit\newblock \usebibmacro{chap+pag}% @@ -739,7 +768,17 @@ bibliography style] \newunit\newblock \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}% \newunit\newblock - \usebibmacro{mtitle+mstitle+vol+part+title+stitle}% + \ifboolexpr{% + test {\iffieldundef{crossref}}% + or + togl {cms@bookcrossref}% + }% + {\ifboolexpr{% + test {\iffieldundef{xref}}% + or + togl {cms@bookcrossref}% + }% + {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}% \usebibmacro{editorpunct}% \iffieldundef{edition}% {}% @@ -756,7 +795,6 @@ bibliography style] \printfield{note}% \newunit\newblock \usebibmacro{bibreprint}% -% \newunit\newblock \usebibmacro{publ+loc+year}% \newunit\newblock \usebibmacro{pubstate}% @@ -772,7 +810,15 @@ bibliography style] \usebibmacro{pageref}% \newunit\newblock \usebibmacro{originally+published+as}% - \usebibmacro{finentry}} + \usebibmacro{finentry}}% +{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \bibxrefcite{\thefield{xref}} + \usebibmacro{bibpostxref}% + \usebibmacro{finentry}}}% +{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \bibxrefcite{\thefield{crossref}}% + \usebibmacro{bibpostxref}% + \usebibmacro{finentry}}} \DeclareBibliographyDriver{customc}{% \usebibmacro{bibindex}% @@ -802,7 +848,6 @@ bibliography style] \usebibmacro{byeditor+others}% \newunit\newblock \usebibmacro{bibreprint}% -% \newunit\newblock \printfield{howpublished}% \newunit\newblock \printfield{type}% @@ -841,9 +886,18 @@ bibliography style] \usebibmacro{byauthor}% \setunit{\addperiod\addspace}% \usebibmacro{part+editor+translator}% - \setunit{\addperiod\addspace}% + \ifboolexpr{ + test {\iffieldundef{crossref}}% + or + togl {cms@crossref}% + } + {\ifboolexpr{ + test {\iffieldundef{xref}}% + or + togl {cms@crossref}% + } + {\setunit{\addperiod\addspace}% \usebibmacro{chapincoll}% - \usebibmacro{cms-in:}% \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}% \newcunit \iffieldundef{edition}% @@ -862,7 +916,6 @@ bibliography style] \printfield{note}% \newunit\newblock \usebibmacro{bibreprint}% -% \newunit\newblock \usebibmacro{publ+loc+year}% \newunit\newblock \usebibmacro{pubstate}% @@ -879,6 +932,14 @@ bibliography style] \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% +{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \bibxrefcite{\thefield{xref}} + \usebibmacro{bibpostxref}% + \usebibmacro{finentry}}}% +{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \bibxrefcite{\thefield{crossref}}% + \usebibmacro{bibpostxref}% + \usebibmacro{finentry}}} \DeclareBibliographyDriver{incollection}{% \usebibmacro{bibindex}% @@ -895,11 +956,18 @@ bibliography style] \usebibmacro{byauthor}% \setunit{\addperiod\addspace}% \usebibmacro{part+editor+translator}% - \iffieldundef{crossref}% - {\iffieldundef{xref}% + \ifboolexpr{ + test {\iffieldundef{crossref}}% + or + togl {cms@crossref}% + } + {\ifboolexpr{ + test {\iffieldundef{xref}}% + or + togl {cms@crossref}% + } {\setunit{\addperiod\addspace}% Moved here. \usebibmacro{chapincoll}% - \usebibmacro{cms-in:}% \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}% \newcunit \iffieldundef{edition}% @@ -918,7 +986,6 @@ bibliography style] \printfield{note}% \newunit\newblock \usebibmacro{bibreprint}% -% \newunit\newblock \usebibmacro{publ+loc+year}% \newunit\newblock \usebibmacro{pubstate}% @@ -959,11 +1026,18 @@ bibliography style] \usebibmacro{byauthor}% \setunit{\addperiod\addspace}% \usebibmacro{part+editor+translator}% - \iffieldundef{crossref}% - {\iffieldundef{xref}% + \ifboolexpr{ + test {\iffieldundef{crossref}}% + or + togl {cms@crossref}% + } + {\ifboolexpr{ + test {\iffieldundef{xref}}% + or + togl {cms@crossref}% + } {\setunit{\addperiod\addspace}% \usebibmacro{chapincoll}% - \usebibmacro{cms-in:}% \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}% \newcunit\newblock \usebibmacro{byeditor+others}% @@ -975,7 +1049,6 @@ bibliography style] \printfield{note}% \newunit\newblock \usebibmacro{bibreprint}% -% \newunit\newblock \usebibmacro{org+publ+loc+year}% \newunit\newblock \usebibmacro{pubstate}% @@ -1015,7 +1088,6 @@ bibliography style] \newunit\newblock \usebibmacro{part+editor+translator}% \setunit*{\addperiod\addspace}% need asterisk? - \usebibmacro{alt-in:}% \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}% \newcunit \iffieldundef{edition}% @@ -1037,7 +1109,6 @@ bibliography style] \printfield{note}% \newunit\newblock \usebibmacro{bibreprint}% -% \newunit\newblock \usebibmacro{publ+loc+year}% \newcunit\newblock \printlist[][-\value{listtotal}]{lista}% @@ -1084,10 +1155,17 @@ bibliography style] \newunit\newblock%\bibsentence \usebibmacro{part+editor+translator}% \setunit*{\addperiod\addspace}% - \iffieldundef{crossref}% - {\iffieldundef{xref}% + \ifboolexpr{ + test {\iffieldundef{crossref}}% + or + togl {cms@crossref}% + } + {\ifboolexpr{ + test {\iffieldundef{xref}}% + or + togl {cms@crossref}% + } {\usebibmacro{chapincoll}% - \usebibmacro{cms-in:}% \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}% \newcunit \iffieldundef{edition}% @@ -1104,7 +1182,6 @@ bibliography style] \printfield{note}% \newunit\newblock \usebibmacro{bibreprint}% -% \newunit\newblock \usebibmacro{publ+loc+year}% \newunit\newblock \usebibmacro{pubstate}% @@ -1157,7 +1234,6 @@ bibliography style] \printfield{note}% \newunit\newblock% \usebibmacro{bibreprint}% -% \newunit\newblock \usebibmacro{org+publ+loc+year}% \newunit\newblock \usebibmacro{pubstate}% @@ -1204,7 +1280,6 @@ bibliography style] \usebibmacro{byeditor+others}% \newunit\newblock \usebibmacro{bibreprint}% -% \newunit\newblock \printfield{howpublished}% \newunit\newblock \printfield{type}% @@ -1264,7 +1339,7 @@ bibliography style] \newunit% ??? Editorpunct maybe not right here? \iffieldundef{maintitle} {} - {\iffieldundef{volume} + {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}% {\usebibmacro{cms-in:}% \printtext{% \printfield{maintitle}% @@ -1321,6 +1396,14 @@ bibliography style] \usebibmacro{originally+published+as}% \usebibmacro{finentry}} +\DeclareBibliographyAlias{mvbook}{book} + +\DeclareBibliographyAlias{mvcollection}{collection} + +\DeclareBibliographyAlias{mvproceedings}{proceedings} + +\DeclareBibliographyAlias{mvreference}{reference} + \DeclareBibliographyDriver{online}{% \usebibmacro{bibindex}% \usebibmacro{shorthand:author}% @@ -1336,7 +1419,6 @@ bibliography style] \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{bibreprint}% -% \newunit\newblock \printlist{organization}% 16th ed. \newunit\newblock \printfield{note}% @@ -1379,7 +1461,6 @@ bibliography style] \printfield{note}% \setunit{\addperiod\addspace}% \usebibmacro{bibreprint}% -% \newunit\newblock \printfield{type}% \setunit{\addspace}% \printfield{number}% @@ -1446,7 +1527,6 @@ bibliography style] \usebibmacro{byeditor+others}% \newunit\newblock \usebibmacro{bibreprint}% -% \newunit\newblock \printfield{note}% \setunit*{\addcomma\addspace}\newblock% \usebibmacro{periodical+date+issue}% @@ -1494,7 +1574,6 @@ bibliography style] \usebibmacro{byeditor+others}% \newunit\newblock \usebibmacro{bibreprint}% -% \newunit\newblock \printfield{note}% \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)?? \usebibmacro{periodical+issue+year+pages}% @@ -1526,7 +1605,17 @@ bibliography style] \newunit\newblock \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}% \newunit\newblock - \usebibmacro{mtitle+mstitle+vol+part+title+stitle}% + \ifboolexpr{% + test {\iffieldundef{crossref}}% + or + togl {cms@bookcrossref}% + }% + {\ifboolexpr{% + test {\iffieldundef{xref}}% + or + togl {cms@bookcrossref}% + }% + {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}% \newunit\newblock \usebibmacro{volume+or+volumes}% \newunit\newblock @@ -1535,7 +1624,6 @@ bibliography style] \printfield{note}% \newunit\newblock \usebibmacro{bibreprint}% -% \newunit\newblock \usebibmacro{org+publ+loc+year}% \newunit\newblock \usebibmacro{pubstate}% @@ -1551,7 +1639,15 @@ bibliography style] \usebibmacro{pageref}% \newunit\newblock \usebibmacro{originally+published+as}% - \usebibmacro{finentry}} + \usebibmacro{finentry}}% +{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \bibxrefcite{\thefield{xref}} + \usebibmacro{bibpostxref}% + \usebibmacro{finentry}}}% +{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \bibxrefcite{\thefield{crossref}}% + \usebibmacro{bibpostxref}% + \usebibmacro{finentry}}} \DeclareBibliographyDriver{reference}{% \usebibmacro{bibindex}% @@ -1567,7 +1663,6 @@ bibliography style] \newunit\newblock \usebibmacro{part+editor+translator}% \setunit*{\addperiod\addspace}% need asterisk? - \usebibmacro{alt-in:}% \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}% \newcunit \iffieldundef{edition}% @@ -1589,7 +1684,6 @@ bibliography style] \printfield{note}% \newunit\newblock \usebibmacro{bibreprint}% -% \newunit\newblock \usebibmacro{publ+loc+year}% \newunit\newblock \usebibmacro{pubstate}% @@ -1630,7 +1724,6 @@ bibliography style] \printfield{note}% \newunit\newblock \usebibmacro{bibreprint}% -% \newunit\newblock \usebibmacro{inst+loc+year}% \newunit\newblock \usebibmacro{pubstate}% @@ -1679,7 +1772,6 @@ bibliography style] \usebibmacro{part+editor+translator}% \newunit\newblock% \usebibmacro{bibreprint}% -% \newunit\newblock \usebibmacro{issuetitle}% \setunit*{\addcomma\addspace}% \usebibmacro{byeditor+others}% @@ -1756,7 +1848,6 @@ bibliography style] \printfield{note}% \newunit\newblock \usebibmacro{bibreprint}% -% \newunit\newblock \usebibmacro{publ+loc+year}% \newunit\newblock \usebibmacro{pubstate}% @@ -1795,7 +1886,6 @@ bibliography style] \printfield{note}% \setunit{\addperiod\addspace}\newblock% \usebibmacro{bibreprint}% -% \newunit\newblock \usebibmacro{type+inst+year}% \newunit\newblock \usebibmacro{pubstate}% @@ -1823,8 +1913,9 @@ bibliography style] \newunit%usebibmacro{byauthorpunct}% Why does this work? No idea. \usebibmacro{byauthor}% Same in thesis type, as well. 16th ed. \setunit{\addperiod\addspace}% + \usebibmacro{byeditor+others}% Fix bug ??? + \newunit\newblock \usebibmacro{bibreprint}% -% \newunit\newblock \printfield{howpublished}% \setunit*{\addcomma\addspace}\newblock% \printfield{note}% @@ -1889,7 +1980,7 @@ bibliography style] \newunit% ??? Editorpunct maybe not right here? \iffieldundef{maintitle} {} - {\iffieldundef{volume} + {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}% {\usebibmacro{cms-in:}% \printtext{% \printfield{maintitle}% @@ -1980,34 +2071,39 @@ bibliography style] \newbibmacro*{shorthand:label}{% Test this \ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT% - \iffieldequalstr{entrytype}{periodical}}% Simplifies .bib creation + \ifentrytype{periodical}}% Simplifies .bib creation {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}}}% - {\iffieldequalstr{entrytype}{manual}% + {\ifentrytype{manual}% {\printtext[bibhyperref]{\printlist{organization}}}% {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}}}% \newbibmacro*{labelyear+extrayear}{% \ifboolexpr{ ( - test {\iffieldequalstr{entrytype}{music}}% + test {\ifentrytype{music}}% or - test {\iffieldequalstr{entrytype}{review}}% + test {\ifentrytype{review}}% or - test {\iffieldequalstr{entrytype}{video}}% + test {\ifentrytype{video}}% ) and - togl {cms@avdate} + togl {cms@avdate}% }% {\usebibmacro{av+labelyear+extrayear}}% - {\usebibmacro{standard+labelyear+extrayear}}} + {\iftoggle{cms@ordate}% + {\usebibmacro{origfirst+labelyear+extrayear}}% + {\usebibmacro{standard+labelyear+extrayear}}}} \newbibmacro*{standard+labelyear+extrayear}{% - \iffieldundef{labelyear}% + \ifthenelse{\iffieldundef{labelyear}\OR% + \iffieldequalstr{labelyear}{nodate}}% or new declaration ??? {\ifboolexpr{ - test {\iffieldequalstr{entrytype}{misc}} + test {\ifentrytype{misc}} + or + test {\ifentrytype{inreference}} or - test {\iffieldequalstr{entrytype}{inreference}} + test {\ifentrytype{reference}} or - test {\iffieldequalstr{entrytype}{reference}} + test {\ifentrytype{mvreference}} or not togl {cms@nodates}}% {}% @@ -2057,7 +2153,7 @@ bibliography style] \clearfield{eventyear}}% {\iffieldundef{eventmonth}% {\clearfield{eventyear}}% - {\iffieldsequal{eventyear}{evendendyear}% + {\iffieldsequal{eventyear}{eventendyear}% {\clearfield{eventyear}\clearfield{eventendyear}}% {}}}}}}% {\printfield{labelyear}% @@ -2076,14 +2172,96 @@ bibliography style] {\clearfield{year}\clearfield{endyear}}% {}}}}}}} +\newbibmacro*{origfirst+labelyear+extrayear}{% + \ifthenelse{\iffieldundef{labelyear}\OR% + \iffieldequalstr{labelyear}{nodate}}% + {\ifboolexpr{ + test {\ifentrytype{misc}} + or + test {\ifentrytype{inreference}} + or + test {\ifentrytype{reference}} + or + test {\ifentrytype{mvreference}} + or + not togl {cms@nodates}}% + {}% + {\bibstring{nodate}}}% + {\iffieldundef{origyear}% + {\iffieldundef{year} + {\iffieldundef{eventyear}% + {\printfield{labelyear}% + \iffieldundef{extrayear}% + {}% + {\setunit*{}% + \printfield{extrayear}}% + \iffieldundef{urlendyear}% + {\clearfield{urlyear}}% + {\iffieldequalstr{urlendyear}{}% + {\mbox{\bibdatedash}% + \clearfield{urlyear}}% + {\iffieldundef{urlmonth}% + {\clearfield{urlyear}}% + {\iffieldsequal{urlyear}{urlendyear}% + {\clearfield{urlyear}\clearfield{urlendyear}}% + {}}}}}% + {\printfield{labelyear}% + \iffieldundef{extrayear}% + {}% + {\setunit*{}% + \printfield{extrayear}}% + \iffieldundef{eventendyear}% + {\clearfield{eventyear}}% + {\iffieldequalstr{eventendyear}{}% + {\mbox{\bibdatedash}% + \clearfield{eventyear}}% + {\iffieldundef{eventmonth}% + {\clearfield{eventyear}}% + {\iffieldsequal{eventyear}{eventendyear}% + {\clearfield{eventyear}\clearfield{eventendyear}}% + {}}}}}}% + {\printfield{labelyear}% + \iffieldundef{extrayear}% + {}% + {\setunit*{}% + \printfield{extrayear}}% + \iffieldundef{endyear}% + {\clearfield{year}}% + {\iffieldequalstr{endyear}{}% + {\mbox{\bibdatedash}% + \clearfield{year}}% + {\iffieldundef{month}% + {\clearfield{year}}% + {\iffieldsequal{year}{endyear}% + {\clearfield{year}\clearfield{endyear}}% + {}}}}}}% + {\printfield{labelyear}% + \iffieldundef{extrayear}% + {}% + {\setunit*{}% + \printfield{extrayear}}% + \iffieldundef{origendyear}% DATE FIX + {\clearfield{origyear}}% + {\iffieldequalstr{origendyear}{}% + {\mbox{\bibdatedash}% + \clearfield{origyear}}% + {\iffieldundef{origmonth}% + {\clearfield{origyear}}% + {\iffieldsequal{origyear}{origendyear}% + {\clearfield{origyear}\clearfield{origendyear}}% + {}}}}}}} + \newbibmacro*{av+labelyear+extrayear}{% - \iffieldundef{labelyear}% + \ifthenelse{\iffieldundef{labelyear}\OR% + \iffieldequalstr{labelyear}{nodate}}% {\ifboolexpr{ - test {\iffieldequalstr{entrytype}{misc}} + test {\ifentrytype{misc}} + or + test {\ifentrytype{inreference}} or - test {\iffieldequalstr{entrytype}{inreference}} + test {\ifentrytype{reference}} or - test {\iffieldequalstr{entrytype}{reference}} + test {\ifentrytype{mvreference}} or not togl {cms@nodates}}% {}% @@ -2154,11 +2332,23 @@ bibliography style] \newbibmacro*{origyear+endyear}{% \printfield{origyear}% - \iffieldundef{origendyear}% + \ifthenelse{\iffieldundef{origendyear}\OR% + \iffieldsequal{origyear}{origendyear}}% Same fix as in .lbx {}% {\iffieldequalstr{origendyear}{}% {\mbox{\bibdatedash}}% - {\bibdatedash\printfield{origendyear}}}} + {\bibdatedash\csuse{mkbibdatelong}{origendyear}{}{}}}}% ??? + +% \printfield{origendyear}}}} Peculiar bug with this after \bibnamedash + +\newbibmacro*{year+endyear}{% + \printfield{year}% + \ifthenelse{\iffieldundef{endyear}\OR% + \iffieldsequal{year}{endyear}}% Same fix as in .lbx + {}% + {\iffieldequalstr{endyear}{}% + {\mbox{\bibdatedash}}% + {\bibdatedash\printfield{endyear}}}} \newbibmacro*{cmsbibsortdate}{% Attempt to solve date-related problems \ifboolexpr{% @@ -2171,7 +2361,7 @@ bibliography style] {\ifboolexpr{% Needed for date ranges - video type, esp. test {\iffieldundef{endyear}}% or - not test {\iffieldnum{endyear}} + not test {\iffieldnum{endyear}}% }% {\ifthenelse{\thefield{origyear}>\thefield{year}}% {\toggletrue{cms@switchdates}% @@ -2181,7 +2371,7 @@ bibliography style] {\toggletrue{cms@switchdates}% \usebibmacro{cmsbibyear}}% {\usebibmacro{cmsbibyear}}}}% - {\usebibmacro{cmsbibyear}}}} + {\usebibmacro{cmsbibyear}}}}% \newbibmacro*{cmsbibyear}{% \iftoggle{cms@origlabel}% @@ -2196,34 +2386,71 @@ bibliography style] {}} \newbibmacro*{origyear+labelyear}{% - \iftoggle{cms@switchdates}% - {\usebibmacro{labelyear+extrayear}% - \clearfield{year}}% - {\iffieldundef{origyear} - {\clearfield{extrayear}\usebibmacro{labelyear+extrayear}}% - {\usebibmacro{origyear+endyear}}% - \clearfield{origyear}}} + \ifboolexpr{ ( + test {\ifentrytype{music}}% + or + test {\ifentrytype{review}}% + or + test {\ifentrytype{video}}% + ) + and + togl {cms@avdate}% + } + {\usebibmacro{av+labelyear+extrayear}}% + {\iftoggle{cms@switchdates}% + {\usebibmacro{labelyear+extrayear}}% + {\iffieldundef{origyear}% + {\iftoggle{cms@ordate}% ??? + {}% + {\clearfield{extrayear}}% + \usebibmacro{standard+labelyear+extrayear}}% + {\iftoggle{cms@ordate}% + {\usebibmacro{origfirst+labelyear+extrayear}}% + {\usebibmacro{origyear+endyear}% + \clearfield{origyear}}}}}} \newbibmacro*{bothyear+oldstyle}{% - \iftoggle{cms@switchdates}% - {\printtext{% - \bibopenparen% - \usebibmacro{labelyear+extrayear}% - \bibcloseparen% - \setunit{\addspace}\usebibmacro{origyear+endyear}}% - \clearfield{year}% - \clearfield{origyear}}% - {\iffieldundef{origyear} - {\clearfield{extrayear}\usebibmacro{labelyear+extrayear}}% + \ifboolexpr{ ( + test {\ifentrytype{music}}% + or + test {\ifentrytype{review}}% + or + test {\ifentrytype{video}}% + ) + and + togl {cms@avdate}% + } + {\usebibmacro{av+labelyear+extrayear}}% \clearfield local to \printtext + {\iftoggle{cms@switchdates}% {\printtext{% \bibopenparen% - \usebibmacro{origyear+endyear}% + \usebibmacro{labelyear+extrayear}% \bibcloseparen% -% \printfield[parens]{origyear}% - \clearfield{extrayear}\setunit*{\addspace}% - \usebibmacro{labelyear+extrayear}}% - \clearfield{origyear}% - \clearfield{year}}}} + \setunit{\addspace}\usebibmacro{origyear+endyear}}% + \clearfield{year}% + \clearfield{origyear}}% + {\iffieldundef{origyear} + {\iftoggle{cms@ordate}% + {}% + {\clearfield{extrayear}}% + \usebibmacro{standard+labelyear+extrayear}}% + {\iftoggle{cms@ordate}% ??? + {\iffieldundef{year}% + {\usebibmacro{origfirst+labelyear+extrayear}}% + {\printtext{% + \bibopenparen% + \usebibmacro{origfirst+labelyear+extrayear}% + \bibcloseparen% + \setunit*{\addspace}% + \usebibmacro{year+endyear}}}}% + {\printtext{% + \bibopenparen% + \usebibmacro{origyear+endyear}% + \bibcloseparen% + \clearfield{extrayear}\setunit*{\addspace}% + \usebibmacro{standard+labelyear+extrayear}}}% + \clearfield{origyear}% + \clearfield{year}}}}} \newbibmacro*{pubstate}{% \iftoggle{cms@reprint}% @@ -2241,8 +2468,8 @@ bibliography style] {\printfield{pubstate}}} \newbibmacro*{choosepubstring}{% - \ifthenelse{\iffieldequalstr{entrytype}{video}\OR% - \iffieldequalstr{entrytype}{music}}% + \ifthenelse{\ifentrytype{video}\OR% + \ifentrytype{music}}% {\bibstring{origreleaseyear}}% {\bibstring{origpubyearalt}}}% @@ -2255,19 +2482,24 @@ bibliography style] {}}}% {}} -\newbibmacro*{volume+pages}{% Volume fix - \iffieldundef{maintitle}% - {\iffieldundef{volume}% +\newbibmacro*{volume+pages}{% Volume fix (modified) + \ifboolexpr{ + test {\iffieldundef{maintitle}}% + or + togl {cms@vol}% + } + {\global\togglefalse{cms@vol}% + \ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}% {\printfield{pages}% \newunit% \printfield{volumes}}% {\iffieldundef{part}% {\iffieldundef{pages}% - {}% + {\printfield{volume}}% Still print this w/o part or pages??? {\ifthenelse{\iffieldnums{pages}% - \AND\iffieldundef{bookpagination}}% + \AND\iffieldundef{bookpagination}\AND\iffieldnums{volume}}% {\printfield[default]{volume}% - \addcolon% + \postvolpunct% \printfield{pages}}% {\printfield{volume}% \addcomma\addspace% @@ -2276,89 +2508,184 @@ bibliography style] \printfield{part}% \newcunit% \printfield{pages}}}}% - {\printfield{pages}% - \newunit% - \printfield{volumes}}}% + {\ifboolexpr{ + togl {cms@hidevolumes}% + and + ( + not test {\iffieldundef{volume}}% + or + not test {\iffieldundef{part}}% + ) + }% + {\printfield{pages}}% + {\printfield{pages}% + \newunit% + \printfield{volumes}}}}% \newbibmacro*{bibpostxref}{% Volume fix - \iffieldundef{pages}% - {\iffieldundef{volume}% - {}% - {\iffieldundef{part}% - {\newcunit\printfield{volume}}% - {\newcunit\printfield{volume}% - \printfield{part}}}}% - {\iffieldundef{volume}% - {\newcunit\printfield{pages}}% - {\iffieldundef{part}% - {\ifthenelse{\iffieldnums{pages}% - \AND\iffieldundef{bookpagination}}% - {\newcunit\printfield[default]{volume}% - \addcolon% - \printfield{pages}}% - {\newcunit\printfield{volume}% - \addcomma\addspace% - \printfield{pages}}}% - {\newcunit\printfield{volume}% - \printfield{part}% - \newcunit% - \printfield{pages}}}}} - -\newbibmacro*{volume+or+volumes}{% Volume fix + \iffieldundef{chapter}% + {\iffieldundef{pages}% + {\iffieldundef{volume}% + {\iffieldundef{part}% + {}% + {\newcunit\printfield{part}}}% + {\ifboolexpr{ + test {\ifcsdef{cbx@incollvol}}% + and + test {\iffieldequalcs{volume}{cbx@incollvol}}% + }% + {\iffieldundef{part}% + {}% + {\ifboolexpr{ + test {\ifcsdef{cbx@incollpart}}% + and + test {\iffieldequalcs{part}{cbx@incollpart}}% + }% + {}% + {\newcunit\printfield{part}}}}% + {\iffieldundef{part}% + {\newcunit\printfield{volume}}% + {\newcunit\printfield{volume}\printfield{part}}}}}% + {\iffieldundef{volume}% + {\iffieldundef{part}% + {\newcunit\printfield{pages}}% + {\newcunit\printfield{part}\newcunit\printfield{pages}}}% + {\ifboolexpr{ + test {\ifcsdef{cbx@incollvol}}% + and + test {\iffieldequalcs{volume}{cbx@incollvol}}% + }% + {\iffieldundef{part}% + {\newcunit\printfield{pages}}% + {\ifboolexpr{ + test {\ifcsdef{cbx@incollpart}}% + and + test {\iffieldequalcs{part}{cbx@incollpart}}% + }% + {\newcunit\printfield{pages}}% + {\newcunit\printfield{part}\newcunit\printfield{pages}}}}% + {\iffieldundef{part}% + {\ifthenelse{\iffieldnums{pages}% + \AND\iffieldundef{bookpagination}\AND\iffieldnums{volume}}% + {\newcunit\printfield[default]{volume}% + \postvolpunct% + \printfield{pages}}% + {\newcunit\printfield{volume}% + \addcomma\addspace% + \printfield{pages}}}% + {\newcunit\printfield{volume}% + \printfield{part}% + \newcunit% + \printfield{pages}}}}}}% + {\newcunit\printfield{chapter}}} + +\newbibmacro*{volume+or+volumes}{% Volume fix (modified) \iffieldundef{maintitle}% - {\iffieldundef{volume}% + {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}% {\printfield{volumes}}% {\printfield{volume}% \printfield{part}}}% - {\printfield{volumes}}} + {\ifboolexpr{ + togl {cms@hidevolumes}% + and + ( + not test {\iffieldundef{volume}}% + or + not test {\iffieldundef{part}}% + ) + }% + {}% + {\printfield{volumes}}}} \newbibmacro*{mtitle+mstitle+vol+part+title+stitle}{% \iffieldundef{maintitle} {} - {\iffieldundef{volume} - {\printtext{% + {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}% Test ??? + {\usebibmacro{cms-in:}% Volume-less treatment? + \printtext{% \printfield{maintitle}% - \setunit{\addcolon\addspace}% - \printfield[maintitle]{mainsubtitle}}% - \newcunit - \printfield{maintitleaddon}} - {\printfield{volume}% - \printfield{part}% - \setunit{\addspace} - \bibstring{ofseries}% - \setunit{\addspace} + \setunit{\addcolon\addspace}% + \printfield[maintitle]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}} + {\printfield{volume}% + \printfield{part}% + \setunit{\addspace} + \bibstring{ofseries}% + \setunit{\addspace} + \printtext{% + \printfield{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[maintitle]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}}}} + +\newbibmacro*{btitle+bstitle}{% InIn fix from N&B + \iffieldundef{booktitle} + {} + {\ifthenelse{\ifentrytype{audio}\OR\ifentrytype{music}\OR% + \ifentrytype{video}}% + {}% + {\usebibmacro{cms-in:}}% \printtext{% - \printfield{maintitle}% + \printfield{booktitle}% \setunit{\addcolon\addspace}% - \printfield[maintitle]{mainsubtitle}}% + \printfield[booktitle]{booksubtitle}}% \newcunit - \printfield{maintitleaddon}}}} + \printfield{booktitleaddon}% + \setunit*{\addcomma\addspace}}} \newbibmacro*{mtitle+mstitle+vol+part+btitle+bstitle}{% \usebibmacro{btitle+bstitle}% - \iffieldundef{booktitle} - {\setunit{\addperiod\addspace}}% Fix customc? - {\setunit{\addcomma\addspace}}% \iffieldundef{maintitle} {} - {\iffieldundef{volume} - {\printtext{% + {\ifthenelse{\(\iffieldundef{volume}\AND\iffieldundef{part}\)\OR% + \(\iffieldundef{booktitle}\AND\NOT\ifentrytype{bookinbook}\)}% + {\usebibmacro{cms-in:}% Volume-less treatment? + \printtext{% \printfield{maintitle}% - \setunit{\addcolon\addspace}% - \printfield[maintitle]{mainsubtitle}}% - \newcunit - \printfield{maintitleaddon}} - {\printfield{volume}% - \printfield{part}% - \setunit{\addspace} - \bibstring{ofseries}% - \setunit{\addspace} - \printtext{% - \printfield{maintitle}% - \setunit{\addcolon\addspace}% - \printfield[maintitle]{mainsubtitle}}% - \newcunit - \printfield{maintitleaddon}}}} + \setunit{\addcolon\addspace}% + \printfield[maintitle]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}% + \toggletrue{cms@vol}} + {\printfield{volume}% + \printfield{part}% + \setunit{\addspace} + \bibstring{ofseries}% + \setunit{\addspace} + \printtext{% + \printfield{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[maintitle]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}}}} + +\newbibmacro*{cjournal+ser+vol+num}{% Moved to bbx + \usebibmacro{journal+sub}% + \setunit*{\addspace}% + \printlist[periodplace]{location}% + \setunit*{\addspace}% + \iffieldundef{series} + {} + {\newcunit + \printfield[jourser]{series}% + \newcunit}%\setunit*{\addspace}? + \ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}% + {\iffieldundef{volume}% + {\newcunit% + \printfield[journum]{number}% + \clearfield{number}% + \setunit{\addcomma\addspace}} + {\printfield[jourvol]{volume}% + \setunit{\addcomma\addspace}}}% + {\printfield[jourvol]{volume}% + \newcunit% + \printfield[journum]{number}% + \clearfield{number}% + \setunit{\addcomma\addspace}}% need * here? + \printfield{eid}% + \newunit} \newbibmacro*{journal+issue+year+pages}{% \iftoggle{cms@numbermonth}{}{\clearfield{month}}% @@ -2366,9 +2693,9 @@ bibliography style] \setunit{\addspace}% \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month} \AND\iffieldundef{number}}% - {\iftoggle{cms@postposit}% Kludge for French colon spacing. - {\setunit{\addcolon\addspace}}% - {\setunit{\addcolon}}}% This may not be universally correct. + {\iffieldundef{bookpagination}% 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? \iffieldundef{issue} {\usebibmacro{date}% @@ -2385,9 +2712,9 @@ bibliography style] \setunit{\addspace}% \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month} \AND\iffieldundef{number}}% - {\iftoggle{cms@postposit}% - {\setunit{\addcolon\addspace}}% - {\setunit{\addcolon}}}% + {\iffieldundef{bookpagination}% Removed kludge for French ??? + {\setunit{\postvolpunct}}% + {\setunit{\addcolon\addspace}}}% {\printtext[parens]{% \iffieldundef{issue} {\usebibmacro{date}% 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 19742ff22be..08a623d20db 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,10 @@ -% $Id: chicago-authordate.cbx,v 0.8.1.32 2013/03/12 12:35:38 dfussner Exp $ +% $Id: chicago-authordate.cbx,v 0.8.1.57 2013/10/29 14:04:11 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/03/12 v 2.5 biblatex citation style] +\ProvidesFile{chicago-authordate.cbx}[2013/10/29 v 2.8 biblatex citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -22,6 +22,7 @@ \providetoggle{cms@los} %\providetoggle{cms@oneyear} \providetoggle{cms@avdate} +\providetoggle{cms@ordate} \providetoggle{cms@nodates} \providetoggle{cms@authorparens} @@ -32,6 +33,7 @@ \providetoggle{cms@isbn} \providetoggle{cms@numbermonth} \providetoggle{cms@bookpages} +\providetoggle{cms@hidevolumes}% Modify Volume fix \providetoggle{cms@jrcomma}% Comma after Jr./Sr. @@ -41,7 +43,10 @@ \providetoggle{cms@origpublished}% Keep \providetoggle{cms@annotation}% Keep \providetoggle{cms@postposit}% Keep -\providetoggle{cms@fullshhand} +\providetoggle{cms@fullshhand}% +\providetoggle{cms@vol}% +\providetoggle{cms@crossref}% +\providetoggle{cms@bookcrossref} \AtEveryCitekey{% \iffieldundef{userc}% @@ -56,18 +61,55 @@ {\csuse{cms@opt@avdate@#1}} {\blx@err@invopt{avdate=#1}{}}} \def\cms@opt@avdate@true{% - \@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4 - {\DeclareLabelyear[music,review,video]{\field{eventyear}% - \field{origyear} \field{year} \field{urlyear}}}% + \@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4/2.5 + {\@ifpackagelater{biblatex}{2013/03/30}% for biblatex 2.6 ff. + {\DeclareLabeldate[music,review,video]{\field{eventyear}% + \field{origyear} \field{year} \field{urlyear}}}% + {\DeclareLabelyear[music,review,video]{\field{eventyear}% + \field{origyear} \field{year} \field{urlyear}}}}% {\DeclareLabelyear[music,review,video]{eventyear,origyear,year,urlyear}}% \toggletrue{cms@avdate}}% \def\cms@opt@avdate@false{% \togglefalse{cms@avdate}} -\DeclareBibliographyOption{cmsdate}{% Trying to implement origyear as - \ifcsdef{cms@opt@cmsdate@#1}% labelyear. Sorting will be an issue. - {\csuse{cms@opt@cmsdate@#1}} +\DeclareBibliographyOption{cmsdate}[off]{% Trying to implement origyear as + \ifcsdef{cms@global@cmsdate@#1}% labelyear. Sorting will be an issue. + {\csuse{cms@global@cmsdate@#1}} {\blx@err@invopt{cmsdate=#1}{}}} +\def\cms@global@cmsdate@on{% + \toggletrue{cms@origlabel}% + \ExecuteBibliographyOptions{cmsorigdate=true}} +\def\cms@global@cmsdate@new{% + \toggletrue{cms@bothlabelnew}% + \ExecuteBibliographyOptions{cmsorigdate=true}} +\def\cms@global@cmsdate@old{% + \toggletrue{cms@bothlabelold}% + \ExecuteBibliographyOptions{cmsorigdate=true}} +\def\cms@global@cmsdate@both{% + \toggletrue{cms@bothlabelold}% + \ExecuteBibliographyOptions{cmsorigdate=true}} +\def\cms@global@cmsdate@full{}% +\def\cms@global@cmsdate@off{} + +\DeclareBibliographyOption{cmsorigdate}[true]{% ??? Also need new macros + \ifcsdef{cms@opt@origdate@#1}% for printing dates. Worth it ??? + {\csuse{cms@opt@origdate@#1}}% + {\blx@err@invopt{cmsorigdate=#1}{}}} +\def\cms@opt@origdate@true{% + \@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4/2.5 + {\@ifpackagelater{biblatex}{2013/03/30}% for biblatex 2.6 ff. + {\DeclareLabeldate{\field{origyear} \field{year}% + \field{eventyear} \field{urlyear}}% + \DeclareLabeldate[patent]{\field{year} \field{eventyear}% + \field{origyear} \field{urlyear}}}% + {\DeclareLabelyear{\field{origyear} \field{year}% + \field{eventyear} \field{urlyear}}% + \DeclareLabelyear[patent]{\field{year} \field{eventyear}% + \field{origyear} \field{urlyear}}}}% + {\DeclareLabelyear{origyear,year,eventyear,urlyear}% + \DeclareLabelyear[patent]{year,eventyear,origyear,urlyear}}% + \global\toggletrue{cms@ordate}}% +\def\cms@opt@origdate@false{\togglefalse{cms@ordate}}% \DeclareEntryOption{cmsdate}[off]{% Trying to implement origyear as \ifcsdef{cms@opt@cmsdate@#1}% labelyear. Sorting will be an issue. @@ -122,6 +164,45 @@ \DeclareBibliographyOption{shorthandfull}[true]{% \settoggle{cms@fullshhand}{#1}} +\DeclareBibliographyOption{longcrossref}[false]{% + \ifcsdef{cms@opt@lxref@#1}% + {\csuse{cms@opt@lxref@#1}} + {\blx@err@invopt{longcrossref=#1}{}}} +\def\cms@opt@lxref@none{% + \togglefalse{cms@crossref}% + \togglefalse{cms@bookcrossref}}% +\def\cms@opt@lxref@true{% + \toggletrue{cms@crossref}}% +\def\cms@opt@lxref@false{% + \togglefalse{cms@crossref}}% +\def\cms@opt@lxref@notes{% + \togglefalse{cms@crossref}}% +\def\cms@opt@lxref@bib{% + \toggletrue{cms@crossref}}% + +\DeclareEntryOption{longcrossref}[false]{% + \ifcsdef{cms@opt@doi@#1}% + {\csuse{cms@opt@doi@#1}} + {\blx@err@invopt{doi=#1}{}}} + +\DeclareBibliographyOption{booklongxref}[true]{% + \ifcsdef{cms@opt@bklxref@#1}% + {\csuse{cms@opt@bklxref@#1}} + {\blx@err@invopt{booklongxref=#1}{}}}% +\def\cms@opt@bklxref@true{% + \toggletrue{cms@bookcrossref}}% +\def\cms@opt@bklxref@false{% + \togglefalse{cms@bookcrossref}}% +\def\cms@opt@bklxref@notes{% + \togglefalse{cms@bookcrossref}}% +\def\cms@opt@bklxref@bib{% + \toggletrue{cms@bookcrossref}}% + +\DeclareEntryOption{booklongxref}[true]{% + \ifcsdef{cms@opt@bklxref@#1}% + {\csuse{cms@opt@bklxref@#1}} + {\blx@err@invopt{booklongxref=#1}{}}}% + % The field-exclusion options % \DeclareBibliographyOption{isbn}[true]{% @@ -151,6 +232,8 @@ \settoggle{cms@eprint}{#1}% \settoggle{cms@numbermonth}{#1}% \settoggle{cms@bookpages}{#1}} +\DeclareBibliographyOption{hidevolumes}[true]{% + \settoggle{cms@hidevolumes}{#1}} \DeclareEntryOption{isbn}[true]{% \settoggle{cms@isbn}{#1}} @@ -172,8 +255,71 @@ \settoggle{cms@numbermonth}{#1}} \DeclareEntryOption{bookpages}[true]{% \settoggle{cms@bookpages}{#1}} +\DeclareEntryOption{hidevolumes}[true]{% + \settoggle{cms@hidevolumes}{#1}} + +\ExecuteBibliographyOptions{includeall,hidevolumes,booklongxref}% + +\@ifpackagelater{biblatex}{2013/03/30}% For biblatex 2.6 ff. +{\ExecuteBibliographyOptions{labeldate=true}}% +{\ExecuteBibliographyOptions{labelyear=true}}% + +\DeclareDataInheritance{collection}{suppcollection}{% + \inherit{title}{title} + \inherit{subtitle}{subtitle} + \inherit{titleaddon}{titleaddon}} + +\DeclareDataInheritance{mvbook}{incollection}{% + \inherit{title}{maintitle} + \inherit{subtitle}{mainsubtitle} + \inherit{titleaddon}{maintitleaddon} + \noinherit{shorttitle} + \noinherit{sorttitle} + \noinherit{indextitle} + \noinherit{indexsorttitle} +} -\ExecuteBibliographyOptions{includeall}% +\DeclareDataInheritance{book,collection}{letter}{% + \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} + \inherit{titleaddon}{maintitleaddon} + \noinherit{shorttitle} + \noinherit{sorttitle} + \noinherit{indextitle} + \noinherit{indexsorttitle} +} + +\DeclareDataInheritance{*}{*}{% + \noinherit{namea} + \noinherit{nameb} + \noinherit{sortyear} + \noinherit{sortname} + \noinherit{sorttitle}} + +\DeclareDataInheritance{mvbook,mvcollection,mvproceedings,mvreference}% +{*}{% ??? + \noinherit{year} + \noinherit{month} + \noinherit{day} + \noinherit{endyear} + \noinherit{endmonth} + \noinherit{endday} + \noinherit{origyear} + \noinherit{origmonth} + \noinherit{origday} + \noinherit{origendyear} + \noinherit{origendmonth} + \noinherit{origendday}} % More authordate options % @@ -199,7 +345,9 @@ } \sort{ \field{sortyear} + \field{labelyear} \field{year} + \field{origyear} } \sort{ \field{sorttitle} @@ -294,8 +442,9 @@ {\iffieldequalstr{entrysubtype}{classical}% Similar to notes+bib {\iffieldundef{shorthand}% {\ifthenelse{\ifnameundef{labelname}\OR - \iffieldequalstr{entrytype}{inreference}\OR - \iffieldequalstr{entrytype}{reference}}% Simplified for CMS + \ifentrytype{inreference}\OR + \ifentrytype{reference}\OR + \ifentrytype{mvreference}}% Simplified for CMS {\usebibmacro{cite:label}% \setunit{\addspace}% \usebibmacro{cite:reinit}} @@ -307,7 +456,7 @@ {\iffieldequals{namehash}{\cbx@lastyear}% {}% {\usebibmacro{cmsbracketname}% For names in [] - \iffieldequalstr{entrytype}{customc}% + \ifentrytype{customc}% {\newcunit}% {\setunit{\addspace}}}% \usebibmacro{cite:label}% @@ -317,8 +466,9 @@ {\usebibmacro{cite:shorthand+title}}} {\iffieldundef{shorthand}% {\ifthenelse{\ifnameundef{labelname}\OR - \iffieldequalstr{entrytype}{inreference}\OR - \iffieldequalstr{entrytype}{reference}}% Simplified for CMS + \ifentrytype{inreference}\OR + \ifentrytype{reference}\OR + \ifentrytype{mvreference}}% Simplified for CMS {\usebibmacro{cite:label}% \setunit{\addspace}% \usebibmacro{cmscitesortdate}% @@ -401,14 +551,15 @@ {\usebibmacro{cmscitesortdate}}}% {\iffieldundef{shorthand} {\ifthenelse{\ifnameundef{labelname}\OR - \iffieldequalstr{entrytype}{inreference}\OR - \iffieldequalstr{entrytype}{reference}}% + \ifentrytype{inreference}\OR + \ifentrytype{reference}\OR + \ifentrytype{mvreference}}% {\iffieldequalstr{entrysubtype}{classical}% {\setunit{% \global\booltrue{cbx:parens}% \addspace\bibopenparen}% \ifnumequal{\value{citecount}}{1}% - {\usebibmacro{prenote}} + {\usebibmacro{prenote}}% {}% \usebibmacro{cite:label}} {\usebibmacro{cite:label}% @@ -416,7 +567,7 @@ \global\booltrue{cbx:parens}% \addspace\bibopenparen}% \ifnumequal{\value{citecount}}{1} - {\usebibmacro{prenote}} + {\usebibmacro{prenote}}% {}% \usebibmacro{cmscitesortdate}}} {\printnames{labelname}% @@ -424,12 +575,12 @@ \global\booltrue{cbx:parens}% \addspace\bibopenparen}% \ifnumequal{\value{citecount}}{1} - {\usebibmacro{prenote}} + {\usebibmacro{prenote}}% {}% \iffieldequalstr{entrysubtype}{classical}% - {\usebibmacro{cite:label}} + {\usebibmacro{cite:label}}% {\usebibmacro{cmscitesortdate}}% - \savefield{namehash}{\cbx@lasthash}}} + \savefield{namehash}{\cbx@lasthash}}}% {\printfield{shorthand}% \setunit{% \global\booltrue{cbx:parens}% @@ -438,14 +589,15 @@ {\usebibmacro{prenote}}% {}% \iffieldequalstr{entrysubtype}{classical}% - {\usebibmacro{cite:label}} + {\usebibmacro{cite:label}}% {\usebibmacro{cmscitesortdate}}% - \savefield{namehash}{\cbx@lasthash}}}% + \savefield{namehash}{\cbx@lasthash}}% + \stepcounter{textcitecount}}% Added ??? \setunit{% \ifbool{cbx:parens}% {\bibcloseparen\global\boolfalse{cbx:parens}}% {}% - \multicitedelim}} + \textcitedelim}}% Not \multicitedelim ??? \newbibmacro*{textcite:citeshort}{% \iffieldequals{namehash}{\cbx@lasthash} @@ -458,7 +610,7 @@ {\setunit{\multicitedelim}}% \iffieldequalstr{entrysubtype}{classical}% {\usebibmacro{cite:label}}% - {\usebibmacro{cmscitesortdate}}} + {\usebibmacro{cmscitesortdate}}}% {\iffieldundef{postnote}% {\iffieldequals{namehash}{\cbx@lastyear}% {\setunit{\multicitedelim}% @@ -468,15 +620,16 @@ \printtext[bibhyperref]{% \printfield{shorthand}}}}% {\ifthenelse{\ifnameundef{labelname}\OR - \iffieldequalstr{entrytype}{inreference}\OR - \iffieldequalstr{entrytype}{reference}}% + \ifentrytype{inreference}\OR + \ifentrytype{reference}\OR + \ifentrytype{mvreference}}% {\iffieldundef{shorthand} {\iffieldequalstr{entrysubtype}{classical}% {\setunit{% \global\booltrue{cbx:parens}% \addspace\bibopenparen}% \ifnumequal{\value{citecount}}{1}% - {\usebibmacro{prenote}} + {\usebibmacro{prenote}}% {}% \usebibmacro{cite:label}} {\usebibmacro{cite:label}% @@ -484,9 +637,9 @@ \global\booltrue{cbx:parens}% \addspace\bibopenparen}% \ifnumequal{\value{citecount}}{1} - {\usebibmacro{prenote}} + {\usebibmacro{prenote}}% {}% - \usebibmacro{cmscitesortdate}}} + \usebibmacro{cmscitesortdate}}}% {\printtext[bibhyperref]{% \printfield{shorthand}}}} {\printnames{labelname}% @@ -494,20 +647,21 @@ \global\booltrue{cbx:parens}% \addspace\bibopenparen}% \ifnumequal{\value{citecount}}{1} - {\usebibmacro{prenote}} + {\usebibmacro{prenote}}% {}% \iffieldundef{shorthand} {\iffieldequalstr{entrysubtype}{classical}% - {\usebibmacro{cite:label}} + {\usebibmacro{cite:label}}% {\usebibmacro{cmscitesortdate}}}% {\printtext[bibhyperref]{% \printfield{shorthand}}}% - \savefield{namehash}{\cbx@lasthash}}}% + \savefield{namehash}{\cbx@lasthash}}% + \stepcounter{textcitecount}}% Added ??? \setunit{% \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}}% {}% - \multicitedelim}} + \textcitedelim}}% Not \multicitedelim ??? \newbibmacro*{textcite:postnote}{% \iffieldundef{postnote}% @@ -519,13 +673,13 @@ {\setunit{}% \printtext{% \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}}% {}}}% {\setunit{% \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}}% {}% - \multicitedelim}}} + \textcitedelim}}}% Not \multicitedelim ??? \newbibmacro*{cite:shorthand}{% \iftoggle{cms@los}% @@ -558,35 +712,40 @@ \newbibmacro*{cite:label}{% Test this \iffieldundef{label}% {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT% - \iffieldequalstr{entrytype}{periodical}}% Simplifies .bib creation + \ifentrytype{periodical}}% Simplifies .bib creation {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}}}% - {\iffieldequalstr{entrytype}{manual}% + {\ifentrytype{manual}% {\printtext[bibhyperref]{\printlist{organization}}}% {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}}}% {\printtext[bibhyperref]{\printfield{label}}}} \newbibmacro*{cite:labelyear+extrayear}{% \ifboolexpr{ ( - test {\iffieldequalstr{entrytype}{music}}% + test {\ifentrytype{music}}% or - test {\iffieldequalstr{entrytype}{review}}% + test {\ifentrytype{review}}% or - test {\iffieldequalstr{entrytype}{video}}% + test {\ifentrytype{video}}% ) and - togl {cms@avdate} + togl {cms@avdate}% }% {\usebibmacro{cite:av+labelyear+extrayear}}% - {\usebibmacro{cite:standard+labelyear+extrayear}}} + {\iftoggle{cms@ordate}% + {\usebibmacro{cite:origfirst+labelyear+extrayear}}% + {\usebibmacro{cite:standard+labelyear+extrayear}}}} \newbibmacro*{cite:standard+labelyear+extrayear}{% - \iffieldundef{labelyear} + \ifthenelse{\iffieldundef{labelyear}\OR% + \iffieldequalstr{labelyear}{nodate}}% {\ifboolexpr{ - test {\iffieldequalstr{entrytype}{misc}} + test {\ifentrytype{misc}} or - test {\iffieldequalstr{entrytype}{inreference}} + test {\ifentrytype{inreference}} or - test {\iffieldequalstr{entrytype}{reference}} + test {\ifentrytype{reference}} + or + test {\ifentrytype{mvreference}} or not togl {cms@nodates} }% @@ -637,14 +796,78 @@ {\mbox{\bibdatedash}}% {}}}}}} +\newbibmacro*{cite:origfirst+labelyear+extrayear}{% + \ifthenelse{\iffieldundef{labelyear}\OR% + \iffieldequalstr{labelyear}{nodate}}% + {\ifboolexpr{ + test {\ifentrytype{misc}} + or + test {\ifentrytype{inreference}} + or + test {\ifentrytype{reference}} + or + test {\ifentrytype{mvreference}} + or + not togl {cms@nodates} + }% + {}% + {\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS? + {\printtext[bibhyperref]{% + \iffieldundef{origyear}% + {\iffieldundef{year} + {\iffieldundef{eventyear}% + {\printfield{labelyear}% + \iffieldundef{extrayear}% + {}% + {\setunit*{}% + \printfield{extrayear}}% + \iffieldundef{urlendyear}% + {}% + {\iffieldequalstr{urlendyear}{}% + {\mbox{\bibdatedash}}% + {}}}% + {\printfield{labelyear}% + \iffieldundef{extrayear}% + {}% + {\setunit*{}% + \printfield{extrayear}}% + \iffieldundef{eventendyear}% + {}% + {\iffieldequalstr{eventendyear}{}% + {\mbox{\bibdatedash}}% + {}}}} + {\printfield{labelyear}% + \iffieldundef{extrayear}% + {}% + {\setunit*{}% + \printfield{extrayear}}% + \iffieldundef{endyear}% + {}% + {\iffieldequalstr{endyear}{}% + {\mbox{\bibdatedash}}% + {}}}} + {\printfield{labelyear}% + \iffieldundef{extrayear}% + {}% + {\setunit*{}% + \printfield{extrayear}}% + \iffieldundef{origendyear}% DATE FIX + {}% + {\iffieldequalstr{origendyear}{}% + {\mbox{\bibdatedash}}% + {}}}}}} + \newbibmacro*{cite:av+labelyear+extrayear}{% - \iffieldundef{labelyear} + \ifthenelse{\iffieldundef{labelyear}\OR% + \iffieldequalstr{labelyear}{nodate}}% {\ifboolexpr{ - test {\iffieldequalstr{entrytype}{misc}} + test {\ifentrytype{misc}} + or + test {\ifentrytype{inreference}} or - test {\iffieldequalstr{entrytype}{inreference}} + test {\ifentrytype{reference}} or - test {\iffieldequalstr{entrytype}{reference}} + test {\ifentrytype{mvreference}} or not togl {cms@nodates} }% @@ -733,28 +956,67 @@ {}} \newbibmacro*{cite:origyear+labelyear}{% - \iftoggle{cms@switchdates}% - {\usebibmacro{cite:labelyear+extrayear}} - {\iffieldundef{origyear}% - {\clearfield{extrayear}\usebibmacro{cite:labelyear+extrayear}}% - {\printtext[bibhyperref]{% - \usebibmacro{origyear+endyear}}}}} + \ifboolexpr{ ( + test {\ifentrytype{music}}% + or + test {\ifentrytype{review}}% + or + test {\ifentrytype{video}}% + ) + and + togl {cms@avdate}% + } + {\usebibmacro{cite:av+labelyear+extrayear}}% + {\iftoggle{cms@switchdates}% + {\usebibmacro{cite:labelyear+extrayear}}% + {\iffieldundef{origyear}% + {\iftoggle{cms@ordate}% ??? + {}% + {\clearfield{extrayear}}% + \usebibmacro{cite:standard+labelyear+extrayear}}% + {\iftoggle{cms@ordate}% + {\usebibmacro{cite:origfirst+labelyear+extrayear}}% + {\printtext[bibhyperref]{% + \usebibmacro{origyear+endyear}}}}}}} \newbibmacro*{cite:bothyear+oldstyle}{% - \iftoggle{cms@switchdates}% - {\printtext[bibhyperref]{% - \bibopenparen% - \usebibmacro{cite:labelyear+extrayear}% - \bibcloseparen% - \addspace\usebibmacro{origyear+endyear}}}% - {\iffieldundef{origyear}% - {\clearfield{extrayear}\usebibmacro{cite:labelyear+extrayear}}% + \ifboolexpr{ ( + test {\ifentrytype{music}}% + or + test {\ifentrytype{review}}% + or + test {\ifentrytype{video}}% + ) + and + togl {cms@avdate}% + } + {\usebibmacro{cite:av+labelyear+extrayear}}% + {\iftoggle{cms@switchdates}% {\printtext[bibhyperref]{% \bibopenparen% - \usebibmacro{origyear+endyear}% + \usebibmacro{cite:labelyear+extrayear}% \bibcloseparen% - \clearfield{extrayear}\addspace% - \usebibmacro{cite:labelyear+extrayear}}}}} + \addspace\usebibmacro{origyear+endyear}}}% + {\iffieldundef{origyear}% ??? + {\iftoggle{cms@ordate}% + {}% + {\clearfield{extrayear}}% + \usebibmacro{cite:standard+labelyear+extrayear}}% + {\iftoggle{cms@ordate}% Added test for year field ??? + {\iffieldundef{year}% + {\usebibmacro{cite:origfirst+labelyear+extrayear}}% + {\printtext[bibhyperref]{% + \bibopenparen% + \usebibmacro{cite:origfirst+labelyear+extrayear}% + \bibcloseparen% + \setunit{\addspace}%\addspace% ??? + \usebibmacro{year+endyear}}}}% + {\printtext[bibhyperref]{% + \bibopenparen% + \usebibmacro{origyear+endyear}% + \bibcloseparen% + \clearfield{extrayear}\addspace% + \usebibmacro{cite:standard+labelyear+extrayear}}}}}}} \newbibmacro*{cite:save}{% \savefield{entrykey}{\cbx@lastkey}} @@ -821,13 +1083,45 @@ {} {\usebibmacro{postnote}} -\DeclareCiteCommand{\textcite} +%%% Textcite commands taken verbatim from authoryear-comp.cbx %%% + +\DeclareCiteCommand{\cbx@textcite} {\usebibmacro{cite:init}} {\usebibmacro{citeindex}% - \usebibmacro{textcite}} + \usebibmacro{textcite}} {} {\usebibmacro{textcite:postnote}} +\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite] + {\gdef\cbx@savedkeys{}% + \citetrackerfalse% + \pagetrackerfalse% + \DeferNextCitekeyHook% + \usebibmacro{cite:init}} + {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0} + {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}% + \global\clearfield{multipostnote}} + {}% + \xappto\cbx@savedkeys{\thefield{entrykey},}% + \iffieldequals{namehash}{\cbx@lasthash} + {} + {\stepcounter{textcitetotal}% + \savefield{namehash}{\cbx@lasthash}}} + {} + {\protected@xappto\cbx@savedcites{% + [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}} + +\newrobustcmd{\cbx@textcite@init}[2]{% + \setcounter{textcitetotal}{0}% + \setcounter{textcitecount}{0}% + \def\cbx@savedcites{#1}#2\cbx@savedcites\empty} + +\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{} +\DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{} + +\let\cbx@textcites@init\cbx@textcite@init +\pretocmd{\cbx@textcites@init}{\UseNextMultiCiteHook}{}{} + \DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}} \DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}% @@ -839,11 +1133,9 @@ \DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]% {\footcitetext}{\setunit{\multicitedelim}} -\DeclareMultiCiteCommand{\textcites}{\textcite}{} - \DeclareCiteCommand{\bibxrefcite} {\usebibmacro{cite:init}}%\usebibmacro{clearalmostall}} (?) - {\usebibmacro{cms-in:}% + {\usebibmacro{xref-in:}% \blx@ibidreset% For authordate style \usebibmacro{cite}} {} @@ -923,22 +1215,34 @@ %%%% Field Formats -- Title, Citetitle, Lostitle %%%% -\DeclareFieldFormat[article]{title}{% +\DeclareFieldFormat{title}{\mkbibemph{#1}\isdot} + +\DeclareFieldFormat{citetitle}{\mkbibemph{#1}\isdot} + +\DeclareFieldFormat{lostitle}{\mkbibemph{#1}\isdot} + +\DeclareFieldFormat +[article,inbook,incollection,inproceedings,online,thesis,unpublished] +{title}{% \iffieldundef{title}% {}% {\mkbibquote{#1\isdot}}} -\DeclareFieldFormat[article]{citetitle}{% +\DeclareFieldFormat +[article,inbook,incollection,inproceedings,online,thesis,unpublished] +{citetitle}{% \iffieldundef{title}% {#1\isdot}% {\mkbibquote{#1\isdot}}} -\DeclareFieldFormat[article]{lostitle}{% +\DeclareFieldFormat +[article,inbook,incollection,inproceedings,online,thesis,unpublished] +{lostitle}{% \iffieldundef{title}% {#1\isdot}% {\mkbibquote{#1\isdot}}} -\DeclareFieldFormat[artwork]{title}{% +\DeclareFieldFormat[artwork,image]{title}{% \iffieldundef{entrysubtype}% {\mkbibemph{#1}\isdot}% {#1\isdot}} @@ -947,83 +1251,17 @@ \DeclareFieldAlias[artwork]{lostitle}[artwork]{title} -\DeclareFieldFormat[book]{title}{\mkbibemph{#1}\isdot} - -\DeclareFieldAlias[book]{citetitle}[book]{title} - -\DeclareFieldAlias[book]{lostitle}[book]{title} - -\DeclareFieldAlias[bookinbook]{title}[book]{title} - -\DeclareFieldAlias[bookinbook]{citetitle}[book]{title} - -\DeclareFieldAlias[bookinbook]{lostitle}[book]{title} - -\DeclareFieldAlias[collection]{title}[book]{title} - -\DeclareFieldAlias[collection]{citetitle}[book]{title} - -\DeclareFieldAlias[collection]{lostitle}[book]{lostitle} - -\DeclareFieldFormat[periodical]{title}{\mkbibemph{#1}\isdot} - -\DeclareFieldFormat[periodical]{citetitle}{\mkbibemph{#1}\isdot} - -\DeclareFieldFormat[periodical]{lostitle}{\mkbibemph{#1}\isdot} - -\DeclareFieldAlias[image]{title}[artwork]{title} - \DeclareFieldAlias[image]{citetitle}[artwork]{title} -\DeclareFieldAlias[image]{lostitle}[artwork]{lostitle} - -\DeclareFieldAlias[incollection]{title}[article]{title}% Change article? - -\DeclareFieldAlias[incollection]{citetitle}[article]{title} - -\DeclareFieldAlias[incollection]{lostitle}[article]{lostitle} - -\DeclareFieldAlias[inreference]{title}[book]{title} - -\DeclareFieldAlias[inreference]{citetitle}[book]{title} - -\DeclareFieldAlias[inreference]{lostitle}[book]{lostitle} - -\DeclareFieldAlias[reference]{title}[book]{title} - -\DeclareFieldAlias[reference]{citetitle}[book]{title} - -\DeclareFieldAlias[reference]{lostitle}[book]{lostitle} - -\DeclareFieldFormat[letter]{title}{#1\isdot} - -\DeclareFieldFormat[letter]{citetitle}{#1\isdot} - -\DeclareFieldFormat[letter]{lostitle}{#1\isdot} - -\DeclareFieldAlias[inproceedings]{title}[article]{title}% As above - -\DeclareFieldAlias[inproceedings]{citetitle}[article]{title} - -\DeclareFieldAlias[inproceedings]{lostitle}[article]{lostitle} - -\DeclareFieldAlias[thesis]{title}[article]{title} - -\DeclareFieldAlias[thesis]{citetitle}[article]{title} +\DeclareFieldAlias[image]{lostitle}[artwork]{title} -\DeclareFieldAlias[thesis]{lostitle}[article]{lostitle} +\DeclareFieldFormat[letter,patent]{title}{#1\isdot} -\DeclareFieldAlias[patent]{title}[letter]{lostitle}% 16th ed. +\DeclareFieldFormat[letter,patent]{citetitle}{#1\isdot} -\DeclareFieldAlias[patent]{citetitle}[letter]{title} +\DeclareFieldFormat[letter,patent]{lostitle}{#1\isdot} -\DeclareFieldAlias[patent]{lostitle}[letter]{lostitle} - -\DeclareFieldAlias[unpublished]{title}[article]{title} - -\DeclareFieldAlias[unpublished]{citetitle}[article]{citetitle} - -\DeclareFieldAlias[unpublished]{lostitle}[article]{lostitle} +\DeclareFieldFormat{prenote}{\ifcapital{\MakeCapital{#1}}{#1}} \DeclareFieldFormat{postnote}{% Removed \isdots -- required \iffieldundef{pagination}% elsewhere also? @@ -1049,17 +1287,11 @@ {\bibstring{ed#1}} {\ifcapital{\MakeCapital{#1}}{#1}}}} -\DeclareFieldAlias[inbook]{title}[article]{title} - -\DeclareFieldAlias[inbook]{citetitle}[article]{title} - -\DeclareFieldAlias[inbook]{lostitle}[article]{lostitle} - -\DeclareFieldFormat[suppbook]{title}{\mkbibemph{#1}\isdot} +\DeclareFieldFormat[suppbook,suppcollection]{title}{\mkbibemph{#1}\isdot} \DeclareFieldAlias[suppbook]{citetitle}[suppbook]{lostitle} -\DeclareFieldFormat[suppbook]{lostitle}{% +\DeclareFieldFormat[suppbook,suppcollection]{lostitle}{% \usebibmacro{inforaft}% \addspace% \mkbibemph{#1}\isdot} @@ -1080,30 +1312,8 @@ #1}% {\printfield{nameaddon}\addspace #1}}} -\DeclareFieldAlias[suppcollection]{title}[suppbook]{title} - \DeclareFieldAlias[suppcollection]{citetitle}[suppbook]{lostitle} -\DeclareFieldAlias[suppcollection]{lostitle}[suppbook]{lostitle} - -\DeclareFieldAlias[booklet]{title}[book]{title} - -\DeclareFieldAlias[booklet]{citetitle}[book]{citetitle} - -\DeclareFieldAlias[booklet]{lostitle}[book]{lostitle} - -\DeclareFieldAlias[manual]{title}[book]{title} - -\DeclareFieldAlias[manual]{citetitle}[book]{citetitle} - -\DeclareFieldAlias[manual]{lostitle}[book]{lostitle} - -\DeclareFieldAlias[report]{title}[book]{title} - -\DeclareFieldAlias[report]{citetitle}[book]{citetitle} - -\DeclareFieldAlias[report]{lostitle}[book]{lostitle} - \DeclareFieldFormat[misc]{title}{% \iffieldundef{entrysubtype}% {\mkbibemph{#1}\isdot}% @@ -1113,7 +1323,7 @@ \DeclareFieldAlias[misc]{lostitle}[misc]{title} -\DeclareFieldFormat[review]{title}{% +\DeclareFieldFormat[review,suppperiodical]{title}{% \ifcapital{\MakeCapital{#1\isdot}}% {#1\isdot}} @@ -1121,23 +1331,15 @@ \DeclareFieldAlias[review]{citetitle}[review]{title} -\DeclareFieldAlias[suppperiodical]{title}[review]{title} - \DeclareFieldAlias[suppperiodical]{citetitle}[review]{title} \DeclareFieldAlias[suppperiodical]{lostitle}[review]{title} -\DeclareFieldAlias[online]{title}[article]{title} - -\DeclareFieldAlias[online]{citetitle}[article]{citetitle} - -\DeclareFieldAlias[online]{lostitle}[article]{lostitle} - \DeclareFieldFormat{booktitle}{\mkbibemph{#1}} \DeclareFieldFormat{maintitle}{\mkbibemph{#1}} -\DeclareFieldFormat[video]{title}{% +\DeclareFieldFormat[audio,music,video]{title}{% \iffieldundef{booktitle}% {\mkbibemph{#1}\isdot}% {\mkbibquote{#1\isdot}}} @@ -1146,17 +1348,13 @@ \DeclareFieldAlias[video]{lostitle}[video]{title} -\DeclareFieldAlias[music]{title}[video]{title} - -\DeclareFieldAlias[music]{citetitle}[video]{citetitle} - -\DeclareFieldAlias[music]{lostitle}[video]{lostitle} +\DeclareFieldAlias[music]{citetitle}[music]{title} -\DeclareFieldAlias[audio]{title}[video]{title} +\DeclareFieldAlias[music]{lostitle}[music]{title} -\DeclareFieldAlias[audio]{citetitle}[video]{citetitle} +\DeclareFieldAlias[audio]{citetitle}[audio]{title} -\DeclareFieldAlias[audio]{lostitle}[video]{lostitle} +\DeclareFieldAlias[audio]{lostitle}[audio]{title} %%%% Other Field Formats %%%% @@ -1167,36 +1365,20 @@ \DeclareFieldFormat{note}{% \ifcapital{\MakeCapital{#1}}{#1}}% -\DeclareFieldFormat[suppbook]{type}{% +\DeclareFieldFormat +[audio,manual,music.patent,report,suppbook,suppcollection,thesis,video] +{type}{% \ifbibstring{#1}% {\bibstring{#1}}% {\ifcapital% {\MakeCapital{#1\isdot}}% {#1\isdot}}} -\DeclareFieldFormat[artwork]{type}{% +\DeclareFieldFormat[artwork,image]{type}{% \ifcapital% {\MakeCapital{#1}}% {#1}} -\DeclareFieldAlias[patent]{type}[suppbook]{type} - -\DeclareFieldAlias[manual]{type}[suppbook]{type} - -\DeclareFieldAlias[thesis]{type}[suppbook]{type} - -\DeclareFieldAlias[report]{type}[suppbook]{type} - -\DeclareFieldAlias[image]{type}[artwork]{type} - -\DeclareFieldAlias[suppcollection]{type}[suppbook]{type} - -\DeclareFieldAlias[video]{type}[suppbook]{type} - -\DeclareFieldAlias[music]{type}[suppbook]{type} - -\DeclareFieldAlias[audio]{type}[suppbook]{type} - \DeclareFieldFormat{url}{\url{#1}} \DeclareFieldFormat{doi}{% @@ -1205,6 +1387,26 @@ {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}} {\nolinkurl{#1}}} +\DeclareFieldFormat[music]{date}{% Generalize userd ??? + \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}% + \OR\NOT\iffieldundef{eventyear}\OR\NOT\iffieldundef{origyear}% + \OR\NOT\iffieldundef{urlmonth}\OR\NOT\iffieldundef{eventmonth}% + \OR\NOT\iffieldundef{origmonth}}% + {#1}% + {\printfield{userd}\addspace #1}} + +\DeclareFieldFormat[video]{date}{% Generalize userd ??? + \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}% + \OR\NOT\iffieldundef{eventyear}\OR\NOT\iffieldundef{urlmonth}% + \OR\NOT\iffieldundef{eventmonth}}% + {#1}% + {\printfield{userd}\addspace #1}} + +\DeclareFieldFormat{date}{% Generalize userd ??? + \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}}% + {#1}% + {\printfield{userd}\addspace #1}} + \DeclareFieldFormat{urldate}{% 16th ed. \iffieldundef{userd}% {\bibstring{urlseen}\space #1}% @@ -1251,7 +1453,7 @@ \DeclareFieldFormat{edition}{% New in 0.8 \ifinteger{#1} - {\mkbibordinal{#1}~\bibstring{edition}}% + {\mkbibordedition{#1}~\bibstring{edition}}% {\ifcapital {\MakeCapital{#1\isdot}}% {#1\isdot}}} @@ -1269,7 +1471,7 @@ \DeclareFieldFormat{jourser}{% \ifinteger{#1}% - {\mkbibordinal{#1}% + {\mkbibordseries{#1}% \addnbspace% \bibstring{jourser}}% {\ifbibstring{#1}{\bibstring{#1}}{#1}}} @@ -1296,7 +1498,10 @@ \DeclareFieldFormat{annotation}{\par\nobreak \vskip \bibitemsep #1} -\DeclareFieldFormat{part}{\addcomma\bibstring{partvolume}~#1} +\DeclareFieldFormat{part}{% + \ifnumerals{#1}% + {\addcomma\addspace\bibstring{partvolume}~#1}% + {\addcomma\addspace\ifcapital{\MakeCapital{#1}}{#1}}} \DeclareFieldAlias[review]{volume}[article]{volume} @@ -1311,6 +1516,9 @@ \renewcommand*{\multicitedelim}{\addsemicolon\space} +\renewcommand*{\iffinalcitedelim}{% + \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}} + \renewcommand*{\nameyeardelim}{% \iffieldundef{origyear}% Is this test correct? {\iffieldundef{year}% @@ -1326,10 +1534,12 @@ \newcommand{\classicpunct}{% \ifthenelse{\iffieldequalstr{entrysubtype}{classical}\OR% - \iffieldequalstr{entrytype}{letter}}% + \ifentrytype{letter}}% {\setunit*{\addspace}}% {\setunit*{\addcomma\addspace}}} +\newcommand{\postvolpunct}{\addcolon}% + \newcommand{\parttrans}{% {\bibstring{bytranslator}\space}}% @@ -1375,7 +1585,10 @@ \renewcommand*{\postnotedelim}{% \iftoggle{cms@inlineibid}% - {\togglefalse{cms@inlineibid}}% + {\togglefalse{cms@inlineibid}% + \iffieldundef{prenote}% Bug fix + {}% + {\addspace}}% {\iffieldequalstr{entrysubtype}{classical}% For Notes+Bib, too? {\NumCheckSetup{\DeclareNumChars*{abcdeABCDE}}% \iffieldpages{postnote}% @@ -1480,7 +1693,7 @@ \iffieldundef{maintitle}\AND\iffieldundef{issuetitle}\)% \OR\iffieldsequal{booktitle}{title}% Changed these for crossrefed \OR\iffieldsequal{maintitle}{title}}% entries. Create problems? - {\iffieldequalstr{entrytype}{video}% + {\ifentrytype{video}% {\newcunit\newblock}% {\newunit\newblock}}% {\newcunit\newblock}} @@ -1769,11 +1982,10 @@ {\bibstring{in}% \setunit{\addspace}}} -\newbibmacro*{alt-in:}{% - \iffieldundef{booktitle}% - {} - {\bibstring{in}% - \setunit{\addspace}}} +\newbibmacro*{xref-in:}{% + \iffieldundef{volume}{}{\savefield{volume}{\cbx@incollvol}}% + \iffieldundef{part}{}{\savefield{part}{\cbx@incollpart}}% + \usebibmacro{cms-in:}} \newbibmacro*{chapincoll}{% \iffieldundef{chapter}% @@ -1782,7 +1994,7 @@ \newbibmacro*{chapinscore}{% \iffieldundef{chapter}% - {\ifthenelse{\iffieldequalstr{entrytype}{music}% + {\ifthenelse{\ifentrytype{music}% \AND\NOT\iffieldundef{booktitle}}% {\bibstring{on}\setunit{\addspace}}% {}}% @@ -1860,9 +2072,9 @@ \newbibmacro*{issuetitle}{% \iffieldundef{issuetitle}% {} - {\ifthenelse{\iffieldequalstr{entrytype}{article}\OR% - \iffieldequalstr{entrytype}{review}\OR% - \iffieldequalstr{entrytype}{suppperiodical}}% This test is for + {\ifthenelse{\ifentrytype{article}\OR% + \ifentrytype{review}\OR% + \ifentrytype{suppperiodical}}% This test is for {\usebibmacro{cms-in:}}% periodical entries {}% \printtext[issuetitle]{% @@ -1870,16 +2082,6 @@ \setunit{\addcolon\addspace}% \printfield[noformat]{issuesubtitle}}}} -\newbibmacro*{btitle+bstitle}{% - \iffieldundef{booktitle} - {} - {\printtext{% - \printfield{booktitle}% - \setunit{\addcolon\addspace}% - \printfield[booktitle]{booksubtitle}}% - \newcunit - \printfield{booktitleaddon}}} - \newbibmacro*{publ+loc+year}{% \printlist{location}% \iflistundef{publisher}% @@ -2041,32 +2243,6 @@ \mkbibmonth{\thefield{origmonth}}\setunit{\nobreakspace}% \printfield{origyear}}}}}% -\newbibmacro*{cjournal+ser+vol+num}{% - \usebibmacro{journal+sub}% - \setunit*{\addspace}% - \printlist[periodplace]{location}% - \setunit*{\addspace}% - \iffieldundef{series} - {} - {\newcunit - \printfield[jourser]{series}% - \newcunit}%\setunit*{\addspace}? - \ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}% - {\iffieldundef{volume}% - {\newcunit% - \printfield[journum]{number}% - \clearfield{number}% - \setunit{\addcomma\addspace}} - {\printfield[jourvol]{volume}% - \setunit{\addcomma\addspace}}}% - {\printfield[jourvol]{volume}% - \newcunit% - \printfield[journum]{number}% - \clearfield{number}% - \setunit{\addcomma\addspace}}% need * here? - \printfield{eid}% - \newunit} - \newbibmacro*{cperiodical+ser+vol+num}{% For periodical entries, \printtext[title]{% article subtype \printfield[noformat]{title}% @@ -2153,52 +2329,6 @@ \newcunit\newblock \usebibmacro{date+issue}} -\newbibmacro*{cmtitle+mstitle+vol+part+title+stitle}{% - \iffieldundef{maintitle} - {} - {\iffieldundef{volume} - {\printtext{% - \printfield{maintitle}% - \setunit{\addcolon\addspace}% - \printfield[maintitle]{mainsubtitle}}% - \newcunit - \printfield{maintitleaddon}} - {\printfield{volume}% - \printfield{part}% - \setunit{\addspace} - \bibstring{ofseries}% - \setunit{\addspace} - \printtext{% - \printfield{maintitle}% - \setunit{\addcolon\addspace}% - \printfield[maintitle]{mainsubtitle}}% - \newcunit - \printfield{maintitleaddon}}}} - -\newbibmacro*{cmtitle+mstitle+vol+part+btitle+bstitle}{% - \usebibmacro{btitle+bstitle}% - \newcunit - \iffieldundef{maintitle} - {} - {\iffieldundef{volume} - {\printtext{% - \printfield{maintitle}% - \setunit{\addcolon\addspace}% - \printfield[maintitle]{mainsubtitle}}% - \newcunit - \printfield{maintitleaddon}} - {\printfield{volume}% - \printfield{part}% - \setunit{\addspace} - \bibstring{ofseries}% - \setunit{\addspace} - \printtext{% - \printfield{maintitle}% - \setunit{\addcolon\addspace}% - \printfield[maintitle]{mainsubtitle}}% - \newcunit - \printfield{maintitleaddon}}}} - \renewbibmacro*{postnote}{% \iffieldundef{postnote}% {}% @@ -2318,9 +2448,13 @@ \clearname{namea}% \clearname{nameb}% \clearfield{nameaddon}% - \clearfield{title}% - \clearfield{subtitle}% - \clearfield{titleaddon}% + \ifthenelse{\ifentrytype{periodical}\OR\ifentrytype{mvbook}\OR% + \ifentrytype{mvcollection}\OR\ifentrytype{mvproceedings}\OR% + \ifentrytype{mvreference}}% + {}% + {\clearfield{title}% + \clearfield{subtitle}% + \clearfield{titleaddon}}% \clearfield{reprinttitle}% \clearfield{usere}% \clearlist{language}% 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 15b959db4ff..7364ef99492 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.16 2012/12/06 12:17:19 dfussner Exp $ +% $Id: chicago-authordate15.bbx,v 0.8.1.17 2013/10/21 14:51:44 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} -[2012/12/06 v 2.4 biblatex bibliography style] +[2013/10/21 v 2.8 biblatex bibliography style] %%%% Initialize and format bibliography and los %%%% @@ -2107,7 +2107,8 @@ {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}}}% \newbibmacro*{labelyear+extrayear}{% - \iffieldundef{labelyear}% + \ifthenelse{\iffieldundef{labelyear}\OR% + \iffieldequalstr{labelyear}{nodate}}% {\ifboolexpr{ test {\iffieldequalstr{entrytype}{misc}} or 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 390c0b9d176..318c5f68121 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.20 2012/12/06 12:16:45 dfussner Exp $ +% $Id: chicago-authordate15.cbx,v 0.8.1.21 2013/10/21 14:51:16 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} -[2012/12/06 v 2.4 biblatex citation style] +[2013/10/21 v 2.8 biblatex citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -155,6 +155,69 @@ \ExecuteBibliographyOptions{includeall}% +%% From 16th ed. %% + +\@ifpackagelater{biblatex}{2013/03/30}% For biblatex 2.6 ff. +{\ExecuteBibliographyOptions{labeldate=true}}% +{\ExecuteBibliographyOptions{labelyear=true}}% + +\DeclareDataInheritance{collection}{suppcollection}{% + \inherit{title}{title} + \inherit{subtitle}{subtitle} + \inherit{titleaddon}{titleaddon}} + +\DeclareDataInheritance{mvbook}{incollection}{% ??? + \inherit{title}{maintitle} + \inherit{subtitle}{mainsubtitle} + \inherit{titleaddon}{maintitleaddon} + \noinherit{shorttitle} + \noinherit{sorttitle} + \noinherit{indextitle} + \noinherit{indexsorttitle} +} + +\DeclareDataInheritance{book,collection}{letter}{% ??? + \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} + \inherit{titleaddon}{maintitleaddon} + \noinherit{shorttitle} + \noinherit{sorttitle} + \noinherit{indextitle} + \noinherit{indexsorttitle} +} + +\DeclareDataInheritance{*}{*}{% + \noinherit{namea} + \noinherit{nameb} + \noinherit{sortyear} + \noinherit{sortname} + \noinherit{sorttitle}} + +\DeclareDataInheritance{mvbook,mvcollection,mvproceedings,mvreference}% +{*}{% ??? + \noinherit{year} + \noinherit{month} + \noinherit{day} + \noinherit{endyear} + \noinherit{endmonth} + \noinherit{endday} + \noinherit{origyear} + \noinherit{origmonth} + \noinherit{origday} + \noinherit{origendyear} + \noinherit{origendmonth} + \noinherit{origendday}} + % More authordate options % \DeclareSortingScheme{cms}{ @@ -536,7 +599,8 @@ {\printtext[bibhyperref]{\printfield{label}}}} \newbibmacro*{cite:labelyear+extrayear}{% - \iffieldundef{labelyear} + \ifthenelse{\iffieldundef{labelyear}\OR% + \iffieldequalstr{labelyear}{nodate}}% {\ifboolexpr{ test {\iffieldequalstr{entrytype}{misc}} or @@ -1155,7 +1219,7 @@ \DeclareFieldFormat{annotation}{\par\nobreak \vskip \bibitemsep #1} -\DeclareFieldFormat{part}{\addcomma\bibstring{partvolume}~#1} +\DeclareFieldFormat{part}{\addcomma\addspace\bibstring{partvolume}~#1} \DeclareFieldAlias[review]{volume}[article]{volume} 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 307197f8141..a9f4d864a7d 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.34 2013/03/12 12:07:20 dfussner Exp $ +% $Id: chicago-notes.bbx,v 0.9.7.50 2013/10/29 12:32:21 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/03/12 v 2.5 biblatex bibliography style] +\ProvidesFile{chicago-notes.bbx}[2013/10/29 v 2.8 biblatex bibliography style] %%%% Initialize and format bibliography and los %%%% @@ -364,10 +364,10 @@ \finentry}% {\ifnameundef{labelname}% {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT% - \iffieldequalstr{entrytype}{periodical}}% + \ifentrytype{periodical}}% {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}% \newcunit}}% - {\iffieldequalstr{entrytype}{manual}% + {\ifentrytype{manual}% {\printtext[bibhyperref]{\printlist{organization}\newcunit}}% {}}}% {\usebibmacro{author/editor}% @@ -505,7 +505,7 @@ \newunit% ??? Editorpunct maybe not right here? \iffieldundef{maintitle} {} - {\iffieldundef{volume} + {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}% {\usebibmacro{cms-in:}% \printtext[maintitle]{% \printfield[noformat]{maintitle}% @@ -559,6 +559,8 @@ \printfield{nameaddon}% \newunit\newblock \usebibmacro{italtitle+stitle}% + \setunit{\addspace}% + \usebibmacro{bib:xref+date}% \newunit\newblock \iffieldundef{maintitle}% {\iffieldundef{edition}% @@ -566,11 +568,21 @@ {\usebibmacro{edition}}}% {}% \newunit\newblock% 16th ed. - \usebibmacro{byauthor} + \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{part+editor+translator}% \newunit\newblock - \usebibmacro{mtitle+mstitle+vol+part+title+stitle}% + \ifboolexpr{% + test {\iffieldundef{crossref}}% + or + togl {cms@bookbibxref}% + }% + {\ifboolexpr{% + test {\iffieldundef{xref}}% + or + togl {cms@bookbibxref}% + }% + {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}% \newcunit \iffieldundef{edition}% {}% @@ -606,7 +618,17 @@ \usebibmacro{pageref}% \newunit\newblock \usebibmacro{originally+published+as}% - \usebibmacro{finentry}} + \usebibmacro{finentry}}% +{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \usebibmacro{xrefprenote}% Volume fix + \bookbibxrefcite{\thefield{xref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}}% +{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \usebibmacro{xrefprenote}% Volume fix + \bookbibxrefcite{\thefield{crossref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}} \DeclareBibliographyDriver{bookinbook}{% \usebibmacro{bibindex}% @@ -615,6 +637,8 @@ \printfield{nameaddon}% \newunit\newblock \usebibmacro{italtitle+stitle}% + \setunit{\addspace}% + \usebibmacro{bib:xref+date}% \newunit\newblock \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}% {\iffieldundef{edition}% @@ -626,8 +650,17 @@ \newunit\newblock \usebibmacro{part+editor+translator}% \setunit*{\addperiod\addspace}% - \usebibmacro{cms-in:}% - \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}% + \ifboolexpr{ + test {\iffieldundef{crossref}}% + or + togl {cms@bookbibxref}% + } + {\ifboolexpr{ + test {\iffieldundef{xref}}% + or + togl {cms@bookbibxref}% + } + {\usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}% \newcunit \iffieldundef{edition}% {}% @@ -660,7 +693,17 @@ \usebibmacro{pageref}% \newunit\newblock \usebibmacro{originally+published+as}% - \usebibmacro{finentry}} + \usebibmacro{finentry}}% +{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \usebibmacro{xrefprenote}% Volume fix + \bookbibxrefcite{\thefield{xref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}}% +{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \usebibmacro{xrefprenote}% Volume fix + \bookbibxrefcite{\thefield{crossref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}} \DeclareBibliographyDriver{booklet}{% \usebibmacro{bibindex}% @@ -694,8 +737,20 @@ \printfield{nameaddon}% \newunit\newblock \usebibmacro{italtitle+stitle}% + \setunit{\addspace}% + \usebibmacro{bib:xref+date}% \newunit\newblock - \usebibmacro{mtitle+mstitle+vol+part+title+stitle}% + \ifboolexpr{% + test {\iffieldundef{crossref}}% + or + togl {cms@bookbibxref}% + }% + {\ifboolexpr{% + test {\iffieldundef{xref}}% + or + togl {cms@bookbibxref}% + }% + {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}% \usebibmacro{editorpunct}% \iffieldundef{edition}% {}% @@ -724,7 +779,17 @@ \usebibmacro{pageref}% \newunit\newblock \usebibmacro{originally+published+as}% - \usebibmacro{finentry}} + \usebibmacro{finentry}}% +{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \usebibmacro{xrefprenote}% Volume fix + \bookbibxrefcite{\thefield{xref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}}% +{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \usebibmacro{xrefprenote}% Volume fix + \bookbibxrefcite{\thefield{crossref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}} \DeclareBibliographyDriver{customc}{% \usebibmacro{bibindex}% @@ -783,9 +848,18 @@ \usebibmacro{byauthor}% \setunit{\addperiod\addspace}% \usebibmacro{part+editor+translator}% - \setunit{\addperiod\addspace}% + \ifboolexpr{ + test {\iffieldundef{crossref}}% + or + togl {cms@bibcrossref}% + } + {\ifboolexpr{ + test {\iffieldundef{xref}}% + or + togl {cms@bibcrossref}% + } + {\setunit{\addperiod\addspace}% \usebibmacro{chapincoll}% - \usebibmacro{cms-in:}% \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}% \newcunit \iffieldundef{edition}% @@ -817,6 +891,18 @@ \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% +{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \usebibmacro{xrefprenote}% Volume fix + \usebibmacro{chapincoll}% + \bibxrefcite{\thefield{xref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}}% +{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \usebibmacro{xrefprenote}% Volume fix + \usebibmacro{chapincoll}% + \bibxrefcite{\thefield{crossref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}} \DeclareBibliographyDriver{incollection}{% \usebibmacro{bibindex}% @@ -831,11 +917,18 @@ \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{part+editor+translator}% - \iffieldundef{crossref}% - {\iffieldundef{xref}% + \ifboolexpr{ + test {\iffieldundef{crossref}}% + or + togl {cms@bibcrossref}% + } + {\ifboolexpr{ + test {\iffieldundef{xref}}% + or + togl {cms@bibcrossref}% + } {\newunit\newblock \usebibmacro{chapincoll}% - \usebibmacro{cms-in:}% \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}% \newcunit \iffieldundef{edition}% @@ -893,11 +986,18 @@ \usebibmacro{byauthor}% \setunit{\addperiod\addspace}% \usebibmacro{part+editor+translator}% - \iffieldundef{crossref}% - {\iffieldundef{xref}% + \ifboolexpr{ + test {\iffieldundef{crossref}}% + or + togl {cms@bibcrossref}% + } + {\ifboolexpr{ + test {\iffieldundef{xref}}% + or + togl {cms@bibcrossref}% + } {\setunit{\addperiod\addspace}% - \usebibmacro{chapincoll}% - \usebibmacro{cms-in:}% + \usebibmacro{chapincoll}% \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}% \newcunit\newblock \usebibmacro{volume+pages}% @@ -945,7 +1045,6 @@ \newunit\newblock \usebibmacro{part+editor+translator}% \setunit*{\addperiod\addspace}% need asterisk? - \usebibmacro{alt-in:}% \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}% \newcunit \iffieldundef{edition}% @@ -1007,10 +1106,17 @@ \newunit\newblock%\bibsentence \usebibmacro{part+editor+translator}% \setunit*{\addperiod\addspace}% - \iffieldundef{crossref}% - {\iffieldundef{xref}% + \ifboolexpr{ + test {\iffieldundef{crossref}}% + or + togl {cms@bibcrossref}% + } + {\ifboolexpr{ + test {\iffieldundef{xref}}% + or + togl {cms@bibcrossref}% + } {\usebibmacro{chapincoll}% - \usebibmacro{cms-in:}% \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}% \newcunit \iffieldundef{edition}% @@ -1165,7 +1271,7 @@ \newunit% ??? Editorpunct maybe not right here? \iffieldundef{maintitle} {} - {\iffieldundef{volume} + {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}% {\usebibmacro{cms-in:}% \printtext[maintitle]{% \printfield[noformat]{maintitle}% @@ -1222,6 +1328,14 @@ \usebibmacro{originally+published+as}% \usebibmacro{finentry}} +\DeclareBibliographyAlias{mvbook}{book} + +\DeclareBibliographyAlias{mvcollection}{collection} + +\DeclareBibliographyAlias{mvproceedings}{proceedings} + +\DeclareBibliographyAlias{mvreference}{reference} + \DeclareBibliographyDriver{online}{% \usebibmacro{bibindex}% \usebibmacro{author/editor}% @@ -1368,8 +1482,20 @@ \printfield{nameaddon}% \newunit\newblock \usebibmacro{italtitle+stitle}% + \setunit{\addspace}% + \usebibmacro{bib:xref+date}% \newunit\newblock - \usebibmacro{mtitle+mstitle+vol+part+title+stitle}% + \ifboolexpr{% + test {\iffieldundef{crossref}}% + or + togl {cms@bookbibxref}% + }% + {\ifboolexpr{% + test {\iffieldundef{xref}}% + or + togl {cms@bookbibxref}% + }% + {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}% \newunit\newblock \usebibmacro{volume+or+volumes}% \newunit\newblock @@ -1390,7 +1516,17 @@ \usebibmacro{pageref}% \newunit\newblock \usebibmacro{originally+published+as}% - \usebibmacro{finentry}} + \usebibmacro{finentry}}% +{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \usebibmacro{xrefprenote}% Volume fix + \bookbibxrefcite{\thefield{xref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}}% +{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \usebibmacro{xrefprenote}% Volume fix + \bookbibxrefcite{\thefield{crossref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}} \DeclareBibliographyDriver{reference}{% \usebibmacro{bibindex}% @@ -1404,7 +1540,6 @@ \newunit\newblock \usebibmacro{part+editor+translator}% \setunit*{\addperiod\addspace}% need asterisk? - \usebibmacro{alt-in:}% \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}% \newcunit \iffieldundef{edition}% @@ -1610,6 +1745,8 @@ \newunit%usebibmacro{byauthorpunct}% Why does this work? No idea. \usebibmacro{byauthor}% Same in thesis type, as well. 16th ed. \setunit{\addperiod\addspace}% + \usebibmacro{byeditor+others}% + \newunit\newblock% \printfield{howpublished}% \setunit*{\addcomma\addspace}\newblock% \printfield{note}% @@ -1662,7 +1799,7 @@ \newunit% ??? Editorpunct maybe not right here? \iffieldundef{maintitle} {} - {\iffieldundef{volume} + {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}% {\usebibmacro{cms-in:}% \printtext[maintitle]{% \printfield[noformat]{maintitle}% @@ -1736,19 +1873,69 @@ {\printfield{url}}% {}}% -\newbibmacro*{volume+pages}{% Volume fix - \iffieldundef{maintitle}% - {\iffieldundef{volume}% +\newbibmacro{bib:xref+date}{% Experiment for xrefs + \ifboolexpr{ + togl {cms@omitxrefdate}% + or + togl {cms@bookbibxref}% + or + test {\iffieldundef{crossref}}% + or + test {\iffieldundef{maintitle}}% + or + (( + test {\iffieldundef{year}}% + or + togl {cms@switchdates}% + ) + and + (test {\iffieldundef{origyear}}% + or + not togl {cms@switchdates}% + )) + } + {\ifboolexpr{ + togl {cms@omitxrefdate}% + or + togl {cms@bookbibxref}% + or + test {\iffieldundef{xref}}% + or + test {\iffieldundef{maintitle}}% + or + (( + test {\iffieldundef{year}}% + or + togl {cms@switchdates}% + ) + and + (test {\iffieldundef{origyear}}% + or + not togl {cms@switchdates}% + )) + } + {}% + {\printtext[parens]{\usebibmacro{date}}}}% + {\printtext[parens]{\usebibmacro{date}}}} + +\newbibmacro*{volume+pages}{% Volume fix (modified) + \ifboolexpr{ + test {\iffieldundef{maintitle}}% + or + togl {cms@vol}% + }% + {\global\togglefalse{cms@vol}% + \ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}% {\printfield{pages}% \newunit% \printfield{volumes}}% {\iffieldundef{part}% {\iffieldundef{pages}% - {}% + {\printfield{volume}}% Still print this w/o part or pages??? {\ifthenelse{\iffieldnums{pages}\AND% - \iffieldundef{bookpagination}}% + \iffieldundef{bookpagination}\AND\iffieldnums{volume}}% {\printfield[default]{volume}% - \addcolon% + \postvolpunct% \printfield{pages}}% {\printfield{volume}% \addcomma\addspace% @@ -1757,14 +1944,24 @@ \printfield{part}% \newcunit% \printfield{pages}}}}% - {\printfield{pages}% - \newunit% - \printfield{volumes}}}% + {\ifboolexpr{ + togl {cms@hidevolumes}% + and + ( + not test {\iffieldundef{volume}}% + or + not test {\iffieldundef{part}}% + ) + }% + {\printfield{pages}}% + {\printfield{pages}% + \newunit% + \printfield{volumes}}}}% \newbibmacro*{mtitle+mstitle+vol+part+title+stitle}{% \iffieldundef{maintitle} {} - {\iffieldundef{volume} + {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}% {\usebibmacro{cms-in:}% 16th ed (Also 15th?) \printtext[maintitle]{% \printfield[noformat]{maintitle}% @@ -1786,19 +1983,18 @@ \newbibmacro*{mtitle+mstitle+vol+part+btitle+bstitle}{% \usebibmacro{btitle+bstitle}% - \iffieldundef{booktitle} - {\setunit{\addperiod\addspace}}% Fix customc? - {\setunit{\addcomma\addspace}}% \iffieldundef{maintitle} {}% - {\iffieldundef{volume} + {\ifthenelse{\(\iffieldundef{volume}\AND\iffieldundef{part}\)\OR% + \(\iffieldundef{booktitle}\AND\NOT\ifentrytype{bookinbook}\)}% ??? {\usebibmacro{cms-in:}% 16th ed (also 15th?) \printtext[maintitle]{% \printfield[noformat]{maintitle}% \setunit{\addcolon\addspace}% \printfield[noformat]{mainsubtitle}}% \newcunit - \printfield{maintitleaddon}} + \printfield{maintitleaddon}% + \toggletrue{cms@vol}}% InIn fix {\printfield{volume}% \printfield{part}% \setunit{\addspace} @@ -1822,7 +2018,7 @@ }% {\iffieldundef{number}% {\iffieldundef{bookpagination}% - {\setunit{\addcolon}}% + {\setunit{\postvolpunct}}% {\setunit{\addcolon\addspace}}% \printfield{pages}}% {\newcunit\printfield{pages}}}% @@ -1847,7 +2043,7 @@ }% {\iffieldundef{number}% {\iffieldundef{bookpagination}% - {\setunit{\addcolon}}% + {\setunit{\postvolpunct}}% {\setunit{\addcolon\addspace}}% \printfield{pages}}% {\newcunit\printfield{pages}}}% 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 a1095a10057..9b41305c2eb 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.55 2013/03/12 12:07:30 dfussner Exp $ +% $Id: chicago-notes.cbx,v 0.9.7.87 2013/10/29 12:32:14 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}[2013/03/12 v 2.5 biblatex citation style] +\ProvidesFile{chicago-notes.cbx}[2013/10/29 v 2.8 biblatex citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -23,6 +23,7 @@ \providetoggle{cms@isbn} \providetoggle{cms@numbermonth} \providetoggle{cms@bookpages} +\providetoggle{cms@hidevolumes}% Modify volume fix \providetoggle{cms@bookseries} \providetoggle{cms@notefield} \providetoggle{cms@addendum} @@ -40,6 +41,16 @@ \providetoggle{cms@loccit} \providetoggle{cms@annotation} \providetoggle{cms@postposit} +\providetoggle{cms@vol} +\providetoggle{cms@postvol} +\providetoggle{cms@usedvol} +\providetoggle{cms@citecrossref} +\providetoggle{cms@bibcrossref} +\providetoggle{cms@bookcitexref} +\providetoggle{cms@bookbibxref} +\providetoggle{cms@xrefvol} +\providetoggle{cms@xrefpart} +\providetoggle{cms@omitxrefdate} \AtEveryCitekey{% \iffieldundef{userc}% @@ -59,7 +70,11 @@ 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}}% {}}% @@ -94,6 +109,67 @@ \DeclareEntryOption{juniorcomma}[true]{% \settoggle{cms@jrcomma}{#1}} +\DeclareBibliographyOption{delayvolume}[true]{% + \settoggle{cms@postvol}{#1}} + +\DeclareEntryOption{delayvolume}[true]{% + \settoggle{cms@postvol}{#1}} + +\DeclareBibliographyOption{longcrossref}[false]{% + \ifcsdef{cms@opt@lxref@#1}% + {\csuse{cms@opt@lxref@#1}} + {\blx@err@invopt{longcrossref=#1}{}}} +\def\cms@opt@lxref@none{% + \togglefalse{cms@citecrossref}% + \togglefalse{cms@bibcrossref}% + \togglefalse{cms@bookcitexref}% + \togglefalse{cms@bookbibxref}} +\def\cms@opt@lxref@true{% + \toggletrue{cms@citecrossref}% + \toggletrue{cms@bibcrossref}}% +\def\cms@opt@lxref@false{% + \togglefalse{cms@citecrossref}% + \togglefalse{cms@bibcrossref}}% +\def\cms@opt@lxref@notes{% + \toggletrue{cms@citecrossref}% + \togglefalse{cms@bibcrossref}}% +\def\cms@opt@lxref@bib{% + \togglefalse{cms@citecrossref}% + \toggletrue{cms@bibcrossref}}% + +\DeclareEntryOption{longcrossref}[false]{% + \ifcsdef{cms@opt@doi@#1}% + {\csuse{cms@opt@doi@#1}} + {\blx@err@invopt{doi=#1}{}}} + +\DeclareBibliographyOption{booklongxref}[true]{% + \ifcsdef{cms@opt@bklxref@#1}% + {\csuse{cms@opt@bklxref@#1}} + {\blx@err@invopt{booklongxref=#1}{}}}% +\def\cms@opt@bklxref@true{% + \toggletrue{cms@bookcitexref}% + \toggletrue{cms@bookbibxref}}% +\def\cms@opt@bklxref@false{% + \togglefalse{cms@bookcitexref}% + \togglefalse{cms@bookbibxref}}% +\def\cms@opt@bklxref@notes{% + \toggletrue{cms@bookcitexref}% + \togglefalse{cms@bookbibxref}}% +\def\cms@opt@bklxref@bib{% + \togglefalse{cms@bookcitexref}% + \toggletrue{cms@bookbibxref}}% + +\DeclareEntryOption{booklongxref}[true]{% + \ifcsdef{cms@opt@bklxref@#1}% + {\csuse{cms@opt@bklxref@#1}} + {\blx@err@invopt{booklongxref=#1}{}}}% + +\DeclareBibliographyOption{omitxrefdate}[true]{% + \settoggle{cms@omitxrefdate}{#1}} + +\DeclareEntryOption{omitxrefdate}[true]{% + \settoggle{cms@omitxrefdate}{#1}} + % The field-exclusion options % \DeclareBibliographyOption{isbn}[true]{% @@ -123,6 +199,8 @@ \settoggle{cms@eprint}{#1}% \settoggle{cms@numbermonth}{#1}% \settoggle{cms@bookpages}{#1}} +\DeclareBibliographyOption{hidevolumes}[true]{% + \settoggle{cms@hidevolumes}{#1}} \DeclareBibliographyOption{addendum}[true]{% \settoggle{cms@addendum}{#1}} @@ -155,6 +233,8 @@ \settoggle{cms@numbermonth}{#1}} \DeclareEntryOption{bookpages}[true]{% \settoggle{cms@bookpages}{#1}} +\DeclareEntryOption{hidevolumes}[true]{% + \settoggle{cms@hidevolumes}{#1}} \DeclareEntryOption{addendum}[true]{% \settoggle{cms@addendum}{#1}} @@ -163,7 +243,7 @@ \DeclareEntryOption{notefield}[true]{% \settoggle{cms@notefield}{#1}} -\ExecuteBibliographyOptions{includeall,completenotes} +\ExecuteBibliographyOptions{includeall,completenotes,hidevolumes,booklongxref} % For author-date compatibility % @@ -172,6 +252,8 @@ \DeclareEntryOption{cmsdate}{}% +\DeclareBibliographyOption{cmsdate}{}% + \DeclareBibliographyOption{strict}[true]{% \let\splitfootnoterule\footnoterule \renewcommand\footnoterule{}% @@ -213,7 +295,6 @@ % American-specific punctuation change for 16th edition % \DefineBibliographyExtras{american}{% -% \DeclareCapitalPunctuation{.}% \DeclarePunctuationPairs{comma}{*!?}} %%%% Initialize and define bibstrings %%%% @@ -258,57 +339,22 @@ \usebibmacro{cite:full}% \usebibmacro{cite:save}}}}% -\newbibmacro*{crosscite}{% - \ifciteseen - {\iffieldundef{shorthand} - {\ifthenelse{\iffieldequals{entrykey}{\cbx@lastkey}\AND - \NOT\iffirstonpage} - {\usebibmacro{cite:ibid}}% - {\global\toggletrue{cms@shortnote}% - \global\toggletrue{cms@fullnote}% - \usebibmacro{cite:short}% - \usebibmacro{crossref:volume+postnote}% - \usebibmacro{cite:save}}}% - {\global\togglefalse{cms@shortnote}% - \global\togglefalse{cms@fullnote}% - \usebibmacro{cite:shorthand}% - \usebibmacro{cite:init}}}% - {\iftoggle{cms@allshort}% - {\global\toggletrue{cms@shortnote}% - \usebibmacro{cite:short}% - \usebibmacro{crossref:volume+postnote}% - \usebibmacro{cite:save}}% - {\global\toggletrue{cms@fullnote}% - \usebibmacro{cite:crossfull}% - \usebibmacro{cite:save}}}}% - \newbibmacro*{cite:full}{% \printtext[bibhypertarget]{% \usedriver {\DeclareNameAlias{sortname}{default}\frenchspacing} - {cite:\thefield{entrytype}}% - \iffieldundef{shorthand} - {}% - {\usebibmacro{cms:shorthandintro}}}} - -\newbibmacro*{cite:crossfull}{% - \printtext[bibhypertarget]{% - \usedriver - {\DeclareNameAlias{sortname}{default}\frenchspacing} - {cite:crossfull}% - \iffieldundef{shorthand} - {} - {\usebibmacro{cms:shorthandintro}}}} + {cite:\thefield{entrytype}}}}% \newbibmacro*{cite:short}{% \ifthenelse{\ifnameundef{labelname}\OR% - \iffieldequalstr{entrytype}{inreference}\OR% - \iffieldequalstr{entrytype}{reference}}% + \ifentrytype{inreference}\OR% + \ifentrytype{reference}\OR% + \ifentrytype{mvreference}}% {\iffieldequalstr{entrysubtype}{magazine}% Simplify .bib creation {\ifuseauthor% {\printfield[journaltitle]{journaltitle}\isdot\newcunit}% {}}% - {\iffieldequalstr{entrytype}{manual}% + {\ifentrytype{manual}% {\printlist{organization}\isdot\newcunit}% {}}}% {\iffieldequalstr{authortype}{anon}% @@ -326,24 +372,26 @@ }% {\printtext[bibhyperref]{% \printfield[citetitle]{labeltitle}}}% - {\printtext[bibhyperlink]{% + {\printtext[cmshyperlink]{% \printfield[citetitle]{labeltitle}}}}%:\thefield{entrytype}? \newbibmacro*{cite:shorthand}{% \iftoggle{cms@allshort}% {\printtext[bibhyperref]{% \printfield{shorthand}}} - {\printtext[bibhyperlink]{% + {\printtext[cmshyperlink]{% \printfield{shorthand}}}} \newbibmacro*{cms:shorthandintro}{% For changing the citedas phrase - \iffieldundef{shorthandintro}% - {\addspace%\setunit{\addspace}% Fix for after postnote field - \printtext[parens]{% - \bibstring{citedas}\space% - \printfield{shorthand}}}% - {\addspace%\setunit{\addspace}% Ditto - \printfield{shorthandintro}}} + \iffieldundef{shorthand}% + {}% + {\iffieldundef{shorthandintro}% + {%\addspace%\setunit{\addspace}% Fix for after postnote field + \printtext[parens]{% + \bibstring{citedas}\space% + \printfield{shorthand}}}% + {%\addspace%\setunit{\addspace}% Ditto + \printfield{shorthandintro}}}} \newbibmacro*{cite:ibid}{% \iftoggle{cms@noibid} @@ -354,7 +402,7 @@ {\iftoggle{cms@allshort}% {\printtext[bibhyperref]{% \bibstring[\mkibid]{ibidem}}} - {\printtext[bibhyperlink]{% + {\printtext[cmshyperlink]{% \bibstring[\mkibid]{ibidem}}} \ifloccit {\global\toggletrue{cms@loccit}}% @@ -397,9 +445,37 @@ \printfield[jourvol]{volume}% \ifthenelse{\iffieldundef{pagination}\AND% \iffieldundef{bookpagination}}% - {\setunit{\addcolon}}% + {\setunit{\postvolpunct}}% {\setunit{\addcolon\addspace}}}}}} +%% Macros from verbose.cbx %% + +\newbibmacro*{textcite}{% + \ifnameundef{labelname} + {\printfield[citetitle]{labeltitle}} + {\printnames{labelname}}} + +\newbibmacro*{textcite:init}{% + \citetrackerfalse% + \pagetrackerfalse% + \iffirstcitekey + {\global\undef\cbx@lasthash} + {}} + +\newbibmacro*{textcite:count}{% + \stepcounter{textcitetotal}% + \ifnumgreater{\value{uniquelist}}{\value{maxnames}} + {\ifnumgreater{\value{uniquelist}}{\value{textcitemaxnames}} + {\setcounter{textcitemaxnames}{\value{uniquelist}}} + {}} + {\ifnumless{\value{labelname}}{\value{maxnames}} + {\ifnumgreater{\value{labelname}}{\value{textcitemaxnames}} + {\setcounter{textcitemaxnames}{\value{labelname}}} + {}} + {\ifnumgreater{\value{maxnames}}{\value{textcitemaxnames}} + {\setcounter{textcitemaxnames}{\value{maxnames}}} + {}}}} + %%%% Citation Commands, internal and external %%%% \DeclareCiteCommand{\cite} @@ -409,33 +485,41 @@ {\multicitedelim} {\usebibmacro{cite:postnote}} -\DeclareCiteCommand{\xrefcite} +\DeclareCiteCommand{\cmsnoopcite}% +{}{}{}{}% + +\DeclareCiteCommand{\bibxrefcite} {}%\usebibmacro{clearalmostall}} (?) - {\usebibmacro{citeindex}% - \usebibmacro{cms-in:}% + {\usebibmacro{cms-in:}% \ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT% - \(\iffieldequalstr{entrytype}{collection}\OR% - \iffieldequalstr{entrytype}{proceedings}\)}% + \(\ifentrytype{collection}\OR\ifentrytype{proceedings}\OR% + \ifentrytype{mvcollection}\OR\ifentrytype{mvproceedings}\)}% {\clearname{author}% \clearname{shortauthor}% \clearname{labelname}}% {}% - \usebibmacro{crosscite}} + \toggletrue{cms@shortnote}% + \togglefalse{cms@fullnote}% + \usebibmacro{cite:short}} {} - {}%\usebibmacro{xrefpostnote}} + {\usebibmacro{crossref:volume+postnote}}% Volume fix -\DeclareCiteCommand{\bibxrefcite} +\DeclareCiteCommand{\bookbibxrefcite} {}%\usebibmacro{clearalmostall}} (?) - {\usebibmacro{cms-in:}% - \ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT% - \(\iffieldequalstr{entrytype}{collection}\OR% - \iffieldequalstr{entrytype}{proceedings}\)}% - {\clearname{author}% - \clearname{shortauthor}% - \clearname{labelname}}% + {\iffieldequals{fullhash}{\bbx@lasthash}% + {\ifthenelse{\ifentrytype{collection}\OR% + \ifentrytype{proceedings}\OR\ifentrytype{mvcollection}\OR% + \ifentrytype{mvproceedings}}% + {\clearname{editor}% + \clearname{shorteditor}% + \clearname{labelname}}% + {\clearname{author}% + \clearname{shortauthor}% + \clearname{labelname}}}% {}% \toggletrue{cms@shortnote}% \togglefalse{cms@fullnote}% + \usebibmacro{bibxref-in:}% \usebibmacro{cite:short}} {} {\usebibmacro{crossref:volume+postnote}}% Volume fix @@ -500,9 +584,10 @@ {}% \nopunct\unspace}% Put \nopunct and \unspace here for 0.8e. {\usedriver - {\DeclareNameAlias{sortname}{default}\clearfield{postnote} - \clearname{author}\clearfield{userf}\toggletrue{cms@fullnote}% - \toggletrue{cms@headlessnote}\frenchspacing}% + {\DeclareNameAlias{sortname}{default}\clearfield{postnote}% + \clearname{author}\clearfield{userf}\clearfield{shorthand}% + \toggletrue{cms@fullnote}\toggletrue{cms@headlessnote}% + \frenchspacing}% {cite:\thefield{entrytype}}}% {\multicitedelim}% {\finentry}% Helps with annotated bibliographies (?) @@ -514,7 +599,7 @@ \nopunct\unspace}% Put \nopunct and \unspace here for 0.8e. {\usedriver {\DeclareNameAlias{sortname}{default}\clearfield{postnote}% - \usebibmacro{clearpublin}% + \usebibmacro{clearpublin}\clearfield{shorthand}% \toggletrue{cms@fullnote}\toggletrue{cms@headlessnote}% \toggletrue{cms@origpublished}\frenchspacing}% {cite:\thefield{entrytype}}}% @@ -543,6 +628,30 @@ {\multicitedelim} {\usebibmacro{cite:postnote}} +\DeclareCiteCommand{\headlessparencite}[\mkbibparens] + {\usebibmacro{hlcprenote}} + {\usebibmacro{citeindex}% + \toggletrue{cms@headlessnote}% + \clearname{author}% + \clearname{shortauthor}% + \clearname{labelname}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\headlessparenshortcite}[\mkbibparens] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \toggletrue{cms@headlessnote}% + \toggletrue{cms@shortnote}% + \togglefalse{cms@fullnote}% + \clearname{author}% + \clearname{shortauthor}% + \clearname{labelname}% + \usebibmacro{cite:short}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} + \DeclareCiteCommand{\surnamecite} {\usebibmacro{prenote}}%\usebibmacro{hlcprenote}} {\usebibmacro{citeindex}% @@ -609,23 +718,90 @@ \DeclareMultiCiteCommand{\citetitles}{citetitle}{\multicitedelim} -\DeclareCiteCommand{\textcite}[\cbx@textcite\cbx@textcite@i] - {\boolfalse{citetracker}% - \gdef\cbx@savedkeys{}} - {\printnames{labelname}% - \xappto\cbx@savedkeys{\thefield{entrykey},}} - {\multinamedelim} - {\protected@xappto\cbx@savedcites{% - [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}} - -\DeclareMultiCiteCommand{\textcites}[\cbx@textcite\cbx@textcites@i] - {\textcite}{\multinamedelim} - -\newrobustcmd{\cbx@textcite}[2]{\def\cbx@savedcites{#1}#2\cbx@savedcites} -\newrobustcmd{\cbx@textcite@i}{% - \iffootnote{\newcunit\bibstring{in}\addspace\headlesscite}{\footcite}} -\newrobustcmd{\cbx@textcites@i}{% - \iffootnote{\newcunit\bibstring{in}\addspace\cites}{\footcites}} +\DeclareMultiCiteCommand{\headlesscites}{headlesscite}{\multicitedelim} + +\DeclareMultiCiteCommand{\headlessparencites}[\mkbibparens]% +{headlessparencite}{\multicitedelim} + +\DeclareMultiCiteCommand{\headlessparenshortcites}[\mkbibparens]% +{headlessparenshortcite}{\multicitedelim} + +%% Textcite commands adapted from verbose.cbx %% + +\DeclareCiteCommand{\cbx@textcite} + {\usebibmacro{textcite:init}} + {\iffieldequals{namehash}{\cbx@lasthash} + {} + {\iffirstcitekey + {} + {\textcitedelim}% + \stepcounter{textcitecount}% + \usebibmacro{textcite}% + \savefield{namehash}{\cbx@lasthash}}} + {} + {} + +\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite\cms@textcite@i] + {\usebibmacro{textcite:init}% + \gdef\cbx@savedkeys{}% + \DeferNextCitekeyHook} + {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0} + {\protected@xappto\cbx@footcite@args{% + (\thefield{multiprenote})(\thefield{multipostnote})}} + {}% + \xappto\cbx@savedkeys{\thefield{entrykey},}% + \iffieldequals{namehash}{\cbx@lasthash} + {} + {\usebibmacro{textcite:count}% + \savefield{namehash}{\cbx@lasthash}}% + \ifnumequal{\value{citecount}}{\value{citetotal}} + {\protected@xappto\cbx@textcite@args{{\cbx@savedkeys}}% + \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? + {}} + {}} + {} + {} + +\newrobustcmd{\cbx@textcite@init}[3]{% + \setcounter{textcitetotal}{0}% + \setcounter{textcitecount}{0}% + \setcounter{textcitemaxnames}{0}% + \def\cbx@textcite@args{#1}\def\cbx@footcite@args{#2}#3% + \cbx@textcite@args\empty\cbx@footcite@args\empty} + +\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{} +\DeclareMultiCiteCommand{\textcites} + [\cbx@textcites@init\cbx@textcites\cms@textcites@i]{\textcite}{} + +\let\cbx@textcites@init\cbx@textcite@init +\pretocmd{\cbx@textcites@init}{% + \UseNextMultiCiteHook% + \AtNextMultiCite{% + \renewbibmacro{multiprenote}{}% + \renewbibmacro{multipostnote}{}}}{}{} + +\renewcommand*{\textcitedelim}{% + \iffinalcitedelim + {\ifnumgreater{\value{textcitetotal}}{2} + {\addcomma}% + {}% + \addspace\bibstring{and}} + {\addcomma}% + \space} + +\newrobustcmd{\cms@textcite@i}{% + \iffootnote{\foottextcite}{\footcite}} + +\newrobustcmd{\cms@textcites@i}{% + \iffootnote{\foottextcites}{\footcites}} + +\newcommand{\foottextcite}{\addspace\headlessparenshortcite} + +\newcommand{\foottextcites}{\addspace\headlessparenshortcites} %%%% Drivers for the Long Note Format %%%% @@ -658,6 +834,8 @@ {}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -690,6 +868,8 @@ {}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}}} @@ -724,6 +904,8 @@ \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -753,7 +935,7 @@ \usebibmacro{cbyeditor+others}% \iffieldundef{maintitle} {} - {\iffieldundef{volume} + {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}% {\usebibmacro{cms-in:}% \printtext[maintitle]{% \printfield[noformat]{maintitle}% @@ -761,7 +943,8 @@ \printfield[noformat]{mainsubtitle}}% \newcunit \printfield{maintitleaddon}} - {\printfield{volume}% + {\toggletrue{cms@usedvol}% + \printfield{volume}% \printfield{part}% \setunit{\addspace} \bibstring{ofseries}% @@ -782,7 +965,7 @@ \usebibmacro{cpubl+loc+year}% \newcunit \printfield{type}% - \usebibmacro{fullpostnote}% + \usebibmacro{volfullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% \newcunit\newblock @@ -793,6 +976,8 @@ {}% \newcunit\newblock% \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -804,6 +989,8 @@ \printfield{nameaddon}% \newcunit\newblock \usebibmacro{citaltitle+stitle}% + \setunit{\addspace}% + \usebibmacro{cite:xref+date}% \newcunit \iffieldundef{maintitle}% {\iffieldundef{edition}% @@ -815,7 +1002,21 @@ \newcunit \usebibmacro{cpart+editor+translator}% \newcunit - \usebibmacro{cmtitle+mstitle+vol+part+title+stitle}% + \ifboolexpr{ + test {\iffieldundef{crossref}}% + or + not test {\ifentryseen{\thefield{crossref}}}% + or + togl {cms@bookcitexref}% + } + {\ifboolexpr{ + test {\iffieldundef{xref}}% + or + not test {\ifentryseen{\thefield{xref}}}% + or + togl {cms@bookcitexref}% + } + {\usebibmacro{cmtitle+mstitle+vol+part+title+stitle}% \newcunit\newblock \iffieldundef{edition}% {}% @@ -835,7 +1036,7 @@ {\clearfield{pages}}% \newcunit\newblock \usebibmacro{caddendum}% - \usebibmacro{fullpostnote}% + \usebibmacro{volfullpostnote}% \newcunit\newblock \printlist[][-\value{listtotal}]{lista}% \newcunit\newblock @@ -844,9 +1045,24 @@ {}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% - \usebibmacro{finentry}} + \usebibmacro{finentry}% + \usebibmacro{book:xref+finentry}}% + {\ifterm{\addspace\bibsentence}% + {\addcomma\addspace}% + \usebibmacro{xrefprenote}% Volume fix + \bookbibxrefcite{\thefield{xref}}% Removed \addspace from each. + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}}% + {\ifterm{\addspace\bibsentence}% + {\addcomma\addspace}% + \usebibmacro{xrefprenote}% Volume fix + \bookbibxrefcite{\thefield{crossref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}} \DeclareBibliographyDriver{cite:bookinbook}{% \usebibmacro{bibindex}% @@ -855,13 +1071,28 @@ \printfield{nameaddon}% \newcunit\newblock \usebibmacro{citaltitle+stitle}% + \setunit{\addspace}% + \usebibmacro{cite:xref+date}% \newcunit\newblock \usebibmacro{byauthor}% \newcunit \usebibmacro{cpart+editor+translator}% \setunit*{\addcomma\addspace}% - \usebibmacro{cms-in:}% - \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% + \ifboolexpr{ + test {\iffieldundef{crossref}}% + or + not test {\ifentryseen{\thefield{crossref}}}% + or + togl {cms@bookcitexref}% + } + {\ifboolexpr{ + test {\iffieldundef{xref}}% + or + not test {\ifentryseen{\thefield{xref}}}% + or + togl {cms@bookcitexref}% + } + {\usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% \newcunit \iffieldundef{edition}% {}% @@ -879,16 +1110,31 @@ \usebibmacro{cpubl+loc+year}% \newcunit\newblock \usebibmacro{caddendum}% - \usebibmacro{fullpostnote}% + \usebibmacro{volfullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% {}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% - \usebibmacro{finentry}} + \usebibmacro{finentry}% + \usebibmacro{book:xref+finentry}}% + {\ifterm{\addspace\bibsentence}% + {\addcomma\addspace}% + \usebibmacro{xrefprenote}% Volume fix + \bookbibxrefcite{\thefield{xref}}% Removed \addspace from each. + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}}% + {\ifterm{\addspace\bibsentence}% + {\addcomma\addspace}% + \usebibmacro{xrefprenote}% Volume fix + \bookbibxrefcite{\thefield{crossref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}} \DeclareBibliographyDriver{cite:booklet}{% \usebibmacro{bibindex}% @@ -909,6 +1155,8 @@ \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -920,8 +1168,24 @@ \printfield{nameaddon}% \setunit{\addcomma\addspace}\newblock \usebibmacro{citaltitle+stitle}% + \setunit{\addspace} + \usebibmacro{cite:xref+date}% \newcunit - \usebibmacro{mtitle+mstitle+vol+part+title+stitle}% + \ifboolexpr{ + test {\iffieldundef{crossref}}% + or + not test {\ifentryseen{\thefield{crossref}}}% + or + togl {cms@bookcitexref}% + } + {\ifboolexpr{ + test {\iffieldundef{xref}}% + or + not test {\ifentryseen{\thefield{xref}}}% + or + togl {cms@bookcitexref}% + } + {\usebibmacro{cmtitle+mstitle+vol+part+title+stitle}% \newcunit\newblock \iffieldundef{edition}% {}% @@ -938,60 +1202,31 @@ \usebibmacro{cpubl+loc+year}% \newcunit\newblock \usebibmacro{caddendum}% - \usebibmacro{fullpostnote}% + \usebibmacro{volfullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% {}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% - \usebibmacro{finentry}} - -\DeclareBibliographyDriver{cite:crossfull}{% - \ifcsdef{cbx@incollvol}% - {\restorefield{volume}{\cbx@incollvol}}% - {}% - \ifcsdef{cbx@incollpages}% - {\restorefield{pages}{\cbx@incollpages}}% - {}% - \ifcsdef{cbx@incollpgn}% - {\restorefield{pagination}{\cbx@incollpgn}}% - {}% - \ifcsdef{cbx@incollbkpgn}% - {\restorefield{bookpagination}{\cbx@incollbkpgn}}% - {}% - \ifcsdef{cbx@incollpart}% - {\restorefield{part}{\cbx@incollpart}}% - {}% - \usebibmacro{crefmtitle+mstitle+vol+part+title+stitle}% - \newcunit - \iffieldundef{edition}% - {}% - {\usebibmacro{edition}}% - \newcunit - \usebibmacro{bybookauthor}% - \usebibmacro{cbyeditor+others}% - \newcunit\newblock - \usebibmacro{volume+or+volumes}% - \newcunit\newblock - \usebibmacro{cser+num}% - \newcunit\newblock - \usebibmacro{cnotefield}% - \newcunit\newblock - \usebibmacro{cpubl+loc+year}% - \newcunit\newblock - \usebibmacro{caddendum}% - \usebibmacro{fullpostnote}% - \newcunit\newblock - \iftoggle{cms@isbn}% - {\printfield{isbn}}% - {}% - \newcunit\newblock - \usebibmacro{cite+doi+url}% - \newcunit\newblock - \usebibmacro{pageref}}% + \usebibmacro{finentry}% + \usebibmacro{book:xref+finentry}}% + {\ifterm{\addspace\bibsentence}% + {\addcomma\addspace}% + \usebibmacro{xrefprenote}% Volume fix + \bookbibxrefcite{\thefield{xref}}% Removed \addspace from each. + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}}% + {\ifterm{\addspace\bibsentence}% + {\addcomma\addspace}% + \usebibmacro{xrefprenote}% Volume fix + \bookbibxrefcite{\thefield{crossref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}} \DeclareBibliographyDriver{cite:customc}{% \usebibmacro{bibindex}% @@ -1032,6 +1267,8 @@ \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1050,8 +1287,21 @@ \setunit{\addcomma\addspace}% \usebibmacro{cpart+editor+translator}% \setunit{\addcomma\addspace}% - \usebibmacro{chapincoll}% - \usebibmacro{cms-in:}% + \ifboolexpr{ + test {\iffieldundef{crossref}}% + or + not test {\ifentryseen{\thefield{crossref}}}% + or + togl {cms@citecrossref}% + } + {\ifboolexpr{ + test {\iffieldundef{xref}}% + or + not test {\ifentryseen{\thefield{xref}}}% + or + togl {cms@citecrossref}% + } + {\usebibmacro{chapincoll}% \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% \newcunit \iffieldundef{edition}% @@ -1070,16 +1320,37 @@ \usebibmacro{cpubl+loc+year}% \newcunit\newblock \usebibmacro{caddendum}% - \usebibmacro{fullpostnote}% + \usebibmacro{volfullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% {}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% - \usebibmacro{finentry}} + \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 + \usebibmacro{xrefprenote}% Volume fix + \usebibmacro{chapincoll}% + \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}% + \usebibmacro{xrefprenote}% Volume fix + \usebibmacro{chapincoll}% + \bibxrefcite{\thefield{crossref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}} \DeclareBibliographyDriver{cite:incollection}{% \usebibmacro{bibindex}% @@ -1095,10 +1366,21 @@ \setunit{\addcomma\addspace}% \usebibmacro{cpart+editor+translator}% \setunit{\addcomma\addspace}% - \iffieldundef{crossref}% - {\iffieldundef{xref} + \ifboolexpr{ + test {\iffieldundef{crossref}}% + or + not test {\ifentryseen{\thefield{crossref}}}% + or + togl {cms@citecrossref}% + } + {\ifboolexpr{ + test {\iffieldundef{xref}}% + or + not test {\ifentryseen{\thefield{xref}}}% + or + togl {cms@citecrossref}% + } {\usebibmacro{chapincoll}% - \usebibmacro{cms-in:}% \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% \newcunit \iffieldundef{edition}% @@ -1117,23 +1399,26 @@ \usebibmacro{cpubl+loc+year}% \newcunit\newblock \usebibmacro{caddendum}% - \usebibmacro{fullpostnote}% + \usebibmacro{volfullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% {}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% - \usebibmacro{finentry}} + \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 \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% - \xrefcite{\thefield{xref}}% Removed \addspace from each. + \bibxrefcite{\thefield{xref}}% Removed \addspace from each. \usebibmacro{xrefpostnote}% \usebibmacro{finentry}}}% {\ifterm{\iffieldundef{chapter}% New test needed to cope with @@ -1142,7 +1427,7 @@ {\addcomma\addspace}% \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% - \xrefcite{\thefield{crossref}}% + \bibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% \usebibmacro{finentry}}} @@ -1160,10 +1445,21 @@ \setunit{\addcomma\addspace}% \usebibmacro{cpart+editor+translator}% \setunit{\addcomma\addspace}% - \iffieldundef{crossref}% - {\iffieldundef{xref} + \ifboolexpr{ + test {\iffieldundef{crossref}}% + or + not test {\ifentryseen{\thefield{crossref}}}% + or + togl {cms@citecrossref}% + } + {\ifboolexpr{ + test {\iffieldundef{xref}}% + or + not test {\ifentryseen{\thefield{xref}}}% + or + togl {cms@citecrossref}% + } {\usebibmacro{chapincoll}% - \usebibmacro{cms-in:}% \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% \newcunit\newblock \usebibmacro{volume+or+volumes}% @@ -1176,23 +1472,26 @@ \usebibmacro{org+publ+loc+year}}% \newcunit\newblock \usebibmacro{caddendum}% - \usebibmacro{fullpostnote}% + \usebibmacro{volfullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% {}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% - \usebibmacro{finentry}} + \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}% \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% - \xrefcite{\thefield{xref}}% + \bibxrefcite{\thefield{xref}}% \usebibmacro{xrefpostnote}% \usebibmacro{finentry}}}% {\ifterm{\iffieldundef{chapter}% New test needed to cope with @@ -1201,7 +1500,7 @@ {\addcomma\addspace}% \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% - \xrefcite{\thefield{crossref}}% + \bibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% \usebibmacro{finentry}}} @@ -1217,7 +1516,6 @@ \newcunit \usebibmacro{cpart+editor+translator}% \setunit*{\addcomma\addspace}% - \usebibmacro{alt-in:}% \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% \newcunit \iffieldundef{edition}% @@ -1250,6 +1548,8 @@ {}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1268,10 +1568,21 @@ \newcunit\newblock% \usebibmacro{cpart+editor+translator}% \setunit*{\addcomma\addspace}% - \iffieldundef{crossref}% - {\iffieldundef{xref}% + \ifboolexpr{ + test {\iffieldundef{crossref}}% + or + not test {\ifentryseen{\thefield{crossref}}}% + or + togl {cms@citecrossref}% + } + {\ifboolexpr{ + test {\iffieldundef{xref}}% + or + not test {\ifentryseen{\thefield{xref}}}% + or + togl {cms@citecrossref}% + } {\usebibmacro{chapincoll}% - \usebibmacro{cms-in:}% \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% \newcunit \iffieldundef{edition}% @@ -1290,23 +1601,26 @@ \usebibmacro{cpubletter+loc+year}% \newcunit\newblock \usebibmacro{caddendum}% - \usebibmacro{fullpostnote}% + \usebibmacro{volfullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% {}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% - \usebibmacro{finentry}}% + \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}% \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% - \xrefcite{\thefield{xref}}% + \bibxrefcite{\thefield{xref}}% \usebibmacro{xrefpostnote}% \usebibmacro{finentry}}}% {\ifterm{\iffieldundef{chapter}% New test needed to cope with @@ -1315,7 +1629,7 @@ {\addcomma\addspace}% \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% - \xrefcite{\thefield{crossref}}% + \bibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% \usebibmacro{finentry}}} @@ -1348,6 +1662,8 @@ {}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1394,6 +1710,8 @@ \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1423,7 +1741,7 @@ \usebibmacro{cbyeditor+others}% \iffieldundef{maintitle} {} - {\iffieldundef{volume} + {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}% {\usebibmacro{cms-in:}% \printtext[maintitle]{% \printfield[noformat]{maintitle}% @@ -1431,7 +1749,8 @@ \printfield[noformat]{mainsubtitle}}% \newcunit \printfield{maintitleaddon}} - {\printfield{volume}% + {\toggletrue{cms@usedvol}% + \printfield{volume}% \printfield{part}% \setunit{\addspace} \bibstring{ofseries}% @@ -1475,10 +1794,20 @@ {}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} +\DeclareBibliographyAlias{cite:mvbook}{cite:book} + +\DeclareBibliographyAlias{cite:mvcollection}{cite:collection} + +\DeclareBibliographyAlias{cite:mvproceedings}{cite:proceedings} + +\DeclareBibliographyAlias{cite:mvreference}{cite:reference} + \DeclareBibliographyDriver{cite:online}{% \usebibmacro{bibindex}% \usebibmacro{author/editor}% @@ -1514,6 +1843,8 @@ \printfield{url}% \newcunit\newblock \usebibmacro{caddendum}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1555,6 +1886,8 @@ \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1584,6 +1917,8 @@ {}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}}% @@ -1612,6 +1947,8 @@ {}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}}} @@ -1623,8 +1960,24 @@ \printfield{nameaddon}% \setunit{\addcomma\addspace}\newblock% \usebibmacro{citaltitle+stitle}% + \setunit{\addspace} + \usebibmacro{cite:xref+date}% \newcunit - \usebibmacro{cmtitle+mstitle+vol+part+title+stitle}% + \ifboolexpr{ + test {\iffieldundef{crossref}}% + or + not test {\ifentryseen{\thefield{crossref}}}% + or + togl {cms@bookcitexref}% + } + {\ifboolexpr{ + test {\iffieldundef{xref}}% + or + not test {\ifentryseen{\thefield{xref}}}% + or + togl {cms@bookcitexref}% + } + {\usebibmacro{cmtitle+mstitle+vol+part+title+stitle}% \newcunit\newblock \usebibmacro{volume+or+volumes}% \newcunit\newblock @@ -1636,16 +1989,31 @@ \usebibmacro{org+publ+loc+year}}% \newcunit\newblock \usebibmacro{caddendum}% - \usebibmacro{fullpostnote}% + \usebibmacro{volfullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% {}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% - \usebibmacro{finentry}} + \usebibmacro{finentry}% + \usebibmacro{book:xref+finentry}}% + {\ifterm{\addspace\bibsentence}% + {\addcomma\addspace}% + \usebibmacro{xrefprenote}% Volume fix + \bookbibxrefcite{\thefield{xref}}% Removed \addspace from each. + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}}% + {\ifterm{\addspace\bibsentence}% + {\addcomma\addspace}% + \usebibmacro{xrefprenote}% Volume fix + \bookbibxrefcite{\thefield{crossref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}} \DeclareBibliographyDriver{cite:reference}{% \usebibmacro{bibindex}% @@ -1659,7 +2027,6 @@ \newcunit \usebibmacro{cpart+editor+translator}% \setunit*{\addcomma\addspace}% - \usebibmacro{alt-in:}% \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% \newcunit \iffieldundef{edition}% @@ -1678,13 +2045,15 @@ \usebibmacro{cpubl+loc+year}% \newcunit\newblock \usebibmacro{caddendum}% - \usebibmacro{fullpostnote}% + \usebibmacro{volfullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% {}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1718,6 +2087,8 @@ {}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1760,6 +2131,8 @@ {}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1800,13 +2173,15 @@ \clearfield{pages}% ?? For 16th ed. \newcunit\newblock \usebibmacro{caddendum}% - \usebibmacro{fullpostnote}% + \usebibmacro{volfullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% {}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1836,6 +2211,8 @@ \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1851,6 +2228,8 @@ \usebibmacro{language+transtitle}% \setunit{\addcomma\addspace}% \usebibmacro{byauthor}% + \newcunit\newblock% + \usebibmacro{cbyeditor+others}% \setunit{\addspace}\newblock% \printtext[parens]{% \printfield{howpublished}% @@ -1865,6 +2244,8 @@ \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1894,7 +2275,7 @@ \usebibmacro{cbyeditor+others}% \iffieldundef{maintitle} {} - {\iffieldundef{volume} + {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}% {\usebibmacro{cms-in:}% \printtext[maintitle]{% \printfield[noformat]{maintitle}% @@ -1902,7 +2283,8 @@ \printfield[noformat]{mainsubtitle}}% \newcunit \printfield{maintitleaddon}} - {\printfield{volume}% + {\toggletrue{cms@usedvol}% + \printfield{volume}% \printfield{part}% \setunit{\addspace} \bibstring{ofseries}% @@ -1925,7 +2307,7 @@ \usebibmacro{cpubl+loc+year}% \newcunit\newblock \printfield{type}% Order of this and next? - \usebibmacro{fullpostnote}% + \usebibmacro{volfullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% \newcunit\newblock @@ -1934,6 +2316,8 @@ {}% \newcunit\newblock \usebibmacro{cite+doi+url}% + \setunit{\addspace}% + \usebibmacro{cms:shorthandintro}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1987,90 +2371,55 @@ %%%% Field Formats -- Title, Citetitle, Lostitle %%%% +\DeclareFieldFormat{title}{\mkbibemph{#1}\isdot} -\DeclareFieldFormat[article]{title}{% +\DeclareFieldFormat{citetitle}{\mkbibemph{#1}\isdot} + +\DeclareFieldFormat{lostitle}{\mkbibemph{#1}\isdot} + +\DeclareFieldFormat +[article,inbook,incollection,inproceedings,online,thesis,unpublished] +{title}{% \iffieldundef{title}% {}% {\mkbibquote{#1\isdot}}} -\DeclareFieldFormat[article]{citetitle}{% +\DeclareFieldFormat +[article,inbook,incollection,inproceedings,online,thesis,unpublished] +{citetitle}{% \iffieldundef{title}% {#1\isdot}% {\mkbibquote{#1\isdot}}} -\DeclareFieldFormat[article]{lostitle}{% +\DeclareFieldFormat +[article,inbook,incollection,inproceedings,online,thesis,unpublished] +{lostitle}{% \iffieldundef{title}% {#1\isdot}% {\mkbibquote{#1\isdot}}} -\DeclareFieldFormat[artwork]{title}{% +\DeclareFieldFormat[artwork,image]{title}{% \iffieldundef{entrysubtype}% {\mkbibemph{#1}\isdot}% {#1\isdot}} -\DeclareFieldFormat[artwork]{citetitle}{% +\DeclareFieldFormat[artwork,image]{citetitle}{% \iffieldundef{entrysubtype}% {\mkbibemph{#1}\isdot}% {#1\isdot}} -\DeclareFieldFormat[artwork]{lostitle}{% +\DeclareFieldFormat[artwork,image]{lostitle}{% \iffieldundef{entrysubtype}% {\mkbibemph{#1}\isdot}% {#1\isdot}} -\DeclareFieldFormat[book]{title}{\mkbibemph{#1}\isdot} - -\DeclareFieldFormat[book]{citetitle}{\mkbibemph{#1}\isdot} - -\DeclareFieldFormat[book]{lostitle}{\mkbibemph{#1}\isdot} +\DeclareFieldFormat[letter,patent]{title}{#1\isdot} -\DeclareFieldFormat[periodical]{title}{\mkbibemph{#1}\isdot} +\DeclareFieldFormat[letter,patent]{citetitle}{#1\isdot} -\DeclareFieldFormat[periodical]{citetitle}{\mkbibemph{#1}\isdot} +\DeclareFieldFormat[letter,patent]{lostitle}{#1\isdot} -\DeclareFieldFormat[periodical]{lostitle}{\mkbibemph{#1}\isdot} - -\DeclareFieldAlias[image]{title}[artwork]{title} - -\DeclareFieldAlias[image]{citetitle}[artwork]{citetitle} - -\DeclareFieldAlias[image]{lostitle}[artwork]{lostitle} - -\DeclareFieldAlias[incollection]{title}[article]{title} - -\DeclareFieldAlias[incollection]{citetitle}[article]{citetitle} - -\DeclareFieldAlias[incollection]{lostitle}[article]{lostitle} - -\DeclareFieldFormat[letter]{title}{#1\isdot} - -\DeclareFieldFormat[letter]{citetitle}{#1\isdot} - -\DeclareFieldFormat[letter]{lostitle}{#1\isdot} - -\DeclareFieldAlias[inproceedings]{title}[article]{title} - -\DeclareFieldAlias[inproceedings]{citetitle}[article]{citetitle} - -\DeclareFieldAlias[inproceedings]{lostitle}[article]{lostitle} - -\DeclareFieldAlias[thesis]{title}[article]{title} - -\DeclareFieldAlias[thesis]{citetitle}[article]{citetitle} - -\DeclareFieldAlias[thesis]{lostitle}[article]{lostitle} - -\DeclareFieldAlias[patent]{title}[letter]{title} - -\DeclareFieldAlias[patent]{citetitle}[letter]{citetitle} - -\DeclareFieldAlias[patent]{lostitle}[letter]{lostitle} - -\DeclareFieldAlias[unpublished]{title}[article]{title} - -\DeclareFieldAlias[unpublished]{citetitle}[article]{citetitle} - -\DeclareFieldAlias[unpublished]{lostitle}[article]{lostitle} +\DeclareFieldFormat{prenote}{\ifcapital{\MakeCapital{#1}}{#1}} \DeclareFieldFormat{postnote}{% Removed \isdots -- required \iffieldundef{pagination}% elsewhere also? @@ -2094,20 +2443,14 @@ {\bibstring{ed#1}} {\ifcapital{\MakeCapital{#1}}{#1}}}} -\DeclareFieldAlias[inbook]{title}[article]{title} - -\DeclareFieldAlias[inbook]{citetitle}[article]{citetitle} - -\DeclareFieldAlias[inbook]{lostitle}[article]{lostitle} +\DeclareFieldFormat[suppbook,suppcollection]{title}{\mkbibemph{#1}\isdot} -\DeclareFieldFormat[suppbook]{title}{\mkbibemph{#1}\isdot} - -\DeclareFieldFormat[suppbook]{citetitle}{% +\DeclareFieldFormat[suppbook,suppcollection]{citetitle}{% \usebibmacro{inforaft}% \addspace% \mkbibemph{#1}\isdot} -\DeclareFieldFormat[suppbook]{lostitle}{% +\DeclareFieldFormat[suppbook,suppcollection]{lostitle}{% \usebibmacro{inforaft}% \addspace% \mkbibemph{#1}\isdot} @@ -2126,30 +2469,6 @@ #1}% {\printfield{nameaddon}\addspace #1}} -\DeclareFieldAlias[suppcollection]{title}[suppbook]{title} - -\DeclareFieldAlias[suppcollection]{citetitle}[suppbook]{citetitle} - -\DeclareFieldAlias[suppcollection]{lostitle}[suppbook]{lostitle} - -\DeclareFieldFormat[booklet]{title}{\mkbibemph{#1}\isdot} - -\DeclareFieldFormat[booklet]{citetitle}{\mkbibemph{#1}\isdot} - -\DeclareFieldFormat[booklet]{lostitle}{\mkbibemph{#1}\isdot} - -\DeclareFieldFormat[manual]{title}{\mkbibemph{#1}\isdot} - -\DeclareFieldFormat[manual]{citetitle}{\mkbibemph{#1}\isdot} - -\DeclareFieldFormat[manual]{lostitle}{\mkbibemph{#1}\isdot} - -\DeclareFieldFormat[report]{title}{\mkbibemph{#1}\isdot} - -\DeclareFieldFormat[report]{citetitle}{\mkbibemph{#1}\isdot} - -\DeclareFieldFormat[report]{lostitle}{\mkbibemph{#1}\isdot} - \DeclareFieldFormat[misc]{title}{% \iffieldundef{entrysubtype}% {\mkbibemph{#1}\isdot}% @@ -2165,54 +2484,30 @@ {\mkbibemph{#1}\isdot}% {\ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}} -\DeclareFieldFormat[review]{title}{% +\DeclareFieldFormat[review,suppperiodical]{title}{% \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}} -\DeclareFieldFormat[review]{citetitle}{% +\DeclareFieldFormat[review,suppperiodical]{citetitle}{% \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}} -\DeclareFieldFormat[review]{lostitle}{% +\DeclareFieldFormat[review,suppperiodical]{lostitle}{% \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}} -\DeclareFieldAlias[suppperiodical]{title}[review]{title} - -\DeclareFieldAlias[suppperiodical]{citetitle}[review]{citetitle} - -\DeclareFieldAlias[suppperiodical]{lostitle}[review]{lostitle} - -\DeclareFieldAlias[online]{title}[article]{title} - -\DeclareFieldAlias[online]{citetitle}[article]{citetitle} - -\DeclareFieldAlias[online]{lostitle}[article]{lostitle} - -\DeclareFieldFormat[video]{title}{% +\DeclareFieldFormat[audio,music,video]{title}{% \iffieldundef{booktitle}% {\mkbibemph{#1}\isdot}% {\mkbibquote{#1\isdot}}} -\DeclareFieldFormat[video]{citetitle}{% +\DeclareFieldFormat[audio,music,video]{citetitle}{% \iffieldundef{booktitle}% {\mkbibemph{#1}\isdot}% {\mkbibquote{#1\isdot}}} -\DeclareFieldFormat[video]{lostitle}{% +\DeclareFieldFormat[audio,music,video]{lostitle}{% \iffieldundef{booktitle}% {\mkbibemph{#1}\isdot}% {\mkbibquote{#1\isdot}}} -\DeclareFieldAlias[music]{title}[video]{title} - -\DeclareFieldAlias[music]{citetitle}[video]{citetitle} - -\DeclareFieldAlias[music]{lostitle}[video]{lostitle} - -\DeclareFieldAlias[audio]{title}[video]{title} - -\DeclareFieldAlias[audio]{citetitle}[video]{citetitle} - -\DeclareFieldAlias[audio]{lostitle}[video]{lostitle} - %%%% Other Field Formats %%%% \DeclareNumChars*{:}% For proper ibidem with multi-volume works. @@ -2222,36 +2517,20 @@ \DeclareFieldFormat{note}{% \ifcapital{\MakeCapital{#1}}{#1}}% -\DeclareFieldFormat[suppbook]{type}{% +\DeclareFieldFormat +[audio,manual,music,patent,report,suppbook,suppcollection,thesis,video] +{type}{% \ifbibstring{#1}% {\bibstring{#1}}% {\ifcapital% {\MakeCapital{#1\isdot}}% {#1\isdot}}} -\DeclareFieldFormat[artwork]{type}{% +\DeclareFieldFormat[artwork,image]{type}{% \ifcapital% {\MakeCapital{#1}}% {#1}} -\DeclareFieldAlias[patent]{type}[suppbook]{type} - -\DeclareFieldAlias[manual]{type}[suppbook]{type} - -\DeclareFieldAlias[thesis]{type}[suppbook]{type} - -\DeclareFieldAlias[report]{type}[suppbook]{type} - -\DeclareFieldAlias[image]{type}[artwork]{type} - -\DeclareFieldAlias[suppcollection]{type}[suppbook]{type} - -\DeclareFieldAlias[video]{type}[suppbook]{type} - -\DeclareFieldAlias[music]{type}[suppbook]{type} - -\DeclareFieldAlias[audio]{type}[suppbook]{type} - \DeclareFieldFormat{url}{\url{#1}} \DeclareFieldFormat{doi}{% @@ -2260,6 +2539,23 @@ {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}} {\nolinkurl{#1}}} +\DeclareFieldFormat[music]{date}{% Generalize userd ??? + \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}% + \OR\NOT\iffieldundef{eventyear}\OR\NOT\iffieldundef{origyear}}% + {#1}% + {\printfield{userd}\addspace #1}} + +\DeclareFieldFormat[video]{date}{% Generalize userd ??? + \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}% + \OR\NOT\iffieldundef{eventyear}}% + {#1}% + {\printfield{userd}\addspace #1}} + +\DeclareFieldFormat{date}{% Generalize userd ??? + \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}}% + {#1}% + {\printfield{userd}\addspace #1}} + \DeclareFieldFormat{urldate}{% 16th ed. \iffieldundef{userd}% {\bibstring{urlseen}\space #1}% @@ -2306,7 +2602,7 @@ \DeclareFieldFormat{edition}{% New in 0.8 \ifinteger{#1} - {\mkbibordinal{#1}~\bibstring{edition}}% + {\mkbibordedition{#1}~\bibstring{edition}}% {\ifcapital {\MakeCapital{#1\isdot}}% {#1\isdot}}} @@ -2342,7 +2638,7 @@ \DeclareFieldFormat{jourser}{% \ifinteger{#1}% - {\mkbibordinal{#1}% + {\mkbibordseries{#1}% \addnbspace% \bibstring{jourser}}% {\ifbibstring{#1}{\bibstring{#1}}{#1}}} @@ -2371,7 +2667,79 @@ \DeclareFieldFormat{annotation}{\par\nobreak \vskip \bibitemsep #1} -\DeclareFieldFormat{part}{\addcomma\bibstring{partvolume}~#1} +\DeclareFieldFormat{part}{% xref revision ??? + \ifnumerals{#1}% + {\addcomma\addspace\bibstring{partvolume}~#1}% + {\addcomma\addspace\ifcapital{\MakeCapital{#1}}{#1}}} + +\DeclareFieldFormat{xrefpart}{% xref revision ??? + \ifnumerals{#1}% + {\bibstring{partvolume}~#1}% + {\ifcapital{\MakeCapital{#1}}{#1}}} + +%% This tries to get hyperlinks from shortened cross-ref'd notes to %% +%% long notes working properly. Used in short and shorthand cites. %% + +\DeclareFieldFormat{cmshyperlink}{% + \iffieldundef{crossref}% + {\iffieldundef{xref}% + {\bibhyperlink{\thefield{entrykey}}{#1}}% + {\ifboolexpr{(( + test {\ifentrytype{book}}% + or + test {\ifentrytype{bookinbook}}% + or + test {\ifentrytype{collection}}% + or + test {\ifentrytype{proceedings}}% + ) + and + not togl {cms@bookcitexref}% + ) + or + (( + test {\ifentrytype{inbook}}% + or + test {\ifentrytype{letter}}% + or + test {\ifentrytype{incollection}}% + or + test {\ifentrytype{inproceedings}}% + ) + and + not togl {cms@citecrossref} + ) + }% + {\bibhyperlink{\thefield{xref}}{#1}}% + {\bibhyperlink{\thefield{entrykey}}{#1}}}}% + {\ifboolexpr{(( + test {\ifentrytype{book}}% + or + test {\ifentrytype{bookinbook}}% + or + test {\ifentrytype{collection}}% + or + test {\ifentrytype{proceedings}}% + ) + and + not togl {cms@bookcitexref}% + ) + or + (( + test {\ifentrytype{inbook}}% + or + test {\ifentrytype{letter}}% + or + test {\ifentrytype{incollection}}% + or + test {\ifentrytype{inproceedings}}% + ) + and + not togl {cms@citecrossref} + ) + }% + {\bibhyperlink{\thefield{crossref}}{#1}}% + {\bibhyperlink{\thefield{entrykey}}{#1}}}} \DeclareFieldAlias[review]{volume}[article]{volume} @@ -2386,6 +2754,9 @@ \renewcommand*{\multicitedelim}{\addsemicolon\space} +\renewcommand*{\iffinalcitedelim}{% + \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}} + \newcommand{\custpunct}{% \iftoggle{cms@fullnote}% {\iffieldequalstr{type}{plain}% @@ -2415,7 +2786,7 @@ \newcommand{\classicpunct}{% 16th ed. \ifthenelse{\(\iffieldequalstr{entrysubtype}{classical}\AND% \iffieldundef{labeltitle}\)\OR - \iffieldequalstr{entrytype}{letter}}% + \ifentrytype{letter}}% {\setunit*{\addspace}}% {\setunit*{\addcomma\addspace}}} @@ -2426,7 +2797,7 @@ \newcommand{\encypunct}{% for named entries in an encyclopedia \iftoggle{cms@fullnote}% - {\iffieldequalstr{entrytype}{book}% + {\ifentrytype{book}% {\ifthenelse{\iffieldundef{addendum}\AND\iffieldundef{doi}\AND \iffieldundef{isbn}\AND\iffieldundef{url}}% {\ifthenelse{\value{multicitecount} < \value{multicitetotal}}% @@ -2441,12 +2812,14 @@ {\addperiod}}% {\addcomma}}% {}}}% - {\iffieldequalstr{entrytype}{book}% + {\ifentrytype{book}% {\addperiod}% {\ifnameundef{author}% {\addperiod}% {}}}} +\newcommand{\postvolpunct}{\addcolon}% For vol:page customization + \newcommand{\parttrans}{% \iftoggle{cms@fullnote}% {\bibstring{cbytranslator}\space}% @@ -2518,10 +2891,10 @@ {\addcomma\addspace}}% {\addcomma\addspace}}% 16th ed -- no more volumes test. {\iftoggle{cms@fullnote}% - {\ifthenelse{\(\iffieldequalstr{entrytype}{article}\OR - \iffieldequalstr{entrytype}{review}\OR - \iffieldequalstr{entrytype}{periodical}\OR - \iffieldequalstr{entrytype}{suppperiodical}\)\AND\NOT + {\ifthenelse{\(\ifentrytype{article}\OR + \ifentrytype{review}\OR + \ifentrytype{periodical}\OR + \ifentrytype{suppperiodical}\)\AND\NOT \iffieldequalstr{entrysubtype}{magazine}}% {\addcolon\addspace}% {\addcomma\addspace}}% @@ -2583,6 +2956,60 @@ {}% \finentry} +\newbibmacro*{book:xref+finentry}{% + \iffieldundef{crossref}% + {\iffieldundef{xref}% + {}% + {\iftoggle{cms@bookcitexref}% + {}% + {\ifboolexpr{ + test {\ifpunct}% + or + test {\ifpunctmark{*}}% + }% + {\bibhypertarget{\thefield{xref}}% + {\cmsnoopcite{\thefield{xref}}}\nopunct}% + {\bibhypertarget{\thefield{xref}}% + {\cmsnoopcite{\thefield{xref}}}}}}}% + {\iftoggle{cms@bookcitexref}% + {}% + {\ifboolexpr{ + test {\ifpunct}% + or + test {\ifpunctmark{*}}% + }% + {\bibhypertarget{\thefield{crossref}}% + {\cmsnoopcite{\thefield{crossref}}}\nopunct}% + {\bibhypertarget{\thefield{crossref}}% + {\cmsnoopcite{\thefield{crossref}}}}}}} + +\newbibmacro*{cite:xref+finentry}{% + \iffieldundef{crossref}% + {\iffieldundef{xref}% + {}% + {\iftoggle{cms@citecrossref}% + {}% + {\ifboolexpr{ + test {\ifpunct}% + or + test {\ifpunctmark{*}}% + }% + {\bibhypertarget{\thefield{xref}}% + {\cmsnoopcite{\thefield{xref}}}\nopunct}% + {\bibhypertarget{\thefield{xref}}% + {\cmsnoopcite{\thefield{xref}}}}}}}% + {\iftoggle{cms@citecrossref}% + {}% + {\ifboolexpr{ + test {\ifpunct}% + or + test {\ifpunctmark{*}}% + }% + {\bibhypertarget{\thefield{crossref}}% + {\cmsnoopcite{\thefield{crossref}}}\nopunct}% + {\bibhypertarget{\thefield{crossref}}% + {\cmsnoopcite{\thefield{crossref}}}}}}} + \newbibmacro*{entrytail}{% From reading.bbx, for annotated bibliography \newunit\newblock \iftoggle{cms@annotation}% @@ -2625,7 +3052,7 @@ \iffieldundef{maintitle}\AND\iffieldundef{issuetitle}\)% \OR\iffieldsequal{booktitle}{title}% Changed these for crossrefed \OR\iffieldsequal{maintitle}{title}}% entries. Create problems? - {\iffieldequalstr{entrytype}{video}% Change for Video type? Appears + {\ifentrytype{video}% Change for Video type? Appears {\newcunit\newblock}% to treat italicized title as booktitle in {\newunit\newblock}}% available examples. Added issuetitle 0.9.9c. {\newcunit\newblock}} @@ -2913,15 +3340,60 @@ \newbibmacro*{cms-in:}{% Fix for 0.9a compat. \iftoggle{cms@origpublished}% {} - {\bibstring{in} - \setunit{\addspace}}} - -\newbibmacro*{alt-in:}{% - \iffieldundef{booktitle}% - {} {\bibstring{in}% \setunit{\addspace}}} +\newbibmacro*{bibxref-in:}{% + \iffieldundef{volume}% + {\ifcsdef{cbx@incollvol}% + {\restorefield{volume}{\cbx@incollvol}\toggletrue{cms@xrefvol}% + \ifcsdef{cbx@incollpart}% + {\restorefield{part}{\cbx@incollpart}}% + {}% + \ifthenelse{\ifentrytype{mvbook}\OR\ifentrytype{mvcollection}\OR% + \ifentrytype{mvproceedings}\OR\ifentrytype{mvreference}}% + {\printfield{volume}% + \clearfield{volume}% + \global\let\cbx@incollvol\undefined% Volume fix + \printfield{part}% + \clearfield{part}% + \global\let\cbx@incollpart\undefined% Volume fix + \setunit{\addspace}% + \bibstring{ofseries}% + \setunit{\addspace}}% + {\usebibmacro{cms-in:}}}% + {\iffieldundef{part}% + {\ifcsdef{cbx@incollpart}% + {\restorefield{part}{\cbx@incollpart}\toggletrue{cms@xrefpart}}% + {}}% + {}% + \ifthenelse{\ifentrytype{mvbook}\OR\ifentrytype{mvcollection}\OR% + \ifentrytype{mvproceedings}\OR\ifentrytype{mvreference}}% + {\printfield[xrefpart]{part}% + \clearfield{part}% + \global\let\cbx@incollpart\undefined% Volume fix + \setunit{\addspace}% + \bibstring{ofseries}% + \setunit{\addspace}}% + {\usebibmacro{cms-in:}}}}% + {\iffieldundef{part}% + {\ifcsdef{cbx@incollpart}% + {\restorefield{part}{\cbx@incollpart}\toggletrue{cms@xrefpart}}% + {}}% + {}% + \ifthenelse{\ifentrytype{mvbook}\OR\ifentrytype{mvcollection}\OR% + \ifentrytype{mvproceedings}\OR\ifentrytype{mvreference}}% + {\printfield{volume}% + \clearfield{volume}% + \global\let\cbx@incollvol\undefined% Volume fix + \printfield{part}% + \clearfield{part}% + \global\let\cbx@incollpart\undefined% Volume fix + \setunit{\addspace}% + \bibstring{ofseries}% + \setunit{\addspace}}% + {\usebibmacro{cms-in:}}}}% + \newbibmacro*{chapincoll}{% \iffieldundef{chapter}% {} @@ -2930,7 +3402,7 @@ \newbibmacro*{chapinscore}{% \iffieldundef{chapter}% - {\ifthenelse{\iffieldequalstr{entrytype}{music}% 16th ed. + {\ifthenelse{\ifentrytype{music}% 16th ed. \AND\NOT\iffieldundef{booktitle}}% {\bibstring{on}\setunit{\addspace}}% {}} @@ -3040,9 +3512,9 @@ \newbibmacro*{issuetitle}{% \iffieldundef{issuetitle}% {} - {\ifthenelse{\iffieldequalstr{entrytype}{article}\OR% - \iffieldequalstr{entrytype}{review}\OR% - \iffieldequalstr{entrytype}{suppperiodical}}% This test is for + {\ifthenelse{\ifentrytype{article}\OR% + \ifentrytype{review}\OR% + \ifentrytype{suppperiodical}}% This test is for {\usebibmacro{cms-in:}}% periodical entries {}% \printtext[issuetitle]{% @@ -3052,19 +3524,24 @@ \newbibmacro*{btitle+bstitle}{% \iffieldundef{booktitle} - {} - {\printtext[booktitle]{% - \printfield[noformat]{booktitle}% - \setunit{\addcolon\addspace}% - \printfield[noformat]{booksubtitle}}% - \newcunit - \printfield{booktitleaddon}}} + {} + {\ifthenelse{\ifentrytype{audio}\OR\ifentrytype{music}\OR% + \ifentrytype{video}}% + {}% + {\usebibmacro{cms-in:}}% + \printtext[booktitle]{% + \printfield[noformat]{booktitle}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{booksubtitle}}% + \newcunit + \printfield{booktitleaddon}% + \setunit*{\addcomma\addspace}}} \newbibmacro*{publ+loc+year}{% Revised for reprint \ifboolexpr{ - togl{cms@reprint} + togl {cms@reprint} and - not test {\iffieldequalstr{entrytype}{video}} + not test {\ifentrytype{video}} }% {\bibstring{reprint}% \newcunit}% @@ -3136,7 +3613,7 @@ \ifboolexpr{ togl {cms@reprint} and - not test{\iffieldequalstr{entrytype}{video}} + not test{\ifentrytype{video}} }% {\bibsstring{reprint}% \newcunit}% @@ -3150,15 +3627,23 @@ \usebibmacro{date}}}}% \newbibmacro*{cpubletter+loc+year}{% - \setunit{\addspace}% + \ifboolexpr{ + test {\iflistundef{location}} + and + test {\iflistundef{publisher}} + and + test {\iffieldundef{year}} + }% + {}% + {\setunit{\addspace}% \printtext[parens]{% - \printlist{location}% - \iflistundef{publisher} - {\setunit*{\addspace}} - {\setunit*{\addcolon\space}}% - \printlist{publisher}% - \setunit{\addcomma\space}% - \usebibmacro{date}}}% Changed for 0.9 + \printlist{location}% + \iflistundef{publisher} + {\setunit*{\addspace}} + {\setunit*{\addcolon\space}}% + \printlist{publisher}% + \setunit{\addcomma\space}% + \usebibmacro{date}}}}% Changed for 0.9 \newbibmacro*{originally+published+as}{% Punctuation fix now in \iffieldundef{userf}% \origfullcite for 0.8e. @@ -3219,7 +3704,7 @@ {\iffieldundef{number}% {\ifthenelse{\iffieldundef{pagination}\AND% \iffieldundef{bookpagination}}% - {\setunit{\addcolon}}% + {\setunit{\postvolpunct}}% {\setunit{\addcolon\addspace}}}% {\addcomma\addspace}}% {\setunit{\addspace}% @@ -3242,7 +3727,7 @@ {\iffieldundef{number}% {\ifthenelse{\iffieldundef{pagination}\AND% \iffieldundef{bookpagination}}% - {\setunit{\addcolon}}% + {\setunit{\postvolpunct}}% {\setunit{\addcolon\addspace}}}% {\addcomma\addspace}}% {\setunit{\addspace}% @@ -3295,8 +3780,8 @@ {}}% \newbibmacro*{choosepubstring}{% - \ifthenelse{\iffieldequalstr{entrytype}{video}\OR% - \iffieldequalstr{entrytype}{music}}% + \ifthenelse{\ifentrytype{video}\OR% + \ifentrytype{music}}% {\bibstring{origreleaseyear}}% {\bibstring{origpubyearalt}}}% @@ -3305,6 +3790,55 @@ {\printorigdate}% {\printdate}} +\newbibmacro{cite:xref+date}{% + \ifboolexpr{ + togl {cms@omitxrefdate}% + or + togl {cms@bookcitexref}% + or + test {\iffieldundef{crossref}}% + or + test {\iffieldundef{maintitle}}% + or + (( + test {\iffieldundef{year}}% + or + togl {cms@switchdates}% + ) + and + (test {\iffieldundef{origyear}}% + or + not togl {cms@switchdates}% + )) + or + not test {\ifentryseen{\thefield{crossref}}}% + } + {\ifboolexpr{ + togl {cms@omitxrefdate}% + or + togl {cms@bookcitexref}% + or + test {\iffieldundef{xref}}% + or + test {\iffieldundef{maintitle}} + or + (( + test {\iffieldundef{year}}% + or + togl {cms@switchdates}% + ) + and + (test {\iffieldundef{origyear}}% + or + not togl {cms@switchdates}% + )) + or + not test {\ifentryseen{\thefield{xref}}}% + } + {}% + {\printtext[parens]{\usebibmacro{date}}}}% + {\printtext[parens]{\usebibmacro{date}}}} + \newbibmacro*{cmsorigdate}{% New for 0.9 \iftoggle{cms@switchdates}% {\printdate}% @@ -3469,7 +4003,7 @@ \newbibmacro*{cmtitle+mstitle+vol+part+title+stitle}{% \iffieldundef{maintitle} {} - {\iffieldundef{volume} + {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}% {\usebibmacro{cms-in:}% \printtext[maintitle]{% \printfield[noformat]{maintitle}% @@ -3477,33 +4011,8 @@ \printfield[noformat]{mainsubtitle}}% \newcunit \printfield{maintitleaddon}} - {\printfield{volume}% - \printfield{part}% - \setunit{\addspace} - \bibstring{ofseries}% - \setunit{\addspace} - \printtext[maintitle]{% - \printfield[noformat]{maintitle}% - \setunit{\addcolon\addspace}% - \printfield[noformat]{mainsubtitle}}% - \newcunit - \printfield{maintitleaddon}}}} - -\newbibmacro*{crefmtitle+mstitle+vol+part+title+stitle}{% - \iffieldundef{booktitle} - {\usebibmacro{citaltitle+stitle}}% - {\usebibmacro{btitle+bstitle}}% - \newcunit% need this? - \iffieldundef{maintitle} - {}% - {\iffieldundef{volume} - {\printtext[maintitle]{% - \printfield[noformat]{maintitle}% - \setunit{\addcolon\addspace}% - \printfield[noformat]{mainsubtitle}}% - \newcunit - \printfield{maintitleaddon}} - {\printfield{volume}% + {\toggletrue{cms@usedvol}% + \printfield{volume}% \printfield{part}% \setunit{\addspace} \bibstring{ofseries}% @@ -3517,18 +4026,22 @@ \newbibmacro*{cmtitle+mstitle+vol+part+btitle+bstitle}{% \usebibmacro{btitle+bstitle}% - \newcunit \iffieldundef{maintitle} {} - {\iffieldundef{volume} - {\usebibmacro{cms-in:}% + {\ifthenelse{\(\iffieldundef{volume}\AND\iffieldundef{part}\)\OR% + \(\iffieldundef{booktitle}\AND\NOT\ifentrytype{bookinbook}\)}% + {\iffieldundef{booktitle}% Fix for origpublin ??? + {\usebibmacro{cms-in:}}% + {\bibstring{in}\setunit{\addspace}}% \printtext[maintitle]{% \printfield[noformat]{maintitle}% \setunit{\addcolon\addspace}% \printfield[noformat]{mainsubtitle}}% \newcunit - \printfield{maintitleaddon}} - {\printfield{volume}% + \printfield{maintitleaddon}% + \toggletrue{cms@vol}}% InIn fix + {\toggletrue{cms@usedvol}% + \printfield{volume}% \printfield{part}% \setunit{\addspace} \bibstring{ofseries}% @@ -3595,48 +4108,27 @@ {\postnotedelim% Don't need \ifbibliography test w/ following \usebibmacro{semel:postnote}}} -\newbibmacro*{volume+or+volumes}{% Volume fix - \iffieldundef{maintitle}% - {\iffieldundef{volume}% - {\printfield{volumes}}% - {\printfield{volume}% - \printfield{part}}}% - {\printfield{volumes}}} - -\newbibmacro*{crossref:volume+postnote}{% - \ifcsdef{cbx@incollpgn}% - {\restorefield{pagination}{\cbx@incollpgn}}% - {}% - \ifcsdef{cbx@incollbkpgn}% - {\restorefield{bookpagination}{\cbx@incollbkpgn}}% - {}% - \iffieldundef{volume}% Volume fix (unfinished) - {\ifcsdef{cbx@incollvol}% - {\restorefield{volume}{\cbx@incollvol}% - \ifcsdef{cbx@incollpart}{\restorefield{part}{\cbx@incollpart}}{}% - \iffieldundef{postnote}% - {\ifcsdef{cbx@incollpages}% - {\restorefield{pages}{\cbx@incollpages}% - \iffieldundef{part}% - {\ifthenelse{\iffieldnums{pages}\AND% - \iffieldundef{bookpagination}}% - {\newcunit\printfield[default]{volume}% - \addcolon% - \printfield{pages}}% - {\newcunit\printfield{volume}% - \addcomma\addspace% - \printfield{pages}}}% - {\newcunit\printfield{volume}% - \printfield{part}% - \addcomma\addspace% - \printfield{pages}}}% +\newbibmacro*{volfullpostnote}{% + \iftoggle{cms@postvol}% + {\ifboolexpr{( + test {\iffieldundef{volume}}% + and + test {\iffieldundef{part}}% + ) + or + togl {cms@usedvol}% + }% + {\usebibmacro{fullpostnote}}% + {\iffieldundef{postnote}% + {\iffieldundef{chapter}% {\iffieldundef{pages}% - {\newcunit\printfield{volume}\printfield{part}}% + {\newcunit\printfield{volume}% + \printfield{part}}% {\iffieldundef{part}% {\ifthenelse{\iffieldnums{pages}\AND% - \iffieldundef{bookpagination}}% + \iffieldundef{bookpagination}\AND\iffieldnums{volume}}% {\newcunit\printfield[default]{volume}% - \addcolon% + \postvolpunct% \printfield{pages}}% {\newcunit\printfield{volume}% \addcomma\addspace% @@ -3644,12 +4136,16 @@ {\newcunit\printfield{volume}% \printfield{part}% \addcomma\addspace% - \printfield{pages}}}}}% + \printfield{pages}}}}% + {\newcunit\printfield{volume}% + \printfield{part}% + \newcunit + \printfield{chapter}}}% {\iffieldundef{part}% {\ifthenelse{\iffieldnums{postnote}\AND% - \iffieldundef{pagination}}% + \iffieldundef{pagination}\AND\iffieldnums{volume}}% {\newcunit\printfield[default]{volume}% - \addcolon% + \postvolpunct% \usebibmacro{semel:postnote}}% {\newcunit\printfield{volume}% \addcomma\addspace% @@ -3657,57 +4153,182 @@ {\newcunit\printfield{volume}% \printfield{part}% \addcomma\addspace% - \usebibmacro{semel:postnote}}}}% - {\ifcsdef{cbx@incollpages}% - {\restorefield{pages}{\cbx@incollpages}% - \usebibmacro{fullpostnote}}% - {\usebibmacro{fullpostnote}}}}% - {\iffieldundef{postnote}% + \usebibmacro{semel:postnote}}}}}% + {\usebibmacro{fullpostnote}}% + \global\togglefalse{cms@usedvol}}% + +\newbibmacro*{volume+or+volumes}{% Volume fix (modified) + \ifboolexpr{ ( + test {\iffieldundef{maintitle}}% + or + togl {cms@vol}% + ) + and + not togl {cms@postvol}% + and + not togl {cms@usedvol}% + }% + {\global\togglefalse{cms@vol}% + \ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}% + {\printfield{volumes}}% + {\printfield{volume}% + \printfield{part}}}% + {\ifboolexpr{ + togl {cms@hidevolumes}% + and + ( + not test {\iffieldundef{volume}}% + or + not test {\iffieldundef{part}}% + or + togl {cms@usedvol}% + ) + }% + {\global\togglefalse{cms@vol}}% + {\global\togglefalse{cms@vol}% + \printfield{volumes}}}} + +\newbibmacro*{crossref:volume+postnote}{% + \ifcsdef{cbx@incollpgn}% + {\restorefield{pagination}{\cbx@incollpgn}}% + {}% + \ifcsdef{cbx@incollbkpgn}% + {\restorefield{bookpagination}{\cbx@incollbkpgn}}% + {}% + \iffieldundef{volume}% Volume fix (unfinished) + {\ifcsdef{cbx@incollvol}% + {\restorefield{volume}{\cbx@incollvol}% + \ifcsdef{cbx@incollpart}{\restorefield{part}{\cbx@incollpart}}{}% + \iffieldundef{postnote}% {\ifcsdef{cbx@incollpages}% {\restorefield{pages}{\cbx@incollpages}% - \iffieldundef{part}% - {\ifthenelse{\iffieldnums{pages}\AND% - \iffieldundef{bookpagination}}% - {\newcunit\printfield[default]{volume}% - \addcolon% - \printfield{pages}}% - {\newcunit\printfield{volume}% - \addcomma\addspace% - \printfield{pages}}}% - {\newcunit\printfield{volume}% - \printfield{part}% - \addcomma\addspace% - \printfield{pages}}}% + \usebibmacro{pages+cref+print}}% {\iffieldundef{pages}% {\newcunit\printfield{volume}\printfield{part}}% - {\iffieldundef{part}% - {\ifthenelse{\iffieldnums{pages}\AND% - \iffieldundef{bookpagination}}% - {\newcunit\printfield[default]{volume}% - \addcolon% - \printfield{pages}}% - {\newcunit\printfield{volume}% - \addcomma\addspace% - \printfield{pages}}}% - {\newcunit\printfield{volume}% - \printfield{part}% - \addcomma\addspace% - \printfield{pages}}}}}% - {\iffieldundef{part}% - {\ifthenelse{\iffieldnums{postnote}\AND% - \iffieldundef{pagination}}% - {\newcunit\printfield[default]{volume}% - \addcolon% - \usebibmacro{semel:postnote}}% - {\newcunit\printfield{volume}% - \addcomma\addspace% - \usebibmacro{semel:postnote}}}% - {\newcunit\printfield{volume}% - \printfield{part}% - \addcomma\addspace% - \usebibmacro{semel:postnote}}}}}% + {\usebibmacro{pages+cref+print}}}}% + {\usebibmacro{postnote+cref+print}}}% + {\iffieldundef{part}% + {\ifcsdef{cbx@incollpart}% + {\restorefield{part}{\cbx@incollpart}% + \iffieldundef{postnote}% + {\ifcsdef{cbx@incollpages}% + {\restorefield{pages}{\cbx@incollpages}% + \usebibmacro{pages+cref+print}}% + {\iffieldundef{pages}% + {\newcunit\printfield{volume}\printfield{part}}% + {\usebibmacro{pages+cref+print}}}}% + {\usebibmacro{postnote+cref+print}}}% + {\ifcsdef{cbx@incollpages}% + {\restorefield{pages}{\cbx@incollpages}% + \usebibmacro{fullpostnote}}% + {\usebibmacro{fullpostnote}}}}% + {\iffieldundef{postnote}% + {\ifcsdef{cbx@incollpages}% + {\restorefield{pages}{\cbx@incollpages}% + \usebibmacro{pages+cref+print}}% + {\iffieldundef{pages}% + {\newcunit\printfield{volume}\printfield{part}}% + {\usebibmacro{pages+cref+print}}}}% + {\usebibmacro{postnote+cref+print}}}}}% + {\iffieldundef{part}% + {\ifcsdef{cbx@incollpart}% + {\restorefield{part}{\cbx@incollpart}}% + {}}% + {}% + \iffieldundef{maintitle}% More elaborate test ??? + {\iffieldundef{postnote}% + {\ifcsdef{cbx@incollpages}% + {\restorefield{pages}{\cbx@incollpages}% + \usebibmacro{pages+cref+print}}% + {\iffieldundef{pages}% + {\newcunit\printfield{volume}\printfield{part}}% + {\usebibmacro{pages+cref+print}}}}% + {\usebibmacro{postnote+cref+print}}}% + {\ifboolexpr{ + test {\ifcsdef{cbx@incollvol}}% + and + ( + not test {\iffieldequalcs{volume}{cbx@incollvol}}% + or + togl {cms@xrefvol}% Necessary ??? + ) + }% + {\restorefield{volume}{\cbx@incollvol}% + \iffieldundef{part}% + {\ifcsdef{cbx@incollpart}{\restorefield{part}{\cbx@incollpart}}{}}% + {\ifboolexpr{ + test {\ifcsdef{cbx@incollpart}}% + and + ( + not test {\iffieldequalcs{part}{cbx@incollpart}}% + or + togl {cms@xrefpart}% + ) + }% + {\clearfield{part}\restorefield{part}{\cbx@incollpart}}% + {\clearfield{part}}}% + \iffieldundef{postnote}% + {\ifcsdef{cbx@incollpages}% + {\restorefield{pages}{\cbx@incollpages}% + \usebibmacro{pages+cref+print}}% + {\iffieldundef{pages}% + {\newcunit\printfield{volume}\printfield{part}}% + {\usebibmacro{pages+cref+print}}}}% + {\usebibmacro{postnote+cref+print}}}% + {\ifboolexpr{ + test {\ifcsdef{cbx@incollpart}}% + and + ( + not test {\iffieldequalcs{part}{cbx@incollpart}}% + or + togl {cms@xrefpart}% + ) + } + {\iffieldundef{postnote}% + {\ifcsdef{cbx@incollpages}% + {\restorefield{pages}{\cbx@incollpages}% + \printfield{part}\newcunit\printfield{pages}}% + {\iffieldundef{pages}% + {\printfield{part}}% + {\printfield{part}\newcunit\printfield{pages}}}}% + {\printfield{part}\newcunit\usebibmacro{semel:postnote}}}% + {\ifcsdef{cbx@incollpages}% + {\restorefield{pages}{\cbx@incollpages}% + \usebibmacro{fullpostnote}}% + {\usebibmacro{fullpostnote}}}}}}}% + +\newbibmacro*{pages+cref+print}{% Reusable chunk for above + \iffieldundef{part}% + {\ifthenelse{\iffieldnums{pages}\AND% + \iffieldundef{bookpagination}\AND\iffieldnums{volume}}% + {\newcunit\printfield[default]{volume}% + \postvolpunct% + \printfield{pages}}% + {\newcunit\printfield{volume}% + \addcomma\addspace% + \printfield{pages}}}% + {\newcunit\printfield{volume}% + \printfield{part}% + \addcomma\addspace% + \printfield{pages}}} + +\newbibmacro*{postnote+cref+print}{% Reusable chunk for above + \iffieldundef{part}% + {\ifthenelse{\iffieldnums{postnote}\AND% + \iffieldundef{pagination}\AND\iffieldnums{volume}}% + {\newcunit\printfield[default]{volume}% + \postvolpunct% + \usebibmacro{semel:postnote}}% + {\newcunit\printfield{volume}% + \addcomma\addspace% + \usebibmacro{semel:postnote}}}% + {\newcunit\printfield{volume}% + \printfield{part}% + \addcomma\addspace% + \usebibmacro{semel:postnote}}} \newbibmacro*{inreffullpostnote}{% + \global\togglefalse{cms@usedvol}% \iffieldundef{postnote}% {\iffieldundef{chapter}% {\iffieldundef{pages}% @@ -3729,6 +4350,9 @@ {\cbx@incollbkpgn}}} \newbibmacro*{xrefpostnote}{% + \togglefalse{cms@xrefvol}% + \togglefalse{cms@xrefpart}% + \global\togglefalse{cms@usedvol}% \global\let\cbx@incollvol\undefined% Volume fix \global\let\cbx@incollpages\undefined% \global\let\cbx@incollpart\undefined% @@ -3745,7 +4369,13 @@ \iffieldundef{prenote}% command, rather than \headlessfullcite. {\bibsentence}% Needed for Ibid to be capitalized. {\printfield{prenote}% - \ifciteseen{\addspace}{\nopunct}}}% Do we need \unspace here? + \ifboolexpr{% + test {\ifciteseen} + or + togl {cms@allshort} + }% + {\addspace}% + {\nopunct}}}% Do we need \unspace here? \newbibmacro*{journalprenote}{% \iffieldundef{prenote}% @@ -3810,6 +4440,58 @@ \inherit{subtitle}{subtitle} \inherit{titleaddon}{titleaddon}} +\DeclareDataInheritance{mvbook}{incollection}{% + \inherit{title}{maintitle} + \inherit{subtitle}{mainsubtitle} + \inherit{titleaddon}{maintitleaddon} + \noinherit{shorttitle} + \noinherit{sorttitle} + \noinherit{indextitle} + \noinherit{indexsorttitle} +} + +\DeclareDataInheritance{book,collection}{letter}{% + \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} + \inherit{titleaddon}{maintitleaddon} + \noinherit{shorttitle} + \noinherit{sorttitle} + \noinherit{indextitle} + \noinherit{indexsorttitle} +} + +\DeclareDataInheritance{*}{*}{% + \noinherit{namea} + \noinherit{nameb} + \noinherit{sortyear} + \noinherit{sortname} + \noinherit{sorttitle}} + +\DeclareDataInheritance{mvbook,mvcollection,mvproceedings,mvreference}% +{*}{% ??? + \noinherit{year} + \noinherit{month} + \noinherit{day} + \noinherit{endyear} + \noinherit{endmonth} + \noinherit{endday} + \noinherit{origyear} + \noinherit{origmonth} + \noinherit{origday} + \noinherit{origendyear} + \noinherit{origendmonth} + \noinherit{origendday}} + \DeclareSortingScheme{cms}{ \sort{ \field{presort} @@ -3974,9 +4656,13 @@ \clearname{namea}% \clearname{nameb}% \clearfield{nameaddon}% - \clearfield{title}% - \clearfield{subtitle}% - \clearfield{titleaddon}% + \ifthenelse{\ifentrytype{periodical}\OR\ifentrytype{mvbook}\OR% + \ifentrytype{mvcollection}\OR\ifentrytype{mvproceedings}\OR% + \ifentrytype{mvreference}}% + {}% + {\clearfield{title}% + \clearfield{subtitle}% + \clearfield{titleaddon}}% \clearfield{reprinttitle}% \clearfield{usere}% \clearlist{language}% diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.cbx index 4d09088a2f4..ca84169b50d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.cbx @@ -1,11 +1,11 @@ -% $Id: chicago-notes15.cbx,v 0.9.7.21 2012/12/06 12:14:29 dfussner Exp $ +% $Id: chicago-notes15.cbx,v 0.9.7.22 2013/10/21 14:51:29 dfussner Exp $ % This is a biblatex citation style file, adapted from Lehman's % authortitle-cverb.cbx. It is heavily modified, with the intention % of providing footnote citations and a bibliography formatted % according to the specifications of the Chicago Manual of Style, % _15th_ edition. -\ProvidesFile{chicago-notes15.cbx}[2012/12/06 v 2.4 biblatex citation style] +\ProvidesFile{chicago-notes15.cbx}[2013/10/21 v 2.8 biblatex citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -2414,7 +2414,7 @@ \DeclareFieldFormat{annotation}{\par\nobreak \vskip \bibitemsep #1} -\DeclareFieldFormat{part}{\addcomma\bibstring{partvolume}~#1} +\DeclareFieldFormat{part}{\addcomma\addspace\bibstring{partvolume}~#1} \DeclareFieldAlias[review]{volume}[article]{volume} @@ -3616,6 +3616,65 @@ {\bibsentence}% {\usebibmacro{prenote}}} +%% From 16th ed. %% + +\DeclareDataInheritance{collection}{suppcollection}{% + \inherit{title}{title} + \inherit{subtitle}{subtitle} + \inherit{titleaddon}{titleaddon}} + +\DeclareDataInheritance{mvbook}{incollection}{% ??? + \inherit{title}{maintitle} + \inherit{subtitle}{mainsubtitle} + \inherit{titleaddon}{maintitleaddon} + \noinherit{shorttitle} + \noinherit{sorttitle} + \noinherit{indextitle} + \noinherit{indexsorttitle} +} + +\DeclareDataInheritance{book,collection}{letter}{% ??? + \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} + \inherit{titleaddon}{maintitleaddon} + \noinherit{shorttitle} + \noinherit{sorttitle} + \noinherit{indextitle} + \noinherit{indexsorttitle} +} + +\DeclareDataInheritance{*}{*}{% + \noinherit{namea} + \noinherit{nameb} + \noinherit{sortyear} + \noinherit{sortname} + \noinherit{sorttitle}} + +\DeclareDataInheritance{mvbook,mvcollection,mvproceedings,mvreference}% +{*}{% ??? + \noinherit{year} + \noinherit{month} + \noinherit{day} + \noinherit{endyear} + \noinherit{endmonth} + \noinherit{endday} + \noinherit{origyear} + \noinherit{origmonth} + \noinherit{origday} + \noinherit{origendyear} + \noinherit{origendmonth} + \noinherit{origendday}} + \newbibmacro*{part+editor+translator}{% \ifnameundef{namea}% {\ifnameundef{nameb}% diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx index 37eb9e735d2..49f8987d745 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx @@ -1,6 +1,6 @@ -% $Id: cms-american.lbx,v 0.10.1.31 2013/03/14 16:42:23 dfussner Exp $ +% $Id: cms-american.lbx,v 0.10.1.35 2013/10/29 14:13:10 dfussner Exp $ -\ProvidesFile{cms-american.lbx}[2013/03/14 v 2.5 biblatex localization] +\ProvidesFile{cms-american.lbx}[2013/10/29 v 2.8 biblatex localization] \InheritBibliographyExtras{american} @@ -251,7 +251,7 @@ afterwordto = {{afterword to}{afterw\adddot\space to}}, forewordto = {{foreword to}{forew\adddot\space to}}, introductionto = {{introduction to}{intro\adddot\space to}}, - partvolume = {{\addspace bk\adddot}{\addspace bk\adddot}}, + partvolume = {{bk\adddot}{bk\adddot}}, by = {{by}{by}}, of = {{of}{of}}, on = {{on}{on}}, @@ -811,7 +811,10 @@ {} {\printtext[#2date]{% \iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}% + {\csuse{mkbibdate#1}{#2year}{}{}% + \clearfield{#2endyear}}% Clear up inheritance problem ??? + {\csuse{mkbibdate#1}{}{#2month}{#2day}}}% {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% \iffieldundef{#2endyear} {\iffieldundef{#2endmonth} @@ -829,12 +832,15 @@ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}} -\protected\gdef\lbx@cms@mkbibrangetrunc@short#1#2{% +\protected\gdef\lbx@cms@mkbibrangetrunc@short#1#2{% Modify ??? \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}% {} {\printtext[#2date]{% \iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}% + {\csuse{mkbibdate#1}{#2year}{}{}% + \clearfield{#2endyear}}% Clear up inheritance problem ??? + {\csuse{mkbibdate#1}{}{#2month}{#2day}}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}} {} @@ -846,7 +852,11 @@ \protected\gdef\lbx@cms@mkbibrangefull#1#2{% \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}% {}% - {\printtext[#2date]{% + {\ifthenelse{\iffieldsequal{#2year}{#2endyear}\AND% + \iffieldundef{#2month}\AND\iffieldundef{#2day}}% + {\clearfield{#2endyear}}% Clear up inheritance problem ??? + {}% + \printtext[#2date]{% \csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}} {} diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx index 0b7949341bd..20bca56a1d6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx @@ -1,6 +1,6 @@ -% $Id: cms-british.lbx,v 0.5 2013/03/14 16:44:04 dfussner Exp $ +% $Id: cms-british.lbx,v 0.7 2013/10/29 14:13:55 dfussner Exp $ -\ProvidesFile{cms-british.lbx}[2013/03/14 v 2.5 biblatex localization] +\ProvidesFile{cms-british.lbx}[2013/10/29 v 2.8 biblatex localization] \InheritBibliographyExtras{british} @@ -49,7 +49,10 @@ \iffieldsequal{#2year}{#2endyear} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{}{}{#2day}} - {\csuse{mkbibdate#1}{}{#2month}{#2day}}} + {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}% + {\csuse{mkbibdate#1}{#2year}{}{}% + \clearfield{#2endyear}}% Clear up inheritance problem ??? + {\csuse{mkbibdate#1}{}{#2month}{#2day}}}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% \iffieldundef{#2endyear} {} @@ -61,7 +64,11 @@ \protected\gdef\lbx@cms@mkbibrangefull#1#2{% \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}% {}% - {\printtext[#2date]{% + {\ifthenelse{\iffieldsequal{#2year}{#2endyear}\AND% + \iffieldundef{#2month}\AND\iffieldundef{#2day}}% + {\clearfield{#2endyear}}% Clear up inheritance problem ??? + {}% + \printtext[#2date]{% \csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}} {} diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx index 5bec9bfff6b..e136fd56e1c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx @@ -1,6 +1,6 @@ -% $Id: cms-finnish.lbx,v 0.3 2013/03/14 16:43:14 dfussner Exp $ +% $Id: cms-finnish.lbx,v 0.6 2013/10/29 14:15:17 dfussner Exp $ -\ProvidesFile{cms-finnish.lbx}[2013/03/14 v 2.5 biblatex localization] +\ProvidesFile{cms-finnish.lbx}[2013/10/29 v 2.8 biblatex localization] % STATUS OF THIS FILE % - Translated by a native speaker (Antti-Juhani Kaijanaho). @@ -269,7 +269,7 @@ afterwordto = {{j\"alkipuhe teokselle}{j\"alkipuhe teokselle}}, % forewordto = {{foreword to}{forew\adddot\space to}}, introductionto = {{johdanto teoksessa}{johdanto\adddot\space teoksessa}}, - partvolume = {{\addspace osa}{\addspace osa}}, + partvolume = {{osa}{osa}}, by = {{kirjoittanut}{kirjoittanut}}, % of = {{of}{of}}, on = {{levyll\"a}{levyll\"a}}, @@ -845,7 +845,10 @@ \iffieldsequal{#2year}{#2endyear} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{}{}{#2day}} - {\csuse{mkbibdate#1}{}{#2month}{#2day}}} + {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}% + {\csuse{mkbibdate#1}{#2year}{}{}% + \clearfield{#2endyear}}% Clear up inheritance problem ??? + {\csuse{mkbibdate#1}{}{#2month}{#2day}}}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% \iffieldundef{#2endyear} {} @@ -857,7 +860,11 @@ \protected\gdef\lbx@cms@mkbibrangefull#1#2{% \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}% {}% - {\printtext[#2date]{% + {\ifthenelse{\iffieldsequal{#2year}{#2endyear}\AND% + \iffieldundef{#2month}\AND\iffieldundef{#2day}}% + {\clearfield{#2endyear}}% Clear up inheritance problem ??? + {}% + \printtext[#2date]{% \csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}} {} diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx index 32903140d7a..fe046122525 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx @@ -1,6 +1,6 @@ -% $Id: cms-french.lbx,v 0.9.5.24 2013/03/14 16:42:55 dfussner Exp $ +% $Id: cms-french.lbx,v 0.9.5.27 2013/10/29 14:16:06 dfussner Exp $ -\ProvidesFile{cms-french.lbx}[2013/03/14 v 2.5 biblatex localization] +\ProvidesFile{cms-french.lbx}[2013/10/29 v 2.8 biblatex localization] % STATUS OF THIS FILE % - Some strings still missing @@ -10,6 +10,8 @@ \InheritBibliographyExtras{french} \DeclareBibliographyExtras{% + \savecommand\postvolpunct% + \renewcommand{\postvolpunct}{\addcolon\addspace}% \toggletrue{cms@postposit}% \savecommand\mkbibnamelast \protected\def\mkbibnamelast#1{#1}% No small caps for Chicago (?) @@ -28,6 +30,7 @@ \def\cms@datelongalt{\printdate}}% \UndeclareBibliographyExtras{% + \restorecommand\postvolpunct% \restorecommand\mkbibnamelast \restorecommand\cms@datelong \restorecommand\cms@datelongalt @@ -803,7 +806,10 @@ \iffieldsequal{#2year}{#2endyear} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{}{}{#2day}} - {\csuse{mkbibdate#1}{}{#2month}{#2day}}} + {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}% + {\csuse{mkbibdate#1}{#2year}{}{}% + \clearfield{#2endyear}}% Clear up inheritance problem ??? + {\csuse{mkbibdate#1}{}{#2month}{#2day}}}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% \iffieldundef{#2endyear} {} @@ -815,7 +821,11 @@ \protected\gdef\lbx@cms@mkbibrangefull#1#2{% \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}% {}% - {\printtext[#2date]{% + {\ifthenelse{\iffieldsequal{#2year}{#2endyear}\AND% + \iffieldundef{#2month}\AND\iffieldundef{#2day}}% + {\clearfield{#2endyear}}% Clear up inheritance problem ??? + {}% + \printtext[#2date]{% \csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}} {} diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx index 955e0e606f3..6697704de2a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx @@ -1,6 +1,6 @@ -% $Id: cms-german.lbx,v 0.9.5.24 2013/03/14 16:42:38 dfussner Exp $ +% $Id: cms-german.lbx,v 0.9.5.27 2013/10/29 14:17:00 dfussner Exp $ -\ProvidesFile{cms-german.lbx}[2013/03/14 v 2.5 biblatex localization] +\ProvidesFile{cms-german.lbx}[2013/10/29 v 2.8 biblatex localization] % STATUS OF THIS FILE % - Translated strings and formatting decisions need review by native @@ -267,7 +267,7 @@ afterwordto = {{Nachwort zu}{Nachw\adddot\ zu}}, forewordto = {{Vorwort zu}{Vorw\adddot\ zu}}, introductionto = {{Einleitung in}{Einl\adddot\ in}}, - partvolume = {{\addspace T\adddot}{\addspace T\adddot}}, + partvolume = {{T\adddot}{T\adddot}}, by = {{von}{von}}, of = {{von}{von}}, on = {{auf}{auf}}, @@ -963,7 +963,10 @@ \iffieldsequal{#2year}{#2endyear} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{}{}{#2day}} - {\csuse{mkbibdate#1}{}{#2month}{#2day}}} + {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}% + {\csuse{mkbibdate#1}{#2year}{}{}% + \clearfield{#2endyear}}% Clear up inheritance problem ??? + {\csuse{mkbibdate#1}{}{#2month}{#2day}}}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% \iffieldundef{#2endyear} {} @@ -975,7 +978,11 @@ \protected\gdef\lbx@cms@mkbibrangefull#1#2{% \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}% {}% - {\printtext[#2date]{% + {\ifthenelse{\iffieldsequal{#2year}{#2endyear}\AND% + \iffieldundef{#2month}\AND\iffieldundef{#2day}}% + {\clearfield{#2endyear}}% Clear up inheritance problem ??? + {}% + \printtext[#2date]{% \csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}} {} diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx index 870490a132b..8ac97d571ed 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx @@ -1,6 +1,6 @@ -% $Id: cms-icelandic.lbx,v 0.7 2013/03/14 16:43:41 dfussner Exp $ +% $Id: cms-icelandic.lbx,v 0.10 2013/10/29 14:18:01 dfussner Exp $ -\ProvidesFile{cms-icelandic.lbx}[2013/03/14 v 2.5 biblatex localization] +\ProvidesFile{cms-icelandic.lbx}[2013/10/29 v 2.8 biblatex localization] % STATUS OF THIS FILE % - Translated by a native speaker (Baldur Kristinsson). @@ -253,7 +253,7 @@ afterwordto = {{eftirm\'ali vi}{eftirm\'ali vi}}, forewordto = {{form\'ali vi}{form\'ali vi}}, introductionto = {{inngangur a}{inngangur a}}, - partvolume = {{\addspace hl\adddot}{\addspace hl\adddot}}, + partvolume = {{hl\adddot}{hl\adddot}}, by = {{eftir}{eftir}}, of = {{af}{af}}, % on = {{}{}}, @@ -474,7 +474,10 @@ \iffieldsequal{#2year}{#2endyear} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{}{}{#2day}} - {\csuse{mkbibdate#1}{}{#2month}{#2day}}} + {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}% + {\csuse{mkbibdate#1}{#2year}{}{}% + \clearfield{#2endyear}}% Clear up inheritance problem ??? + {\csuse{mkbibdate#1}{}{#2month}{#2day}}}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% \iffieldundef{#2endyear} {} @@ -486,7 +489,11 @@ \protected\gdef\lbx@cms@mkbibrangefull#1#2{% \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}% {}% - {\printtext[#2date]{% + {\ifthenelse{\iffieldsequal{#2year}{#2endyear}\AND% + \iffieldundef{#2month}\AND\iffieldundef{#2day}}% + {\clearfield{#2endyear}}% Clear up inheritance problem ??? + {}% + \printtext[#2date]{% \csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}} {} diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx index e49ddd36962..6bbe9710ac1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx @@ -1,6 +1,6 @@ -% $Id: cms-german.lbx,v 0.9.5.24 2013/03/14 16:42:38 dfussner Exp $ +% $Id: cms-german.lbx,v 0.9.5.27 2013/10/29 14:17:00 dfussner Exp $ -\ProvidesFile{cms-ngerman.lbx}[2013/03/14 v 2.5 biblatex localization] +\ProvidesFile{cms-ngerman.lbx}[2013/10/29 v 2.8 biblatex localization] % STATUS OF THIS FILE % - Translated strings and formatting decisions need review by native @@ -267,7 +267,7 @@ afterwordto = {{Nachwort zu}{Nachw\adddot\ zu}}, forewordto = {{Vorwort zu}{Vorw\adddot\ zu}}, introductionto = {{Einleitung in}{Einl\adddot\ in}}, - partvolume = {{\addspace T\adddot}{\addspace T\adddot}}, + partvolume = {{T\adddot}{T\adddot}}, by = {{von}{von}}, of = {{von}{von}}, on = {{auf}{auf}}, @@ -963,7 +963,10 @@ \iffieldsequal{#2year}{#2endyear} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{}{}{#2day}} - {\csuse{mkbibdate#1}{}{#2month}{#2day}}} + {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}% + {\csuse{mkbibdate#1}{#2year}{}{}% + \clearfield{#2endyear}}% Clear up inheritance problem ??? + {\csuse{mkbibdate#1}{}{#2month}{#2day}}}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% \iffieldundef{#2endyear} {} @@ -975,7 +978,11 @@ \protected\gdef\lbx@cms@mkbibrangefull#1#2{% \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}% {}% - {\printtext[#2date]{% + {\ifthenelse{\iffieldsequal{#2year}{#2endyear}\AND% + \iffieldundef{#2month}\AND\iffieldundef{#2day}}% + {\clearfield{#2endyear}}% Clear up inheritance problem ??? + {}% + \printtext[#2date]{% \csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}} {} diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx index 51af37c83ed..8e5dc4a2706 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx @@ -1,14 +1,762 @@ -% $Id: cms-norsk.lbx,v 1.3 2013/03/14 16:41:51 dfussner Exp $ +% $Id: cms-norsk.lbx,v 1.6 2013/10/29 14:19:01 dfussner Exp $ -\ProvidesFile{cms-norsk.lbx}[2013/03/14 v 2.5 biblatex localization] +\ProvidesFile{cms-norsk.lbx}[2013/10/29 v 2.8 biblatex localization] % STATUS OF THIS FILE -% - Placeholder for cms-norwegian.lbx, as in standard biblatex. -% - Strings in cms-norwegian.lbx translated by a native speaker -% (H{\aa}kon Malmedal). -% - Date handling there modified by dfussner. +% - Translated by a native speaker (H{\aa}kon Malmedal). +% - Date handling modified by dfussner. -\InheritBibliographyExtras{cms-norwegian} -\InheritBibliographyStrings{cms-norwegian} +\InheritBibliographyExtras{norsk} + +\DeclareBibliographyExtras{% + \savecommand\cms@datelong + \savecommand\cms@datelongalt + \savecommand\mkbibrangecomp + \savecommand\mkbibrangeterse + \savecommand\mkbibrangefull + \protected\def\mkbibrangecomp{% + \lbx@cms@mkbibrangetrunc{long}}% + \protected\def\mkbibrangeterse{% + \lbx@cms@mkbibrangetrunc{short}}% + \protected\def\mkbibrangefull{% + \lbx@cms@mkbibrangefull}% + \def\cms@datelong{\printorigdate}% + \def\cms@datelongalt{\printdate}}% + +\UndeclareBibliographyExtras{% + \restorecommand\cms@datelong + \restorecommand\cms@datelongalt + \restorecommand\mkbibrangecomp% + \restorecommand\mkbibrangefull% + \restorecommand\mkbibrangeterse}% + +\NewBibliographyString{bynone} +\NewBibliographyString{bycompiler} +\NewBibliographyString{byconductor} +\NewBibliographyString{bydirector} +\NewBibliographyString{byproducer} +\NewBibliographyString{byeditorcp} +\NewBibliographyString{byeditortrcp} +\NewBibliographyString{byeditortrcpco} +\NewBibliographyString{byeditortrcpan} +\NewBibliographyString{byeditortrcpin} +\NewBibliographyString{byeditortrcpfo} +\NewBibliographyString{byeditortrcpaf} +\NewBibliographyString{byeditortrcpcoin} +\NewBibliographyString{byeditortrcpcofo} +\NewBibliographyString{byeditortrcpcoaf} +\NewBibliographyString{byeditortrcpanin} +\NewBibliographyString{byeditortrcpanfo} +\NewBibliographyString{byeditortrcpanaf} +\NewBibliographyString{byeditorcpco} +\NewBibliographyString{byeditorcpan} +\NewBibliographyString{byeditorcpin} +\NewBibliographyString{byeditorcpfo} +\NewBibliographyString{byeditorcpaf} +\NewBibliographyString{byeditorcpcoin} +\NewBibliographyString{byeditorcpcofo} +\NewBibliographyString{byeditorcpcoaf} +\NewBibliographyString{byeditorcpanin} +\NewBibliographyString{byeditorcpanfo} +\NewBibliographyString{byeditorcpanaf} +\NewBibliographyString{bytranslatorcp} +\NewBibliographyString{bytranslatorcpco} +\NewBibliographyString{bytranslatorcpan} +\NewBibliographyString{bytranslatorcpin} +\NewBibliographyString{bytranslatorcpfo} +\NewBibliographyString{bytranslatorcpaf} +\NewBibliographyString{bytranslatorcpcoin} +\NewBibliographyString{bytranslatorcpcofo} +\NewBibliographyString{bytranslatorcpcoaf} +\NewBibliographyString{bytranslatorcpanin} +\NewBibliographyString{bytranslatorcpanfo} +\NewBibliographyString{bytranslatorcpanaf} +\NewBibliographyString{bycompilerco} +\NewBibliographyString{bycompileran} +\NewBibliographyString{bycompilerin} +\NewBibliographyString{bycompilerfo} +\NewBibliographyString{bycompileraf} +\NewBibliographyString{bycompilercoin} +\NewBibliographyString{bycompilercofo} +\NewBibliographyString{bycompilercoaf} +\NewBibliographyString{bycompileranin} +\NewBibliographyString{bycompileranfo} +\NewBibliographyString{bycompileranaf} +\NewBibliographyString{cbynone} +\NewBibliographyString{cbyauthor} +\NewBibliographyString{cbyeditor} +\NewBibliographyString{cbytranslator} +\NewBibliographyString{cbycompiler} +\NewBibliographyString{cbyredactor} +\NewBibliographyString{cbycommentator} +\NewBibliographyString{cbyannotator} +\NewBibliographyString{cbyfounder} +\NewBibliographyString{cbycontinuator} +\NewBibliographyString{cbycollaborator} +\NewBibliographyString{cbyconductor} +\NewBibliographyString{cbydirector} +\NewBibliographyString{cbyproducer} +\NewBibliographyString{cbyeditortr} +\NewBibliographyString{cbyeditorcp} +\NewBibliographyString{cbyeditorco} +\NewBibliographyString{cbyeditoran} +\NewBibliographyString{cbyeditorin} +\NewBibliographyString{cbyeditorfo} +\NewBibliographyString{cbyeditoraf} +\NewBibliographyString{cbyeditortrcp} +\NewBibliographyString{cbyeditortrco} +\NewBibliographyString{cbyeditortran} +\NewBibliographyString{cbyeditortrin} +\NewBibliographyString{cbyeditortrfo} +\NewBibliographyString{cbyeditortraf} +\NewBibliographyString{cbyeditortrcpco} +\NewBibliographyString{cbyeditortrcpan} +\NewBibliographyString{cbyeditortrcpin} +\NewBibliographyString{cbyeditortrcpfo} +\NewBibliographyString{cbyeditortrcpaf} +\NewBibliographyString{cbyeditorcoin} +\NewBibliographyString{cbyeditorcofo} +\NewBibliographyString{cbyeditorcoaf} +\NewBibliographyString{cbyeditoranin} +\NewBibliographyString{cbyeditoranfo} +\NewBibliographyString{cbyeditoranaf} +\NewBibliographyString{cbyeditortrcoin} +\NewBibliographyString{cbyeditortrcofo} +\NewBibliographyString{cbyeditortrcoaf} +\NewBibliographyString{cbyeditortranin} +\NewBibliographyString{cbyeditortranfo} +\NewBibliographyString{cbyeditortranaf} +\NewBibliographyString{cbyeditortrcpcoin} +\NewBibliographyString{cbyeditortrcpcofo} +\NewBibliographyString{cbyeditortrcpcoaf} +\NewBibliographyString{cbyeditortrcpanin} +\NewBibliographyString{cbyeditortrcpanfo} +\NewBibliographyString{cbyeditortrcpanaf} +\NewBibliographyString{cbyeditorcpco} +\NewBibliographyString{cbyeditorcpan} +\NewBibliographyString{cbyeditorcpin} +\NewBibliographyString{cbyeditorcpfo} +\NewBibliographyString{cbyeditorcpaf} +\NewBibliographyString{cbyeditorcpcoin} +\NewBibliographyString{cbyeditorcpcofo} +\NewBibliographyString{cbyeditorcpcoaf} +\NewBibliographyString{cbyeditorcpanin} +\NewBibliographyString{cbyeditorcpanfo} +\NewBibliographyString{cbyeditorcpanaf} +\NewBibliographyString{cbytranslatorcp} +\NewBibliographyString{cbytranslatorco} +\NewBibliographyString{cbytranslatoran} +\NewBibliographyString{cbytranslatorin} +\NewBibliographyString{cbytranslatorfo} +\NewBibliographyString{cbytranslatoraf} +\NewBibliographyString{cbytranslatorcpco} +\NewBibliographyString{cbytranslatorcpan} +\NewBibliographyString{cbytranslatorcpin} +\NewBibliographyString{cbytranslatorcpfo} +\NewBibliographyString{cbytranslatorcpaf} +\NewBibliographyString{cbytranslatorcoin} +\NewBibliographyString{cbytranslatorcofo} +\NewBibliographyString{cbytranslatorcoaf} +\NewBibliographyString{cbytranslatoranin} +\NewBibliographyString{cbytranslatoranfo} +\NewBibliographyString{cbytranslatoranaf} +\NewBibliographyString{cbytranslatorcpcoin} +\NewBibliographyString{cbytranslatorcpcofo} +\NewBibliographyString{cbytranslatorcpcoaf} +\NewBibliographyString{cbytranslatorcpanin} +\NewBibliographyString{cbytranslatorcpanfo} +\NewBibliographyString{cbytranslatorcpanaf} +\NewBibliographyString{cbycompilerco} +\NewBibliographyString{cbycompileran} +\NewBibliographyString{cbycompilerin} +\NewBibliographyString{cbycompilerfo} +\NewBibliographyString{cbycompileraf} +\NewBibliographyString{cbycompilercoin} +\NewBibliographyString{cbycompilercofo} +\NewBibliographyString{cbycompilercoaf} +\NewBibliographyString{cbycompileranin} +\NewBibliographyString{cbycompileranfo} +\NewBibliographyString{cbycompileranaf} +\NewBibliographyString{cfromamerican} +\NewBibliographyString{cfrombrazilian} +\NewBibliographyString{cfromdanish} +\NewBibliographyString{cfromdutch} +\NewBibliographyString{cfromenglish} +\NewBibliographyString{cfromfrench} +\NewBibliographyString{cfromgerman} +\NewBibliographyString{cfromgreek} +\NewBibliographyString{cfromitalian} +\NewBibliographyString{cfromlatin} +\NewBibliographyString{cfromnorwegian} +\NewBibliographyString{cfromportuguese} +\NewBibliographyString{cfromrussian} +\NewBibliographyString{cfromspanish} +\NewBibliographyString{cfromswedish} +\NewBibliographyString{partvolume} +\NewBibliographyString{by} +\NewBibliographyString{of} +\NewBibliographyString{on} +\NewBibliographyString{afterwordto} +\NewBibliographyString{forewordto} +\NewBibliographyString{introductionto} +\NewBibliographyString{origpub} +\NewBibliographyString{origpublin} +\NewBibliographyString{origpubyear} +\NewBibliographyString{origpubyearalt} +\NewBibliographyString{origreleaseyear} +\NewBibliographyString{origshownyear} +\NewBibliographyString{origedition} +\NewBibliographyString{revisededition} +\NewBibliographyString{broadcast} +\NewBibliographyString{recorded} +\NewBibliographyString{numbers} +\NewBibliographyString{nodate} +\NewBibliographyString{pseudonym} +\NewBibliographyString{patentfiled}% Needed for CMS style patent entries +\NewBibliographyString{patentissued}% +\NewBibliographyString{inlang} +\NewBibliographyString{langrussian} +\NewBibliographyString{fromrussian} +\NewBibliographyString{edamerican} +\NewBibliographyString{edbrazilian} +\NewBibliographyString{eddanish} +\NewBibliographyString{eddutch} +\NewBibliographyString{edenglish} +\NewBibliographyString{edfrench} +\NewBibliographyString{edgerman} +\NewBibliographyString{edgreek} +\NewBibliographyString{editalian} +\NewBibliographyString{edlatin} +\NewBibliographyString{ednorwegian} +\NewBibliographyString{edportuguese} +\NewBibliographyString{edrussian} +\NewBibliographyString{edspanish} +\NewBibliographyString{edswedish} +\NewBibliographyString{review} +\NewBibliographyString{reviewof} +\NewBibliographyString{section} +\NewBibliographyString{sections} +\NewBibliographyString{compiler} +\NewBibliographyString{compilers} +\NewBibliographyString{conductor} +\NewBibliographyString{conductors} +\NewBibliographyString{director} +\NewBibliographyString{directors} +\NewBibliographyString{none} +\NewBibliographyString{nones} +\NewBibliographyString{producer} +\NewBibliographyString{producers} +\NewBibliographyString{transcompiler} +\NewBibliographyString{transcompilers} +\NewBibliographyString{editortranscompiler} +\NewBibliographyString{editorcompiler} +\NewBibliographyString{editortranslator} +\NewBibliographyString{editortranscompilers} +\NewBibliographyString{editorcompilers} +\NewBibliographyString{editortranslators} + +\DeclareBibliographyStrings{% + inherit = {norsk}, + afterwordto = {{etterord til}{etterord til}}, + forewordto = {{forord til}{forord til}}, + introductionto = {{innledning til}{innl\adddot\space til}}, + partvolume = {{del}{del}}, + by = {{av}{av}}, + of = {{av}{av}}, + on = {{p{\aa}}{p{\aa}}}, + compiler = {{komp\adddot}{komp\adddot}}, + compilers = {{komp\adddot}{komp\adddot}}, + transcompiler = {{overs\adddot\addspace og komp\adddot}% + {overs\adddot\addspace og komp\adddot}}, + transcompilers = {{overs\adddot\addspace og komp\adddot}% + {overs\adddot\addspace og komp\adddot}}, + editortranscompiler = {{red\adddot\addcomma\addspace + overs\adddot\addcomma\addspace og komp\adddot}% + {red\adddot\addcomma\addspace + overs\adddot\addcomma\addspace og komp\adddot}}, + editorcompiler = {{red\adddot\addspace og komp\adddot}% + {red\adddot\addspace og komp\adddot}}, + editortranslator = {{red\adddot\addspace og overs\adddot}% + {red\adddot\addspace og overs\adddot}}, + editortranscompilers = {{red\adddot\addcomma\addspace + overs\adddot\addcomma\addspace og komp\adddot}% + {red\adddot\addcomma\addspace + overs\adddot\addcomma\addspace og komp\adddot}}, + editorcompilers = {{red\adddot\addspace og komp\adddot}% + {red\adddot\addspace og komp\adddot}}, + editortranslators = {{red\adddot\addspace og overs\adddot}% + {red\adddot\addspace og overs\adddot}}, + conductor = {{dir\adddot}{dir\adddot}}, + conductors = {{dir\adddot}{dir\adddot}}, + director = {{regi}{regi}}, + directors = {{regi}{regi}}, + none = {{}{}}, + nones = {{}{}}, + producer = {{prod\adddot}{prod\adddot}}, + producers = {{prod\adddot}{prod\adddot}}, + editor = {{red\adddot}{red\adddot}}, + editors = {{red\adddot}{red\adddot}}, + ibidem = {{sst\adddot}{sst\adddot}}, + origpub = {{opprinnelig utgitt som}% + {oppr\adddot\ utg\adddot\ som}}, + origpublin = {{opprinnelig utgitt i\addspace}% + {oppr\adddot\ utg\adddot\addspace i\addspace}}, + origpubyear = {{opprinnelig utgitt i\addspace}% + {oppr\adddot\ utg\adddot\addspace}}, + origpubyearalt = {{f{\o}rst utgitt\addspace}% + {f{\o}rst utg\adddot\addspace}}, + origreleaseyear = {{opprinnelig utgitt i\addspace}% + {oppr\adddot\ utg\adddotspace}}, + origshownyear = {{opprinnelig vist i\addspace}% + {oppr\adddot\ vist\addspace}}, + origedition ={{utgave\addcolon\addspace}% + {utg\adddot\addcolon\addspace}}, + revisededition = {{rev\adddot\addspace utg\adddot}% + {rev\adddot\addspace utg\adddot}}, + broadcast = {{kringkastet}{kringkastet}}, + recorded = {{spilt inn}{spilt inn}}, + numbers = {{nr\adddot}{nr\adddot}}, + nodate = {{udatert}{udatert}}, + pseudonym = {{pseud\adddot}{pseud\adddot}}, + patentfiled = {{s{\o}kt}{s{\o}kt}}, + patentissued = {{meddelt}{meddelt}}, + inlang = {{p{\aa}\addspace}{p{\aa}\addspace}}, + edamerican = {{amerikansk}{amerikansk}}, + edbrazilian = {{brasiliansk}{brasiliansk}}, + eddanish = {{dansk}{dansk}}, + eddutch = {{nederlandsk}{nederlandsk}}, + edenglish = {{engelsk}{engelsk}}, + edfrench = {{fransk}{fransk}}, + edgerman = {{tysk}{tysk}}, + edgreek = {{gresk}{gresk}}, + editalian = {{italiensk}{italiensk}}, + edlatin = {{latin}{latin}}, + ednorwegian = {{norsk}{norsk}}, + edportuguese = {{portugisisk}{portugisisk}}, + edrussian = {{russisk}{russisk}} + edspanish = {{spansk}{spansk}}, + edswedish = {{svensk}{svensk}}, + translator = {{overs\adddot}{overs\adddot}}, + translators = {{overs\adddot}{overs\adddot}}, + redactor = {{bearb\adddot}{bearb\adddot}}, + redactors = {{bearb\adddot}{bearb\adddot}}, + founder = {{grunnl\adddot}{grunnl\adddot}}, + founders = {{grunnl\adddot}{grunnl\adddot}}, + continuator = {{videref\adddot}{videref\adddot}}, + continuators = {{videref\adddot}{videref\adddot}}, + collaborator = {{samarb\adddot}{samarb\adddot}}, + collaborators = {{samarb\adddot}{samarb\adddot}}, + annotator = {{forkl\adddot}{forkl\adddot}}, + annotators = {{forkl\adddot}{forkl\adddot}}, + review = {{omtale}{omtale}}, + reviewof = {{omtale av}{omtale av}}, + cbynone = {{}{}}, + cbyauthor = {{av}{av}}, + cbyeditor = {{red\adddot}{red\adddot}}, + cbytranslator = {{overs\adddot\addspace\lbx@cfromlang}% + {overs\adddot\addspace\lbx@cfromlang}}, + cbycompiler = {{komp\adddot}{komp\adddot}}, + cbyredactor = {{bearb\adddot}{bearb\adddot}}, + cbycommentator = {{komm\adddot}{komm\adddot}}, + cbyannotator = {{forkl\addot}{forkl\addot}}, + cbyfounder = {{grunnl\adddot}{grunnl\adddot}}, + cbycontinuator = {{videref\adddot}{videref\adddot}}, + cbycollaborator = {{i samarb\adddotspace med}% + {i samarb\adddotspace med}}, + cbyconductor = {{dir\adddot}{dir\adddot}}, + cbydirector = {{regi}{regi}}, + cbyproducer = {{prod\adddot}{prod\adddot}}, + cbyeditortr = {{red\adddot\space og + overs\adddot\addspace\lbx@cfromlang}% + {red\adddot\space og overs\adddot\addspace\lbx@cfromlang}}, + cbyeditorcp = {{red\adddot\space og komp\adddot}% + {red\adddot\space og komp\adddot}}, + cbyeditorco = {{red\adddot\space og komm\adddot}% + {red\adddot\space og komm\adddot}}, + cbyeditoran = {{red\adddot\space og forkl\adddot}% + {red\adddot\space og forkl\adddot}}, + cbyeditorin = {{red.,\addabbrvspace med innl., av}% + {red.,\addabbrvspace med innl., av}}, + cbyeditorfo = {{red.,\addabbrvspace med forord, av}% + {red.,\addabbrvspace med forord, av}}, + cbyeditoraf = {{red.,\addabbrvspace med etterord, av}% + {red.,\addabbrvspace med etterord, av}}, + cbyeditortrcp = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang og + komp\adddot}% + {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp\adddot}}, + cbyeditortrco = {{red.,\addabbrvspace + overs\adddot\addspace\lbx@fromlang\space og + komm\adddot}% + {red.,\addabbrvspace + overs\adddot\addspace\lbx@fromlang\space og komm\adddot}}, + cbyeditortran = {{red.,\addabbrvspace + overs\adddot\addspace\lbx@fromlang\space og + forkl\adddot}% + {red.,\addabbrvspace + overs\adddot\addspace\lbx@fromlang\space og forkl\adddot}}, + cbyeditortrin = {{red\adddotspace og overs\adddot\ \lbx@sfromlang, med innl., av}% + {red\adddotspace og overs\adddot\ \lbx@sfromlang, med innl., av}}, + cbyeditortrfo = {{red\adddotspace og overs\adddot\ \lbx@sfromlang, med forord, av}% + {red\adddotspace og overs\adddot\ \lbx@sfromlang, med forord, av}}, + cbyeditortraf = {{red\adddotspace og overs\adddot\ \lbx@sfromlang, med etterord, av}% + {red\adddotspace og overs\adddot\ \lbx@sfromlang, med etterord, av}}, + cbyeditorcpco = {{red.,\addabbrvspace komp. og komm\adddot}% + {red.,\addabbrvspace komp. og komm\adddot}}, + cbyeditorcpan = {{red.,\addabbrvspace komp. og forkl\adddot}% + {red.,\addabbrvspace komp. og forkl\adddot}}, + cbyeditorcpin = {{red\adddot\space og komp., med innl., av}% + {red\adddot\space og komp., med innl., av}}, + cbyeditorcpfo = {{red\adddot\space og komp., med forord, av}% + {red\adddot\space og komp., med forord, av}}, + cbyeditorcpaf = {{red\adddot\space og komp., med etterord, av}% + {red\adddot\space og komp., med etterord, av}}, + cbyeditorcpcoin = {{red.,\addabbrvspace komp. og komm., med innl., av}% + {red.,\addabbrvspace komp. og komm., med innl., av}}, + cbyeditorcpcofo = {{red.,\addabbrvspace komp. og komm., med forord, av}% + {red.,\addabbrvspace komp. og komm., med forord, av}}, + cbyeditorcpcoaf = {{red.,\addabbrvspace komp. og komm., med etterord, av}% + {red.,\addabbrvspace komp. og komm., med etterord, av}}, + cbyeditorcpanin = {{red.,\addabbrvspace komp. og forkl., med innl., av}% + {red.,\addabbrvspace komp. og forkl., med innl., av}}, + cbyeditorcpanfo = {{red.,\addabbrvspace komp. og forkl., med forord, av}% + {red.,\addabbrvspace komp. og forkl., med forord, av}}, + cbyeditorcpanaf = {{red.,\addabbrvspace komp. og forkl., med etterord, av}% + {red.,\addabbrvspace komp. og forkl., med etterord, av}}, + cbyeditortrcpco = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang, + komp. og komm\adddot}% + {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm\adddot}}, + cbyeditortrcpan = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang, + komp. og forkl\adddot}% + {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl\adddot}}, + cbyeditortrcpin = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp., med innl., av}% + {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp., + med innl., av}}, + cbyeditortrcpfo = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp., med forord, av}% + {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp., + med forord, av}}, + cbyeditortrcpaf = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp., med etterord, av}% + {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp., + med etterord, av}}, + cbyeditortrcpcoin = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang, + komp. og komm., med innl., av}% + {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm., med innl., av}}, + cbyeditortrcpcofo = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang, + komp. og komm., med forord, av}% + {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm., med forord, av}}, + cbyeditortrcpcoaf = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang, + komp. og komm., med etterord, av}% + {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm., med etterord, av}}, + cbyeditortrcpanin = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang, + komp. og forkl., med innl., av}% + {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl., med innl., av}}, + cbyeditortrcpanfo = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang, + komp. og forkl., med forord, av}% + {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl., med forord, av}}, + cbyeditortrcpanaf = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang, + komp. og forkl., med etterord, av}% + {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl., med etterord, av}}, + cbyeditorcoin = {{red\adddot\space og komm., med innl., av}% + {red\adddot\space og komm., med innl., av}}, + cbyeditorcofo = {{red\adddot\space og komm., med forord, av}% + {red\adddot\space og komm., med forord, av}}, + cbyeditorcoaf = {{red\adddot\space og komm., med etterord, av}% + {red\adddot\space og komm., med etterord, av}}, + cbyeditoranin = {{red\adddot\space og forkl., med innl., av}% + {red\adddot\space og forkl., med innl., av}}, + cbyeditoranfo = {{red\adddot\space og forkl., med forord, av}% + {red\adddot\space og forkl., med forord, av}}, + cbyeditoranaf = {{red\adddot\space og forkl., med etterord, av}% + {red\adddot\space og forkl., med etterord, av}}, + cbyeditortrcoin = {{red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og komm., med innl., av}% + {red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og komm., med innl., av}}, + cbyeditortrcofo = {{red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og komm., med forord, av}% + {red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og komm., med forord, av}}, + cbyeditortrcoaf = {{red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og komm., med etterord, av}% + {red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og komm., med etterord, av}}, + cbyeditortranin = {{red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og forkl., med innl., av}% + {red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og forkl., med innl., av}}, + cbyeditortranfo = {{red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og forkl., med forord, av}% + {red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og forkl., med forord, av}}, + cbyeditortranaf = {{red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og forkl., med etterord, av}% + {red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og forkl., med etterord, av}}, + cbytranslatorcp = {{overs\adddot\addspace\lbx@fromlang\ og komp\adddot}% + {overs\adddot\addspace\lbx@fromlang\ og komp\adddot}}, + cbytranslatorco = {{overs\adddot\addspace\lbx@fromlang\ og komm\adddot}% + {overs\adddot\addspace\lbx@fromlang\ og komm\adddot}}, + cbytranslatoran = {{overs\adddot\addspace\lbx@fromlang\ og forkl\adddot}% + {overs\adddot\addspace\lbx@fromlang\ og forkl\adddot}}, + cbytranslatorin = {{overs\adddot\addspace\lbx@fromlang, med innl., av}% + {overs\adddot\addspace\lbx@fromlang, med innl., av}}, + cbytranslatorfo = {{overs\adddot\addspace\lbx@fromlang, med forord, av}% + {overs\adddot\addspace\lbx@fromlang, med forord, av}}, + cbytranslatoraf = {{overs\adddot\addspace\lbx@fromlang, med etterord, av}% + {overs\adddot\addspace\lbx@fromlang, med etterord, av}}, + cbytranslatorcoin = {{overs\adddot\addspace\lbx@fromlang\ og komm., + med innl., av}% + {overs\adddot\addspace\lbx@fromlang\ og komm., med innl., av}}, + cbytranslatorcofo = {{overs\adddot\addspace\lbx@fromlang\ og komm., + med forord, av}% + {overs\adddot\addspace\lbx@fromlang\ og komm., med forord, av}}, + cbytranslatorcoaf = {{overs\adddot\addspace\lbx@fromlang\ og komm., + med etterord, av}% + {overs\adddot\addspace\lbx@fromlang\ og komm., med etterord, av}}, + cbytranslatoranin = {{overs\adddot\addspace\lbx@fromlang\ og forkl., + med innl., av}% + {overs\adddot\addspace\lbx@fromlang\ og forkl., med innl., av}}, + cbytranslatoranfo = {{overs\adddot\addspace\lbx@fromlang\ og forkl., + med forord, av}% + {overs\adddot\addspace\lbx@fromlang\ og forkl., med forord, av}}, + cbytranslatoranaf = {{overs\adddot\addspace\lbx@fromlang\ og forkl., + med etterord, av}% + {overs\adddot\addspace\lbx@fromlang\ og forkl., med etterord, av}}, + cbytranslatorcpco = {{overs\adddot\addspace\lbx@fromlang, komp. og komm\adddot}% + {overs\adddot\addspace\lbx@fromlang, komp. og komm\adddot}}, + cbytranslatorcpan = {{overs\adddot\addspace\lbx@fromlang, komp. og forkl\adddot}% + {overs\adddot\addspace\lbx@fromlang, komp. og forkl\adddot}}, + cbytranslatorcpin = {{overs\adddot\addspace\lbx@fromlang\ og komp., + med innl., av}% + {overs\adddot\addspace\lbx@fromlang\ og komp., med innl., av}}, + cbytranslatorcpfo = {{overs\adddot\addspace\lbx@fromlang\ og komp., + med forord, av}% + {overs\adddot\addspace\lbx@fromlang\ og komp., med forord, av}}, + cbytranslatorcpaf = {{overs\adddot\addspace\lbx@fromlang\ og komp., + med etterord, av}% + {overs\adddot\addspace\lbx@fromlang\ og komp., med etterord, av}}, + cbytranslatorcpcoin = {{overs\adddot\addspace\lbx@fromlang, komp. og komm., med innl., av}% + {overs\adddot\addspace\lbx@fromlang, komp. og komm., + med innl., av}}, + cbytranslatorcpcofo = {{overs\adddot\addspace\lbx@fromlang, komp. og komm., med forord, av}% + {overs\adddot\addspace\lbx@fromlang, komp. og komm., + med forord, av}}, + cbytranslatorcpcoaf = {{overs\adddot\addspace\lbx@fromlang, komp. og komm., med etterord, av}% + {overs\adddot\addspace\lbx@fromlang, komp. og komm., + med etterord, av}}, + cbytranslatorcpanin = {{overs\adddot\addspace\lbx@fromlang, komp. og forkl., med innl., av}% + {overs\adddot\addspace\lbx@fromlang, komp. og forkl., + med innl., av}}, + cbytranslatorcpanfo = {{overs\adddot\addspace\lbx@fromlang, komp. og forkl., med forord, av}% + {overs\adddot\addspace\lbx@fromlang, komp. og forkl., + med forord, av}}, + cbytranslatorcpanaf = {{overs\adddot\addspace\lbx@fromlang, komp. og forkl., med etterord, av}% + {overs\adddot\addspace\lbx@fromlang, komp. og forkl., + med etterord, av}}, + cbycompilerco = {{komp\adddot\space og komm\adddot}% + {komp\adddot\space og komm\adddot}}, + cbycompileran = {{komp\adddot\space og forkl\adddot}% + {komp\adddot\space og forkl\adddot}}, + cbycompilerin = {{komp.,\addabbrvspace med innl., av}% + {komp.,\addabbrvspace med innl., av}}, + cbycompilerfo = {{komp.,\addabbrvspace med forord, av}% + {komp.,\addabbrvspace med forord, av}}, + cbycompileraf = {{komp.,\addabbrvspace med etterord, av}% + {komp.,\addabbrvspace med etterord, av}}, + cbycompilercoin = {{komp\adddot\space og komm., med innl., av}% + {komp\adddot\space og komm., med innl., av}}, + cbycompilercofo = {{komp\adddot\space og komm., med forord, av}% + {komp\adddot\space og komm., med forord, av}}, + cbycompilercoaf = {{komp\adddot\space og komm., med etterord, av}% + {komp\adddot\space og komm., med etterord, av}}, + cbycompileranin = {{komp\adddot\space og forkl., med innl., av}% + {komp\adddot\space og forkl., med innl., av}}, + cbycompileranfo = {{komp\adddot\space og forkl., med forord, av}% + {komp\adddot\space og forkl., med forord, av}}, + cbycompileranaf = {{komp\adddot\space og forkl., med etterord, av}% + {komp\adddot\space og forkl., med etterord, av}}, + volume = {{bd\adddot}{bd\adddot}}, + volumes = {{bd\adddot}{bd\adddot}}, + jourvol = {{{\aa}rg\adddot}{{\aa}rg\adddot}}, + jourser = {{ser\adddot}{ser\adddot}}, + oldseries = {{gl\adddotspace ser\adddot}{gl\adddotspace ser\adddot}}, + edition = {{utg\adddot}{utg\adddot}}, + page = {{s\adddot}{s\adddot}}, + pages = {{s\adddot}{s\adddot}}, + column = {{sp\adddot}{sp\adddot}}, + columns = {{sp\adddot}{sp\adddot}}, + line = {{l\adddot}{l\adddot}}, + lines = {{l\adddot}{l\adddot}}, + paragraph = {{avsn\adddot}{avsn\adddot}}, + paragraphs = {{avsn\adddot}{avsn\adddot}}, + section = {{avsn\adddot}{avsn\adddot}}, + sections = {{avsn\adddot}{avsn\adddot}}, + verse = {{v\adddot}{v\adddot}}, + verses = {{v\adddot}{v\adddot}}, + number = {{nr\adddot}{nr\adddot}}, + chapter = {{kap\adddot}{kap\adddot}}, + cfromamerican = {{fra amerikansk-engelsk av}{fra amerikansk-engelsk av}}, + cfrombrazilian = {{fra brasiliansk-portugisisk av}{fra brasiliansk-portugisisk av}}, + cfromdanish = {{fra dansk av}{fra dansk av}}, + cfromdutch = {{fra nederlandsk av}{fra nederlandsk av}}, + cfromenglish = {{fra engelsk av}{fra engelsk av}}, + cfromfrench = {{fra fransk av}{fra fransk av}}, + cfromgerman = {{fra tysk av}{fra tysk av}}, + cfromgreek = {{fra gresk av}{fra gresk av}}, + cfromitalian = {{fra italiensk av}{fra italiensk av}}, + cfromlatin = {{fra latin av}{fra latin av}}, + cfromnorwegian = {{fra norsk av}{fra norsk av}}, + cfromportuguese = {{fra portugisisk av}{fra portugisisk av}}, + cfromrussian = {{fra russisk av}{fra russisk av}}, + cfromspanish = {{fra spansk av}{fra spansk av}}, + cfromswedish = {{fra svensk av}{fra svensk av}}, + bynone = {{}{}}, + byconductor = {{dirigert av}{dir\adddot}}, + bydirector = {{regissert av}{regi}}, + byproducer = {{produsert av}{prod\adddot}}, + byeditorcp = {{redigert og kompilert av}{red\adddot\space og komp\adddot}}, + byeditortrcp = {{redigert, oversatt \lbx@fromlang og kompilert av}% + {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp\adddot}}, + byeditortrcpco = {{redigert, oversatt \lbx@fromlang, kompilert og kommentert av}% + {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm\adddot}}, + byeditortrcpan = {{redigert, oversatt \lbx@fromlang, kompilert og forklart av}% + {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl\adddot}}, + byeditortrcpin = {{redigert, oversatt \lbx@fromlang og kompilert, med innledning, av}% + {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp\adddot, + med innledning, av}}, + byeditortrcpfo = {{redigert, oversatt \lbx@fromlang og kompilert, med forord, av}% + {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp\adddot, + med forord, av}}, + byeditortrcpaf = {{redigert, oversatt \lbx@fromlang og kompilert, med etterord, av}% + {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp\adddot, + med etterord, av}}, + byeditortrcpcoin = {{redigert, oversatt \lbx@fromlang, kompilert og kommentert, med innledning, av}% + {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm\adddot, med innledning, av}}, + byeditortrcpcofo = {{redigert, oversatt \lbx@fromlang, kompilert og kommentert, med forord, av}% + {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm\adddot, med forord, av}}, + byeditortrcpcoaf = {{redigert, oversatt \lbx@fromlang, kompilert og kommentert, med etterord, av}% + {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm\adddot, med etterord, av}}, + byeditortrcpanin = {{redigert, oversatt \lbx@fromlang, kompilert og forklart, med innledning, av}% + {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl\adddot, med innledning, av}}, + byeditortrcpanfo = {{redigert, oversatt \lbx@fromlang, kompilert og forklart, med forord, av}% + {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl\adddot, med forord, av}}, + byeditortrcpanaf = {{redigert, oversatt \lbx@fromlang, kompilert og forklart, med etterord, av}% + {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl\adddot, med etterord, av}}, + byeditorcpco = {{redigert, kompilert og kommentert av}% + {red.,\addabbrvspace komp. og komm\adddot}}, + byeditorcpan = {{redigert, kompilert og forklart av}% + {red.,\addabbrvspace komp. og forkl\adddot}}, + byeditorcpin = {{redigert og kompilert, med innledning, av}% + {red\adddot\space og komp., med innledning, av}}, + byeditorcpfo = {{redigert og kompilert, med forord, av}% + {red\adddot\space og komp., med forord, av}}, + byeditorcpaf = {{redigert og kompilert, med etterord, av}% + {red\adddot\space og komp., med etterord, av}}, + byeditorcpcoin = {{redigert, kompilert og kommentert, med innledning, av}% + {red.,\addabbrvspace komp. og komm., med innledning, av}}, + byeditorcpcofo = {{redigert, kompilert og kommentert, med forord, + av}% + {red.,\addabbrvspace komp. og komm., med forord, av}}, + byeditorcpcoaf = {{redigert, kompilert og kommentert, med etterord, av}% + {red.,\addabbrvspace komp. og komm., med etterord, av}}, + byeditorcpanin = {{redigert, kompilert og forklart, med innledning, av}% + {red.,\addabbrvspace komp. og forkl., med innledning, av}}, + byeditorcpanfo = {{redigert, kompilert og forklart, med forord, + av}% + {red.,\addabbrvspace komp. og forkl., med forord, av}}, + byeditorcpanaf = {{redigert, kompilert og forklart, med etterord, av}% + {red.,\addabbrvspace komp. og forkl., med etterord, av}}, + bytranslatorcp = {{oversatt \lbx@fromlang\ og kompilert av}% + {overs\adddot\addspace\lbx@fromlang\ og komp\adddot}}, + bytranslatorcpco = {{oversatt \lbx@fromlang, kompilert og kommentert av}% + {overs\adddot\addspace\lbx@fromlang, komp. og komm\adddot}}, + bytranslatorcpan = {{oversatt \lbx@fromlang, kompilert og forklart av}% + {overs\adddot\addspace\lbx@fromlang, komp. og forkl\adddot}}, + bytranslatorcpin = {{oversatt \lbx@fromlang\ og kompilert, med innledning, av}% + {overs\adddot\addspace\lbx@fromlang\ og komp., med innledning, av}}, + bytranslatorcpfo = {{oversatt \lbx@fromlang\ og kompilert, med forord, av}% + {overs\adddot\addspace\lbx@fromlang\ og komp., med forord, av}}, + bytranslatorcpaf = {{oversatt \lbx@fromlang\ og kompilert, med etterord, av}% + {overs\adddot\addspace\lbx@fromlang\ og komp., med etterord, av}}, + bytranslatorcpcoin = {{oversatt \lbx@fromlang, kompilert og kommentert, + med innledning, av}% + {overs\adddot\addspace\lbx@fromlang, komp. og komm., med innledning, av}}, + bytranslatorcpcofo = {{oversatt \lbx@fromlang, kompilert og kommentert, + med forord, av}% + {overs\adddot\addspace\lbx@fromlang, komp. og komm., + med forord, av}}, + bytranslatorcpcoaf = {{oversatt \lbx@fromlang, kompilert og kommentert, + med etterord, av}% + {overs\adddot\addspace\lbx@fromlang, komp. og komm., med etterord, av}}, + bytranslatorcpanin = {{oversatt \lbx@fromlang, kompilert og forklart, + med innledning, av}% + {overs\adddot\addspace\lbx@fromlang, komp. og forkl., med innledning, av}}, + bytranslatorcpanfo = {{oversatt \lbx@fromlang, kompilert og forklart, + med forord, av}% + {overs\adddot\addspace\lbx@fromlang, komp. og forkl., + med forord, av}}, + bytranslatorcpanaf = {{oversatt \lbx@fromlang, kompilert og forklart, + med etterord, av}% + {overs\adddot\addspace\lbx@fromlang, komp. og forkl., + med etterord, av}}, + bycompilerco = {{kompilert og kommentert av}% + {komp\adddot\space og komm\adddot}}, + bycompileran = {{kompilert og forklart av}% + {komp\adddot\space og forkl\adddot}}, + bycompilerin = {{kompilert, med innledning, av}% + {komp\adddot, med innledning, av}}, + bycompilerfo = {{kompilert, med forord, av}% + {komp\adddot, med forord, av}}, + bycompileraf = {{kompilert, med etterord, av}% + {komp\adddot, med etterord, av}}, + bycompilercoin = {{kompilert og kommentert, med innledning, av}% + {komp\adddot\space og komm\adddot, med innledning, av}}, + bycompilercofo = {{kompilert og kommentert, med forord, av}% + {komp\adddot\space og komm\adddot, med forord, av}}, + bycompilercoaf = {{kompilert og kommentert, med etterord, av}% + {komp\adddot\space og komm\adddot, med etterord, av}}, + bycompileranin = {{kompilert og forklart, med innledning, av}% + {komp\adddot\space og forkl\adddot, med innledning, av}}, + bycompileranfo = {{kompilert og forklart, med forord, av}% + {komp\adddot\space og forkl\adddot, med forord, av}}, + bycompileranaf = {{kompilert og forklart, med etterord, av}% + {komp\adddot\space og forkl\adddot, med etterord, av}}, +} + +\protected\gdef\lbx@cms@mkbibrangetrunc#1#2{% DATE FIX + \iffieldundef{#2year}% + {\iffieldundef{#2month} + {} + {\printtext[#2date]{% + \iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{}{}{#2day}} + {\csuse{mkbibdate#1}{}{#2month}{#2day}}% + \iffieldundef{#2endyear} + {\iffieldundef{#2endmonth} + {} + {\bibdatedash + \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdatedash}} + {\bibdatedash + \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}} + {\printtext[#2date]{% + \iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{}{}{#2day}} + {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}% + {\csuse{mkbibdate#1}{#2year}{}{}% + \clearfield{#2endyear}}% Clear up inheritance problem ??? + {\csuse{mkbibdate#1}{}{#2month}{#2day}}}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdatedash}} + {\bibdatedash + \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}} + +\protected\gdef\lbx@cms@mkbibrangefull#1#2{% + \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}% + {}% + {\ifthenelse{\iffieldsequal{#2year}{#2endyear}\AND% + \iffieldundef{#2month}\AND\iffieldundef{#2day}}% + {\clearfield{#2endyear}}% Clear up inheritance problem ??? + {}% + \printtext[#2date]{% + \csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdatedash}} + {\bibdatedash + \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx index 44437821b93..11e05e73d0e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx @@ -1,6 +1,6 @@ -% $Id: cms-norwegian.lbx,v 1.3 2013/03/14 16:41:34 dfussner Exp $ +% $Id: cms-norwegian.lbx,v 1.6 2013/10/29 14:19:41 dfussner Exp $ -\ProvidesFile{cms-norwegian.lbx}[2013/03/14 v 2.5 biblatex localization] +\ProvidesFile{cms-norwegian.lbx}[2013/10/29 v 2.8 biblatex localization] % STATUS OF THIS FILE % - Translated by a native speaker (H{\aa}kon Malmedal). @@ -260,7 +260,7 @@ afterwordto = {{etterord til}{etterord til}}, forewordto = {{forord til}{forord til}}, introductionto = {{innledning til}{innl\adddot\space til}}, - partvolume = {{\addspace del}{\addspace del}}, + partvolume = {{del}{del}}, by = {{av}{av}}, of = {{av}{av}}, on = {{p{\aa}}{p{\aa}}}, @@ -731,7 +731,10 @@ \iffieldsequal{#2year}{#2endyear} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{}{}{#2day}} - {\csuse{mkbibdate#1}{}{#2month}{#2day}}} + {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}% + {\csuse{mkbibdate#1}{#2year}{}{}% + \clearfield{#2endyear}}% Clear up inheritance problem ??? + {\csuse{mkbibdate#1}{}{#2month}{#2day}}}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% \iffieldundef{#2endyear} {} @@ -743,7 +746,11 @@ \protected\gdef\lbx@cms@mkbibrangefull#1#2{% \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}% {}% - {\printtext[#2date]{% + {\ifthenelse{\iffieldsequal{#2year}{#2endyear}\AND% + \iffieldundef{#2month}\AND\iffieldundef{#2day}}% + {\clearfield{#2endyear}}% Clear up inheritance problem ??? + {}% + \printtext[#2date]{% \csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}} {} diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx index bd0c671310c..46dd5d2cdd0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx @@ -1,6 +1,6 @@ -% $Id: cms-nynorsk.lbx,v 1.3 2013/03/14 16:42:05 dfussner Exp $ +% $Id: cms-nynorsk.lbx,v 1.6 2013/10/29 14:20:26 dfussner Exp $ -\ProvidesFile{cms-nynorsk.lbx}[2013/03/14 v 2.5 biblatex localization] +\ProvidesFile{cms-nynorsk.lbx}[2013/10/29 v 2.8 biblatex localization] % STATUS OF THIS FILE % - Translated by a native speaker (H{\aa}kon Malmedal). @@ -260,7 +260,7 @@ afterwordto = {{etterord til}{etterord til}}, forewordto = {{f{\o}reord til}{f{\o}reord til}}, introductionto = {{innleiing til}{innl\adddot\space til}}, - partvolume = {{\addspace del}{\addspace del}}, + partvolume = {{del}{del}}, by = {{av}{av}}, of = {{av}{av}}, on = {{p{\aa}}{p{\aa}}}, @@ -731,7 +731,10 @@ \iffieldsequal{#2year}{#2endyear} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{}{}{#2day}} - {\csuse{mkbibdate#1}{}{#2month}{#2day}}} + {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}% + {\csuse{mkbibdate#1}{#2year}{}{}% + \clearfield{#2endyear}}% Clear up inheritance problem ??? + {\csuse{mkbibdate#1}{}{#2month}{#2day}}}} {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% \iffieldundef{#2endyear} {} @@ -743,7 +746,11 @@ \protected\gdef\lbx@cms@mkbibrangefull#1#2{% \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}% {}% - {\printtext[#2date]{% + {\ifthenelse{\iffieldsequal{#2year}{#2endyear}\AND% + \iffieldundef{#2month}\AND\iffieldundef{#2day}}% + {\clearfield{#2endyear}}% Clear up inheritance problem ??? + {}% + \printtext[#2date]{% \csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}} {} |