From 0a9c7c7a36016413358a7590677f5741abedf868 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 20 Jan 2019 23:18:31 +0000 Subject: oscola (20jan19) git-svn-id: svn://tug.org/texlive/trunk@49772 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/oscola/README.md | 12 +- .../doc/latex/oscola/oscola-examples.bib | 1525 -------------------- Master/texmf-dist/doc/latex/oscola/oscola.pdf | Bin 603655 -> 607124 bytes Master/texmf-dist/doc/latex/oscola/oscola.tex | 28 +- Master/texmf-dist/makeindex/oscola/oscola.ist | 2 +- .../tex/latex/oscola/american-oscola.lbx | 573 ++++++++ .../texmf-dist/tex/latex/oscola/british-oscola.lbx | 6 +- .../texmf-dist/tex/latex/oscola/english-oscola.lbx | 8 +- Master/texmf-dist/tex/latex/oscola/oscola.bbx | 69 +- Master/texmf-dist/tex/latex/oscola/oscola.cbx | 60 +- 10 files changed, 680 insertions(+), 1603 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/oscola/oscola-examples.bib create mode 100644 Master/texmf-dist/tex/latex/oscola/american-oscola.lbx (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/oscola/README.md b/Master/texmf-dist/doc/latex/oscola/README.md index 28d053c6a28..c71883d7837 100644 --- a/Master/texmf-dist/doc/latex/oscola/README.md +++ b/Master/texmf-dist/doc/latex/oscola/README.md @@ -10,10 +10,10 @@ further information about coverage see the documentation. ## 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 +The package consists of five principal files (`oscola.bbx`, `oscola.cbx`, and three language definition files, +`english-oscola.lbx`, `british-oscola.lbx`, and `american-oscola.lbx`). There is also a very short index style file, `oscola.ist`. Those files are copyright (c) Paul Stanley -2012-17. +2012-18. This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license @@ -46,6 +46,7 @@ currently installs as follows: * `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` +* `american-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` @@ -67,3 +68,8 @@ March 2017 Version 1.5 The package has been updated to take have been fixed; experimental support has been added for the use of ECLI numbers in EU cases. + +March 2018 Version 1.6 The package has been updated again to take + account of minor changes in Biblatex; various + bugs have been fixed; support for \\textcite has been + improved. diff --git a/Master/texmf-dist/doc/latex/oscola/oscola-examples.bib b/Master/texmf-dist/doc/latex/oscola/oscola-examples.bib deleted file mode 100644 index f25b19625a4..00000000000 --- a/Master/texmf-dist/doc/latex/oscola/oscola-examples.bib +++ /dev/null @@ -1,1525 +0,0 @@ -% This file contains various sample entries for testing the -% biblatex-oscola package. It is 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} - -@misc{amazon:email, - title = {Email from Amazon.co.uk to author}, - date = {2008-12-16}, -} - -@book{bar00, - author = {von Bar, Christian}, - title = {The Common European Law of Torts}, - volume = 2, - publisher = {CH Beck}, - date = 2000, - pagination = {paragraph}, -} - -@legislation{ucta, - title= {Unfair Contract Terms Act}, - shorttitle = {UCTA 77}, - date ={1977}, - entrysubtype={primary}, - pagination={section}, - keywords = {en}, - number={23 Eliz II, cap 23}} - -@legislation{disorderly, - title={Penalties for Disorderly Behaviour (Amendment of Minimum Age) Order}, - date={2004}, - entrysubtype={secondary}, - pagination={regulation}, - keywords = {en}, - number={SI 2004\slash 3166}, - } - -@legislation{hollowware, - title = {Hollow-ware and Galvanising Welfare Order}, - date = {1921}, - number = {SR~\&~O 1921\slash 2032}, - pagination = {rule}, - entrysubtype = {secondary}, -} - -@legislation{eggs, - title = {Eggs and Chicks (England) Regulations}, - date = {2009}, - number = {SI 2009\slash 2163}, - pagination = {regulation}, - entrysubtype = {secondary}, -} - -@legislation{learner, - title = {The Learner Travel (Wales) Measure 2008 (Commencement - No 2) Order}, - number = {SI 2009\slash 2819}, - pagination = {regulation}, - keywords = {cy}, - userb = {W~245}, - entrysubtype = {secondary}, -} - -@legislation{learner08, - title = {Learner Travel (Wales) Measure}, - date = {2008}, - number = {nawm 2}, - keywords = {cy}, - entrysubtype = {primary}, - pagination = {section}, -} - -@legislation{gorchymyn, - title = {Gorchymyn Mesur Teithio gan Ddysgwyr (Cymru) - (Cychwyn Rhif 2)\nopunct}, - number = {SI 2009\slash 2819}, - pagination = {regulation}, - keywords = {cy}, - userb = {Cy 245}, - entrysubtype = {secondary}, - language = {welsh}, -} - -@legislation{breedingdogs, - title = {Breeding of Dogs (Licensing Records) (Scotland) Regulations}, - date = {1999}, - number = {SSI 1999\slash 176}, - keywords = {sc}, - pagination = {regulation}, - entrysubtype = {secondary}, -} - -@legislation{sederunt:session, - title = {Act of Sederunt (Rules of the Court of Session 1994)}, - date = {1994}, - number = {SI 1994\slash 1443}, - keywords = {sc}, - pagination = {rule}, - entrysubtype = {secondary}, -} - -@legislation{adjournal, - title = {Act of Adjournal (Criminal Appeals)}, - date = {2003}, - number = {SSI 2003\slash 387}, - keywords = {sc}, - entrysybtype = {secondary}, -} - -@legislation{bann, - title = {The River Bann Navigation Order (Northern Ireland)}, - date = {2010}, - number = {SR 2010\slash 126}, - keywords = {ni}, - entrysubtype = {secondary}, -} - -@legislation{cpr, - title = {Civil Procedure Rules}, - shorttitle = {CPR}, - keywords = {en}, - entrysubtype = {procedure-rule}, - date = {1999}, -} - -@legislation{pd, - title = {CPR Practice Directions}, - shorttitle = {PD}, - keywords = {en}, - entrysubtype = {procedure-rule}, -} - -@legislation{rsc, - title = {Rules of the Supreme Court}, - shorttitle = {RSC}, - keywords = {en}, - date = {1965}, - entrysubtype = {procedure-rule}, - pagination = {rule}, -} - -@legislation{ccr, - title = {County Court Rules}, - shorttitle = {CCR}, - keywords = {en}, - date = {1985}, - pagination = {rule}, - entrysubtype = {procedure-rule}, -} - -@legislation{2002/60, - title = {Council Directive 2002\slash 60\slash EC of - 27 June 2002 laying down specific provisions - for the control of African swine fever and - amending Directive 99\slash 119\slash EEC as - regards Teschen disease and African swine - fever}, - date = {2002}, - origdate = {2002-06-27}, - journaltitle = {OJ}, - series = {L}, - issue = {192}, - pages = {27}, - type = {directive}, - number = {2002/60/EC}, - pagination = {article}, - keywords = {eu}, -} - -@legislation{merger, - title = {Council Regulation (EC) No 139/2004 of 20 - January 2004 on the control - of concentrations between undertakings}, - type = {regulation}, - entrysubtype = {regulation}, - journaltitle = {OJ}, - volume = {24}, - series = {L}, - date = {2004}, - pages = {1--22}, - keywords = {eu}, - number = {139/2004}, -} - -@legislation{teu, - title = {Consolidated Version of the - Treaty on European Union}, - indextitle = {Treaty on European Union}, - date = {2010}, - journaltitle = {OJ}, - series = {C}, - volume = {83}, - pages = {13}, - shorthand = {TEU}, - entrysubtype = {eu-treaty}, - pagination = {article}, - keywords = {eu}, -} - -@jurisdiction{antaios85, - title = {Antaios Compania Naviera S.A. v. Salen Rederierna A.B. (The Nema)}, - shorttitle = {The Nema}, - date = {1985}, - reporter = {A.C.}, - pages = {191}, - court = {H.L.}, - additionalreports = {[1984] 3 WLR 592 and (1984) 128 SJ 564 and [1984] 3 All ER 229 and [1984] 2 Lloyd's Rep 235}, - keywords = {gb}, -} - -@jurisdiction{clearbrook, - title = {Clearbrook Ironworks Ltd. v. Letorneau}, - number = {2006 FCA 42}, - volume = {46}, - reporter = {C.P.R.}, - series = {4th}, - pages = {241}, - date = {2006}, - pagination = {paragraph}, - keywords = {ca}, -} -@jurisdiction{tang, - title = {R. v. Tang}, - date = {2008}, - volume = {237}, - reporter = {C.L.R.}, - pages = {1}, - keywords = {au}, -} -@jurisdiction{bakker, - title = {Bakker v. Stewart}, - date = {1980}, - reporter = {V.R.}, - pages = {17}, - keywords = {au}, -} - -@book{birks87, - translator = {Birks, Peter and McLeod, Grant}, - title = {The Institutes of Justinian}, - indextitle = {Institutes of Justinian, The}, - publisher = {Duckworth}, - date = 1987, - location = {London}, -} -@jurisdiction{adbhu, - keywords = {eu}, - title = {Procureur de la R\'epublique v ADBHU}, - shorttitle = {ADBHU}, - number = {240/83}, - institution = {ECJ}, - date = {1985}, - reporter = {ECR}, - pages = {531}, - ecli = {EU:C:1985:59}, -} - -@jurisdiction{C430/93, - keywords = {eu}, - title = {Jereon van Schijndel v Stichting Pensioenfonds voor Fysiotherapeuten}, - shorttitle = {van Schijndel}, - number = {C-430/93--C-431/93}, - institution = {ECJ}, - reporter = {ECR}, - volume = {I}, - date = {1998}, - pages = {4705}, -} - -@jurisdiction{T344/99, - keywords = {eu}, - title = {Arne Mathisen AS v Council}, - shorttitle = {Arne Mathisen}, - number = {T-344/99}, - institution = {CFI}, - reporter = {ECR}, - volume = {II}, - pages = {2905}, - date = {2002}, -} - -@jurisdiction{C556/07, - keywords = {eu}, - title = {Commission v France}, - date = {2009}, - reporter = {OJ}, - series = {C}, - volume = {102}, - pages = {8}, - number = {C-556/07}, - institution = {ECJ}, -} - -@jurisdiction{T277/08, - keywords = {eu}, - title = {Bayer Healthcare v OHMI--Uriach Aquilea OTC}, - institution = {CFI}, - number = {T-277/08}, - date = {2009-11-11},} - -@jurisdiction{alcatel, - keywords = {eu}, - title = {Alcatel/Telettra}, - userb = {IV/M.042}, - number = {91\slash 251\slash EEC}, - institution = {commission}, - type = {Decision}, - date = {1991}, - reporter = {OJ}, - series = {L}, - volume = {122}, - pages = {48}, -} - -@jurisdiction{C176/03, - keywords = {eu}, - title = {Commission v Council}, - number = {C\textendash176/03}, - date = {2005}, - reporter = {ECR}, - volume = {I}, - pages = {7879}, - institution = {ECJ}, -} - -@jurisdiction{verkehrsorgani, - keywords = {eu}, - title = {Georg Verkehrsorgani v Ferrovie dello Stato}, - userb = {Case COMP\slash 37.685}, - number = {2004/33/EC}, - institution = {commission}, - year = {2004}, - reporter = {OJ}, - series = {L}, - issue = {11}, - pages = {17}, - hyphenation = {italian}, -} - -@jurisdiction{boardman, - title = {Phipps v Boardman}, - keywords = {gb}, - reporter = {AC}, - date = {1967}, - volume = 2, - pages = {46}, - institution = {HL}, - options = {year-essential=true}, - shorthand = {Phipps}, -} - -@article{bm:note, - author = {Neil Andrews}, - journaltitle = {CLJ}, - date = 1986, - pages = 220, - entrysubtype = {casenote}, - crossref = {boardman}, -} - -@jurisdiction{corr08, - title = {Corr v I.B.C. Vehicles Ltd.}, - keywords = {gb}, - date = {2008}, - number = {[2008] UKHL 13}, - reporter = {AC}, - volume = {1}, - pages = {884}, - options = {year-essential=true}, - institution = {HL}, - shorttitle = {Corr}, - pagination = {[]}, -} -@jurisdiction{jameel04, - title = {Jameel v. Wall Street Journal - Europe SPRL}, - shorttitle = {Jameel v Wall Street Journal}, - number = {[2006] UKHL 44}, - date = {2007}, - volume = {1}, - reporter = {A.C.}, - pages = {359}, - options = {year-essential}, -} - -@Book{book:1, - author = {A N Author}, - title = {Title of Book}, - date = 1998, - location = {London}, - publisher = {{Sweet \& Maxwell}} -} -@jurisdiction{page96, - title = {Page v Smith}, - keywords = {en}, - date = {1996}, - reporter = {AC}, - pages = {155}, - institution = {HL}, - annotation = {affirmed \cite{corr}}, -} - -@jurisdiction{barrett01, - title = {Barrett v Enfield LBC}, - keywords = {en}, - date = {2001}, - reporter = {AC}, - volume = {2}, - pages = {550}, - institution = {HL}, - options = {year-essential=true}, -} - -@jurisdiction{barrett01a, - title = {Barrett v Enfield LBC}, - keywords = {en}, - date = {2001}, - reporter = {BMLR}, - volume = {49}, - pages = {1}, - lista = {First and Second and Third}, - institution = {HL}, -} - -@jurisdiction{rea01, - title = {Re A (Conjoined Twins)}, - indextitle = {A (Conjoined Twins), Re}, - keywords = {en}, - date = {2001}, - reporter = {Fam}, - options = {year-essential=false}, - pages = 147, -} - -@jurisdiction{madoff09, - title = {Re Bernard L Madoff Investment Securities LLC}, - number = {[2009] EWHC 442 (Ch)}, - date = {2010}, - origdate = {2009}, - reporter = {BCC}, - pages = 328, - pagination = {[]}, - shorthand = {Re Madoff Securities}, -} - -@jurisdiction{taylor79, - title = {Taylor v Glass}, - date = {1979}, - reporter = {CLY}, - institution = {CA}, - pages = {672}, - options = {year-essential=true}, -} - -@jurisdiction{quainoo82, - title = {Quainoo v Brent and Harrow AHA}, - date = {1982}, - volume = {132}, - reporter = {NLJ}, - pages = {1100}, - institution = {QB}, -} - -@jurisdiction{powick93, - title = {Powick v Malvern Wells Water Co}, - date = {1993-09-28}, - reporter = {The Times}, - institution = {QB}, - entrysubtype = {newspaper}, -} - -@jurisdiction{emerald10, - title = {Emerald Supplies Ltd v British Airways plc}, - number = {[2009] EWHC 741 (Ch)}, - date = {2010}, - origdate = {2009}, - reporter = {Ch}, - pages = {48}, - shorttitle = {Emerald Supplies Ltd}, -} - -@jurisdiction{stubbs90, - title = {Stubbs v Sayer}, - institution = {CA}, - date = {1990-11-08}, -} - -@jurisdiction{calvert02, - title = {Calvert v Gardiner}, - number = {[2002] EWHC 1394 (QB)}, - institution = {QB}, - date = {2002-01-01}, -} - -@article{boyle04, - author = {Boyle, James}, - title = {A Manifesto on WIPO and the Future of Intellectual - Property}, - journaltitle = {2004 Duke L \& Tech Review 0009}, - url = - {http://dltr.law.duke.edu/2004/09/08/a-manifesto-on-wipo-and-the-future-of-intellectual-property}, - urldate = {2012-07-18}, - options = {url=true}, -} - -@misc{brown:letter, - title = {Letter from Gordon Brown to Lady Ashton}, - date = {2009-11-20}, -} - -@book{burrows02, - author = {Burrows, Andrew}, - title = {The Law of Resitution}, - edition = 2, - publisher = {Butterworths}, - date = 2002, -} - -@book{burrows04, - author = {Burrows, Andrew}, - title = {Remedies for Torts and Breach of Contract}, - edition = 3, - publisher = {OUP}, - date = 2004, -} - -@inbook{cartwright09, - author = {Cartwright, John}, - title = {The Fiction of the \enquote{Reasonable Man}}, - crossref = {castermans09}, -} - -@book{castermans09, - editor = {Castermans, A. G. and others}, - title = {Ex Libris Hans Nieuwenhuis}, - publisher = {Kluwer}, - date = 2009, -} - -@article{craig05, - author = {Craig, Paul}, - title = {Theory \enquote{Pure Theory} and Values in Public - Law}, - date = 2005, - journaltitle = {PL}, - pages = 440, -} - -@article{croft, - title = {Supreme Court Warns on Quality}, - author = {Jane Croft}, - journaltitle = {Financial Times}, - location = {London}, - date = {2010-07-01}, - pages = 3, - entrysubtype = {newspaper}, -} - -@book{endicott09, - author = {Endicott, Timothy}, - title = {Administrative Law}, - publisher = {OUP}, - location = {Oxford}, - date = 2009, -} - -@article{greenleaf10, - author = {Greenleaf, Graham}, - title = {The Global Development of Free Access to Legal - Information}, - date = 2010, - url = {http://ejlt.org/article/view/17}, - urldate = {2010-07-10}, - journaltitle = {EJLT}, - volume = 1, - issue = 1, -} - -@article{griffith01, - author = {Griffith, J. A. G.}, - title = {The Common Law and the Political Constitution}, - date = 2001, - journaltitle = {L.Q.R.}, - volume = 117, - pages = 42, -} - -@book{hart08, - author = {Hart, H. L. A.}, - title = {Punishment and Responsibility}, - subtitle = {Essays in the Philosophy of Law}, - editor = {Gardner, John}, - edition = 2, - publisher = {OUP}, - date = 2008, -} - -@misc{honore:interview, - author = {Endicott, Timothy and Gardner, John}, - title = {Interview with Tony Honor\'e, Emeritus Regius - Professor of Civil Law, University of Oxford}, - location = {Oxford}, - date = {2007-07-17}, - shorttitle = {Interview with Tony Honor\'e}, -} - -@book{horder00, - editor = {Horder, Jeremy}, - title = {Oxford Essays in Jurisprudence: Fourth Series}, - publisher = {OUP}, - date = 2000, -} - -@book{jones09, - author = {Jones, Gareth}, - title = {Goff and Jones: The Law of Restitution}, - edition = {1st Supp, 7th edn}, - publisher = {{Sweet~\& Maxwell}}, - date = 2009, - location = {London}, -} - -@book{kotz98, - author = {Zweigert, K. and K\"otz, H.}, - title = {An Introduction to Comparative Law}, - translator = {Weir, Tony}, - edition = 3, - publisher = {OUP}, - date = 1998, -} - -@misc{kull:interview, - title = {Interview with Irene Kull, Assistant Dean, Faculty - of Law, Tartu University}, - location = {Tartu, Estonia}, - date = {2003-08-04}, -} - -@book{lenaerts2, - title = {Constitutional Law of the European Union}, - edition = 2, - author = {Lenaerts, Koen and Piet van Nuffel}, - editor = {Bray, Robert}, - publisher = {Sweet \& Maxwell}, - date = 2005, -} - -@book{leviathan, - author = {Hobbes, Thomas}, - title = {Leviathan}, - publisher = {Penguin}, - date = 1985, - origdate = 1651, - location = {Harmondsworth}, -} - -@article{loader, - title = {The Great Victim of this Get Tough Hyperactivity is - Labour}, - author = {Ian Loader}, - journaltitle = {The Guardian}, - location = {London}, - date = {2008-06-19}, - url = - {http://www.guardian.co.uk/commentisfree/2008/jun/19/justice.ukcrime}, - urldate = {2009-11-19}, - entrysubtype = {newspaper}, -} - -@reference{halsbury5, - title = {Halsbury's Laws}, - pagination = {paragraph}, - edition = {5}, - date = {2010}, - publisher = {Butterworths}, -} - -@inreference{halsbury5:57, - volume = {57}, - crossref = {halsbury5}, - pagination = {paragraph}, -} - -@reference{iess, - title = {International Encyclopaedia of the Social Sciences III}, - date = {1968}, -} - -@inreference{friedrich68, - title = {Constitutions and Constitutionalism}, - author = {Friedrich, CJ}, - pages = 319, - maintitle = {International Encyclopaedia of the - Social Sciences III}, - date = {1968}, -} - -@inreference{friedrich68a, - title = {Constitutions and Constitutionalism}, - author = {Friedrich, C.J.}, - pages = {319}, - volume = {III}, - maintitle = {International Encyclopaedia of the - Social Sciences}, - date = {1968}, -} - -@reference{cross, - title = {Cross on Local Government Law}, - options = {looseleaf}, - date = {2010}, -} - -@commentary{stair, - author = {Stair}, - title = {Institutions}, - keywords = {sc}, - } - -@commentary{colitt, - author = {Coke}, - title = {Co Litt}, - keywords = {en}, -} - -@commentary{blackstone, - author = {Blackstone}, - title = {Commentaries}, - shorttitle = {Bl Comm}, - keywords = {en}, -} - -@legislation{supremacy1558, - title = {Act of Supremacy}, - date = {1558}, - entrysubtype= {primary}, - pagination = {section}, - keywords = {en}, -} - -@legislation{shipping1995, - title = {Shipping and Trading Interests (Protection) Act}, - date = {1995}, - entrysubtype= {primary}, - pagination = {section}, - keywords = {en}, -} - -@legislation{nia1965, - title = {Nuclear Installations Act}, - date = {1965}, - shorthand = {NIA 1965}, - keywords = {en}, - pagination = {section}, - entrysubtype= {primary}, - keywords = {en}, - note = {as amended}, -} - -@legislation{cpa1987, - title = {Consumer Protection Act}, - year = {1987}, - keywords = {en}, - pagination= {section}, - type = {primary}, -} - -@jurisdiction{boulton57, - title = {Boulton v Jones}, - date = {1857}, - volume = {2}, - journaltitle = {H\&N}, - pages = {564}, - keywords = {en}, - userb = {157}, - userc = {ER}, - usere = {232--242}, -} - -@jurisdiction{henly28, - title = {Henly v Mayor of Lyme}, - shorttitle = {Henly}, - date = {1828}, - volume = {5}, - reporter = {Bing}, - pages = {91}, - keywords = {en}, - parvolume = {130}, - parreporter= {ER}, - parpages = {995}, - options = {no-ibid=true}, -} - -@jurisdiction{johnston86, - title = {Johnston v Ireland}, - reporter = {Series A}, - pages = {122}, - date = {1986}, - institution = {ECtHR}, - keywords = {echr}, -} - -@jurisdiction{osman98, - title = {Osman v UK}, - reporter = {ECHR}, - date = {1998}, - volume = {8}, - pages = {3124}, - institution = {ECtHR}, - keywords = {echr}, -} - -@jurisdiction{omojudi10, - title = {Omojudi v UK}, - reporter = {EHRR}, - date = {2010}, - pages = {10}, - volume = {51}, - institution = {ECtHR}, - keywords = {echr}, -} - -@jurisdiction{x71, - title = {X v Netherlands}, - date = {1971}, - volume = {38}, - reporter = {CD}, - pages = {9}, - court = {Commission}, - keywords = {echr}, -} - -@jurisdiction{ccsu87, - title = {Council of Civil Service Unions v UK}, - date = {1987}, - volume = {10}, - reporter = {EHRR}, - pages = {269}, - institution = {Commission}, - keywords = {echr}, -} - -@jurisdiction{simpson86, - title = {Simpson v UK}, - date = {1989}, - volume = {64}, - reporter = {DR}, - pages = {188}, - institution = {Commission}, - keywords = {echr}, -} - -@jurisdiction{balogh04, - title = {Balogh v Hungary}, - number = {47940/99}, - date = {2004-07-20}, - institution = {E{\mbox{Ct}}HR}, - keywords = {echr}, -} - -@jurisdiction{hislop42, - title = {Hislop v Durham}, - date = {1842}, - volume = {4}, - reporter = {D}, - pages = {1168}, - keywords = {sc}, -} - -@jurisdiction{adams03, - title = {Adams v Advocate General}, - date = {2003}, - reporter = {SC}, - pages = {171}, - institution = {OH}, - keywords = {sc}, -} - -@jurisdiction{dodds03, - title = {Dodds v HM Advocate}, - date = {2003}, - reporter = {JC}, - pages = {8}, - keywords = {sc}, -} - -@jurisdiction{crofters02, - title = {Crofters Commission v Scottish Ministers}, - date = {2002}, - reporter = {SLT}, - series = {(Land Ct)}, - pages = {19}, - keywords = {sc}, -} - -@jurisdiction{davidson05, - title = {Davidson v Scottish Ministers}, - date = {2006}, - number = {[2005] UKHL 74}, - reporter = {SC (HL)}, - keywords = {gb}, - options = {scottish-style=true}, -} - -@jurisdiction{smart06, - title = {Smart v HM Advocate}, - number = {[2006] HJAC 12}, - date = {2006}, - reporter = {JC}, - pages = {119}, - keywords = {sc}, -} - - -@jurisdiction{p88, - title = {P v UK}, - number = {13473/87}, - date = {1988-07-11}, - institution = {Commission}, - keywords = {echr}, -} - -@report{rc:capital, - title = {Report of the Royal Commission on Capital Punishment}, - author = {{Home Office}}, - series = {Cmd}, - number = {8932}, - date = {1953}, - pagination = {paragraph}, -} - -@report{autumnperf, - title = {2008 Autumn Performance Report}, - institution = {Department for Children, Schools and Families}, - series = {Cm}, - number = {7507}, - date = {2008}, -} - -@report{eliminating:poverty, - title = {Eliminating World Poverty}, - subtitle = {Building our Common Future}, - author = {{Department for International Development}}, - number = {Cm 7656}, - type = {White Paper}, - date = {2009}, -} - -@report{lawcom313, - title = {Reforming Bribery}, - institution = {Law Commission}, - number = {Law Com No 313}, - date = {2008}, - pagination = {paragraph}, -} - -@report{scotlawcom196, - title = {Damages for Psychiatric Injury}, - institution = {Scottish Law Commission}, - number = {Scot Law Com No 196}, - date = {2004-11-11}, - pagination = {paragraph}, - usera = {officialreports}, -} - -@report{lawcomcp121, - title = {Privity of Contract: Contracts for the Benefit - of Third Parties}, - author = {{Law Commission}}, - number = {Law Com CP No 121}, - date = {1991}, - pagination = {paragraph}, -} - -@report{genomic, - title = {Genomic Medicine}, - author = {Science and Technology Committee}, - entrysubtype = {parliamentary}, - number = {HL 107}, - volume = {1}, - date = {2008/2009}, -} - -@report{equality, - title = {Legislative Scrutiny: Equality Bill (second report); - Digital Economy Bill}, - institution = {Joint Committee on Human Rights}, - entrysubtype = {parliamentary}, - date = {2009/2010}, - number = {HL 73, HC 425}, -} - -@report{patient, - title = {Patient Safety}, - institution = {Health Committee}, - entrysubtype = {parliamentary}, - date = {2008/2009}, - volume = {1}, - number = {HC 151}, - pagination = {paragraph}, -} - -@legal{hansardhc, - title = {Official Report, House of Commons}, - shorttitle = {HC Deb}, - entrysubtype = {parliamentary}, - pagination = {column} -} - -@legal{hra:hc:2, - crossref = {hansardhc}, - volume = {123}, - options = {skipbib=true}, - date = {2004-07-31}, - pages = {333--54}, -} - -@legal{hra:hc:3, - crossref = {hansardhc}, - volume = {145}, - date = {2004-08-21}, - pages = {100-103}, -} - -@legal{foia:2r, - volume = {340}, - pages = {714--98}, - date = {1999-12-07}, - crossref = {hansardhc}, - entrysubtype = {parliamentary}, - options = {skipbib=true}, - -} - -@legal{healthbill, - title = {Health Bill Deb}, - date = {2007-01-30}, - pagination = {column}, - entrysubtype = {parliamentary}, -} - - - -@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)}, - institution = {Commission}, - number = {COM (2008) 895 final}, - entrysubtype = {comdoc} -} - -@report{com13, - title = {Action Plan on consumer access to justice and the - settlement of disputes in the internal market}, - type = {Communication}, - number = {COM (96) 13 final}, - institution = {Commission}, - entrysubtype = {comdoc} -} - -@report{com348, - 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}, -} - -@book{mcgill:guide, - title = {Canadian Guide to Uniform Legal Citation}, - author = {{McGill Law Journal}}, - edition = 7, - date = 2010, - publisher = {Carswell}, -} - -@book{melbourne, - title = {Australian Guide to Legal Citation}, - author = {{Melbourne University Law Review Association Inc}}, - publisher = {Melbourne University Law Review Association and - Melbourne Journal of International Law}, - edition = 3, - date = 2010, - url = {http://mulr.law.unimelb.edu.au/go/aglc}, - urldate = {2012-07-18}, -} - -@book{oscola, - title = {OSCOLA}, - subtitle = {Oxford Standard for the Citation of Legal - Authorities}, - author = {{Faculty of Law, University of Oxford}}, - url = {http://www.law.ox.ac.uk/oscola}, - date = 2010, - edition = 4, - shorthand = {{{\scshape oscola}}}, -} -@online{cole09, - title = {Virtual Friend Fires Employee}, - journaltitle = {Naked Law}, - date = {2009-05-01}, - url = {http://www.nakedlaw.com/2009/05/index.html}, - urldate = {2009-11-09}, - author = {Cole, Sarah}, -} -@thesis{herberg89, - title = {Injunctive Relief for Wrongful Termination of - Employment}, - author = {Herberg, Javan}, - date = {1989}, - institution = {{University of Oxford}}, - type = {DPhil thesis}, -} -@jurisdiction{corfu, - title = {Corfu Channel Case}, - subtitle = {UK v Albania}, - titleaddon = {Merits}, - date = {1949}, - reporter = {ICJ Rep}, - pages = {4}, - keywords = {int}, -} -@jurisdiction{nicaragua, - title = {Land, Island and Maritime Frontier - Case}, - subtitle = {El Salvador\slash Hon\-duras, Nicaragua - intervening}, - titleaddon = {Application for Intervention}, - date = {1994}, - reporter = {ICJ Rep}, - pages = {92}, - keywords = {int}, -} -@jurisdiction{wall, - title = {Legal Consequences of the Construction - of a Wall}, - titleaddon = {Advisory Opinion}, - date = {2004}, - url = {http://www.icj-cij.org/icjwww/imwp/imwpframe.htm}, - urldate = {2005-07-21}, - pagination = {[]}, - keywords = {int}, -} -@jurisdiction{chorzow, - title = {Case Concerning the Factory at Chorz\'ow}, - subtitle = {Germany v Poland}, - titleaddon = {Merits}, - indextitle = {Chorz\'ow Factory Case}, - reporter = {PCIJ Rep}, - date = {1928}, - series = {A}, - pages = {17}, - keywords = {int}, -} -@jurisdiction{gex, - title = {Case of the Free Zones of Upper Savoy and - the District of Gex}, - subtitle = {Switzerland v France}, - reporter = {PCIJ Rep}, - series = {Series A/B}, - pages = {No 46}, - keywords = {int}, -} -@jurisdiction{consular, - title = {Case Concerning the Vienna Convention on - Consular Relations}, - subtitle = {Germany v USA}, - titleaddon = {Request for the Indication of Provisional - Measures: Order}, - number = {General List No 104}, - reporter = {ICJ}, - date = {1999}, - pages = {1}, - keywords = {int}, -} -@legislation{confund, - title = {Consolidated Fund Bill}, - date = {2008/2009}, - institution = {HC}, - number = {5}, - keywords = {gb, draft}, - entrysubtype = {primary}, - pagination = {clause}, -} - -@book{oscola3, - title = {OSCOLA}, - subtitle = {Oxford Standard for the Citation of Legal - Authorities}, - author = {{Faculty of Law, University of Oxford}}, - url = - {http://www.law.ox.ac.uk/published/oscola/oscola_2006.pdf}, - date = 2006, - edition = 3, -} -@legislation{confund2, - title = {Consolidated Fund Bill}, - date = {2008/2009}, - institution = {HC}, - number = {34}, - keywords = {gb, draft}, - entrysubtype = {primary}, - pagination = {clause}, -} -@legislation{academies, - title = {Academies Bill}, - date = {2010/2011}, - institution = {HL}, - number = {1}, - keywords = {gb, draft}, - entrysubtype = {primary}, - pagination = {clause}, -} -@legal{charitiesnotes, - title = {Explanatory Notes on the Charities Act 2006}, - indextitle = {Charities Act 2006, Explanatory Note}, - pagination = {paragraph}, - entrysubtype = {explanatory note}, -} -@report{biblatex2, - author = {Lehman, Philip and Boruvka, Audrey and Kime, Philip and Wright, Joseph}, - title = {The biblatex Package}, - date = {2012}, - edition = {v 2.0}, -} -@legal{scheldt, - title = {International Agreement on the Scheldt}, - shorttitle = {Scheldt Agreement}, - parties = {Belgium and France and Netherlands}, - execution = {signed=2002-12-01 and inforce=2005-12-01}, - pagination = {article}, - volume = {2351}, - journaltitle = {UNTS}, - pages = {13}, - entrysubtype = {piltreaty}, -} -@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}, - lista = {opened=1921-10-02 and inforce=1922-12-06}, - pagination = {article}, - volume = {9}, - date = {1921}, - journaltitle = {LNTS}, - pages = {211}, - entrysubtype = {piltreaty}, -} -@legal{mongolia, - title = {Agreement with Mongolia (Economic Co-operation)}, - shortitle = {Mongolia Cooperation Agreement}, - journaltitle= {O.J.}, - series = {L}, - issue = {264}, - pages = {1}, - date = {1978}, - entrysubtype= {piltreaty}, -} - -@inbook{pila10, - author = {Pila, Justine}, - editor = {Dutton, William H. and Jeffreys, Paul W.}, - booktitle = {World Wide Research: Reshaping the Sciences and - Humanities in the Century of Information}, - publisher = {MIT Press}, - date = 2010, - title = {The Value of Authorship in the Digital Environment}, - pages = {210--231}, -} - -@inproceedings{reliance, - author = {McFarlane, Ben and Nolan, Donal}, - title = {Remedying Reliance: The Future Development of - Promissory and Proprietary Estoppel in English Law}, - eventtitle = {Obligations III conference}, - location = {Brisbane}, - eventdate = {2006-07-01}, -} - -@book{roberts09, - author = {Roberts, Julian V and Hough, Mike}, - title = {Public Opinion and the Jury: An International - Literature Review}, - series = {Ministry of Justice Research Series}, - number = {1/09}, - date = 2009, -} - -@article{rowbottom07, - entrysubtype = {casenote}, - author = {Rowbottom, Jacob}, - crossref = {jameel04}, - date = 2007, - journaltitle = {C.L.J.}, - pages = {8--11}, -} - -@misc{spbill4, - title = {SP Bill 4 Abolition of Feudal Tenure etc (Scotland) - Bill [as introduced] Session 1}, - date = 1999, - tabulate = {pmats}, - options = {skipbib}, -} - -@Book{testbook, - author = {A T Author}, - title = {Title}, - editor = {Editor, E and Beditor, B}, - publisher = {Publisher}, - origdate = 1232, - translator = {Translator}, - volume = 1, - location = {Location}, - edition = 3, - note = {note}, - eprint = {eprintreference}, - eprinttype = {google}, - pagination = {paragraph}, - year = 2000 -} -@jurisdiction{western97, - title = {Western Alliance Insurance Co. v. Gill}, - volume = {686}, - reporter = {N.E.}, - series = {2}, - pages = {997}, - location = {Mass.}, - date = {1997}, - keywords = {us}, -} -@jurisdiction{harbor91, - title = {Harbor Insurance Co. v. Tishman Construction Co.}, - volume = {578}, - reporter = {N.E.2d.}, - pages = {1197}, - location = {Ill.}, - court = {App. Ct.}, - date = {1991}, - keywords = {us}, -} -@jurisdiction{operadora09, - title = {Re Operadora D.B. Mexico S.A.}, - indextitle = {Operadora D.B. Mexico S.A., Re}, - number = {6:09-{}cv-{}383-{}Orl 022GJK}, - eprint = {2009 WL 2423138}, - court = {M.D. Fla.}, - date = {2009}, - keywords = {us}, -} - -@article{waldron06, - author = {Waldron, Jeremy}, - title = {The Core of the Case against Judicial Review}, - date = 2006, - volume = 115, - journaltitle = {Yale L.J.}, - pages = 1346, -} - -@article{young09, - author = {Young, Alison L.}, - title = {In Defence of Due Deference}, - date = 2009, - journaltitle = {MLR}, - volume = 72, - pages = 554, -} - -@legal{echr:treaty, - title = {Convention for the Protection of Human Rights - and Fundamental Freedoms}, - execution = { opened=1950-11-04 and inforce=1953-09-03 }, - 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}, - shorthand = {ECHR}, - entrysubtype = {piltreaty}, -} -@ARTICLE{JAB0960, - title = {A Nonparty View}, - author = {A }, - address = {London}, - date = {1911-07-28}, - entrysubtype = {newspaper}, - options = {skipbib=true}, - abstract = {active}, - journaltitle = {The Times} -} - -@ARTICLE{JAB0218, - title = {Ireland and the Political Situation}, - author = {Blake, Henry. A.}, - address = {London}, - date = {1910-02-07}, - pages = {6}, - entrysubtype = {newspaper}, - options = {skipbib=true}, - abstract = {active}, - journaltitle = {The Times} -} - -@ARTICLE{JAB0266, - title = {The Political Situation}, - author = {Blake, Henry. A.}, - address = {London}, - date = {1910-02-23}, - pages = {9}, - entrysubtype = {newspaper}, - options = {skipbib=true}, - abstract = {active}, - journaltitle = {The Times} -} - -@ARTICLE{JAB0304, - title = {The House Of Lords}, - author = {Blake, Henry. A.}, - address = {London}, - date = {1910-03-23}, - pages = {10}, - entrysubtype = {newspaper}, - options = {skipbib=true}, - abstract = {active}, - journaltitle = {The Times} -} - -@ARTICLE{JAB0025, - title = {Forcible Feeding}, - author = {{A.C.P} }, - address = {London}, - date = {1909-11-10}, - pages = {10}, - entrysubtype = {newspaper}, - options = {skipbib=true}, - abstract = {active}, - journaltitle = {The Times} -} - -@ARTICLE{JAB0976, - title = {The Last Ditch}, - author = {{A Bottomless Pitman}}, - address = {London}, - date = {1911-07-29}, - pages = {10}, - entrysubtype = {newspaper}, - options = {skipbib=true}, - abstract = {active}, - journaltitle = {The Times} -} - -@ARTICLE{JAB0642, - title = {Scandal-Mongers- A Butlers Protest}, - author = {{A Butler}}, - address = {London}, - date = {1911-01-28}, - pages = {12}, - entrysubtype = {newspaper}, - options = {skipbib=true}, - abstract = {inactive}, - journaltitle = {The Times} -} - -@ARTICLE{JAB0217, - title = {The Political Outlook}, - author = {Academicus}, - address = {London}, - date = {1910-02-04}, - pages = {7}, - entrysubtype = {newspaper}, - options = {skipbib=true}, - abstract = {active}, - journaltitle = {The Times} -} - -@ARTICLE{JAB0904, - title = {Reculer Pour Mieux Sauter}, - author = {Academicus}, - address = {London}, - date = {1911-07-25}, - pages = {7}, - entrysubtype = {newspaper}, - options = {skipbib=true}, - abstract = {active}, - journaltitle = {The Times} -} - -@misc{Indep, - institution = {UNGA}, - title = {Declaration on the Granting of Independence to Colonial - Countries and Peoples}, - instrument_no = {Res 1514 (XV)}, - date = {1960-12-14}, - doc_no = {UN~Doc A/4684 (1961)}, - shorttitle = {Res 1514 (XV)}, - entrysubtype = {undoc}, -} - -@misc{res51_210, - institution = {UNGA}, - instrument_no = {Res 51/210}, - date = {1996-12-17}, - doc_no = {UN~Doc A/RES/51/210}, - entrysubtype = {undoc}, -} - -@misc{badinter4, -title = {Opinion No 4}, -author = {{Badinter Commission}}, -indextitle = {Badinter Commission Opinion 4}, -year = 1992, -volume = 31, -journaltitle = {I.L.M.}, -pages = 1501, -entrysubtype = {undoc}, -} \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/oscola/oscola.pdf b/Master/texmf-dist/doc/latex/oscola/oscola.pdf index f2853a1f716..82f396d857b 100644 Binary files a/Master/texmf-dist/doc/latex/oscola/oscola.pdf and b/Master/texmf-dist/doc/latex/oscola/oscola.pdf differ diff --git a/Master/texmf-dist/doc/latex/oscola/oscola.tex b/Master/texmf-dist/doc/latex/oscola/oscola.tex index 280268b86a4..1d2e5d16c37 100644 --- a/Master/texmf-dist/doc/latex/oscola/oscola.tex +++ b/Master/texmf-dist/doc/latex/oscola/oscola.tex @@ -19,8 +19,8 @@ {scrartcl} % SET VERSION NUMBER AND RELEASE DATE -\def\releasedate{1 April 2017} -\def\versionnumber{1.5} +\def\releasedate{20 January 2019} +\def\versionnumber{1.6} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usepackage{geometry} @@ -351,7 +351,7 @@ order.\index[general]{Biblatex!introduction Basic use of \oscola\ will require: \begin{itemize} \item The \textsc{biblatex} package. This is to be found in any modern - \TeX\ distribution. You need version 2.0 (or higher).\index[general]{Biblatex!version 2.0 required}\index[general]{prerequisites!Biblatex} + \TeX\ distribution. You need version 3.9 (or higher).\index[general]{Biblatex!version 3.9 required}\index[general]{prerequisites!Biblatex} \item The files \texttt{oscola.bbx}, \texttt{oscola.cbx} and \texttt{english-oscola.lbx}, installed where \LaTeX\ can find them.\index[general]{oscola.bbx@\texttt{oscola.bbx}}\index[general]{oscola.cbx@\texttt{oscola.cbx}}\index[general]{english-oscola.lbx@\texttt{english-oscola.lbx}}\index[general]{prerequisites!package files} \item A working version of \textsc{biber}; this is also to be found in @@ -483,7 +483,9 @@ of `ibid' in successive citations. there, then set the \texttt{ibidstyle} option to \texttt{uc}. Please note that while this will work reliably with citations created using \verb|\footcite| or \verb|\autocite|, if you use the - form\begin{verbatim}\footnote{\cite{ ... }}\end{verbatim}the need + form +\begin{verbatim}\footnote{\cite{ ... }}\end{verbatim} + the need for a capital will not be `picked up' automatically. In such a case, if you are using capitals, you will need to insert the command \verb|\bibsentence| immediately before the \verb|\cite|. (This is a @@ -785,7 +787,15 @@ case, you can use the \verb|\multicites| and \verb|\multifootcites| commands, which are described in more detail in the \biblatex\ documentation.\index[general]{multicites@\texttt{\textbackslash{multicites}}} -The package supports the use of the \verb|\textcite| command, but it is not fully developed. It makes most sense for cases, where \verb|\textcite{boardman}| will produce a citation with the name of the case in the text, and the reference in the footnote, so that one can refer to \textcite{boardman} in running text. For books and articles it provides the author's name. For other material it is not guaranteed to produce useful results. +The package supports the use of the \verb|\textcite| command, but it +is not fully developed. It makes most sense for cases, where +\verb|\textcite{boardman}| will produce a citation with the name of +the case in the text, and the reference in the footnote, so that one +can refer to \textcite{boardman} in running text. For UK statutes, it +will print the statute title and date in the text, and add a footnote +only if there is a postnote. For books and articles it provides the +author's name. For other material it is not guaranteed to produce +useful results. \index[general]{citation commands|)} @@ -1637,6 +1647,9 @@ could be ignored. It also correctly stripped out full points. (3) The \texttt{pagination} field of example \ref{corr08} ensures that pinpoints are correctly formatted. +So this is a citation to \autocite{boardman}. And here is another.\autocite{boardman} + + Now let's look at a case where the year is not essential.\footcite[14]{oscola} @@ -3151,6 +3164,11 @@ Ensure that the title includes the number and the the instrument. It is needed to construct a short title, and, even if you provide your own, to make sure the instrument is properly indexed. +\item[url] + \index[general]{url field!\texttt{url} field!EU legislation@in EU legislation} + \index[general]{bibfile@\texttt{.bib} file!url field@\texttt{url} field} + \index[general]{eli number@\texttt{eri} number} + The EU is moving towards the use of a system of uniform resource location called the \textsc{eli} number. If you want to include this, use the \texttt{url} field, which will be printed unless you have passed the option \verb|url=false| to \biblatex. \end{description} \index[general]{legislation!EU!type field@\texttt{type} field} diff --git a/Master/texmf-dist/makeindex/oscola/oscola.ist b/Master/texmf-dist/makeindex/oscola/oscola.ist index 417d0223ab7..2bd72651bff 100644 --- a/Master/texmf-dist/makeindex/oscola/oscola.ist +++ b/Master/texmf-dist/makeindex/oscola/oscola.ist @@ -1,6 +1,6 @@ % Part of the OSCOLA package for biblatex: see the file % oscola.lbx for copyright and licence information -% v 1.5 01/04/2017 +% v 1.6 22/03/2018 delim_0 "\\space\\dotfill\\space " delim_1 "\\space\\dotfill\\space " diff --git a/Master/texmf-dist/tex/latex/oscola/american-oscola.lbx b/Master/texmf-dist/tex/latex/oscola/american-oscola.lbx new file mode 100644 index 00000000000..83ae46a8a7f --- /dev/null +++ b/Master/texmf-dist/tex/latex/oscola/american-oscola.lbx @@ -0,0 +1,573 @@ +% 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{english-oscola.lbx} +[2019/01/20 v 1.6 Biblatex localisation file for OSCOLA citations] + +\DeclareRedundantLanguages{english,american,british}{english,american,british} + +\InheritBibliographyExtras{english} + +\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@us@mkbibrangetrunc@long{long}}% + \protected\def\mkbibrangeterse{% + \lbx@us@mkbibrangetrunc@short{short}}% + \protected\def\mkbibrangecompextra{% + \lbx@us@mkbibrangetruncextra@long{long}}% + \protected\def\mkbibrangeterseextra{% + \lbx@us@mkbibrangetruncextra@short{short}}% + \protected\gdef\lbx@us@mkbibrangetrunc@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@us@mkbibrangetruncextra@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@us@mkbibrangetruncextra@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@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@lfromlang\ by}% + {edspace and trans\ \lbx@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@lfromlang\finalandcomma\ and commented by}% + {ed,\addabbrvspace trans\ \lbx@sfromlang\finalandcomma\ and comm\ by}}, + byeditortran = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated by}% + {ed,\addabbrvspace trans\ \lbx@sfromlang\finalandcomma\ and annot\ by}}, + byeditortrin = {{edited and translated \lbx@lfromlang, with an introduction, by}% + {edspace and trans\ \lbx@sfromlang, with an introd, by}}, + byeditortrfo = {{edited and translated \lbx@lfromlang, with a foreword, by}% + {edspace and trans\ \lbx@sfromlang, with a forew, by}}, + byeditortraf = {{edited and translated \lbx@lfromlang, with an afterword, by}% + {edspace and trans\ \lbx@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@lfromlang\finalandcomma\ and commented, with an introduction, by}% + {ed,\addabbrvspace trans\ \lbx@sfromlang\finalandcomma\ and comm, with an introd, by}}, + byeditortrcofo = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented, with a foreword, by}% + {ed,\addabbrvspace trans\ \lbx@sfromlang\finalandcomma\ and comm, with a forew, by}}, + byeditortrcoaf = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented, with an afterword, by}% + {ed,\addabbrvspace trans\ \lbx@sfromlang\finalandcomma\ and comm, with an afterw, by}}, + byeditortranin = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated, with an introduction, by}% + {ed,\addabbrvspace trans\ \lbx@sfromlang\finalandcomma\ and annot, with an introd, by}}, + byeditortranfo = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated, with a foreword, by}% + {ed,\addabbrvspace trans\ \lbx@sfromlang\finalandcomma\ and annot, with a forew, by}}, + byeditortranaf = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated, with an afterword, by}% + {ed,\addabbrvspace trans\ \lbx@sfromlang\finalandcomma\ and annot, with an afterw, by}}, + bytranslatorco = {{translated \lbx@lfromlang\ and commented by}% + {trans\ \lbx@sfromlang\ and comm\ by}}, + bytranslatoran = {{translated \lbx@lfromlang\ and annotated by}% + {trans\ \lbx@sfromlang\ and annot\ by}}, + bytranslatorin = {{translated \lbx@lfromlang, with an introduction, by}% + {trans\ \lbx@sfromlang, with an introd, by}}, + bytranslatorfo = {{translated \lbx@lfromlang, with a foreword, by}% + {trans\ \lbx@sfromlang, with a forew, by}}, + bytranslatoraf = {{translated \lbx@lfromlang, with an afterword, by}% + {trans\ \lbx@sfromlang, with an afterw, by}}, + bytranslatorcoin = {{translated \lbx@lfromlang\ and commented, with an introduction, by}% + {trans\ \lbx@sfromlang\ and comm, with an introd, by}}, + bytranslatorcofo = {{translated \lbx@lfromlang\ and commented, with a foreword, by}% + {trans\ \lbx@sfromlang\ and comm, with a forew, by}}, + bytranslatorcoaf = {{translated \lbx@lfromlang\ and commented, with an afterword, by}% + {trans\ \lbx@sfromlang\ and comm, with an afterw, by}}, + bytranslatoranin = {{translated \lbx@lfromlang\ and annotated, with an introduction, by}% + {trans\ \lbx@sfromlang\ and annot, with an introd, by}}, + bytranslatoranfo = {{translated \lbx@lfromlang\ and annotated, with a foreword, by}% + {trans\ \lbx@sfromlang\ and annot, with a forew, by}}, + bytranslatoranaf = {{translated \lbx@lfromlang\ and annotated, with an afterword, by}% + {trans\ \lbx@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@us@mkbibrangetrunc@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 diff --git a/Master/texmf-dist/tex/latex/oscola/british-oscola.lbx b/Master/texmf-dist/tex/latex/oscola/british-oscola.lbx index 53851968dd3..9e72e5341ad 100644 --- a/Master/texmf-dist/tex/latex/oscola/british-oscola.lbx +++ b/Master/texmf-dist/tex/latex/oscola/british-oscola.lbx @@ -2,10 +2,12 @@ % 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] +\ProvidesFile{british-oscola.lbx}[2019/01/20 v 1.6 Biblatex localisation file for OSCOLA citations] \InheritBibliographyExtras{british} +\DeclareRedundantLanguages{english,american,british}{english,american,british} + \NewBibliographyString{regulation, regulations, eucase, @@ -567,6 +569,4 @@ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}} - - \endinput diff --git a/Master/texmf-dist/tex/latex/oscola/english-oscola.lbx b/Master/texmf-dist/tex/latex/oscola/english-oscola.lbx index 99f9bfd79a1..83ae46a8a7f 100644 --- a/Master/texmf-dist/tex/latex/oscola/english-oscola.lbx +++ b/Master/texmf-dist/tex/latex/oscola/english-oscola.lbx @@ -3,9 +3,11 @@ % oscola.lbx for copyright and licence information \ProvidesFile{english-oscola.lbx} -[2017/04/01 v 1.5 Biblatex localisation file for OSCOLA citations] +[2019/01/20 v 1.6 Biblatex localisation file for OSCOLA citations] -\DeclareRedundantLanguages{english}{english,american} +\DeclareRedundantLanguages{english,american,british}{english,american,british} + +\InheritBibliographyExtras{english} \NewBibliographyString{regulation, regulations, @@ -568,6 +570,4 @@ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}} - - \endinput 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} } 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 -- cgit v1.2.3