summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/oscola/oscola.cbx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/oscola/oscola.cbx')
-rw-r--r--Master/texmf-dist/tex/latex/oscola/oscola.cbx40
1 files changed, 32 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/oscola/oscola.cbx b/Master/texmf-dist/tex/latex/oscola/oscola.cbx
index 72716b765c5..7125ff94ea4 100644
--- a/Master/texmf-dist/tex/latex/oscola/oscola.cbx
+++ b/Master/texmf-dist/tex/latex/oscola/oscola.cbx
@@ -2,10 +2,15 @@
% Part of the OSCOLA package for biblatex: see the file
% oscola.lbx for copyright and licence information
-\ProvidesFile{oscola.cbx}[2012/08/16 v0.1 Biblatex citation style for OSCOLA standard]
+\ProvidesFile{oscola.cbx}[2013/05/23 v1.2 Biblatex citation style for OSCOLA standard]
\RequireCitationStyle{verbose-inote}
+\newcommand{\bbx@ifnottrackingcites}{%
+ \ifx\blx@imc@ifciteseen\@secondoftwo
+ \expandafter\@firstoftwo\else
+ \expandafter\@secondoftwo\fi}
+
\newcounter{bbx@lastcitedc}
\newtoggle{bbx@samefootnote}
@@ -32,8 +37,9 @@
\renewbibmacro*{cite}{%
\usebibmacro{cite:citepages}%
\global\togglefalse{cbx:loccit}%
- \ifciteseen
- {\iffieldundef{shorthand}
+ \ifboolexpr {test {\ifciteseen} or test {\ifciteibid}}
+ {\ifboolexpr {test {\iffieldundef{shorthand}}
+ or test {\bbx@ifnottrackingcites}}
{\ifboolexpr{
test {\ifciteibid}
and
@@ -46,6 +52,19 @@
{\usebibmacro{cite:shorthand}}}
{\usebibmacro{cite:full}}}
+\renewbibmacro*{footcite}{%
+ \usebibmacro{cite:citepages}%
+ \global\togglefalse{cbx:loccit}%
+ \ifboolexpr {test {\ifciteseen} or test {\ifciteibid}}
+ {\ifboolexpr {test {\iffieldundef{shorthand}}
+ or test {\bbx@ifnottrackingcites}}
+ {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+ {\usebibmacro{footcite:ibid}}
+ {\usebibmacro{footcite:note}}}%
+ {\usebibmacro{footcite:shorthand}}}
+ {\usebibmacro{footcite:full}%
+ \usebibmacro{footcite:save}}}
+
\renewbibmacro*{citeindex}{%
\ifboolexpr{ test{\ifciteindex} and test{\iftoggle{cbx@weareindexing}}}
@@ -57,7 +76,9 @@
\newcommand{\DNI}{\togglefalse{cbx@weareindexing}}
\newbibmacro*{footcite:note:old}{%
- \ifboolexpr{ test {\ifentrytype{misc}} or test {\ifentrytype{legal}} }
+ \ifboolexpr{ test {\ifentrytype{misc}}
+ or test {\ifentrytype{legal}}
+ or test {\ifentrytype{jurisdiction}}}
{\printfield[title]{labeltitle}\setunit*{\addspace}}
{\ifnameundef{labelname}%
{\printfield{label}}%
@@ -87,6 +108,7 @@
\setunit*{\nametitledelim}%
\printtext[bibhyperlink]{%
\printfield[citetitle]{labeltitle}}}
+
\newbibmacro*{cite:miscshort}{%
\iffieldundef{shorttitle}
@@ -238,7 +260,7 @@
{\usebibmacro{cite:shortleg}}
{\ifboolexpr{(
test {\ifentrytype{commentary}}
- or (test {\ifentrytype{legal}} and not test {\iffieldequals{entrysubtype}{\treatysubtype}} )
+ or (test {\ifentrytype{legal}} and not test {\iffieldequals{entrysubtype}{\treatysubtype}} )
or (test {\ifentrytype{jurisdiction}}
and (not test {\iffieldundef{userc}})
and (not test {\iffieldundef{postnote}})))}%
@@ -248,11 +270,12 @@
{\usebibmacro{cite:oldshort}}}}}
\renewbibmacro*{footcite:note}{%
- \ifboolexpr{test {\ifentrytype{legislation}}
+ \ifboolexpr{test {\ifentrytype{legislation}}
or ( test {\ifentrytype{legal}}
- and not test {\iffieldequals{entrysubtype}{\treatysubtype}} )}%
+ and ( not test {\iffieldequals{entrysubtype}{\treatysubtype}} ))}%
{\usebibmacro{cite:short}}%
- {\ifentrytype{commentary}%
+ {\ifboolexpr{ test {\ifentrytype{commentary}}
+ or ( test {\ifentrytype{legal}} and not test {\iffieldequals{entrysubtype}{\treatysubtype}}) }%
{\usebibmacro{footcite:full}}%
{\ifboolexpr{ ( test {\ifentrytype{jurisdiction}}
and
@@ -387,4 +410,5 @@
{\printfield{shorthand}}}%
{\printfield{title}}}
+
\endinput \ No newline at end of file