diff options
author | Karl Berry <karl@freefriends.org> | 2011-08-31 21:32:07 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-08-31 21:32:07 +0000 |
commit | 6a11d2c3656f990f59782df3b1eb5648660d8959 (patch) | |
tree | 5ae5c51da61e99a704486da854fc4fd17907f0d1 /Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx | |
parent | a706eaebd9e859c2a4e3da9247666a364345b6e9 (diff) |
biblatex-chicago (31aug11)
git-svn-id: svn://tug.org/texlive/trunk@23763 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx | 45 |
1 files changed, 31 insertions, 14 deletions
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 876f3d1193b..1b122dece49 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.2 2011/03/03 18:08:03 dfussner Exp dfussner $ +% $Id: chicago-notes15.cbx,v 0.9.7.8 2011/08/24 18:08:44 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/03/17 v 1.3 biblatex citation style] +\ProvidesFile{chicago-notes.cbx}[2011/08/31 v 1.6 biblatex citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -154,11 +154,11 @@ \def\mkbibcurdinal#1{% \@tempcnta0#1 \the\@tempcnta}% -\@ifpackagelater{biblatex}{2010/08/28} +\@ifpackagelater{biblatex}{2011/01/04} {} {\PackageError{biblatex} {Outdated 'biblatex' package} - {The Chicago style requires biblatex v0.9 or later.\MessageBreak + {The Chicago style requires biblatex v1.1 or later.\MessageBreak You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak This is a fatal error. I'm aborting now.}% \endinput} @@ -249,7 +249,9 @@ \iffieldequalstr{entrytype}{inreference}\OR% \iffieldequalstr{entrytype}{reference}}% {\iffieldequalstr{entrysubtype}{magazine}% Simplify .bib creation - {\printfield[journaltitle]{journaltitle}\isdot\newcunit}% + {\ifuseauthor% + {\printfield[journaltitle]{journaltitle}\isdot\newcunit}% + {}}% {\iffieldequalstr{entrytype}{manual}% {\printlist{organization}\isdot\newcunit}% {}}}% @@ -352,13 +354,16 @@ {\usebibmacro{cite:postnote}} \DeclareCiteCommand{\smartcite} - [\iffootnote{\mkbibparens}{\mkbibfootnote}] + [\iffootnote{}{\mkbibfootnote}] {\usebibmacro{prenote}}%\bibsentence {\usebibmacro{citeindex}% \usebibmacro{cite}} {\multicitedelim} {\usebibmacro{cite:postnote}} +\DeclareMultiCiteCommand{\smartcites}[\iffootnote{}{\mkbibfootnote}]% +{\smartcite}{\multicitedelim} + \DeclareCiteCommand{\footfullcite}[\mkbibfootnote] {\usebibmacro{prenote}}%\bibsentence {\usebibmacro{citeindex}% @@ -1181,6 +1186,7 @@ \DeclareBibliographyDriver{cite:letter}{% \usebibmacro{bibindex}% + \savefield{fullhash}{\bbx@lasthash}% \printtext[title]{% \printfield[noformat]{title}}% \newcunit\newblock% @@ -2490,12 +2496,19 @@ {\bibstring{cfrom\thefield{origlanguage}}}}% {\unspace}} -\renewcommand*{\lbx@fromlang}{% - \iffieldundef{userf} - {\iffieldundef{origlanguage} - {\unspace} - {\bibstring{from\thefield{origlanguage}}}}% - {\unspace}} +\@ifpackagelater{biblatex}{2011/07/28} +{\newcommand*{\lbx@fromlang}{% + \iffieldundef{userf} + {\iffieldundef{origlanguage} + {\unspace} + {\bibstring{from\thefield{origlanguage}}}}% + {\unspace}}} +{\renewcommand*{\lbx@fromlang}{% + \iffieldundef{userf} + {\iffieldundef{origlanguage} + {\unspace} + {\bibstring{from\thefield{origlanguage}}}}% + {\unspace}}} \renewcommand*{\lbx@lfromlang}{% \iffieldundef{userf} @@ -2595,14 +2608,18 @@ \setunit*{\addspace}% \printlist[periodplace]{location}% \savefield{journaltitle}{\bbx@lasthash}}}% - {\usebibmacro{author}}} + {\ifuseauthor% + {\usebibmacro{author}}% + {}}} \newbibmacro*{cmag+news+author}{% \ifnameundef{author}% {\usebibmacro{journal+sub}% \setunit*{\addspace}% \printlist[periodplace]{location}}% - {\usebibmacro{author}}} + {\ifuseauthor% + {\usebibmacro{author}}% + {}}} \newbibmacro*{type+inst+year}{% \printfield{type} |