diff options
author | Karl Berry <karl@freefriends.org> | 2013-05-27 23:01:50 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-05-27 23:01:50 +0000 |
commit | 06b0b0312eaa46e5a87b594eabc4280c9cef86ef (patch) | |
tree | d414804d6c0c7323f32ff9a10b5551915ea27deb /Master/texmf-dist/tex/latex/oscola/oscola.cbx | |
parent | 0b8ab1856673ff7fa3769d3b1a6416374b14c291 (diff) |
oscola
git-svn-id: svn://tug.org/texlive/trunk@30736 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/oscola/oscola.cbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/oscola/oscola.cbx | 40 |
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 |