summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-chicago
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-08-22 21:07:18 +0000
committerKarl Berry <karl@freefriends.org>2014-08-22 21:07:18 +0000
commit44bb765d19eddeae2ed7e74052b1e75a4e12123b (patch)
tree267ab7f12f758913aeec3870dc3a38769c948fe7 /Master/texmf-dist/tex/latex/biblatex-chicago
parent9655d464f79faee56fa49acca8a92b80899c3a8a (diff)
biblatex-chicago (22aug14)
git-svn-id: svn://tug.org/texlive/trunk@35015 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-notes.cbx38
1 files changed, 22 insertions, 16 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 83013a2a7f3..b446b548796 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.112 2014/08/15 09:27:37 dfussner Exp $
+% $Id: chicago-notes.cbx,v 0.9.7.114 2014/08/21 16:25:50 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}[2014/08/15 v 2.9a biblatex citation style]
+\ProvidesFile{chicago-notes.cbx}[2014/08/21 v 2.9a biblatex citation style]
%%%% Biblatex initialization + Chicago options + Toggles %%%%
@@ -29,7 +29,6 @@
\providetoggle{cms@addendum}
\providetoggle{cms@comprange}
\providetoggle{cms@modpostnote}
-\providetoggle{cms@crspace}
\providetoggle{cms@headlessnote}
\providetoggle{cms@origcite}
@@ -349,7 +348,17 @@
\newbibmacro*{cite}{%
\ifciteseen%
- {\iffieldundef{shorthand}%
+ {\ifboolexpr{
+ test {\iffieldundef{shorthand}}%
+ or
+ (
+ togl {blx@skipbiblist}%
+ and
+ togl {cms@inheritshhand}%
+ and
+ not test {\iffieldundef{crossref}}%
+ )
+ }
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
{\usebibmacro{cite:ibid}}%
{\global\toggletrue{cms@shortnote}%
@@ -575,11 +584,11 @@
\toggletrue{cms@shortnote}%
\togglefalse{cms@fullnote}%
\usebibmacro{bibxref-in:}%
- \ifboolexpr{
+ \ifboolexpr{%
togl {cms@inheritshhand}%
and
not test {\iffieldundef{shorthand}}%
- }
+ }%
{\usebibmacro{cite}}%
{\usebibmacro{cite:short}}}%
{}%
@@ -3434,8 +3443,8 @@
\newbibmacro*{cms-in:}{% Fix for 0.9a compat.
\iftoggle{cms@origpublished}%
- {}% The following is needed for userf + crossref inside bib.
- {\iftoggle{cms@crspace}{\addspace}{}\bibstring{in}% ?!?
+ {}% Removed the cms@crspace test -- fixed a bug I had introduced
+ {\bibstring{in}%
\setunit{\addspace}}}
\newbibmacro*{bibxref-in:}{%
@@ -3456,8 +3465,7 @@
\setunit{\addspace}%
\bibstring{ofseries}%
\setunit{\addspace}}%
- {\toggletrue{cms@crspace}\usebibmacro{cms-in:}%
- \togglefalse{cms@crspace}}}%
+ {\usebibmacro{cms-in:}}}%
{\iffieldundef{part}%
{\ifcsdef{cbx@incollpart}%
{\restorefield{part}{\cbx@incollpart}\toggletrue{cms@xrefpart}}%
@@ -3471,8 +3479,7 @@
\setunit{\addspace}%
\bibstring{ofseries}%
\setunit{\addspace}}%
- {\toggletrue{cms@crspace}\usebibmacro{cms-in:}%
- \togglefalse{cms@crspace}}}}%
+ {\usebibmacro{cms-in:}}}}%
{\iffieldundef{part}%
{\ifcsdef{cbx@incollpart}%
{\restorefield{part}{\cbx@incollpart}\toggletrue{cms@xrefpart}}%
@@ -3489,8 +3496,7 @@
\setunit{\addspace}%
\bibstring{ofseries}%
\setunit{\addspace}}%
- {\toggletrue{cms@crspace}\usebibmacro{cms-in:}%
- \togglefalse{cms@crspace}}}}%
+ {\usebibmacro{cms-in:}}}}%
\newbibmacro*{chapincoll}{%
\iffieldundef{chapter}%
@@ -4180,7 +4186,7 @@
\newbibmacro*{backref+check}{%
\ifbibliography%
{\backtrackerfalse}%
- {}}
+ {}}%
\newbibmacro*{cite:postnote}{%
\iftoggle{cms@loccit}%
@@ -4479,7 +4485,7 @@
\iffieldundef{pagination}{}{\savefield{pagination}{\cbx@incollpgn}}%
\iffieldundef{bookpagination}{}{\savefield{bookpagination}%
{\cbx@incollbkpgn}}% The next line saves the child's backrefs
- \iflistundef{pageref}{}{\savelist{pageref}{\cbx@incollpgref}}}
+ \iflistundef{pageref}{}{\savelist{pageref}{\cbx@incollpgref}}}%
\newbibmacro*{xrefpostnote}{%
\ifcsdef{cbx@incollpgref}% Here we print and clear the child's