summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-03-17 21:51:20 +0000
committerKarl Berry <karl@freefriends.org>2013-03-17 21:51:20 +0000
commitf6ebf7e69e4c372ab549c769ce5058a8f864336d (patch)
tree3bb456431feecd46466c9af16eff7887f998d9de /Master/texmf-dist/tex
parent0fc23846257eb94f086d8bde2dce867e483362ad (diff)
biblatex-chicago
git-svn-id: svn://tug.org/texlive/trunk@29410 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty7
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx44
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx468
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx53
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx422
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx601
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx869
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx10
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx10
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx6
16 files changed, 1476 insertions, 1050 deletions
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}}%