From f6ebf7e69e4c372ab549c769ce5058a8f864336d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 17 Mar 2013 21:51:20 +0000 Subject: biblatex-chicago git-svn-id: svn://tug.org/texlive/trunk@29410 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/biblatex-chicago/README | 37 +- .../texmf-dist/doc/latex/biblatex-chicago/RELEASE | 81 ++ .../latex/biblatex-chicago/biblatex-chicago.pdf | Bin 841117 -> 853175 bytes .../latex/biblatex-chicago/biblatex-chicago.tex | 1423 +++++++++++--------- .../latex/biblatex-chicago/biblatex-chicago15.pdf | Bin 747965 -> 748257 bytes .../latex/biblatex-chicago/biblatex-chicago15.tex | 64 +- .../latex/biblatex-chicago/cms-dates-sample.pdf | Bin 431109 -> 431830 bytes .../latex/biblatex-chicago/cms-dates-sample.tex | 34 +- .../latex/biblatex-chicago/cms-notes-sample.pdf | Bin 314744 -> 314750 bytes .../doc/latex/biblatex-chicago/cms-trad-sample.pdf | Bin 430305 -> 430989 bytes .../doc/latex/biblatex-chicago/cms-trad-sample.tex | 35 +- .../latex/biblatex-chicago/cms15-dates-sample.pdf | Bin 414978 -> 414974 bytes .../latex/biblatex-chicago/cms15-dates-sample.tex | 2 +- .../latex/biblatex-chicago/cms15-notes-sample.pdf | Bin 308951 -> 308951 bytes .../doc/latex/biblatex-chicago/dates-test.bib | 2 +- .../latex/biblatex-chicago/biblatex-chicago.sty | 7 +- .../biblatex-chicago/chicago-authordate-trad.cbx | 44 +- .../latex/biblatex-chicago/chicago-authordate.bbx | 468 ++----- .../latex/biblatex-chicago/chicago-authordate.cbx | 53 +- .../tex/latex/biblatex-chicago/chicago-notes.bbx | 422 ++---- .../tex/latex/biblatex-chicago/chicago-notes.cbx | 601 ++++----- .../tex/latex/biblatex-chicago/cms-american.lbx | 6 +- .../tex/latex/biblatex-chicago/cms-british.lbx | 6 +- .../tex/latex/biblatex-chicago/cms-finnish.lbx | 869 ++++++++++++ .../tex/latex/biblatex-chicago/cms-french.lbx | 8 +- .../tex/latex/biblatex-chicago/cms-german.lbx | 10 +- .../tex/latex/biblatex-chicago/cms-icelandic.lbx | 6 +- .../tex/latex/biblatex-chicago/cms-ngerman.lbx | 10 +- .../tex/latex/biblatex-chicago/cms-norsk.lbx | 4 +- .../tex/latex/biblatex-chicago/cms-norwegian.lbx | 6 +- .../tex/latex/biblatex-chicago/cms-nynorsk.lbx | 6 +- 31 files changed, 2459 insertions(+), 1745 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/README b/Master/texmf-dist/doc/latex/biblatex-chicago/README index 16edb477aee..1d5981b885c 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/README +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/README @@ -1,17 +1,18 @@ IMPORTANT NOTE: This is the package formerly known as biblatex-chicago-notes-df. It -has now been upgraded to work with version 2.4 of biblatex, which has -recently been released. It contains, for the first time, both the -15th- and 16th-edition Chicago style files. 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.4 -if you are using the latest biblatex, 0.9.8 or 0.9.9 if you are still -using biblatex 1.7). +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). -README (version 0.9.9b, 2012-12-06): +README (version 0.9.9c, 2013-03-15): Biblatex-chicago contains five biblatex styles implementing the specifications of the Chicago Manual of Style in both its 15th and @@ -32,7 +33,7 @@ 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 with to continue using the 15th-edition files, you'll +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. @@ -81,16 +82,16 @@ in your TeX directory tree instead of in your working directory, I recommend the following, which should be familiar from the main biblatex package: - - The twenty files biblatex-chicago.sty, chicago-notes.cbx, + - The twenty-one files biblatex-chicago.sty, chicago-notes.cbx, chicago-notes.bbx, chicago-authordate.cbx, chicago-authordate.bbx, chicago-authordate-trad.cbx, chicago-authordate-trad.bbx, chicago-notes15.cbx, chicago-notes15.bbx, chicago-authordate15.cbx, chicago-authordate15.bbx, cms-american.lbx, cms-british.lbx, - cms-french.lbx, cms-german.lbx, cms-icelandic.lbx, cms-ngerman.lbx, - cms-norsk.lbx, cms-norwegian.lbx, and cms-nynorsk.lbx are located - in the latex/ subdirectory, itself further subdivided into bbx/, - cbx/, and lbx/. The entire contents of this latex/ directory, - including its subdirectories, can go in + cms-finnish.lbx, cms-french.lbx, cms-german.lbx, cms-icelandic.lbx, + cms-ngerman.lbx, cms-norsk.lbx, cms-norwegian.lbx, and + cms-nynorsk.lbx are located in the latex/ subdirectory, itself + further subdivided into bbx/, cbx/, and lbx/. The entire contents + of this latex/ directory, including its subdirectories, can go in /tex/latex/biblatex-contrib/biblatex-chicago, where is the root of your local TeX installation -- for example, and depending on your system, /usr/share/texmf-local, @@ -115,7 +116,7 @@ Changelog: See the RELEASE file, and also the end of biblatex-chicago.pdf (or biblatex-chicago15.pdf). -Copyright (c) 2008-2012 David Fussner. This package is +Copyright (c) 2008-2013 David Fussner. This package is author-maintained. This work may be copied, distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license or (at your option) any later diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE b/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE index 47c547c7e35..5cfa81434ee 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE @@ -1,3 +1,84 @@ +Release notes for version 0.9.9c [2013-03-15]: + + - I am marking the 15th-edition styles as "deprecated." I recommend + that you switch to one of the 16th-edition styles as soon as is + practicable. The older styles still work, but haven't received any + updates or bug fixes for this release. + + - Antti-Juhani Kaijahano has very kindly provided a new Finnish + localization for biblatex-chicago, called cms-finnish.lbx. As you + will see if you look through it, it is still something of a work in + progress. If you would like to fill some of its lacunae, please do + let me know. + + - Following a report by Bertold Schweitzer, I have added the "namea" + and "nameb" fields to Article and Review entries in all three + 16th-edition Chicago styles. As in all the book-like entry types, + they allow you to associate an editor or a translator specifically + with a "title" rather than, in these cases, with an "issuetitle." + See the docs on these entry types in sections 4.1 and 5.1 in + biblatex-chicago.pdf. + + - Thanks to another report by Bertold I have, in all three + 16th-edition Chicago styles, corrected inaccuracies in the + presentation of the Report entry type. The "number" now appears + immediately after the "type," and the "type" itself is now + capitalized properly depending on its context in an entry. + + - A third report by Bertold, detailing inaccuracies in the treatment + of the "volume" and "volumes" fields in certain contexts, has + resulted in a complete rewrite of the presentation of these (and + several related) fields in all non-periodical entry types in all + three 16th-edition Chicago styles. This won't require any changes + to your .bib files, but the output you see may, in some reasonably + unusual situations, change. Please let me know if something + doesn't look right to you. + + - A fourth report by Bertold revealed some inadequacies with multiple + date presentation in the two 16th-edition author-date styles, + issues that particularly involved cross-referenced entries. In + addition to some general fixes in the code, I have also slightly + changed the functioning of the "cmsdate=both" and "cmsdate=on" + switches. If, and only if, a work has only one date, and there is + no "switchdates" in the "options" field, then "cmsdate=on" and + "cmsdate=both" will both result in the suppression of the + "extrayear" field in that entry. See the "date" field docs in + section 5.2 of biblatex-chicago.pdf. + + - Following a report by Antti-Juhani Kaijahano, I have modified the + presentation of author-less Article and Review entries in the + reference list of both 16th-edition author-date styles. If such a + source had a "magazine" "entrysubtype," the styles would already + use the "journaltitle" at the head of the entry in the list of + references, but if there was no "entrysubtype" the entry would + appear in the list "date" first. Now, in keeping with the Manual + (14.175), the "title" will appear first, in both reference lists + and in-text citations. See especially under Article in section 5.1 + of biblatex-chicago.pdf. + + - Several users have pointed out annoying formatting errors in the + 16th-edition styles. Evan Cortens spotted two bugs in the notes & + bibliography style, one of which, under various circumstances, + introduced extra spaces into long notes and the other of which + affected the formatting of the "type" field in Thesis entries. I + have fixed both, also applying the latter fix to several other + entry types that use the "type" field. Bertold Schweitzer pointed + out a formatting bug with the "issuesubtitle" field in the + author-date style, now fixed. Mark Sprevak reported some spurious + spaces appearing in headers and footers when using the titleps + package; the culprits were errors in the cms-*.lbx files, now + cleaned up. + + - I have rectified a number of other errors, in particular making the + automatic provision of abbreviated cross-references more robust in + InCollection, InProceedings, and Letter entries, improving the + behavior of the "postnote" field in certain corner cases, fixing + bugs in the handling of "pagination" and "bookpagination" fields, + and slightly altering the placement of the "addendum" field in + book-like entries to bring it closer to the Manual's specification. + A number of other, smaller improvements should also bring the + styles into closer conformity with the specification. + Release notes for version 0.9.9b [2012-12-06]: - This release contains a new variant of the author-date style, diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf index 49826af7f1d..86363fb84a6 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf and b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex index 297c4928601..9fa80b0ab1d 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.9b (beta) \\ +\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.9c (beta) \\ \href{mailto:djf027@googlemail.com}{djf027@googlemail.com}\\ \today \end{center} @@ -73,19 +73,21 @@ \textbf{Please be advised that this package is beta software. Philipp Lehman's \textsf{biblatex} package has now reached a stable state, and is unlikely to require wholesale changes to styles written for - it. This release of \textsf{biblatex-chicago} implements, for the - first time, 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 encourage all users to switch - to the newer specification. If the title-formatting changes in the + 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 \textsf{authordate-trad} style keeps the traditional title - formatting but switches everything else to the 16th edition spec. - The 15th-edition documentation is still available, also, in - \textsf{biblatex-chicago15.pdf}. 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.\mylittlespace\\ + 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\\ 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 @@ -106,7 +108,7 @@ read on. \section{Quickstart} \reversemarginpar -%\enlargethispage{-3\baselineskip} +\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 @@ -145,7 +147,7 @@ this release. \begin{itemize}{}{} \item Philipp Lehman's \textsf{biblatex} package, of course! You - should use the latest version(s) --- 1.7 or 2.4 at the time of + 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 @@ -169,14 +171,13 @@ this release. Chicago author-date style with any version of \textsf{biblatex} from version 1.5 onwards. For that style you must use the following: - \item \mycolor{\textsf{Biber}} --- the next-generation - \textsc{Bib}\TeX\ replacement, called \textsf{Biber}, which is - available from SourceForge. You should use the latest version, - 1.4, to work with \textsf{biblatex-chicago} and \textsf{biblatex} - 2.4, 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. + \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. \end{itemize} \item The line: \begin{quote} @@ -189,17 +190,18 @@ this release. \end{quote} to load the author-date style, or the line: \begin{quote} - \cmd{usepackage[\mycolor{authordate-trad},backend=biber]\{biblatex-chicago\}} + \cmd{usepackage[\mycolor{authordate-trad},% + backend=biber]\{biblatex-chicago\}} \end{quote} to load the traditional variant of the author-date style. (You can - use \mycolor{\texttt{notes15}} or \mycolor{\texttt{authordate15}} to - load the 15th-edition styles. Please see - \mycolor{\textsf{biblatex-chicago15.pdf}} for the details.) Any - other options you usually pass to \textsf{biblatex} can be given to - \textsf{biblatex-chicago} instead, but loading it this way sets up a - number of other parameters automatically. You can also load the - package via the usual \cmd{usepackage\{biblatex\}}, adding either + use \texttt{notes15} or \texttt{authordate15} to load the + 15th-edition styles. Please see \textsf{bibla\-tex-chicago15.pdf} + for the details.) Any other options you usually pass to + \textsf{biblatex} can be given to \textsf{biblatex-chicago} instead, + but loading it this way sets up a number of other parameters + automatically. You can also load the package via the usual + \cmd{usepackage\{biblatex\}}, adding either \texttt{style=chicago\-notes} or \texttt{style=chicago-authordate}, but this is mainly for those who wish to set much of the low-level formatting of their document themselves. Please see @@ -221,31 +223,28 @@ this release. \texttt{american} as the main text language. 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 support for - \mycolor{British}, French, German, \mycolor{Icelandic}, and - \mycolor{Norwegian}. Please see below - (section~\ref{sec:international}) for a fuller explanation of all - the options. + \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. \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}, \mycolor{\textsf{cms-british.lbx}}, - \textsf{cms-french.lbx}, \textsf{cms-ger\-man.lbx}, - \mycolor{\textsf{cms-icelandic.lbx}}, \textsf{cms-ngerman.lbx}, - \mycolor{\textsf{cms-norsk.lbx}}, - \mycolor{\textsf{cms-norwe\-gian.lbx}}, - \mycolor{\textsf{cms-nynorsk.lbx}}, and + \textsf{cms-am\-erican.lbx}, \textsf{cms-british.lbx}, + \mycolor{\textsf{cms-finnish.lbx}}, \textsf{cms-french.lbx}, + \textsf{cms-ger\-man.lbx}, \textsf{cms-icelandic.lbx}, + \textsf{cms-ngerman.lbx}, \textsf{cms-norsk.lbx}, + \textsf{cms-norwe\-gian.lbx}, \textsf{cms-nynorsk.lbx}, and \textsf{biblatex-chicago.sty}, all from \textsf{biblatex-chicago}, installed either in a system-wide \TeX\ directory, or in the working directory where you keep your *.tex files. (To use the 15th-edition - styles, you'll also require \textsf{\mycolor{chicago-notes15.bbx}}, - \textsf{\mycolor{chicago-notes15.cbx}}, - \textsf{\mycolor{chicago-authordate15.bbx}}, and - \textsf{\mycolor{chicago-authordate15.cbx}}.) The .zip file from - CTAN contains several subdirectories to help keep the growing number - of files organized, so the files listed above can be found in the + styles, you'll also require \textsf{chicago-notes15.bbx}, + \textsf{chicago-notes15.cbx}, \textsf{chicago-authordate15.bbx}, and + \textsf{chicago-authordate15.cbx}.) The .zip file from CTAN + contains several subdirectories to help keep the growing number of + files organized, so the files listed above can be found in the \texttt{latex/} subdirectory, itself further divided into the \texttt{bbx/}, \texttt{cbx/}, and \texttt{lbx/} subdirectories. If you install in a system-wide directory, I suggest using the standard @@ -314,7 +313,7 @@ this release. \subsection{License} \label{sec:lppl} -Copyright © 2008--2012 David Fussner. This package is +Copyright © 2008--2013 David Fussner. This package is author-maintained. This work may be copied, distributed and/or modified under the conditions of the \LaTeX\ Project Public License, either version 1.3 of this license or (at your option) any later @@ -343,7 +342,8 @@ for the \texttt{shorthandibid} option from Dominik Wa \textsf{biblatex-dw} package. I've adapted Audrey Boruvka's \cmd{textcite} code from \href{http://tex/stackexchange.com/questions/67837/citations-as-nouns-in-biblatex-chicago}{Stackexchange} -for the notes \&\ bibliography style. I am very grateful to Baldur +for the notes \&\ bibliography style. I am very grateful to +Antti-Juhani Kaijahano for the Finnish localization, to Baldur Kristinsson for providing the Icelandic localization, and to Håkon Malmedal for the Norwegian localizations. Kazuo Teramoto and Gildas Hamel both sent patches to improve the package, and there may be other @@ -436,6 +436,8 @@ 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} + \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 \textsf{biblatex}, so that my .bbx and .cbx files would use his @@ -486,7 +488,7 @@ 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}, \mycolor{\textbf{customc}}, \textbf{image}, +\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}), @@ -577,7 +579,7 @@ to do what you want. Here, however, if all you need is a \textsf{titleaddon}, then you want to switch to the \textsf{review} type, where you can simply use the \textsf{title} field instead. -\mylittlespace No less than seven more things need explication here. +\mylittlespace No less than eight more things need explication here. First, since the \emph{Manual} specifies that much of what goes into a \textsf{titleaddon} field stays unformatted --- no italics, no quotation marks --- this plain style is the default for such text, @@ -624,7 +626,22 @@ lakeforester:pushcarts and, for the sorting issue, %\enlargethispage{-\baselineskip} -\mylittlespace Fourth, if you've been using +\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 Fifth, if you've been using \textsf{biblatex-chicago-notes} for a while, you may remember using the single-letter \cmd{bibstring} mechanism in order to help \textsf{biblatex} decide where to capitalize a wide variety of strings @@ -643,7 +660,7 @@ a note or bibliography entry. Please see \textbf{\textbackslash since both appear regularly in \textsf{article} entries, I thought the problem merited a preliminary mention here. -\mylittlespace Fifth, if you need to cite an entire issue of any sort +\mylittlespace Sixth, if you need to cite an entire issue of any sort of periodical, rather than one article in an issue, then the \textsf{periodical} entry type, once again with or without the \texttt{magazine} toggle in \textsf{entrysubtype}, is what you'll @@ -661,7 +678,7 @@ information you need to include in an \textsf{article}, it in the \textsf{note} field, but rather in \textsf{titleaddon} or perhaps \textsf{addendum} (brown:bremer). -\mylittlespace Sixth, if you wish to cite a television or radio +\mylittlespace Seventh, if you wish to cite a television or radio broadcast, the \textsf{article} type, \textsf{entrysubtype} \texttt{magazine} is the place for it. The name of the program would go in \textsf{journaltitle}, with the name of the episode in @@ -702,7 +719,7 @@ that I have found in my own research that the unusual and/or limit cases are really rather rare, and that the vast majority of sources won't require any knowledge of these onerous details. -\mybigspace Arne \colmarginpar{\textbf{artwork}} Kjell Vikhagen has +\mybigspace Arne \mymarginpar{\textbf{artwork}} Kjell Vikhagen has pointed out to me that none of the standard entry types were straightforwardly adaptable when referring to visual artworks. The \emph{Manual} doesn't give any thorough specifications for such @@ -744,7 +761,7 @@ use the \textsf{misc} entry type with an \textsf{entrysubtype}. Fortunately, in this instance the other fields in a \textsf{misc} entry function pretty much as in \textsf{artwork}. -\mybigspace Following \colmarginpar{\textbf{audio}} the request of +\mybigspace Following \mymarginpar{\textbf{audio}} the request of Johan Nordstrom, I have included three entry types, all undefined by the standard styles, designed to allow users to present audiovisual sources in accordance with the Chicago specifications. The @@ -843,7 +860,7 @@ obsolete, and any such entries in your .bib file will trigger an error. Please use the standard \textsf{biblatex} \textbf{bookinbook} type instead. -\mybigspace This \colmarginpar{\textbf{customc}} entry type allows you +\mybigspace This \mymarginpar{\textbf{customc}} entry type allows you to include alphabetized cross-references to other, separate entries in the bibliography, particularly to other names or pseudonyms, as recommended by the \emph{Manual}. (This is different from the usual @@ -871,7 +888,7 @@ key in a \cmd{nocite} command, or you can put that entry key in the \textsf{biblatex-chicago} will print the expanded abbreviation if and only if you cite the main entry. (Cf.\ \textsf{userc}, below.) -\enlargethispage{\baselineskip} +%\enlargethispage{\baselineskip} \mylittlespace Under ordinary circumstances, \textsf{biblatex-chicago} will connect the two parts of the cross-reference with the word @@ -880,7 +897,7 @@ will connect the two parts of the cross-reference with the word differently, you can put the connecting word(s) into the \textsf{nameaddon} field. -\mybigspace This \colmarginpar{\textbf{image}} entry type, left +\mybigspace This \mymarginpar{\textbf{image}} entry type, left undefined in the standard styles, was in previous releases of \textsf{biblatex-chicago} intended for referring to photographs, but the 16th edition of the \emph{Manual} has changed its specifications @@ -948,7 +965,7 @@ mechanism for shortening citations of multiple pieces from the same \textsf{incollection} entries. See \textbf{crossref}, below, 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 @@ -1030,7 +1047,7 @@ works, as well, for which you need to provide not only a \textsf{url} but also, always, a \textsf{urldate}, as these sources are in constant flux (wikiped:bibtex, grove:sibelius). -\mybigspace This \colmarginpar{\textbf{letter}} is the entry type to +\mybigspace This \mymarginpar{\textbf{letter}} is the entry type to use for citing letters, memoranda, or similar texts, but \emph{only} when they appear in a published collection. (Unpublished material of this nature needs a \textsf{misc} entry, for which see below.) @@ -1123,7 +1140,7 @@ you would need to define both \textsf{author} and \textsf{publisher} using the name you here might have put in \textsf{organization}. (See 14.92; chicago:manual, dyna:browser, natrecoff:camera.) -\mybigspace As \colmarginpar{\textbf{misc}} its name suggests, the +\mybigspace As \mymarginpar{\textbf{misc}} its name suggests, the \textsf{misc} entry type was designed as a hold-all for citations that didn't quite fit into other categories. In \textsf{biblatex-chicago-notes}, I have somewhat extended its @@ -1239,7 +1256,7 @@ conformity to some external standard, so it is the former which you should pursue. I hope that \textsf{biblatex-chicago-notes} proves helpful in this regard. -\mybigspace The \colmarginpar{\textbf{music}} 16th edition of the +\mybigspace The \mymarginpar{\textbf{music}} 16th edition of the \emph{Manual} has revised its recommendations more for this type than for any other, so the notes which follow present several large changes that you'll need to make to your .bib files. The good news is that @@ -1287,58 +1304,57 @@ equivalences. song title, in which latter case the album title would go into \textsf{booktitle}. The \textsf{maintitle} might be necessary for something like a box set of \emph{Complete Symphonies}. -\item[\mycolor{publisher, series, number}:] These three - closely-associated fields are intended for presenting the catalog - information provided by the music publisher. The 16th edition - generally only requires the \textsf{series} and \textsf{number} - fields (nytrumpet:art), which hold the record label and catalog - number, respectively. Alternatively, \textsf{publisher} would - function as a synonym for \textsf{series} (holiday:fool), but there - may be cases when you need or want to specify a publisher in - addition to a label, as was the general requirement in the 15th - edition. (This might happen, for example, when a single publisher - oversees more than one label.) You can certainly put all of this - information into one of the above fields, but separating it may help - make the .bib entry more readable. -\item[\mycolor{howpublished/pubstate}:] The 16th edition of the - \emph{Manual} (14.276) has rather helpfully eliminated any reference - to the specialized symbols (\texttt{\textcircledP} \&\ +\item[publisher, series, number:] These three closely-associated + fields are intended for presenting the catalog information provided + by the music publisher. The 16th edition generally only requires + the \textsf{series} and \textsf{number} fields (nytrumpet:art), + which hold the record label and catalog number, respectively. + Alternatively, \textsf{publisher} would function as a synonym for + \textsf{series} (holiday:fool), but there may be cases when you need + or want to specify a publisher in addition to a label, as was the + general requirement in the 15th edition. (This might happen, for + example, when a single publisher oversees more than one label.) You + can certainly put all of this information into one of the above + fields, but separating it may help make the .bib entry more + readable. +\item[howpublished/pubstate:] The 16th edition of the \emph{Manual} + (14.276) has rather helpfully eliminated any reference to the + specialized symbols (\texttt{\textcircledP} \&\ \texttt{\textcopyright}) found in the 15th edition for presenting publishing information for musical recordings. This means that the \textsf{howpublished} field is now obsolete, and you can remove it from \textsf{music} entries in your .bib files. The - \textsf{pubstate} field, therefore, can revert to its standard use for - identifying reprints. In \textsf{music} entries, putting + \textsf{pubstate} field, therefore, can revert to its standard use + for identifying reprints. In \textsf{music} entries, putting \texttt{reprint} here will transform the \textsf{origdate} from a recording date for an entire album into an original release date for that album, notice of which will be printed towards the end of a note or bibliography entry. -\item[\mycolor{date, eventdate, origdate}:] As though to compensate - for the simplification I've just mentioned, the \textsf{Manual} now - states that \enquote{citations without a date are generally - unacceptable} (14.276). Finding a date may take some research, - but they will basically fall into two types, i.e., the date(s) of - the recording or the copyright / publishing date(s). Recording - dates go either in \textsf{origdate} (for complete albums) or - \textsf{eventdate} (for individual tracks). The copyright or - publishing dates go either in the \textsf{date} field (which applies - to the current medium you are citing) or in the \textsf{origdate} - field (which refers to the original release date). You may have - noticed that the \textsf{origdate} has two slightly different uses - --- you can tell \textsf{biblatex-chicago} which sort you intend by - using the string \texttt{reprint} in the \textsf{pubstate} field, - which transforms the \textsf{origdate} from a recording date into an - original release 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 \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.) +\item[date, eventdate, origdate:] As though to compensate for the + simplification I've just mentioned, the \textsf{Manual} now states + that \enquote{citations without a date are generally unacceptable} + (14.276). Finding a date may take some research, but they will + basically fall into two types, i.e., the date(s) of the recording or + the copyright / publishing date(s). Recording dates go either in + \textsf{origdate} (for complete albums) or \textsf{eventdate} (for + individual tracks). The copyright or publishing dates go either in + the \textsf{date} field (which applies to the current medium you are + citing) or in the \textsf{origdate} field (which refers to the + original release date). You may have noticed that the + \textsf{origdate} has two slightly different uses --- you can tell + \textsf{biblatex-chicago} which sort you intend by using the string + \texttt{reprint} in the \textsf{pubstate} field, which transforms + the \textsf{origdate} from a recording date into an original release + 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 + \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.) \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. @@ -1357,7 +1373,7 @@ course, be entertained. (Cf. 14.276--77; \textsf{eventdate}, bernstein:shostakovich, floyd:atom, holiday:fool, nytrumpet:art, rubinstein:chopin.) -\mybigspace The \colmarginpar{\textbf{online}} \emph{Manual}'s +\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 different from those suggested by standard \textsf{biblatex}. Indeed, @@ -1401,7 +1417,7 @@ dates to access dates when documenting online material. See %\enlargethispage{\baselineskip} -\mybigspace The \colmarginpar{\textbf{patent}} \emph{Manual} is very +\mybigspace The \mymarginpar{\textbf{patent}} \emph{Manual} is very brief on this subject (14.230), but very clear about which information it wants you to present, so such entries may not work well with other \textsf{biblatex} styles. The important date, as far as Chicago is @@ -1459,15 +1475,16 @@ in the bibliography as well.) \mybigspace This \mymarginpar{\textbf{report}} entry type is a \textsf{biblatex} generalization of the traditional \textsc{Bib}\TeX\ type \textsf{techreport}. Instructions for such entries are rather -thin on the ground in the \emph{Manual} (14.249), so I have followed -the generic advice about formatting it like a book, and hope that the -results conform to the specification. Its main peculiarities are the -\textsf{institution} field in place of a \textsf{publisher}, the -\textsf{type} field for identifying the kind of report in question, -and the \textsf{isrn} field containing the International Standard -Technical Report Number of a technical report. As in standard -\textsf{biblatex}, if you use a \textsf{techreport} entry, then the -\textsf{type} field automatically defaults to +thin on the ground in the \emph{Manual} (8.183, 14.249), so I have +followed the generic advice about formatting it like a book, and hope +that the results conform to the specification. Its main peculiarities +are the \textsf{institution} field in place of a \textsf{publisher}, +the \textsf{type} field for identifying the kind of report in +question, the \textsf{number} field closely associated with the +\textsf{type}, and the \textsf{isrn} field containing the +International Standard Technical Report Number of a technical report. +As in standard \textsf{biblatex}, if you use a \textsf{techreport} +entry, then the \textsf{type} field automatically defaults to \cmd{bibstring\{techreport\}}. As with \textsf{booklet} and \textsf{manual}, you can also use a \textsf{book} entry, putting the report type in \textsf{note} and the \textsf{institution} in @@ -1557,9 +1574,21 @@ 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} -\mybigspace This \colmarginpar{\textbf{suppbook}} is the entry type to +\mybigspace This \marginpar{\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 @@ -1628,9 +1657,9 @@ 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 -(nass:address). +(14.228; nass:address). -\mybigspace This \colmarginpar{\textbf{video}} is the last of the three +\mybigspace This \mymarginpar{\textbf{video}} is the last of the three audiovisual entry types, and as its name suggests it is intended for citing visual media, be it films of any sort or TV shows, broadcast, on the Net, on VHS, DVD, or Blu-ray. As with the \textsf{music} type @@ -1660,40 +1689,39 @@ by \textsf{biblatex}. Here are the main correspondences: identify performers, as they usually don't need further specifying and this role prevents \textsf{biblatex} from falling back on the default \texttt{editor} bibstring. -\item[title, titleaddon, booktitle, \mycolor{booktitleaddon}, - maintitle:] As with the other audiovisual types, \textsf{video} - serves as an analogue both to books and to collections, so the - \textsf{title} may be of a whole film DVD or of a TV series, or it - may identify one episode in a series or one scene in a film. In the - latter cases, the title of the whole would go in \textsf{booktitle}. - The \mycolor{\textsf{booktitleaddon}} field, in a change from the - 15th edition, may be useful for specifying the season and/or episode - number of a TV series, while the \textsf{titleaddon} is for for any - information that needs to come between the \textsf{title} and the +\item[title, titleaddon, booktitle, booktitleaddon, maintitle:] As + with the other audiovisual types, \textsf{video} serves as an + analogue both to books and to collections, so the \textsf{title} may + be of a whole film DVD or of a TV series, or it may identify one + episode in a series or one scene in a film. In the latter cases, + the title of the whole would go in \textsf{booktitle}. The + \textsf{booktitleaddon} field, in a change from the 15th edition, + may be useful for specifying the season and/or episode number of a + TV series, while the \textsf{titleaddon} is for for any information + that needs to come between the \textsf{title} and the \textsf{booktitle} (cleese:holygrail, friends:leia, handel:messiah). As in the \textsf{music} type, \textsf{maintitle} may be necessary for a boxed set or something similar. -\item[\mycolor{date, eventdate, origdate}:] As with \textsf{music} - entries, in order to follow the specifications of the 16th edition - of the \emph{Manual}, I have had to provide three separate date - fields for citing \textsf{video} sources, but their uses differ - somewhat between the two types. In both, the \textsf{date} will - generally provide the publishing or copyright date of the medium you - are referencing. The \textsf{eventdate} will most commonly present +\item[date, eventdate, origdate:] As with \textsf{music} entries, in + order to follow the specifications of the 16th edition of the + \emph{Manual}, I have had to provide three separate date fields for + citing \textsf{video} sources, but their uses differ somewhat + between the two types. In both, the \textsf{date} will generally + provide the publishing or copyright date of the medium you are + referencing. The \textsf{eventdate} will most 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 - \mycolor{\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 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. \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. @@ -1715,13 +1743,21 @@ 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 \mymarginpar{\textbf{addendum}} in standard +\mybigspace As \colmarginpar{\textbf{addendum}} in standard \textsf{biblatex}, this field allows you to add miscellaneous -information to the end of an entry, after publication data but before -any \textsf{url} or \textsf{doi} field. In the \textsf{patent} entry -type (which see), it will be printed in close association with the -filing and issue dates. In any entry type, if your data begins with a -word that would ordinarily only be capitalized at the beginning of a +information to the end of an entry, after publication data but, with +the single exception of the \textsf{online} entry type, before any +\textsf{url} or \textsf{doi} field. In the \textsf{patent} entry type +(which see), it will be printed in close association with the filing +and issue dates. In a few entry types --- \textsf{article}, +\textsf{audio}, \textsf{music}, \textsf{periodical}, \textsf{review}, +and \textsf{video} --- this information will come \emph{after} any +\textsf{pages} or \textsf{postnote} references present in long notes, +while in the remainder it comes \emph{before} such information, +allowing you in particular to use the field to identify a particular +type of book-like publication when such data won't fit well in another +part of an entry. In any entry type, if your data begins with a word +that would ordinarily only be capitalized at the beginning of a sentence, then simply ensure that that word is in lowercase, and the style will take care of the rest. Cf.\ \textsf{note}. (See \emph{Manual} 14.119, 14.166--168; davenport:attention, @@ -1965,7 +2001,7 @@ 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} +%\enlargethispage{\baselineskip} \mybigspace This \mymarginpar{\textbf{chapter}} field holds the chapter number, mainly useful only in an \textsf{inbook} or an @@ -2128,7 +2164,7 @@ of the notes \&\ bibliography style.) \textsf{biblatex} 0.9, is obsolete, and will be ignored if you use it in your .bib files. Use \textsf{date} instead. -\mybigspace Standard \colmarginpar{\textbf{doi}} \textsf{biblatex} +\mybigspace Standard \mymarginpar{\textbf{doi}} \textsf{biblatex} field, providing the Digital Object Identifier of the work. The 16th edition of the \emph{Manual} specifies that, given their relative permanence compared to URLs, \enquote{authors should include DOIs @@ -2216,19 +2252,17 @@ proceeding in order through \textsf{editor}, \textsf{translator}, and \textsf{journaltitle} at the head of an entry. See above under \textsf{article} for details.) The \textsf{editortype} field, added in \textsf{biblatex 0.7}, provides even greater flexibility, giving -you the ability to put a compiler at the head of an entry without -using \textsf{namec}, freeing you from the need to use a -\textsf{sortkey} and a \textsf{shortauthor}. You can do this even -though an author is named (eliot:pound shows this mechanism in action -for a standard editor, rather than a compiler). Two things are -necessary for this to happen. First, in the \textsf{options} field -you need to set \texttt{useauthor=false}, then you need to put the -name you wish to see at the head of your entry into the -\textsf{editor} or the \textsf{namea} field. If the \enquote{editor} -is in fact a 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 both the bibliography and in the long -note form. +you the ability to indicate any number of roles at the head of an +entry. You can do this even though an author is named (eliot:pound +shows this mechanism in action for a standard editor, rather than for +an alternative role). Two things are necessary for this to happen. +First, in the \textsf{options} field you need to set +\texttt{useauthor=false}, then you need to put the name you wish to +see at the head of your entry into the \textsf{editor} or the +\textsf{namea} field. If the \enquote{editor} is in fact a 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 both the bibliography and in the long note form. \mylittlespace There are a few details of which you need to be aware. Because \textsf{biblatex-chicago} has added the \textsf{namea} field, @@ -2241,11 +2275,11 @@ for an \textsf{editor}. When the \textsf{editor} field is used, \textsf{biblatex}'s sorting algorithms will work properly, and also 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, 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}. +\textsf{namea} field provides the name, and you are not using +\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}. \mylittlespace In \textsf{biblatex} 0.9 Lehman reworked the string concatenation mechanism, for reasons he outlined in his RELEASE file, @@ -2341,7 +2375,7 @@ antiquity whose title you do not wish to be italicized. Please see the documentation of \textsf{artwork} above for the details. \mybigspace Kazuo -\colmarginpar{\textbf{eprint}\\\textbf{eprintclass}\\\textbf{eprinttype}} +\mymarginpar{\textbf{eprint}\\\textbf{eprintclass}\\\textbf{eprinttype}} Teramoto suggested adding \textsf{biblatex's} excellent \textsf{eprint} handling to \textsf{biblatex-chicago}, and he sent me a patch implementing it. With minor alterations, I have applied it to @@ -2350,7 +2384,7 @@ in standard \textsf{biblatex}. They may prove helpful in providing more abbreviated references to online content than conventional URLs, though I can find no specific reference to them in the \emph{Manual}. -\mybigspace This \colmarginpar{\textbf{eventdate}} is a standard +\mybigspace This \mymarginpar{\textbf{eventdate}} is a standard \textsf{biblatex} field. In the 15th edition it was barely used, but in order to comply with changes in the 16th edition of the \emph{Manual} it can now play a significant role in \textsf{music}, @@ -2444,7 +2478,7 @@ proper place to identify the type of issue, e.g.,\ \texttt{special issue}, with the initial letter lower-cased to enable automatic contextual capitalization. -\enlargethispage{\baselineskip} +%\enlargethispage{\baselineskip} \mybigspace The \mymarginpar{\textbf{journalsubtitle}} subtitle for a \textsf{journaltitle} --- see next entry. @@ -2537,7 +2571,7 @@ the documentation of these entry types for further details. (See \emph{Manual} 14.247--248; ency:britannica, grove:sibelius, times:guide, wikiped:bibtex.) -\mybigspace This \colmarginpar{\textbf{location}} is +\mybigspace This \mymarginpar{\textbf{location}} is \textsf{biblatex}'s version of the usual \textsc{Bib}\TeX\ field \textsf{address}, though the latter is accepted as an alias if that simplifies the modification of older .bib files. According to the @@ -2600,17 +2634,20 @@ leaves undefined itself. In \textsf{biblatex-chicago} it contains the name(s) of the editor(s) of a \textsf{title}, if the entry has a \textsf{booktitle} or \textsf{maintitle}, or both, in which situation the \textsf{editor} would be associated with one of these latter -fields (donne:var). You should 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} above for the full details. -Cf.\ also \textsf{nameb}, \textsf{namec}, \textsf{translator}, and the -macros \cmd{partedit}, \cmd{parttrans}, \cmd{parteditandtrans}, +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 +\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 \cmd{partedittransand\-comp}, for which see section~\ref{sec:formatcommands}. -\mybigspace This \colmarginpar{\textbf{nameaddon}} field is provided +\mybigspace This \mymarginpar{\textbf{nameaddon}} field is provided by \textsf{biblatex}, though not used by the standard styles. In \textsf{biblatex-chicago}, it allows you, in most entry types, to specify that an author's name is a pseudo\-nym, or to provide either @@ -2645,12 +2682,14 @@ styles. In \textsf{biblatex-chicago}, it contains the name(s) of the translator(s) of a \textsf{title}, if the entry has a \textsf{booktitle} or \textsf{maintitle}, or both, in which situation the \textsf{translator} would be associated with one of these latter -fields (euripides:orestes). You should 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}, +fields (euripides:orestes). (In \textsf{article} and \textsf{review} +entries, \textsf{nameb} 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 +\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 @@ -2734,21 +2773,23 @@ the right thing. Cf.\ \textsf{addendum}. \mybigspace This \mymarginpar{\textbf{number}} is a standard \textsf{biblatex} field, containing the number of a \textsf{journaltitle} in an \textsf{article} or \textsf{review} entry, -the number of a \textsf{title} in a \textsf{periodical} entry, or the -volume/number of a book in a \textsf{series}. Generally, in an -\textsf{article}, \textsf{periodical}, or \textsf{review} entry, this -will be a plain cardinal number, but in such entries -\textsf{biblatex-chicago} now does the right thing if you have a list -or range of numbers (unsigned:ranke). In any \textsf{book}-like entry -the field may well contain considerably more information, including -even a reference to \enquote{2nd ser.,} for example, while the -\textsf{series} field in such an entry will contain the name of the -series, rather than a number. This field is also the place for the -patent number in a \textsf{patent} entry. Cf.\ \textsf{issue} and -\textsf{series}. (See \emph{Manual} 14.128--132 and boxer:china, -palmatary:pottery, wauchope:ceramics; 14.180--181 and beattie:crime, -conley:fifthgrade, friedman:learn\-ing, garrett, gibbard, hlatky:hrt, -mcmillen:antebellum, rozner:liberation, warr:el\-lison.) +the number of a \textsf{title} in a \textsf{periodical} entry, the +volume/number of a book in a \textsf{series}, or the (generally +numerical) specifier of the \textsf{type} in a \textsf{report} entry. +Generally, in an \textsf{article}, \textsf{periodical}, or +\textsf{review} entry, this will be a plain cardinal number, but in +such entries \textsf{biblatex-chicago} now does the right thing if you +have a list or range of numbers (unsigned:ranke). In any +\textsf{book}-like entry the field may well contain considerably more +information, including even a reference to \enquote{2nd ser.,} for +example, while the \textsf{series} field in such an entry will contain +the name of the series, rather than a number. This field is also the +place for the patent number in a \textsf{patent} entry. Cf.\ +\textsf{issue} and \textsf{series}. (See \emph{Manual} 14.128--132 +and boxer:china, palmatary:pottery, wauchope:ceramics; 14.180--181 and +beattie:crime, conley:fifthgrade, friedman:learn\-ing, garrett, +gibbard, hlatky:hrt, mcmillen:antebellum, rozner:liberation, +warr:el\-lison.) \mylittlespace \textbf{NB}: This may be an opportune place to point out that the \emph{Manual} (14.154) prefers arabic to roman numerals @@ -2774,7 +2815,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 \colmarginpar{\textbf{origdate}} \textsf{biblatex} +\mybigspace This \mymarginpar{\textbf{origdate}} \textsf{biblatex} field allows you to provide more than one full date specification for those references which need it. As with the analogous \textsf{date} field, you provide the date (or range of dates) in \textsc{iso}8601 @@ -2871,7 +2912,7 @@ writing, be one of \texttt{american}, \texttt{brazilian}, %\enlargethispage{-\baselineskip} -\mybigspace The \colmarginpar{\textbf{origlocation}} 16th edition of +\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). Starting with this release of \textsf{biblatex-chicago}, @@ -2889,7 +2930,7 @@ new functionality should make this simple to achieve. Cf.\ \textsf{origdate}, \textsf{origpublisher} and \textsf{pubstate}; schweitzer:bach.) -\mybigspace As \colmarginpar{\textbf{origpublisher}} with the +\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 their corresponding originals (14.166). You can now provide an @@ -2939,7 +2980,7 @@ association with a \textsf{volume} number, so if you need to identify field, (which in this case would be \textsf{number} [palmatary:pottery]). Cf.\ \textsf{volume}. -\mybigspace Standard \colmarginpar{\textbf{publisher}} +\mybigspace Standard \mymarginpar{\textbf{publisher}} \textsf{biblatex} field. Remember that \enquote{\texttt{and}} is a keyword for connecting multiple publishers, so if a publisher's name contains \enquote{and,} then you should either use the ampersand (\&) @@ -2967,7 +3008,7 @@ Some style guides apparently suggest using \texttt{s.n.}\,(= \emph{sine nomine}) to specify the lack of a publisher, but the \emph{Manual} doesn't mention this. -\mybigspace Due \colmarginpar{\textbf{pubstate}} to specific +\mybigspace Due \mymarginpar{\textbf{pubstate}} to specific requirements in the author-date style, I have implemented this field there as a way of providing accurate citations of reprinted books. As the functionality seemed useful, I have also included some of it in @@ -3058,7 +3099,7 @@ periodicals, see 14.195; garaud:gatine, sewall:letter.) Cf.\ \textsf{number} for more information on the \emph{Manual}'s preferences regarding the formatting of numerals. -\mybigspace This \colmarginpar{\textbf{shortauthor}} is a standard +\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 purposes of the Chicago style, the field provides the name to be used @@ -3100,7 +3141,7 @@ most situations, but if you have set \texttt{useauthor=false} (and not only \textsf{shorteditor} will be recognized. Cf.\ \textsf{editortype}, above. -\mybigspace This \colmarginpar{\textbf{shorthand}} is +\mybigspace This \mymarginpar{\textbf{shorthand}} is \textsf{biblatex}'s mechanism for using abbreviations in place of the usual short note form, and in previous releases I left it effectively unmodified in \textsf{biblatex-chicago-notes}, apart from a few @@ -3117,8 +3158,8 @@ 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 For this release, I have provided three new options to -alter these defaults. First, there is a new citation command, +\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 @@ -3143,7 +3184,7 @@ care is needed when using shorthands with cross-references, and I would avoid them in all parent entries, at least in the current state of \textsf{biblatex-chicago-notes}. -\mybigspace When \colmarginpar{\textbf{shorthandintro}} you include a +\mybigspace When \mymarginpar{\textbf{shorthandintro}} you include a \textsf{shorthand} in an entry, it will ordinarily appear the first time you cite the work, at the end of a long note, surrounded by parentheses and prefaced by the phrase \enquote{hereafter cited as.} @@ -3183,7 +3224,7 @@ unsigned:ranke). %\enlargethispage{\baselineskip} -\mybigspace A \colmarginpar{\textbf{sortkey}} standard +\mybigspace A \mymarginpar{\textbf{sortkey}} standard \textsf{biblatex} field, designed to allow you to specify how you want an entry alphabetized in a bibliography. In general, if an entry doesn't turn up where you expect or want it, this field should provide @@ -3232,7 +3273,7 @@ are as follows: \item[\qquad Italics:] \textsf{booktitle}, \textsf{maintitle}, and \textsf{journaltitle} in all entry types; \textsf{title} of \textsf{artwork}, \textsf{book}, \textsf{bookinbook}, - \textsf{booklet}, \textsf{collection}, \mycolor{\textsf{image}}, + \textsf{booklet}, \textsf{collection}, \textsf{image}, \textsf{inbook}, \textsf{manual}, \textsf{misc} (with no \textsf{entrysubtype}), \textsf{periodical}, \textsf{proceedings}, \textsf{report}, \textsf{suppbook}, and \textsf{suppcollection} @@ -3245,8 +3286,8 @@ are as follows: \item[\qquad Unformatted:] \textsf{booktitleaddon}, \textsf{maintitleaddon}, and \textsf{titleaddon} in all entry types, \textsf{title} of \textsf{customc}, \textsf{letter}, \textsf{misc} - (with an \textsf{entrysubtype}), \mycolor{\textsf{patent}}, - \textsf{review}, and \textsf{suppperiodical} entry types. + (with an \textsf{entrysubtype}), \textsf{patent}, \textsf{review}, + and \textsf{suppperiodical} entry types. \item[\qquad Italics or Quotation Marks:] All of the audiovisual entry types --- \textsf{audio}, \textsf{music}, and \textsf{video} --- have to serve as analogues both to \textsf{book} and to @@ -3408,7 +3449,7 @@ cleese:holygrail, leo:madonna, nytrumpet:art.) %\enlargethispage{-\baselineskip} -\mybigspace A standard \colmarginpar{\textbf{url}} \textsf{biblatex} +\mybigspace A standard \mymarginpar{\textbf{url}} \textsf{biblatex} field, it holds the url of an online publication, though you can provide one for all entry types. The 16th edition of the \textsf{Manual} expresses a strong preference for DOIs over URLs if @@ -3417,18 +3458,17 @@ the former is available --- cf.\ \textsf{doi} above, and also \textsf{url} will ensure that your documents format such references properly, in the text and in the reference apparatus. -\mybigspace A standard \colmarginpar{\textbf{urldate}} \textsf{biblatex} -field, it identifies exactly when you accessed a given url, and is -given in \textsc{iso}8601 format. The 16th 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 treated, as -before, as an access date (14.6--8, 14.184; evanston:library, -grove:sibelius, hlatky:hrt, osborne:poison, sirosh:visualcortex, -wikiped:bibtex). +\mybigspace A standard \mymarginpar{\textbf{urldate}} +\textsf{biblatex} field, it identifies exactly when you accessed a +given url, and is given in \textsc{iso}8601 format. The 16th 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 +\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; evanston:library, grove:sibelius, +hlatky:hrt, osborne:poison, sirosh:visualcortex, wikiped:bibtex). \mybigspace A \mymarginpar{\textbf{usera}} supplemental \textsf{biblatex} field which functions in \textsf{biblatex-chicago} @@ -3458,18 +3498,18 @@ 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 \colmarginpar{\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 \mymarginpar{\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). \mylittlespace Because of the rather specialized needs of some audio-visual references, this basic schema changes for \textsf{music} @@ -3554,13 +3594,16 @@ field. It holds the volume of a \textsf{journaltitle} in volume of a multi-volume work in many other sorts of entry. Cf.\ \textsf{part}. -\enlargethispage{\baselineskip} +%\enlargethispage{\baselineskip} \mybigspace Standard \colmarginpar{\textbf{volumes}} \textsf{biblatex} field. It holds the total number of volumes of a multi-volume work, and in the 16th edition of the \emph{Manual} no longer triggers any odd changes to the punctuation of short notes (14.159; -meredith:letters). +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. \mybigspace A \mymarginpar{\textbf{xref}} modified \textsf{crossref} field provided by \textsf{biblatex}. See \textbf{crossref}, above. @@ -3928,7 +3971,7 @@ prefer a longer citation where you might automatically find inside a \cmd{footnote} command manually. (See also section \ref{sec:useropts}, below.) -\mybigspace I \colmarginpar{\textbf{\textbackslash citeauthor}} have +\mybigspace I \mymarginpar{\textbf{\textbackslash citeauthor}} have adapted this standard \textsf{biblatex} command only very slightly to bring it into line with \textsf{biblatex-chicago's} needs. Its main usage will probably be for references to works from classical @@ -3982,7 +4025,7 @@ 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} +%\enlargethispage{-\baselineskip} \mybigspace Matthew \mymarginpar{\textbf{\textbackslash headlesscite}} Lundin requested a more generalized \cmd{headlesscite} macro, @@ -4017,14 +4060,14 @@ want something else. Again, I've provided only the most flexible form of the command, so you'll have to wrap it in a \cmd{footnote} manually. -\mybigspace At \colmarginpar{\textbf{\textbackslash shorthandcite}} +\mybigspace At \mymarginpar{\textbf{\textbackslash shorthandcite}} the request of Kenneth Pearce, I have included this command which always prints the \textsf{shorthand}, even at the first citation of a given work. Again, I've only provided the most flexible form of the command, so you'll need to place it inside parentheses or wrap it in a \cmd{footnote} manually. -\mybigspace This \colmarginpar{\textbf{\textbackslash surnamecite}} +\mybigspace This \mymarginpar{\textbf{\textbackslash surnamecite}} command is analogous to \cmd{headlesscite}, but whereas the latter allows you to omit an \textsf{author's} name when that name is obvious from the \textsf{title} of a work, \cmd{surnamecite} allows you to @@ -4034,13 +4077,13 @@ 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 \colmarginpar{\textbf{\textbackslash textcite}} -Gray started a discussion on -\href{http://tex/stackexchange.com/questions/67837/citations-as-nouns-in-biblatex-chicago}{Stackexchange} +\mybigspace Norman \mymarginpar{\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 the -user Audrey provided some code, adapted from \textsf{verbose.cbx}, to +\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 @@ -4113,7 +4156,7 @@ 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, following the specification (14.29). -\mylittlespace These \colmarginpar{\textsf{\texttt{maxbibnames\\=10\\ +\mylittlespace These \mymarginpar{\textsf{\texttt{maxbibnames\\=10\\ minbibnames\\=7}}} two options are new, and control the number of names printed in the bibliography when that number exceeds 10. These numbers follow the recommendations of the \emph{Manual} (14.76), @@ -4134,7 +4177,7 @@ mode, or whole spreads in twoside mode. the sorting of uppercase and lowercase letters separately, a practice which the \emph{Manual} doesn't appear to recommend. -\mylittlespace This \colmarginpar{\texttt{sorting=\\}\cmd{cms@choose}} +\mylittlespace This \mymarginpar{\texttt{sorting=\\}\cmd{cms@choose}} new setting tests whether you are using \textsf{Biber} as your backend, and if so enables a custom \textsf{biblatex-chicago} sorting scheme for the bibliography (\texttt{cms}). If you are using any @@ -4181,23 +4224,23 @@ chosen font. The default definition is: \cmd{renewcommand*\{\textbackslash bibnamedash\}\{\textbackslash rule[.4ex]\{3em\}\{.6pt\}\}}. -\mylittlespace With -\colmarginpar{\texttt{losnotes} \&\\\texttt{losendnotes}} this release, -and at the request of Kenneth Pearce, I have added two new -\texttt{bibenvironments} to \textsf{chicago-notes.bbx}, for use with -the \texttt{env} option to the \cmd{printshorthands} command. The -first, \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.) Please see the documentation of \textsf{shorthand} in -section~\ref{sec:entryfields} above for further options available to -you for presenting and formatting the list of shorthands. - -\mylittlespace The \colmarginpar{\cmd{Declare-}\\\texttt{Labelname}} +\mylittlespace At \mymarginpar{\texttt{losnotes} + \&\\\texttt{losendnotes}} the request of Kenneth Pearce, I have +added two new \texttt{bibenvironments} to \textsf{chicago-notes.bbx}, +for use with the \texttt{env} option to the \cmd{printshorthands} +command. The first, \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.) Please see the documentation of +\textsf{shorthand} in section~\ref{sec:entryfields} above for further +options available to you for presenting and formatting the list of +shorthands. + +\mylittlespace The \mymarginpar{\cmd{Declare-}\\\texttt{Labelname}} next-generation backend \textsf{Biber} offers enhanced functionality in many areas, two of which I've implemented in this release. \cmd{DeclareLabelname} allows you to add name fields for consideration @@ -4213,7 +4256,7 @@ its flexibility considerably. When \textsf{biblatex} reaches version to know it sooner rather than later. \mylittlespace The -\colmarginpar{\cmd{Declare-}\\\texttt{SortingScheme}} second +\mymarginpar{\cmd{Declare-}\\\texttt{SortingScheme}} second \textsf{Biber} enhancement I have implemented allows you to include almost any field whatsoever in \textsf{biblatex's} sorting algorithms for the bibliography, so that a great many more entries will be sorted @@ -4226,7 +4269,7 @@ variant of the default \texttt{nty}. (You can find its definition in \textsf{chicago-notes.cbx}.) Users of all other backends will still be using \texttt{nty}. -\enlargethispage{\baselineskip} +%\enlargethispage{\baselineskip} \mylittlespace The advantages of this scheme are, specifically, that any entry headed by one of the supplemental name fields @@ -4259,7 +4302,7 @@ the preamble, for the whole document, or on a per-entry basis in the would make sense to eliminate the \textsf{pages} field from the affected entries). -\mylittlespace This \colmarginpar{\texttt{doi=true}} option controls +\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 @@ -4274,7 +4317,9 @@ 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 \colmarginpar{\texttt{eprint=true}} option controls +\enlargethispage{\baselineskip} + +\mylittlespace This \mymarginpar{\texttt{eprint=true}} option controls whether any \textsf{eprint} fields present in the .bib file will be printed in notes and bibliography. It defaults to true, and can be set to false either in the preamble, for the whole document, or on a @@ -4323,14 +4368,14 @@ others may find that some automatic pruning helps clear things up, at least to a first approximation. Some per-entry work afterward may then polish up the details. -\mylittlespace At \colmarginpar{\texttt{addendum=\\true}} the request +\mylittlespace At \mymarginpar{\texttt{addendum=\\true}} the request of Roger Hart, I have included this option, which controls the printing of the \textsf{addendum} field, but \emph{only} in long notes. It defaults to true, and can be set to false either in the preamble, for the whole document, or on a per-entry basis, in the \textsf{options} field. -\mylittlespace According \colmarginpar{\texttt{bookseries=\\true}} to +\mylittlespace According \mymarginpar{\texttt{bookseries=\\true}} to the \emph{Manual} (14.128), the \textsf{series} field in book-like entries \enquote{may be omitted to save space (especially in a footnote).} This option allows you to control the printing of that @@ -4341,7 +4386,7 @@ this field, so the option will have no effect in them, and it is also ignored in \textsf{article}, \textsf{misc}, \textsf{music}, \textsf{periodical}, and \textsf{review} entries. -\mylittlespace As \colmarginpar{\texttt{notefield=\\true}} with the +\mylittlespace As \mymarginpar{\texttt{notefield=\\true}} with the previous two options, Roger Hart requested an option to control the printing of the \textsf{note} field in long notes. It defaults to true, and can be set to false either in the preamble, for the whole @@ -4350,7 +4395,7 @@ option will be ignored in \textsf{article}, \textsf{misc}, \textsf{periodical}, and \textsf{review} fields. \mylittlespace This -\colmarginpar{\vspace{-1\baselineskip}\texttt{completenotes}% +\mymarginpar{\vspace{-1\baselineskip}\texttt{completenotes}% \\\vspace{\baselineskip}\texttt{=true}} is the one option that rules the three preceding, either printing all the fields under consideration --- the default --- or excluding all of them from long @@ -4462,7 +4507,7 @@ 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} +\enlargethispage{\baselineskip} \mylittlespace This \mymarginpar{\texttt{short}} option means that your text will only use the short note form, even in the first @@ -4475,8 +4520,8 @@ citation commands which allow you to present the full reference in specific cases (see section \ref{sec:citecommands}). If your bibliography is not complete, then you should not use this option. -\mylittlespace Kenneth Pearce \colmarginpar{\texttt{shorthandfull}} -has suggested that, in some fields of study, a list of shorthands +\mylittlespace Kenneth Pearce \mymarginpar{\texttt{shorthandfull}} has +suggested that, in some fields of study, a list of shorthands providing full bibliographical information may replace the bibliography itself. This option prints this full information in the list of shorthands, though of course you should remember that any .bib @@ -4709,7 +4754,7 @@ 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: \textbf{article}, \textbf{artwork}, +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}, @@ -4717,7 +4762,7 @@ alias, is as follows: \textbf{article}, \textbf{artwork}, \textbf{music}, \textbf{online} (with its alias \textbf{www}), \textbf{patent}, \textbf{periodical}, \textbf{proceedings}, \textbf{reference}, \textbf{report} (with its alias -\textbf{techreport}), \textbf{review}, \textbf{suppbook}, +\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}. @@ -4733,7 +4778,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 \mymarginpar{\textbf{article}} \emph{Chicago Manual of +\mybigspace The \colmarginpar{\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 @@ -4808,7 +4853,7 @@ 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} +%\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 @@ -4824,7 +4869,7 @@ is a generic title like \enquote{review of \ldots,} then you want to switch to the \textsf{review} type, where you can simply use the \textsf{title} field for it. -\mylittlespace No less than seven more things need explication under +\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 unformatted --- no italics, no quotation marks --- this plain style is @@ -4851,25 +4896,45 @@ reference list. If you do use the reference list, then the standard shorter citation will be sufficient, and in both cases the name of the periodical (in the \textsf{journaltitle} field) will be used in place of the missing author. Just to clarify: in \textsf{article} or -\textsf{review} entries, \textsf{entrysubtype} \texttt{magazine}, and -only in such entries, a missing \textsf{author} field results in the -name of the periodical (in the \textsf{journaltitle} field) being used -as the missing author. The new default sorting scheme in -\textsf{biblatex-chicago-authordate} means that you no longer need the -\textsf{sortkey} field to alphabetize by \textsf{journaltitle} instead -of \textsf{title}, though you will still need one if you retain the -definite or indefinite article at the beginning of the -\textsf{journaltitle}. Also, if you want to abbreviate the +\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 +\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 +\textsf{journaltitle} in author-less entries with an +\textsf{entrysubtype}. If you want to abbreviate the \textsf{journaltitle} for use in citations, but give the full name in the list of references, then the \textsf{shortauthor} field, somewhat -surprisingly, is the place for it. (See +surprisingly, is the place for it. A shortened \textsf{title} should +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. + %\enlargethispage{-\baselineskip} -\mylittlespace Fourth, in certain fields, just beginning your data -with a lowercase letter activates the mechanism for capitalizing that +\mylittlespace Fifth, in certain fields, just beginning your data with +a lowercase letter activates the mechanism for capitalizing that letter depending on its context within a list of references entry. This is less important in the author-date styles, where this information only turns up in the reference list and not in citations, @@ -4879,7 +4944,7 @@ among those treating their data this way, and since both appear regularly in \textsf{article} entries, I thought the problem merited a preliminary mention here. -\mylittlespace Fifth, if you need to cite an entire issue of any sort +\mylittlespace Sixth, if you need to cite an entire issue of any sort of periodical, rather than one article in an issue, then the \textsf{periodical} entry type, once again with or without the \texttt{magazine} toggle in \textsf{entrysubtype,} is what you'll @@ -4897,7 +4962,7 @@ information you need to include in an \textsf{article} or \textsf{note} field, but rather in \textsf{titleaddon} or perhaps \textsf{addendum} (brown:bremer). -\mylittlespace Sixth, I would suggest that if you wish to cite a +\mylittlespace Seventh, I would suggest that if you wish to cite a television or radio broadcast, the \textsf{article} type, \textsf{entrysubtype} \texttt{magazine} is the place for it. The name of the program would go in \textsf{journaltitle}, with the name of the @@ -4923,7 +4988,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 @@ -5158,6 +5223,8 @@ media. This means that this entry type is now a clone of the for users migrating from the old to the new specification. (See 3.22, 8.193; bedford:photo.) +\enlargethispage{\baselineskip} + \mybigspace These \mymarginpar{\textbf{inbook}\\\textbf{incollection}} two standard \textsf{biblatex} types have very nearly identical formatting requirements as far as the Chicago specification is @@ -5482,22 +5549,22 @@ equivalences. song title, in which latter case the album title would go into \textsf{booktitle}. The \textsf{maintitle} might be necessary for something like a box set of \emph{Complete Symphonies}. -\item[\mycolor{publisher, series, number:}] These three closely- - associated fields are intended for presenting the catalog - information provided by the music publisher. The 16th edition - generally only requires the \textsf{series} and \textsf{number} - fields (nytrumpet:art), which hold the record label and catalog - number, respectively. Alternatively, \textsf{publisher} would - function as a synonym for \textsf{series} (holiday:fool), but there - may be cases when you need or want to specify a publisher in - addition to a label, as was the general requirement in the 15th - edition. (This might happen, for example, when a single publisher - oversees more than one label.) You can certainly put all of this - information into one of the above fields, but separating it may help - make the .bib entry more readable. -\item[\mycolor{howpublished/pubstate:}] The 16th edition of the - \emph{Manual} (14.276, 15.53) has rather helpfully eliminated any - reference to the specialized symbols (\texttt{\textcircledP} \&\ +\item[publisher, series, number:] These three closely- associated + fields are intended for presenting the catalog information provided + by the music publisher. The 16th edition generally only requires + the \textsf{series} and \textsf{number} fields (nytrumpet:art), + which hold the record label and catalog number, respectively. + Alternatively, \textsf{publisher} would function as a synonym for + \textsf{series} (holiday:fool), but there may be cases when you need + or want to specify a publisher in addition to a label, as was the + general requirement in the 15th edition. (This might happen, for + example, when a single publisher oversees more than one label.) You + can certainly put all of this information into one of the above + fields, but separating it may help make the .bib entry more + readable. +\item[howpublished/pubstate:] The 16th edition of the \emph{Manual} + (14.276, 15.53) has rather helpfully eliminated any reference to the + specialized symbols (\texttt{\textcircledP} \&\ \texttt{\textcopyright}) found in the 15th edition for presenting publishing information for musical recordings. This means that the \textsf{howpublished} field is now obsolete, and you can remove it @@ -5509,8 +5576,8 @@ equivalences. that album, notice of which will be printed towards the end of a reference list entry, always assuming that the \textsf{origdate} hasn't already appeared at the head of the entry and in citations. -\item[\mycolor{date, eventdate, origdate:}] As though to compensate - for the simplification I've just mentioned, the \textsf{Manual} now +\item[date, eventdate, origdate:] As though to compensate for the + simplification I've just mentioned, the \textsf{Manual} now \enquote{recommends a more comprehensive approach to dating audiovisual materials than in previous editions} (15.53). Indeed, \enquote{citations without a date are generally unacceptable} @@ -5661,21 +5728,21 @@ entry. (Cf.\ \textsf{inreference}, above.) \mybigspace This \mymarginpar{\textbf{report}} entry type is a \textsf{biblatex} generalization of the traditional \textsc{Bib}\TeX\ type \textsf{techreport}. Instructions for such entries are rather -thin on the ground in the \emph{Manual} (14.249), so I have followed -the generic advice about formatting it like a book, and hope that the -results conform to the specification. Its main peculiarities are the -\textsf{institution} field in place of a \textsf{publisher}, the -\textsf{type} field for identifying the kind of report in question, -and the \textsf{isrn} field containing the International Standard -Technical Report Number of a technical report. As in standard -\textsf{biblatex}, if you use a \textsf{techreport} entry, then the -\textsf{type} field automatically defaults to +thin on the ground in the \emph{Manual} (8.183, 14.249), so I have +followed the generic advice about formatting it like a book, and hope +that the results conform to the specification. Its main peculiarities +are the \textsf{institution} field in place of a \textsf{publisher}, +the \textsf{type} field for identifying the kind of report in +question, and the \textsf{isrn} field containing the International +Standard Technical Report Number of a technical report. As in +standard \textsf{biblatex}, if you use a \textsf{techreport} entry, +then the \textsf{type} field automatically defaults to \cmd{bibstring\{techreport\}}. As with \textsf{booklet} and \textsf{manual}, you can also use a \textsf{book} entry, putting the report type in \textsf{note} and the \textsf{institution} in \textsf{publisher}. (See herwign:office.) -\mybigspace The \mymarginpar{\textbf{review}} \textsf{review} entry +\mybigspace The \colmarginpar{\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 @@ -5744,19 +5811,23 @@ fields will be ignored. (See osborne:poison.) 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 reviews are treated -just like similar newspaper articles --- the \textsf{journaltitle} -replaces the author in citations and heads the entry in the list of -references. The sorting of such entries isn't an issue, as it's -solved by \textsf{Biber} (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 \enquote{interview,} -\enquote{review,} and \enquote{letter} only need capitalization after -a full stop, so you can start the \textsf{title} field with a -lowercase letter and let the automatic field formatting with -\cmd{autocap} do its work, though this isn't strictly necessary with -\textsf{biblatex-chicago-authordate}. +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; +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 +\enquote{interview,} \enquote{review,} and \enquote{letter} only need +capitalization after a full stop, so you can start the \textsf{title} +field with a lowercase letter and let the automatic field formatting +with \cmd{autocap} do its work, though this isn't strictly necessary +with \textsf{biblatex-chicago-authordate}. \mylittlespace One detail of the \textsf{review} type is new to both specifications, and responds to the needs of the 16th edition of the @@ -5780,6 +5851,18 @@ in the the \textsf{review} type as well. (Cf.\ the documentation of \cmd{DeclareLabelyear} 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. + %\enlargethispage{\baselineskip} \mybigspace This \mymarginpar{\textbf{suppbook}} is the entry type to @@ -5813,15 +5896,15 @@ field, the resultant entry will not be portable across languages.) the same. The \textsf{author} field refers to the author of the introduction or afterword, while \textsf{bookauthor} refers to the author of the main text of the work, if the two differ. For the 16th -edition \colmarginpar{New!}, the \emph{Manual} requires that you -include the page range for the cited part in the list of references. -As ever, if the focus of the reference is the main text of the book, -but you want to mention the name of the writer of an introduction or -afterword for completeness, then the normal \textsf{biblatex} rules -apply, and you can just put their name in the appropriate field of a -\textsf{book} entry, that is, in the \textsf{foreword}, -\textsf{afterword}, or \textsf{introduction} field. (See -\emph{Manual} 14.116; friedman:intro, polakow:afterw, prose:intro). +edition, the \emph{Manual} requires that you include the page range +for the cited part in the list of references. As ever, if the focus +of the reference is the main text of the book, but you want to mention +the name of the writer of an introduction or afterword for +completeness, then the normal \textsf{biblatex} rules apply, and you +can just put their name in the appropriate field of a \textsf{book} +entry, that is, in the \textsf{foreword}, \textsf{afterword}, or +\textsf{introduction} field. (See \emph{Manual} 14.116; +friedman:intro, polakow:afterw, prose:intro). \mybigspace This \mymarginpar{\textbf{suppcollection}} fulfills a function analogous to \textsf{suppbook}. Indeed, I believe the @@ -5869,21 +5952,21 @@ by \textsf{biblatex}. Here are the main correspondences: identify performers, as they usually don't need further specifying and this role prevents \textsf{biblatex} from falling back on the default \texttt{editor} bibstring. -\item[title, titleaddon, booktitle, \mycolor{booktitleaddon}, - maintitle:] As with the other audiovisual types, \textsf{video} - serves as an analogue both to books and to collections, so the - \textsf{title} may be of a whole film DVD or of a TV series, or it - may identify one episode in a series or one scene in a film. In the - latter cases, the title of the whole would go in \textsf{booktitle}. - The \mycolor{\textsf{booktitleaddon}} field, in a change from the - 15th edition, may be useful for specifying the season and/or episode - number of a TV series, while the \textsf{titleaddon} is for any - information that needs to come between the \textsf{title} and the - \textsf{booktitle} (cleese:holygrail, episode:tv, handel:messiah). - As in the \textsf{music} type, \textsf{maintitle} may be necessary - for a boxed set or something similar. -\item[\mycolor{date, eventdate, origdate}, pubstate:] The 16th edition - of the \textsf{Manual} now \enquote{recommends a more comprehensive +\item[title, titleaddon, booktitle, booktitleaddon, maintitle:] As + with the other audiovisual types, \textsf{video} serves as an + analogue both to books and to collections, so the \textsf{title} may + be of a whole film DVD or of a TV series, or it may identify one + episode in a series or one scene in a film. In the latter cases, + the title of the whole would go in \textsf{booktitle}. The + \textsf{booktitleaddon} field, in a change from the 15th edition, + may be useful for specifying the season and/or episode number of a + TV series, while the \textsf{titleaddon} is for any information that + needs to come between the \textsf{title} and the \textsf{booktitle} + (cleese:holygrail, episode:tv, handel:messiah). As in the + \textsf{music} type, \textsf{maintitle} may be necessary for a boxed + set or something similar. +\item[date, eventdate, origdate, pubstate:] The 16th edition of the + \textsf{Manual} now \enquote{recommends a more comprehensive approach to dating audiovisual materials than in previous editions} (15.53). Indeed, \enquote{citations without a date are generally unacceptable} (14.276), while if there is more than one @@ -5900,22 +5983,22 @@ by \textsf{biblatex}. Here are the main correspondences: 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 - \mycolor{\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. -\item[\mycolor{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. + \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. +\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. \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. @@ -5997,7 +6080,7 @@ serves as an alias for this.) do, even though the \emph{Manual} doesn't actually mention it. It may be useful for some purposes. Cf.\ \textsf{commentator}. -\mybigspace For \colmarginpar{\textbf{author}} the most part, I have +\mybigspace For \mymarginpar{\textbf{author}} the most part, I have implemented this field in a completely standard \textsc{Bib}\TeX\ fashion. Remember that corporate or organizational authors need to have an extra set of curly braces around them (e.g., @@ -6052,10 +6135,11 @@ possible before. For full details of how this works, see the \textsf{collection} and \textsf{proceedings} entry types, an \textsf{author} isn't expected, so there the \textsf{editor} is required, as in standard \textsf{biblatex}. Also, in \textsf{article} -entries with \textsf{entrysubtype} \texttt{magazine}, the absence of -an \textsf{author} triggers the use of the \textsf{journaltitle} in -its stead. See the next paragraph, and those entry types, for further -details.) +and \textsf{review} entries with \textsf{entrysubtype} +\texttt{magazine}, the absence of an \textsf{author} triggers the use +of the \textsf{journaltitle} in its stead. Without an +\textsf{entrysubtype}, the \textsf{title} will be used. See the next +paragraph, and those entry types, for further details.) \mylittlespace As its name suggests, the author-date style very much wants to have a name of some sort present both for the entries in the @@ -6064,28 +6148,29 @@ is nothing if not flexible, however, so with unsigned articles or encyclopedia entries the \textsf{journaltitle} or \textsf{title} may take the place of the \textsf{author} (gourmet:052006, lakeforester:pushcarts, nyt:trevorobit, unsigned:ranke, -wikipedia:bibtex). Even in such \textsf{article} entries, however, it -may be advantageous to provide a (formatted and abbreviated) -\textsf{shortauthor} field to keep the in-text citations to a +wikipedia:bibtex). Even in such entries, however, it may be +advantageous to provide either a standard \textsf{shorttitle} or, for +abbreviating a \textsf{journaltitle}, a (formatted) +\textsf{shortauthor} field, thereby keeping the in-text citations to a 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 \colmarginpar{New!} concerning -anonymous authors in other kinds of references have changed somewhat -in the 16th edition of the \emph{Manual} (15.32), placing greater -emphasis on using the \textsf{title} in citations and at the head of -reference list entries, rather than \enquote{Anonymous.} The latter -may still in some cases be useful \enquote{in a bibliography in which - several anonymous works need to be grouped} (14.79), but even with a -source like virginia:plantation, \enquote{the reference list entry - should normally begin with the title\ldots\ Text citations may refer - to a short form of the title but must include the first word (other - than an initial article)} (15.32). The \textsf{shorttitle} field is -the place for the short form, and you'll also need a \textsf{sortkey} -of some sort if the full title begins with an article that is to be -ignored when alphabetizing. +\mylittlespace Recommendations concerning anonymous authors in other +kinds of references have changed somewhat in the 16th edition of the +\emph{Manual} (15.32), placing greater emphasis on using the +\textsf{title} in citations and at the head of reference list entries, +rather than \enquote{Anonymous.} The latter may still in some cases +be useful \enquote{in a bibliography in which several anonymous works + need to be grouped} (14.79), but even with a source like +virginia:plantation, \enquote{the reference list entry should normally + begin with the title\ldots\ Text citations may refer to a short form + of the title but must include the first word (other than an initial + article)} (15.32). The \textsf{shorttitle} field is the place for +the short form, and you'll also need a \textsf{sortkey} of some sort +if the full title begins with an article that is to be ignored when +alphabetizing. \mylittlespace If \enquote{the authorship is known or guessed at but was omitted on the title page,} then you need to use the @@ -6196,7 +6281,7 @@ citation's \textsf{postnote} field, then you must use \mybigspace The \mymarginpar{\textbf{booksubtitle}} subtitle for a \textsf{booktitle}. See the next entry for further information. -\mybigspace In \colmarginpar{\textbf{booktitle}} the +\mybigspace In \mymarginpar{\textbf{booktitle}} the \textsf{bookinbook}, \textsf{inbook}, \textsf{incollection}, \textsf{inproceedings}, and \textsf{letter} entry types, the \textsf{booktitle} field holds the title of the larger volume in which @@ -6366,17 +6451,17 @@ 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 -\mycolor{\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.) +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 @@ -6404,24 +6489,23 @@ notice will be printed at the end of the entry saying \enquote{First appear at the head of the entry, then you need to use the \texttt{cmsdate} toggle in the \textsf{options} field. This has 3 possible states relevant to this context, though there is a fourth -state (\mycolor{\texttt{full}}) which I've discussed two paragraphs -up: +state (\texttt{full}) which I've discussed two paragraphs up: \begin{enumerate} -\item \mycolor{\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=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=off} is the default, discussed above: (Author 1952). -\item \mycolor{\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}. +\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}. \end{enumerate} In the first and third cases, if you put the string \texttt{reprint} @@ -6471,17 +6555,15 @@ the same as before, but there are only two possible outcomes, as follows: \begin{enumerate} -\item \texttt{cmsdate=off} (the default) and - \mycolor{\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}}. -\item \mycolor{\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 options \texttt{old} and \texttt{new} are now synonyms - for this. +\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}}. +\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 + options \texttt{old} and \texttt{new} are now synonyms for this. \end{enumerate} If, for some reason, the automatic switching of the dates cannot be @@ -6496,7 +6578,20 @@ options often being required, but their presence at least should allow maximum flexibility in reference lists that contain a lot of \textsf{origdates}. -\enlargethispage{\baselineskip} +\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, 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. + +%\enlargethispage{\baselineskip} \mylittlespace Finally, in the \textsf{misc} entry type this field can help to distinguish between two classes of archival material, letters @@ -6524,7 +6619,7 @@ sections~\ref{sec:preset:authdate} and \ref{sec:authentryopts}. \textsf{biblatex} 0.9, is obsolete, and will be ignored if you use it in your .bib files. Use \textsf{date} instead. -\mybigspace Standard \colmarginpar{\textbf{doi}} \textsf{biblatex} +\mybigspace Standard \mymarginpar{\textbf{doi}} \textsf{biblatex} field, providing the Digital Object Identifier of the work. The 16th edition of the \emph{Manual} specifies that, given their relative permanence compared to URLs, \enquote{authors should include DOIs @@ -6598,28 +6693,29 @@ performers. To specify the role, use the fields \textsf{editoratype}, bernstein:shostakovich, handel:messiah.) \mybigspace Normally, \mymarginpar{\textbf{editortype}} with the -exception of the \textsf{article} type, +exception of the \textsf{article} and \textsf{review} types with a +\texttt{magazine} \textsf{entrysubtype}, \textsf{biblatex-chicago-authordate} will automatically find a name to put at the head of an entry, starting with an \textsf{author}, and proceeding in order through \textsf{editor}, \textsf{translator}, and \textsf{namec} (the compiler). If all four are missing, then the -\textsf{title} will be placed at the head. (In \textsf{article} -entries with a \texttt{magazine} \textsf{entrysubtype}, a missing -author immediately prompts the use of \textsf{journaltitle} at the -head of an entry. See above under \textsf{article} for details.) The -\textsf{editortype} field provides even greater flexibility, allowing -you to choose from a variety of editorial roles while only using the -\textsf{editor} field. You can do this even though an author is named -(eliot:pound shows this mechanism in action for a standard editor, -rather than for some other role). Two things are necessary for this -to happen. First, in the \textsf{options} field you need to set -\texttt{useauthor=false} (if there is an \textsf{author}), then you -need to put the name you wish to see at the head of your entry into -the \textsf{editor} or the \textsf{namea} field. If the -\enquote{editor} is in fact, e.g., a 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. +\textsf{title} will be placed at the head. (In \textsf{article} and +\textsf{review} entries with a \texttt{magazine} +\textsf{entrysubtype}, a missing author immediately prompts the use of +\textsf{journaltitle} at the head of an entry. See above under +\textsf{article} for details.) The \textsf{editortype} field provides +even greater flexibility, allowing you to choose from a variety of +editorial roles while only using the \textsf{editor} field. You can +do this even though an author is named (eliot:pound shows this +mechanism in action for a standard editor, rather than for some other +role). Two things are necessary for this to happen. First, in the +\textsf{options} field you need to set \texttt{useauthor=false} (if +there is an \textsf{author}), then you need to put the name you wish +to see at the head of your entry into the \textsf{editor} or the +\textsf{namea} field. If the \enquote{editor} is in fact, e.g., a +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. \mylittlespace There are a few details of which you need to be aware. Because \textsf{biblatex-chicago} has added the \textsf{namea} field, @@ -6734,6 +6830,8 @@ unpublished archive. Please see section~\ref{sec:types:authdate} above under \textbf{misc} for all the details on how these citations work. +\enlargethispage{\baselineskip} + \mylittlespace Fourth, the field can be defined in the \textsf{artwork} entry type in order to refer to a work from antiquity whose title you do not wish to be italicized. Please see the @@ -6744,7 +6842,7 @@ documentation of \textsf{video} in section~\ref{sec:types:authdate} above, and that of \textsf{userd} below.) \mybigspace Kazuo -\colmarginpar{\textbf{eprint}\\\textbf{eprintclass}\\\textbf{eprinttype}} +\mymarginpar{\textbf{eprint}\\\textbf{eprintclass}\\\textbf{eprinttype}} Teramoto suggested adding \textsf{biblatex's} excellent \textsf{eprint} handling to \textsf{biblatex-chicago}, and he sent me a patch implementing it. With minor alterations, I have applied it to @@ -6753,7 +6851,7 @@ in standard \textsf{biblatex}. They may prove helpful in providing more abbreviated references to online content than conventional URLs, though I can find no specific reference to them in the \emph{Manual}. -\mybigspace This \colmarginpar{\textbf{eventdate}} is a standard +\mybigspace This \mymarginpar{\textbf{eventdate}} is a standard \textsf{biblatex} field. In the 15th edition it was barely used, but in order to comply with changes in the 16th edition of the \emph{Manual} it will now play a significant role in \textsf{music}, @@ -6807,7 +6905,7 @@ from the \textsf{author}. The \emph{Manual} has nothing to say on the subject, but \textsf{biblatex-chicago} prints it (them), in parentheses, just after the author(s). -\enlargethispage{\baselineskip} +%\enlargethispage{\baselineskip} \mybigspace Standard \mymarginpar{\textbf{howpublished}} \textsf{biblatex} field, mainly applicable in the \textsf{booklet} @@ -6979,7 +7077,7 @@ provide the parentheses (14.246; ellis:blog). \mybigspace The \mymarginpar{\textbf{mainsubtitle}} subtitle for a \textsf{maintitle} --- see next entry. -\mybigspace The \colmarginpar{\textbf{maintitle}} main title for a +\mybigspace The \mymarginpar{\textbf{maintitle}} main title for a multi-volume work, e.g., \enquote{Opera} or \enquote{Collected Works.} It no longer takes sentence-style capitalization in \textsf{authordate}, though it does in @@ -7005,17 +7103,20 @@ leaves undefined itself. In \textsf{biblatex-chicago} it contains the name(s) of the editor(s) of a \textsf{title}, if the entry has a \textsf{booktitle} or \textsf{maintitle}, or both, in which situation the \textsf{editor} would be associated with one of these latter -fields (donne:var). You should 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}, +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 +\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}, \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:formatting:authdate}. -\mybigspace This \colmarginpar{\textbf{nameaddon}} field is provided +\mybigspace This \mymarginpar{\textbf{nameaddon}} field is provided by \textsf{biblatex}, though not used by the standard styles. In \textsf{biblatex-chicago}, it allows you to specify that an author's name is a pseudo\-nym, or to provide either the real name or the @@ -7051,12 +7152,14 @@ styles. In \textsf{biblatex-chicago}, it contains the name(s) of the translator(s) of a \textsf{title}, if the entry has a \textsf{booktitle} or \textsf{maintitle}, or both, in which situation the \textsf{translator} would be associated with one of these latter -fields (euripides:orestes). You should 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}, +fields (euripides:orestes). (In \textsf{article} and \textsf{review} +entries, \textsf{nameb} 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 +\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 @@ -7132,21 +7235,23 @@ automatically do the right thing. Cf.\ \textsf{addendum}. \mybigspace This \mymarginpar{\textbf{number}} is a standard \textsf{biblatex} field, containing the number of a \textsf{journaltitle} in an \textsf{article} or \textsf{review} entry, -the number of a \textsf{title} in a \textsf{periodical} entry, or the -volume/number of a book in a \textsf{series}. Generally, in an -\textsf{article}, \textsf{periodical}, or \textsf{review} entry, this -will be a plain cardinal number, but in such entries -\textsf{biblatex-chicago} now does the right thing if you have a list -or range of numbers (unsigned:ranke). In any \textsf{book}-like entry -it may well contain considerably more information, including even a -reference to \enquote{2nd ser.,} for example, while the -\textsf{series} field in such an entry will contain the name of the -series, rather than a number. This field is also the place for the -patent number in a \textsf{patent} entry. Cf.\ \textsf{issue} and -\textsf{series}. (See \emph{Manual} 14.128--132 and boxer:china, -palmatary:pottery, wauchope:ceramics; 14.180--181 and beattie:crime, -conley:fifthgrade, friedman:learn\-ing, garrett, gibbard, hlatky:hrt, -mcmillen:antebellum, rozner:liberation, warr:el\-lison.) +the number of a \textsf{title} in a \textsf{periodical} entry, the +volume/number of a book in a \textsf{series}, or the (generally +numerical) specifier of the \textsf{type} in a \textsf{report} entry. +Generally, in an \textsf{article}, \textsf{periodical}, or +\textsf{review} entry, this will be a plain cardinal number, but in +such entries \textsf{biblatex-chicago} now does the right thing if you +have a list or range of numbers (unsigned:ranke). In any +\textsf{book}-like entry it may well contain considerably more +information, including even a reference to \enquote{2nd ser.,} for +example, while the \textsf{series} field in such an entry will contain +the name of the series, rather than a number. This field is also the +place for the patent number in a \textsf{patent} entry. Cf.\ +\textsf{issue} and \textsf{series}. (See \emph{Manual} 14.128--132 +and boxer:china, palmatary:pottery, wauchope:ceramics; 14.180--181 and +beattie:crime, conley:fifthgrade, friedman:learn\-ing, garrett, +gibbard, hlatky:hrt, mcmillen:antebellum, rozner:liberation, +warr:el\-lison.) \mylittlespace \textbf{NB}: This may be an opportune place to point out that the \emph{Manual} (14.154) prefers arabic to roman numerals @@ -7174,7 +7279,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 \colmarginpar{\textbf{origdate}} is a standard +\mybigspace This \mymarginpar{\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 @@ -7308,7 +7413,7 @@ be one of \texttt{american}, \texttt{brazilian}, \texttt{danish}, \texttt{portuguese}, \texttt{spanish}, or \texttt{swedish}, to which I've added \texttt{russian}. -\mybigspace The \colmarginpar{\textbf{origlocation}} 16th edition of +\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 @@ -7326,7 +7431,9 @@ different cities. The new functionality should make this simple to achieve. Cf.\ \textsf{origdate}, \textsf{origpublisher} and \textsf{pubstate}; schweitzer:bach.) -\mybigspace As \colmarginpar{\textbf{origpublisher}} with the +\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 their corresponding originals (14.166, 15.38). You can now provide an @@ -7375,7 +7482,7 @@ example, then you'll need to use a different field, (which in the case of a series would be \textsf{number} [palmatary:pottery]). Cf.\ \textsf{volume}; iso:electrodoc. -\mybigspace Standard \colmarginpar{\textbf{publisher}} +\mybigspace Standard \mymarginpar{\textbf{publisher}} \textsf{biblatex} field. Remember that \enquote{\texttt{and}} is a keyword for connecting multiple publishers, so if a publisher's name contains \enquote{and,} then you should either use the ampersand (\&) @@ -7403,7 +7510,7 @@ Some style guides apparently suggest using \texttt{s.n.}\,(= \emph{sine nomine}) to specify the lack of a publisher, but the \emph{Manual} doesn't mention this. -\mybigspace A \colmarginpar{\textbf{pubstate}} standard +\mybigspace A \mymarginpar{\textbf{pubstate}} standard \textsf{biblatex} field, introduced in version 0.9. Because the author-date specification has fairly complicated rules about presenting reprinted editions, I have adopted this field as a means of @@ -7493,7 +7600,7 @@ garaud:gatine, sewall:letter.) Cf.\ \textsf{number} for more information on the \emph{Manual}'s preferences regarding the formatting of numerals. -\mybigspace This \colmarginpar{\textbf{shortauthor}} is a standard +\mybigspace This \mymarginpar{\textbf{shortauthor}} is a standard \textsf{biblatex} field, but \textsf{biblatex-chicago} makes considerably grea\-ter use of it than the standard styles. For the purposes of the author-date specification, the field provides the name @@ -7535,9 +7642,9 @@ 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 \colmarginpar{\textbf{shorthand}} is +\mybigspace This \mymarginpar{\textbf{shorthand}} is \textsf{biblatex}'s mechanism for using abbreviations in citations. For \textsf{biblatex-chicago-authordate} I have modified it somewhat to conform to the needs of the specification, though there is a @@ -7591,25 +7698,24 @@ itself. You can place \texttt{skiplos} in the \textsf{options} field to exclude a particular entry from the list of shorthands if you do decide to print that list, giving maximum flexibility. -\mylittlespace Indeed, \colmarginpar{New!} for this release, I have -provided two new options to add to this flexibility. First, 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.) Second, 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 list of references in favor of -a fortified shorthand list. This option will only work if used in -tandem with \texttt{cmslos=false}, as otherwise the shorthand will be -printed twice. (See 15.36, 13.65, 14.54--55, and also -\textsf{biblatex.pdf} for more information.) +\mylittlespace Indeed, I have provided two new options to add to this +flexibility. First, I have included two new \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.) Second, I have provided a new package option, +\texttt{short\-handfull}, which prints entries in the list of shorthands +which contain full bibliographical information, effectively allowing +you to eschew the list of references in favor of a fortified shorthand +list. This option will only work if used in tandem with +\texttt{cmslos=false}, as otherwise the shorthand will be printed +twice. (See 15.36, 13.65, 14.54--55, and also \textsf{biblatex.pdf} +for more information.) %\enlargethispage{-\baselineskip} @@ -7632,7 +7738,7 @@ entries (where the \textsf{title} takes the place of the space in your running text this is the field where you can provide it. (Cf.\ ency:britannica, grove:sibelius, aristotle:metaphy:gr.) -\mybigspace A \colmarginpar{\textbf{sortkey}} standard +\mybigspace A \mymarginpar{\textbf{sortkey}} standard \textsf{biblatex} field, designed to allow you to specify how you want an entry alphabetized in a list of references. In general, if an entry doesn't turn up where you expect or want it, this field should @@ -7717,7 +7823,7 @@ order to comply with them. \item[\qquad Italics:] \textsf{booktitle}, \textsf{maintitle}, and \textsf{journaltitle} in all entry types; \textsf{title} of \textsf{artwork}, \textsf{book}, \textsf{bookinbook}, - \textsf{booklet}, \textsf{collection}, \mycolor{\textsf{image}}, + \textsf{booklet}, \textsf{collection}, \textsf{image}, \textsf{inbook}, \textsf{manual}, \textsf{misc} (with no \textsf{entrysubtype}), \textsf{periodical}, \textsf{proceedings}, \textsf{report}, \textsf{suppbook}, and \textsf{suppcollection} @@ -7730,8 +7836,8 @@ order to comply with them. \item[\qquad Unformatted:] \textsf{booktitleaddon}, \textsf{maintitleaddon}, and \textsf{titleaddon} in all entry types, \textsf{title} of \textsf{customc}, \textsf{letter}, \textsf{misc} - (with an \textsf{entrysubtype}), \mycolor{\textsf{patent}}, - \textsf{review}, and \textsf{suppperiodical} entry types. + (with an \textsf{entrysubtype}), \textsf{patent}, \textsf{review}, + and \textsf{suppperiodical} entry types. \item[\qquad Italics or Quotation Marks:] All of the audiovisual entry types --- \textsf{audio}, \textsf{music}, and \textsf{video} --- have to serve as analogues both to \textsf{book} and to @@ -7792,7 +7898,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 @@ -8007,7 +8113,7 @@ translator's name, behavior that can be controlled with the \textsf{author}, \textsf{editor}, \textsf{namea}, \textsf{nameb}, and \textsf{namec}. -\enlargethispage{\baselineskip} +%\enlargethispage{\baselineskip} \mybigspace This \mymarginpar{\textbf{type}} is a standard \textsf{biblatex} field, and in its normal usage serves to identify @@ -8042,7 +8148,7 @@ do the right thing in citations. Cf.\ \textsf{artwork}, above, for all the details. (See auden:reading, bedford:photo, cleese:holygrail, leo:madonna, nytrumpet:art.) -\mybigspace Standard \colmarginpar{\textbf{url}} \textsf{biblatex} +\mybigspace Standard \mymarginpar{\textbf{url}} \textsf{biblatex} field, it holds the url of an online publication, though you can provide one for all entry types. The 16th edition of the \textsf{Manual} expresses a strong preference for DOIs over URLs if @@ -8051,7 +8157,7 @@ the former is available --- cf.\ \textsf{doi} above, and also \textsf{url} will ensure that your documents format such references properly, in the text and in the reference apparatus. -\mybigspace Standard \colmarginpar{\textbf{urldate}} \textsf{biblatex} +\mybigspace Standard \mymarginpar{\textbf{urldate}} \textsf{biblatex} field, it identifies exactly when you accessed a given url. The 16th edition of the \emph{Manual} prefers DOIs to URLs; in the latter case it allows the use of access dates, particularly in contexts that @@ -8067,7 +8173,7 @@ sirosh:visualcortex, wikiped:bibtex). In the default setting of \textsf{urldate} to find a year for citations and the list of references (grove:sibelius, wikiped:bibtex). -%\enlargethispage{\baselineskip} +\enlargethispage{\baselineskip} \mybigspace A \mymarginpar{\textbf{usera}} supplemental \textsf{biblatex} field which functions in \textsf{biblatex-chicago} @@ -8079,7 +8185,7 @@ field will be placed, unformatted and between commas, after the identifying the broadcast network when you cite a radio or television program (14:221; bundy:macneil). -\mybigspace I \colmarginpar{\textbf{userc}} have now implemented this +\mybigspace I \mymarginpar{\textbf{userc}} have now implemented this supplemental \textsf{biblatex} field as part of the Chicago author-date style's handling of cross-references within the list of references. (The \enquote{c} part is meant as a sort of mnemonic for @@ -8099,7 +8205,7 @@ 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 \colmarginpar{\textbf{userd}} \textsf{userd} field, +\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 @@ -8196,7 +8302,7 @@ field. It holds the volume of a \textsf{journaltitle} in in many other sorts of entry. Cf.\ \textsf{part}; conway:evolution shows how sometimes this field may hold series information, as well. -\mybigspace Standard \mymarginpar{\textbf{volumes}} \textsf{biblatex} +\mybigspace Standard \colmarginpar{\textbf{volumes}} \textsf{biblatex} field. It holds the total number of volumes of a multi-volume work, and in such references you should provide the volume and page numbers in the \textsf{postnote} field of the relevant \cmd{cite} command, @@ -8209,7 +8315,11 @@ e.g.: Cf.\ 15.22; meredith:letters, tillich:system, weber:saugetiere, wright:evolution. The entry wright:theory presents one volume of such a multi-volume work, so you would no longer need to give the volume in -any \textsf{postnote} field when citing it. +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. \mybigspace A \mymarginpar{\textbf{xref}} modified \textsf{crossref} field provided by \textsf{biblatex}. See \textbf{crossref}, above. @@ -8325,7 +8435,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{-3\baselineskip} \mybigspace This \mymarginpar{\textbf{\textbackslash mkbibquote}} is the standard \textsf{biblatex} command, which requires attention here @@ -8402,7 +8512,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 @@ -8560,13 +8670,12 @@ between a title and a subtitle appears in the correct, matching font. the sorting of uppercase and lowercase letters separately, a practice which the \emph{Manual} doesn't appear to recommend. -\mylittlespace This \colmarginpar{\texttt{sorting=cms}} setting, new -in this release, takes advantage of the \cmd{DeclareSortingScheme} -command provided by \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. +\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 +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. \mylittlespace This \mymarginpar{\texttt{uniquelist=\\minyear}} option enables \textsf{biblatex-chicago-authordate} to disambiguate entries @@ -8624,9 +8733,9 @@ chosen font. The default definition is: \cmd{renewcommand*\{\textbackslash bibnamedash\}\{\textbackslash rule[.4ex]\{3em\}\{.6pt\}\}}. -\mylittlespace With \colmarginpar{\texttt{losnotes} - \&\\\texttt{losendnotes}} this release, and at the request of -Kenneth Pearce, I have added two new \texttt{bibenvironments} to +\mylittlespace At \mymarginpar{\texttt{losnotes} + \&\\\texttt{losendnotes}} the request of Kenneth Pearce, I have +added two new \texttt{bibenvironments} to \textsf{chicago-authordate.bbx}, for use with the \texttt{env} option to the \cmd{printshorthands} command. The first, \texttt{losnotes}, is designed to allow a list of shorthands to appear inside footnotes, @@ -8646,7 +8755,7 @@ 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. -\mylittlespace This \colmarginpar{\cmd{Declare-}\\\texttt{Labelname}} +\mylittlespace This \mymarginpar{\cmd{Declare-}\\\texttt{Labelname}} option allows you to add name fields for consideration when \textsf{biblatex} is attempting to find a shortened name for in-text citations. This, for example, allows a compiler (=\textsf{namec}) to @@ -8657,7 +8766,7 @@ currently is \texttt{\{shortauthor,author,\\shorteditor,namea,editor,nameb,% translator,namec\}}. -\mylittlespace This \colmarginpar{\cmd{Declare-}\\\texttt{Labelyear}} +\mylittlespace This \mymarginpar{\cmd{Declare-}\\\texttt{Labelyear}} 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 @@ -8675,7 +8784,7 @@ section~\ref{sec:authpreset}, just below. \enlargethispage{\baselineskip} \mylittlespace The -\colmarginpar{\cmd{Declare-}\\\texttt{SortingScheme}} third +\mymarginpar{\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 @@ -8690,16 +8799,21 @@ its definition in \textsf{chicago-authordate.cbx}. any entry headed by one of the supplemental name fields (\textsf{name[a-c]}), a \textsf{manual} entry headed by an \textsf{organization}, or an \textsf{article} or \textsf{review} entry -headed by a \textsf{journaltitle} will no longer need a -\textsf{sortkey} set. The main disadvantage should only occur very -rarely, and appears because the supplemental name fields are treated -differently from the standard name fields by \textsf{biblatex}. -Ordinarily, you can set, for example, \texttt{useauthor=false} in the -\textsf{options} field to remove the \textsf{author's} name from -consideration for sorting purposes. The Chicago-specific option -\textsf{usecompiler=false}, however, doesn't remove \textsf{namec} -from such consideration, so in some rare corner cases you may need a -\textsf{sortkey}. +with an \textsf{entrysubtype} and headed by a \textsf{journaltitle} +will no longer need a \textsf{sortkey} set. The two main +disadvantages should only occur very rarely. First, in +\textsf{author}-less \textsf{article} and \textsf{review} entries +without an \textsf{entrysubtype}, the \textsf{title} will appear +instead of the \textsf{journaltitle}, and since the latter appears +before the former in the sorting scheme, you'll need a +\textsf{sortkey} for proper alphabetization. The second occurs +because the supplemental name fields are treated differently from the +standard name fields by \textsf{biblatex}. Ordinarily, you can set, +for example, \texttt{useauthor=false} in the \textsf{options} field to +remove the \textsf{author's} name from consideration for sorting +purposes. The Chicago-specific option \textsf{usecompiler=false}, +however, doesn't remove \textsf{namec} from such consideration, so in +some rare corner cases you may need a \textsf{sortkey}. \subsubsection{{Pre-set \textsf{chicago} Options}} \label{sec:authpreset} @@ -8716,7 +8830,7 @@ preamble, for the whole document, or on a per-entry basis in the would make sense to eliminate the \textsf{pages} field from the affected entries). -\mylittlespace This \colmarginpar{\texttt{doi=true}} option controls +\mylittlespace This \mymarginpar{\texttt{doi=true}} option controls 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 @@ -8731,7 +8845,7 @@ 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 \colmarginpar{\texttt{eprint=true}} option controls +\mylittlespace This \mymarginpar{\texttt{eprint=true}} option controls whether any \textsf{eprint} fields present in the .bib file will be printed in the list of references. It defaults to true, and can be set to false either in the preamble, for the whole document, or on a @@ -8782,7 +8896,7 @@ others may find that some automatic pruning helps clear things up, at least to a first approximation. Some per-entry work afterward may then polish up the details. -\mylittlespace For \colmarginpar{\texttt{avdate=true}} \textsf{music} +\mylittlespace For \mymarginpar{\texttt{avdate=true}} \textsf{music} 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 @@ -8808,7 +8922,7 @@ cases, surprise. Please see \textsf{music}, \textsf{review}, and section~\ref{sec:fields:authdate}; and \cmd{DeclareLabelyear} in section~\ref{sec:authformopts}. -\mylittlespace This \colmarginpar{\texttt{cmslos=true}} option alters +\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 recommend the use of shorthands as abbreviations for long authors' @@ -8837,7 +8951,7 @@ preamble, then the package won't perform this substitution in any entry type whatsoever. (The bibstring expands to \enquote{\texttt{n.d.}} in English.) -\mylittlespace This \colmarginpar{\texttt{usecompiler=\\true}} option +\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 of an \textsf{author}, \textsf{editor}, or \textsf{translator}, in @@ -8887,7 +9001,7 @@ once again footnote marks will revert to the \LaTeX\ default, but of course you also lose a fair amount of other formatting, as well. See section~\ref{sec:loading:auth}, below. -\enlargethispage{\baselineskip} +%\enlargethispage{\baselineskip} \mylittlespace Several \colmarginpar{\texttt{headline}\\\texttt{(trad only)}} users requested an option that turned off the automatic @@ -8946,8 +9060,8 @@ use the \cmd{citereset} command, allied possibly with the \textsf{biblatex}\ \texttt{citereset} option, on which see \textsf{biblatex.pdf} §3.1.2.1. -\mylittlespace Kenneth Pearce \colmarginpar{\texttt{shorthandfull}} -has suggested that, in some fields of study, a list of shorthands +\mylittlespace Kenneth Pearce \mymarginpar{\texttt{shorthandfull}} has +suggested that, in some fields of study, a list of shorthands providing full bibliographical information may replace the list of references itself. This option, which must be used in tandem with \texttt{cmslos=false}, prints this full information in the list of @@ -9028,6 +9142,16 @@ 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} @@ -9216,23 +9340,21 @@ in other \enquote{American} \textsf{biblatex} styles (e.g., 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, Baldur -Kristinsson has very kindly provided -\mycolor{\textsf{cms-icelandic.lbx}} for speakers of that language, -while Håkon Malmedal has equally kindly provided -\mycolor{\textsf{cms-norsk.lbx}}, -\mycolor{\textsf{cms-norwegian.lbx}}, and -\mycolor{\textsf{cms-nynorsk.lbx}}. I have added -\mycolor{\textsf{cms-british.lbx}} in order to simplify and to improve -the package's handling of non-American typographical conventions in -English. This means that all --- or at least most --- of the -Chicago-specific bibstrings are now available for documents and -reference apparatuses written in these languages, with, as I intend, -more languages to follow, limited mainly by my finite time and -even-more-finite competence. (If you would like to provide bibstrings -for a language in which you want to work, or indeed correct -deficiencies in the lbx files contained in the package, please contact -me.) +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 +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 +order to simplify and to improve the package's handling of +non-American typographical conventions in English. This means that +all --- or at least most --- of the Chicago-specific bibstrings are +now available for documents and reference apparatuses written in these +languages, with, as I intend, more languages to follow, limited mainly +by my finite time and even-more-finite competence. (If you would like +to provide bibstrings for a language in which you want to work, or +indeed correct deficiencies in the lbx files contained in the package, +please contact me.) \mylittlespace Using \mymarginpar{\textbf{babel}} these facilities is fairly simple. By default, and this functionality remains the same as @@ -9253,19 +9375,19 @@ American-style punctuation tracking, when you: an American citation style, to expect this arrangement to work well for the majority of users.) -\mylittlespace If, \colmarginpar{New!} for whatever reason, you wanted -to use \textsf{biblatex-chicago} but retain British typographical -conventions --- punctuation outside of quotation marks, outer quotes -single rather than double, etc.\ --- then you no longer need to follow -the complicated rules outlined in previous releases of +\mylittlespace If, for whatever reason, you wanted to use +\textsf{biblatex-chicago} but retain British typographical conventions +--- punctuation outside of quotation marks, outer quotes single rather +than double, etc.\ --- then you no longer need to follow the +complicated rules outlined in previous releases of \textsf{biblatex-chicago}. Instead, simply load \textsf{babel} with the \texttt{british} option. -\mylittlespace If you want to use French, German, Icelandic, or -Norwegian strings in the reference apparatus, then you can load -\textsf{babel} with \texttt{french}, \texttt{german}, -\texttt{icelandic}, \texttt{ngerman}, \texttt{norsk}, or -\texttt{nynorsk} as the main document language. You no longer need +\mylittlespace If you want to use Finnish, French, German, Icelandic, +or Norwegian strings in the reference apparatus, then you can load +\textsf{babel} with \texttt{finnish}, \texttt{french}, +\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. @@ -9316,10 +9438,10 @@ esp.\ s.v.\ \enquote{\cmd{partedit}.} provided may well break with established bibliographical traditions in those languages, but my main concern when choosing them was to remain as close as possible to the quirks of the Chicago specification. I -have entirely relied on the judgment of the creators of the Icelandic -and Norwegian localizations in those instances. If you have strong -objections to any of the strings, or indeed to any of my formatting -decisions, please let me know. +have entirely relied on the judgment of the creators of the Finnish, +Icelandic and Norwegian localizations in those instances. If you have +strong objections to any of the strings, or indeed to any of my +formatting decisions, please let me know. \section{One .bib Database, Two Chicago Styles} \label{sec:twostyles} @@ -9462,10 +9584,10 @@ This release implements the 16th edition of the \emph{Chicago Manual formatting, alongside the \textsf{authordate} code which unifies the treatment of titles between itself and the notes \&\ bibliography style. I hope that users will migrate to one of these styles -implementing the most recent specification, so that I can focus my -development and testing there. For the moment, I shall call the -15th-edition styles \enquote{mildly deprecated,} but if you still have -urgent feature requests for them, I'll do what I can. +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. \mylittlespace Regardless of which edition you are considering, there are a number of things I haven't implemented. The solution in @@ -9551,9 +9673,9 @@ using a customizable command like \cmd{titleaddonpunct}. I hope to provide this in the next release. He has also requested, despite the \emph{Manual's} objections, the possibility of using both \texttt{Idem} and \texttt{Ibid.}\ in notes. I shall look into this -for the next release. +for the next major release. -\enlargethispage{\baselineskip} +%\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 @@ -9577,9 +9699,84 @@ code for it, let me know, and I'll look into it. \section{Revision History} \label{sec:history} -\textbf{0.9.9b: Released \today} +\textbf{0.9.9c: Released \today} + +\begin{itemize} +\item Antti-Juhani Kaijahano has very kindly provided a new Finnish + localization for \textsf{biblatex-chicago}, called + \mycolor{\textsf{cms-finnish.lbx}}. As you will see if you look + through it, it is still something of a work in progress. If you + would like to fill some of its lacunae, please do let me know. +\item Following a report by Bertold Schweitzer, I have added the + \textbf{namea} and \textbf{nameb} fields to \textbf{article} and + \textbf{review} entries in all three Chicago styles. As in all the + book-like entry types, they allow you to associate an editor or a + translator specifically with a \textsf{title}, rather than, in these + cases, with an \textsf{issuetitle}. See the docs on these entry + types in sections~\ref{sec:entrytypes} and \ref{sec:types:authdate}, + above. +\item Thanks to another report by Bertold I have, in all three Chicago + styles, corrected inaccuracies in the presentation of the + \textbf{report} entry type. The \textsf{number} now appears + immediately after the \textsf{type}, and the \textsf{type} itself is + now capitalized properly depending on its context in an entry. +\item A third report by Bertold, detailing inaccuracies in the + treatment of the \textbf{volume} and \textbf{volumes} fields in + certain contexts, has resulted in a complete rewrite of the + presentation of these (and several related) fields in all + non-periodical entry types in all three Chicago styles. This won't + require any changes to your .bib files, but the output you see may, + in some reasonably unusual situations, change. Please let me know + if something doesn't look right to you. +\item A fourth report by Bertold revealed some inadequacies with + multiple \textsf{date} presentation in the two Chicago author-date + styles, issues that particularly involved cross-referenced entries. + In addition to some general fixes in the code, I have also slightly + changed the functioning of the \texttt{cmsdate=both} and + \texttt{cmsdate=on} switches. 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. See the \textbf{date} field docs in + section~\ref{sec:fields:authdate}, above. +\item Following a report by Antti-Juhani Kaijahano, I have modified + the presentation of author-less \textbf{article} and \textbf{review} + entries in the reference list of both Chicago author-date styles. + If such a source had a \texttt{magazine} \textsf{entrysubtype}, the + styles would already use the \textsf{journaltitle} at the head of + the entry in the list of references, but if there was no + \textsf{entrysubtype} the entry would appear in the list + \textsf{date} first. Now, in keeping with the \emph{Manual} + (14.175), the \textsf{title} will appear first, in both reference + lists and in-text citations. See especially under \textbf{article} + in section~\ref{sec:types:authdate}, above. +\item Several users have pointed out annoying formatting errors in the + styles. Evan Cortens spotted two bugs in the notes \&\ bibliography + style, one of which, under various circumstances, introduced extra + spaces into long notes and the other of which affected the + formatting of the \textsf{type} field in \textsf{thesis} entries. I + have fixed both, also applying the latter fix to several other entry + types that use the \textsf{type} field. Bertold Schweitzer pointed + out a formatting bug with the \textsf{issuesubtitle} field in the + author-date style, now fixed. Mark Sprevak reported some spurious + spaces appearing in headers and footers when using the + \textsf{titleps} package; the culprits were errors in the + \textsf{cms-*.lbx} files, now cleaned up. +\item I have rectified a number of other errors, in particular making + the automatic provision of abbreviated cross-references more robust + in \textsf{incollection}, \textsf{inproceedings}, and + \textsf{letter} entries, improving the behavior of the + \textsf{postnote} field in certain corner cases, fixing bugs in the + handling of \textsf{pagination} and \textsf{bookpagination} fields, + and slightly altering the placement of the \textsf{addendum} field + in book-like entries to bring it closer to the \emph{Manual's} + specification. A number of other, smaller improvements should also + bring the styles into closer conformity with the specification. +\end{itemize} + +\textbf{0.9.9b: Released December 6, 2012} \begin{itemize} -\item This \label{deprec:obsol} release contains a new variant of the +\item This release \label{deprec:obsol} contains a new variant of the author-date style, available as the \mycolor{\texttt{authordate-trad}} option when loading \textsf{biblatex-chicago}. This provides the traditional, plain, @@ -9633,7 +9830,7 @@ code for it, let me know, and I'll look into it. \textsf{postnote} field, then only that will appear. \end{itemize} -\enlargethispage{-2\baselineskip} +%\enlargethispage{-2\baselineskip} \textbf{0.9.9a: Released July 30, 2012} \begin{itemize} @@ -9684,7 +9881,7 @@ Edition: \item In \textbf{suppbook} entries, the \emph{Manual} now requires you to provide the page range (in the \textsf{pages} field) for the specific part you are citing, e.g., an introduction, foreword, or - afterword.\enlargethispage{-2\baselineskip} + afterword.%\enlargethispage{-2\baselineskip} \item In \textbf{patent} entries, the \emph{Manual} now prefers sentence-style capitalization for titles, which you'll need to provide yourself by hand. diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf index c468b340aea..39e6c3e395c 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf and b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.tex index 8e4ece31ecd..44ebde49325 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.9b (beta) \\ +\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.9c (beta) \\ \href{mailto:djf027@googlemail.com}{djf027@googlemail.com}\\ \today \end{center} @@ -74,29 +74,28 @@ implementing the 15th edition of \emph{The Chicago Manual of Style}. This edition has been superseded by the 16th edition, documented in \textsf{biblatex-chicago.pdf}. There may still be some users, - however, who wish to continue using the 15th-edition styles, so I - shall, at least for the moment, carry on maintaining them, though I - am marking them as \enquote{mildly deprecated.} The main reason to - continue using these files is perhaps a desire not to interrupt a - work-in-progress. If you wish to use an author-date style with the - traditional sentence-style capitalization (and absence of quotation - marks) in titles, the new \mycolor{\textsf{authordate-trad}} style - provides this while in all other respects adhering to the - 16th-edition specification.\mylittlespace \\ I have not backported - all improvements to the notes \&\ bibliography style, as the - 16th-edition specification represents in itself an incremental - upgrade which I encourage users of this style to adopt in their own - time. The author-date style is more complicated. I have backported - as many improvements as I can, and documented them here, but it - still isn't an implementation of the 16th-edition style with - 15th-edition title formatting, as provided by - \mycolor{\textsf{authordate-trad}}. I encourage all author-date - users, therefore, to adopt one of the newer styles in their own - time. \mylittlespace \\ The package remains beta software. If it - seems like it could be of use to you, yet it doesn't do something - you need/want it to do, please feel free to let me know, and of - course any suggestions for solving problems more elegantly or - accurately would be most welcome.} + 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 + 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 + traditional Chicago sentence-style capitalization (and absence of + quotation marks) in titles while in all other respects adhering to + the 16th-edition specification. I can't promise that switching to a + newer style will be entirely painless, but if you read through the + RELEASE file you'll find that it won't, under ordinary + circumstances, require Herculean efforts. \mylittlespace \\ The + package remains beta software. If it seems like it could be of use + to you, yet it doesn't do something you need/want it to do, please + feel free to let me know, and of course any suggestions for solving + problems more elegantly or accurately would be most welcome.} \mylittlespace\textbf{Important Note:} If you have used \textsf{biblatex-chicago} before, please make sure you have read the @@ -143,7 +142,7 @@ release. \begin{itemize}{}{} \item Philipp Lehman's \textsf{biblatex} package, of course! You - should use the latest version(s) --- 1.7 or 2.4 --- as those + should use the latest version(s) --- 1.7 or 2.5 --- 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 @@ -168,8 +167,8 @@ release. 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.4, to work with - \textsf{biblatex} 2.4, or 0.9.9 with \textsf{biblatex} 1.7, and it + 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. @@ -290,7 +289,7 @@ release. \subsection{License} \label{sec:lppl} -Copyright © 2008--2012 David Fussner. This package is +Copyright © 2008--2013 David Fussner. This package is author-maintained. This work may be copied, distributed and/or modified under the conditions of the \LaTeX\ Project Public License, either version 1.3 of this license or (at your option) any later @@ -8566,7 +8565,14 @@ code for it, let me know, and I'll look into it. \section{Revision History} \label{sec:history} -\textbf{0.9.9b: Released \today} +\textbf{0.9.9c: Released \today} +\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 + is practicable to the 16th-edition styles. +\end{itemize} + +\textbf{0.9.9b: Released December 6, 2012} \begin{itemize} \item I have updated calls to \cmd{DeclareLabelname} and \cmd{DeclareLabelyear} in .cbx files so that the package works diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf index f876dbbe978..7bbff5bed5f 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf and b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex index 247d32c5e03..b0d74ad50e0 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 @@ -69,7 +69,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.4 and \textsf{biblatex} 2.4, which latter two are +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\ @@ -94,11 +94,11 @@ 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 \textsf{biblatex-chicago}, which have been updated with some -improvements borrowed from the 16th edition. (See -\textsf{biblatex-chicago15.pdf} and \textsf{cms15-dates-sample.pdf}.) -I would encourage all users, however, to switch to one of the -16th-edition styles as soon as possible, as I am concentrating nearly -all of my development time there. +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. \subsection*{Usage} \label{usage} @@ -128,12 +128,12 @@ automatically resets the tracker at page breaks: \citereset\cmd{citereset}\ \autocite[15.27]{chicago:manual}. If you are going to repeat a source, make sure that the cite command provides -a postnote --- from this release of \textsf{biblatex-chicago} you'll -no longer get any annoying empty parentheses, but you will get another -standard citation, which may add too much clutter: -\autocite{chicago:manual}. If you don't need to cite a specific page, -then it may be better, or at least more concise, only to use one -citation command rather than two. +a postnote --- when using \textsf{biblatex-chicago} you'll no longer +get any annoying empty parentheses, but you will get another standard +citation, which may add too much clutter: \autocite{chicago:manual}. +If you don't need to cite a specific page, then it may be better, or +at least more concise, only to use one citation command rather than +two. \subsection*{Other citation commands} \label{sec:other} @@ -268,10 +268,12 @@ In \textsf{Article} and \textsf{Review} entries with the \texttt{magazine} entrysubtype, the absence of an author automatically places the \textsf{journaltitle} of the periodical in citations and at the head of the entry in the list of references: -\autocite{gourmet:052006}. You can cite newspaper and magazine -articles entirely within the text, i.e., without them appearing in the -reference list \autocite[15.47]{chicago:manual}, if you set the -\texttt{cmsdate=full} entry option: \autocite{lakeforester:pushcarts}; +\autocite{gourmet:052006}. (Without the entrysubtype, you'll get the +\textsf{title} at the head rather than the \textsf{journaltitle}.) +You can cite newspaper and magazine articles entirely within the text, +i.e., without them appearing in the reference list +\autocite[15.47]{chicago:manual}, if you set the \texttt{cmsdate=full} +entry option: \autocite{lakeforester:pushcarts}; \autocite{nyt:trevorobit}. In \textsf{Manual} entries, the \textsf{organization} field does the same: \autocite{dyna:browser}. If you wish to present an abbreviated form of the journal (or diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf index be59f305b60..1a609ab414c 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf and b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.pdf index af5c6547def..2f28293369b 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.pdf and b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.tex index e63610c0f46..73a880674e1 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 @@ -69,7 +69,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.4 and \textsf{biblatex} 2.4, which latter two are +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\ @@ -94,12 +94,11 @@ 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. -(See \textsf{biblatex-chicago15.pdf} and -\textsf{cms15-dates-sample.pdf}.) I would encourage all users, -however, to switch to one of the 16th-edition styles as soon as -possible, as I am concentrating nearly all of my development time -there. +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. \subsection*{Usage} \label{usage} @@ -129,12 +128,12 @@ automatically resets the tracker at page breaks: \citereset\cmd{citereset}\ \autocite[15.27]{chicago:manual}. If you are going to repeat a source, make sure that the cite command provides -a postnote --- from this release of \textsf{biblatex-chicago} you'll -no longer get any annoying empty parentheses, but you will get another -standard citation, which may add too much clutter: -\autocite{chicago:manual}. If you don't need to cite a specific page, -then it may be better, or at least more concise, only to use one -citation command rather than two. +a postnote --- when using \textsf{biblatex-chicago} you'll no longer +get any annoying empty parentheses, but you will get another standard +citation, which may add too much clutter: \autocite{chicago:manual}. +If you don't need to cite a specific page, then it may be better, or +at least more concise, only to use one citation command rather than +two. \subsection*{Other citation commands} \label{sec:other} @@ -269,10 +268,12 @@ In \textsf{Article} and \textsf{Review} entries with the \texttt{magazine} entrysubtype, the absence of an author automatically places the \textsf{journaltitle} of the periodical in citations and at the head of the entry in the list of references: -\autocite{gourmet:052006}. You can cite newspaper and magazine -articles entirely within the text, i.e., without them appearing in the -reference list \autocite[15.47]{chicago:manual}, if you set the -\texttt{cmsdate=full} entry option: \autocite{lakeforester:pushcarts}; +\autocite{gourmet:052006}. (Without the entrysubtype, you'll get the +\textsf{title} at the head rather than the \textsf{journaltitle}.) +You can cite newspaper and magazine articles entirely within the text, +i.e., without them appearing in the reference list +\autocite[15.47]{chicago:manual}, if you set the \texttt{cmsdate=full} +entry option: \autocite{lakeforester:pushcarts}; \autocite{nyt:trevorobit}. In \textsf{Manual} entries, the \textsf{organization} field does the same: \autocite{dyna:browser}. If you wish to present an abbreviated form of the journal (or diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.pdf index 44d44f6343f..dfefe02a823 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.pdf and b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.tex index f1fb82488bd..10bb7e492d1 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 @@ -67,7 +67,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.4 and \textsf{biblatex} 2.4, which latter two are +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\ diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-notes-sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-notes-sample.pdf index e1782a2dcbf..2c29d47d368 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-notes-sample.pdf and b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-notes-sample.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib b/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib index 733174374b8..d80d9067665 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib @@ -577,7 +577,7 @@ author = {Centinel}, nameaddon = {\bibstring{pseudonym}}, titleaddon = {letters}, - booktitle = {{The Complete Anti-Federalist}}, + booktitle = {The Complete {Anti-Federalist}}, publisher = uchp, year = 1981, editor = {Storing, Herbert J.}, 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 fce7c22a511..c36619ae7f8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty @@ -1,6 +1,6 @@ -% $Id: biblatex-chicago.sty,v 0.1.1.46 2012/12/06 12:19:45 dfussner Exp $ +% $Id: biblatex-chicago.sty,v 0.1.1.48 2013/03/12 14:19:12 dfussner Exp $ -% Copyright (c) 2009-2012 David Fussner. This package is +% Copyright (c) 2009-2013 David Fussner. This package is % author-maintained. % % This work may be copied, distributed and/or modified under the @@ -13,7 +13,7 @@ % but not limited to, the implied warranties of merchantability and % fitness for a particular purpose. -\ProvidesPackage{biblatex-chicago}[2012/12/06 v 2.4 biblatex style] +\ProvidesPackage{biblatex-chicago}[2013/03/12 v 2.5 biblatex style] \RequirePackage{etoolbox} @@ -134,6 +134,7 @@ \DeclareLanguageMapping{british}{cms-british} \DeclareLanguageMapping{german}{cms-german} \DeclareLanguageMapping{french}{cms-french} +\DeclareLanguageMapping{finnish}{cms-finnish} \DeclareLanguageMapping{ngerman}{cms-ngerman} \DeclareLanguageMapping{icelandic}{cms-icelandic} \DeclareLanguageMapping{norsk}{cms-norsk} 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 809bcbf8c7b..c1db18e73e8 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,11 @@ -% $Id: chicago-authordate-trad.cbx,v 0.8.1.27 2012/12/06 11:45:44 dfussner Exp $ +% $Id: chicago-authordate-trad.cbx,v 0.8.1.32 2013/03/12 12:40:45 dfussner Exp $ % This is a biblatex citation style file, adapted from Lehman's % authoryear-comp.cbx. It is heavily modified, with the intention of % providing inline citations (and a reference list) for the % author-date style of the Chicago Manual of Style, 16th edition. -\ProvidesFile{chicago-authordate.cbx}[2012/12/06 v 2.4 biblatex citation style] +\ProvidesFile{chicago-authordate-trad.cbx}[2013/03/12 v 2.5 biblatex +citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -739,9 +740,9 @@ \iftoggle{cms@switchdates}% {\usebibmacro{cite:labelyear+extrayear}} {\iffieldundef{origyear}% - {\usebibmacro{cite:labelyear+extrayear}}% + {\clearfield{extrayear}\usebibmacro{cite:labelyear+extrayear}}% {\printtext[bibhyperref]{% - \printfield{origyear}}}}} + \usebibmacro{origyear+endyear}}}}} \newbibmacro*{cite:bothyear+oldstyle}{% \iftoggle{cms@switchdates}% @@ -749,12 +750,15 @@ \bibopenparen% \usebibmacro{cite:labelyear+extrayear}% \bibcloseparen% - \addspace\printfield{origyear}}}% + \addspace\usebibmacro{origyear+endyear}}}% {\iffieldundef{origyear}% - {\usebibmacro{cite:labelyear+extrayear}}% + {\clearfield{extrayear}\usebibmacro{cite:labelyear+extrayear}}% {\printtext[bibhyperref]{% - \printfield[parens]{origyear}% - \addspace\printfield{labelyear}}}}} + \bibopenparen% + \usebibmacro{origyear+endyear}% + \bibcloseparen% + \clearfield{extrayear}\addspace% + \usebibmacro{cite:labelyear+extrayear}}}}} \newbibmacro*{cite:save}{% \savefield{entrykey}{\cbx@lastkey}} @@ -1033,7 +1037,7 @@ \DeclareFieldFormat{pages}{% \iffieldundef{bookpagination}% {#1\isdot}% - {\mkpageprefix[bookpagination]{#1\isdot}}} + {\mkpageprefix[bookpagination]{#1}}} \DeclareFieldFormat{bibnote}{\MakeCapital{#1}} @@ -1175,6 +1179,14 @@ {\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} @@ -1422,13 +1434,13 @@ \newbibmacro*{finentry}{%{\finentry} To make annotated bibliography \ifbibliography - {\usebibmacro{entrytail}} + {\usebibmacro{entrytail}}% {}% \finentry} \newbibmacro*{entrytail}{% From reading.bbx, for annotated bibliography \newunit\newblock - \iftoggle{cms@annotation} + \iftoggle{cms@annotation}% {\usebibmacro{annotation}% \newunit\newblock} {}}% @@ -1464,7 +1476,8 @@ \newcunit\newblock}}} \newbibmacro*{editorpunct}{% - \ifthenelse{\(\iffieldundef{booktitle}\AND\iffieldundef{maintitle}\)% + \ifthenelse{\(\iffieldundef{booktitle}\AND% + \iffieldundef{maintitle}\AND\iffieldundef{issuetitle}\)% \OR\iffieldsequal{booktitle}{title}% Changed these for crossrefed \OR\iffieldsequal{maintitle}{title}}% entries. Create problems? {\iffieldequalstr{entrytype}{video}% @@ -2086,13 +2099,6 @@ \setunit{\addcolon\addspace}% \printfield[noformat]{journalsubtitle}}}} -% \newbibmacro*{url+date}{% Changed for 0.9: No longer used? -% \printfield{url}% -% \iffieldundef{urlyear} -% {} -% {\setunit{\addspace}% -% \printtext[urldate]{\printurldate}}} - \newbibmacro*{chap+pag}{% \printfield{chapter}% \setunit*{\addcomma\space}% 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 36b6b6e12c2..6d3cfe411a8 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.23 2012/12/06 11:40:16 dfussner Exp $ +% $Id: chicago-authordate.bbx,v 0.8.1.29 2013/03/13 19:05:02 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}[2012/12/06 v 2.4 biblatex +\ProvidesFile{chicago-authordate.bbx}[2013/03/12 v 2.5 biblatex bibliography style] %%%% Initialize and format bibliography and los %%%% @@ -376,12 +376,14 @@ bibliography style] \setunit{\addspace}% \usebibmacro{language+transtitle}% \newunit\newblock% + \usebibmacro{part+editor+translator}% + \newunit\newblock% \usebibmacro{bibreprint}% % \newunit\newblock% \usebibmacro{issuetitle}% \setunit*{\addcomma\addspace}% \usebibmacro{byeditor+others}% - \newunit\newblock + \usebibmacro{editorpunct}%\newunit\newblock \printfield{note}% \setunit*{\addcomma\addspace}\newblock% \usebibmacro{mag+news+date}% @@ -407,20 +409,23 @@ bibliography style] \setunit{\addspace}% \printfield{nameaddon}% \newunit\newblock + \ifundef{\bbx@lasthash}{\usebibmacro{mag+news+title}\newunit}{}% \usebibmacro{cmsbibsortdate}% \newunit\newblock - \usebibmacro{mag+news+title}% + \ifundef{\bbx@lasthash}{}{\usebibmacro{mag+news+title}}% \setunit{\addspace}% \usebibmacro{language+transtitle}% \setunit*{\addperiod\addspace}\newblock% 16th ed. \usebibmacro{byauthor}% \newunit\newblock + \usebibmacro{part+editor+translator}% + \newunit\newblock% \usebibmacro{bibreprint}% % \newunit\newblock \usebibmacro{issuetitle}% \setunit*{\addcomma\addspace}% \usebibmacro{byeditor+others}% - \newunit\newblock + \usebibmacro{editorpunct}%\newunit\newblock \printfield{note}% \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)?? \usebibmacro{journal+issue+year+pages}% @@ -506,17 +511,7 @@ bibliography style] {\setunit{\addcomma\addspace}}% \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newunit% unit, not cunit? \usebibmacro{bybookauthor}% \usebibmacro{byeditor+others}% @@ -543,14 +538,7 @@ bibliography style] \newcunit \printfield{maintitleaddon}}} \newcunit\newblock - \printfield{pages}% - \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \usebibmacro{volume+pages}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -595,15 +583,7 @@ bibliography style] \iffieldundef{maintitle}% {\iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newunit - \printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}% - \newunit - \printfield{volumes}% - \clearfield{volumes}}}% + {\usebibmacro{edition}}}% {}% \newunit\newblock% 16th ed. \usebibmacro{byauthor} @@ -614,31 +594,16 @@ bibliography style] \newcunit \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes}% - \clearfield{volumes}}% + {\usebibmacro{edition}}% \usebibmacro{editorpunct}% \usebibmacro{byeditor+others}% \usebibmacro{editorpunct}% \iftoggle{cms@bookpages}% {}% {\clearfield{pages}}% - \usebibmacro{chap+pag}% - \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \printfield{chapter}% + \setunit*{\addcomma\addspace}% + \usebibmacro{volume+pages}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -682,15 +647,7 @@ bibliography style] \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}% {\iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newunit - \printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}% - \newunit - \printfield{volumes}% - \clearfield{volumes}}}% + {\usebibmacro{edition}}}% {}% \newunit\newblock% 16th ed. \usebibmacro{byauthor}% @@ -702,32 +659,15 @@ bibliography style] \newcunit \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes}% - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{bybookauthor}% \usebibmacro{editorpunct} \usebibmacro{byeditor+others}% \newcunit\newblock - \usebibmacro{chap+pag}% - \newunit\newblock - \printfield{edition}% - \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \printfield{chapter}% + \newcunit\newblock + \usebibmacro{volume+pages}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -803,26 +743,11 @@ bibliography style] \usebibmacro{editorpunct}% \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \usebibmacro{editorpunct}% - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \usebibmacro{editorpunct}% - \printfield{volumes}% - \clearfield{volumes}}% + {\usebibmacro{edition}}% \usebibmacro{editorpunct}% \usebibmacro{bytranslator+others}% \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -923,29 +848,12 @@ bibliography style] \newcunit \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{bybookauthor}% \usebibmacro{byeditor+others}% \newcunit\newblock - \printfield{pages}% - \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \usebibmacro{volume+pages}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -996,29 +904,12 @@ bibliography style] \newcunit \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{bybookauthor}% \usebibmacro{byeditor+others}% \newcunit\newblock - \printfield{pages}% - \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \usebibmacro{volume+pages}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -1077,14 +968,7 @@ bibliography style] \newcunit\newblock \usebibmacro{byeditor+others}% \newcunit\newblock - \printfield{pages}% - \newunit\newblock - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \usebibmacro{volume+pages}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -1126,15 +1010,7 @@ bibliography style] \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}% {\iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newunit - \printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}% - \newunit - \printfield{volumes}% - \clearfield{volumes}}}% + {\usebibmacro{edition}}}% {}% \newunit\newblock \usebibmacro{part+editor+translator}% @@ -1144,30 +1020,15 @@ bibliography style] \newcunit \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes}% - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{bybookauthor}% \usebibmacro{editorpunct} \usebibmacro{byeditor+others}% \newcunit\newblock - \usebibmacro{chap+pag}% - \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \printfield{chapter}% + \newcunit\newblock + \usebibmacro{volume+pages}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -1231,29 +1092,12 @@ bibliography style] \newcunit \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{bybookauthor}% \usebibmacro{byeditor+others}% \newcunit\newblock - \printfield{pages}% - \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \usebibmacro{volume+pages}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -1413,17 +1257,7 @@ bibliography style] {\newcunit}% \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newunit% unit, not cunit? \usebibmacro{bybookauthor}% \usebibmacro{byeditor+others}% @@ -1450,14 +1284,7 @@ bibliography style] \newcunit \printfield{maintitleaddon}}} \newcunit\newblock - \printfield{pages}% - \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \usebibmacro{volume+pages}% \newunit\newblock \printfield{version}% \newunit\newblock @@ -1701,12 +1528,7 @@ bibliography style] \newunit\newblock \usebibmacro{mtitle+mstitle+vol+part+title+stitle}% \newunit\newblock - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -1740,15 +1562,7 @@ bibliography style] \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}% {\iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newunit - \printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}% - \newunit - \printfield{volumes}% - \clearfield{volumes}}}% + {\usebibmacro{edition}}}% {}% \newunit\newblock \usebibmacro{part+editor+translator}% @@ -1758,30 +1572,15 @@ bibliography style] \newcunit \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes}% - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{bybookauthor}% \usebibmacro{editorpunct} \usebibmacro{byeditor+others}% \newcunit\newblock - \usebibmacro{chap+pag}% - \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \printfield{chapter}% + \newcunit\newblock + \usebibmacro{volume+pages}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -1822,9 +1621,11 @@ bibliography style] \newunit% 16th ed. \usebibmacro{byauthor}% \newunit\newblock - \usebibmacro{ser+num}% - \newunit\newblock \printfield{type}% + \newcunit + \printfield{series}% + \setunit{\addnbspace}% + \printfield{number}% \newunit \printfield{note}% \newunit\newblock @@ -1855,11 +1656,19 @@ bibliography style] \setunit{\addspace}% \printfield{nameaddon}% \newunit\newblock + \ifundef{\bbx@lasthash}% + {\printfield{title}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{subtitle}% + \newunit}% + {}% \usebibmacro{cmsbibsortdate}% \newunit\newblock - \printfield{title}% + \ifundef{\bbx@lasthash}% + {}% + {\printfield{title}% \setunit{\addcolon\addspace}% - \printfield[noformat]{subtitle}% + \printfield[noformat]{subtitle}}% \setunit{\addspace}% \printfield{titleaddon}% \newcunit\newblock @@ -1867,12 +1676,14 @@ bibliography style] \setunit{\addspace}% \usebibmacro{language+transtitle}% \newunit\newblock% + \usebibmacro{part+editor+translator}% + \newunit\newblock% \usebibmacro{bibreprint}% % \newunit\newblock \usebibmacro{issuetitle}% \setunit*{\addcomma\addspace}% \usebibmacro{byeditor+others}% - \newunit\newblock + \usebibmacro{editorpunct}%\newunit\newblock \printfield{note}% \setunit*{\addcomma\addspace}\newblock% \iffieldequalstr{entrysubtype}{magazine} @@ -1921,15 +1732,7 @@ bibliography style] \iffieldundef{maintitle}% {\iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newunit - \printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}% - \newunit - \printfield{volumes}% - \clearfield{volumes}}}% + {\usebibmacro{edition}}}% {}% \newcunit \usebibmacro{bybookauthor}% @@ -1940,26 +1743,11 @@ bibliography style] \newcunit% \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle}% - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes}% - \clearfield{volumes}}% + {\usebibmacro{edition}}% \usebibmacro{editorpunct}% \usebibmacro{byeditor+others}% \newunit - \iffieldundef{maintitle}% - {\printfield{volume}% - \printfield{part}}% - {}% - \newunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -2094,17 +1882,7 @@ bibliography style] {\setunit{\addcomma\addspace}}% \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newunit% unit, not cunit? \usebibmacro{bybookauthor}% \usebibmacro{byeditor+others}% @@ -2131,14 +1909,7 @@ bibliography style] \newcunit \printfield{maintitleaddon}}} \newcunit\newblock - \printfield{pages}% - \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \usebibmacro{volume+pages}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -2173,20 +1944,23 @@ bibliography style] \ifthenelse{\iffieldundef{urlyear}\AND\iffieldundef{urlmonth}}% {}% {\printurldate}% Date fix - \newunit\newblock + \iffieldundef{addendum}% + {\newunit\newblock}% + {\newcunit\newblock}% \iftoggle{cms@doionly}% {\iffieldundef{doi}% {}% {\printfield{doi}% + \setunit*{\addperiod\addspace}\newblock% \clearfield{url}}}% {\iftoggle{cms@doi}% - {\printfield{doi}}% + {\printfield{doi}% + \setunit*{\addperiod\addspace}\newblock}% {}}% - \newunit\newblock \iftoggle{cms@eprint}% - {\usebibmacro{eprint}}% + {\usebibmacro{eprint}% + \setunit*{\addperiod\addspace}\newblock}% {}% - \newunit\newblock \iftoggle{cms@url}% {\printfield{url}}% {}}% @@ -2378,6 +2152,14 @@ bibliography style] {\clearfield{eventyear}\clearfield{eventendyear}}% {}}}}}}} +\newbibmacro*{origyear+endyear}{% + \printfield{origyear}% + \iffieldundef{origendyear}% + {}% + {\iffieldequalstr{origendyear}{}% + {\mbox{\bibdatedash}}% + {\bibdatedash\printfield{origendyear}}}} + \newbibmacro*{cmsbibsortdate}{% Attempt to solve date-related problems \ifboolexpr{% test {\iffieldundef{origyear}} @@ -2418,10 +2200,9 @@ bibliography style] {\usebibmacro{labelyear+extrayear}% \clearfield{year}}% {\iffieldundef{origyear} - {\usebibmacro{labelyear+extrayear}}% - {\printtext{% - \printfield{origyear}}% - \clearfield{origyear}}}} + {\clearfield{extrayear}\usebibmacro{labelyear+extrayear}}% + {\usebibmacro{origyear+endyear}}% + \clearfield{origyear}}} \newbibmacro*{bothyear+oldstyle}{% \iftoggle{cms@switchdates}% @@ -2429,14 +2210,18 @@ bibliography style] \bibopenparen% \usebibmacro{labelyear+extrayear}% \bibcloseparen% - \setunit{\addspace}\printfield{origyear}}% + \setunit{\addspace}\usebibmacro{origyear+endyear}}% \clearfield{year}% \clearfield{origyear}}% {\iffieldundef{origyear} - {\usebibmacro{labelyear+extrayear}}% + {\clearfield{extrayear}\usebibmacro{labelyear+extrayear}}% {\printtext{% - \printfield[parens]{origyear}% - \setunit*{\addspace}\printfield{labelyear}}% + \bibopenparen% + \usebibmacro{origyear+endyear}% + \bibcloseparen% +% \printfield[parens]{origyear}% + \clearfield{extrayear}\setunit*{\addspace}% + \usebibmacro{labelyear+extrayear}}% \clearfield{origyear}% \clearfield{year}}}} @@ -2470,17 +2255,62 @@ bibliography style] {}}}% {}} -\newbibmacro*{bibpostxref}{% - \iffieldundef{postnote}% - {\iffieldundef{chapter}% - {\iffieldundef{pages}% - {}% - {\postnotedelim% Extra space? - \printfield{pages}}}% - {\postnotedelim% - \printfield{chapter}}}% - {\postnotedelim% - \printfield{postnote}}} +\newbibmacro*{volume+pages}{% Volume fix + \iffieldundef{maintitle}% + {\iffieldundef{volume}% + {\printfield{pages}% + \newunit% + \printfield{volumes}}% + {\iffieldundef{part}% + {\iffieldundef{pages}% + {}% + {\ifthenelse{\iffieldnums{pages}% + \AND\iffieldundef{bookpagination}}% + {\printfield[default]{volume}% + \addcolon% + \printfield{pages}}% + {\printfield{volume}% + \addcomma\addspace% + \printfield{pages}}}}% + {\printfield{volume}% + \printfield{part}% + \newcunit% + \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{maintitle}% + {\iffieldundef{volume}% + {\printfield{volumes}}% + {\printfield{volume}% + \printfield{part}}}% + {\printfield{volumes}}} \newbibmacro*{mtitle+mstitle+vol+part+title+stitle}{% \iffieldundef{maintitle} 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 b73c23d5fa4..19742ff22be 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.25 2012/12/06 11:43:37 dfussner Exp $ +% $Id: chicago-authordate.cbx,v 0.8.1.32 2013/03/12 12:35:38 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}[2012/12/06 v 2.4 biblatex citation style] +\ProvidesFile{chicago-authordate.cbx}[2013/03/12 v 2.5 biblatex citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -736,9 +736,9 @@ \iftoggle{cms@switchdates}% {\usebibmacro{cite:labelyear+extrayear}} {\iffieldundef{origyear}% - {\usebibmacro{cite:labelyear+extrayear}}% + {\clearfield{extrayear}\usebibmacro{cite:labelyear+extrayear}}% {\printtext[bibhyperref]{% - \printfield{origyear}}}}} + \usebibmacro{origyear+endyear}}}}} \newbibmacro*{cite:bothyear+oldstyle}{% \iftoggle{cms@switchdates}% @@ -746,12 +746,15 @@ \bibopenparen% \usebibmacro{cite:labelyear+extrayear}% \bibcloseparen% - \addspace\printfield{origyear}}}% + \addspace\usebibmacro{origyear+endyear}}}% {\iffieldundef{origyear}% - {\usebibmacro{cite:labelyear+extrayear}}% + {\clearfield{extrayear}\usebibmacro{cite:labelyear+extrayear}}% {\printtext[bibhyperref]{% - \printfield[parens]{origyear}% - \addspace\printfield{labelyear}}}}} + \bibopenparen% + \usebibmacro{origyear+endyear}% + \bibcloseparen% + \clearfield{extrayear}\addspace% + \usebibmacro{cite:labelyear+extrayear}}}}} \newbibmacro*{cite:save}{% \savefield{entrykey}{\cbx@lastkey}} @@ -1035,7 +1038,7 @@ \DeclareFieldFormat{pages}{% \iffieldundef{bookpagination}% {#1\isdot}% - {\mkpageprefix[bookpagination]{#1\isdot}}} + {\mkpageprefix[bookpagination]{#1}}}% Removed \isdot. \DeclareFieldFormat{bibnote}{\MakeCapital{#1}} @@ -1168,14 +1171,22 @@ \ifbibstring{#1}% {\bibstring{#1}}% {\ifcapital% - {\MakeCapital{#1}}% - {#1}}} + {\MakeCapital{#1\isdot}}% + {#1\isdot}}} \DeclareFieldFormat[artwork]{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} @@ -1423,13 +1434,13 @@ \newbibmacro*{finentry}{%{\finentry} To make annotated bibliography \ifbibliography - {\usebibmacro{entrytail}} + {\usebibmacro{entrytail}}% {}% \finentry} \newbibmacro*{entrytail}{% From reading.bbx, for annotated bibliography \newunit\newblock - \iftoggle{cms@annotation} + \iftoggle{cms@annotation}% {\usebibmacro{annotation}% \newunit\newblock} {}}% @@ -1465,7 +1476,8 @@ \newcunit\newblock}}} \newbibmacro*{editorpunct}{% - \ifthenelse{\(\iffieldundef{booktitle}\AND\iffieldundef{maintitle}\)% + \ifthenelse{\(\iffieldundef{booktitle}\AND% + \iffieldundef{maintitle}\AND\iffieldundef{issuetitle}\)% \OR\iffieldsequal{booktitle}{title}% Changed these for crossrefed \OR\iffieldsequal{maintitle}{title}}% entries. Create problems? {\iffieldequalstr{entrytype}{video}% @@ -1853,10 +1865,10 @@ \iffieldequalstr{entrytype}{suppperiodical}}% This test is for {\usebibmacro{cms-in:}}% periodical entries {}% - \printtext{% - \printfield{issuetitle}% + \printtext[issuetitle]{% + \printfield[noformat]{issuetitle}% \setunit{\addcolon\addspace}% - \printfield[issuetitle]{issuesubtitle}}}} + \printfield[noformat]{issuesubtitle}}}} \newbibmacro*{btitle+bstitle}{% \iffieldundef{booktitle} @@ -2087,13 +2099,6 @@ \setunit{\addcolon\addspace}% \printfield[noformat]{journalsubtitle}}}} -% \newbibmacro*{url+date}{% Changed for 0.9: No longer called? -% \printfield{url}% -% \iffieldundef{urlyear} -% {} -% {\setunit{\addspace}% -% \printtext[urldate]{\printurldate}}} - \newbibmacro*{chap+pag}{% \printfield{chapter}% \setunit*{\addcomma\space}% 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 0e41d319d0e..307197f8141 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.24 2012/12/06 11:50:31 dfussner Exp $ +% $Id: chicago-notes.bbx,v 0.9.7.34 2013/03/12 12:07:20 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}[2012/12/06 v 2.4 biblatex bibliography style] +\ProvidesFile{chicago-notes.bbx}[2013/03/12 v 2.5 biblatex bibliography style] %%%% Initialize and format bibliography and los %%%% @@ -386,10 +386,12 @@ \setunit{\addspace}% \usebibmacro{language+transtitle}% \newunit\newblock% + \usebibmacro{part+editor+translator}% + \newunit\newblock% \usebibmacro{issuetitle}% \setunit*{\addcomma\addspace}% \usebibmacro{byeditor+others}% - \newunit\newblock + \usebibmacro{editorpunct}%\newunit\newblock \printfield{note}% \setunit*{\addcomma\addspace}\newblock% \usebibmacro{mag+news+date}% @@ -419,10 +421,12 @@ \setunit*{\addperiod\addspace}\newblock% 16th ed. \usebibmacro{byauthor}% \newunit\newblock + \usebibmacro{part+editor+translator}% + \newunit\newblock% \usebibmacro{issuetitle}% \setunit*{\addcomma\addspace}% \usebibmacro{byeditor+others}% - \newunit\newblock + \usebibmacro{editorpunct}%\newunit\newblock \printfield{note}% \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)?? \usebibmacro{journal+issue+year+pages}% @@ -494,17 +498,7 @@ {\setunit{\addcomma\addspace}}% \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newunit% unit, not cunit? \usebibmacro{bybookauthor}% \usebibmacro{byeditor+others}% @@ -531,14 +525,7 @@ \newcunit \printfield{maintitleaddon}}} \newcunit\newblock - \printfield{pages}% - \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \usebibmacro{volume+pages}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -576,15 +563,7 @@ \iffieldundef{maintitle}% {\iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newunit - \printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}% - \newunit - \printfield{volumes}% - \clearfield{volumes}}}% + {\usebibmacro{edition}}}% {}% \newunit\newblock% 16th ed. \usebibmacro{byauthor} @@ -595,31 +574,16 @@ \newcunit \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes}% - \clearfield{volumes}}% + {\usebibmacro{edition}}% \usebibmacro{editorpunct}% \usebibmacro{byeditor+others}% \usebibmacro{editorpunct}%\newcunit\newblock \iftoggle{cms@bookpages}% {}% {\clearfield{pages}}% - \usebibmacro{chap+pag}% - \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \printfield{chapter}% + \setunit*{\addcomma\addspace}% + \usebibmacro{volume+pages}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -655,15 +619,7 @@ \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}% {\iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newunit - \printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}% - \newunit - \printfield{volumes}% - \clearfield{volumes}}}% + {\usebibmacro{edition}}}% {}% \newunit\newblock% 16th ed. \usebibmacro{byauthor}% @@ -675,32 +631,15 @@ \newcunit \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes}% - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{bybookauthor}% \usebibmacro{editorpunct} \usebibmacro{byeditor+others}% \newcunit\newblock - \usebibmacro{chap+pag}% - \newunit\newblock - \printfield{edition}% - \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \printfield{chapter}% + \newcunit\newblock + \usebibmacro{volume+pages}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -760,26 +699,11 @@ \usebibmacro{editorpunct}% \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \usebibmacro{editorpunct}% - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \usebibmacro{editorpunct}% - \printfield{volumes}% - \clearfield{volumes}}% + {\usebibmacro{edition}}% \usebibmacro{editorpunct}% \usebibmacro{bytranslator+others}% \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -866,29 +790,12 @@ \newcunit \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{bybookauthor}% \usebibmacro{byeditor+others}% \newcunit\newblock - \printfield{pages}% - \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \usebibmacro{volume+pages}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -933,29 +840,12 @@ \newcunit \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{bybookauthor}% \usebibmacro{byeditor+others}% \newcunit\newblock - \printfield{pages}% - \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \usebibmacro{volume+pages}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -978,14 +868,16 @@ \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% {\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \bibxrefcite{\thefield{xref}}% - \usebibmacro{bibpostxref}% + \usebibmacro{xrefpostnote}% \usebibmacro{finentry}}}% {\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \bibxrefcite{\thefield{crossref}}% - \usebibmacro{bibpostxref}% + \usebibmacro{xrefpostnote}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{inproceedings}{% @@ -1008,14 +900,7 @@ \usebibmacro{cms-in:}% \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}% \newcunit\newblock - \printfield{pages}% - \newunit\newblock - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \usebibmacro{volume+pages}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -1036,14 +921,16 @@ \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% {\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \bibxrefcite{\thefield{xref}}% - \usebibmacro{bibpostxref}% + \usebibmacro{xrefpostnote}% \usebibmacro{finentry}}}% {\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \bibxrefcite{\thefield{crossref}}% - \usebibmacro{bibpostxref}% + \usebibmacro{xrefpostnote}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{inreference}{% @@ -1053,15 +940,7 @@ \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}% {\iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newunit - \printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}% - \newunit - \printfield{volumes}% - \clearfield{volumes}}}% + {\usebibmacro{edition}}}% {}% \newunit\newblock \usebibmacro{part+editor+translator}% @@ -1071,30 +950,15 @@ \newcunit \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes}% - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{bybookauthor}% \usebibmacro{editorpunct} \usebibmacro{byeditor+others}% \newcunit\newblock - \usebibmacro{chap+pag}% - \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \printfield{chapter}% + \newcunit\newblock + \usebibmacro{volume+pages}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -1151,29 +1015,12 @@ \newcunit \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{bybookauthor}% \usebibmacro{byeditor+others}% \newcunit\newblock - \printfield{pages}% - \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \usebibmacro{volume+pages}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -1196,16 +1043,18 @@ {\ifpunctmark{*}% Attempt to fix issues with n.d. Changed for 0.9. {\setunit{\nopunct\addspace\bibsentence}}% {}% + \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \bibxrefcite{\thefield{xref}}% - \usebibmacro{bibpostxref}% + \usebibmacro{xrefpostnote}% \usebibmacro{finentry}}}% {\ifpunctmark{*}% Likewise. {\setunit{\nopunct\addspace\bibsentence}}% {}% + \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \bibxrefcite{\thefield{crossref}}% - \usebibmacro{bibpostxref}% + \usebibmacro{xrefpostnote}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{manual}{% @@ -1309,17 +1158,7 @@ {\newcunit}% \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newunit% unit, not cunit? \usebibmacro{bybookauthor}% \usebibmacro{byeditor+others}% @@ -1346,14 +1185,7 @@ \newcunit \printfield{maintitleaddon}}} \newcunit\newblock - \printfield{pages}% - \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \usebibmacro{volume+pages}% \newunit\newblock \printfield{version}% \newunit\newblock @@ -1539,12 +1371,7 @@ \newunit\newblock \usebibmacro{mtitle+mstitle+vol+part+title+stitle}% \newunit\newblock - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -1572,15 +1399,7 @@ \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}% {\iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newunit - \printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}% - \newunit - \printfield{volumes}% - \clearfield{volumes}}}% + {\usebibmacro{edition}}}% {}% \newunit\newblock \usebibmacro{part+editor+translator}% @@ -1590,30 +1409,15 @@ \newcunit \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes}% - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{bybookauthor}% \usebibmacro{editorpunct} \usebibmacro{byeditor+others}% \newcunit\newblock - \usebibmacro{chap+pag}% - \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \printfield{chapter}% + \newcunit\newblock + \usebibmacro{volume+pages}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -1646,9 +1450,11 @@ \newunit% 16th ed. \usebibmacro{byauthor}% \newunit\newblock - \usebibmacro{ser+num}% - \newunit\newblock \printfield{type}% + \newcunit + \printfield{series}% + \setunit{\addnbspace}% + \printfield{number}% \newunit \printfield{note}% \newunit\newblock @@ -1685,10 +1491,12 @@ \setunit{\addspace}% \usebibmacro{language+transtitle}% \newunit\newblock% + \usebibmacro{part+editor+translator}% + \newunit\newblock% \usebibmacro{issuetitle}% \setunit*{\addcomma\addspace}% \usebibmacro{byeditor+others}% - \newunit\newblock + \usebibmacro{editorpunct}%\newunit\newblock \printfield{note}% \setunit*{\addcomma\addspace}\newblock% \iffieldequalstr{entrysubtype}{magazine} @@ -1723,15 +1531,7 @@ \iffieldundef{maintitle}% {\iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newunit - \printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}% - \newunit - \printfield{volumes}% - \clearfield{volumes}}}% + {\usebibmacro{edition}}}% {}% \newcunit \usebibmacro{bybookauthor}% @@ -1742,26 +1542,11 @@ \newcunit% \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \usebibmacro{editorpunct}% \usebibmacro{byeditor+others}% \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -1870,17 +1655,7 @@ {\setunit{\addcomma\addspace}}% \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newunit% unit, not cunit? \usebibmacro{bybookauthor}% \usebibmacro{byeditor+others}% @@ -1907,14 +1682,7 @@ \newcunit \printfield{maintitleaddon}}} \newcunit\newblock - \printfield{pages}% - \newunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit - \printfield{volumes}% + \usebibmacro{volume+pages}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -1947,35 +1715,51 @@ \iffieldundef{urlyear} {} {\printurldate}% Date fix - \newunit\newblock + \iffieldundef{addendum}% Punctuation fixes in 0.9.9c + {\newunit\newblock}% + {\newcunit\newblock}% \iftoggle{cms@doionly}% {\iffieldundef{doi}% {}% {\printfield{doi}% + \setunit*{\addperiod\addspace}\newblock% \clearfield{url}}}% {\iftoggle{cms@doi}% - {\printfield{doi}}% + {\printfield{doi}% + \setunit*{\addperiod\addspace}\newblock}% {}}% - \newunit\newblock \iftoggle{cms@eprint}% - {\usebibmacro{eprint}}% + {\usebibmacro{eprint}% + \setunit*{\addperiod\addspace}\newblock}% {}% - \newunit\newblock \iftoggle{cms@url}% {\printfield{url}}% {}}% -\newbibmacro*{bibpostxref}{% - \iffieldundef{postnote}% - {\iffieldundef{chapter}% - {\iffieldundef{pages}% - {}% - {\postnotedelim% Extra space? - \printfield{pages}}}% - {\postnotedelim% - \printfield{chapter}}}% - {\postnotedelim% - \printfield{postnote}}} +\newbibmacro*{volume+pages}{% Volume fix + \iffieldundef{maintitle}% + {\iffieldundef{volume}% + {\printfield{pages}% + \newunit% + \printfield{volumes}}% + {\iffieldundef{part}% + {\iffieldundef{pages}% + {}% + {\ifthenelse{\iffieldnums{pages}\AND% + \iffieldundef{bookpagination}}% + {\printfield[default]{volume}% + \addcolon% + \printfield{pages}}% + {\printfield{volume}% + \addcomma\addspace% + \printfield{pages}}}}% + {\printfield{volume}% + \printfield{part}% + \newcunit% + \printfield{pages}}}}% + {\printfield{pages}% + \newunit% + \printfield{volumes}}}% \newbibmacro*{mtitle+mstitle+vol+part+title+stitle}{% \iffieldundef{maintitle} @@ -2037,7 +1821,10 @@ not togl {cms@switchdates} }% {\iffieldundef{number}% - {\setunit{\addcolon}\printfield{pages}}% + {\iffieldundef{bookpagination}% + {\setunit{\addcolon}}% + {\setunit{\addcolon\addspace}}% + \printfield{pages}}% {\newcunit\printfield{pages}}}% {\setunit{\addspace}% \printtext[parens]{% @@ -2059,7 +1846,10 @@ not togl {cms@switchdates} }% {\iffieldundef{number}% - {\setunit{\addcolon}\printfield{pages}}% + {\iffieldundef{bookpagination}% + {\setunit{\addcolon}}% + {\setunit{\addcolon\addspace}}% + \printfield{pages}}% {\newcunit\printfield{pages}}}% {\setunit{\addspace}% \printtext[parens]{% 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 bd39d98c705..a1095a10057 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.40 2012/12/06 11:58:41 dfussner Exp $ +% $Id: chicago-notes.cbx,v 0.9.7.55 2013/03/12 12:07:30 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}[2012/12/06 v 2.4 biblatex citation style] +\ProvidesFile{chicago-notes.cbx}[2013/03/12 v 2.5 biblatex citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -267,8 +267,8 @@ {\global\toggletrue{cms@shortnote}% \global\toggletrue{cms@fullnote}% \usebibmacro{cite:short}% - \usebibmacro{fullpostnote}% - \usebibmacro{cite:save}}}% + \usebibmacro{crossref:volume+postnote}% + \usebibmacro{cite:save}}}% {\global\togglefalse{cms@shortnote}% \global\togglefalse{cms@fullnote}% \usebibmacro{cite:shorthand}% @@ -276,7 +276,7 @@ {\iftoggle{cms@allshort}% {\global\toggletrue{cms@shortnote}% \usebibmacro{cite:short}% - \usebibmacro{fullpostnote}% + \usebibmacro{crossref:volume+postnote}% \usebibmacro{cite:save}}% {\global\toggletrue{cms@fullnote}% \usebibmacro{cite:crossfull}% @@ -394,7 +394,11 @@ {\toggletrue{cms@fullnote}% \togglefalse{cms@shortnote}% \setunit{\addspace}% - \printfield[jourvol]{volume}\setunit{\addcolon}}}}} + \printfield[jourvol]{volume}% + \ifthenelse{\iffieldundef{pagination}\AND% + \iffieldundef{bookpagination}}% + {\setunit{\addcolon}}% + {\setunit{\addcolon\addspace}}}}}} %%%% Citation Commands, internal and external %%%% @@ -434,7 +438,7 @@ \togglefalse{cms@fullnote}% \usebibmacro{cite:short}} {} - {} + {\usebibmacro{crossref:volume+postnote}}% Volume fix \DeclareCiteCommand*{\cite} {\usebibmacro{cite:init}% @@ -636,6 +640,8 @@ \setunit{\addspace}% \usebibmacro{language+transtitle}% \setunit{\addcomma\addspace}%\newblock% + \usebibmacro{cpart+editor+translator}% + \newcunit% \usebibmacro{issuetitle}% \setunit{\addcomma\addspace}% \usebibmacro{cbyeditor+others}% @@ -666,6 +672,8 @@ \setunit{\addcomma\addspace}% \usebibmacro{byauthor}% \setunit{\addcomma\addspace}% + \usebibmacro{cpart+editor+translator}% + \newcunit% \usebibmacro{issuetitle}% \setunit{\addcomma\addspace}% \usebibmacro{cbyeditor+others}% @@ -711,9 +719,9 @@ \usebibmacro{institution+organization}% \newcunit\newblock \printlist{location}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{cite+doi+url}% \newcunit\newblock @@ -739,17 +747,7 @@ \newcunit \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{bybookauthor}% \usebibmacro{cbyeditor+others}% @@ -775,12 +773,7 @@ \newcunit \printfield{maintitleaddon}}} \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock @@ -815,15 +808,7 @@ \iffieldundef{maintitle}% {\iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}% - \newcunit - \printfield{volumes}% - \clearfield{volumes}}}% + {\usebibmacro{edition}}}% {}% \newcunit \usebibmacro{byauthor}% @@ -834,26 +819,11 @@ \newcunit\newblock \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{cbyeditor+others}% \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock @@ -863,12 +833,12 @@ \iftoggle{cms@bookpages}% {}% {\clearfield{pages}}% + \newcunit\newblock + \usebibmacro{caddendum}% \usebibmacro{fullpostnote}% \newcunit\newblock \printlist[][-\value{listtotal}]{lista}% \newcunit\newblock - \usebibmacro{caddendum}% - \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% {}% @@ -895,36 +865,21 @@ \newcunit \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{bybookauthor}% \usebibmacro{cbyeditor+others}% \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock \usebibmacro{cnotefield}% \newcunit\newblock \usebibmacro{cpubl+loc+year}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% @@ -949,9 +904,9 @@ \setunit{\addspace}\newblock% \printtext[parens]{% \usebibmacro{howpubl+loc+year}}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{cite+doi+url}% \newcunit\newblock @@ -970,35 +925,20 @@ \newcunit\newblock \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{cbytranslator+others}% \newcunit\newblock - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock \usebibmacro{cnotefield}% \newcunit\newblock \usebibmacro{cpubl+loc+year}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% @@ -1010,40 +950,40 @@ \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 - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{bybookauthor}% \usebibmacro{cbyeditor+others}% \newcunit\newblock - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock \usebibmacro{cnotefield}% \newcunit\newblock \usebibmacro{cpubl+loc+year}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% @@ -1087,9 +1027,9 @@ \usebibmacro{institution+organization}% \newcunit\newblock \printlist{location}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{cite+doi+url}% \newcunit\newblock @@ -1116,36 +1056,21 @@ \newcunit \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{bybookauthor}% \usebibmacro{cbyeditor+others}% \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock \usebibmacro{cnotefield}% \newcunit\newblock \usebibmacro{cpubl+loc+year}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% @@ -1178,36 +1103,21 @@ \newcunit \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{bybookauthor}% \usebibmacro{cbyeditor+others}% \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock \usebibmacro{cnotefield}% \newcunit\newblock \usebibmacro{cpubl+loc+year}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% @@ -1221,6 +1131,7 @@ {\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. \usebibmacro{xrefpostnote}% @@ -1229,6 +1140,7 @@ {\addspace\bibsentence}% new chapter citing system. {\setunit{\addspace\bibsentence}}}% {\addcomma\addspace}% + \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \xrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% @@ -1254,12 +1166,7 @@ \usebibmacro{cms-in:}% \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% \newcunit\newblock - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock @@ -1267,9 +1174,9 @@ \setunit{\addspace}\newblock% \printtext[parens]{% \usebibmacro{org+publ+loc+year}}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% @@ -1283,6 +1190,7 @@ {\addspace\bibsentence}% new chapter citing system. {\setunit{\addspace\bibsentence}}}% See incollection {\addcomma\addspace}% + \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \xrefcite{\thefield{xref}}% \usebibmacro{xrefpostnote}% @@ -1291,6 +1199,7 @@ {\addspace\bibsentence}% new chapter citing system. {\setunit{\addspace\bibsentence}}}% {\addcomma\addspace}% + \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \xrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% @@ -1303,15 +1212,7 @@ \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}% {\iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}% - \newcunit - \printfield{volumes}% - \clearfield{volumes}}}% + {\usebibmacro{edition}}}% {}% \newcunit \usebibmacro{cpart+editor+translator}% @@ -1321,33 +1222,20 @@ \newcunit \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{bybookauthor}% \usebibmacro{cbyeditor+others}% \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock \usebibmacro{cnotefield}% \newcunit\newblock \usebibmacro{cpubl+loc+year}% + \newcunit\newblock + \usebibmacro{caddendum}% \usebibmacro{inreffullpostnote}% \newcunit\newblock%setunit{\addspace}% 16th ed \ifnameundef{author}% @@ -1357,8 +1245,6 @@ \addspace% \printnames{author}}}% \newcunit\newblock - \usebibmacro{caddendum}% - \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% {}% @@ -1390,36 +1276,21 @@ \newcunit \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{bybookauthor}% \usebibmacro{cbyeditor+others}% \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock \usebibmacro{cnotefield}% \newcunit\newblock \usebibmacro{cpubletter+loc+year}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% @@ -1432,7 +1303,8 @@ {\ifterm{\iffieldundef{chapter}% New test needed to cope with {\addspace\bibsentence}% new chapter citing system. {\setunit{\addspace\bibsentence}}}% - {\addcomma\addspace}% + {\addcomma\addspace}% + \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \xrefcite{\thefield{xref}}% \usebibmacro{xrefpostnote}% @@ -1441,6 +1313,7 @@ {\addspace\bibsentence}% new chapter citing system. {\setunit{\addspace\bibsentence}}}% {\addcomma\addspace}% + \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \xrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% @@ -1466,9 +1339,9 @@ \setunit{\addspace}\newblock% \printtext[parens]{% \usebibmacro{org+publ+loc+year}}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% @@ -1516,9 +1389,9 @@ {\newcunit\newblock \usebibmacro{date}}% {}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{cite+doi+url}% \newcunit\newblock @@ -1544,17 +1417,7 @@ \newcunit \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{bybookauthor}% \usebibmacro{cbyeditor+others}% @@ -1580,12 +1443,7 @@ \newcunit \printfield{maintitleaddon}}} \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \printfield{version}% \newcunit\newblock @@ -1608,10 +1466,10 @@ \printfield{type}% \usebibmacro{fullpostnote}% \newcunit\newblock - \usebibmacro{pubstate}% 16th ed. - \newcunit\newblock \usebibmacro{caddendum}% \newcunit\newblock + \usebibmacro{pubstate}% 16th ed. + \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{iswc}}% {}% @@ -1638,6 +1496,7 @@ \usebibmacro{cnotefield}% \setunit{\addcomma\addspace} \usebibmacro{date}% + \usebibmacro{fullpostnote}% \setunit{\addcomma\addspace}% \iffieldundef{urlyear}% {}% @@ -1653,7 +1512,6 @@ \usebibmacro{eprint}% \newcunit\newblock \printfield{url}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% \newcunit\newblock @@ -1768,12 +1626,7 @@ \newcunit \usebibmacro{cmtitle+mstitle+vol+part+title+stitle}% \newcunit\newblock - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock @@ -1781,9 +1634,9 @@ \setunit{\addspace}\newblock% \printtext[parens]{% \usebibmacro{org+publ+loc+year}}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% @@ -1801,15 +1654,7 @@ \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}% {\iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}% - \newcunit - \printfield{volumes}% - \clearfield{volumes}}}% + {\usebibmacro{edition}}}% {}% \newcunit \usebibmacro{cpart+editor+translator}% @@ -1819,36 +1664,21 @@ \newcunit \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{bybookauthor}% \usebibmacro{cbyeditor+others}% \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock \usebibmacro{cnotefield}% \newcunit\newblock \usebibmacro{cpubl+loc+year}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% @@ -1868,18 +1698,20 @@ \usebibmacro{citaltitle+stitle}% \newcunit \usebibmacro{byauthor}% - \newcunit\newblock - \usebibmacro{cser+num}% - \newcunit\newblock + \newcunit% \printfield{type}% \newcunit + \printfield{series}% + \setunit{\addnbspace}% + \printfield{number}% + \newcunit% \usebibmacro{cnotefield}% \setunit{\addspace}\newblock% - \printtext[parens]{% + \printtext[parens]{% \usebibmacro{inst+loc+year}}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isrn}}% @@ -1908,6 +1740,8 @@ \setunit{\addspace}% \usebibmacro{language+transtitle}% \setunit{\addcomma\addspace}%\newblock% + \usebibmacro{cpart+editor+translator}% + \newcunit% \usebibmacro{issuetitle}% \setunit{\addcomma\addspace}% \usebibmacro{cbyeditor+others}% @@ -1943,15 +1777,7 @@ \iffieldundef{maintitle}% {\iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}% - \newcunit - \printfield{volumes}% - \clearfield{volumes}}}% + {\usebibmacro{edition}}}% {}% \newcunit \usebibmacro{bybookauthor}% @@ -1960,26 +1786,11 @@ \newcunit \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{cbyeditor+others}% \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock @@ -1987,9 +1798,9 @@ \newcunit\newblock \usebibmacro{cpubl+loc+year}% \clearfield{pages}% ?? For 16th ed. - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% @@ -2020,9 +1831,9 @@ \setunit{\addspace}% \printtext[parens]{% \usebibmacro{type+inst+year}}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{cite+doi+url}% \newcunit\newblock @@ -2049,9 +1860,9 @@ \printlist{location}% \newcunit\newblock \usebibmacro{date}}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{cite+doi+url}% \newcunit\newblock @@ -2077,17 +1888,7 @@ \newcunit \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{bybookauthor}% \usebibmacro{cbyeditor+others}% @@ -2113,12 +1914,7 @@ \newcunit \printfield{maintitleaddon}}} \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock @@ -2289,7 +2085,7 @@ \DeclareFieldFormat{pages}{% \iffieldundef{bookpagination}% {#1\isdot}% - {\mkpageprefix[bookpagination]{#1\isdot}}} + {\mkpageprefix[bookpagination]{#1}}} \DeclareFieldFormat{edlang}{% \ifbibstring{#1} @@ -2438,6 +2234,14 @@ {\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} @@ -2773,7 +2577,7 @@ %%%% Formatting macros, called both by cbx and bbx %%%% \newbibmacro*{finentry}{%{\finentry} To make annotated bibliography - \togglefalse{cms@switchdates} + \togglefalse{cms@switchdates}% \ifbibliography {\usebibmacro{entrytail}} {}% @@ -2781,7 +2585,7 @@ \newbibmacro*{entrytail}{% From reading.bbx, for annotated bibliography \newunit\newblock - \iftoggle{cms@annotation} + \iftoggle{cms@annotation}% {\usebibmacro{annotation}% \newunit\newblock} {}}% @@ -2817,12 +2621,13 @@ \newcunit\newblock}}} \newbibmacro*{editorpunct}{% - \ifthenelse{\(\iffieldundef{booktitle}\AND\iffieldundef{maintitle}\)% + \ifthenelse{\(\iffieldundef{booktitle}\AND% + \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 {\newcunit\newblock}% to treat italicized title as booktitle in - {\newunit\newblock}}% available examples. + {\newunit\newblock}}% available examples. Added issuetitle 0.9.9c. {\newcunit\newblock}} \newbibmacro*{edition}{% @@ -3218,14 +3023,9 @@ \printfield{titleaddon}% }%\newcunit\newblock} -\renewcommand*{\subtitlepunct}{% - \ifpunctmark{?}{\setunit{\addspace}}{\setunit{\addcolon\addspace}}} - \newbibmacro*{cmag+news+title}{% \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work) \printfield[noformat]{title}% -% \ifpunctmark{?}{\setunit{\addcolon\addspace}{\addspace}}% -% \subtitlepunct \setunit{\addcolon\addspace}% \printfield[noformat]{subtitle}}% \setunit{\addcomma\addspace}% @@ -3417,7 +3217,10 @@ not togl {cms@switchdates} }% {\iffieldundef{number}% - {\setunit{\addcolon}}% + {\ifthenelse{\iffieldundef{pagination}\AND% + \iffieldundef{bookpagination}}% + {\setunit{\addcolon}}% + {\setunit{\addcolon\addspace}}}% {\addcomma\addspace}}% {\setunit{\addspace}% \printtext[parens]{% parens is the default here @@ -3437,7 +3240,10 @@ not togl {cms@switchdates} }% {\iffieldundef{number}% - {\setunit{\addcolon}}% + {\ifthenelse{\iffieldundef{pagination}\AND% + \iffieldundef{bookpagination}}% + {\setunit{\addcolon}}% + {\setunit{\addcolon\addspace}}}% {\addcomma\addspace}}% {\setunit{\addspace}% \printtext[parens]{% parens is the default here @@ -3689,7 +3495,7 @@ {\usebibmacro{btitle+bstitle}}% \newcunit% need this? \iffieldundef{maintitle} - {} + {}% {\iffieldundef{volume} {\printtext[maintitle]{% \printfield[noformat]{maintitle}% @@ -3734,11 +3540,15 @@ \newcunit \printfield{maintitleaddon}}}} -\newbibmacro{cite:postnote}{% +\newbibmacro*{cite:postnote}{% \iftoggle{cms@loccit}% {}% {\usebibmacro{postnote}}} +\newbibmacro*{semel:postnote}{% Fix to print postnote only once + \printfield{postnote}% + \global\let\abx@field@postnote\undefined} + \renewbibmacro*{postnote}{% \iftoggle{cms@fullnote}% {\global\togglefalse{cms@shortnote}% @@ -3755,12 +3565,12 @@ \global\togglefalse{cms@fullnote}}} {\iffieldundef{shorthand} {\postnotedelim% - \printfield{postnote}% + \usebibmacro{semel:postnote}% \global\togglefalse{cms@printshhand}% \global\togglefalse{cms@shortnote}% \global\togglefalse{cms@fullnote}} {\postnotedelim% - \printfield{postnote}% + \usebibmacro{semel:postnote}% \usebibmacro{cms:shorthandintro}% \global\togglefalse{cms@printshhand}% \global\togglefalse{cms@shortnote}% @@ -3769,7 +3579,7 @@ {\global\togglefalse{cms@shortnote}% \global\togglefalse{cms@fullnote}} {\postnotedelim% - \printfield{postnote}% + \usebibmacro{semel:postnote}% \global\togglefalse{cms@shortnote}% \global\togglefalse{cms@fullnote}}}}}% @@ -3782,8 +3592,120 @@ \printfield{pages}}}% {\postnotedelim% \printfield{chapter}}}% - {\postnotedelim% - \printfield{postnote}}} + {\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}}}% + {\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}}}}% + {\ifcsdef{cbx@incollpages}% + {\restorefield{pages}{\cbx@incollpages}% + \usebibmacro{fullpostnote}}% + {\usebibmacro{fullpostnote}}}}% + {\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}}}% + {\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}}}}}% \newbibmacro*{inreffullpostnote}{% \iffieldundef{postnote}% @@ -3796,19 +3718,22 @@ {\postnotedelim% \printfield{chapter}}}% {\postnotedelim% - \printfield{postnote}}} - -\newbibmacro*{xrefpostnote}{% Only for crossrefed (or xrefed) InCollection, - \iffieldundef{postnote}% InProceedings, or CustomA entries - {\iffieldundef{chapter}% - {\iffieldundef{pages}% - {}% - {\addcomma\addspace% - \printfield{pages}}}% - {\addcomma\addspace% - \printfield{chapter}}}% - {}}% The postnote field already shows up because of the fullpostnote - % call. + \usebibmacro{semel:postnote}}} + +\newbibmacro*{xrefprenote}{% + \iffieldundef{volume}{}{\savefield{volume}{\cbx@incollvol}}% + \iffieldundef{pages}{}{\savefield{pages}{\cbx@incollpages}}% + \iffieldundef{part}{}{\savefield{part}{\cbx@incollpart}}% + \iffieldundef{pagination}{}{\savefield{pagination}{\cbx@incollpgn}}% + \iffieldundef{bookpagination}{}{\savefield{bookpagination}% + {\cbx@incollbkpgn}}} + +\newbibmacro*{xrefpostnote}{% + \global\let\cbx@incollvol\undefined% Volume fix + \global\let\cbx@incollpages\undefined% + \global\let\cbx@incollpart\undefined% + \global\let\cbx@incollpgn\undefined% + \global\let\cbx@incollbkpgn\undefined} \newbibmacro*{hlprenote}{% Removes spurious comma after prenote in \iffieldundef{prenote}% \headlessfullnote citations. 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 4835b7cb453..37eb9e735d2 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.30 2012/12/06 12:04:24 dfussner Exp $ +% $Id: cms-american.lbx,v 0.10.1.31 2013/03/14 16:42:23 dfussner Exp $ -\ProvidesFile{cms-american.lbx}[2012/12/06 v 2.4 biblatex localization] +\ProvidesFile{cms-american.lbx}[2013/03/14 v 2.5 biblatex localization] \InheritBibliographyExtras{american} @@ -13,7 +13,7 @@ \protected\def\mkbibrangeterse{% \lbx@cms@mkbibrangetrunc@short{short}}% \protected\def\mkbibrangefull{% - \lbx@cms@mkbibrangefull}} + \lbx@cms@mkbibrangefull}}% \UndeclareBibliographyExtras{% \restorecommand\mkbibrangecomp% 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 cb4b5511806..0b7949341bd 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.4 2012/12/06 12:10:09 dfussner Exp $ +% $Id: cms-british.lbx,v 0.5 2013/03/14 16:44:04 dfussner Exp $ -\ProvidesFile{cms-british.lbx}[2012/12/06 v 2.4 biblatex localization] +\ProvidesFile{cms-british.lbx}[2013/03/14 v 2.5 biblatex localization] \InheritBibliographyExtras{british} @@ -15,7 +15,7 @@ \protected\def\mkbibrangeterse{% \lbx@cms@mkbibrangetrunc{short}}% \protected\def\mkbibrangefull{% - \lbx@cms@mkbibrangefull} + \lbx@cms@mkbibrangefull}% \def\cms@datelong{\printorigdate}% \def\cms@datelongalt{\printdate}}% diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx new file mode 100644 index 00000000000..5bec9bfff6b --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx @@ -0,0 +1,869 @@ +% $Id: cms-finnish.lbx,v 0.3 2013/03/14 16:43:14 dfussner Exp $ + +\ProvidesFile{cms-finnish.lbx}[2013/03/14 v 2.5 biblatex localization] + +% STATUS OF THIS FILE +% - Translated by a native speaker (Antti-Juhani Kaijanaho). +% - Depends on finnish.lbx from the biblatex project +% - Many bibstrings remain untranslated, or commented out -- all +% contributions gratefully received. + +\InheritBibliographyExtras{finnish} + +\DeclareBibliographyExtras{% + \savecommand\mkbibrangecomp + \savecommand\mkbibrangeterse + \savecommand\mkbibrangefull + \savecommand\lbx@fromlang + \savecommand\lbx@lfromlang + \savecommand\lbx@sfromlang + \savecommand\cms@datelong + \savecommand\cms@datelongalt + \def\lbx@fromlang{% + \iffieldundef{userf} + {\iffieldundef{origlanguage} + {}% Removed \unspace here, following german.lbx + {\bibstring{from\thefield{origlanguage}}\addspace}}% + {}}% Removed \unspace here, as above. + \def\lbx@lfromlang{% + \iffieldundef{userf} + {\iffieldundef{origlanguage} + {}% + {\bibstring{from\thefield{origlanguage}}\addspace}}% + {}}% + \def\lbx@sfromlang{% + \iffieldundef{userf} + {\iffieldundef{origlanguage} + {}% + {\bibstring{from\thefield{origlanguage}}\addspace}}% + {}}% + \def\cms@datelong{\printorigdate}% + \def\cms@datelongalt{\printdate}% + \protected\def\mkbibrangecomp{% DATE FIX + \lbx@cms@mkbibrangetrunc{long}}% + \protected\def\mkbibrangeterse{% + \lbx@cms@mkbibrangetrunc{short}}% + \protected\def\mkbibrangefull{% + \lbx@cms@mkbibrangefull}}% + +\UndeclareBibliographyExtras{% + \restorecommand\lbx@fromlang + \restorecommand\cms@datelong + \restorecommand\cms@datelongalt + \restorecommand\mkbibrangecomp% DATE FIX + \restorecommand\mkbibrangeterse% + \restorecommand\mkbibrangefull} + +\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{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} +\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 = {finnish}, + 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}}, + by = {{kirjoittanut}{kirjoittanut}}, + % of = {{of}{of}}, + on = {{levyll\"a}{levyll\"a}}, + % compiler = {{comp\adddot}{comp\adddot}}, + % compilers = {{comps\adddot}{comps\adddot}}, + % transcompiler = {{trans\adddot\addspace and comp\adddot}% + % {trans\adddot\addspace and comp\adddot}}, + % transcompilers = {{trans\adddot\addspace and comps\adddot}% + % {trans\adddot\addspace and comps\adddot}}, + % editortranscompiler = {{ed\adddot\addcomma\addspace + % trans\adddot\addcomma\addspace and comp\adddot}% + % {ed\adddot\addcomma\addspace + % trans\adddot\addcomma\addspace and comp\adddot}}, + % editorcompiler = {{ed\adddot\addspace and comp\adddot}% + % {ed\adddot\addspace and comp\adddot}}, + % editortranslator = {{ed\adddot\addspace and trans\adddot}% + % {ed\adddot\addspace and trans\adddot}}, + % editortranscompilers = {{eds\adddot\addcomma\addspace + % trans\adddot\addcomma\addspace and comps\adddot}% + % {eds\adddot\addcomma\addspace + % trans\adddot\addcomma\addspace and comps\adddot}}, + % editorcompilers = {{eds\adddot\addspace and comps\adddot}% + % {eds\adddot\addspace and comps\adddot}}, + % editortranslators = {{eds\adddot\addspace and trans\adddot}% + % {eds\adddot\addspace and trans\adddot}}, + conductor = {{joht\adddot}{joht\adddot}}, + conductors = {{johtt\adddot}{johtt\adddot}}, + % director = {{dir\adddot}{dir\adddot}}, + % directors = {{dirs\adddot}{dirs\adddot}}, + none = {{}{}}, + nones = {{}{}}, + % producer = {{prod\adddot}{prod\adddot}}, + % producers = {{prods\adddot}{prods\adddot}}, + % editor = {{toim\adddot}{toim\adddot}}, + % editors = {{toimm\adddot}{toimm\adddot}}, + % ibidem = {{ibid\adddot}{ibid\adddot}}, + origpub = {{alkuper\"ainen julkaisu\addspace}% + {alkup\adddot\ julk\adddot\ as\addspace}}, + % origpublin = {{originally published in\addspace}% + % {orig\adddot\ pub\adddot\addspace in\addspace}}, + origpubyear = {{alun perin julkaistu vuonna\addspace}% + {alkup\addot\ julk\addot\addspace}}, + origpubyearalt = {{ensipainos vuodelta\addspace}% + {ensip\adddot\addspace}}, + % origreleaseyear = {{originally released in\addspace}% + % {orig\adddot\ released\addspace}}, + % origshownyear = {{originally shown in\addspace}% + % {orig\adddot\ shown\addspace}}, + origedition ={{laitos\addcolon\addspace}% + {laitos\addcolon\addspace}}, + revisededition = {{uud\adddot\addspace p\adddot}% + {uud\adddot\addspace p\adddot}}, + broadcast = {{l\"ahetetty}{l\"ahetetty}}, + recorded = {{taltioitu}{taltioitu}}, + numbers = {{not\adddot}{not\adddot}}, + nodate = {{{}n\adddot d\adddot}{{}n\adddot d\adddot}}, + pseudonym = {{salanimi}{salan\adddot}}, + patentfiled = {{haettu}{haettu}}, + patentissued = {{my\"onnetty}{my\"onnetty}}, + inlang = {{kielell\"a\addspace}{kielell\"a\addspace}}, + % langrussian = {{Russian}{Russian}}, + % fromrussian = {{from the Russian}{from the Russian}} + % edamerican = {{American}{American}}, + % edbrazilian = {{Brazilian}{Brazilian}}, + % eddanish = {{Danish}{Danish}}, + % eddutch = {{Dutch}{Dutch}}, + % edenglish = {{English}{English}}, + % edfrench = {{French}{French}}, + % edgerman = {{German}{German}}, + edgreek = {{kreikankielinen}{kreikankielinen}}, + % editalian = {{Italian}{Italian}}, + % edlatin = {{Latin}{Latin}}, + % ednorwegian = {{Norwegian}{Norwegian}}, + % edportuguese = {{Portuguese}{Portuguese}}, + % edrussian = {{Russian}{Russian}} + % edspanish = {{Spanish}{Spanish}}, + % edswedish = {{Swedish}{Swedish}}, + % translator = {{trans\adddot}{trans\adddot}}, + % translators = {{trans\adddot}{trans\adddot}}, + % redactor = {{red\adddot}{red\adddot}}, + % redactors = {{reds\adddot}{reds\adddot}}, + % founder = {{found\adddot}{found\adddot}}, + % founders = {{found\adddot}{found\adddot}}, + % continuator = {{cont\adddot}{cont\adddot}}, % ? + % continuators = {{cont\adddot}{cont\adddot}}, % ? + % collaborator = {{collab\adddot}{collab\adddot}}, % ? + % collaborators = {{collab\adddot}{collab\adddot}}, % ? + % annotator = {{annot\adddot}{annot\adddot}}, + % annotators = {{annot\adddot}{annot\adddot}}, + % review = {{review}{review}}, + reviewof = {{arvio teoksesta}{arvio teoksesta}}, + % reprint = {{reprint}{repr\adddot}}, + % shorthands = {{Abbreviations}{Abbreviations}}, + % newseries = {{n\adddot s\adddot}{n\adddot s\adddot}}, + % urlseen = {{accessed}{accessed}}, + % cbynone = {{}{}}, + % cbyauthor = {{by}{by}}, + % cbyeditor = {{ed\adddot}{ed\adddot}}, + % cbytranslator = {{trans\adddot\addspace\lbx@cfromlang}% + % {trans\adddot\addspace\lbx@cfromlang}}, + % cbycompiler = {{comp\adddot}{comp\adddot}}, + % cbyredactor = {{red\adddot}{red\adddot}}, + % cbycommentator = {{comm\adddot}{comm\adddot}}, + % cbyannotator = {{annot\addot}{annot\addot}}, + % cbyfounder = {{found\adddot}{found\adddot}}, + % cbycontinuator = {{cont\adddot}{cont\adddot}}, + % cbycollaborator = {{in collab\adddotspace with}% + % {in collab\adddotspace with}}, + % cbyconductor = {{johtaa}{joht\adddot}}, + % cbydirector = {{dir\adddot}{dir\adddot}}, + % cbyproducer = {{prod\adddot}{prod\adddot}}, + % cbyeditortr = {{ed\adddot\space and + % trans\adddot\addspace\lbx@cfromlang}% + % {ed\adddot\space and trans\adddot\addspace\lbx@cfromlang}}, + % cbyeditorcp = {{ed\adddot\space and comp\adddot}% + % {ed\adddot\space and comp\adddot}}, + % cbyeditorco = {{ed\adddot\space and comm\adddot}% + % {ed\adddot\space and comm\adddot}}, + % cbyeditoran = {{ed\adddot\space and annot\adddot}% + % {ed\adddot\space and annot\adddot}}, + % cbyeditorin = {{ed.,\addabbrvspace with an introduction by}% + % {ed.,\addabbrvspace with an introduction by}}, + % cbyeditorfo = {{ed.,\addabbrvspace with a foreword by}% + % {ed.,\addabbrvspace with a foreword by}}, + % cbyeditoraf = {{ed.,\addabbrvspace with an afterword by}% + % {ed.,\addabbrvspace with an afterword by}}, + % cbyeditortrcp = {{ed.,\addabbrvspace trans.\addspace\lbx@fromlang, and + % comp\adddot}% + % {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, and comp\adddot}}, + % cbyeditortrco = {{ed.,\addabbrvspace + % trans\adddot\addspace\lbx@fromlang\finalandcomma\space and + % comm\adddot}% + % {ed.,\addabbrvspace + % trans\adddot\addspace\lbx@fromlang\finalandcomma\space and comm\adddot}}, + % cbyeditortran = {{ed.,\addabbrvspace + % trans\adddot\addspace\lbx@fromlang\finalandcomma\space and + % annot\adddot}% + % {ed.,\addabbrvspace + % trans\adddot\addspace\lbx@fromlang\finalandcomma\space and annot\adddot}}, + % cbyeditortrin = {{ed\adddot\space and trans.\addspace\lbx@fromlang, with + % an introduction by}% + % {ed\adddot\space and trans.\addspace\lbx@fromlang, with + % an introduction by}}, + % cbyeditortrfo = {{ed\adddot\space and trans.\addspace\lbx@fromlang, with + % a foreword by}% + % {ed\adddot\space and trans.\addspace\lbx@fromlang, with + % a foreword by}}, + % cbyeditortraf = {{ed\adddot\space and trans.\addspace\lbx@fromlang, with + % an afterword by}% + % {ed\adddot\space and trans.\addspace\lbx@fromlang, with + % an afterword by}}, + % cbyeditorcpco = {{ed.,\addabbrvspace comp., and comm\adddot}% + % {ed.,\addabbrvspace comp., and comm\adddot}}, + % cbyeditorcpan = {{ed.,\addabbrvspace comp., and annot\adddot}% + % {ed.,\addabbrvspace comp., and annot\adddot}}, + % cbyeditorcpin = {{ed\adddot\space and comp., with an introduction + % by}% + % {ed\adddot\space and comp., with an introduction by}}, + % cbyeditorcpfo = {{ed\adddot\space and comp., with a foreword by}% + % {ed\adddot\space and comp., with a foreword by}}, + % cbyeditorcpaf = {{ed\adddot\space and comp., with an afterword by}% + % {ed\adddot\space and comp., with an afterword by}}, + % cbyeditorcpcoin = {{ed.,\addabbrvspace comp., and comm., with an + % introduction by}% + % {ed.,\addabbrvspace comp., and comm., with an introduction by}}, + % cbyeditorcpcofo = {{ed.,\addabbrvspace comp., and comm., with a + % foreword by}% + % {ed.,\addabbrvspace comp., and comm., with a foreword by}}, + % cbyeditorcpcoaf = {{ed.,\addabbrvspace comp., and comm., with an + % afterword by}% + % {ed.,\addabbrvspace comp., and comm., with an afterword by}}, + % cbyeditorcpanin = {{ed.,\addabbrvspace comp., and annot., with an + % introduction by}% + % {ed.,\addabbrvspace comp., and annot., with an introduction by}}, + % cbyeditorcpanfo = {{ed.,\addabbrvspace comp., and annot., with a + % foreword by}% + % {ed.,\addabbrvspace comp., and annot., with a foreword by}}, + % cbyeditorcpanaf = {{ed.,\addabbrvspace comp., and annot., with an + % afterword by}% + % {ed.,\addabbrvspace comp., and annot., with an afterword by}}, + % cbyeditortrcpco = {{ed.,\addabbrvspace trans.\addspace\lbx@fromlang, + % comp., and comm\adddot}% + % {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, comp., + % and comm\adddot}}, + % cbyeditortrcpan = {{ed.,\addabbrvspace trans.\addspace\lbx@fromlang, + % comp., and annot\adddot}% + % {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, comp., + % and annot\adddot}}, + % cbyeditortrcpin = {{ed.,\addabbrvspace trans.\addspace\lbx@fromlang, and + % comp., with an introduction by}% + % {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, and comp., + % with an introduction by}}, + % cbyeditortrcpfo = {{ed.,\addabbrvspace trans.\addspace\lbx@fromlang, and + % comp., with a foreword by}% + % {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, and comp., + % with a foreword by}}, + % cbyeditortrcpaf = {{ed.,\addabbrvspace trans.\addspace\lbx@fromlang, and + % comp., with an afterword by}% + % {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, and comp., + % with an afterword by}}, + % cbyeditortrcpcoin = {{ed.,\addabbrvspace trans.\addspace\lbx@fromlang, + % comp., and comm., with an introduction by}% + % {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, comp., + % and comm., with an introduction by}}, + % cbyeditortrcpcofo = {{ed.,\addabbrvspace trans.\addspace\lbx@fromlang, + % comp., and comm., with a foreword by}% + % {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, comp., + % and comm., with a foreword by}}, + % cbyeditortrcpcoaf = {{ed.,\addabbrvspace trans.\addspace\lbx@fromlang, + % comp., and comm., with an afterword by}% + % {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, comp., + % and comm., with an afterword by}}, + % cbyeditortrcpanin = {{ed.,\addabbrvspace trans.\addspace\lbx@fromlang, + % comp., and annot., with an introduction by}% + % {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, comp., + % and annot., with an introduction by}}, + % cbyeditortrcpanfo = {{ed.,\addabbrvspace trans.\addspace\lbx@fromlang, + % comp., and annot., with a foreword by}% + % {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, comp., + % and annot., with a foreword by}}, + % cbyeditortrcpanaf = {{ed.,\addabbrvspace trans.\addspace\lbx@fromlang, + % comp., and annot., with an afterword by}% + % {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, comp., + % and annot., with an afterword by}}, + % cbyeditorcoin = {{ed\adddot\space and comm., with an introduction by}% + % {ed\adddot\space and comm., with an introduction by}}, + % cbyeditorcofo = {{ed\adddot\space and comm., with a foreword by}% + % {ed\adddot\space and comm., with a foreword by}}, + % cbyeditorcoaf = {{ed\adddot\space and comm., with an afterword by}% + % {ed\adddot\space and comm., with an afterword by}}, + % cbyeditoranin = {{ed\adddot\space and annot., with an introduction by}% + % {ed\adddot\space and annot., with an introduction by}}, + % cbyeditoranfo = {{ed\adddot\space and annot., with a foreword by}% + % {ed\adddot\space and annot., with a foreword by}}, + % cbyeditoranaf = {{ed\adddot\space and annot., with an afterword by}% + % {ed\adddot\space and annot., with an afterword by}}, + % cbyeditortrcoin = {{ed.,\addabbrvspace + % trans\adddot\addspace\lbx@fromlang\finalandcomma\space and comm., with + % an introduction by}% + % {ed.,\addabbrvspace + % trans\adddot\addspace\lbx@fromlang\finalandcomma\space and comm., with + % an introduction by}}, + % cbyeditortrcofo = {{ed.,\addabbrvspace + % trans\adddot\addspace\lbx@fromlang\finalandcomma\space and comm., with + % a foreword by}% + % {ed.,\addabbrvspace + % trans\adddot\addspace\lbx@fromlang\finalandcomma\space and comm., with + % a foreword by}}, + % cbyeditortrcoaf = {{ed.,\addabbrvspace + % trans\adddot\addspace\lbx@fromlang\finalandcomma\space and comm., with + % an afterword by}% + % {ed.,\addabbrvspace + % trans\adddot\addspace\lbx@fromlang\finalandcomma\space and comm., with + % an afterword by}}, + % cbyeditortranin = {{ed.,\addabbrvspace + % trans\adddot\addspace\lbx@fromlang\finalandcomma\space and annot., with + % an introduction by}% + % {ed.,\addabbrvspace + % trans\adddot\addspace\lbx@fromlang\finalandcomma\space and annot., with + % an introduction by}}, + % cbyeditortranfo = {{ed.,\addabbrvspace + % trans\adddot\addspace\lbx@fromlang\finalandcomma\space and annot., with + % a foreword by}% + % {ed.,\addabbrvspace + % trans\adddot\addspace\lbx@fromlang\finalandcomma\space and annot., with + % a foreword by}}, + % cbyeditortranaf = {{ed.,\addabbrvspace + % trans\adddot\addspace\lbx@fromlang\finalandcomma\space and annot., with + % an afterword by}% + % {ed.,\addabbrvspace + % trans\adddot\addspace\lbx@fromlang\finalandcomma\space and annot., with + % an afterword by}}, + % cbytranslatorcp = {{trans\adddot\addspace\lbx@fromlang\ and comp\adddot}% + % {trans\adddot\addspace\lbx@fromlang\ and comp\adddot}}, + % cbytranslatorco = {{trans\adddot\addspace\lbx@fromlang\ and comm\adddot}% + % {trans\adddot\addspace\lbx@fromlang\ and comm\adddot}}, + % cbytranslatoran = {{trans\adddot\addspace\lbx@fromlang\ and annot\adddot}% + % {trans\adddot\addspace\lbx@fromlang\ and annot\adddot}}, + % cbytranslatorin = {{trans\adddot\addspace\lbx@fromlang, with an + % introduction by}% + % {trans\adddot\addspace\lbx@fromlang, with an introduction by}}, + % cbytranslatorfo = {{trans\adddot\addspace\lbx@fromlang, with a + % foreword by}% + % {trans\adddot\addspace\lbx@fromlang, with a foreword by}}, + % cbytranslatoraf = {{trans\adddot\addspace\lbx@fromlang, with an + % afterword by}% + % {trans\adddot\addspace\lbx@fromlang, with an afterword by}}, + % cbytranslatorcoin = {{trans\adddot\addspace\lbx@fromlang\ and comm., + % with an introduction by}% + % {trans\adddot\addspace\lbx@fromlang\ and comm., with an introduction by}}, + % cbytranslatorcofo = {{trans\adddot\addspace\lbx@fromlang\ and comm., + % with a foreword by}% + % {trans\adddot\addspace\lbx@fromlang\ and comm., with a foreword by}}, + % cbytranslatorcoaf = {{trans\adddot\addspace\lbx@fromlang\ and comm., + % with an afterword by}% + % {trans\adddot\addspace\lbx@fromlang\ and comm., with an afterword by}}, + % cbytranslatoranin = {{trans\adddot\addspace\lbx@fromlang\ and annot., + % with an introduction by}% + % {trans\adddot\addspace\lbx@fromlang\ and annot., with an introduction by}}, + % cbytranslatoranfo = {{trans\adddot\addspace\lbx@fromlang\ and annot., + % with a foreword by}% + % {trans\adddot\addspace\lbx@fromlang\ and annot., with a foreword by}}, + % cbytranslatoranaf = {{trans\adddot\addspace\lbx@fromlang\ and annot., + % with an afterword by}% + % {trans\adddot\addspace\lbx@fromlang\ and annot., with an afterword by}}, + % cbytranslatorcpco = {{trans\adddot\addspace\lbx@fromlang, comp., and + % comm\adddot}% + % {trans\adddot\addspace\lbx@fromlang, comp., and comm\adddot}}, + % cbytranslatorcpan = {{trans\adddot\addspace\lbx@fromlang, comp., and + % annot\adddot}% + % {trans\adddot\addspace\lbx@fromlang, comp., and annot\adddot}}, + % cbytranslatorcpin = {{trans\adddot\addspace\lbx@fromlang\ and comp., + % with an introduction by}% + % {trans\adddot\addspace\lbx@fromlang\ and comp., with an introduction by}}, + % cbytranslatorcpfo = {{trans\adddot\addspace\lbx@fromlang\ and comp., + % with a foreword by}% + % {trans\adddot\addspace\lbx@fromlang\ and comp., with a foreword by}}, + % cbytranslatorcpaf = {{trans\adddot\addspace\lbx@fromlang\ and comp., + % with an afterword by}% + % {trans\adddot\addspace\lbx@fromlang\ and comp., with an afterword by}}, + % cbytranslatorcpcoin = {{trans\adddot\addspace\lbx@fromlang, comp., and + % comm., with an introduction by}% + % {trans\adddot\addspace\lbx@fromlang, comp., and comm., + % with an introduction by}}, + % cbytranslatorcpcofo = {{trans\adddot\addspace\lbx@fromlang, comp., and + % comm., with a foreword by}% + % {trans\adddot\addspace\lbx@fromlang, comp., and comm., + % with a foreword by}}, + % cbytranslatorcpcoaf = {{trans\adddot\addspace\lbx@fromlang, comp., and + % comm., with an afterword by}% + % {trans\adddot\addspace\lbx@fromlang, comp., and comm., + % with an afterword by}}, + % cbytranslatorcpanin = {{trans\adddot\addspace\lbx@fromlang, comp., and + % annot., with an introduction by}% + % {trans\adddot\addspace\lbx@fromlang, comp., and annot., + % with an introduction by}}, + % cbytranslatorcpanfo = {{trans\adddot\addspace\lbx@fromlang, comp., and + % annot., with a foreword by}% + % {trans\adddot\addspace\lbx@fromlang, comp., and annot., + % with a foreword by}}, + % cbytranslatorcpanaf = {{trans\adddot\addspace\lbx@fromlang, comp., and + % annot., with an afterword by}% + % {trans\adddot\addspace\lbx@fromlang, comp., and annot., + % with an afterword by}}, + % cbycompilerco = {{comp\adddot\space and comm\adddot}% + % {comp\adddot\space and comm\adddot}}, + % cbycompileran = {{comp\adddot\space and annot\adddot}% + % {comp\adddot\space and annot\adddot}}, + % cbycompilerin = {{comp.,\addabbrvspace with an introduction by}% + % {comp.,\addabbrvspace with an introduction by}}, + % cbycompilerfo = {{comp.,\addabbrvspace with a foreword by}% + % {comp.,\addabbrvspace with a foreword by}}, + % cbycompileraf = {{comp.,\addabbrvspace with an afterword by}% + % {comp.,\addabbrvspace with an afterword by}}, + % cbycompilercoin = {{comp\adddot\space and comm., with an + % introduction by}% + % {comp\adddot\space and comm., with an introduction by}}, + % cbycompilercofo = {{comp\adddot\space and comm., with a foreword by}% + % {comp\adddot\space and comm., with a foreword by}}, + % cbycompilercoaf = {{comp\adddot\space and comm., with an afterword by}% + % {comp\adddot\space and comm., with an afterword by}}, + % cbycompileranin = {{comp\adddot\space and annot., with an + % introduction by}% + % {comp\adddot\space and annot., with an introduction by}}, + % cbycompileranfo = {{comp\adddot\space and annot., with a foreword by}% + % {comp\adddot\space and annot., with a foreword by}}, + % cbycompileranaf = {{comp\adddot\space and annot., with an afterword by}% + % {comp\adddot\space and annot., with an afterword by}}, + volume = {{nide}{nid.\adddot}}, + volumes = {{nidett\"a}{nidd.\adddot}}, + % jourvol = {{vol\adddot}{vol\adddot}}, + % jourser = {{ser\adddot}{ser\adddot}}, + % oldseries = {{o\adddot s\adddot}{o\adddot s\adddot}}, + % edition = {{ed\adddot}{ed\adddot}}, + % page = {{p\adddot}{p\adddot}}, + % pages = {{pp\adddot}{pp\adddot}}, + % column = {{col\adddot}{col\adddot}}, + % columns = {{cols\adddot}{cols\adddot}}, + % line = {{line}{line}}, + % lines = {{lines}{lines}}, + % paragraph = {{\P}{\P}}, + % paragraphs = {{\P\P}{\P\P}}, + % section = {{\S}{\S}}, + % sections = {{\S\S}{\S\S}}, + % verse = {{v\adddot}{v\adddot}}, + % verses = {{vv\adddot}{vv\adddot}}, + % number = {{no\adddot}{no\adddot}}, + % chapter = {{chap\adddot}{chap\adddot}}, + % mathesis = {{master's thesis}{master's thesis}}, + % phdthesis = {{PhD\addabbrvspace diss\adddot}{PhD\addabbrvspace diss\adddot}}, + % techreport = {{technical report}{technical report}}, + % cfromamerican = {{from the American by}{from the American by}}, + % cfrombrazilian = {{from the Brazilian by}{from the Brazilian + % by}}, + % cfromdanish = {{from the Danish by}{from the Danish by}}, + % cfromdutch = {{from the Dutch by}{from the Dutch by}}, + % cfromenglish = {{from the English by}{from the English by}}, + % cfromfrench = {{from the French by}{from the French by}}, + % cfromgerman = {{from the German by}{from the German by}}, + % cfromgreek = {{from the Greek by}{from the Greek by}}, + % cfromitalian = {{from the Italian by}{from the Italian by}}, + % cfromlatin = {{from the Latin by}{from the Latin by}}, + % cfromnorwegian = {{from the Norwegian by}{from the Norwegian + % by}}, + % cfromportuguese = {{from the Portuguese by}{from the Portuguese + % by}}, + % cfromrussian = {{from the Russian by}{from the Russian by}}, + % cfromspanish = {{from the Spanish by}{from the Spanish by}}, + % cfromswedish = {{from the Swedish by}{from the Swedish by}}, + bynone = {{}{}}, + % bycompiler = {{compiled by}{comp\adddot}}, + byconductor = {{johtaa}{joht.\adddot}}, + bydirector = {{ohjannut}{ohj\adddot}}, + % byproducer = {{produced by}{prod\adddot}}, + % byeditorcp = {{edited and compiled by}{ed\adddot\space and comp\adddot}}, + % byeditortrcp = {{edited, translated \lbx@fromlang, and compiled by}% + % {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, and comp\adddot}}, + % byeditortrcpco = {{edited, translated \lbx@fromlang, compiled, and + % commented by}% + % {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, comp., + % and comm\adddot}}, + % byeditortrcpan = {{edited, translated \lbx@fromlang, compiled, and + % annotated by}% + % {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, comp., + % and annot\adddot}}, + % byeditortrcpin = {{edited, translated \lbx@fromlang, and compiled, with + % an introduction, by}% + % {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, and comp\adddot, + % with an introduction, by}}, + % byeditortrcpfo = {{edited, translated \lbx@fromlang, and compiled, with a + % foreword, by}% + % {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, and comp\adddot, + % with a foreword, by}}, + % byeditortrcpaf = {{edited, translated \lbx@fromlang, and compiled, with + % an afterword, by}% + % {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, and comp\adddot, + % with an afterword, by}}, + % byeditortrcpcoin = {{edited, translated \lbx@fromlang, compiled, and + % commented, with an introduction, by}% + % {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, comp., + % and comm\adddot, with an introduction, by}}, + % byeditortrcpcofo = {{edited, translated \lbx@fromlang, compiled, and + % commented, with a foreword, by}% + % {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, comp., + % and comm\adddot, with a foreword, by}}, + % byeditortrcpcoaf = {{edited, translated \lbx@fromlang, compiled, and + % commented, with an afterword, by}% + % {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, comp., + % and comm\adddot, with an afterword, by}}, + % byeditortrcpanin = {{edited, translated \lbx@fromlang, compiled, and + % annotated, with an introduction, by}% + % {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, comp., + % and annot\adddot, with an introduction, by}}, + % byeditortrcpanfo = {{edited, translated \lbx@fromlang, compiled, and + % annotated, with a foreword, by}% + % {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, comp., + % and annot\adddot, with a foreword, by}}, + % byeditortrcpanaf = {{edited, translated \lbx@fromlang, compiled, and + % annotated, with an afterword, by}% + % {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, comp., + % and annot\adddot, with an afterword, by}}, + % byeditorcpco = {{edited, compiled, and commented by}% + % {ed.,\addabbrvspace comp., and comm\adddot}}, + % byeditorcpan = {{edited, compiled, and annotated by}% + % {ed.,\addabbrvspace comp., and annot\adddot}}, + % byeditorcpin = {{edited and compiled, with an introduction, by}% + % {ed\adddot\space and comp., with an introduction, by}}, + % byeditorcpfo = {{edited and compiled, with a foreword, by}% + % {ed\adddot\space and comp., with a foreword, by}}, + % byeditorcpaf = {{edited and compiled, with an afterword, by}% + % {ed\adddot\space and comp., with an afterword, by}}, + % byeditorcpcoin = {{edited, compiled, and commented, with an + % introduction, by}% + % {ed.,\addabbrvspace comp., and comm., with an introduction, by}}, + % byeditorcpcofo = {{edited, compiled, and commented, with a foreword, + % by}% + % {ed.,\addabbrvspace comp., and comm., with a foreword, by}}, + % byeditorcpcoaf = {{edited, compiled, and commented, with an + % afterword, by}% + % {ed.,\addabbrvspace comp., and comm., with an afterword, by}}, + % byeditorcpanin = {{edited, compiled, and annotated, with an + % introduction, by}% + % {ed.,\addabbrvspace comp., and annot., with an introduction, by}}, + % byeditorcpanfo = {{edited, compiled, and annotated, with a foreword, + % by}% + % {ed.,\addabbrvspace comp., and annot., with a foreword, by}}, + % byeditorcpanaf = {{edited, compiled, and annotated, with an + % afterword, by}% + % {ed.,\addabbrvspace comp., and annot., with an afterword, by}}, + % bytranslatorcp = {{translated \lbx@fromlang\ and compiled by}% + % {trans\adddot\addspace\lbx@fromlang\ and comp\adddot}}, + % bytranslatorcpco = {{translated \lbx@fromlang, compiled, and + % commented by}% + % {trans\adddot\addspace\lbx@fromlang, comp., and comm\adddot}}, + % bytranslatorcpan = {{translated \lbx@fromlang, compiled, and + % annotated by}% + % {trans\adddot\addspace\lbx@fromlang, comp., and annot\adddot}}, + % bytranslatorcpin = {{translated \lbx@fromlang\ and compiled, with an + % introduction, by}% + % {trans\adddot\addspace\lbx@fromlang\ and comp., with an introduction, by}}, + % bytranslatorcpfo = {{translated \lbx@fromlang\ and compiled, with a + % foreword, by}% + % {trans\adddot\addspace\lbx@fromlang\ and comp., with a foreword, by}}, + % bytranslatorcpaf = {{translated \lbx@fromlang\ and compiled, with an + % afterword, by}% + % {trans\adddot\addspace\lbx@fromlang\ and comp., with an afterword, by}}, + % bytranslatorcpcoin = {{translated \lbx@fromlang, compiled, and commented, + % with an introduction, by}% + % {trans\adddot\addspace\lbx@fromlang, comp., and comm., with an + % introduction, by}}, + % bytranslatorcpcofo = {{translated \lbx@fromlang, compiled, and commented, + % with a foreword, by}% + % {trans\adddot\addspace\lbx@fromlang, comp., and comm., + % with a foreword, by}}, + % bytranslatorcpcoaf = {{translated \lbx@fromlang, compiled, and commented, + % with an afterword, by}% + % {trans\adddot\addspace\lbx@fromlang, comp., and comm., with an + % afterword, by}}, + % bytranslatorcpanin = {{translated \lbx@fromlang, compiled, and annotated, + % with an introduction, by}% + % {trans\adddot\addspace\lbx@fromlang, comp., and annot., with an + % introduction, by}}, + % bytranslatorcpanfo = {{translated \lbx@fromlang, compiled, and annotated, + % with a foreword, by}% + % {trans\adddot\addspace\lbx@fromlang, comp., and annot., + % with a foreword, by}}, + % bytranslatorcpanaf = {{translated \lbx@fromlang, compiled, and annotated, + % with an afterword, by}% + % {trans\adddot\addspace\lbx@fromlang, comp., and annot., + % with an afterword, by}}, + % bycompilerco = {{compiled and commented by}% + % {comp\adddot\space and comm\adddot}}, + % bycompileran = {{compiled and annotated by}% + % {comp\adddot\space and annot\adddot}}, + % bycompilerin = {{compiled, with an introduction, by}% + % {comp\adddot, with an introduction, by}}, + % bycompilerfo = {{compiled, with a foreword, by}% + % {comp\adddot, with a foreword, by}}, + % bycompileraf = {{compiled, with an afterword, by}% + % {comp\adddot, with an afterword, by}}, + % bycompilercoin = {{compiled and commented, with an introduction, by}% + % {comp\adddot\space and comm\adddot, with an introduction, by}}, + % bycompilercofo = {{compiled and commented, with a foreword, by}% + % {comp\adddot\space and comm\adddot, with a foreword, by}}, + % bycompilercoaf = {{compiled and commented, with an afterword, by}% + % {comp\adddot\space and comm\adddot, with an afterword, by}}, + % bycompileranin = {{compiled and annotated, with an introduction, by}% + % {comp\adddot\space and annot\adddot, with an introduction, by}}, + % bycompileranfo = {{compiled and annotated, with a foreword, by}% + % {comp\adddot\space and annot\adddot, with a foreword, by}}, + % bycompileranaf = {{compiled and annotated, with an afterword, by}% + % {comp\adddot\space and annot\adddot, with an afterword, by}}, +} + +\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}} + {\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}}% + {}% + {\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-french.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx index 25de5e7b404..32903140d7a 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.23 2012/12/06 12:05:19 dfussner Exp $ +% $Id: cms-french.lbx,v 0.9.5.24 2013/03/14 16:42:55 dfussner Exp $ -\ProvidesFile{cms-french.lbx}[2012/12/06 v 2.4 biblatex localization] +\ProvidesFile{cms-french.lbx}[2013/03/14 v 2.5 biblatex localization] % STATUS OF THIS FILE % - Some strings still missing @@ -23,7 +23,7 @@ \protected\def\mkbibrangeterse{% \lbx@cms@mkbibrangetrunc{short}}% \protected\def\mkbibrangefull{% - \lbx@cms@mkbibrangefull} + \lbx@cms@mkbibrangefull}% \def\cms@datelong{\printorigdate}% \def\cms@datelongalt{\printdate}}% @@ -31,7 +31,7 @@ \restorecommand\mkbibnamelast \restorecommand\cms@datelong \restorecommand\cms@datelongalt - \togglefalse{cms@postposit} + \togglefalse{cms@postposit}% \restorecommand\mkbibrangecomp% \restorecommand\mkbibrangefull% \restorecommand\mkbibrangeterse}% 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 1daac95fd30..955e0e606f3 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.23 2012/12/06 12:06:28 dfussner Exp $ +% $Id: cms-german.lbx,v 0.9.5.24 2013/03/14 16:42:38 dfussner Exp $ -\ProvidesFile{cms-german.lbx}[2012/12/06 v 2.4 biblatex localization] +\ProvidesFile{cms-german.lbx}[2013/03/14 v 2.5 biblatex localization] % STATUS OF THIS FILE % - Translated strings and formatting decisions need review by native @@ -35,14 +35,14 @@ {}% {\bibstring{from\thefield{origlanguage}}\addspace}}% {}}% - \def\cms@datelong{\printorigdate} - \def\cms@datelongalt{\printdate} + \def\cms@datelong{\printorigdate}% + \def\cms@datelongalt{\printdate}% \protected\def\mkbibrangecomp{% DATE FIX \lbx@cms@mkbibrangetrunc{long}}% \protected\def\mkbibrangeterse{% \lbx@cms@mkbibrangetrunc{short}}% \protected\def\mkbibrangefull{% - \lbx@cms@mkbibrangefull}} + \lbx@cms@mkbibrangefull}}% \UndeclareBibliographyExtras{% \restorecommand\lbx@fromlang 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 77bda016fa2..870490a132b 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.6 2012/12/06 12:11:26 dfussner Exp $ +% $Id: cms-icelandic.lbx,v 0.7 2013/03/14 16:43:41 dfussner Exp $ -\ProvidesFile{cms-icelandic.lbx}[2012/12/06 v 2.4 biblatex localization] +\ProvidesFile{cms-icelandic.lbx}[2013/03/14 v 2.5 biblatex localization] % STATUS OF THIS FILE % - Translated by a native speaker (Baldur Kristinsson). @@ -28,7 +28,7 @@ \protected\def\mkbibrangeterse{% \lbx@cms@mkbibrangetrunc{short}}% \protected\def\mkbibrangefull{% - \lbx@cms@mkbibrangefull} + \lbx@cms@mkbibrangefull}% \def\cms@datelong{\printorigdate}% \def\cms@datelongalt{\printdate}}% 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 5f96c95e8e6..e49ddd36962 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.23 2012/12/06 12:06:28 dfussner Exp $ +% $Id: cms-german.lbx,v 0.9.5.24 2013/03/14 16:42:38 dfussner Exp $ -\ProvidesFile{cms-ngerman.lbx}[2012/12/06 v 2.4 biblatex localization] +\ProvidesFile{cms-ngerman.lbx}[2013/03/14 v 2.5 biblatex localization] % STATUS OF THIS FILE % - Translated strings and formatting decisions need review by native @@ -35,14 +35,14 @@ {}% {\bibstring{from\thefield{origlanguage}}\addspace}}% {}}% - \def\cms@datelong{\printorigdate} - \def\cms@datelongalt{\printdate} + \def\cms@datelong{\printorigdate}% + \def\cms@datelongalt{\printdate}% \protected\def\mkbibrangecomp{% DATE FIX \lbx@cms@mkbibrangetrunc{long}}% \protected\def\mkbibrangeterse{% \lbx@cms@mkbibrangetrunc{short}}% \protected\def\mkbibrangefull{% - \lbx@cms@mkbibrangefull}} + \lbx@cms@mkbibrangefull}}% \UndeclareBibliographyExtras{% \restorecommand\lbx@fromlang 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 0d51cd11176..51af37c83ed 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx @@ -1,6 +1,6 @@ -% $Id: cms-norsk.lbx,v 1.2 2012/12/06 11:34:59 dfussner Exp $ +% $Id: cms-norsk.lbx,v 1.3 2013/03/14 16:41:51 dfussner Exp $ -\ProvidesFile{cms-norsk.lbx}[2012/12/06 v 2.4 biblatex localization] +\ProvidesFile{cms-norsk.lbx}[2013/03/14 v 2.5 biblatex localization] % STATUS OF THIS FILE % - Placeholder for cms-norwegian.lbx, as in standard biblatex. 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 c79e0abd76b..44437821b93 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.2 2012/12/06 11:34:06 dfussner Exp $ +% $Id: cms-norwegian.lbx,v 1.3 2013/03/14 16:41:34 dfussner Exp $ -\ProvidesFile{cms-norwegian.lbx}[2012/12/06 v 2.4 biblatex localization] +\ProvidesFile{cms-norwegian.lbx}[2013/03/14 v 2.5 biblatex localization] % STATUS OF THIS FILE % - Translated by a native speaker (H{\aa}kon Malmedal). @@ -19,7 +19,7 @@ \protected\def\mkbibrangeterse{% \lbx@cms@mkbibrangetrunc{short}}% \protected\def\mkbibrangefull{% - \lbx@cms@mkbibrangefull} + \lbx@cms@mkbibrangefull}% \def\cms@datelong{\printorigdate}% \def\cms@datelongalt{\printdate}}% 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 26418fd213f..bd0c671310c 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.2 2012/12/06 11:32:01 dfussner Exp $ +% $Id: cms-nynorsk.lbx,v 1.3 2013/03/14 16:42:05 dfussner Exp $ -\ProvidesFile{cms-nynorsk.lbx}[2012/12/06 v 2.4 biblatex localization] +\ProvidesFile{cms-nynorsk.lbx}[2013/03/14 v 2.5 biblatex localization] % STATUS OF THIS FILE % - Translated by a native speaker (H{\aa}kon Malmedal). @@ -19,7 +19,7 @@ \protected\def\mkbibrangeterse{% \lbx@cms@mkbibrangetrunc{short}}% \protected\def\mkbibrangefull{% - \lbx@cms@mkbibrangefull} + \lbx@cms@mkbibrangefull}% \def\cms@datelong{\printorigdate}% \def\cms@datelongalt{\printdate}}% -- cgit v1.2.3