summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-chicago
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-09-29 23:41:18 +0000
committerKarl Berry <karl@freefriends.org>2011-09-29 23:41:18 +0000
commit953dbb42038c276aea20982b20d60fface9890d9 (patch)
treeff25f9907c38c9e09468da58ee2f767a06a5e06a /Master/texmf-dist/tex/latex/biblatex-chicago
parent65642b7dd742e23e69a9e34a38fb82421e570795 (diff)
biblatex-chicago (29sep11)
git-svn-id: svn://tug.org/texlive/trunk@24143 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-chicago')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx134
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx67
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx22
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx19
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx86
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx108
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx110
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx110
8 files changed, 266 insertions, 390 deletions
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 ea5ec1ccfbc..377d9007db9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
@@ -1,11 +1,11 @@
-% $Id: chicago-authordate15.bbx,v 0.8.1.2 2011/09/21 10:53:07 dfussner Exp $
+% $Id: chicago-authordate15.bbx,v 0.8.1.6 2011/09/28 17:33:38 dfussner Exp $
% This is a biblatex style file, adapted mainly from Lehman's
% standard.bbx and from chicago-notes.bbx. It provides the
% reference list formatting for the Chicago author-date style,
% _15th_ edition.
\ProvidesFile{chicago-authordate.bbx}
-[2011/09/21 v 1.6 biblatex bibliography style]
+[2011/09/28 v 1.6 biblatex bibliography style]
%%%% Initialize and format bibliography and los %%%%
@@ -218,8 +218,8 @@
{\usebibmacro{picktranslator}}
{\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
\iffirstonpage}
- {\bibnamedash\addcomma\addspace}
- {\printnames{editor}\addcomma\space
+ {\bibnamedash\editordelim}%
+ {\printnames{editor}\editordelim%
\savefield{fullhash}{\bbx@lasthash}}%
\usebibmacro{editstrg}}}
@@ -228,8 +228,8 @@
{\let\bbx@lasthash\undefined}
{\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
\iffirstonpage}
- {\bibnamedash\addcomma\addspace}
- {\printnames{editor}\addcomma\space
+ {\bibnamedash\editordelim}%
+ {\printnames{editor}\editordelim%
\savefield{fullhash}{\bbx@lasthash}}%
\usebibmacro{editstrg}}}
@@ -1311,9 +1311,9 @@
\newunit\newblock
\usebibmacro{italtitle+stitle}%
\newcunit%
- \printeventdate%
- \newcunit%
\usebibmacro{byauthor}%
+ \setunit*{\addperiod\addspace}%
+ \printeventdate%
\newunit\newblock
\usebibmacro{part+editor+translator}%
\newunit\newblock
@@ -2038,17 +2038,63 @@
not togl {cms@nodates}}%
{}%
{\bibstring{nodate}}}%
- {\printfield{labelyear}%
- \iffieldundef{extrayear}% For spurious punctuation
- {}%
- {\setunit*{}}%
- \printfield{extrayear}%
- \clearfield{year}}}
+ {\iffieldundef{year}%
+ {\iffieldundef{eventyear}
+ {\iffieldundef{origyear}%
+ {\printfield{labelyear}%
+ \iffieldundef{extrayear}%
+ {}%
+ {\setunit*{}%
+ \printfield{extrayear}}%
+ \iffieldundef{urlendyear}%
+ {\clearfield{urlyear}}%
+ {\iffieldequalstr{urlendyear}{}%
+ {\mbox{\bibdatedash}%
+ \clearfield{urlyear}}%
+ {\iffieldundef{urlmonth}%
+ {\clearfield{urlyear}}%
+ {}}}}%
+ {\printfield{labelyear}%
+ \iffieldundef{extrayear}%
+ {}%
+ {\setunit*{}%
+ \printfield{extrayear}}%
+ \iffieldundef{origendyear}%
+ {\clearfield{origyear}}%
+ {\iffieldequalstr{origendyear}{}%
+ {\mbox{\bibdatedash}%
+ \clearfield{origyear}}%
+ {\iffieldundef{origmonth}%
+ {\clearfield{origyear}}%
+ {}}}}}%
+ {\printfield{labelyear}%
+ \iffieldundef{extrayear}%
+ {}%
+ {\setunit*{}%
+ \printfield{extrayear}}%
+ \iffieldundef{eventendyear}%
+ {\clearfield{eventyear}}%
+ {\iffieldequalstr{eventendyear}{}%
+ {\mbox{\bibdatedash}%
+ \clearfield{eventyear}}%
+ {\iffieldundef{eventmonth}%
+ {\clearfield{eventyear}}%
+ {}}}}}%
+ {\printfield{labelyear}%
+ \iffieldundef{extrayear}%
+ {}%
+ {\setunit*{}%
+ \printfield{extrayear}}%
+ \iffieldundef{endyear}% DATE FIX
+ {\clearfield{year}}%
+ {\iffieldequalstr{endyear}{}%
+ {\mbox{\bibdatedash}%
+ \clearfield{year}}%
+ {\iffieldundef{month}%
+ {\clearfield{year}}%
+ {}}}}}}%
\newbibmacro*{cmsbibsortdate}{% Attempt to solve date-related problems
- \iffieldsequal{year}{endyear}%
- {\toggletrue{cms@oneyear}}%
- {\togglefalse{cms@oneyear}}%
\ifboolexpr{%
test {\iffieldundef{origyear}}
or
@@ -2056,7 +2102,11 @@
}%
{\usebibmacro{cmsbibyear}}%
{\iffieldint{year}%
- {\iffieldundef{endyear}% Needed for date ranges - video type, esp.
+ {\ifboolexpr{% Needed for date ranges - video type, esp.
+ test {\iffieldundef{endyear}}%
+ or
+ not test {\iffieldnum{endyear}}
+ }%
{\ifthenelse{\thefield{origyear}>\thefield{year}}%
{\toggletrue{cms@switchdates}%
\usebibmacro{cmsbibyear}}%
@@ -2082,45 +2132,65 @@
\newbibmacro*{origyear+labelyear}{%
\iftoggle{cms@switchdates}%
{\usebibmacro{labelyear+extrayear}%
- \clearfield{year}}%
+ \iffieldundef{endyear}% DATE FIX
+ {\clearfield{year}}%
+ {}}%
{\iffieldundef{origyear}
{\usebibmacro{labelyear+extrayear}}%
- {\printtext[bibhyperref]{%
+ {\printtext{%
\printfield{origyear}}%
- \clearfield{origyear}}}}
+ \iffieldundef{origendyear}% DATE FIX
+ {\clearfield{origyear}}%
+ {}}}}
\newbibmacro*{bothyear+newstyle}{%
\iftoggle{cms@switchdates}%
{\usebibmacro{labelyear+extrayear}\addslash%
\setunit{}% Need * here?
\printfield{origyear}%
- \clearfield{year}%
- \clearfield{origyear}}%
+ \iffieldundef{endyear}% DATE FIX
+ {\clearfield{year}}%
+ {}%
+ \iffieldundef{origendyear}% DATE FIX
+ {\clearfield{origyear}}%
+ {}}%
{\iffieldundef{origyear}%
{\usebibmacro{labelyear+extrayear}}%
- {\printtext[bibhyperref]{% Why?
+ {\printtext{% Why?
\printfield{origyear}\addslash%
\setunit*{}%
\printfield{labelyear}}%
- \clearfield{origyear}%
- \clearfield{year}}}}
+ \iffieldundef{origendyear}% DATE FIX
+ {\clearfield{origyear}}%
+ {}%
+ \iffieldundef{endyear}% DATE FIX
+ {\clearfield{year}}%
+ {}}}}
\newbibmacro*{bothyear+oldstyle}{%
\iftoggle{cms@switchdates}%
- {\printtext[bibhyperref]{%
+ {\printtext{%
\bibopenbracket%
\usebibmacro{labelyear+extrayear}%
\bibclosebracket%
\setunit{\addspace}\printfield{origyear}}%
- \clearfield{year}%
- \clearfield{origyear}}%
+ \iffieldundef{endyear}% DATE FIX
+ {\clearfield{year}}%
+ {}%
+ \iffieldundef{origendyear}% DATE FIX
+ {\clearfield{origyear}}%
+ {}}%
{\iffieldundef{origyear}
{\usebibmacro{labelyear+extrayear}}%
- {\printtext[bibhyperref]{%
+ {\printtext{%
\printfield[brackets]{origyear}%
\setunit*{\addspace}\printfield{labelyear}}%
- \clearfield{origyear}%
- \clearfield{year}}}}
+ \iffieldundef{origendyear}% DATE FIX
+ {\clearfield{origyear}}%
+ {}%
+ \iffieldundef{endyear}% DATE FIX
+ {\clearfield{year}}%
+ {}}}}
\newbibmacro*{pubstate}{%
\iftoggle{cms@reprint}%
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 e3a66102f11..b718305caef 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
@@ -1,11 +1,11 @@
-% $Id: chicago-authordate15.cbx,v 0.8.1.4 2011/09/21 10:53:18 dfussner Exp $
+% $Id: chicago-authordate15.cbx,v 0.8.1.7 2011/09/28 17:33:47 dfussner Exp $
% This is a biblatex citation style file, adapted from Lehman's
% authoryear-comp.cbx. It is heavily modified, with the intention of
% providing inline citations (and a reference list) for the
% author-date style of the Chicago Manual of Style, _15th_ edition.
\ProvidesFile{chicago-authordate.cbx}
-[2011/09/21 v 1.6 biblatex citation style]
+[2011/09/28 v 1.6 biblatex citation style]
%%%% Biblatex initialization + Chicago options + Toggles %%%%
@@ -20,7 +20,6 @@
\providetoggle{cms@reprint}
\providetoggle{cms@switchdates}
\providetoggle{cms@los}
-\providetoggle{cms@oneyear}
\providetoggle{cms@nodates}
\providetoggle{cms@url}% These are for the field-exclusion options
@@ -488,10 +487,51 @@
not togl {cms@nodates}
}%
{}%
- {\bibstring{nodate}}}% For CMS?
+ {\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS?
{\printtext[bibhyperref]{%
- \printfield{labelyear}\setunit{}% Needed for patent type
- \printfield{extrayear}}}}
+ \iffieldundef{year}%
+ {\iffieldundef{eventyear}
+ {\iffieldundef{origyear}%
+ {\printfield{labelyear}%
+ \iffieldundef{extrayear}%
+ {}%
+ {\setunit*{}%
+ \printfield{extrayear}}%
+ \iffieldundef{urlendyear}%
+ {}%
+ {\iffieldequalstr{urlendyear}{}%
+ {\mbox{\bibdatedash}}%
+ {}}}%
+ {\printfield{labelyear}%
+ \iffieldundef{extrayear}%
+ {}%
+ {\setunit*{}%
+ \printfield{extrayear}}%
+ \iffieldundef{origendyear}%
+ {}%
+ {\iffieldequalstr{origendyear}{}%
+ {\mbox{\bibdatedash}}%
+ {}}}}
+ {\printfield{labelyear}%
+ \iffieldundef{extrayear}%
+ {}%
+ {\setunit*{}%
+ \printfield{extrayear}}%
+ \iffieldundef{eventendyear}%
+ {}%
+ {\iffieldequalstr{eventendyear}{}%
+ {\mbox{\bibdatedash}}%
+ {}}}}
+ {\printfield{labelyear}%
+ \iffieldundef{extrayear}%
+ {}%
+ {\setunit*{}%
+ \printfield{extrayear}}%
+ \iffieldundef{endyear}% DATE FIX
+ {}%
+ {\iffieldequalstr{endyear}{}%
+ {\mbox{\bibdatedash}}%
+ {}}}}}}
\newbibmacro*{cmscitesortdate}{% Attempt to solve date-related problems
\ifboolexpr{%
@@ -501,7 +541,11 @@
}%
{\usebibmacro{cmsciteyear}}%
{\iffieldint{year}%
- {\iffieldundef{endyear}% Needed for date ranges -- video type, esp.
+ {\ifboolexpr{% Needed for date ranges
+ test {\iffieldundef{endyear}}%
+ or
+ not test {\iffieldnum{endyear}}
+ }%
{\ifthenelse{\thefield{origyear}>\thefield{year}}%
{\toggletrue{cms@switchdates}%
\usebibmacro{cmsciteyear}}%
@@ -1136,6 +1180,11 @@
{\addcomma\addspace}}%
{\addcomma\addspace}}}
+\newcommand*{\editordelim}{% Otherwise you get an inaccurate comma.
+ \iffieldequalstr{editortype}{none}%
+ {\addperiod\addspace}%
+ {\addcomma\addspace}}
+
\newcommand*{\lbx@cfromlang}{%
\iffieldundef{userf}
{\iffieldundef{origlanguage}
@@ -1793,8 +1842,8 @@
\newbibmacro*{url+date}{% Changed for 0.9
\printfield{url}%
- \iffieldundef{urlyear}
- {}
+ \ifthenelse{\iffieldundef{urlyear}\AND\iffieldundef{urlmonth}}%
+ {}%
{\setunit{\addspace}%
\printtext[urldate]{\printurldate}}}
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 68680cc54b3..80aa9cbbca9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
@@ -1,11 +1,11 @@
-% $Id: chicago-notes15.bbx,v 0.9.7.6 2011/09/21 10:49:31 dfussner Exp $
+% $Id: chicago-notes15.bbx,v 0.9.7.7 2011/09/27 20:20:29 dfussner Exp $
% This is a biblatex style file, adapted mainly from Lehman's standard.bbx
% It provides the bibliography formatting for the Chicago notes +
% bibliography style, _15th_ edition.
\ProvidesFile{chicago-notes.bbx}
-[2011/09/21 v 1.6 biblatex bibliography style]
+[2011/09/28 v 1.6 biblatex bibliography style]
%%%% Initialize and format bibliography and los %%%%
@@ -59,7 +59,11 @@
togl {cms@switchdates}
}%
{}%
- {\iffieldundef{endyear}%
+ {\ifboolexpr{%
+ test {\iffieldundef{endyear}}%
+ or
+ not test {\iffieldnum{endyear}}
+ }%
{\ifthenelse{\thefield{origyear}>\thefield{year}}%
{\toggletrue{cms@switchdates}}%
{}}%
@@ -238,8 +242,8 @@
{\usebibmacro{picktranslator}}
{\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
\iffirstonpage}
- {\bibnamedash\addcomma\addspace}
- {\printnames{editor}\addcomma\space
+ {\bibnamedash\editordelim}%
+ {\printnames{editor}\editordelim%
\savefield{fullhash}{\bbx@lasthash}}%
\usebibmacro{editstrg}}}
@@ -248,8 +252,8 @@
{\let\bbx@lasthash\undefined}
{\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
\iffirstonpage}
- {\bibnamedash\addcomma\addspace}
- {\printnames{editor}\addcomma\space
+ {\bibnamedash\editordelim}%
+ {\printnames{editor}\editordelim%
\savefield{fullhash}{\bbx@lasthash}}%
\usebibmacro{editstrg}}}
@@ -1249,9 +1253,9 @@
\newunit\newblock
\usebibmacro{italtitle+stitle}%
\newcunit%
- \printeventdate%
- \newcunit%
\usebibmacro{byauthor}%
+ \setunit*{\addperiod\addspace}
+ \printeventdate%
\newunit\newblock
\usebibmacro{part+editor+translator}%
\newunit\newblock
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 df25f25700b..0b0db8a2cc1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
@@ -1,11 +1,11 @@
-% $Id: chicago-notes15.cbx,v 0.9.7.9 2011/09/21 10:49:14 dfussner Exp $
+% $Id: chicago-notes15.cbx,v 0.9.7.10 2011/09/27 20:23:17 dfussner Exp $
% This is a biblatex citation style file, adapted from Lehman's
% authortitle-cverb.cbx. It is heavily modified, with the intention
% of providing footnote citations and a bibliography formatted
% according to the specifications of the Chicago Manual of Style,
% _15th_ edition.
-\ProvidesFile{chicago-notes.cbx}[2011/09/21 v 1.6 biblatex citation style]
+\ProvidesFile{chicago-notes.cbx}[2011/09/28 v 1.6 biblatex citation style]
%%%% Biblatex initialization + Chicago options + Toggles %%%%
@@ -56,7 +56,11 @@
togl {cms@switchdates}
}%
{}%
- {\iffieldundef{endyear}%
+ {\ifboolexpr{%
+ test {\iffieldundef{endyear}}%
+ or
+ not test {\iffieldnum{endyear}}
+ }%
{\ifthenelse{\thefield{origyear}>\thefield{year}}%
{\toggletrue{cms@switchdates}}%
{}}%
@@ -1351,9 +1355,9 @@
\setunit{\addcomma\addspace}\newblock
\usebibmacro{citaltitle+stitle}%
\newcunit
- \printeventdate%
- \newcunit
\usebibmacro{byauthor}%
+ \newcunit
+ \printeventdate%
\newcunit\newblock
\usebibmacro{cpart+editor+translator}%
\newcunit
@@ -2491,6 +2495,11 @@
{\addcomma\addspace}}%
{\addcomma\addspace}}}%
+\newcommand*{\editordelim}{% Otherwise you get a spurious comma.
+ \iffieldequalstr{editortype}{none}%
+ {\addperiod\addspace}%
+ {\addcomma\addspace}}
+
\newcommand*{\lbx@cfromlang}{% Needed to eliminate "by" after "trans."
\iffieldundef{userf}
{\iffieldundef{origlanguage}
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 8e7b3baa131..85b918eb7c7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx
@@ -1,28 +1,24 @@
-% $Id: cms-american.lbx,v 0.10.1.21 2011/09/21 11:16:35 dfussner Exp $
+% $Id: cms-american.lbx,v 0.10.1.23 2011/09/28 17:27:05 dfussner Exp $
-\ProvidesFile{cms-american.lbx}[2011/09/21 v 1.6 biblatex localization]
+\ProvidesFile{cms-american.lbx}[2011/09/28 v 1.6 biblatex localization]
\InheritBibliographyExtras{american}
\DeclareBibliographyExtras{%
\savecommand\mkbibrangecomp
- \savecommand\mkbibrangecompextra
\savecommand\mkbibrangeterse
- \savecommand\mkbibrangeterseextra
+ \savecommand\mkbibrangefull
\protected\def\mkbibrangecomp{%
\lbx@cms@mkbibrangetrunc@long{long}}%
\protected\def\mkbibrangeterse{%
\lbx@cms@mkbibrangetrunc@short{short}}%
- \protected\def\mkbibrangecompextra{%
- \lbx@cms@mkbibrangetruncextra@long{long}}%
- \protected\def\mkbibrangeterseextra{%
- \lbx@cms@mkbibrangetruncextra@short{short}}}
+ \protected\def\mkbibrangefull{%
+ \lbx@cms@mkbibrangefull}}
\UndeclareBibliographyExtras{%
\restorecommand\mkbibrangecomp%
- \restorecommand\mkbibrangecompextra%
\restorecommand\mkbibrangeterse%
- \restorecommand\mkbibrangeterseextra%
+ \restorecommand\mkbibrangefull%
}
\NewBibliographyString{bynone}
@@ -810,12 +806,8 @@
\protected\gdef\lbx@cms@mkbibrangetrunc@long#1#2{%
\ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
{}
- \printtext{%
- \ifboolexpr{
- togl {cms@oneyear}
- or
- test {\iffieldsequal{#2year}{#2endyear}}
- }%
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
{\csuse{mkbibdate#1}{}{#2month}{#2day}}
{\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
\iffieldundef{#2endyear}
@@ -823,25 +815,17 @@
{\iffieldequalstr{#2endyear}{}
{\mbox{\bibdatedash}}
{\bibdatedash
- \ifboolexpr{
- togl {cms@oneyear}
- or
- test {\iffieldsequal{#2year}{#2endyear}}
- }%
+ \iffieldsequal{#2year}{#2endyear}
{\iffieldsequal{#2month}{#2endmonth}
{\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
{\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}}
\protected\gdef\lbx@cms@mkbibrangetrunc@short#1#2{%
\ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
{}
{\printtext{%
- \ifboolexpr{
- togl {cms@oneyear}
- or
- test {\iffieldsequal{#2year}{#2endyear}}
- }%
+ \iffieldsequal{#2year}{#2endyear}
{\csuse{mkbibdate#1}{}{#2month}{#2day}}
{\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
\iffieldundef{#2endyear}
@@ -851,52 +835,16 @@
{\bibdatedash
\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-\protected\gdef\lbx@cms@mkbibrangetruncextra@long#1#2{%
- \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
- {}
- {\printtext{%
- \ifboolexpr{
- togl {cms@oneyear}
- or
- test {\iffieldsequal{#2year}{#2endyear}}
- }%
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \ifboolexpr{
- togl {cms@oneyear}
- or
- test {\iffieldsequal{#2year}{#2endyear}}
- }%
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
- \printfield{extrayear}}}}}}
-
-\protected\gdef\lbx@cms@mkbibrangetruncextra@short#1#2{%
+\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
\ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
- {}
+ {}%
{\printtext{%
- \ifboolexpr{
- togl {cms@oneyear}
- or
- test {\iffieldsequal{#2year}{#2endyear}}
- }%
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
\iffieldundef{#2endyear}
- {\printfield{extrayear}}
+ {}
{\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
+ {\mbox{\bibdatedash}}
{\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
- \printfield{extrayear}}}}}}
+ \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 9b479d98d97..628d4dbfa5b 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.13 2011/09/21 11:17:01 dfussner Exp $
+% $Id: cms-french.lbx,v 0.9.5.15 2011/09/28 17:26:22 dfussner Exp $
-\ProvidesFile{cms-french.lbx}[2011/09/21 v 1.6 biblatex localization]
+\ProvidesFile{cms-french.lbx}[2011/09/28 v 1.6 biblatex localization]
% STATUS OF THIS FILE
% - Some strings still missing
@@ -16,17 +16,14 @@
\savecommand\cms@datelong
\savecommand\cms@datelongalt
\savecommand\mkbibrangecomp
- \savecommand\mkbibrangecompextra
\savecommand\mkbibrangeterse
- \savecommand\mkbibrangeterseextra
+ \savecommand\mkbibrangefull
\protected\def\mkbibrangecomp{%
- \lbx@cms@mkbibrangetrunc@long{long}}%
+ \lbx@cms@mkbibrangetrunc{long}}%
\protected\def\mkbibrangeterse{%
- \lbx@cms@mkbibrangetrunc@short{short}}%
- \protected\def\mkbibrangecompextra{%
- \lbx@cms@mkbibrangetruncextra@long{long}}%
- \protected\def\mkbibrangeterseextra{%
- \lbx@cms@mkbibrangetruncextra@short{short}}
+ \lbx@cms@mkbibrangetrunc{short}}%
+ \protected\def\mkbibrangefull{%
+ \lbx@cms@mkbibrangefull}
\def\cms@datelong{\printorigdate}%
\def\cms@datelongalt{\printdate}}%
@@ -36,9 +33,8 @@
\restorecommand\cms@datelongalt
\togglefalse{cms@postposit}
\restorecommand\mkbibrangecomp%
- \restorecommand\mkbibrangecompextra%
- \restorecommand\mkbibrangeterse%
- \restorecommand\mkbibrangeterseextra}
+ \restorecommand\mkbibrangefull%
+ \restorecommand\mkbibrangeterse}%
\NewBibliographyString{bynone}
\NewBibliographyString{bycompiler}
@@ -776,42 +772,14 @@
par}{comp\adddot, annot\adddot\ et postf\adddot}},
}
-\protected\gdef\lbx@cms@mkbibrangetrunc@long#1#2{%
- \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
- {}
- \printtext{%
- \ifboolexpr{
- togl {cms@oneyear}
- or
- test {\iffieldsequal{#2year}{#2endyear}}
- }%
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
- {\mbox{\bibdatedash}}
- {\bibdatedash
- \ifboolexpr{
- togl {cms@oneyear}
- or
- test {\iffieldsequal{#2year}{#2endyear}}
- }%
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
-\protected\gdef\lbx@cms@mkbibrangetrunc@short#1#2{%
+\protected\gdef\lbx@cms@mkbibrangetrunc#1#2{% DATE FIX
\ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
{}
{\printtext{%
- \ifboolexpr{
- togl {cms@oneyear}
- or
- test {\iffieldsequal{#2year}{#2endyear}}
- }%
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{}{}{#2day}}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
{\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
\iffieldundef{#2endyear}
{}
@@ -820,52 +788,16 @@
{\bibdatedash
\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-\protected\gdef\lbx@cms@mkbibrangetruncextra@long#1#2{%
- \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
- {}
- {\printtext{%
- \ifboolexpr{
- togl {cms@oneyear}
- or
- test {\iffieldsequal{#2year}{#2endyear}}
- }%
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \ifboolexpr{
- togl {cms@oneyear}
- or
- test {\iffieldsequal{#2year}{#2endyear}}
- }%
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
- \printfield{extrayear}}}}}}
-
-\protected\gdef\lbx@cms@mkbibrangetruncextra@short#1#2{%
+\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
\ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
- {}
+ {}%
{\printtext{%
- \ifboolexpr{
- togl {cms@oneyear}
- or
- test {\iffieldsequal{#2year}{#2endyear}}
- }%
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
\iffieldundef{#2endyear}
- {\printfield{extrayear}}
+ {}
{\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
+ {\mbox{\bibdatedash}}
{\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
- \printfield{extrayear}}}}}}
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
\endinput
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 a39cbc67c16..9f5f7c72ecd 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.13 2011/09/21 11:16:49 dfussner Exp $
+% $Id: cms-german.lbx,v 0.9.5.16 2011/09/28 17:25:59 dfussner Exp $
-\ProvidesFile{cms-german.lbx}[2011/09/21 v 1.6 biblatex localization]
+\ProvidesFile{cms-german.lbx}[2011/09/28 v 1.6 biblatex localization]
% STATUS OF THIS FILE
% - Translated strings and formatting decisions need review by native
@@ -10,9 +10,8 @@
\DeclareBibliographyExtras{%
\savecommand\mkbibrangecomp
- \savecommand\mkbibrangecompextra
\savecommand\mkbibrangeterse
- \savecommand\mkbibrangeterseextra
+ \savecommand\mkbibrangefull
\savecommand\lbx@fromlang
\savecommand\lbx@lfromlang
\savecommand\lbx@sfromlang
@@ -38,23 +37,20 @@
{}}%
\def\cms@datelong{\printorigdate}
\def\cms@datelongalt{\printdate}
- \protected\def\mkbibrangecomp{%
- \lbx@cms@mkbibrangetrunc@long{long}}%
+ \protected\def\mkbibrangecomp{% DATE FIX
+ \lbx@cms@mkbibrangetrunc{long}}%
\protected\def\mkbibrangeterse{%
- \lbx@cms@mkbibrangetrunc@short{short}}%
- \protected\def\mkbibrangecompextra{%
- \lbx@cms@mkbibrangetruncextra@long{long}}%
- \protected\def\mkbibrangeterseextra{%
- \lbx@cms@mkbibrangetruncextra@short{short}}}
+ \lbx@cms@mkbibrangetrunc{short}}%
+ \protected\def\mkbibrangefull{%
+ \lbx@cms@mkbibrangefull}}
\UndeclareBibliographyExtras{%
\restorecommand\lbx@fromlang
\restorecommand\cms@datelong
\restorecommand\cms@datelongalt
- \restorecommand\mkbibrangecomp%
- \restorecommand\mkbibrangecompextra%
+ \restorecommand\mkbibrangecomp% DATE FIX
\restorecommand\mkbibrangeterse%
- \restorecommand\mkbibrangeterseextra}
+ \restorecommand\mkbibrangefull}
\NewBibliographyString{bynone}
\NewBibliographyString{bycompiler}
@@ -937,42 +933,14 @@
vers\adddot\ von}},
}
-\protected\gdef\lbx@cms@mkbibrangetrunc@long#1#2{%
- \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
- {}
- \printtext{%
- \ifboolexpr{
- togl {cms@oneyear}
- or
- test {\iffieldsequal{#2year}{#2endyear}}
- }%
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
- {\mbox{\bibdatedash}}
- {\bibdatedash
- \ifboolexpr{
- togl {cms@oneyear}
- or
- test {\iffieldsequal{#2year}{#2endyear}}
- }%
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
-\protected\gdef\lbx@cms@mkbibrangetrunc@short#1#2{%
+\protected\gdef\lbx@cms@mkbibrangetrunc#1#2{% DATE FIX
\ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
{}
{\printtext{%
- \ifboolexpr{
- togl {cms@oneyear}
- or
- test {\iffieldsequal{#2year}{#2endyear}}
- }%
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{}{}{#2day}}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
{\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
\iffieldundef{#2endyear}
{}
@@ -981,52 +949,16 @@
{\bibdatedash
\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-\protected\gdef\lbx@cms@mkbibrangetruncextra@long#1#2{%
- \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
- {}
- {\printtext{%
- \ifboolexpr{
- togl {cms@oneyear}
- or
- test {\iffieldsequal{#2year}{#2endyear}}
- }%
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \ifboolexpr{
- togl {cms@oneyear}
- or
- test {\iffieldsequal{#2year}{#2endyear}}
- }%
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
- \printfield{extrayear}}}}}}
-
-\protected\gdef\lbx@cms@mkbibrangetruncextra@short#1#2{%
+\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
\ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
- {}
+ {}%
{\printtext{%
- \ifboolexpr{
- togl {cms@oneyear}
- or
- test {\iffieldsequal{#2year}{#2endyear}}
- }%
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
\iffieldundef{#2endyear}
- {\printfield{extrayear}}
+ {}
{\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
+ {\mbox{\bibdatedash}}
{\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
- \printfield{extrayear}}}}}}
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
\endinput
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 5c68f7a4135..3e01b98075d 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-ngerman.lbx,v 0.9.5.13 2011/09/21 11:16:49 dfussner Exp $
+% $Id: cms-ngerman.lbx,v 0.9.5.16 2011/09/28 17:25:59 dfussner Exp $
-\ProvidesFile{cms-ngerman.lbx}[2011/09/21 v 1.6 biblatex localization]
+\ProvidesFile{cms-ngerman.lbx}[2011/09/28 v 1.6 biblatex localization]
% STATUS OF THIS FILE
% - Translated strings and formatting decisions need review by native
@@ -10,9 +10,8 @@
\DeclareBibliographyExtras{%
\savecommand\mkbibrangecomp
- \savecommand\mkbibrangecompextra
\savecommand\mkbibrangeterse
- \savecommand\mkbibrangeterseextra
+ \savecommand\mkbibrangefull
\savecommand\lbx@fromlang
\savecommand\lbx@lfromlang
\savecommand\lbx@sfromlang
@@ -38,23 +37,20 @@
{}}%
\def\cms@datelong{\printorigdate}
\def\cms@datelongalt{\printdate}
- \protected\def\mkbibrangecomp{%
- \lbx@cms@mkbibrangetrunc@long{long}}%
+ \protected\def\mkbibrangecomp{% DATE FIX
+ \lbx@cms@mkbibrangetrunc{long}}%
\protected\def\mkbibrangeterse{%
- \lbx@cms@mkbibrangetrunc@short{short}}%
- \protected\def\mkbibrangecompextra{%
- \lbx@cms@mkbibrangetruncextra@long{long}}%
- \protected\def\mkbibrangeterseextra{%
- \lbx@cms@mkbibrangetruncextra@short{short}}}
+ \lbx@cms@mkbibrangetrunc{short}}%
+ \protected\def\mkbibrangefull{%
+ \lbx@cms@mkbibrangefull}}
\UndeclareBibliographyExtras{%
\restorecommand\lbx@fromlang
\restorecommand\cms@datelong
\restorecommand\cms@datelongalt
- \restorecommand\mkbibrangecomp%
- \restorecommand\mkbibrangecompextra%
+ \restorecommand\mkbibrangecomp% DATE FIX
\restorecommand\mkbibrangeterse%
- \restorecommand\mkbibrangeterseextra}
+ \restorecommand\mkbibrangefull}
\NewBibliographyString{bynone}
\NewBibliographyString{bycompiler}
@@ -937,42 +933,14 @@
vers\adddot\ von}},
}
-\protected\gdef\lbx@cms@mkbibrangetrunc@long#1#2{%
- \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
- {}
- \printtext{%
- \ifboolexpr{
- togl {cms@oneyear}
- or
- test {\iffieldsequal{#2year}{#2endyear}}
- }%
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
- {\mbox{\bibdatedash}}
- {\bibdatedash
- \ifboolexpr{
- togl {cms@oneyear}
- or
- test {\iffieldsequal{#2year}{#2endyear}}
- }%
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
-\protected\gdef\lbx@cms@mkbibrangetrunc@short#1#2{%
+\protected\gdef\lbx@cms@mkbibrangetrunc#1#2{% DATE FIX
\ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
{}
{\printtext{%
- \ifboolexpr{
- togl {cms@oneyear}
- or
- test {\iffieldsequal{#2year}{#2endyear}}
- }%
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{}{}{#2day}}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
{\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
\iffieldundef{#2endyear}
{}
@@ -981,52 +949,16 @@
{\bibdatedash
\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-\protected\gdef\lbx@cms@mkbibrangetruncextra@long#1#2{%
- \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
- {}
- {\printtext{%
- \ifboolexpr{
- togl {cms@oneyear}
- or
- test {\iffieldsequal{#2year}{#2endyear}}
- }%
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \ifboolexpr{
- togl {cms@oneyear}
- or
- test {\iffieldsequal{#2year}{#2endyear}}
- }%
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
- \printfield{extrayear}}}}}}
-
-\protected\gdef\lbx@cms@mkbibrangetruncextra@short#1#2{%
+\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
\ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
- {}
+ {}%
{\printtext{%
- \ifboolexpr{
- togl {cms@oneyear}
- or
- test {\iffieldsequal{#2year}{#2endyear}}
- }%
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
\iffieldundef{#2endyear}
- {\printfield{extrayear}}
+ {}
{\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
+ {\mbox{\bibdatedash}}
{\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
- \printfield{extrayear}}}}}}
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
\endinput