summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx89
1 files changed, 78 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
index 05a2999b84a..bcd8d124745 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
@@ -1,20 +1,86 @@
-% $Id: verbose-trad3.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-trad3.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
\ProvidesFile{verbose-trad3.cbx}
-[\abx@cbxid $Id: verbose-trad3.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@cbxid $Id: verbose-trad3.cbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
-\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
- loccittracker=constrict,autocite=footnote}
\providecommand*{\mkibid}[1]{#1}
-\newbool{cbx:ibid}
+\newtoggle{cbx:loccit}
\DeclareBibliographyOption{strict}[true]{%
\ifstrequal{#1}{true}
{\ExecuteBibliographyOptions{ibidtracker=constrict,loccittracker=constrict}}
{\ExecuteBibliographyOptions{ibidtracker=context,loccittracker=context}}}
+\DeclareBibliographyOption{citepages}[permit]{%
+ \ifcsdef{cbx@opt@citepages@#1}
+ {\csuse{cbx@opt@citepages@#1}}
+ {\PackageError{biblatex}
+ {Invalid option 'citepages=#1'}
+ {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}}
+
+\def\cbx@opt@citepages@permit{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{}%
+ \renewbibmacro*{cite:postnote}{%
+ \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@suppress{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \clearfield{pages}%
+ \clearfield{pagetotal}}%
+ \renewbibmacro*{cite:postnote}{%
+ \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@omit{%
+ \renewbibmacro*{cite:citepages}{}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \ifboolexpr{
+ test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+ and
+ test {\iffieldpages{postnote}}
+ }
+ {\clearfield{pages}%
+ \clearfield{pagetotal}}
+ {}}%
+ \renewbibmacro*{cite:postnote}{%
+ \usebibmacro{cite:postnote:ibidpage}}}
+
+\def\cbx@opt@citepages@separate{%
+ \providetoggle{cbx:fullcite}%
+ \renewbibmacro*{cite:citepages}{%
+ \global\togglefalse{cbx:fullcite}}%
+ \renewbibmacro*{cite:full:citepages}{%
+ \global\toggletrue{cbx:fullcite}}%
+ \renewbibmacro*{cite:postnote}{%
+ \ifboolexpr{
+ togl {cbx:fullcite}
+ and
+ test {\iffieldpages{postnote}}
+ and
+ test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
+ and
+ (
+ not test {\iffieldundef{pages}}
+ or
+ not test {\iffieldundef{pagetotal}}
+ )
+ }
+ {\usebibmacro{cite:postnote:pages}}
+ {\usebibmacro{cite:postnote:ibidpage}}}
+ \providebibmacro*{cite:postnote:pages}{%
+ \setunit{\postnotedelim}%
+ \bibstring{thiscite}%
+ \setunit{\addspace}%
+ \printfield{postnote}}}
+
+\ExecuteBibliographyOptions{citetracker=context,ibidtracker=constrict,
+ loccittracker=constrict,autocite=footnote,
+ citepages=permit}
+
\newbibmacro*{cite}{%
- \global\boolfalse{cbx:ibid}%
+ \usebibmacro{cite:citepages}%
+ \global\togglefalse{cbx:loccit}%
\ifciteseen
{\ifciteibid
{\ifloccit
@@ -28,6 +94,7 @@
{\usebibmacro{cite:full}}}
\newbibmacro*{cite:full}{%
+ \usebibmacro{cite:full:citepages}%
\printtext[bibhypertarget]{%
\usedriver
{\DeclareNameAlias{sortname}{default}}
@@ -36,25 +103,25 @@
\newbibmacro*{cite:short}{%
\printnames{labelname}%
- \setunit*{\addcomma\space}%
+ \setunit*{\nametitledelim}%
\printtext[bibhyperlink]{%
\printfield[citetitle]{labeltitle}}}
\newbibmacro*{cite:opcit}{%
\printnames{labelname}%
- \setunit*{\addcomma\space}%
+ \setunit*{\nametitledelim}%
\printtext[bibhyperlink]{%
\bibstring[\mkibid]{opcit}}}
\newbibmacro*{cite:ibid}{%
\printtext[bibhyperlink]{\bibstring[\mkibid]{ibidem}}%
- \global\booltrue{cbx:ibid}}
+ \global\toggletrue{cbx:loccit}}
\newbibmacro*{cite:shorthand}{%
\printtext[bibhyperlink]{\printfield{shorthand}}}
-\newbibmacro*{cite:postnote}{%
- \ifbool{cbx:ibid}
+\newbibmacro*{cite:postnote:ibidpage}{%
+ \iftoggle{cbx:loccit}
{}
{\usebibmacro{postnote}}}