texlive[43599] Master/texmf-dist: oscola (25mar17)
commits+karl at tug.org
commits+karl at tug.org
Sat Mar 25 21:53:45 CET 2017
Revision: 43599
http://tug.org/svn/texlive?view=revision&revision=43599
Author: karl
Date: 2017-03-25 21:53:44 +0100 (Sat, 25 Mar 2017)
Log Message:
-----------
oscola (25mar17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/oscola/oscola-examples.bib
trunk/Master/texmf-dist/doc/latex/oscola/oscola.pdf
trunk/Master/texmf-dist/doc/latex/oscola/oscola.tex
trunk/Master/texmf-dist/makeindex/oscola/oscola.ist
trunk/Master/texmf-dist/tex/latex/oscola/english-oscola.lbx
trunk/Master/texmf-dist/tex/latex/oscola/oscola.bbx
trunk/Master/texmf-dist/tex/latex/oscola/oscola.cbx
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/oscola/README.md
trunk/Master/texmf-dist/tex/latex/oscola/british-oscola.lbx
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/oscola/README
Deleted: trunk/Master/texmf-dist/doc/latex/oscola/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/oscola/README 2017-03-25 20:53:31 UTC (rev 43598)
+++ trunk/Master/texmf-dist/doc/latex/oscola/README 2017-03-25 20:53:44 UTC (rev 43599)
@@ -1,74 +0,0 @@
-SUMMARY
-=======
-
-The Oscola package works (only!) with Biblatex (v 2.0 or later) and
-Biber (v 1.0 or later). It aims to implement, almost completely, the
-OSCOLA style of legal citation, according to the 4th edition. For
-further information about coverage see the documentation.
-
-FILES AND LICENCE
-=================
-
-The package consists of three principal files (oscola.bbx, oscola.cbx
-and english-oscola.lbx) which should be placed, documentation
-(oscola.pdf), and a very short index style file
-(oscola.ist). Those files are copyright (c) Paul Stanley 2012-13.
-
-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.
-
-The latest version of the license is in
- http://www.latex-project.org/lppl.txt
-and version 1.3 or later is part of all distributions of LaTeX
-version 2005/12/01 or later.
-
-This work has the LPPL maintenance status 'maintained'. The current
-maintainer of this work is Paul Stanley (pstanley at essexcourt.net)
-
-The documentation consists of oscola.pdf and
-oscola-examples.bib. Those files are distributed under the Creative
-Commons Attribution 3.0-Unported License (CC BY 3.0). A copy of that
-license is available at
- http://creativecommons.org/licenses/by/3.0/deed.en_GB
-
-The LaTeX source of oscola.pdf is available upon request
-from the author, or from https://github.com/PaulStanley/oscola-biblatex.
-It is also licensed under CC BY 3.0.
-
-All bug reports, questions, or suggestions should be sent to the
-maintainer, whose email is pstanley at essexcourt.net.
-
-INSTALLATION
-============
-
-I find the TDS difficult, but I think the correct installation (under
-the local tree) is as follows:
-
-oscola.bbx: With the bibliography style files in
- ...tex/latex/biblatex/bbx
-oscola.cbx: With the citation style files in
- .../tex/latex/biblatex/cbx
-english-oscola.lbx: With the language definition files in
- .../tex/latex/biblatex/lbx
-oscola.pdf: With documentation in a suitable directory
- under .../doc/latex
-oscola.ist: With the index style files in
- .../makeindex/latex
-oscola-examples.bib: With the sample bibliography files in a suitable
- directory under .../bibtex/bib
-
-VERSION HISTORY
-===============
-
-August 2012 Version 1 Original release
-
-May 2013 Version 1.2 Various bugfixes, and implementation
- of citation scheme for UN documents
-
-October 2013 Version 1.3 Corrected spacing bug
-
-May 2014 Version 1.4 Various bugs have been fixed, an additional
- index has been installed, and there have
- been minor improvements to the documentation
-
Added: trunk/Master/texmf-dist/doc/latex/oscola/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/oscola/README.md (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/oscola/README.md 2017-03-25 20:53:44 UTC (rev 43599)
@@ -0,0 +1,69 @@
+# Summary
+
+The Oscola package works (only!) with Biblatex (v 2.0 or later) and
+Biber (v 1.0 or later). It aims to implement, almost completely, the
+OSCOLA style of legal citation, according to the
+[4th edition](https://www.law.ox.ac.uk/sites/files/oxlaw/oscola_4th_edn_hart_2012.pdf). For
+further information about coverage see the documentation.
+
+# Files and licence
+
+## The package
+
+The package consists of four principal files (`oscola.bbx`, `oscola.cbx`,
+`english-oscola.lbx`, and `british-oscola.lbx`) and a very short index
+style file, `oscola.ist`. Those files are copyright (c) Paul Stanley
+2012-17.
+
+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.
+
+The latest version of the license is in [available online](http://www.latex-project.org/lppl.txt)
+and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later.
+
+This work has the LPPL maintenance status 'maintained'. The current
+maintainer of this work is Paul Stanley (pstanley at essexcourt.net).
+
+## The documentation
+
+The documentation consists of `oscola.tex`, `oscola.pdf` and
+`oscola-examples.bib`. Those files are distributed under the Creative
+Commons Attribution 3.0-Unported License (CC BY 3.0). A copy of that
+license is available [online](http://creativecommons.org/licenses/by/3.0/deed.en_GB).
+
+## Bug reports
+
+All bug reports, questions, or suggestions should be sent to the
+maintainer, whose email is pstanley at essexcourt.net.
+
+# Installation
+
+I find the TDS difficult. TeXlive, whose maintainers apparently don't,
+currently installs as follows:
+
+* `oscola.bbx`: in the package directory `...tex/latex/oscola`
+* `oscola.cbx`: in the package directory `.../tex/latex/oscola`
+* `english-oscola.lbx`: in the package directory `.../tex/latex/oscola`
+* `british-oscola.lbx`: in the package directory `.../tex/latex/oscola`
+* `oscola.pdf` and `oscola.tex`: with documentation under `.../doc/latex/oscola`
+* `oscola.ist`: with the index style files in `.../makeindex/oscola`
+
+# Version history
+
+August 2012 Version 1 Original release
+
+May 2013 Version 1.2 Various bugfixes, and implementation
+ of citation scheme for UN documents
+
+October 2013 Version 1.3 Corrected spacing bug
+
+May 2014 Version 1.4 Various bugs have been fixed, an additional
+ index has been installed, and there have
+ been minor improvements to the documentation
+
+March 2017 Version 1.5 The package has been updated to take
+ account of changes in Biblatex; various bugs
+ have been fixed; experimental support has
+ been added for the use of ECLI numbers
+ in EU cases.
Property changes on: trunk/Master/texmf-dist/doc/latex/oscola/README.md
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/oscola/oscola-examples.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/oscola/oscola-examples.bib 2017-03-25 20:53:31 UTC (rev 43598)
+++ trunk/Master/texmf-dist/doc/latex/oscola/oscola-examples.bib 2017-03-25 20:53:44 UTC (rev 43599)
@@ -245,7 +245,7 @@
location = {London},
}
@jurisdiction{adbhu,
- keywords = {eu},
+ keywords = {eu},
title = {Procureur de la R\'epublique v ADBHU},
shorttitle = {ADBHU},
number = {240/83},
@@ -253,6 +253,7 @@
date = {1985},
reporter = {ECR},
pages = {531},
+ ecli = {EU:C:1985:59},
}
@jurisdiction{C430/93,
Modified: trunk/Master/texmf-dist/doc/latex/oscola/oscola.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/oscola/oscola.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/oscola/oscola.tex 2017-03-25 20:53:31 UTC (rev 43598)
+++ trunk/Master/texmf-dist/doc/latex/oscola/oscola.tex 2017-03-25 20:53:44 UTC (rev 43599)
@@ -1,14 +1,17 @@
-% This file documents the biblatex-oscola package. It is (c) Paul Stanley 2014
+% This file documents the biblatex-oscola package. It is (c) Paul Stanley 2014-2017
% and licensed under the Creative Commons Attribution 3.0-Unported License (CC BY 3.0). A copy of that
% license is available at
% http://creativecommons.org/licenses/by/3.0/deed.en_GB
%
-% The documentation makes use of fonts that are commercially available, but may
-% be modified so that it does not do so.
-% To compile: run LaTeX, Biber, LaTeX, LaTeX, splitindex -- -s oscola.ist, makeindex oscola-documentation-general, LaTeX, LaTeX
+% To compile: run
+% LaTeX <oscola>
+% Biber <oscola>
+% LaTeX <oscola> , LaTeX <oscola>
+% splitindex <oscola> -- -s oscola.ist
+% makeindex oscola-general
+% LaTeX <oscola>, LaTeX <oscola>
%
%
-
\documentclass[a4paper,
11pt,
DIV=1,
@@ -16,8 +19,8 @@
{scrartcl}
% SET VERSION NUMBER AND RELEASE DATE
-\def\releasedate{22 May 2014}
-\def\versionnumber{1.4}
+\def\releasedate{1 April 2017}
+\def\versionnumber{1.5}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage{geometry}
@@ -36,6 +39,7 @@
\usepackage[style=oscola,
indexing=cite,
backend=biber,
+ ecli=yes,
babel=hyphen]{biblatex}
\usepackage[splitindex,
@@ -63,11 +67,6 @@
\renewcommand{\linespread}{1.2}
-% HYPER REF
-
-\usepackage{hyperref}
-
-
% Various commands and environments specific to this document
\newcommand{\oscola}{\textsc{bl-oscola}}
\newcommand{\biblatex}{\textsc{biblatex}}
@@ -74,7 +73,8 @@
\newcommand{\oscolashort}{\textsc{oscola}\nocite{oscola}}
\newcounter{egcounter}\setcounter{egcounter}{0}
-
+% TYPOGRAPHY
+\usepackage{scrpage2}
\usepackage[dvipsnames]{xcolor}
% This code from Juanjo's answer at http://www.latex-community.org
@@ -101,6 +101,11 @@
\newcommand{\egcite}[1]{{\texttt{\textbackslash cite#1}}}
\newcommand\angledtext[1]{$\langle$\textit{#1}\/$\rangle$}
+% HYPER REF
+
+\usepackage[final=true,colorlinks=true]{hyperref}
+
+
% BIBLIOGRAPHIC RESOURCES
\addbibresource{oscola-examples.bib}
@@ -109,9 +114,8 @@
\hyphenation{nieu-wen-huis}
\hyphenation{sti-cht-ing}
-% TYPOGRAPHY
-\usepackage{scrpage2}
+% Some basic typographical settings
\deffootnote{1em}{1em}{\thefootnotemark\ }
\setcounter{secnumdepth}{-1}
\frenchspacing
@@ -192,6 +196,8 @@
\tableofcontents
+\clearpage
+
\section{Scope}
\index[general]{scope of package|(}The \oscola\ style for \biblatex\
@@ -225,7 +231,7 @@
a work with \emph{extensive} citation of public international law
materials.
-\textsc{Bl-oscola}\index[general]{scope of package!historical cases}
+This style\index[general]{scope of package!historical cases}
does not include citation forms for Yearbook or historical
cases\footcite[20--21]{oscola} (other than the \enquote{plain vanilla}
of the nominate reports and the English Reports). Nor does the package
@@ -249,13 +255,13 @@
the US, Australia, Canada and New Zealand, but not for citing
legislation or `official' materials.
\item The \oscola\ style provides basic facilities for citing public
- international law treaties and case law, and at least many UN documents, but does not cover
- everything that the 3rd edition of \oscola\ specifies in relation to
- such materials.
+ international law treaties and case law, and at least many UN
+ documents, but does not cover everything that the 3rd edition of
+ \oscola\ specifies in relation to such materials.
\end{itemize}
-I hope that the coverage is sufficient for most UK legal work; I believe
-that only specialists in public international law or legal history are
-likely to find it significantly deficient.
+I hope that the coverage is sufficient for most UK legal work; I
+believe that only specialists in public international law or legal
+history are likely to find it significantly deficient.
\subsection{Language}
@@ -278,9 +284,11 @@
Joseph Wright -- without whom this would be impossible. Many members
of the community at
\TeX-StackExchange\footnote{\url{tex.stackexchange.com}} have helped
-too. I've borrowed from more people than I can remember. Daniel
-H\"ogger identified various important bugs, and suggested
-improvements, particularly in relation to international law materials. Thanks to everyone.
+too, at first by answering my questions, and later by asking (and and
+sometimes answering) their own. I've borrowed from more people than I
+can remember. Daniel H\"ogger identified various important bugs, and
+suggested improvements, particularly in relation to international law
+materials. Thanks to everyone.
\subsection{An apology}
@@ -378,12 +386,9 @@
\index[general]{english-oscola.ist@\texttt{english-oscola.ist}}
I would suggest installation in your (local) \TeX\ directory as follows:
\begin{description}
-\item[oscola.bbx] With the bibliography style files in \texttt{.../\allowbreak tex/\allowbreak latex/\linebreak biblatex/\allowbreak bbx}.
-\item[oscola.cbx] With the citation style files in \texttt{.../tex/latex/\linebreak biblatex/cbx}.
-\item[english-oscola.lbx] With the language definition files in \texttt{.../tex/latex/\linebreak biblatex/lbx}.
-\item[oscola.pdf] With documentation in a suitable directory under\linebreak \texttt{.../doc/latex}.
-\item[oscola.ist] With the index style files in \verb|.../makeindex/latex|.
-\item[oscola-examples.bib] With the sample bibliography files in a suitable directory under \verb|.../bibtex/bib|.
+\item The operational files (that is \verb|oscola.bbx|, \verb|oscola.cbx|, \verb|english-oscola.lbx| and \verb|british-oscola.lbx| go with \LaTeX\ macros under \verb|.../tex/latex/oscola|.
+\item The index style file \verb|oscola.idx| goes with other such files under \verb|.../makeindex/oscola|.
+\item The documentation files (\verb|oscola.tex| and \verb|oscola.pdf| go under \verb|.../doc/latex/oscola|.
\end{description}
\section{Basic Use}
@@ -460,6 +465,16 @@
To my eye that looks odd. The option \texttt{caseshorthands=italic}
will see to it that shorthand names for cases, like their short
titles, will be printed in italic type.
+\item[ecli]\index[general]{ECLI numbers}
+ \index[general]{options!ecli@\texttt{ecli}} This option controls
+ whether the EU's recently introduced ECLI numbers get
+ printed. Options are: \verb|yes| (the default), which means they are
+ printed when available in addition to the official report,
+ \verb|no|, in which case they are never printed, or \verb|only|, in
+ which case only ECLI numbers are used, with no printed report, in
+ the current style of the CJEU itself (not yet officially accepted by
+ the standard). Note that if the case is otherwise unreported, ECLI
+ numbers will always be used if available.
\item[ibidstyle]\index[general]{customization!ibid}
\index[general]{ibid!capitalization}
\index[general]{options!ibidstyle@\texttt{ibidstyle}}
@@ -846,6 +861,7 @@
information in an external file which will, with the help of another
\index[general]{Imakeidx!recommended}
\index[general]{Splitindex!recommended}
+\index[general]{memoir!incompatibility}
package (\textsc{imakeidx} is the one I recommend) and an external
program or programs (I recommend \textsc{splitindex})\footnote{Why
\textsc{imakeidx} and \textsc{splitindex}? I like \textsc{splitindex}
@@ -853,7 +869,9 @@
can only write a number of auxiliary files. I like \textsc{imakeidx}
because it provides a convenient method of using
\textsc{splitindex}. You cannot, in fact, use \textsc{splitindex}
-directly with \oscola.} produce the necessary tables.
+directly with \oscola.} produce the necessary tables. If you are using the
+\textsc{memoir} class, you \emph{must} load \textsc{imakeidx}, to avoid some
+fundamental problems.
The complication is in the word `tries'. The difficulty is that it's
not obvious how many indexes you want. \textsc{Oscola} leaves you
@@ -1074,7 +1092,10 @@
\item If you are using \textsc{splitindex}, run it with the option
\verb|-m|, and then process each of the resulting sub-indices that
you want formatted with leaders with the option \verb|-s oscola|.
-\item Alternatively, run \textsc{splitindex} with the option \verb|-- -s oscola|, which will run \textsc{makeindex} on each file with the requisite style.
+\item Alternatively, run \textsc{splitindex} with the option \verb|-- -s oscola|, which will run \textsc{makeindex} on each file with the requisite style. In that case your \verb|.tex| source base name comes first, so that the overall command is
+\begin{verbatim}
+splitindex [BASENAME] -- -s oscola
+\end{verbatim}
\end{itemize}
The only real annoyance is when you have multiple indexes and want
@@ -1898,7 +1919,9 @@
\index[general]{bibfile@\texttt{.bib} file!number field@\texttt{number field}}
\index[general]{cases!European Union!case number@\texttt{case number}}
Enter the case number (or numbers) in the
- \texttt{number} field. Do not include `Case' or `Joined Cases' in the number field.
+ \texttt{number} field. Do not include `Case' or `Joined Cases' in the number field. This
+ is the number given to the case by the court registry -- not the ECLI number given
+ to the reported decision.
\item[type] If your case is an ordinary one (ie, `Case' or `Joined
Cases') you need enter nothing here. If you need to specify
something unusual (like \texttt{Opinion}) to precede the case
@@ -1910,6 +1933,10 @@
some other full report) you can include a citation to the Official
Journal. Follow the advice set out in relation to Commission
decisions, below.
+\item[ecli]\index[general]{ECLI number}
+ The ECLI number for the case report. Note that whether the
+ number is used depends on the setting of the option \verb|ecli| to
+ \verb|yes| (the default), \verb|no|, or \verb|only|.
\item[pagination] You can, if you like, specify \texttt{paragraph};
but if nothing is entered, paragraph will be assumed.
\end{description}
@@ -1948,6 +1975,7 @@
date = {1985},
journaltitle = {ECR},
pages = {531},
+ ecli = {EU:C:1985:59},
}
\end{verbatim}
\end{bibexample}
@@ -2943,8 +2971,8 @@
\begin{bibexample}[spbill4]
\begin{verbatim}
@misc{spbill4,
- title = {SP Bill 4 Abolition of Feudal Tenure etc (Scotland)
- Bill [as introduced] Session 1},
+ title = {SP Bill 4 Abolition of Feudal Tenure etc
+ (Scotland) Bill [as introduced] Session 1},
date = {1999},
}
\end{verbatim}
@@ -3378,8 +3406,8 @@
@legal{aaland,
title = {Convention Relating to the Non-Fortification
and Neutralisation of the Aaland Islands},
- parties = {{Aaaland Islands} and Germany and Denmark and Estonia
- and Finland and France},
+ parties = {{Aaaland Islands} and Germany and Denmark
+ and Estonia and Finland and France},
lista = {opened=1921-10-02 and inforce=1922-12-06},
pagination = {article},
volume = {9},
@@ -3427,11 +3455,12 @@
volume = {213},
reporter = {U.N.T.S.},
pages = {221},
- note = {as amended by Protocol No 14bis to the Convention
- for the Protection of Human Rights and
- Fundamental Freedoms
- (opened for signature 27 May 2009, entered into force
- 1 September 2009) CETS No 204},
+ note = {as amended by Protocol No 14bis to the
+ Convention for the Protection of Human Rights
+ and Fundamental Freedoms
+ (opened for signature 27 May 2009,
+ entered into force1 September 2009)
+ CETS No 204},
shorthand = {ECHR},
entrysubtype = {piltreaty},
}
@@ -4542,10 +4571,11 @@
\begin{bibexample}[com895]
\begin{verbatim}
@report{com895,
- title = {Proposal for a Council Decision on the conclusion,
- on behalf of the European Community, of a Protocol
- on the Implementation of the Alpine Convention in
- the Field of Transport (Transport Protocol)},
+ title = {Proposal for a Council Decision on the
+ conclusion, on behalf of the European Community,
+ of a Protocol on the Implementation of the Alpine
+ Convention in the Field of Transport
+ (Transport Protocol)},
institution = {Commission},
number = {COM (2008) 895 final},
entrysubtype = {comdoc}
@@ -4571,9 +4601,10 @@
\begin{bibexample}[com348]
\begin{verbatim}
@report{com348,
- title = {Proposal for a Council Regulation on jurisdiction
- and the recognition and enforcement of judgments
- in civil and commercial matters},
+ title = {Proposal for a Council Regulation on
+ jurisdiction and the recognition and
+ enforcement of judgments in civil and
+ commercial matters},
number = {COM (99) 348 final},
institution = {Commission},
entrysubtype = {comdoc},
@@ -4769,8 +4800,9 @@
\begin{verbatim}
@inproceedings{reliance,
author = {McFarlane, Ben and Nolan, Donal},
- title = {Remedying Reliance: The Future Development of
- Promissory and Proprietary Estoppel in English Law},
+ title = {Remedying Reliance: The Future Development
+ of Promissory and Proprietary Estoppel in
+ English Law},
eventtitle = {Obligations III conference},
location = {Brisbane},
eventdate = {2006-07-01},
Modified: trunk/Master/texmf-dist/makeindex/oscola/oscola.ist
===================================================================
--- trunk/Master/texmf-dist/makeindex/oscola/oscola.ist 2017-03-25 20:53:31 UTC (rev 43598)
+++ trunk/Master/texmf-dist/makeindex/oscola/oscola.ist 2017-03-25 20:53:44 UTC (rev 43599)
@@ -1,6 +1,6 @@
% Part of the OSCOLA package for biblatex: see the file
% oscola.lbx for copyright and licence information
-% v 1.2 23/05/2013
+% v 1.5 01/04/2017
delim_0 "\\space\\dotfill\\space "
delim_1 "\\space\\dotfill\\space "
Added: trunk/Master/texmf-dist/tex/latex/oscola/british-oscola.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/oscola/british-oscola.lbx (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/oscola/british-oscola.lbx 2017-03-25 20:53:44 UTC (rev 43599)
@@ -0,0 +1,572 @@
+% Based on english.lbx by Philip Lehman and others
+% Part of the OSCOLA package for biblatex: see the file
+% oscola.lbx for copyright and licence information
+
+\ProvidesFile{british-oscola.lbx}[2017/04/01 v 1.5 Biblatex localisation file for OSCOLA citations]
+
+\InheritBibliographyExtras{british}
+
+\NewBibliographyString{regulation,
+ regulations,
+ eucase,
+ eujoinedcases,
+ commissiondecision,
+ article,
+ articles,
+ application,
+ rule,
+ rules,
+ order,
+ directive,
+ decision,
+ bill,
+ draft,
+ clause,
+ clauses,
+ signed,
+ opened,
+ inforce,
+ adopted,
+ casenote,
+ firstpublished}
+
+\DeclareBibliographyExtras{%
+ \protected\def\bibrangedash{%
+ \textendash\penalty\hyphenpenalty}% breakable dash
+ \protected\def\bibdatedash{\bibrangedash}%
+ \def\finalandcomma{\addcomma}%
+ \protected\def\mkbibordinal#1{%
+ \begingroup
+ \@tempcnta0#1\relax\number\@tempcnta
+ \@whilenum\@tempcnta>100\do{\advance\@tempcnta-100\relax}%
+ \ifnum\@tempcnta>20
+ \@whilenum\@tempcnta>9\do{\advance\@tempcnta-10\relax}%
+ \fi
+ \ifcase\@tempcnta th\or st\or nd\or rd\else th\fi
+ \endgroup}%
+ \protected\def\mkusbibordinal#1{%
+ \begingroup
+ \@tempcnta0#1\relax\number\@tempcnta
+ \@whilenum\@tempcnta>100\do{\advance\@tempcnta-100\relax}%
+ \ifnum\@tempcnta>20
+ \@whilenum\@tempcnta>9\do{\advance\@tempcnta-10\relax}%
+ \fi
+ \ifcase\@tempcnta th\or st\or d\or d\else th\fi
+ \endgroup}%
+ \protected\def\mkbibmascord{\mkbibordinal}%
+ \protected\def\mkbibfemord{\mkbibordinal}%
+ \protected\def\mkbibdatelong#1#2#3{%
+ \iffieldundef{#3}
+ {}%
+ {\stripzeros{\thefield{#3}}%
+ \iffieldundef{#2}{}{\nobreakspace}}%
+ \iffieldundef{#2}%
+ {}%
+ {\mkbibmonth{\thefield{#2}}%
+ \iffieldundef{#1}{}{\space}}%
+ \iffieldundef{#1}%
+ {}%
+ {\stripzeros{\thefield{#1}}}}%
+ \protected\def\mkbibdateshort#1#2#3{%
+ \iffieldundef{#2}
+ {}
+ {\mkdatezeros{\thefield{#2}}%
+ \iffieldundef{#3}
+ {\iffieldundef{#1}{}{/}}
+ {/}}%
+ \iffieldundef{#3}
+ {}
+ {\mkdatezeros{\thefield{#3}}%
+ \iffieldundef{#1}{}{/}}%
+ \mkdatezeros{\thefield{#1}}}%
+ \savecommand\mkbibrangecomp
+ \savecommand\mkbibrangecompextra
+ \savecommand\mkbibrangeterse
+ \savecommand\mkbibrangeterseextra
+ \protected\def\mkbibrangecomp{%
+ \lbx at us@mkbibrangetrunc at long{long}}%
+ \protected\def\mkbibrangeterse{%
+ \lbx at us@mkbibrangetrunc at short{short}}%
+ \protected\def\mkbibrangecompextra{%
+ \lbx at us@mkbibrangetruncextra at long{long}}%
+ \protected\def\mkbibrangeterseextra{%
+ \lbx at us@mkbibrangetruncextra at short{short}}%
+ \protected\gdef\lbx at us@mkbibrangetrunc at short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdatedash}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+
+\protected\gdef\lbx at us@mkbibrangetruncextra at long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \mbox{\bibdatedash}}
+ {\bibdatedash
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
+ \printfield{extrayear}}}}}}
+
+\protected\gdef\lbx at us@mkbibrangetruncextra at short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \mbox{\bibdatedash}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+ \printfield{extrayear}}}}}}
+}
+
+\UndeclareBibliographyExtras{%
+ \restorecommand\mkbibrangecomp
+ \restorecommand\mkbibrangecompextra
+ \restorecommand\mkbibrangeterse
+ \restorecommand\mkbibrangeterseextra
+}
+
+\DeclareBibliographyStrings{%
+% inherit = {english},
+ bibliography = {{Bibliography}{Bibliography}},
+ references = {{References}{References}},
+ shorthands = {{List of Abbreviations}{Abbreviations}},
+ editor = {{editor}{ed}},
+ editors = {{editors}{eds}},
+ compiler = {{compiler}{comp}},
+ compilers = {{compilers}{comp}},
+ redactor = {{redactor}{red}},
+ redactors = {{redactors}{red}},
+ founder = {{founder}{found}},
+ founders = {{founders}{found}},
+ continuator = {{continued}{cont}}, % FIXME: unsure
+ continuators = {{continued}{cont}}, % FIXME: unsure
+ collaborator = {{collaborator}{collab}}, % FIXME: unsure
+ collaborators = {{collaborators}{collab}}, % FIXME: unsure
+ translator = {{translator}{tr}},
+ translators = {{translators}{trs}},
+ commentator = {{commentator}{comm}},
+ commentators = {{commentators}{comm}},
+ annotator = {{annotator}{annot}},
+ annotators = {{annotators}{annot}},
+ commentary = {{commentary}{comm}},
+ annotations = {{annotations}{annot}},
+ introduction = {{introduction}{intro}},
+ foreword = {{foreword}{foreword}},
+ afterword = {{afterword}{afterword}},
+ editortr = {{editor and translator}%
+ {ed and tr}},
+ editorstr = {{editors and translators}%
+ {eds and trs}},
+ editorco = {{editor and commentator}%
+ {ed and comm}},
+ editorsco = {{editors and commentators}%
+ {eds and comm}},
+ editoran = {{editor and annotator}%
+ {ed and annot}},
+ editorsan = {{editors and annotators}%
+ {eds and annot}},
+ editorin = {{editor and introduction}%
+ {ed and introd}},
+ editorsin = {{editors and introduction}%
+ {eds and introd}},
+ editorfo = {{editor and foreword}%
+ {ed and foreword}},
+ editorsfo = {{editors and foreword}%
+ {eds and forewords}},
+ editoraf = {{editor and afterword}%
+ {ed and afterword}},
+ editorsaf = {{editors and afterword}%
+ {eds and afterword}},
+ editortrco = {{editor, translator\finalandcomma\ and commentator}%
+ {ed\addcomma\space trans\finalandcomma\ and comm}},
+ editorstrco = {{editors, translators\finalandcomma\ and commentators}%
+ {eds,\addabbrvspace trans\finalandcomma\ and comm}},
+ editortran = {{editor, translator\finalandcomma\ and annotator}%
+ {ed,\addabbrvspace trans\finalandcomma\ and annot}},
+ editorstran = {{editors, translators\finalandcomma\ and annotators}%
+ {eds,\addabbrvspace trans\finalandcomma\ and annot}},
+ editortrin = {{editor, translator\finalandcomma\ and introduction}%
+ {ed,\addabbrvspace trans\finalandcomma\ and introd}},
+ editorstrin = {{editors, translators\finalandcomma\ and introduction}%
+ {eds,\addabbrvspace trans\finalandcomma\ and introd}},
+ editortrfo = {{editor, translator\finalandcomma\ and foreword}%
+ {ed.,\addabbrvspace trans\finalandcomma\ and forew}},
+ editorstrfo = {{editors, translators\finalandcomma\ and foreword}%
+ {eds,\addabbrvspace trans\finalandcomma\ and forew}},
+ editortraf = {{editor, translator\finalandcomma\ and afterword}%
+ {ed,\addabbrvspace trans\finalandcomma\ and afterw}},
+ editorstraf = {{editors, translators\finalandcomma\ and afterword}%
+ {eds,\addabbrvspace trans\finalandcomma\ and afterw}},
+ editorcoin = {{editor, commentator\finalandcomma\ and introduction}%
+ {ed,\addabbrvspace comm\finalandcomma\ and introd}},
+ editorscoin = {{editors, commentators\finalandcomma\ and introduction}%
+ {eds,\addabbrvspace comm\finalandcomma\ and introd}},
+ editorcofo = {{editor, commentator\finalandcomma\ and foreword}%
+ {ed,\addabbrvspace comm\finalandcomma\ and forew}},
+ editorscofo = {{editors, commentators\finalandcomma\ and foreword}%
+ {eds,\addabbrvspace comm\finalandcomma\ and forew}},
+ editorcoaf = {{editor, commentator\finalandcomma\ and afterword}%
+ {ed,\addabbrvspace comm\finalandcomma\ and afterw}},
+ editorscoaf = {{editors, commentators\finalandcomma\ and afterword}%
+ {eds,\addabbrvspace comm\finalandcomma\ and afterw}},
+ editoranin = {{editor, annotator\finalandcomma\ and introduction}%
+ {ed,\addabbrvspace annot\finalandcomma\ and introd}},
+ editorsanin = {{editors, annotators\finalandcomma\ and introduction}%
+ {eds,\addabbrvspace annot\finalandcomma\ and introd}},
+ editoranfo = {{editor, annotator\finalandcomma\ and foreword}%
+ {ed,\addabbrvspace annot\finalandcomma\ and forew}},
+ editorsanfo = {{editors, annotators\finalandcomma\ and foreword}%
+ {eds,\addabbrvspace annot\finalandcomma\ and forew}},
+ editoranaf = {{editor, annotator\finalandcomma\ and afterword}%
+ {ed,\addabbrvspace annot\finalandcomma\ and afterw}},
+ editorsanaf = {{editors, annotators\finalandcomma\ and afterword}%
+ {eds,\addabbrvspace annot\finalandcomma\ and afterw}},
+ editortrcoin = {{editor, translator, commentator\finalandcomma\ and introduction}%
+ {ed,\addabbrvspace trans, comm\finalandcomma\ and introd}},
+ editorstrcoin = {{editors, translators, commentators\finalandcomma\ and introduction}%
+ {eds,\addabbrvspace trans, comm\finalandcomma\ and introd}},
+ editortrcofo = {{editor, translator, commentator\finalandcomma\ and foreword}%
+ {ed,\addabbrvspace trans, comm\finalandcomma\ and forew}},
+ editorstrcofo = {{editors, translators, commentators\finalandcomma\ and foreword}%
+ {eds,\addabbrvspace trans, comm\finalandcomma\ and forew}},
+ editortrcoaf = {{editor, translator, commentator\finalandcomma\ and afterword}%
+ {ed,\addabbrvspace trans, comm\finalandcomma\ and afterw}},
+ editorstrcoaf = {{editors, translators, commentators\finalandcomma\ and afterword}%
+ {eds,\addabbrvspace trans, comm\finalandcomma\ and afterw}},
+ editortranin = {{editor, translator, annotator\finalandcomma\ and introduction}%
+ {ed,\addabbrvspace trans, annot\finalandcomma\ and introd}},
+ editorstranin = {{editors, translators, annotators\finalandcomma\ and introduction}%
+ {eds,\addabbrvspace trans, annot\finalandcomma\ and introd}},
+ editortranfo = {{editor, translator, annotator\finalandcomma\ and foreword}%
+ {ed,\addabbrvspace trans, annot\finalandcomma\ and forew}},
+ editorstranfo = {{editors, translators, annotators\finalandcomma\ and foreword}%
+ {eds,\addabbrvspace trans, annot\finalandcomma\ and forew}},
+ editortranaf = {{editor, translator, annotator\finalandcomma\ and afterword}%
+ {ed,\addabbrvspace trans, annot\finalandcomma\ and afterw}},
+ editorstranaf = {{editors, translators, annotators\finalandcomma\ and afterword}%
+ {eds,\addabbrvspace trans, annot\finalandcomma\ and afterw}},
+ translatorco = {{translator and commentator}%
+ {trans\ and comm}},
+ translatorsco = {{translators and commentators}%
+ {trans\ and comm}},
+ translatoran = {{translator and annotator}%
+ {trans\ and annot}},
+ translatorsan = {{translators and annotators}%
+ {trans\ and annot}},
+ translatorin = {{translation and introduction}%
+ {trans\ and introd}},
+ translatorsin = {{translation and introduction}%
+ {trans\ and introd}},
+ translatorfo = {{translation and foreword}%
+ {trans\ and forew}},
+ translatorsfo = {{translation and foreword}%
+ {trans\ and forew}},
+ translatoraf = {{translation and afterword}%
+ {trans\ and afterw}},
+ translatorsaf = {{translation and afterword}%
+ {trans\ and afterw}},
+ translatorcoin = {{translation, commentary\finalandcomma\ and introduction}%
+ {trans, comm\finalandcomma\ and introd}},
+ translatorscoin = {{translation, commentary\finalandcomma\ and introduction}%
+ {trans, comm\finalandcomma\ and introd}},
+ translatorcofo = {{translation, commentary\finalandcomma\ and foreword}%
+ {trans, comm\finalandcomma\ and forew}},
+ translatorscofo = {{translation, commentary\finalandcomma\ and foreword}%
+ {trans, comm\finalandcomma\ and forew}},
+ translatorcoaf = {{translation, commentary\finalandcomma\ and afterword}%
+ {trans, comm\finalandcomma\ and afterw}},
+ translatorscoaf = {{translation, commentary\finalandcomma\ and afterword}%
+ {trans, comm\finalandcomma\ and afterw}},
+ translatoranin = {{translation, annotations\finalandcomma\ and introduction}%
+ {trans, annot\finalandcomma\ and introd}},
+ translatorsanin = {{translation, annotations\finalandcomma\ and introduction}%
+ {trans, annot\finalandcomma\ and introd}},
+ translatoranfo = {{translation, annotations\finalandcomma\ and foreword}%
+ {trans, annot\finalandcomma\ and forew}},
+ translatorsanfo = {{translation, annotations\finalandcomma\ and foreword}%
+ {trans, annot\finalandcomma\ and forew}},
+ translatoranaf = {{translation, annotations\finalandcomma\ and afterword}%
+ {trans, annot\finalandcomma\ and afterw}},
+ translatorsanaf = {{translation, annotations\finalandcomma\ and afterword}%
+ {trans, annot\finalandcomma\ and afterw}},
+ byauthor = {{by}{by}},
+ byeditor = {{edited by}{ed}},
+ bycompiler = {{compiled by}{compiler}},
+ byredactor = {{redacted by}{redactor}},
+ byfounder = {{founded by}{founder}},
+ bycontinuator = {{continued by}{continuator}},
+ bycollaborator = {{in collaboration with}{in collaboration with}}, % FIXME: unsure
+ bytranslator = {{translated \lbx at lfromlang\ by}{tr}},
+ bycommentator = {{commented by}{commentator}},
+ byannotator = {{annotated by}{annotator}},
+ withcommentator = {{with a commentary by}{with a commentary by}},
+ withannotator = {{with annotations by}{with annots\ by}},
+ withintroduction = {{with an introduction by}{with an intro\ by}},
+ withforeword = {{with a foreword by}{with a forew\ by}},
+ withafterword = {{with an afterword by}{with an afterw\ by}},
+ byeditortr = {{edited and translated \lbx at lfromlang\ by}%
+ {edspace and trans\ \lbx at sfromlang\ by}},
+ byeditorco = {{edited and commented by}%
+ {edspace and comm\ by}},
+ byeditoran = {{edited and annotated by}%
+ {edspace and annot\ by}},
+ byeditorin = {{edited, with an introduction, by}%
+ {ed,\addabbrvspace with an introd, by}},
+ byeditorfo = {{edited, with a foreword, by}%
+ {ed,\addabbrvspace with a forew, by}},
+ byeditoraf = {{edited, with an afterword, by}%
+ {ed,\addabbrvspace with an afterw, by}},
+ byeditortrco = {{edited, translated \lbx at lfromlang\finalandcomma\ and commented by}%
+ {ed,\addabbrvspace trans\ \lbx at sfromlang\finalandcomma\ and comm\ by}},
+ byeditortran = {{edited, translated \lbx at lfromlang\finalandcomma\ and annotated by}%
+ {ed,\addabbrvspace trans\ \lbx at sfromlang\finalandcomma\ and annot\ by}},
+ byeditortrin = {{edited and translated \lbx at lfromlang, with an introduction, by}%
+ {edspace and trans\ \lbx at sfromlang, with an introd, by}},
+ byeditortrfo = {{edited and translated \lbx at lfromlang, with a foreword, by}%
+ {edspace and trans\ \lbx at sfromlang, with a forew, by}},
+ byeditortraf = {{edited and translated \lbx at lfromlang, with an afterword, by}%
+ {edspace and trans\ \lbx at sfromlang, with an afterw, by}},
+ byeditorcoin = {{edited and commented, with an introduction, by}%
+ {edspace and comm, with an introd, by}},
+ byeditorcofo = {{edited and commented, with a foreword, by}%
+ {edspace and comm, with a forew, by}},
+ byeditorcoaf = {{edited and commented, with an afterword, by}%
+ {edspace and comm, with an afterw, by}},
+ byeditoranin = {{edited and annotated, with an introduction, by}%
+ {edspace and annot, with an introd, by}},
+ byeditoranfo = {{edited and annotated, with a foreword, by}%
+ {edspace and annot, with a forew, by}},
+ byeditoranaf = {{edited and annotated, with an afterword, by}%
+ {edspace and annot, with an afterw, by}},
+ byeditortrcoin = {{edited, translated \lbx at lfromlang\finalandcomma\ and commented, with an introduction, by}%
+ {ed,\addabbrvspace trans\ \lbx at sfromlang\finalandcomma\ and comm, with an introd, by}},
+ byeditortrcofo = {{edited, translated \lbx at lfromlang\finalandcomma\ and commented, with a foreword, by}%
+ {ed,\addabbrvspace trans\ \lbx at sfromlang\finalandcomma\ and comm, with a forew, by}},
+ byeditortrcoaf = {{edited, translated \lbx at lfromlang\finalandcomma\ and commented, with an afterword, by}%
+ {ed,\addabbrvspace trans\ \lbx at sfromlang\finalandcomma\ and comm, with an afterw, by}},
+ byeditortranin = {{edited, translated \lbx at lfromlang\finalandcomma\ and annotated, with an introduction, by}%
+ {ed,\addabbrvspace trans\ \lbx at sfromlang\finalandcomma\ and annot, with an introd, by}},
+ byeditortranfo = {{edited, translated \lbx at lfromlang\finalandcomma\ and annotated, with a foreword, by}%
+ {ed,\addabbrvspace trans\ \lbx at sfromlang\finalandcomma\ and annot, with a forew, by}},
+ byeditortranaf = {{edited, translated \lbx at lfromlang\finalandcomma\ and annotated, with an afterword, by}%
+ {ed,\addabbrvspace trans\ \lbx at sfromlang\finalandcomma\ and annot, with an afterw, by}},
+ bytranslatorco = {{translated \lbx at lfromlang\ and commented by}%
+ {trans\ \lbx at sfromlang\ and comm\ by}},
+ bytranslatoran = {{translated \lbx at lfromlang\ and annotated by}%
+ {trans\ \lbx at sfromlang\ and annot\ by}},
+ bytranslatorin = {{translated \lbx at lfromlang, with an introduction, by}%
+ {trans\ \lbx at sfromlang, with an introd, by}},
+ bytranslatorfo = {{translated \lbx at lfromlang, with a foreword, by}%
+ {trans\ \lbx at sfromlang, with a forew, by}},
+ bytranslatoraf = {{translated \lbx at lfromlang, with an afterword, by}%
+ {trans\ \lbx at sfromlang, with an afterw, by}},
+ bytranslatorcoin = {{translated \lbx at lfromlang\ and commented, with an introduction, by}%
+ {trans\ \lbx at sfromlang\ and comm, with an introd, by}},
+ bytranslatorcofo = {{translated \lbx at lfromlang\ and commented, with a foreword, by}%
+ {trans\ \lbx at sfromlang\ and comm, with a forew, by}},
+ bytranslatorcoaf = {{translated \lbx at lfromlang\ and commented, with an afterword, by}%
+ {trans\ \lbx at sfromlang\ and comm, with an afterw, by}},
+ bytranslatoranin = {{translated \lbx at lfromlang\ and annotated, with an introduction, by}%
+ {trans\ \lbx at sfromlang\ and annot, with an introd, by}},
+ bytranslatoranfo = {{translated \lbx at lfromlang\ and annotated, with a foreword, by}%
+ {trans\ \lbx at sfromlang\ and annot, with a forew, by}},
+ bytranslatoranaf = {{translated \lbx at lfromlang\ and annotated, with an afterword, by}%
+ {trans\ \lbx at sfromlang\ and annot, with an afterw, by}},
+ and = {{and}{and}},
+ andothers = {{and others}{and others}},
+ andmore = {{and others}{and others}},
+ volume = {{volume}{vol}},
+ volumes = {{volumes}{vols}},
+ jourvol = {{volume}{vol}},
+ jourser = {{series}{series}},
+ newseries = {{new series}{ns}},
+ oldseries = {{old series}{os}},
+ edition = {{edition}{edn}},
+ reprint = {{reprint}{repr}},
+ reprintof = {{reprint of}{repr of}},
+ reprintas = {{reprinted as}{rpt as}},
+ page = {{page}{p}},
+ pages = {{pages}{pp}},
+ column = {{column}{col}},
+ columns = {{columns}{cols}},
+ line = {{line}{l}},
+ lines = {{lines}{ll}},
+ verse = {{verse}{v}},
+ verses = {{verses}{vv}},
+ section = {{section}{s}},
+ sections = {{sections}{ss}},
+ paragraph = {{paragraph}{para}},
+ paragraphs = {{paragraphs}{paras}},
+ regulation = {{regulation}{reg}},
+ regulations = {{regulations}{regs}},
+ in = {{in}{in}},
+ inseries = {{in}{in}},
+ ofseries = {{of}{of}},
+ number = {{number}{no}},
+ chapter = {{chapter}{chap}},
+ mathesis = {{Master's thesis}{MA\addabbrvspace thesis}},
+ phdthesis = {{PhD\addabbrvspace thesis}{PhD\addabbrvspace thesis}},
+ resreport = {{research report}{research rep}},
+ techreport = {{technical report}{techspace rep}},
+ software = {{computer software}{compspace software}},
+ datacd = {{CD-ROM}{CD-ROM}},
+ audiocd = {{audio CD}{audio CD}},
+ version = {{version}{version}},
+ url = {{address}{address}},
+ urlseen = {{accessed}{accessed}},
+ inpress = {{in press}{in press}},
+ inpreparation = {{in preparation}{in preparation}},
+ submitted = {{submitted}{submitted}},
+ citedas = {{hereinafter}{hereinafter}},
+ thiscite = {{especially}{esp}},
+ seenote = {{see note}{n}},
+ quotedin = {{quoted in}{qtdspace in}},
+ idem = {{idem}{idem}},
+ idemsm = {{idem}{idem}},
+ idemsf = {{eadem}{eadem}},
+ idemsn = {{idem}{idem}},
+ idempm = {{eidem}{eidem}},
+ idempf = {{eaedem}{eaedem}},
+ idempn = {{eadem}{eadem}},
+ idempp = {{eidem}{eidem}},
+ ibidem = {{ibidem}{ibid}},
+ opcit = {{opspace cit}{opspace cit}},
+ loccit = {{locspace cit}{locspace cit}},
+ confer = {{cf}{cf}},
+ sequens = {{sq}{sq}},
+ sequentes = {{sqq}{sqq}},
+ passim = {{passim}{pass}},
+ see = {{see}{see}},
+ seealso = {{see also}{see also}},
+ backrefpage = {{cited on page}{citspace on p}},
+ backrefpages = {{cited on pages}{citspace on pp}},
+ january = {{January}{Jan}},
+ february = {{February}{Feb}},
+ march = {{March}{Mar}},
+ april = {{April}{Apr}},
+ may = {{May}{May}},
+ june = {{June}{Jun}},
+ july = {{July}{Jul}},
+ august = {{August}{Aug}},
+ september = {{September}{Sep}},
+ october = {{October}{Oct}},
+ november = {{November}{Nov}},
+ december = {{December}{Dec}},
+ langamerican = {{American}{American}},
+ langbrazilian = {{Brazilian}{Brazilian}},
+ langdanish = {{Danish}{Danish}},
+ langdutch = {{Dutch}{Dutch}},
+ langenglish = {{English}{English}},
+ langfrench = {{French}{French}},
+ langgerman = {{German}{German}},
+ langgreek = {{Greek}{Greek}},
+ langitalian = {{Italian}{Italian}},
+ langlatin = {{Latin}{Latin}},
+ langnorwegian = {{Norwegian}{Norwegian}},
+ langportuguese = {{Portuguese}{Portuguese}},
+ langspanish = {{Spanish}{Spanish}},
+ langswedish = {{Swedish}{Swedish}},
+ fromamerican = {{from the American}{from the American}},
+ frombrazilian = {{from the Brazilian}{from the Brazilian}},
+ fromdanish = {{from the Danish}{from the Danish}},
+ fromdutch = {{from the Dutch}{from the Dutch}},
+ fromenglish = {{from the English}{from the English}},
+ fromfrench = {{from the French}{from the French}},
+ fromgerman = {{from the German}{from the German}},
+ fromgreek = {{from the Greek}{from the Greek}},
+ fromitalian = {{from the Italian}{from the Italian}},
+ fromlatin = {{from the Latin}{from the Latin}},
+ fromnorwegian = {{from the Norwegian}{from the Norwegian}},
+ fromportuguese = {{from the Portuguese}{from the Portuguese}},
+ fromspanish = {{from the Spanish}{from the Spanish}},
+ fromswedish = {{from the Swedish}{from the Swedish}},
+ countryde = {{Germany}{DE}},
+ countryeu = {{European Union}{EU}},
+ countryep = {{European Union}{EP}},
+ countryfr = {{France}{FR}},
+ countryuk = {{United Kingdom}{GB}},
+ countryus = {{United States of America}{US}},
+ patent = {{patent}{pat}},
+ patentde = {{German patent}{German pat}},
+ patenteu = {{European patent}{European pat}},
+ patentfr = {{French patent}{French pat}},
+ patentuk = {{British patent}{British pat}},
+ patentus = {{US patent}{US pat}},
+ patreq = {{patent request}{pat\ req}},
+ patreqde = {{German patent request}{German pat\ req}},
+ patreqeu = {{European patent request}{European pat\ req}},
+ patreqfr = {{French patent request}{French pat\ req}},
+ patrequk = {{British patent request}{British pat\ req}},
+ patrequs = {{US patent request}{US pat\ req}},
+ file = {{file}{file}},
+ library = {{library}{library}},
+ abstract = {{abstract}{abstract}},
+ annotation = {{annotations}{annotations}},
+ eucase = {{Case}{Case}},
+ eujoinedcases = {{Joined Cases}{Joined Cases}},
+ commissiondecision = {{Commission Decision}{Commission Decision}},
+ article = {{article}{art}},
+ articles = {{articles}{arts}},
+ application = {{Application}{App}},
+ rule = {{rule}{r}},
+ rules = {{rules}{rr}},
+ order = {{Order}{Ord}},
+ directive = {{Directive}{Dir}},
+ decision = {{Decision}{Dec}},
+ bill = {{Bill}{Bill}},
+ draft = {{draft}{draft}},
+ clause = {{clause}{cl}},
+ clauses = {{clauses}{cll}},
+ inforce = {{entered into force}{entered into force}},
+ signed = {{signed}{signed}},
+ opened = {{opened for signature}{opened for signature}},
+ adopted = {{adopted}{adopted}},
+ casenote = {{note}{note}},
+ firstpublished = {{first published}{first published}},
+}
+
+\protected\gdef\lbx at us@mkbibrangetrunc at long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdatedash}}
+ {\bibdatedash
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}}
+
+
+
+\endinput
Modified: trunk/Master/texmf-dist/tex/latex/oscola/english-oscola.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/oscola/english-oscola.lbx 2017-03-25 20:53:31 UTC (rev 43598)
+++ trunk/Master/texmf-dist/tex/latex/oscola/english-oscola.lbx 2017-03-25 20:53:44 UTC (rev 43599)
@@ -3,10 +3,9 @@
% oscola.lbx for copyright and licence information
\ProvidesFile{english-oscola.lbx}
-[2014/05/22 v 1.4 Biblatex localisation file for OSCOLA citations]
+[2017/04/01 v 1.5 Biblatex localisation file for OSCOLA citations]
-\DeclareRedundantLanguages{english}{english,british,american,
-canadian,australian,newzealand,UKenglish,USenglish}
+\DeclareRedundantLanguages{english}{english,american}
\NewBibliographyString{regulation,
regulations,
@@ -93,6 +92,55 @@
\lbx at us@mkbibrangetruncextra at long{long}}%
\protected\def\mkbibrangeterseextra{%
\lbx at us@mkbibrangetruncextra at short{short}}%
+ \protected\gdef\lbx at us@mkbibrangetrunc at short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdatedash}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+
+\protected\gdef\lbx at us@mkbibrangetruncextra at long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \mbox{\bibdatedash}}
+ {\bibdatedash
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
+ \printfield{extrayear}}}}}}
+
+\protected\gdef\lbx at us@mkbibrangetruncextra at short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \mbox{\bibdatedash}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+ \printfield{extrayear}}}}}}
}
\UndeclareBibliographyExtras{%
@@ -520,54 +568,6 @@
{\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
{\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}}
-\protected\gdef\lbx at us@mkbibrangetrunc at short#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
- {\mbox{\bibdatedash}}
- {\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-\protected\gdef\lbx at us@mkbibrangetruncextra at long#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \iffieldsequal{#2year}{#2endyear}
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
- \printfield{extrayear}}}}}}
-\protected\gdef\lbx at us@mkbibrangetruncextra at short#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
- \printfield{extrayear}}}}}}
-
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/oscola/oscola.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/oscola/oscola.bbx 2017-03-25 20:53:31 UTC (rev 43598)
+++ trunk/Master/texmf-dist/tex/latex/oscola/oscola.bbx 2017-03-25 20:53:44 UTC (rev 43599)
@@ -1,6 +1,6 @@
% Legal Style Citations using OSCOLA
-% Copyright Paul Stanley 2014
-% This work consists of oscola.bbx, english-oscola.lbx, oscola.lbx
+% Copyright Paul Stanley 2014-2017
+% This work consists of oscola.bbx, english-oscola.lbx, british-oscola.lbx, oscola.cbx
% and oscola.ist.
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -13,13 +13,13 @@
% This work has the LPPL maintenance status 'maintained'.
% The current maintainer of this work is Paul Stanley (pstanley at essexcourt.net)
-\ProvidesFile{oscola.bbx}[2014/05/22 v1.4 Biblatex bibliography style for OSCOLA standard]
+\ProvidesFile{oscola.bbx}[2017/03/15 v1.5 Biblatex bibliography style for OSCOLA standard]
\RequireBibliographyStyle{authortitle}
\RequireBiber[3]
-\DeclareBibliographyOption{caseshorthands}[false]{
+\DeclareBibliographyOption{caseshorthands}[false]{%
\ifstrequal{#1}{italic}
{\DeclareFieldFormat[jurisdiction]{shorthand}{\textit{##1}}}
{}}
@@ -29,28 +29,49 @@
\ifstrequal{#1}{uc}
{\global\toggletrue{bbx at capibid}}
{\togglefalse{bbx at capibid}}}
-
+
+\newtoggle{bbx at ecliuse}\newtoggle{bbx at eclionly}
+\DeclareBibliographyOption{ecli}[add]{%
+ \ifstrequal{#1}{no}
+ {\global\togglefalse{bbx at ecliuse}\global\togglefalse{bbx at eclionly}}
+ {\global\toggletrue{bbx at ecliuse}
+ \ifstrequal{#1}{only}
+ {\global\toggletrue{bbx at eclionly}}
+ {}}}
+
+\newcommand{\bbx at juriscitationindexlist}{}
+\listadd{\bbx at juriscitationindexlist}{{eu}{eujuriscitation:index}}
+\listadd{\bbx at juriscitationindexlist}{{echr}{echrjuriscitation}}
+\listadd{\bbx at juriscitationindexlist}{{int}{intjuriscitation}}
+\listadd{\bbx at juriscitationindexlist}{{ca}{canjuriscitation}}
+\listadd{\bbx at juriscitationindexlist}{{us}{usjuriscitation}}
+\newcommand{\bbx at defaultjuriscitationindex}{enjuriscitation}
+
\newtoggle{bbx at shortindex}
\DeclareBibliographyOption{shortindex}[true]{%
- \settoggle{bbx at shortindex}{#1}}
+ \toggletrue{bbx at shortindex}%
+ \renewcommand{\bbx at juriscitationindexlist}{}%
+ \listadd{\bbx at juriscitationindexlist}{{eu}{eujuriscitation:index:short}}%
+ \renewcommand{\bbx at defaultjuriscitationindex}{juriscitation:index:short}}
% We ensure that there will always be a trash index
\AtEndPreamble{%
\@ifpackageloaded{imakeidx}{\makeindex[name=trash]}
- {\@ifpackageloaded{index}{\newindex{trash}{tdx}{tnd}{Miscellaneous}}
- {\@ifpackageloaded{multind}{\PackageWarning{biblatex-oscola}{Multind is incompatible with biblatex-oscola. Use imakeidx or index}}
- {\iftoggle{blx at citeindex}
+ {\@ifclassloaded{memoir}{\PackageWarning{biblatex-oscola}{To use indexing with OSCOLA and the memoir class, you need to load imakeidx.}}
+ {\@ifpackageloaded{index}{\newindex{trash}{tdx}{tnd}{Miscellaneous}}
+ {\@ifpackageloaded{multind}{\PackageWarning{biblatex-oscola}{Multind is incompatible with biblatex-oscola. Use imakeidx or index}}
+ {\iftoggle{blx at citeindex}
{\PackageWarning{biblatex-oscola}
- {You need to load imakeidx or index. Indexing will probably fail:}}{}}}}}
+ {You need to load imakeidx or index. Indexing will probably fail:}}{}}}}}}
% The bibliography and citation styles use different forms of name
\AtBeginBibliography{%
- \toggletrue{blx at firstinits}%
- \DeclareNameAlias{default}{last-first}%
- \DeclareNameAlias{editor}{last-first}}
+ \toggletrue{abx at bool@giveninits}%
+ \DeclareNameAlias{default}{family-given}%
+ \DeclareNameAlias{editor}{given-family}}
-\renewbibmacro*{name:last-first}[4]{%
+\renewbibmacro*{name:family-given}[4]{%
\ifuseprefix
{\usebibmacro{name:delim}{#3#1}%
\usebibmacro{name:hook}{#3#1}%
@@ -59,18 +80,18 @@
{\mkbibnameprefix{\MakeCapital{#3}}\isdot}
{\mkbibnameprefix{#3}\isdot}%
\ifpunctmark{'}{}{\bibnamedelimc}}%
- \mkbibnamelast{#1}\isdot
- \ifblank{#4}{}{\bibnamedelimd\mkbibnameaffix{#4}\isdot}%
- \ifblank{#2}{}{\bibnamedelimd\mkbibnamefirst{#2}\isdot}}
+ \mkbibnamefamily{#1}\isdot
+ \ifblank{#4}{}{\bibnamedelimd\mkbibnamesuffix{#4}\isdot}%
+ \ifblank{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}}
{\usebibmacro{name:delim}{#1}%
\usebibmacro{name:hook}{#1}%
- \mkbibnamelast{#1}\isdot
- \ifblank{#4}{}{\bibnamedelimd\mkbibnameaffix{#4}\isdot}%
+ \mkbibnamefamily{#1}\isdot
+ \ifblank{#4}{}{\bibnamedelimd\mkbibnamesuffix{#4}\isdot}%
\ifblank{#2#3}{}{}%
- \ifblank{#2}{}{\bibnamedelimd\mkbibnamefirst{#2}\isdot}%
+ \ifblank{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
\ifblank{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}}}
-\DeclareNameAlias{sortname}{last-first}
+\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
@@ -142,6 +163,7 @@
% Language Mapping
\DeclareLanguageMapping{english}{english-oscola}
+\DeclareLanguageMapping{british}{british-oscola}
% Various aliases
\DeclareBibliographyAlias{inproceedings}{book}
@@ -158,8 +180,6 @@
\DeclareBibliographyAlias{mvcollection}{book}
\DeclareBibliographyAlias{supcollection}{inbook}
-
-
% This deals with suppression of the postnote delimiter after brackets. It
% should be refactored to use a toggle rather than a counter
@@ -414,6 +434,7 @@
\DeclareFieldFormat[legislation]{title}{#1}
\DeclareFieldFormat[legal]{title}{#1}
\DeclareFieldFormat{untitle}{#1}
+\DeclareFieldFormat{verba}{#1}
\DeclareListFormat[jurisdiction]{extracites}{%
\extracitedelim #1}
@@ -818,7 +839,7 @@
\DeclareBibliographyDriver{thesis}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \printnames{author}%
+ \usebibmacro{author}%
\setunit{\addcomma\space}%
\newblock
\printfield{title}%
@@ -1219,6 +1240,19 @@
\usebibmacro{court-note}%
}
+\newbibmacro{eujuriscitation:index:short}{%
+ \iftoggle{bbx at numcite}
+ {\iffieldundef{userb}{}{\printfield{userb}\newunit}
+ \printfield{number}}
+ {\usebibmacro{title}%
+ \newunit
+ \iffieldundef{userb}
+ {}
+ {\printtext{\mkbibparens{\printfield{userb}}\newunit}}%
+ \printtext{\mkbibparens{\usebibmacro{euparenthetical}}}}%
+ \newunit%
+ \usebibmacro{court-note}}
+
\newbibmacro{eujuriscitation:index}{%
\iftoggle{bbx at numcite}
{\iffieldundef{userb}{}{\printfield{userb}\newunit}
@@ -1267,20 +1301,39 @@
\printfield{number}}
\newbibmacro*{eu:reportinfo}{%
+ \iftoggle{bbx at eclionly}
+ {\iffieldundef{verba}
+ {\usebibmacro{eu:osreport}}%
+ {\printfield{verba}}}
+ {\usebibmacro{eu:osreport}}}
+
+
+\newbibmacro*{eu:osreport}{%
+ \iftoggle{bbx at ecliuse}
+ {\iffieldundef{verba}
+ {}
+ {\printfield{verba}%
+ \setunit{\addcomma\space}}}%
+ {}%
\iffieldundef{journaltitle}%
{\usebibmacro{eu:unreported}}%
{\usebibmacro{eu:year+vol+report}}}
\newbibmacro*{eu:unreported}{%
- \ifboolexpr{( test {\iflistundef{institution}}
- and test {\iffieldundef{date}}
- and test {\iffieldundef{year}} )}
- {}
- {\ifboolexpr{( test {\iffieldundef{date}} and test {\iffieldundef{year}} )}
- {\mkbibparens{\printlist[jurisdiction]{institution}}}
- {\bbx at unsetpostnotedelim\iflistundef{institution}%
- {\mkbibparens{\usebibmacro{date}}}%
- {\printtext{\bibopenparen\printlist[jurisdiction]{institution}\addcomma\space}\usebibmacro{date}\bibcloseparen}}}}
+ \iffieldundef{verba}
+ {\ifboolexpr{( test {\iflistundef{institution}}
+ and test {\iffieldundef{date}}
+ and test {\iffieldundef{year}} )}
+ {}%
+ {\ifboolexpr{( test {\iffieldundef{date}} and test {\iffieldundef{year}} )}
+ {\mkbibparens{\printlist[jurisdiction]{institution}}}
+ {\bbx at unsetpostnotedelim\iflistundef{institution}%
+ {\mkbibparens{\usebibmacro{date}}}%
+ {\printtext{\bibopenparen%
+ \printlist[jurisdiction]{institution}\addcomma\space}\usebibmacro{date}\bibcloseparen}}}}
+ {\iftoggle{bbx at ecliuse}
+ {}
+ {\printfield{verba}}}}
\newbibmacro*{eu:year+vol+report}{%
\iffieldequals{journaltitle}{\ecrreporttitle}%
@@ -1449,20 +1502,35 @@
{\printfield[casenotetitle]{title}}}}
{\usebibmacro{title}}}
+\newcommand{\csusebibmacro}[1]{%
+ \edef\bbx at tempcsname{%
+ \noexpand\usebibmacro{#1}}%
+ \bbx at tempcsname}
+
+\newtoggle{bbx at juriscitedone}
+
+\newcommand{\bbx at juriscitationlist}{}
+\listadd{\bbx at juriscitationlist}{{eu}{eujuriscitation}}
+\listadd{\bbx at juriscitationlist}{{echr}{echrjuriscitation}}
+\listadd{\bbx at juriscitationlist}{{int}{intjuriscitation}}
+\listadd{\bbx at juriscitationlist}{{ca}{canjuriscitation}}
+\listadd{\bbx at juriscitationlist}{{us}{usjuriscitation}}
+
+\global\edef\bbx at defaultjuriscitation{enjuriscitation}
+
\newbibmacro{juriscitation}{%
- \ifkeyword{eu}%
- {\usebibmacro{eujuriscitation}}% EU Case
- {\ifkeyword{echr}%
- {\usebibmacro{echrjuriscitation}}% ECHR Case
- {\ifkeyword{int}%
- {\usebibmacro{intjuriscitation}}% PIL Case
- {\ifkeyword{ca}%
- {\usebibmacro{canjuriscitation}}% Canadian Case
- {\ifkeyword{us}
- {\usebibmacro{usjuriscitation}}% US Case
- {\usebibmacro{enjuriscitation}}}}}}}% Default
+ \togglefalse{bbx at juriscitedone}%
+ \renewcommand{\do}[1]{%
+ \edef\@tempa{\noexpand\ifkeyword{\expandafter\@firstoftwo ##1}}%
+ \edef\@tempb{\expandafter\@secondoftwo ##1}%
+ \@tempa
+ {\toggletrue{bbx at juriscitedone}\csusebibmacro{\@tempb}}
+ {}}%
+ \dolistloop{\bbx at juriscitationlist}%
+ \iftoggle{bbx at juriscitedone}
+ {}
+ {\csusebibmacro{\bbx at defaultjuriscitation}}}
-
\newbibmacro{juriscitation:index}{%
\savefield{indextitle}{\bbx at tempa}%
\restorefield{title}{\bbx at tempa}%
@@ -1482,6 +1550,26 @@
{\usebibmacro{usjuriscitation}}
{\usebibmacro{enjuriscitation}}}}}}}
+\renewbibmacro{juriscitation:index}{%
+ \togglefalse{bbx at juriscitedone}%
+ \renewcommand{\do}[1]{%
+ \edef\@tempa{\noexpand\ifkeyword{\expandafter\@firstoftwo ##1}}%
+ \edef\@tempb{\expandafter\@secondoftwo ##1}%
+ \@tempa
+ {\toggletrue{bbx at juriscitedone}\csusebibmacro{\@tempb}}
+ {}}%
+ \dolistloop{\bbx at juriscitationindexlist}%
+ \iftoggle{bbx at juriscitedone}
+ {}
+ {\csusebibmacro{\bbx at defaultjuriscitationindex}}}
+
+\newbibmacro{juriscitation:index:short}{%
+ \printfield{title}%
+ \setunit*{\addspace}%
+ \iffieldundef{year}
+ {}
+ {\printtext{\mkbibparens{\printfield{year}}}}}
+
\newbibmacro*{jurisdictionpages}{%
\iffieldequals{entrysubtype}{\subtypenewsp}%
{}
@@ -1672,7 +1760,7 @@
\renewbibmacro*{postnote}{%
\ifboolexpr {test {\iffieldundef{postnote}} or
test {\iftoggle{cbx at postnoteprinted}}}%
- {\midsentence}
+ {}%<--- this used to read \midsentence
{\ifboolexpr{test {\ifnumequal{\value{bbx at suppresspostnotedelim}}{1}}}
{\setunit{\addspace}%
\bbx at resetpostnotedelim}
@@ -2881,11 +2969,11 @@
\field{sortkey}
}
\sort{
- \name{sortname}
- \name{author}
- \name{editor}
- \name{translator}
- \list{institution}
+ \field{sortname}
+ \field{author}
+ \field{editor}
+ \field{translator}
+ \field{institution}
\field{sorttitle}
\field{title}
\field{booktitle}
@@ -2993,6 +3081,8 @@
fieldtarget=institution]
\step[fieldsource=additionalreports,
fieldtarget=listb]
+ \step[fieldsource=ecli,
+ fieldtarget=verba]
}
\map[overwrite=false]{
\pertype{legal}
Modified: trunk/Master/texmf-dist/tex/latex/oscola/oscola.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/oscola/oscola.cbx 2017-03-25 20:53:31 UTC (rev 43598)
+++ trunk/Master/texmf-dist/tex/latex/oscola/oscola.cbx 2017-03-25 20:53:44 UTC (rev 43599)
@@ -2,7 +2,7 @@
% Part of the OSCOLA package for biblatex: see the file
% oscola.lbx for copyright and licence information
-\ProvidesFile{oscola.cbx}[2014/05/22 v1.4 Biblatex citation style for OSCOLA standard]
+\ProvidesFile{oscola.cbx}[2015/03/15 v1.5 Biblatex citation style for OSCOLA standard]
\RequireCitationStyle{verbose-inote}
@@ -53,6 +53,7 @@
{\usebibmacro{cite:full}}}
\renewbibmacro*{footcite}{%
+ \bbx at resetpostnotedelim%
\usebibmacro{cite:citepages}%
\global\togglefalse{cbx:loccit}%
\ifboolexpr {test {\ifciteseen} or test {\ifciteibid}}
@@ -59,7 +60,7 @@
{\ifboolexpr {test {\iffieldundef{shorthand}}
or test {\bbx at ifnottrackingcites}}
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
- {\usebibmacro{footcite:ibid}}
+ {\usebibmacro{footcite:ibid}\bbx at unsetpostnotedelim}
{\usebibmacro{footcite:note}}}%
{\usebibmacro{footcite:shorthand}}}
{\usebibmacro{footcite:full}%
@@ -307,7 +308,8 @@
{\printtext[bibhyperlink]{\iftoggle{bbx at capibid}{}{\midsentence}\bibstring{ibidem}}%
\ifloccit
{\global\toggletrue{cbx:loccit}}
- {}}
+ {}%
+ \bbx at unsetpostnotedelim}%
{\usebibmacro{cite:refonlyfull}}}
\DeclareCiteCommand{\footciteref}[\mkbibfootnote]
More information about the tex-live-commits
mailing list