summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-08-18 22:29:05 +0000
committerKarl Berry <karl@freefriends.org>2014-08-18 22:29:05 +0000
commit9422fc520291ceb7eb36aaacb2b97c08bdb02c9e (patch)
treef9aa98cb24fb2f56941fa7773eba010804383254 /Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
parent389e6d20a6f1b1e09d2e129c21dbad563c233a56 (diff)
biblatex-chicago (18aug14)
git-svn-id: svn://tug.org/texlive/trunk@34969 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx350
1 files changed, 294 insertions, 56 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 c60c053a134..631ace42640 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,9 @@
-% $Id: chicago-authordate.bbx,v 0.8.1.49 2013/10/29 14:04:23 dfussner Exp $
+% $Id: chicago-authordate.bbx,v 0.8.2.7 2014/08/15 09:45:18 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}[2013/10/29 v 2.8 biblatex
+\ProvidesFile{chicago-authordate.bbx}[2014/08/15 v 2.9a biblatex
bibliography style]
%%%% Initialize and format bibliography and los %%%%
@@ -23,7 +22,20 @@ bibliography style]
{\endlist}
{\item}
-\defbibenvironment{shorthands}
+\defbibenvironment{shorthands}% biblatex < 2.9
+ {\list
+ {\printfield[shorthandwidth]{shorthand}}%
+ {\setlength{\labelwidth}{\shorthandwidth}%
+ \setlength{\leftmargin}{\labelwidth}%
+ \setlength{\labelsep}{\biblabelsep}%
+ \addtolength{\leftmargin}{\labelsep}%
+ \setlength{\itemsep}{\lositemsep}%
+ \setlength{\parsep}{\bibparsep}%
+ \renewcommand*{\makelabel}[1]{##1\hss}}}
+ {\endlist}
+ {\item}
+
+\defbibenvironment{shorthand}
{\list
{\printfield[shorthandwidth]{shorthand}}%
{\setlength{\labelwidth}{\shorthandwidth}%
@@ -122,9 +134,9 @@ bibliography style]
{\addlowpenspace\mkbibnameaffix{#4}\isdot}%
{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot%
\ifboolexpr{
- test{\ifnumless{\value{listcount}}{\value{listtotal}}}
+ test{\ifnumless{\value{listcount}}{\value{listtotal}}}%
and
- test{\ifnumless{\value{listcount}}{\value{maxnames}}}
+ test{\ifnumless{\value{listcount}}{\value{maxnames}}}%
}
{\addcomma}%
{}}}%
@@ -336,7 +348,34 @@ bibliography style]
%%%% Drivers for Bibliography entries and Shorthands %%%%
-\DeclareBibliographyDriver{shorthands}{%
+\DeclareBibliographyDriver{shorthand}{%
+ \iftoggle{cms@los}%
+ {\ifnameundef{labelname}
+ {\mkbibemph{\bibstring{see}}%
+ \addspace%
+ \usebibmacro{shorthand:label}}%
+ {\mkbibemph{\bibstring{see}}%
+ \addspace%
+ \usebibmacro{author/editor}}%
+ \finentry}%
+ {\iftoggle{cms@fullshhand}%
+ {\usedriver{\frenchspacing}%
+ {\thefield{entrytype}}%
+ \finentry}%
+ {\ifnameundef{labelname}
+ {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
+ \ifentrytype{periodical}}%
+ {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}%
+ \newcunit}}%
+ {\ifentrytype{manual}%
+ {\printtext[bibhyperref]{\printlist{organization}\newcunit}}%
+ {}}}
+ {\usebibmacro{author/editor}%
+ \setunit{\addcomma\space}}%
+ \printfield[lostitle]{title}%
+ \finentry}}}
+
+\DeclareBibliographyDriver{shorthands}{% biblatex < 2.9
\iftoggle{cms@los}%
{\ifnameundef{labelname}
{\mkbibemph{\bibstring{see}}%
@@ -637,13 +676,31 @@ bibliography style]
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{xref}}
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{crossref}}%
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{bookinbook}{%
@@ -715,13 +772,31 @@ bibliography style]
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{xref}}
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{crossref}}%
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{booklet}{%
@@ -811,13 +886,31 @@ bibliography style]
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{xref}}
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{crossref}}%
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{customc}{%
@@ -932,13 +1025,31 @@ bibliography style]
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{xref}}
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{crossref}}%
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{incollection}{%
@@ -1002,13 +1113,31 @@ bibliography style]
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{xref}}
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{crossref}}%
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{inproceedings}{%
@@ -1065,13 +1194,31 @@ bibliography style]
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{xref}}
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{crossref}}%
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{inreference}{%
@@ -1198,17 +1345,31 @@ bibliography style]
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
-{\ifpunctmark{*}% Attempt to fix issues with n.d. Changed for 0.9.
- {\setunit{\nopunct\addspace\bibsentence}}%
- {}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\newunit}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{xref}}
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}%
-{\ifpunctmark{*}% Likewise.
- {\setunit{\nopunct\addspace\bibsentence}}%
- {}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\newunit}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{crossref}}%
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{manual}{%
@@ -1640,13 +1801,31 @@ bibliography style]
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{xref}}
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+{\ifboolexpr{% Changed for 16th ed.
+ test {\ifterm}%
+ or
+ test {\ifpunctmark{*}}%
+ }
+ {\setunit{\addspace\bibsentence}}%
+ {\setunit{\addperiod\addspace}}%
+ \usebibmacro{bibprexref}%
\bibxrefcite{\thefield{crossref}}%
\usebibmacro{bibpostxref}%
+ \newunit\newblock
+ \usebibmacro{originally+published+as}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{reference}{%
@@ -2097,13 +2276,13 @@ bibliography style]
\ifthenelse{\iffieldundef{labelyear}\OR%
\iffieldequalstr{labelyear}{nodate}}% or new declaration ???
{\ifboolexpr{
- test {\ifentrytype{misc}}
+ test {\ifentrytype{misc}}%
or
- test {\ifentrytype{inreference}}
+ test {\ifentrytype{inreference}}%
or
- test {\ifentrytype{reference}}
+ test {\ifentrytype{reference}}%
or
- test {\ifentrytype{mvreference}}
+ test {\ifentrytype{mvreference}}%
or
not togl {cms@nodates}}%
{}%
@@ -2118,7 +2297,11 @@ bibliography style]
\printfield{extrayear}}%
\iffieldundef{urlendyear}%
{\clearfield{urlyear}}%
- {\iffieldequalstr{urlendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{urlendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{urlyear}}%
{\iffieldundef{urlmonth}%
@@ -2133,7 +2316,11 @@ bibliography style]
\printfield{extrayear}}%
\iffieldundef{origendyear}%
{\clearfield{origyear}}%
- {\iffieldequalstr{origendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{origendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{origyear}}%
{\iffieldundef{origmonth}%
@@ -2148,7 +2335,11 @@ bibliography style]
\printfield{extrayear}}%
\iffieldundef{eventendyear}%
{\clearfield{eventyear}}%
- {\iffieldequalstr{eventendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{eventendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{eventyear}}%
{\iffieldundef{eventmonth}%
@@ -2163,7 +2354,11 @@ bibliography style]
\printfield{extrayear}}%
\iffieldundef{endyear}% DATE FIX
{\clearfield{year}}%
- {\iffieldequalstr{endyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{endyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{year}}%
{\iffieldundef{month}%
@@ -2176,13 +2371,13 @@ bibliography style]
\ifthenelse{\iffieldundef{labelyear}\OR%
\iffieldequalstr{labelyear}{nodate}}%
{\ifboolexpr{
- test {\ifentrytype{misc}}
+ test {\ifentrytype{misc}}%
or
- test {\ifentrytype{inreference}}
+ test {\ifentrytype{inreference}}%
or
- test {\ifentrytype{reference}}
+ test {\ifentrytype{reference}}%
or
- test {\ifentrytype{mvreference}}
+ test {\ifentrytype{mvreference}}%
or
not togl {cms@nodates}}%
{}%
@@ -2197,7 +2392,11 @@ bibliography style]
\printfield{extrayear}}%
\iffieldundef{urlendyear}%
{\clearfield{urlyear}}%
- {\iffieldequalstr{urlendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{urlendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{urlyear}}%
{\iffieldundef{urlmonth}%
@@ -2212,7 +2411,11 @@ bibliography style]
\printfield{extrayear}}%
\iffieldundef{eventendyear}%
{\clearfield{eventyear}}%
- {\iffieldequalstr{eventendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{eventendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{eventyear}}%
{\iffieldundef{eventmonth}%
@@ -2227,7 +2430,11 @@ bibliography style]
\printfield{extrayear}}%
\iffieldundef{endyear}%
{\clearfield{year}}%
- {\iffieldequalstr{endyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{endyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{year}}%
{\iffieldundef{month}%
@@ -2242,7 +2449,11 @@ bibliography style]
\printfield{extrayear}}%
\iffieldundef{origendyear}% DATE FIX
{\clearfield{origyear}}%
- {\iffieldequalstr{origendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{origendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{origyear}}%
{\iffieldundef{origmonth}%
@@ -2255,13 +2466,13 @@ bibliography style]
\ifthenelse{\iffieldundef{labelyear}\OR%
\iffieldequalstr{labelyear}{nodate}}%
{\ifboolexpr{
- test {\ifentrytype{misc}}
+ test {\ifentrytype{misc}}%
or
- test {\ifentrytype{inreference}}
+ test {\ifentrytype{inreference}}%
or
- test {\ifentrytype{reference}}
+ test {\ifentrytype{reference}}%
or
- test {\ifentrytype{mvreference}}
+ test {\ifentrytype{mvreference}}%
or
not togl {cms@nodates}}%
{}%
@@ -2276,7 +2487,11 @@ bibliography style]
\printfield{extrayear}}%
\iffieldundef{urlendyear}%
{\clearfield{urlyear}}%
- {\iffieldequalstr{urlendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{urlendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{urlyear}}%
{\iffieldundef{urlmonth}%
@@ -2291,7 +2506,11 @@ bibliography style]
\printfield{extrayear}}%
\iffieldundef{endyear}%
{\clearfield{year}}%
- {\iffieldequalstr{endyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{endyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{year}}%
{\iffieldundef{month}%
@@ -2306,7 +2525,11 @@ bibliography style]
\printfield{extrayear}}%
\iffieldundef{origendyear}%
{\clearfield{origyear}}%
- {\iffieldequalstr{origendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{origendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{origyear}}%
{\iffieldundef{origmonth}%
@@ -2321,7 +2544,11 @@ bibliography style]
\printfield{extrayear}}%
\iffieldundef{eventendyear}% DATE FIX
{\clearfield{eventyear}}%
- {\iffieldequalstr{eventendyear}{}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{eventendyear}{}}%
+ and
+ not togl {cms@datedash}%
+ }
{\mbox{\bibdatedash}%
\clearfield{eventyear}}%
{\iffieldundef{eventmonth}%
@@ -2352,9 +2579,9 @@ bibliography style]
\newbibmacro*{cmsbibsortdate}{% Attempt to solve date-related problems
\ifboolexpr{%
- test {\iffieldundef{origyear}}
+ test {\iffieldundef{origyear}}%
or
- not test {\iffieldint{origyear}}
+ not test {\iffieldint{origyear}}%
}%
{\usebibmacro{cmsbibyear}}%
{\iffieldint{year}%
@@ -2522,6 +2749,9 @@ bibliography style]
\newunit%
\printfield{volumes}}}}%
+\newbibmacro*{bibprexref}{% For back references
+ \iflistundef{pageref}{}{\savelist{pageref}{\cbx@incollpgref}}}%
+
\newbibmacro*{bibpostxref}{% Volume fix
\iffieldundef{chapter}%
{\iffieldundef{pages}%
@@ -2577,7 +2807,13 @@ bibliography style]
\printfield{part}%
\newcunit%
\printfield{pages}}}}}}%
- {\newcunit\printfield{chapter}}}
+ {\newcunit\printfield{chapter}}%
+ \ifcsdef{cbx@incollpgref}% Here we print and clear the child's
+ {\restorelist{pageref}{\cbx@incollpgref}% backrefs
+ \newunit%
+ \usebibmacro{pageref}%
+ \global\let\cbx@incollpgref\undefined}%
+ {}}
\newbibmacro*{volume+or+volumes}{% Volume fix (modified)
\iffieldundef{maintitle}%
@@ -2693,7 +2929,8 @@ bibliography style]
\setunit{\addspace}%
\ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}
\AND\iffieldundef{number}}%
- {\iffieldundef{bookpagination}% Removed kludge for French colon spacing?
+ {\ifthenelse{\iffieldundef{bookpagination}\AND\NOT%
+ \iffieldundef{volume}}% Removed kludge for French colon spacing?
{\setunit{\postvolpunct}}%
{\setunit{\addcolon\addspace}}}% This may not be universally correct.
{\printtext[parens]{% Perhaps if it's wrong use magazine subtype?
@@ -2712,7 +2949,8 @@ bibliography style]
\setunit{\addspace}%
\ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}
\AND\iffieldundef{number}}%
- {\iffieldundef{bookpagination}% Removed kludge for French ???
+ {\ifthenelse{\iffieldundef{bookpagination}\AND\NOT%
+ \iffieldundef{volume}}% Removed kludge for French ???
{\setunit{\postvolpunct}}%
{\setunit{\addcolon\addspace}}}%
{\printtext[parens]{%