diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/oscola/oscola.cbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/oscola/oscola.cbx | 60 |
1 files changed, 40 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/latex/oscola/oscola.cbx b/Master/texmf-dist/tex/latex/oscola/oscola.cbx index 2c4b967ed51..72770b3db8f 100644 --- a/Master/texmf-dist/tex/latex/oscola/oscola.cbx +++ b/Master/texmf-dist/tex/latex/oscola/oscola.cbx @@ -2,7 +2,7 @@ % Part of the OSCOLA package for biblatex: see the file % oscola.lbx for copyright and licence information -\ProvidesFile{oscola.cbx}[2015/03/15 v1.5 Biblatex citation style for OSCOLA standard] +\ProvidesFile{oscola.cbx}[2018/03/22 v1.6 Biblatex citation style for OSCOLA standard] \RequireCitationStyle{verbose-inote} @@ -66,7 +66,6 @@ {\usebibmacro{footcite:full}% \usebibmacro{footcite:save}}} - \renewbibmacro*{citeindex}{% \ifboolexpr{ test{\ifciteindex} and test{\iftoggle{cbx@weareindexing}}} {\indexnames{labelname}% @@ -110,7 +109,6 @@ \printtext[bibhyperlink]{% \printfield[citetitle]{labeltitle}}} - \newbibmacro*{cite:miscshort}{% \iffieldundef{shorttitle} {\iffieldundef{journaltitle} @@ -184,7 +182,6 @@ {\printtext[bibhyperlink]{\printfield{shorthand}}% \bbx@resetpostnotedelim}}% - \newbibmacro*{makeshorteu}{% \ifboolexpr{ test {\iffieldundef{number}} or test {\iffieldundef{type}} }% {\usedriver{}{legislation}}% @@ -207,11 +204,21 @@ \newbibmacro*{cite:refonlyfull}{% \usebibmacro{cite:citepages}% \global\togglefalse{cbx:loccit}% - \ifentrytype{jurisdiction} + \ifentrytype{jurisdiction}% {\clearfield{title}% \clearfield{shorttitle}}% {}% - \usebibmacro{cite:full}} + \usebibmacro{cite:full}} + +\newbibmacro*{footcite:ref:juris}{% + \bbx@resetpostnotedelim% + \usebibmacro{citeindex}% + \ifboolexpr {test {\ifciteseen} or test {\ifciteibid}} + {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} + {\footnote{\bibfootnotewrapper{\gdef\blx@postpunct@saved{}\usebibmacro{footcite:ibid}\midsentence\bbx@unsetpostnotedelim\usebibmacro{postnote}}}} + {\footnote{\bibfootnotewrapper{\gdef\blx@postpunct@saved{}\usebibmacro{cite:refonlynote}\usebibmacro{postnote}}}}}% + {\footnote{\bibfootnotewrapper{\gdef\blx@postpunct@saved{}\usebibmacro{cite:refonlyfull}\usebibmacro{postnote}% + \usebibmacro{footcite:save}}}}} % I've left this, although I think I probably won't use it because % it doesn't make sense to have "partial" references going back to @@ -375,9 +382,6 @@ {} {} -% The following declarations are required for some reason that I cannot -% understand. Unless so redefined, we get spacing problems with postnotes - \DeclareCiteCommand{\fullcite} {\usebibmacro{prenote}} {\usebibmacro{cite:full}} @@ -390,15 +394,29 @@ {\multicitedelim} {\usebibmacro{postnote}} -%\DeclareCiteCommand{\textcite}[\cbx@textcite\footciteref] -% {\gdef\cbx@savedkeys{}} -% {\ifboolexpr{ test {\ifentrytype{jurisdiction}} or test{\ifentrytype{legislation}} } -% {\usebibmacro{title:or:shorttitle}}% -% {\printnames{labelname}}% -% \xappto\cbx@savedkeys{\thefield{entrykey},}} -% {\multinamedelim} -% {\protected@xappto\cbx@savedcites{% -% [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}} +\DeclareCiteCommand{\textcite} + {\usebibmacro{prenote}}% + {\ifboolexpr{ ( + test {\ifentrytype{jurisdiction}} + or test {\ifentrytype{legislation}} ) + } + {\usebibmacro{title:or:shorttitle}\blx@postpunct@saved% + \ifboolexpr{ ( + test {\ifentrytype{legislation}} + and test {\iffieldundef{postnote}} + ) } + {} + {\usebibmacro{footcite:ref:juris}}} + {\usebibmacro{cite:author}\blx@postpunct@saved% + \gdef\blx@postpunct@saved{}% + \usebibmacro{footcite:ref:juris}}} + {\multicitedelim} + {} + +\newbibmacro{cite:author}{% + \ifnameundef{labelname} + {\printfield{label}} + {\printnames{labelname}}} \newbibmacro{title:or:shorttitle}{% \ifciteseen @@ -410,7 +428,10 @@ {}}% {\printfield{shorttitle}}}% {\printfield{shorthand}}}% - {\printfield{title}}} + {\printfield{title}% + \ifentrytype{legislation} + {\newunit\usebibmacro{date}} + {}}} \renewbibmacro{textcite}{% \ifentrytype{jurisdiction} @@ -421,5 +442,4 @@ {\printfield[citetitle]{labeltitle}} {\printnames{labelname}}}} - \endinput
\ No newline at end of file |