summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/oscola/oscola.bbx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/oscola/oscola.bbx')
-rw-r--r--Master/texmf-dist/tex/latex/oscola/oscola.bbx69
1 files changed, 27 insertions, 42 deletions
diff --git a/Master/texmf-dist/tex/latex/oscola/oscola.bbx b/Master/texmf-dist/tex/latex/oscola/oscola.bbx
index 19056563b86..3cdcf291044 100644
--- a/Master/texmf-dist/tex/latex/oscola/oscola.bbx
+++ b/Master/texmf-dist/tex/latex/oscola/oscola.bbx
@@ -1,7 +1,7 @@
% Legal Style Citations using OSCOLA
-% Copyright Paul Stanley 2014-2017
-% This work consists of oscola.bbx, english-oscola.lbx, british-oscola.lbx, oscola.cbx
-% and oscola.ist.
+% Copyright Paul Stanley 2014-2018
+% This work consists of oscola.bbx, english-oscola.lbx, british-oscola.lbx,
+% oscola.cbx, american-oscola.lbx and oscola.ist.
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
% of this license or (at your option) any later version.
@@ -13,7 +13,7 @@
% This work has the LPPL maintenance status 'maintained'.
% The current maintainer of this work is Paul Stanley (pstanley@essexcourt.net)
-\ProvidesFile{oscola.bbx}[2017/03/15 v1.5 Biblatex bibliography style for OSCOLA standard]
+\ProvidesFile{oscola.bbx}[2019/01/20 v1.6 Biblatex bibliography style for OSCOLA standard]
\RequireBibliographyStyle{authortitle}
@@ -71,30 +71,15 @@
\DeclareNameAlias{default}{family-given}%
\DeclareNameAlias{editor}{given-family}}
-\renewbibmacro*{name:family-given}[4]{%
- \ifuseprefix
- {\usebibmacro{name:delim}{#3#1}%
- \usebibmacro{name:hook}{#3#1}%
- \ifblank{#3}{}{%
- \ifcapital
- {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
- {\mkbibnameprefix{#3}\isdot}%
- \ifpunctmark{'}{}{\bibnamedelimc}}%
- \mkbibnamefamily{#1}\isdot
- \ifblank{#4}{}{\bibnamedelimd\mkbibnamesuffix{#4}\isdot}%
- \ifblank{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}}
- {\usebibmacro{name:delim}{#1}%
- \usebibmacro{name:hook}{#1}%
- \mkbibnamefamily{#1}\isdot
- \ifblank{#4}{}{\bibnamedelimd\mkbibnamesuffix{#4}\isdot}%
- \ifblank{#2#3}{}{}%
- \ifblank{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
- \ifblank{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}}}
+% Github issue 5 refers: Moewe points out that I don't need a redefinition of
+% the name:family-given bibmacro, but can simply do the following
+\renewcommand*{\revsdnamepunct}{}
\DeclareNameAlias{sortname}{family-given}
% This deals with initials: we need to format them without dots
% and close together: HLA not H.L.A. or H. L. A. or H L A
+% The terseinits=true setting is not sufficient
\renewcommand*\bibinitperiod{}
\renewcommand*\bibinitdelim{}
\let\oldbibnamedelima\bibnamedelima
@@ -161,9 +146,7 @@
\DeclareEntryOption{year-essential}[true]{%
\setboolean{bbx@year-essential}{#1}}
-% Language Mapping
-\DeclareLanguageMapping{english}{english-oscola}
-\DeclareLanguageMapping{british}{british-oscola}
+\DeclareLanguageMappingSuffix{-oscola}
% Various aliases
\DeclareBibliographyAlias{inproceedings}{book}
@@ -293,7 +276,7 @@
\renewcommand\newunitpunct{\addspace}
\renewcommand{\newblockpunct}{\addspace}
\renewcommand{\subtitlepunct}{\addcolon\addspace}
-\newcommand{\extracitedelim}{,\space}
+\newcommand{\extracitedelim}{\addcomma\space}
\newcommand\casenotetext{\bibstring{casenote}}
\newcommand\firstpublishedstr{\bibstring{firstpublished}}
\newcommand*{\legalstarturl}{\ensuremath{\langle}}
@@ -635,7 +618,7 @@
\iffieldequals{entrysubtype}{\subtypecourtrules}%
{\usebibmacro{courtrules}}
{\ifkeyword{draft}%
- {\usebibmacro{legislation:bill}}
+ {\usebibmacro{legislation:bill}}%
{\ifkeyword{eu}%
{\usebibmacro{eulegislation}}%
{\printfield[default]{title}%
@@ -1191,8 +1174,10 @@
\newunit\newblock}
\newbibmacro{enjuriscitation}{%
- \usebibmacro{title}%
- \newunit\newblock
+ \iffieldundef{title}%
+ {}%
+ {\usebibmacro{title}%
+ \newunit\newblock}%
\usebibmacro{neutralcite}%
\iffieldundef{journaltitle}% UNREPORTED CASE
{}%
@@ -1276,7 +1261,9 @@
\newbibmacro{eulegislation}{%
\printfield[default]{title}%
\newunit\newblock%
- \usebibmacro{eulegref}}
+ \usebibmacro{eulegref}%
+ \newunit\newblock%
+ \usebibmacro{doi+eprint+url}}
\newbibmacro{eulegref}{%
\ifboolexpr{test {\iffieldequals{journaltitle}{\officialjournaltitle}}
@@ -1482,8 +1469,8 @@
\boolean{bbx@year-essential}%
\) }%
{\ifboolexpr{ test {\ifkeyword{sc}} or
- test {\iftoggle{bbx:scotstyle}}}
- {\usebibmacro{year}}
+ test {\iftoggle{bbx:scotstyle}}}%
+ {\usebibmacro{year}}%
{\usebibmacro{year}[brackets]}}%
{\usebibmacro{year}[parens]}%
}
@@ -1617,13 +1604,11 @@
\printtext{\mkbibparens{\usebibmacro{sessionyear}}}%
\newunit%
\iffieldundef{number}
- {}
+ {}%
{\printlist[billprinting]{institution}}%
- }
+ }%
{\printtext{\bibopenparen{\bibstring{draft}}
- \addspace\printdate\bibcloseparen}}
- \newunit}
-
+ \addspace\printdate\bibcloseparen}}}
\newbibmacro{legislation:note}{%
\iffieldundef{note}
@@ -1763,7 +1748,7 @@
{}%<--- this used to read \midsentence
{\ifboolexpr{test {\ifnumequal{\value{bbx@suppresspostnotedelim}}{1}}}
{\setunit{\addspace}%
- \bbx@resetpostnotedelim}
+ \bbx@resetpostnotedelim}%
{\setunit{\postnotedelim}}%
\usebibmacro{postnotepagination}}%
\global\toggletrue{cbx@postnoteprinted}}
@@ -1941,8 +1926,8 @@
\usebibmacro{author/editor/institution}%
\setunit*{\addcomma\space}\newblock
\usebibmacro{title}%
- \usebibmacro{reportinfo}
- \newunit\newblock
+ \usebibmacro{reportinfo}%
+ \newunit\newblock
\usebibmacro{revisedbookvolume}%
\newunit\newblock}%
@@ -2961,7 +2946,7 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\DeclareSortingScheme{niyt}{
+\DeclareSortingTemplate{niyt}{
\sort{
\field{presort}
}