summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-09-21 23:32:43 +0000
committerKarl Berry <karl@freefriends.org>2011-09-21 23:32:43 +0000
commit665aac624177a34bd2dd661c1788c6f4148d83e4 (patch)
tree65d893ee506ea9f11afd931c0677c0f3c55073f4 /Master/texmf-dist/tex/latex
parent032c722f921577a65cf81ba8be3247d49d7e4388 (diff)
biblatex-chicago (21sep11)
git-svn-id: svn://tug.org/texlive/trunk@24058 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx27
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx12
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx14
-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.lbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx8
8 files changed, 53 insertions, 36 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 32de9dc8a98..ea5ec1ccfbc 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.1 2011/03/03 15:34:59 dfussner Exp $
+% $Id: chicago-authordate15.bbx,v 0.8.1.2 2011/09/21 10:53:07 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/08/31 v 1.6 biblatex bibliography style]
+[2011/09/21 v 1.6 biblatex bibliography style]
%%%% Initialize and format bibliography and los %%%%
@@ -637,7 +637,6 @@
\clearfield{volumes}}}%
{}%
\newcunit\newblock
- \newcunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
\usebibmacro{part+editor+translator}%
@@ -804,8 +803,6 @@
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
\usebibmacro{italtitle+stitle}%
- \setunit{\addspace}\newblock%
- \usebibmacro{language+transtitle}%
\setunit{\addcomma\addspace}%
\usebibmacro{date}%
\newcunit
@@ -847,8 +844,6 @@
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
\usebibmacro{italtitle+stitle}%
- \setunit{\addspace}\newblock%\bibsentence
- \usebibmacro{language+transtitle}%
\setunit{\addcomma\addspace}%
\usebibmacro{byauthor}%
\setunit{\addperiod\addspace}%
@@ -916,8 +911,6 @@
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
\usebibmacro{italtitle+stitle}% All italtitle now?
- \setunit{\addspace}\newblock%\bibsentence
- \usebibmacro{language+transtitle}%
\setunit{\addcomma\addspace}%
\usebibmacro{byauthor}%
\setunit{\addperiod\addspace}%
@@ -995,8 +988,6 @@
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
\usebibmacro{italtitle+stitle}%
- \setunit{\addspace}\newblock%
- \usebibmacro{language+transtitle}%
\setunit{\addcomma\addspace}%
\usebibmacro{byauthor}%
\setunit{\addperiod\addspace}%
@@ -1421,8 +1412,6 @@
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
\usebibmacro{italtitle+stitle}%
- \setunit{\addspace}%
- \usebibmacro{language+transtitle}%
\newcunit%
\usebibmacro{byauthor}%
\newunit\newblock
@@ -1456,8 +1445,6 @@
\usebibmacro{cmscitesortdate}%
\newunit\newblock
\usebibmacro{italtitle+stitle}%{title}?
- \setunit{\addspace}\newblock%
- \usebibmacro{language+transtitle}%
\setunit{\addperiod\addspace}%
\printfield{note}%
\setunit{\addperiod\addspace}%
@@ -1867,8 +1854,6 @@
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
\usebibmacro{italtitle+stitle}%
- \setunit{\addspace}%\newblock%
- \usebibmacro{language+transtitle}%
\newcunit%
\usebibmacro{byauthor}%
\setunit{\addperiod\addspace}%
@@ -1898,8 +1883,6 @@
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
\usebibmacro{italtitle+stitle}%
- \setunit{\addspace}\newblock%
- \usebibmacro{language+transtitle}%
\newcunit%usebibmacro{byauthorpunct}% Why does this work? No idea.
\usebibmacro{byauthor}% Same in thesis type, as well.
\setunit{\addperiod\addspace}%
@@ -2066,7 +2049,11 @@
\iffieldsequal{year}{endyear}%
{\toggletrue{cms@oneyear}}%
{\togglefalse{cms@oneyear}}%
- \iffieldundef{origyear}%
+ \ifboolexpr{%
+ test {\iffieldundef{origyear}}
+ or
+ not test {\iffieldint{origyear}}
+ }%
{\usebibmacro{cmsbibyear}}%
{\iffieldint{year}%
{\iffieldundef{endyear}% Needed for date ranges - video type, esp.
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 2f9fbe24147..e3a66102f11 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.3 2011/08/24 18:09:45 dfussner Exp $
+% $Id: chicago-authordate15.cbx,v 0.8.1.4 2011/09/21 10:53:18 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/08/31 v 1.6 biblatex citation style]
+[2011/09/21 v 1.6 biblatex citation style]
%%%% Biblatex initialization + Chicago options + Toggles %%%%
@@ -494,7 +494,11 @@
\printfield{extrayear}}}}
\newbibmacro*{cmscitesortdate}{% Attempt to solve date-related problems
- \iffieldundef{origyear}%
+ \ifboolexpr{%
+ test {\iffieldundef{origyear}}
+ or
+ not test {\iffieldint{origyear}}
+ }%
{\usebibmacro{cmsciteyear}}%
{\iffieldint{year}%
{\iffieldundef{endyear}% Needed for date ranges -- video type, esp.
@@ -875,7 +879,7 @@
\DeclareFieldAlias[booklet]{title}[book]{title}
-\DeclareFieldFormat[booklet]{citetitle}[book]{\mkbibemph{#1}\isdot}
+\DeclareFieldAlias[booklet]{citetitle}[book]{citetitle}
\DeclareFieldAlias[booklet]{lostitle}[book]{lostitle}
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 bb38e59a089..68680cc54b3 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.5 2011/08/23 20:25:39 dfussner Exp $
+% $Id: chicago-notes15.bbx,v 0.9.7.6 2011/09/21 10:49:31 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/08/31 v 1.6 biblatex bibliography style]
+[2011/09/21 v 1.6 biblatex bibliography style]
%%%% Initialize and format bibliography and los %%%%
@@ -54,6 +54,8 @@
or
not test {\iffieldint{year}}
or
+ not test {\iffieldint{origyear}}
+ or
togl {cms@switchdates}
}%
{}%
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 1b122dece49..df25f25700b 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.8 2011/08/24 18:08:44 dfussner Exp $
+% $Id: chicago-notes15.cbx,v 0.9.7.9 2011/09/21 10:49:14 dfussner Exp $
% This is a biblatex citation style file, adapted from Lehman's
% authortitle-cverb.cbx. It is heavily modified, with the intention
% of providing footnote citations and a bibliography formatted
% according to the specifications of the Chicago Manual of Style,
% _15th_ edition.
-\ProvidesFile{chicago-notes.cbx}[2011/08/31 v 1.6 biblatex citation style]
+\ProvidesFile{chicago-notes.cbx}[2011/09/21 v 1.6 biblatex citation style]
%%%% Biblatex initialization + Chicago options + Toggles %%%%
@@ -51,6 +51,8 @@
or
not test {\iffieldint{year}}
or
+ not test {\iffieldint{origyear}}
+ or
togl {cms@switchdates}
}%
{}%
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 a4e22326340..8e7b3baa131 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.17 2011/08/31 13:38:40 dfussner Exp $
+% $Id: cms-american.lbx,v 0.10.1.21 2011/09/21 11:16:35 dfussner Exp $
-\ProvidesFile{cms-american.lbx}[2011/08/31 v 1.6 biblatex localization]
+\ProvidesFile{cms-american.lbx}[2011/09/21 v 1.6 biblatex localization]
\InheritBibliographyExtras{american}
@@ -190,6 +190,7 @@
\NewBibliographyString{partvolume}
\NewBibliographyString{by}
\NewBibliographyString{of}
+\NewBibliographyString{on}
\NewBibliographyString{afterwordto}
\NewBibliographyString{forewordto}
\NewBibliographyString{introductionto}
@@ -200,6 +201,8 @@
\NewBibliographyString{origshownyear}
\NewBibliographyString{origedition}
\NewBibliographyString{revisededition}
+\NewBibliographyString{broadcast}
+\NewBibliographyString{recorded}
\NewBibliographyString{numbers}
\NewBibliographyString{nodate}
\NewBibliographyString{pseudonym}
@@ -233,6 +236,8 @@
\NewBibliographyString{conductors}
\NewBibliographyString{director}
\NewBibliographyString{directors}
+\NewBibliographyString{none}
+\NewBibliographyString{nones}
\NewBibliographyString{producer}
\NewBibliographyString{producers}
\NewBibliographyString{transcompiler}
@@ -252,6 +257,7 @@
partvolume = {{\addspace bk\adddot}{\addspace bk\adddot}},
by = {{by}{by}},
of = {{of}{of}},
+ on = {{on}{on}},
compiler = {{comp\adddot}{comp\adddot}},
compilers = {{comps\adddot}{comps\adddot}},
transcompiler = {{trans\adddot\addspace and comp\adddot}%
@@ -278,6 +284,8 @@
conductors = {{dirs\adddot}{dirs\adddot}},
director = {{dir\adddot}{dir\adddot}},
directors = {{dirs\adddot}{dirs\adddot}},
+ none = {{}{}},
+ nones = {{}{}},
producer = {{prod\adddot}{prod\adddot}},
producers = {{prods\adddot}{prods\adddot}},
editor = {{ed\adddot}{ed\adddot}},
@@ -297,6 +305,8 @@
{ed\adddot\addcolon\addspace}},
revisededition = {{rev\adddot\addspace ed\adddot}%
{rev\adddot\addspace ed\adddot}},
+ broadcast = {{aired}{aired}},
+ recorded = {{recorded}{recorded}},
numbers = {{nos\adddot}{nos\adddot}},
nodate = {{{}n\adddot d\adddot}{{}n\adddot d\adddot}},
pseudonym = {{pseud\adddot}{pseud\adddot}},
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 522ce344d7d..9b479d98d97 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.11 2011/08/31 13:38:20 dfussner Exp $
+% $Id: cms-french.lbx,v 0.9.5.13 2011/09/21 11:17:01 dfussner Exp $
-\ProvidesFile{cms-french.lbx}[2011/08/31 v 1.6 biblatex localization]
+\ProvidesFile{cms-french.lbx}[2011/09/21 v 1.6 biblatex localization]
% STATUS OF THIS FILE
% - Some strings still missing
@@ -247,6 +247,8 @@
\NewBibliographyString{conductors}
\NewBibliographyString{director}
\NewBibliographyString{directors}
+\NewBibliographyString{none}
+\NewBibliographyString{nones}
\NewBibliographyString{producer}
\NewBibliographyString{producers}
\NewBibliographyString{transcompiler}
@@ -286,6 +288,8 @@
conductors = {{dir\adddot}{dir\adddot}},
director = {{r\'eal\adddot}{r\'eal\adddot}},
directors = {{r\'eal\adddot}{r\'eal\adddot}},
+ none = {{}{}},
+ nones = {{}{}},
producer = {{prod\adddot}{prod\adddot}},
producers = {{prod\adddot}{prod\adddot}},
editor = {{\'ed\adddot}{\'ed\adddot}},
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 ebb49c1e598..a39cbc67c16 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.11 2011/08/31 13:38:30 dfussner Exp $
+% $Id: cms-german.lbx,v 0.9.5.13 2011/09/21 11:16:49 dfussner Exp $
-\ProvidesFile{cms-german.lbx}[2011/08/31 v 1.6 biblatex localization]
+\ProvidesFile{cms-german.lbx}[2011/09/21 v 1.6 biblatex localization]
% STATUS OF THIS FILE
% - Translated strings and formatting decisions need review by native
@@ -249,6 +249,8 @@
\NewBibliographyString{conductors}
\NewBibliographyString{director}
\NewBibliographyString{directors}
+\NewBibliographyString{none}
+\NewBibliographyString{nones}
\NewBibliographyString{producer}
\NewBibliographyString{producers}
\NewBibliographyString{transcompiler}
@@ -293,6 +295,8 @@
conductors = {{Dir\adddot}{Dir\adddot}},
director = {{Reg\adddot}{Reg\adddot}},
directors = {{Reg\adddot}{Reg\adddot}},
+ none = {{}{}},
+ nones = {{}{}},
producer = {{Prod\adddot}{Prod\adddot}},
producers = {{Prod\adddot}{Prod\adddot}},
editor = {{Hrsg\adddot}{Hrsg\adddot}},
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 e361237d46a..5c68f7a4135 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.11 2011/08/31 13:38:30 dfussner Exp $
+% $Id: cms-ngerman.lbx,v 0.9.5.13 2011/09/21 11:16:49 dfussner Exp $
-\ProvidesFile{cms-ngerman.lbx}[2011/08/31 v 1.6 biblatex localization]
+\ProvidesFile{cms-ngerman.lbx}[2011/09/21 v 1.6 biblatex localization]
% STATUS OF THIS FILE
% - Translated strings and formatting decisions need review by native
@@ -249,6 +249,8 @@
\NewBibliographyString{conductors}
\NewBibliographyString{director}
\NewBibliographyString{directors}
+\NewBibliographyString{none}
+\NewBibliographyString{nones}
\NewBibliographyString{producer}
\NewBibliographyString{producers}
\NewBibliographyString{transcompiler}
@@ -293,6 +295,8 @@
conductors = {{Dir\adddot}{Dir\adddot}},
director = {{Reg\adddot}{Reg\adddot}},
directors = {{Reg\adddot}{Reg\adddot}},
+ none = {{}{}},
+ nones = {{}{}},
producer = {{Prod\adddot}{Prod\adddot}},
producers = {{Prod\adddot}{Prod\adddot}},
editor = {{Hrsg\adddot}{Hrsg\adddot}},