diff options
| author | Karl Berry <karl@freefriends.org> | 2019-02-18 23:00:12 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2019-02-18 23:00:12 +0000 |
| commit | 38be0a44ee9d2d9158e4fbc11cf492dbe2f68abe (patch) | |
| tree | 61def877562c6db28c4370b42be5b1cba35af5b3 | |
| parent | 9f39ddd0d3a11b7172e79c4c22f952c611492bc5 (diff) | |
biblatex-oxref (19feb19)
git-svn-id: svn://tug.org/texlive/trunk@50053 c570f23f-e606-0410-a88d-b1316a301751
30 files changed, 642 insertions, 506 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/README.md b/Master/texmf-dist/doc/latex/biblatex-oxref/README.md index 32848e68f6b..1e6ba1b6a51 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/README.md +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/README.md @@ -13,9 +13,6 @@ stipulations and examples provided by the 2014 *New Hart's Rules* and the 2002 * `oxyear` is a style similar to the standard `authoryear`, intended for use with parenthetical in-text citations. -These styles should be considered experimental. In particular, the ways in which -the styles handle certain tricky references are subject to change. - [biblatex]: http://ctan.org/pkg/biblatex ## Installation @@ -119,7 +116,7 @@ first two steps. ## Licence -Copyright 2016–2018 Alex Ball. +Copyright 2016–2019 Alex Ball. This work consists of the documented LaTeX file oxref.dtx and a Makefile. diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf Binary files differindex b50c5a7054a..e428aa0dc24 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex b/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex index 4921a90cfb8..aac80d43212 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \ProvidesFile{oxalph-doc.tex} [\Version\space Alphabetic biblatex style inspired by the Oxford Guide to Style] \PassOptionsToPackage{style=oxalph,varissuedate,anon}{biblatex} @@ -207,7 +207,7 @@ ,bottomrule = 0pt ,rightrule = 0pt }{#1} -\NewTCBListing{egcite}{D(){ok}omo}% +\NewTCBListing{egcite}{D(){ok} o m !o}% {colframe = #1 ,colback = #1!5!white ,listing side text @@ -215,7 +215,7 @@ ,IfNoValueTF={#2}{}{title = #2} ,before lower = {\raggedright\ifblank{#3}{}{\hangfrom{\booksym\space}#3\par}\hangfrom{\cogsym\space}} ,IfNoValueTF={#4}{}{#4}} -\NewTCBListing{egcite*}{D(){ok}omo}% +\NewTCBListing{egcite*}{D(){ok} o m !o}% {colframe = #1 ,colback = #1!5!white ,IfNoValueTF={#2}{}{title = #2} @@ -486,18 +486,19 @@ see the separate documentation file \href{./oxref.pdf}{\texttt{oxref.pdf}} \section{Stability} The \pkg[biblatex]{oxref} family of styles is currently at \fileversion. -I have no further features planned, so unless there is popular demand otherwise, -it should be bug-fix releases only between now and the release of version 1.0. -When that happens, the default (expected) behaviour of the styles will be frozen, -meaning I will do my best to avoid backwards-incompatible changes, though -alternative behaviour may be added. If you spot any aspects of the styles that -could be improved before then, especially for the cases not covered by the two -style manuals, please leave your thoughts on the GitHub issue tracker.% -\footnote{\url{https://github.com/alex-ball/biblatex-oxref/issues}} - -You are of course encouraged to report any bugs you discover on the -\href{https://github.com/alex-ball/biblatex-oxref/issues}{GitHub issue tracker} -as well. + +I have no plans to change the default (expected) behaviour of the styles, +and will do my best to avoid backwards-incompatible changes, though +alternative behaviour may be added. If changes are introduced that alter +the advertised output, this will be signalled by a change in major +version number. + +Please report any bugs you discover on the +\href{https://github.com/alex-ball/biblatex-oxref/issues}{GitHub issue tracker}.% +\footnote{Issue tracker for \pkg[biblatex]{oxref}: +\url{https://github.com/alex-ball/biblatex-oxref/issues}} +You are also welcome to leave your thoughts there on how the styles could +be improved, especially for the cases not covered by the two style manuals. \chapter{Citations and common formatting}\label{sec:citing} @@ -693,7 +694,7 @@ Joukovsky, F. (= Joukovsky-Micha, F.) (1967), \enquote{La Guerre des dieux et de authoraddon = {F. Joukovsky-Micha}, authoraddon+an = {1=variant}, title = {La Guerre des dieux et des géants chez les poètes francais du XVI\textsuperscript{e} - siècle (1500\textendash 1585)}, + siècle (1500--1585)}, journaltitle = {Bibliothèque d'Humanisme et Renaissance}, volume = {29}, date = {1967}, @@ -712,18 +713,18 @@ If the contribution of the translators or revisers is so great they could be joi \begin{bibexbox} {kuehner.blass1890ef} -Kühner, R., rev. Blass, F. (1890-2), \emph{Ausführliche grammatik der griechischen sprache}, i: \emph{Elementar- und Formenlehre} (Hannover: Hahnsche Buchhandlung). +Kühner, R., rev. Blass, F. (1890–2), \emph{Ausführliche grammatik der griechischen sprache}, i: \emph{Elementar- und Formenlehre} (Hannover: Hahnsche Buchhandlung). \toggletrue{blx@bibliography} \tcblower \begin{Verbatim} @mvbook{kuehner.blass1890ef, - author = {Raphael Kühner}, + author = {Raphael Kühner}, editor = {Friedrich Blass}, editor+an = {=jointauthor}, editortype = {reviser}, - shortauthor = {Kühner--Blass}, + shortauthor = {Kühner--Blass}, title = {Elementar- und Formenlehre}, - maintitle = {Ausführliche grammatik der griechischen sprache}, + maintitle = {Ausführliche grammatik der griechischen sprache}, volume = {1}, location = {Hannover}, publisher = {Hahnsche Buchhandlung}, @@ -1034,12 +1035,12 @@ Li, S. et al. (2013), \enquote{Forever Love: The Hitherto Earliest Record of Cop \begin{bibexbox} <NHR \S18.3.3\textdagger> {moody1953mdb} -Moody, T. W. (1953), \enquote{Michael Davitt and the British Labour Movement, 1882–1906}, \emph{Transactions of the Royal Historical Society}, 5th ser., 3: 53--76. +Moody, T. W. (1953), \enquote{Michael Davitt and the British Labour Movement, 1882--1906}, \emph{Transactions of the Royal Historical Society}, 5th ser., 3: 53–76. \tcblower \begin{Verbatim} @article{moody1953mdb, author = {T. W. Moody}, - title = {Michael Davitt and the British Labour Movement, 1882–1906}, + title = {Michael Davitt and the British Labour Movement, 1882--1906}, journaltitle = {Transactions of the Royal Historical Society}, series = {5}, volume = {3}, @@ -1062,7 +1063,7 @@ Hankinson, R. J. (1989), \enquote{Galen and the Best of All Possible Worlds}, \e journaltitle = {CQ}, series = {newseries}, volume = {39}, - pages = {43–76}} + pages = {43-76}} \end{Verbatim} \end{bibexbox} @@ -1089,7 +1090,7 @@ Marx, K. (1842), \enquote{Der Kommunismus und die Augsburger \enquote{Allgemeine \begin{bibexbox}<OGS \S15.19.2> {who1983nsb} -WHO (World Health Organization) (1983), \enquote{Nutrition: Sex Bias of Nutritional Status of Children 0–4 Years}, \emph{Weekly Epidemiologial Record}, 20 May. +WHO (World Health Organization) (1983), \enquote{Nutrition: Sex Bias of Nutritional Status of Children 0--4 Years}, \emph{Weekly Epidemiologial Record}, 20 May. \tcblower \begin{Verbatim} @article{who1983nsb, @@ -1097,7 +1098,7 @@ WHO (World Health Organization) (1983), \enquote{Nutrition: Sex Bias of Nutritio author = {{World Health Organization}}, date = {1983-05-20}, title = {Nutrition}, - subtitle = {Sex Bias of Nutritional Status of Children 0–4 Years}, + subtitle = {Sex Bias of Nutritional Status of Children 0--4 Years}, journaltitle = {Weekly Epidemiologial Record}} \end{Verbatim} \end{bibexbox} @@ -1145,7 +1146,7 @@ Bec, C. (1976) (ed.), \emph{Italie 1500--1550: Une situation de crise?} = \emph{ number = {2}, location = {Lyon}, date = {1976}, - pages = {99--109}} + pages = {99-109}} @periodical{aujm1975.2, title = {Annales de l'Université Jean Moulin}, volume = {1975}, @@ -1582,12 +1583,12 @@ the following form is used: \begin{bibexbox} <OGS \S15.2.2\textdagger> {brady.etal1994hehsa} -Brady, Jr., T. A., Oberman, H. A., and Tracy, J. D. (1994) (eds.), \emph{Handbook of European History, 1400–1600: Late Middle Ages, Renaissance and Reformation}, i: \emph{Structures and Assertions} (Leiden: E. J. Brill). +Brady, Jr., T. A., Oberman, H. A., and Tracy, J. D. (1994) (eds.), \emph{Handbook of European History, 1400--1600: Late Middle Ages, Renaissance and Reformation}, i: \emph{Structures and Assertions} (Leiden: E. J. Brill). \tcblower \begin{Verbatim} @mvcollection{brady.etal1994hehsa, editor = {Brady, Jr., Thomas A. and Heiko A. Oberman and James D. Tracy}, - maintitle = {Handbook of European History, 1400–1600}, + maintitle = {Handbook of European History, 1400--1600}, mainsubtitle = {{Late} {Middle} {Ages,} {Renaissance} and {Reformation}}, volume = {1}, title = {Structures and Assertions}, @@ -2604,14 +2605,14 @@ CNNR/GMH (Comisión Nacional de Reparación y Reconciliación y Grupo de Memoria \begin{bibexbox}<OGS \S15.19.2> {opcs1979amt} -Office of Population Censuses and Surveys (1979a), \emph{Area Mortality Tables: The Registrar-General's Decennial Supplement for England and Wales 1969–1973}, Series DS, No.~3 (London) +Office of Population Censuses and Surveys (1979a), \emph{Area Mortality Tables: The Registrar-General's Decennial Supplement for England and Wales 1969--1973}, Series DS, No.~3 (London) \tcblower \begin{Verbatim} @report{opcs1979amt, author = {{Office of Population Censuses and Surveys}}, date = {1979}, title = {Area Mortality Tables}, - subtitle = {The Registrar-General's Decennial Supplement for England and Wales 1969–1973}, + subtitle = {The Registrar-General's Decennial Supplement for England and Wales 1969--1973}, series = {Series DS}, number = {3}, location = {London}} @@ -3784,9 +3785,9 @@ United Nations (2011), \emph{World Population Prospects: The 2010 Revision} [CD- \chapterprecis{commentary, jurisdiction, legal, legislation} \pkg[biblatex]{Oxref} provides only a basic level of support for legal references, in case you need to use some in a mainly non-legal text. -For a more thorough and robust treatment, intended for a specialist readership, I recommend you use the \href{http://www.ctan.org/pkg/oscola}{\textsf{oscola}} style instead. +For a more thorough and robust treatment, intended for a specialist readership, I recommend you use the \pkg{oscola} style instead. -Since there is a family resemblence between the \emph{Oxford Guide to Style\slash New Hart's Rules} and the \emph{Oxford Standard for the Citation of Legal Authorities}, \pkg[biblatex]{oxref} largely mimics \textsf{oscola} and its data model, though there are some small formatting differences. What you should \emph{not} expect from \pkg[biblatex]{oxref} are facilities for compiling specialist indices of sources, or anything special regarding the handling of postnotes. +Since there is a family resemblence between the \emph{Oxford Guide to Style\slash New Hart's Rules} and the \emph{Oxford Standard for the Citation of Legal Authorities}, \pkg[biblatex]{oxref} largely mimics \pkg{oscola} and its data model, though there are some small formatting differences. What you should \emph{not} expect from \pkg[biblatex]{oxref} are facilities for compiling specialist indices of sources, or anything special regarding the handling of postnotes. \section{Cases} @@ -4046,6 +4047,9 @@ Both the \emph{Oxford Guide to Style} and \emph{New Hart's Rules} are inconsiste \tip{European cases still get sorted by title, even if the entry begins with the case number. Use \code{sorttitle} if you would rather they were sorted under \enquote{Case} or \enquote{Joined Cases}.} +\tip{For ECR cases, you can use either \code{number} or the non-standard \code{casenumber} field + for the case number.} + \begin{bibexbox} <OGS \S13.4.4> {C118/07} @@ -4056,7 +4060,7 @@ Case C–118/07 \emph{Commission of the European Communities v Finland} [2002] E keywords = {eu}, title = {Commission of the European Communities v. Finland}, sorttitle = {Case C0118/0007}, - number = {C\textendash 118/07}, + number = {C--118/07}, journaltitle = {ECR}, volume = {I}, pages = {10889}, @@ -4064,9 +4068,7 @@ Case C–118/07 \emph{Commission of the European Communities v Finland} [2002] E \end{Verbatim} \end{bibexbox} -\tip{Indicate Commission Decisions by putting \code{commission} in the \code{institution} field. If a decision has a formal decision number, put this in the \code{number} field. Put the case number (including the word \enquote{Case} if needed) in either the \code{titleaddon}, \code{parvolume}, or \code{userb} field.} - -\tip{An unfortunate side effect of this is that is not possible to use either the parallel or neutral citation idiom to get a reference to look like the following. In such cases, use the \code{note} field to provide the second citation.} +\tip{Indicate Commission Decisions by putting \code{Commission} in the \code{institution} field. If a decision has a formal decision number, put this in the \code{number} field, and put the case number in the (non-standard) \code{casenumber} field or (\pkg{oscola}-supported) \code{userb} field. If wider portability is an issue, you can put the case number, including the word \enquote{Case} if needed, in the \code{titleaddon} field instead.} \begin{bibexbox} <OGS \S13.2.6> @@ -4077,14 +4079,18 @@ Case C–118/07 \emph{Commission of the European Communities v Finland} [2002] E @jurisdiction{alcatel, keywords = {eu}, title = {Alcatel/Telettra}, - parvolume = {Case IV/M042}, - institution = {commission}, + casenumber = {IV/M042}, + institution = {Commission}, date = {1991}, journaltitle = {OJ}, series = {L}, volume = {122}, pages = {48}, - note = {[1991] 4 CLMR 391}} + pardate = {1991}, + parreporter = {CLMR}, + parvolume = {4}, + parpages = {391}, + options = {paryear-essential}} \end{Verbatim} \end{bibexbox} @@ -4468,7 +4474,7 @@ If a poem is divided into cantos, the title is set in italics rather than quoted \begin{bibexbox} <OGS \S15.8*\textdagger> {spenser1965fq}% -Spenser, E. (1590–6), \emph{The Faerie Queene} (Everyman's Library, 443–4; London: Dent, 1965–6). +Spenser, E. (1590–6), \emph{The Faerie Queene} (Everyman's Library, 443--4; London: Dent, 1965–6). \tcblower \begin{Verbatim} @book{spenser1965fq, @@ -4476,7 +4482,7 @@ Spenser, E. (1590–6), \emph{The Faerie Queene} (Everyman's Library, 443–4; L title = {The Faerie Queene}, shorttitle = {Faerie Queene}, series = {Everyman's Library}, - number = {443–4}, + number = {443--4}, location = {London}, publisher = {Dent}, date = {1965/1966}, @@ -4679,6 +4685,6 @@ Ritter, R. M. (2001), \enquote{Revised proofs} [email to H. E. Cox], (1 Aug.\@), \printbibliography[notcategory=hidden] \end{document} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxalph-doc.tex'. diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf Binary files differindex a130b052a5d..2198155f1a3 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex index f9fef8febd8..9003096a2a9 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \ProvidesFile{oxnotes-doc.tex} [\Version\space Footnote-based biblatex style inspired by the Oxford Guide to Style] \PassOptionsToPackage{style=oxnotes,scnames,varissuedate,anon}{biblatex} @@ -207,7 +207,7 @@ ,bottomrule = 0pt ,rightrule = 0pt }{#1} -\NewTCBListing{egcite}{D(){ok}omo}% +\NewTCBListing{egcite}{D(){ok} o m !o}% {colframe = #1 ,colback = #1!5!white ,listing side text @@ -215,7 +215,7 @@ ,IfNoValueTF={#2}{}{title = #2} ,before lower = {\raggedright\ifblank{#3}{}{\hangfrom{\booksym\space}#3\par}\hangfrom{\cogsym\space}} ,IfNoValueTF={#4}{}{#4}} -\NewTCBListing{egcite*}{D(){ok}omo}% +\NewTCBListing{egcite*}{D(){ok} o m !o}% {colframe = #1 ,colback = #1!5!white ,IfNoValueTF={#2}{}{title = #2} @@ -478,18 +478,19 @@ see the separate documentation file \href{./oxref.pdf}{\texttt{oxref.pdf}} \section{Stability} The \pkg[biblatex]{oxref} family of styles is currently at \fileversion. -I have no further features planned, so unless there is popular demand otherwise, -it should be bug-fix releases only between now and the release of version 1.0. -When that happens, the default (expected) behaviour of the styles will be frozen, -meaning I will do my best to avoid backwards-incompatible changes, though -alternative behaviour may be added. If you spot any aspects of the styles that -could be improved before then, especially for the cases not covered by the two -style manuals, please leave your thoughts on the GitHub issue tracker.% -\footnote{\url{https://github.com/alex-ball/biblatex-oxref/issues}} - -You are of course encouraged to report any bugs you discover on the -\href{https://github.com/alex-ball/biblatex-oxref/issues}{GitHub issue tracker} -as well. + +I have no plans to change the default (expected) behaviour of the styles, +and will do my best to avoid backwards-incompatible changes, though +alternative behaviour may be added. If changes are introduced that alter +the advertised output, this will be signalled by a change in major +version number. + +Please report any bugs you discover on the +\href{https://github.com/alex-ball/biblatex-oxref/issues}{GitHub issue tracker}.% +\footnote{Issue tracker for \pkg[biblatex]{oxref}: +\url{https://github.com/alex-ball/biblatex-oxref/issues}} +You are also welcome to leave your thoughts there on how the styles could +be improved, especially for the cases not covered by the two style manuals. \chapter{Citations and common formatting}\label{sec:citing} @@ -706,7 +707,7 @@ This is only supposed to to printed in the bibliography, not in notes. authoraddon = {F. Joukovsky-Micha}, authoraddon+an = {1=variant}, title = {La Guerre des dieux et des géants chez les poètes francais du XVI\textsuperscript{e} - siècle (1500\textendash 1585)}, + siècle (1500--1585)}, journaltitle = {Bibliothèque d'Humanisme et Renaissance}, volume = {29}, date = {1967}, @@ -725,18 +726,18 @@ If the contribution of the translators or revisers is so great they could be joi \begin{bibexbox} {kuehner.blass1890ef} -\textsc{Kühner, Raphael}, rev. \textsc{Blass, Friedrich}, \emph{Ausführliche grammatik der griechischen sprache}, i: \emph{Elementar- und Formenlehre} (Hannover: Hahnsche Buchhandlung, 1890-2). +\textsc{Kühner, Raphael}, rev. \textsc{Blass, Friedrich}, \emph{Ausführliche grammatik der griechischen sprache}, i: \emph{Elementar- und Formenlehre} (Hannover: Hahnsche Buchhandlung, 1890–2). \toggletrue{blx@bibliography} \tcblower \begin{Verbatim} @mvbook{kuehner.blass1890ef, - author = {Raphael Kühner}, + author = {Raphael Kühner}, editor = {Friedrich Blass}, editor+an = {=jointauthor}, editortype = {reviser}, - shortauthor = {Kühner--Blass}, + shortauthor = {Kühner--Blass}, title = {Elementar- und Formenlehre}, - maintitle = {Ausführliche grammatik der griechischen sprache}, + maintitle = {Ausführliche grammatik der griechischen sprache}, volume = {1}, location = {Hannover}, publisher = {Hahnsche Buchhandlung}, @@ -1056,12 +1057,12 @@ B. Lindars, \enquote{Ezechiel and Individual Responsibility}, \emph{VT} 15 (1965 \begin{bibexbox} <NHR \S18.3.3> {moody1953mdb} -T. W. Moody, \enquote{Michael Davitt and the British Labour Movement, 1882–1906}, \emph{Transactions of the Royal Historical Society}, 5th ser., 3 (1953), 53--76. +T. W. Moody, \enquote{Michael Davitt and the British Labour Movement, 1882--1906}, \emph{Transactions of the Royal Historical Society}, 5th ser., 3 (1953), 53–76. \tcblower \begin{Verbatim} @article{moody1953mdb, author = {T. W. Moody}, - title = {Michael Davitt and the British Labour Movement, 1882–1906}, + title = {Michael Davitt and the British Labour Movement, 1882--1906}, journaltitle = {Transactions of the Royal Historical Society}, series = {5}, volume = {3}, @@ -1084,7 +1085,7 @@ J. Barnes, \enquote{Homonymy in Aristotle and Speusippus}, \emph{Classical Quart series = {newseries}, volume = {21}, date = {1971}, - pages = {65--80}} + pages = {65-80}} \end{Verbatim} \end{bibexbox} @@ -1162,7 +1163,7 @@ C. Bec (ed.), \emph{Italie 1500--1550: Une situation de crise?} = \emph{Annales number = {2}, location = {Lyon}, date = {1976}, - pages = {99--109}} + pages = {99-109}} @periodical{aujm1975.2, title = {Annales de l'Université Jean Moulin}, volume = {1975}, @@ -1608,12 +1609,12 @@ the following form is used: \begin{bibexbox} <OGS \S15.2.2> {brady.etal1994hehsa} -Thomas A. Brady, Jr., Heiko A. Oberman, and James D. Tracy (eds.), \emph{Handbook of European History, 1400–1600: Late Middle Ages, Renaissance and Reformation}, i: \emph{Structures and Assertions} (Leiden: E. J. Brill, 1994). +Thomas A. Brady, Jr., Heiko A. Oberman, and James D. Tracy (eds.), \emph{Handbook of European History, 1400--1600: Late Middle Ages, Renaissance and Reformation}, i: \emph{Structures and Assertions} (Leiden: E. J. Brill, 1994). \tcblower \begin{Verbatim} @mvcollection{brady.etal1994hehsa, editor = {Brady, Jr., Thomas A. and Heiko A. Oberman and James D. Tracy}, - maintitle = {Handbook of European History, 1400–1600}, + maintitle = {Handbook of European History, 1400--1600}, mainsubtitle = {{Late} {Middle} {Ages,} {Renaissance} and {Reformation}}, volume = {1}, title = {Structures and Assertions}, @@ -3773,9 +3774,9 @@ United Nations, \emph{World Population Prospects: The 2010 Revision} [CD-ROM] (N \chapterprecis{commentary, jurisdiction, legal, legislation} \pkg[biblatex]{Oxref} provides only a basic level of support for legal references, in case you need to use some in a mainly non-legal text. -For a more thorough and robust treatment, intended for a specialist readership, I recommend you use the \href{http://www.ctan.org/pkg/oscola}{\textsf{oscola}} style instead. +For a more thorough and robust treatment, intended for a specialist readership, I recommend you use the \pkg{oscola} style instead. -Since there is a family resemblence between the \emph{Oxford Guide to Style\slash New Hart's Rules} and the \emph{Oxford Standard for the Citation of Legal Authorities}, \pkg[biblatex]{oxref} largely mimics \textsf{oscola} and its data model, though there are some small formatting differences. What you should \emph{not} expect from \pkg[biblatex]{oxref} are facilities for compiling specialist indices of sources, or anything special regarding the handling of postnotes. +Since there is a family resemblence between the \emph{Oxford Guide to Style\slash New Hart's Rules} and the \emph{Oxford Standard for the Citation of Legal Authorities}, \pkg[biblatex]{oxref} largely mimics \pkg{oscola} and its data model, though there are some small formatting differences. What you should \emph{not} expect from \pkg[biblatex]{oxref} are facilities for compiling specialist indices of sources, or anything special regarding the handling of postnotes. \section{Cases} @@ -4035,6 +4036,9 @@ Both the \emph{Oxford Guide to Style} and \emph{New Hart's Rules} are inconsiste \tip{European cases still get sorted by title, even if the entry begins with the case number. Use \code{sorttitle} if you would rather they were sorted under \enquote{Case} or \enquote{Joined Cases}.} +\tip{For ECR cases, you can use either \code{number} or the non-standard \code{casenumber} field + for the case number.} + \begin{bibexbox} <OGS \S13.4.4> {C118/07} @@ -4045,7 +4049,7 @@ Case C–118/07 \emph{Commission of the European Communities v Finland} [2002] E keywords = {eu}, title = {Commission of the European Communities v. Finland}, sorttitle = {Case C0118/0007}, - number = {C\textendash 118/07}, + number = {C--118/07}, journaltitle = {ECR}, volume = {I}, pages = {10889}, @@ -4053,9 +4057,7 @@ Case C–118/07 \emph{Commission of the European Communities v Finland} [2002] E \end{Verbatim} \end{bibexbox} -\tip{Indicate Commission Decisions by putting \code{commission} in the \code{institution} field. If a decision has a formal decision number, put this in the \code{number} field. Put the case number (including the word \enquote{Case} if needed) in either the \code{titleaddon}, \code{parvolume}, or \code{userb} field.} - -\tip{An unfortunate side effect of this is that is not possible to use either the parallel or neutral citation idiom to get a reference to look like the following. In such cases, use the \code{note} field to provide the second citation.} +\tip{Indicate Commission Decisions by putting \code{Commission} in the \code{institution} field. If a decision has a formal decision number, put this in the \code{number} field, and put the case number in the (non-standard) \code{casenumber} field or (\pkg{oscola}-supported) \code{userb} field. If wider portability is an issue, you can put the case number, including the word \enquote{Case} if needed, in the \code{titleaddon} field instead.} \begin{bibexbox} <OGS \S13.2.6> @@ -4066,14 +4068,18 @@ Case C–118/07 \emph{Commission of the European Communities v Finland} [2002] E @jurisdiction{alcatel, keywords = {eu}, title = {Alcatel/Telettra}, - parvolume = {Case IV/M042}, - institution = {commission}, + casenumber = {IV/M042}, + institution = {Commission}, date = {1991}, journaltitle = {OJ}, series = {L}, volume = {122}, pages = {48}, - note = {[1991] 4 CLMR 391}} + pardate = {1991}, + parreporter = {CLMR}, + parvolume = {4}, + parpages = {391}, + options = {paryear-essential}} \end{Verbatim} \end{bibexbox} @@ -4459,7 +4465,7 @@ If a poem is divided into cantos, the title is set in italics rather than quoted \begin{bibexbox} <OGS \S15.8*> {spenser1965fq}% -Edmund Spenser, \emph{The Faerie Queene} (Everyman's Library, 443–4; London: Dent, 1965–6) (originally pub. 1590–6). +Edmund Spenser, \emph{The Faerie Queene} (Everyman's Library, 443--4; London: Dent, 1965–6) (originally pub. 1590–6). \tcblower \begin{Verbatim} @book{spenser1965fq, @@ -4467,7 +4473,7 @@ Edmund Spenser, \emph{The Faerie Queene} (Everyman's Library, 443–4; London: D title = {The Faerie Queene}, shorttitle = {Faerie Queene}, series = {Everyman's Library}, - number = {443–4}, + number = {443--4}, location = {London}, publisher = {Dent}, date = {1965/1966}, @@ -4670,6 +4676,6 @@ R. M. Ritter, \enquote{Revised proofs} [email to H. E. Cox], (1 Aug.\@ 2001), \u \printbibliography[notcategory=hidden] \end{document} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxnotes-doc.tex'. diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf Binary files differindex e2b72ae9c7d..658dcefc15e 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex index 88008082e76..3766ad65c3f 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \ProvidesFile{oxnum-doc.tex} [\Version\space Numeric biblatex style inspired by the Oxford Guide to Style] \PassOptionsToPackage{style=oxnum,scnames,varissuedate,anon}{biblatex} @@ -205,7 +205,7 @@ ,bottomrule = 0pt ,rightrule = 0pt }{#1} -\NewTCBListing{egcite}{D(){ok}omo}% +\NewTCBListing{egcite}{D(){ok} o m !o}% {colframe = #1 ,colback = #1!5!white ,listing side text @@ -213,7 +213,7 @@ ,IfNoValueTF={#2}{}{title = #2} ,before lower = {\raggedright\ifblank{#3}{}{\hangfrom{\booksym\space}#3\par}\hangfrom{\cogsym\space}} ,IfNoValueTF={#4}{}{#4}} -\NewTCBListing{egcite*}{D(){ok}omo}% +\NewTCBListing{egcite*}{D(){ok} o m !o}% {colframe = #1 ,colback = #1!5!white ,IfNoValueTF={#2}{}{title = #2} @@ -476,18 +476,19 @@ see the separate documentation file \href{./oxref.pdf}{\texttt{oxref.pdf}} \section{Stability} The \pkg[biblatex]{oxref} family of styles is currently at \fileversion. -I have no further features planned, so unless there is popular demand otherwise, -it should be bug-fix releases only between now and the release of version 1.0. -When that happens, the default (expected) behaviour of the styles will be frozen, -meaning I will do my best to avoid backwards-incompatible changes, though -alternative behaviour may be added. If you spot any aspects of the styles that -could be improved before then, especially for the cases not covered by the two -style manuals, please leave your thoughts on the GitHub issue tracker.% -\footnote{\url{https://github.com/alex-ball/biblatex-oxref/issues}} - -You are of course encouraged to report any bugs you discover on the -\href{https://github.com/alex-ball/biblatex-oxref/issues}{GitHub issue tracker} -as well. + +I have no plans to change the default (expected) behaviour of the styles, +and will do my best to avoid backwards-incompatible changes, though +alternative behaviour may be added. If changes are introduced that alter +the advertised output, this will be signalled by a change in major +version number. + +Please report any bugs you discover on the +\href{https://github.com/alex-ball/biblatex-oxref/issues}{GitHub issue tracker}.% +\footnote{Issue tracker for \pkg[biblatex]{oxref}: +\url{https://github.com/alex-ball/biblatex-oxref/issues}} +You are also welcome to leave your thoughts there on how the styles could +be improved, especially for the cases not covered by the two style manuals. \chapter{Citations and common formatting}\label{sec:citing} @@ -683,7 +684,7 @@ In cases where an author changes the name under which they publish (e.g.\ due to authoraddon = {F. Joukovsky-Micha}, authoraddon+an = {1=variant}, title = {La Guerre des dieux et des géants chez les poètes francais du XVI\textsuperscript{e} - siècle (1500\textendash 1585)}, + siècle (1500--1585)}, journaltitle = {Bibliothèque d'Humanisme et Renaissance}, volume = {29}, date = {1967}, @@ -702,18 +703,18 @@ If the contribution of the translators or revisers is so great they could be joi \begin{bibexbox} {kuehner.blass1890ef} -\textsc{Kühner, Raphael}, rev. \textsc{Blass, Friedrich}, \emph{Ausführliche grammatik der griechischen sprache}, i: \emph{Elementar- und Formenlehre} (Hannover: Hahnsche Buchhandlung, 1890-2). +\textsc{Kühner, Raphael}, rev. \textsc{Blass, Friedrich}, \emph{Ausführliche grammatik der griechischen sprache}, i: \emph{Elementar- und Formenlehre} (Hannover: Hahnsche Buchhandlung, 1890–2). \toggletrue{blx@bibliography} \tcblower \begin{Verbatim} @mvbook{kuehner.blass1890ef, - author = {Raphael Kühner}, + author = {Raphael Kühner}, editor = {Friedrich Blass}, editor+an = {=jointauthor}, editortype = {reviser}, - shortauthor = {Kühner--Blass}, + shortauthor = {Kühner--Blass}, title = {Elementar- und Formenlehre}, - maintitle = {Ausführliche grammatik der griechischen sprache}, + maintitle = {Ausführliche grammatik der griechischen sprache}, volume = {1}, location = {Hannover}, publisher = {Hahnsche Buchhandlung}, @@ -1033,12 +1034,12 @@ B. Lindars, \enquote{Ezechiel and Individual Responsibility}, \emph{VT} 15 (1965 \begin{bibexbox} <NHR \S18.3.3> {moody1953mdb} -T. W. Moody, \enquote{Michael Davitt and the British Labour Movement, 1882–1906}, \emph{Transactions of the Royal Historical Society}, 5th ser., 3 (1953), 53--76. +T. W. Moody, \enquote{Michael Davitt and the British Labour Movement, 1882--1906}, \emph{Transactions of the Royal Historical Society}, 5th ser., 3 (1953), 53–76. \tcblower \begin{Verbatim} @article{moody1953mdb, author = {T. W. Moody}, - title = {Michael Davitt and the British Labour Movement, 1882–1906}, + title = {Michael Davitt and the British Labour Movement, 1882--1906}, journaltitle = {Transactions of the Royal Historical Society}, series = {5}, volume = {3}, @@ -1061,7 +1062,7 @@ J. Barnes, \enquote{Homonymy in Aristotle and Speusippus}, \emph{Classical Quart series = {newseries}, volume = {21}, date = {1971}, - pages = {65--80}} + pages = {65-80}} \end{Verbatim} \end{bibexbox} @@ -1139,7 +1140,7 @@ C. Bec (ed.), \emph{Italie 1500--1550: Une situation de crise?} = \emph{Annales number = {2}, location = {Lyon}, date = {1976}, - pages = {99--109}} + pages = {99-109}} @periodical{aujm1975.2, title = {Annales de l'Université Jean Moulin}, volume = {1975}, @@ -1585,12 +1586,12 @@ the following form is used: \begin{bibexbox} <OGS \S15.2.2> {brady.etal1994hehsa} -Thomas A. Brady, Jr., Heiko A. Oberman, and James D. Tracy (eds.), \emph{Handbook of European History, 1400–1600: Late Middle Ages, Renaissance and Reformation}, i: \emph{Structures and Assertions} (Leiden: E. J. Brill, 1994). +Thomas A. Brady, Jr., Heiko A. Oberman, and James D. Tracy (eds.), \emph{Handbook of European History, 1400--1600: Late Middle Ages, Renaissance and Reformation}, i: \emph{Structures and Assertions} (Leiden: E. J. Brill, 1994). \tcblower \begin{Verbatim} @mvcollection{brady.etal1994hehsa, editor = {Brady, Jr., Thomas A. and Heiko A. Oberman and James D. Tracy}, - maintitle = {Handbook of European History, 1400–1600}, + maintitle = {Handbook of European History, 1400--1600}, mainsubtitle = {{Late} {Middle} {Ages,} {Renaissance} and {Reformation}}, volume = {1}, title = {Structures and Assertions}, @@ -3719,9 +3720,9 @@ United Nations, \emph{World Population Prospects: The 2010 Revision} [CD-ROM] (N \chapterprecis{commentary, jurisdiction, legal, legislation} \pkg[biblatex]{Oxref} provides only a basic level of support for legal references, in case you need to use some in a mainly non-legal text. -For a more thorough and robust treatment, intended for a specialist readership, I recommend you use the \href{http://www.ctan.org/pkg/oscola}{\textsf{oscola}} style instead. +For a more thorough and robust treatment, intended for a specialist readership, I recommend you use the \pkg{oscola} style instead. -Since there is a family resemblence between the \emph{Oxford Guide to Style\slash New Hart's Rules} and the \emph{Oxford Standard for the Citation of Legal Authorities}, \pkg[biblatex]{oxref} largely mimics \textsf{oscola} and its data model, though there are some small formatting differences. What you should \emph{not} expect from \pkg[biblatex]{oxref} are facilities for compiling specialist indices of sources, or anything special regarding the handling of postnotes. +Since there is a family resemblence between the \emph{Oxford Guide to Style\slash New Hart's Rules} and the \emph{Oxford Standard for the Citation of Legal Authorities}, \pkg[biblatex]{oxref} largely mimics \pkg{oscola} and its data model, though there are some small formatting differences. What you should \emph{not} expect from \pkg[biblatex]{oxref} are facilities for compiling specialist indices of sources, or anything special regarding the handling of postnotes. \section{Cases} @@ -3981,6 +3982,9 @@ Both the \emph{Oxford Guide to Style} and \emph{New Hart's Rules} are inconsiste \tip{European cases still get sorted by title, even if the entry begins with the case number. Use \code{sorttitle} if you would rather they were sorted under \enquote{Case} or \enquote{Joined Cases}.} +\tip{For ECR cases, you can use either \code{number} or the non-standard \code{casenumber} field + for the case number.} + \begin{bibexbox} <OGS \S13.4.4> {C118/07} @@ -3991,7 +3995,7 @@ Case C–118/07 \emph{Commission of the European Communities v Finland} [2002] E keywords = {eu}, title = {Commission of the European Communities v. Finland}, sorttitle = {Case C0118/0007}, - number = {C\textendash 118/07}, + number = {C--118/07}, journaltitle = {ECR}, volume = {I}, pages = {10889}, @@ -3999,9 +4003,7 @@ Case C–118/07 \emph{Commission of the European Communities v Finland} [2002] E \end{Verbatim} \end{bibexbox} -\tip{Indicate Commission Decisions by putting \code{commission} in the \code{institution} field. If a decision has a formal decision number, put this in the \code{number} field. Put the case number (including the word \enquote{Case} if needed) in either the \code{titleaddon}, \code{parvolume}, or \code{userb} field.} - -\tip{An unfortunate side effect of this is that is not possible to use either the parallel or neutral citation idiom to get a reference to look like the following. In such cases, use the \code{note} field to provide the second citation.} +\tip{Indicate Commission Decisions by putting \code{Commission} in the \code{institution} field. If a decision has a formal decision number, put this in the \code{number} field, and put the case number in the (non-standard) \code{casenumber} field or (\pkg{oscola}-supported) \code{userb} field. If wider portability is an issue, you can put the case number, including the word \enquote{Case} if needed, in the \code{titleaddon} field instead.} \begin{bibexbox} <OGS \S13.2.6> @@ -4012,14 +4014,18 @@ Case C–118/07 \emph{Commission of the European Communities v Finland} [2002] E @jurisdiction{alcatel, keywords = {eu}, title = {Alcatel/Telettra}, - parvolume = {Case IV/M042}, - institution = {commission}, + casenumber = {IV/M042}, + institution = {Commission}, date = {1991}, journaltitle = {OJ}, series = {L}, volume = {122}, pages = {48}, - note = {[1991] 4 CLMR 391}} + pardate = {1991}, + parreporter = {CLMR}, + parvolume = {4}, + parpages = {391}, + options = {paryear-essential}} \end{Verbatim} \end{bibexbox} @@ -4401,7 +4407,7 @@ If a poem is divided into cantos, the title is set in italics rather than quoted \begin{bibexbox} <OGS \S15.8*> {spenser1965fq}% -Edmund Spenser, \emph{The Faerie Queene} (Everyman's Library, 443–4; London: Dent, 1965–6) (originally pub. 1590–6). +Edmund Spenser, \emph{The Faerie Queene} (Everyman's Library, 443--4; London: Dent, 1965–6) (originally pub. 1590–6). \tcblower \begin{Verbatim} @book{spenser1965fq, @@ -4409,7 +4415,7 @@ Edmund Spenser, \emph{The Faerie Queene} (Everyman's Library, 443–4; London: D title = {The Faerie Queene}, shorttitle = {Faerie Queene}, series = {Everyman's Library}, - number = {443–4}, + number = {443--4}, location = {London}, publisher = {Dent}, date = {1965/1966}, @@ -4612,6 +4618,6 @@ R. M. Ritter, \enquote{Revised proofs} [email to H. E. Cox], (1 Aug.\@ 2001), \u \printbibliography[notcategory=hidden] \end{document} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxnum-doc.tex'. diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.bib b/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.bib index 89772f4eb0c..5aeaea33ce3 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.bib +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.bib @@ -82,20 +82,20 @@ authoraddon = {F. Joukovsky-Micha}, authoraddon+an = {1=variant}, title = {La Guerre des dieux et des géants chez les poètes francais du XVI\textsuperscript{e} - siècle (1500\textendash 1585)}, + siècle (1500--1585)}, journaltitle = {Bibliothèque d'Humanisme et Renaissance}, volume = {29}, date = {1967}, langid = {french}, pages = {55-92}} @mvbook{kuehner.blass1890ef, - author = {Raphael Kühner}, + author = {Raphael Kühner}, editor = {Friedrich Blass}, editor+an = {=jointauthor}, editortype = {reviser}, - shortauthor = {Kühner--Blass}, + shortauthor = {Kühner--Blass}, title = {Elementar- und Formenlehre}, - maintitle = {Ausführliche grammatik der griechischen sprache}, + maintitle = {Ausführliche grammatik der griechischen sprache}, volume = {1}, location = {Hannover}, publisher = {Hahnsche Buchhandlung}, @@ -237,7 +237,7 @@ pages = {411-416}} @article{moody1953mdb, author = {T. W. Moody}, - title = {Michael Davitt and the British Labour Movement, 1882–1906}, + title = {Michael Davitt and the British Labour Movement, 1882--1906}, journaltitle = {Transactions of the Royal Historical Society}, series = {5}, volume = {3}, @@ -250,7 +250,7 @@ series = {newseries}, volume = {21}, date = {1971}, - pages = {65--80}} + pages = {65-80}} @article{hankinson1989gba, author = {R. J. Hankinson}, date = {1989}, @@ -258,7 +258,7 @@ journaltitle = {CQ}, series = {newseries}, volume = {39}, - pages = {43–76}} + pages = {43-76}} @article{bw1984wen, title = {Who's Excellent Now?}, journaltitle = {Business Week}, @@ -280,7 +280,7 @@ author = {{World Health Organization}}, date = {1983-05-20}, title = {Nutrition}, - subtitle = {Sex Bias of Nutritional Status of Children 0–4 Years}, + subtitle = {Sex Bias of Nutritional Status of Children 0--4 Years}, journaltitle = {Weekly Epidemiologial Record}} @article{boyce1957pgi, author = {M. Boyce}, @@ -298,7 +298,7 @@ number = {2}, location = {Lyon}, date = {1976}, - pages = {99--109}} + pages = {99-109}} @periodical{aujm1975.2, title = {Annales de l'Université Jean Moulin}, volume = {1975}, @@ -510,7 +510,7 @@ location = {Oxford}} @mvcollection{brady.etal1994hehsa, editor = {Brady, Jr., Thomas A. and Heiko A. Oberman and James D. Tracy}, - maintitle = {Handbook of European History, 1400–1600}, + maintitle = {Handbook of European History, 1400--1600}, mainsubtitle = {{Late} {Middle} {Ages,} {Renaissance} and {Reformation}}, volume = {1}, title = {Structures and Assertions}, @@ -994,7 +994,7 @@ author = {{Office of Population Censuses and Surveys}}, date = {1979}, title = {Area Mortality Tables}, - subtitle = {The Registrar-General's Decennial Supplement for England and Wales 1969–1973}, + subtitle = {The Registrar-General's Decennial Supplement for England and Wales 1969--1973}, series = {Series DS}, number = {3}, location = {London}} @@ -1503,7 +1503,7 @@ keywords = {eu}, title = {Commission of the European Communities v. Finland}, sorttitle = {Case C0118/0007}, - number = {C\textendash 118/07}, + number = {C--118/07}, journaltitle = {ECR}, volume = {I}, pages = {10889}, @@ -1511,14 +1511,18 @@ @jurisdiction{alcatel, keywords = {eu}, title = {Alcatel/Telettra}, - parvolume = {Case IV/M042}, - institution = {commission}, + casenumber = {IV/M042}, + institution = {Commission}, date = {1991}, journaltitle = {OJ}, series = {L}, volume = {122}, pages = {48}, - note = {[1991] 4 CLMR 391}} + pardate = {1991}, + parreporter = {CLMR}, + parvolume = {4}, + parpages = {391}, + options = {paryear-essential}} @jurisdiction{young1982, title = {Young, James and Webster v. UK}, number = {7601/76}, @@ -1671,7 +1675,7 @@ title = {The Faerie Queene}, shorttitle = {Faerie Queene}, series = {Everyman's Library}, - number = {443–4}, + number = {443--4}, location = {London}, publisher = {Dent}, date = {1965/1966}, diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf Binary files differindex 0d91cf83917..5d16afabd3a 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf Binary files differindex b703cd87a44..50f723060f2 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex b/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex index 636deda5ea9..6cafb88d25a 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \ProvidesFile{oxyear-doc.tex} [\Version\space Author-year biblatex style inspired by the Oxford Guide to Style] \PassOptionsToPackage{style=oxyear,varissuedate,anon}{biblatex} @@ -207,7 +207,7 @@ ,bottomrule = 0pt ,rightrule = 0pt }{#1} -\NewTCBListing{egcite}{D(){ok}omo}% +\NewTCBListing{egcite}{D(){ok} o m !o}% {colframe = #1 ,colback = #1!5!white ,listing side text @@ -215,7 +215,7 @@ ,IfNoValueTF={#2}{}{title = #2} ,before lower = {\raggedright\ifblank{#3}{}{\hangfrom{\booksym\space}#3\par}\hangfrom{\cogsym\space}} ,IfNoValueTF={#4}{}{#4}} -\NewTCBListing{egcite*}{D(){ok}omo}% +\NewTCBListing{egcite*}{D(){ok} o m !o}% {colframe = #1 ,colback = #1!5!white ,IfNoValueTF={#2}{}{title = #2} @@ -486,18 +486,19 @@ see the separate documentation file \href{./oxref.pdf}{\texttt{oxref.pdf}} \section{Stability} The \pkg[biblatex]{oxref} family of styles is currently at \fileversion. -I have no further features planned, so unless there is popular demand otherwise, -it should be bug-fix releases only between now and the release of version 1.0. -When that happens, the default (expected) behaviour of the styles will be frozen, -meaning I will do my best to avoid backwards-incompatible changes, though -alternative behaviour may be added. If you spot any aspects of the styles that -could be improved before then, especially for the cases not covered by the two -style manuals, please leave your thoughts on the GitHub issue tracker.% -\footnote{\url{https://github.com/alex-ball/biblatex-oxref/issues}} - -You are of course encouraged to report any bugs you discover on the -\href{https://github.com/alex-ball/biblatex-oxref/issues}{GitHub issue tracker} -as well. + +I have no plans to change the default (expected) behaviour of the styles, +and will do my best to avoid backwards-incompatible changes, though +alternative behaviour may be added. If changes are introduced that alter +the advertised output, this will be signalled by a change in major +version number. + +Please report any bugs you discover on the +\href{https://github.com/alex-ball/biblatex-oxref/issues}{GitHub issue tracker}.% +\footnote{Issue tracker for \pkg[biblatex]{oxref}: +\url{https://github.com/alex-ball/biblatex-oxref/issues}} +You are also welcome to leave your thoughts there on how the styles could +be improved, especially for the cases not covered by the two style manuals. \chapter{Citations and common formatting}\label{sec:citing} @@ -725,7 +726,7 @@ Joukovsky, F. (= Joukovsky-Micha, F.) (1967), \enquote{La Guerre des dieux et de authoraddon = {F. Joukovsky-Micha}, authoraddon+an = {1=variant}, title = {La Guerre des dieux et des géants chez les poètes francais du XVI\textsuperscript{e} - siècle (1500\textendash 1585)}, + siècle (1500--1585)}, journaltitle = {Bibliothèque d'Humanisme et Renaissance}, volume = {29}, date = {1967}, @@ -744,18 +745,18 @@ If the contribution of the translators or revisers is so great they could be joi \begin{bibexbox} {kuehner.blass1890ef} -Kühner, R., rev. Blass, F. (1890-2), \emph{Ausführliche grammatik der griechischen sprache}, i: \emph{Elementar- und Formenlehre} (Hannover: Hahnsche Buchhandlung). +Kühner, R., rev. Blass, F. (1890–2), \emph{Ausführliche grammatik der griechischen sprache}, i: \emph{Elementar- und Formenlehre} (Hannover: Hahnsche Buchhandlung). \toggletrue{blx@bibliography} \tcblower \begin{Verbatim} @mvbook{kuehner.blass1890ef, - author = {Raphael Kühner}, + author = {Raphael Kühner}, editor = {Friedrich Blass}, editor+an = {=jointauthor}, editortype = {reviser}, - shortauthor = {Kühner--Blass}, + shortauthor = {Kühner--Blass}, title = {Elementar- und Formenlehre}, - maintitle = {Ausführliche grammatik der griechischen sprache}, + maintitle = {Ausführliche grammatik der griechischen sprache}, volume = {1}, location = {Hannover}, publisher = {Hahnsche Buchhandlung}, @@ -1066,12 +1067,12 @@ Li, S. et al. (2013), \enquote{Forever Love: The Hitherto Earliest Record of Cop \begin{bibexbox} <NHR \S18.3.3\textdagger> {moody1953mdb} -Moody, T. W. (1953), \enquote{Michael Davitt and the British Labour Movement, 1882–1906}, \emph{Transactions of the Royal Historical Society}, 5th ser., 3: 53--76. +Moody, T. W. (1953), \enquote{Michael Davitt and the British Labour Movement, 1882--1906}, \emph{Transactions of the Royal Historical Society}, 5th ser., 3: 53–76. \tcblower \begin{Verbatim} @article{moody1953mdb, author = {T. W. Moody}, - title = {Michael Davitt and the British Labour Movement, 1882–1906}, + title = {Michael Davitt and the British Labour Movement, 1882--1906}, journaltitle = {Transactions of the Royal Historical Society}, series = {5}, volume = {3}, @@ -1094,7 +1095,7 @@ Hankinson, R. J. (1989), \enquote{Galen and the Best of All Possible Worlds}, \e journaltitle = {CQ}, series = {newseries}, volume = {39}, - pages = {43–76}} + pages = {43-76}} \end{Verbatim} \end{bibexbox} @@ -1121,7 +1122,7 @@ Marx, K. (1842), \enquote{Der Kommunismus und die Augsburger \enquote{Allgemeine \begin{bibexbox}<OGS \S15.19.2> {who1983nsb} -WHO (World Health Organization) (1983), \enquote{Nutrition: Sex Bias of Nutritional Status of Children 0–4 Years}, \emph{Weekly Epidemiologial Record}, 20 May. +WHO (World Health Organization) (1983), \enquote{Nutrition: Sex Bias of Nutritional Status of Children 0--4 Years}, \emph{Weekly Epidemiologial Record}, 20 May. \tcblower \begin{Verbatim} @article{who1983nsb, @@ -1129,7 +1130,7 @@ WHO (World Health Organization) (1983), \enquote{Nutrition: Sex Bias of Nutritio author = {{World Health Organization}}, date = {1983-05-20}, title = {Nutrition}, - subtitle = {Sex Bias of Nutritional Status of Children 0–4 Years}, + subtitle = {Sex Bias of Nutritional Status of Children 0--4 Years}, journaltitle = {Weekly Epidemiologial Record}} \end{Verbatim} \end{bibexbox} @@ -1177,7 +1178,7 @@ Bec, C. (1976) (ed.), \emph{Italie 1500--1550: Une situation de crise?} = \emph{ number = {2}, location = {Lyon}, date = {1976}, - pages = {99--109}} + pages = {99-109}} @periodical{aujm1975.2, title = {Annales de l'Université Jean Moulin}, volume = {1975}, @@ -1614,12 +1615,12 @@ the following form is used: \begin{bibexbox} <OGS \S15.2.2\textdagger> {brady.etal1994hehsa} -Brady, Jr., T. A., Oberman, H. A., and Tracy, J. D. (1994) (eds.), \emph{Handbook of European History, 1400–1600: Late Middle Ages, Renaissance and Reformation}, i: \emph{Structures and Assertions} (Leiden: E. J. Brill). +Brady, Jr., T. A., Oberman, H. A., and Tracy, J. D. (1994) (eds.), \emph{Handbook of European History, 1400--1600: Late Middle Ages, Renaissance and Reformation}, i: \emph{Structures and Assertions} (Leiden: E. J. Brill). \tcblower \begin{Verbatim} @mvcollection{brady.etal1994hehsa, editor = {Brady, Jr., Thomas A. and Heiko A. Oberman and James D. Tracy}, - maintitle = {Handbook of European History, 1400–1600}, + maintitle = {Handbook of European History, 1400--1600}, mainsubtitle = {{Late} {Middle} {Ages,} {Renaissance} and {Reformation}}, volume = {1}, title = {Structures and Assertions}, @@ -2638,14 +2639,14 @@ CNNR/GMH (Comisión Nacional de Reparación y Reconciliación y Grupo de Memoria \begin{bibexbox}<OGS \S15.19.2> {opcs1979amt} -Office of Population Censuses and Surveys (1979a), \emph{Area Mortality Tables: The Registrar-General's Decennial Supplement for England and Wales 1969–1973}, Series DS, No.~3 (London) +Office of Population Censuses and Surveys (1979a), \emph{Area Mortality Tables: The Registrar-General's Decennial Supplement for England and Wales 1969--1973}, Series DS, No.~3 (London) \tcblower \begin{Verbatim} @report{opcs1979amt, author = {{Office of Population Censuses and Surveys}}, date = {1979}, title = {Area Mortality Tables}, - subtitle = {The Registrar-General's Decennial Supplement for England and Wales 1969–1973}, + subtitle = {The Registrar-General's Decennial Supplement for England and Wales 1969--1973}, series = {Series DS}, number = {3}, location = {London}} @@ -3822,9 +3823,9 @@ United Nations (2011), \emph{World Population Prospects: The 2010 Revision} [CD- \chapterprecis{commentary, jurisdiction, legal, legislation} \pkg[biblatex]{Oxref} provides only a basic level of support for legal references, in case you need to use some in a mainly non-legal text. -For a more thorough and robust treatment, intended for a specialist readership, I recommend you use the \href{http://www.ctan.org/pkg/oscola}{\textsf{oscola}} style instead. +For a more thorough and robust treatment, intended for a specialist readership, I recommend you use the \pkg{oscola} style instead. -Since there is a family resemblence between the \emph{Oxford Guide to Style\slash New Hart's Rules} and the \emph{Oxford Standard for the Citation of Legal Authorities}, \pkg[biblatex]{oxref} largely mimics \textsf{oscola} and its data model, though there are some small formatting differences. What you should \emph{not} expect from \pkg[biblatex]{oxref} are facilities for compiling specialist indices of sources, or anything special regarding the handling of postnotes. +Since there is a family resemblence between the \emph{Oxford Guide to Style\slash New Hart's Rules} and the \emph{Oxford Standard for the Citation of Legal Authorities}, \pkg[biblatex]{oxref} largely mimics \pkg{oscola} and its data model, though there are some small formatting differences. What you should \emph{not} expect from \pkg[biblatex]{oxref} are facilities for compiling specialist indices of sources, or anything special regarding the handling of postnotes. Since legal references are usually cited using footnotes, how \textsf{oxyear} should behave is not well defined. As a result, I have not configured it to do anything fancy: the full reference will be formatted just the same as with \textsf{oxnotes}, and citations will typically be title–year using parentheses in the usual way. I am open to suggestions for how to handle things better. @@ -4086,6 +4087,9 @@ Both the \emph{Oxford Guide to Style} and \emph{New Hart's Rules} are inconsiste \tip{European cases still get sorted by title, even if the entry begins with the case number. Use \code{sorttitle} if you would rather they were sorted under \enquote{Case} or \enquote{Joined Cases}.} +\tip{For ECR cases, you can use either \code{number} or the non-standard \code{casenumber} field + for the case number.} + \begin{bibexbox} <OGS \S13.4.4> {C118/07} @@ -4096,7 +4100,7 @@ Case C–118/07 \emph{Commission of the European Communities v Finland} [2002] E keywords = {eu}, title = {Commission of the European Communities v. Finland}, sorttitle = {Case C0118/0007}, - number = {C\textendash 118/07}, + number = {C--118/07}, journaltitle = {ECR}, volume = {I}, pages = {10889}, @@ -4104,9 +4108,7 @@ Case C–118/07 \emph{Commission of the European Communities v Finland} [2002] E \end{Verbatim} \end{bibexbox} -\tip{Indicate Commission Decisions by putting \code{commission} in the \code{institution} field. If a decision has a formal decision number, put this in the \code{number} field. Put the case number (including the word \enquote{Case} if needed) in either the \code{titleaddon}, \code{parvolume}, or \code{userb} field.} - -\tip{An unfortunate side effect of this is that is not possible to use either the parallel or neutral citation idiom to get a reference to look like the following. In such cases, use the \code{note} field to provide the second citation.} +\tip{Indicate Commission Decisions by putting \code{Commission} in the \code{institution} field. If a decision has a formal decision number, put this in the \code{number} field, and put the case number in the (non-standard) \code{casenumber} field or (\pkg{oscola}-supported) \code{userb} field. If wider portability is an issue, you can put the case number, including the word \enquote{Case} if needed, in the \code{titleaddon} field instead.} \begin{bibexbox} <OGS \S13.2.6> @@ -4117,14 +4119,18 @@ Case C–118/07 \emph{Commission of the European Communities v Finland} [2002] E @jurisdiction{alcatel, keywords = {eu}, title = {Alcatel/Telettra}, - parvolume = {Case IV/M042}, - institution = {commission}, + casenumber = {IV/M042}, + institution = {Commission}, date = {1991}, journaltitle = {OJ}, series = {L}, volume = {122}, pages = {48}, - note = {[1991] 4 CLMR 391}} + pardate = {1991}, + parreporter = {CLMR}, + parvolume = {4}, + parpages = {391}, + options = {paryear-essential}} \end{Verbatim} \end{bibexbox} @@ -4516,7 +4522,7 @@ If a poem is divided into cantos, the title is set in italics rather than quoted \begin{bibexbox} <OGS \S15.8*\textdagger> {spenser1965fq}% -Spenser, E. (1590–6), \emph{The Faerie Queene} (Everyman's Library, 443–4; London: Dent, 1965–6). +Spenser, E. (1590–6), \emph{The Faerie Queene} (Everyman's Library, 443--4; London: Dent, 1965–6). \tcblower \begin{Verbatim} @book{spenser1965fq, @@ -4524,7 +4530,7 @@ Spenser, E. (1590–6), \emph{The Faerie Queene} (Everyman's Library, 443–4; L title = {The Faerie Queene}, shorttitle = {Faerie Queene}, series = {Everyman's Library}, - number = {443–4}, + number = {443--4}, location = {London}, publisher = {Dent}, date = {1965/1966}, @@ -4735,6 +4741,6 @@ Ritter, R. M. (2001), \enquote{Revised proofs} [email to H. E. Cox], (1 Aug.\@), \printbibliography[notcategory=hidden] \end{document} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxyear-doc.tex'. diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/Makefile b/Master/texmf-dist/source/latex/biblatex-oxref/Makefile index 4c468d7f97a..f4f53aa573f 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/Makefile +++ b/Master/texmf-dist/source/latex/biblatex-oxref/Makefile @@ -14,7 +14,7 @@ UTREE = $(shell kpsewhich --var-value TEXMFHOME) .PHONY: source clean distclean inst uninst install uninstall zip ctan -all: $(NAME).pdf $(STY1)-doc.pdf $(STY2)-doc.pdf $(STY3)-doc.pdf $(STY4)-doc.pdf +all: $(NAME).pdf $(STY1)-doc.pdf $(STY2)-doc.pdf $(STY3)-doc.pdf $(STY4)-doc.pdf clean @exit 0 source $(NAME).bbx american-$(NAME).lbx british-$(NAME).lbx english-$(NAME).lbx $(STY1)-doc.tex $(STY1).bbx $(STY1).cbx $(STY1).dbx $(STY2)-doc.tex $(STY2).bbx $(STY2).cbx $(STY2).dbx $(STY3)-doc.tex $(STY3).bbx $(STY3).cbx $(STY3).dbx $(STY4)-doc.tex $(STY4).bbx $(STY4).cbx $(STY4).dbx: $(NAME).dtx @@ -32,6 +32,7 @@ $(STY4)-doc.pdf: $(STY4)-doc.tex $(NAME).bbx $(STY4).bbx $(STY4).cbx american-$( latexmk -silent -lualatex -shell-escape -interaction=nonstopmode $(STY4)-doc.tex >/dev/null clean: + for log in *.log; do grep "WARNING: biblatex-oxref" $$log; test $$? -eq 1; done rm -f {$(NAME),$(STY1)-doc,$(STY2)-doc,$(STY3)-doc,$(STY4)-doc}.{aux,bbl,bcf,blg,doc,fdb_latexmk,fls,glo,gls,hd,idx,ilg,ind,listing,log,nav,out,run.xml,snm,synctex.gz,toc,vrb} rm -f {$(STY1),$(STY2),$(STY3),$(STY4),american-$(NAME),british-$(NAME),english-$(NAME)}.doc rm -rf _minted-* @@ -52,13 +53,13 @@ uninst: install: all sudo mkdir -p $(LOCAL)/{tex,source,doc}/latex/$(PFX)$(NAME) - sudo $(NAME).{dtx,ins} $(LOCAL)/source/latex/$(PFX)$(NAME) - sudo $(NAME).bbx {$(STY1),$(STY2),$(STY3),$(STY4)}.{b,c,d}bx {american,british,english}-$(NAME).lbx $(LOCAL)/tex/latex/$(PFX)$(NAME) + sudo cp $(NAME).{dtx,ins} $(LOCAL)/source/latex/$(PFX)$(NAME) + sudo cp $(NAME).bbx {$(STY1),$(STY2),$(STY3),$(STY4)}.{b,c,d}bx {american,british,english}-$(NAME).lbx $(LOCAL)/tex/latex/$(PFX)$(NAME) sudo cp $(NAME).{bib,pdf} {$(STY1),$(STY2),$(STY3),$(STY4)}-doc.{tex,pdf} $(LOCAL)/doc/latex/$(PFX)$(NAME) - mktexlsr + sudo mktexlsr uninstall: sudo rm -r $(LOCAL)/{tex,source,doc}/latex/$(PFX)$(NAME) - mktexlsr + sudo mktexlsr zip: all mkdir $(TDIR) diff --git a/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx b/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx index eb2bf8d58a2..e9d5b7cc4c3 100644 --- a/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx +++ b/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx @@ -1,6 +1,6 @@ % \iffalse %<*internal|bbx|cbx|dbx|lbx|doc> -\def\Version{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} %</internal|bbx|cbx|dbx|lbx|doc> %<*internal> \iffalse @@ -95,9 +95,6 @@ stipulations and examples provided by the 2014 *New Hart's Rules* and the 2002 * `oxyear` is a style similar to the standard `authoryear`, intended for use with parenthetical in-text citations. -These styles should be considered experimental. In particular, the ways in which -the styles handle certain tricky references are subject to change. - [biblatex]: http://ctan.org/pkg/biblatex %</readme> %<*bib> @@ -149,7 +146,7 @@ See: http://www.latex-project.org/lppl.txt \endpreamble \postamble -Copyright (C) 2016–2018 Alex Ball +Copyright (C) 2016–2019 Alex Ball \endpostamble \usedir{tex/latex/\jobname} @@ -416,7 +413,7 @@ Copyright (C) 2016–2018 Alex Ball % egcite displays a sample citation: % (colour)[title]{hand-coded citation text}[additional TCB options] % Put the citation command in the environment. -\NewTCBListing{egcite}{D(){ok}omo}% +\NewTCBListing{egcite}{D(){ok} o m !o}% {colframe = #1 ,colback = #1!5!white ,listing side text @@ -425,7 +422,7 @@ Copyright (C) 2016–2018 Alex Ball ,before lower = {\raggedright\ifblank{#3}{}{\hangfrom{\booksym\space}#3\par}\hangfrom{\cogsym\space}} ,IfNoValueTF={#4}{}{#4}} % egcite* uses upper and lower portions -\NewTCBListing{egcite*}{D(){ok}omo}% +\NewTCBListing{egcite*}{D(){ok} o m !o}% {colframe = #1 ,colback = #1!5!white ,IfNoValueTF={#2}{}{title = #2} @@ -782,7 +779,7 @@ first two steps. ## Licence -Copyright 2016–2018 Alex Ball. +Copyright 2016–2019 Alex Ball. This work consists of the documented LaTeX file oxref.dtx and a Makefile. @@ -1053,19 +1050,19 @@ see the separate documentation file \href{./oxref.pdf}{\texttt{oxref.pdf}} \section{Stability} The \pkg[biblatex]{oxref} family of styles is currently at \fileversion. -I have no further features planned, so unless there is popular demand otherwise, -it should be bug-fix releases only between now and the release of version 1.0. -When that happens, the default (expected) behaviour of the styles will be frozen, -meaning I will do my best to avoid backwards-incompatible changes, though -alternative behaviour may be added. If you spot any aspects of the styles that -could be improved before then, especially for the cases not covered by the two -style manuals, please leave your thoughts on the GitHub issue tracker.% -\footnote{\url{https://github.com/alex-ball/biblatex-oxref/issues}} -You are of course encouraged to report any bugs you discover on the -\href{https://github.com/alex-ball/biblatex-oxref/issues}{GitHub issue tracker} -as well. +I have no plans to change the default (expected) behaviour of the styles, +and will do my best to avoid backwards-incompatible changes, though +alternative behaviour may be added. If changes are introduced that alter +the advertised output, this will be signalled by a change in major +version number. +Please report any bugs you discover on the +\href{https://github.com/alex-ball/biblatex-oxref/issues}{GitHub issue tracker}.% +\footnote{Issue tracker for \pkg[biblatex]{oxref}: +\url{https://github.com/alex-ball/biblatex-oxref/issues}} +You are also welcome to leave your thoughts there on how the styles could +be improved, especially for the cases not covered by the two style manuals. \chapter{Citations and common formatting}\label{sec:citing} @@ -1147,7 +1144,7 @@ Test \parencites% \end{egcite} %</m|a> %<*y> -The \emph{Oxford Guide to Style} consistently promotes an author–date citation scheme which uses parentheses, within which there is only a space between the name and date. +The \emph{Oxford Guide to Style} consistently promotes an author–date citation scheme which uses parentheses, within which there is only a space between the name and date. If there is no date, the replacement text is separated from the name by a comma. \begin{egcite}{(Anon.\@ 1956), (Marx 1867), (Clarke, n.d.).} @@ -1453,7 +1450,7 @@ In cases where an author changes the name under which they publish (e.g.\ due to authoraddon = {F. Joukovsky-Micha}, authoraddon+an = {1=variant}, title = {La Guerre des dieux et des géants chez les poètes francais du XVI\textsuperscript{e} - siècle (1500\textendash 1585)}, + siècle (1500--1585)}, journaltitle = {Bibliothèque d'Humanisme et Renaissance}, volume = {29}, date = {1967}, @@ -1486,20 +1483,20 @@ If the contribution of the translators or revisers is so great they could be joi \begin{bibexbox} {kuehner.blass1890ef} -%<n|m>\textsc{Kühner, Raphael}, rev. \textsc{Blass, Friedrich}, \emph{Ausführliche grammatik der griechischen sprache}, i: \emph{Elementar- und Formenlehre} (Hannover: Hahnsche Buchhandlung, 1890-2). -%<a|y>Kühner, R., rev. Blass, F. (1890-2), \emph{Ausführliche grammatik der griechischen sprache}, i: \emph{Elementar- und Formenlehre} (Hannover: Hahnsche Buchhandlung). +%<n|m>\textsc{Kühner, Raphael}, rev. \textsc{Blass, Friedrich}, \emph{Ausführliche grammatik der griechischen sprache}, i: \emph{Elementar- und Formenlehre} (Hannover: Hahnsche Buchhandlung, 1890–2). +%<a|y>Kühner, R., rev. Blass, F. (1890–2), \emph{Ausführliche grammatik der griechischen sprache}, i: \emph{Elementar- und Formenlehre} (Hannover: Hahnsche Buchhandlung). \toggletrue{blx@bibliography} \tcblower \begin{Verbatim} %</n|m|a|y> @mvbook{kuehner.blass1890ef, - author = {Raphael Kühner}, + author = {Raphael Kühner}, editor = {Friedrich Blass}, editor+an = {=jointauthor}, editortype = {reviser}, - shortauthor = {Kühner--Blass}, + shortauthor = {Kühner--Blass}, title = {Elementar- und Formenlehre}, - maintitle = {Ausführliche grammatik der griechischen sprache}, + maintitle = {Ausführliche grammatik der griechischen sprache}, volume = {1}, location = {Hannover}, publisher = {Hahnsche Buchhandlung}, @@ -1950,14 +1947,14 @@ B. Lindars, \enquote{Ezechiel and Individual Responsibility}, \emph{VT} 15 (1965 %<n|m><NHR \S18.3.3> %<a|y><NHR \S18.3.3\textdagger> {moody1953mdb} -%<n|m>T. W. Moody, \enquote{Michael Davitt and the British Labour Movement, 1882–1906}, \emph{Transactions of the Royal Historical Society}, 5th ser., 3 (1953), 53--76. -%<a|y>Moody, T. W. (1953), \enquote{Michael Davitt and the British Labour Movement, 1882–1906}, \emph{Transactions of the Royal Historical Society}, 5th ser., 3: 53--76. +%<n|m>T. W. Moody, \enquote{Michael Davitt and the British Labour Movement, 1882--1906}, \emph{Transactions of the Royal Historical Society}, 5th ser., 3 (1953), 53–76. +%<a|y>Moody, T. W. (1953), \enquote{Michael Davitt and the British Labour Movement, 1882--1906}, \emph{Transactions of the Royal Historical Society}, 5th ser., 3: 53–76. \tcblower \begin{Verbatim} %</n|m|a|y> @article{moody1953mdb, author = {T. W. Moody}, - title = {Michael Davitt and the British Labour Movement, 1882–1906}, + title = {Michael Davitt and the British Labour Movement, 1882--1906}, journaltitle = {Transactions of the Royal Historical Society}, series = {5}, volume = {3}, @@ -1986,7 +1983,7 @@ J. Barnes, \enquote{Homonymy in Aristotle and Speusippus}, \emph{Classical Quart series = {newseries}, volume = {21}, date = {1971}, - pages = {65--80}} + pages = {65-80}} %</n|m|bib> %<*n|m> \end{Verbatim} @@ -2008,7 +2005,7 @@ Hankinson, R. J. (1989), \enquote{Galen and the Best of All Possible Worlds}, \e journaltitle = {CQ}, series = {newseries}, volume = {39}, - pages = {43–76}} + pages = {43-76}} %</a|y|bib> %<*a|y> \end{Verbatim} @@ -2086,7 +2083,7 @@ Marx, K. (1842), \enquote{Der Kommunismus und die Augsburger \enquote{Allgemeine % No pages \begin{bibexbox}<OGS \S15.19.2> {who1983nsb} -WHO (World Health Organization) (1983), \enquote{Nutrition: Sex Bias of Nutritional Status of Children 0–4 Years}, \emph{Weekly Epidemiologial Record}, 20 May. +WHO (World Health Organization) (1983), \enquote{Nutrition: Sex Bias of Nutritional Status of Children 0--4 Years}, \emph{Weekly Epidemiologial Record}, 20 May. \tcblower \begin{Verbatim} %</a|y> @@ -2096,7 +2093,7 @@ WHO (World Health Organization) (1983), \enquote{Nutrition: Sex Bias of Nutritio author = {{World Health Organization}}, date = {1983-05-20}, title = {Nutrition}, - subtitle = {Sex Bias of Nutritional Status of Children 0–4 Years}, + subtitle = {Sex Bias of Nutritional Status of Children 0--4 Years}, journaltitle = {Weekly Epidemiologial Record}} %</a|y|bib> %<*a|y> @@ -2157,7 +2154,7 @@ or add the book details to a periodical entry. number = {2}, location = {Lyon}, date = {1976}, - pages = {99--109}} + pages = {99-109}} @periodical{aujm1975.2, title = {Annales de l'Université Jean Moulin}, volume = {1975}, @@ -2877,14 +2874,14 @@ the following form is used: %<n|m><OGS \S15.2.2> %<a|y><OGS \S15.2.2\textdagger> {brady.etal1994hehsa} -%<n|m>Thomas A. Brady, Jr., Heiko A. Oberman, and James D. Tracy (eds.), \emph{Handbook of European History, 1400–1600: Late Middle Ages, Renaissance and Reformation}, i: \emph{Structures and Assertions} (Leiden: E. J. Brill, 1994). -%<a|y>Brady, Jr., T. A., Oberman, H. A., and Tracy, J. D. (1994) (eds.), \emph{Handbook of European History, 1400–1600: Late Middle Ages, Renaissance and Reformation}, i: \emph{Structures and Assertions} (Leiden: E. J. Brill). +%<n|m>Thomas A. Brady, Jr., Heiko A. Oberman, and James D. Tracy (eds.), \emph{Handbook of European History, 1400--1600: Late Middle Ages, Renaissance and Reformation}, i: \emph{Structures and Assertions} (Leiden: E. J. Brill, 1994). +%<a|y>Brady, Jr., T. A., Oberman, H. A., and Tracy, J. D. (1994) (eds.), \emph{Handbook of European History, 1400--1600: Late Middle Ages, Renaissance and Reformation}, i: \emph{Structures and Assertions} (Leiden: E. J. Brill). \tcblower \begin{Verbatim} %</n|m|a|y> @mvcollection{brady.etal1994hehsa, editor = {Brady, Jr., Thomas A. and Heiko A. Oberman and James D. Tracy}, - maintitle = {Handbook of European History, 1400–1600}, + maintitle = {Handbook of European History, 1400--1600}, mainsubtitle = {{Late} {Middle} {Ages,} {Renaissance} and {Reformation}}, volume = {1}, title = {Structures and Assertions}, @@ -4371,7 +4368,7 @@ CNNR/GMH (Comisión Nacional de Reparación y Reconciliación y Grupo de Memoria %<*a|y> \begin{bibexbox}<OGS \S15.19.2> {opcs1979amt} -Office of Population Censuses and Surveys (1979a), \emph{Area Mortality Tables: The Registrar-General's Decennial Supplement for England and Wales 1969–1973}, Series DS, No.~3 (London) +Office of Population Censuses and Surveys (1979a), \emph{Area Mortality Tables: The Registrar-General's Decennial Supplement for England and Wales 1969--1973}, Series DS, No.~3 (London) \tcblower \begin{Verbatim} %</a|y> @@ -4380,7 +4377,7 @@ Office of Population Censuses and Surveys (1979a), \emph{Area Mortality Tables: author = {{Office of Population Censuses and Surveys}}, date = {1979}, title = {Area Mortality Tables}, - subtitle = {The Registrar-General's Decennial Supplement for England and Wales 1969–1973}, + subtitle = {The Registrar-General's Decennial Supplement for England and Wales 1969--1973}, series = {Series DS}, number = {3}, location = {London}} @@ -5773,9 +5770,9 @@ Standard \textsf{biblatex} only provides for one title for online resources, whi \chapterprecis{commentary, jurisdiction, legal, legislation} \pkg[biblatex]{Oxref} provides only a basic level of support for legal references, in case you need to use some in a mainly non-legal text. -For a more thorough and robust treatment, intended for a specialist readership, I recommend you use the \href{http://www.ctan.org/pkg/oscola}{\textsf{oscola}} style instead. +For a more thorough and robust treatment, intended for a specialist readership, I recommend you use the \pkg{oscola} style instead. -Since there is a family resemblence between the \emph{Oxford Guide to Style\slash New Hart's Rules} and the \emph{Oxford Standard for the Citation of Legal Authorities}, \pkg[biblatex]{oxref} largely mimics \textsf{oscola} and its data model, though there are some small formatting differences. What you should \emph{not} expect from \pkg[biblatex]{oxref} are facilities for compiling specialist indices of sources, or anything special regarding the handling of postnotes. +Since there is a family resemblence between the \emph{Oxford Guide to Style\slash New Hart's Rules} and the \emph{Oxford Standard for the Citation of Legal Authorities}, \pkg[biblatex]{oxref} largely mimics \pkg{oscola} and its data model, though there are some small formatting differences. What you should \emph{not} expect from \pkg[biblatex]{oxref} are facilities for compiling specialist indices of sources, or anything special regarding the handling of postnotes. %<y>Since legal references are usually cited using footnotes, how \textsf{oxyear} should behave is not well defined. As a result, I have not configured it to do anything fancy: the full reference will be formatted just the same as with \textsf{oxnotes}, and citations will typically be title–year using parentheses in the usual way. I am open to suggestions for how to handle things better. @@ -6087,6 +6084,9 @@ Both the \emph{Oxford Guide to Style} and \emph{New Hart's Rules} are inconsiste \tip{European cases still get sorted by title, even if the entry begins with the case number. Use \code{sorttitle} if you would rather they were sorted under \enquote{Case} or \enquote{Joined Cases}.} +\tip{For ECR cases, you can use either \code{number} or the non-standard \code{casenumber} field + for the case number.} + \begin{bibexbox} <OGS \S13.4.4> {C118/07} @@ -6098,7 +6098,7 @@ Case C–118/07 \emph{Commission of the European Communities v Finland} [2002] E keywords = {eu}, title = {Commission of the European Communities v. Finland}, sorttitle = {Case C0118/0007}, - number = {C\textendash 118/07}, + number = {C--118/07}, journaltitle = {ECR}, volume = {I}, pages = {10889}, @@ -6107,9 +6107,7 @@ Case C–118/07 \emph{Commission of the European Communities v Finland} [2002] E \end{Verbatim} \end{bibexbox} -\tip{Indicate Commission Decisions by putting \code{commission} in the \code{institution} field. If a decision has a formal decision number, put this in the \code{number} field. Put the case number (including the word \enquote{Case} if needed) in either the \code{titleaddon}, \code{parvolume}, or \code{userb} field.} - -\tip{An unfortunate side effect of this is that is not possible to use either the parallel or neutral citation idiom to get a reference to look like the following. In such cases, use the \code{note} field to provide the second citation.} +\tip{Indicate Commission Decisions by putting \code{Commission} in the \code{institution} field. If a decision has a formal decision number, put this in the \code{number} field, and put the case number in the (non-standard) \code{casenumber} field or (\pkg{oscola}-supported) \code{userb} field. If wider portability is an issue, you can put the case number, including the word \enquote{Case} if needed, in the \code{titleaddon} field instead.} \begin{bibexbox} <OGS \S13.2.6> @@ -6121,14 +6119,18 @@ Case C–118/07 \emph{Commission of the European Communities v Finland} [2002] E @jurisdiction{alcatel, keywords = {eu}, title = {Alcatel/Telettra}, - parvolume = {Case IV/M042}, - institution = {commission}, + casenumber = {IV/M042}, + institution = {Commission}, date = {1991}, journaltitle = {OJ}, series = {L}, volume = {122}, pages = {48}, - note = {[1991] 4 CLMR 391}} + pardate = {1991}, + parreporter = {CLMR}, + parvolume = {4}, + parpages = {391}, + options = {paryear-essential}} %<*n|m|a|y> \end{Verbatim} \end{bibexbox} @@ -6592,8 +6594,8 @@ If a poem is divided into cantos, the title is set in italics rather than quoted %<n|m><OGS \S15.8*> %<a|y><OGS \S15.8*\textdagger> {spenser1965fq}% -%<n|m>Edmund Spenser, \emph{The Faerie Queene} (Everyman's Library, 443–4; London: Dent, 1965–6) (originally pub. 1590–6). -%<a|y>Spenser, E. (1590–6), \emph{The Faerie Queene} (Everyman's Library, 443–4; London: Dent, 1965–6). +%<n|m>Edmund Spenser, \emph{The Faerie Queene} (Everyman's Library, 443--4; London: Dent, 1965–6) (originally pub. 1590–6). +%<a|y>Spenser, E. (1590–6), \emph{The Faerie Queene} (Everyman's Library, 443--4; London: Dent, 1965–6). \tcblower \begin{Verbatim} %</n|m|a|y> @@ -6602,7 +6604,7 @@ If a poem is divided into cantos, the title is set in italics rather than quoted title = {The Faerie Queene}, shorttitle = {Faerie Queene}, series = {Everyman's Library}, - number = {443–4}, + number = {443--4}, location = {London}, publisher = {Dent}, date = {1965/1966}, @@ -7263,10 +7265,12 @@ will trigger the use of parentheses. % \begin{macrocode} \xpatchbibmacro{name:given-family}% {\bibnamedelimd\mkbibnamesuffix{#4}}% - {\ifnumeral{#4}{}{\addcomma}\bibnamedelimd\mkbibnamesuffix{#4}}{}{} + {\ifnumeral{#4}{}{\addcomma}\bibnamedelimd\mkbibnamesuffix{#4}}% +{}{\wlog{WARNING: biblatex-oxref failed to patch name:given-family}} \xpatchbibmacro{name:family-given}% {\bibnamedelimd\mkbibnamesuffix{#4}}% - {\ifnumeral{#4}{}{\addcomma}\bibnamedelimd\mkbibnamesuffix{#4}}{}{} + {\ifnumeral{#4}{}{\addcomma}\bibnamedelimd\mkbibnamesuffix{#4}}% +{}{\wlog{WARNING: biblatex-oxref failed to patch name:family-given}} % \end{macrocode} % % Pseudonyms are printed after the main name, enclosed in parentheses (OGS) or @@ -7636,7 +7640,8 @@ will trigger the use of parentheses. {\global\undef\bbx@lasthash}} \xpatchbibmacro{translatorstrg}% {\bibstring}% - {\bibstring[\mkbibparens]}{}{}% + {\bibstring[\mkbibparens]}% +{}{\wlog{WARNING: biblatex-oxref failed to patch translatorstrg}}% \xpatchbibmacro{translator+othersstrg}% {\bibstring}% {\bibstring[\mkbibparens]}{}{}% @@ -7749,8 +7754,8 @@ will trigger the use of parentheses. % % Year ranges are truncated (e.g.~2012–3). Therefore, we provide a command that % compares two years, and outputs a full or truncated version of the second -% year, depending on how similar it is to the first. It is extracted and adapted -% from code by Marco Daniel.\footnote{\url{http://tex.stackexchange.com/questions/23483/}} +% year, depending on how similar it is to the first. It is adapted from code by +% Marco Daniel.\footnote{\url{http://tex.stackexchange.com/questions/23483/}} % % \begin{macrocode} \newcommand{\blx@ox@compyear}[2]{% @@ -7758,14 +7763,35 @@ will trigger the use of parentheses. \def\num@two{#2}% \StrLen{\num@one}[\num@one@len]% \StrLen{\num@two}[\num@two@len]% - \IfEq{\num@one@len}{\num@two@len}% - {\StrCompare{\num@one}{\num@two}[\Result]% +% \end{macrocode} +% +% The year is only trimmed if it is greater than, but has the same number of +% digits as, the comparison number. +% +% \begin{macrocode} + \ifboolexpr{ + test {\ifnumequal{\num@one@len}{\num@two@len}} + and + test {\ifnumless{\num@one}{\num@two}} + }{% +% \end{macrocode} +% +% For years since 1000, at least two digits must be the same before trimming +% occurs. +% +% \begin{macrocode} + \StrCompare{\num@one}{\num@two}[\Result]% \ifnum\num@two@len>3% - \IfStrEq{\Result}{2}{\def\Result{1}}{}% + \IfStrEq{\Result}{2}{\def\Result{1}}{}% \fi - \StrGobbleLeft{0\num@two}{\Result}}% - {\num@two}% -} +% \end{macrocode} +% +% Since \cs{Result} is the number of digits to trim from the left hand side of +% the year, plus one, we provide an extra sacrificial zero before trimming. +% +% \begin{macrocode} + \StrGobbleLeft{0\num@two}{\Result}% + }{\num@two}} % \end{macrocode} % % We patch the date range formats from |biblatex.sty| to use the @@ -7890,11 +7916,10 @@ will trigger the use of parentheses. % We let |edition| take a localization key as well as a number. % % \begin{macrocode} -\xpatchfieldformat{edition}{% - #1\isdot -}{% - \ifbibstring{#1}{\bibstring{#1}}{#1\isdot}% -}{}{} +\xpatchfieldformat{edition}% + {#1\isdot}% + {\ifbibstring{#1}{\bibstring{#1}}{#1\isdot}}% +{}{\wlog{WARNING: biblatex-oxref failed to patch edition}} % \end{macrocode} % % Page ranges are compressed, but are not usually marked with @@ -8045,7 +8070,8 @@ will trigger the use of parentheses. \DeclareFieldFormat{urldate}{\bibstring{urlseen}\space#1} \xpatchbibmacro{url+urldate}% {\setunit*{\addspace}}% - {\setunit*{\addcomma\addspace}}{}{} + {\setunit*{\addcomma\addspace}}% +{}{\wlog{WARNING: biblatex-oxref failed to patch url+urldate}} % \end{macrocode} % % The DOI is introduced by \enquote{doi} in lowercase. @@ -8053,7 +8079,8 @@ will trigger the use of parentheses. % \begin{macrocode} \xpatchfieldformat{doi}% {\mkbibacro{DOI}}% - {\printtext{doi}}{}{} + {\printtext{doi}}% +{}{\wlog{WARNING: biblatex-oxref failed to patch doi}} % \end{macrocode} % % Unlike URLs, DOIs are preceded by a full stop. @@ -8061,7 +8088,8 @@ will trigger the use of parentheses. % \begin{macrocode} \xpatchbibmacro{doi+eprint+url}% {\printfield{doi}}% - {\setunit{\addperiod\space}\printfield{doi}}{}{} + {\setunit{\addperiod\space}\printfield{doi}}% +{}{\wlog{WARNING: biblatex-oxref failed to patch doi+eprint+url}} % \end{macrocode} % @@ -9565,11 +9593,12 @@ reference,mvreference,inreference]{volume}{% % \begin{macrocode} \renewbibmacro*{institution+location+date}{% \ifboolexpr{ - test {\iffieldundef{type}} - and - test {\iffieldundef{series}} - and - test {\iffieldundef{number}} + ( test {\iffieldundef{number}} + or + not test {\iffieldundef{type}} + or + not test {\iffieldundef{series}} + ) and test {\iflistundef{institution}} and @@ -9626,7 +9655,7 @@ reference,mvreference,inreference]{volume}{% }{% \togglefalse{blx@ox@altthesis}% \ifstrequal{#1}{out}{}{% - \PackageError{oxref} + \PackageError{biblatex-oxref} {Invalid option 'bookseries=#1'} {Valid values are 'in', 'out', and 'plain'.}}}}} \newbibmacro*{type+institution+location+date}{% @@ -9784,7 +9813,7 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{institution+location+date}% }{% \usebibmacro{type+institution+location+date}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref failed to patch thesis}} % \end{macrocode} % % We give booklet entries descriptor support. @@ -10321,7 +10350,7 @@ reference,mvreference,inreference]{volume}{% % performances and exhibitions. % % \begin{macrocode} -\renewbibmacro*{event+venue+location+date}{% +\newbibmacro*{event+venue+location+date}{% \printfield{eventtitle}% \newunit \printfield{eventtitleaddon}% @@ -10478,7 +10507,7 @@ reference,mvreference,inreference]{volume}{% % \subsection{Legal references} % % Legal references are a law unto themselves, and thus require extensive -% fiddly coding. This entire section is adapted from \textsf{oscola} by +% fiddly coding. This entire section is adapted from \pkg{oscola} by % Paul Stanley. % % \subsubsection{Entry options} @@ -10774,7 +10803,7 @@ reference,mvreference,inreference]{volume}{% \setunit{\addspace}% \printfield{pages}}} \newbibmacro{pcitenote}{% - \iffieldundef{userc}{}{% parreporter + \iffieldundef{parreporter}{}{% \setunit{\addcomma\space}% \iffieldundef{postnote}{}{% \printfield{postnote}% @@ -10855,22 +10884,32 @@ reference,mvreference,inreference]{volume}{% % Here is the format for EU cases. % % \begin{macrocode} +\newtoggle{bbx@commissiondecision} \newbibmacro*{eujuriscitation}{% - \iflistcontains{institution}{\commission}{}{% + \ifboolexpr{ + test {\iflistcontains{institution}{\commission}} + or + test {\iflistcontains{institution}{\Commission}} + }{% + \toggletrue{bbx@commissiondecision}% + }{% + \togglefalse{bbx@commissiondecision}}% + \iftoggle{bbx@commissiondecision}{}{% \usebibmacro{eucasenumber}}% \usebibmacro{title}% \setunit{\addspace}% - \iflistcontains{institution}{\commission}{% + \iftoggle{bbx@commissiondecision}{% \usebibmacro{eucommissiondecision}}{}% \setunit{\addspace}% \usebibmacro{eu:reportinfo}% - \iflistcontains{institution}{\commission}{% + \iftoggle{bbx@commissiondecision}{% \setunit{\addcomma\space}% }{% \setunit{\addspace}}% + \usebibmacro{altreportdetails}% \usebibmacro{court-note}% } -\newbibmacro{eucasenumber}{% +\newbibmacro{eucasetype}{% \iffieldundef{type}{% \ifboolexpr{ test {\IfSubStr{\thefield{number}}{,}} @@ -10884,19 +10923,33 @@ reference,mvreference,inreference]{volume}{% \bibstring{eucase}}% }{% \printfield{type}}% +} +\newbibmacro{eucasenumber}{% + \usebibmacro{eucasetype}% \setunit{\addnbspace}% \printfield{number}% \setunit{\addspace}} \newbibmacro{eucommissiondecision}{% - \iffieldundef{userb}{}{% - \printfield[parens]{userb}}% - \setunit{\addspace}% - \iffieldundef{number}{}{% - \iffieldundef{type}{% - \setunit{\addspace\bibstring{commissiondecision}\addspace}% - }{% - \setunit{\addspace\printfield{type}\addspace}}% - \printfield{number}}} + \iffieldundef{userb}{% + \iffieldundef{number}{}{% + \printtext[parens]{% + \usebibmacro{eucasetype}% + \setunit{\addnbspace}% + \printfield{number}}}% + }{% + \printtext[parens]{% + \usebibmacro{eucasetype}% + \setunit{\addnbspace}% + \printfield{userb}}% + \setunit{\addspace}% + \iffieldundef{number}{}{% + \iffieldundef{type}{% + \setunit{\addspace\bibstring{commissiondecision}\addspace}% + }{% + \setunit{\addspace\printfield{type}\addspace}}% + \printfield{number}}% + }% +} \newbibmacro*{eu:reportinfo}{% \iftoggle{bbx@eclionly}{% \iffieldundef{verba}{% @@ -11175,7 +11228,7 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{court-note}} \newbibmacro{altreportdetails}{% \restorefield{prenote}{\postnotesecond}% - \iffieldundef{userc}{}{% parreporter + \iffieldundef{parreporter}{}{% \usebibmacro{journaldate}[par]% \setunit{\addspace}\newblock \usebibmacro{altreportvolume}% @@ -11189,26 +11242,17 @@ reference,mvreference,inreference]{volume}{% \setunit{\addcomma\space}% \printfield[postnote]{prenote}}}} \newbibmacro*{altreportvolume}{% - \iffieldundef{userb}{% parvolume - \printfield{volume}% - }{% - \printfield{userb}}} + \iffieldundef{parvolume}{}{% + \printfield{parvolume}}} \newbibmacro*{altjournaltitle}{% - \iffieldundef{userc}{% parreporter - \printfield{journaltitle}% - \setunit{\addspace}% - }{ - \printfield{userc}}} + \iffieldundef{parreporter}{}{ + \printfield{parreporter}}} \newbibmacro*{altseries}{% - \iffieldundef{userd}{% parseries - \printfield{series}% - }{% - \printfield{userd}}} + \iffieldundef{parseries}{}{% + \printfield{parseries}}} \newbibmacro*{altjurisdictionpages}{% - \iffieldundef{usere}{% parpages - \usebibmacro{jurisdictionpages}% - }{% - \printfield{usere}}}% + \iffieldundef{parpages}{}{% + \printfield{parpages}}}% % \end{macrocode} % @@ -11713,14 +11757,14 @@ reference,mvreference,inreference]{volume}{% }{% \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} -}{}{} +}{}{\wlog{WARNING: biblatex-oxref failed to patch booklet}} \xpatchbibdriver{misc}{% \newunit\newblock \iftoggle{bbx:related} }{% \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} -}{}{} +}{}{\wlog{WARNING: biblatex-oxref failed to patch misc}} % \end{macrocode} % % We provide an option for setting the relatedtype punctuation. @@ -11776,7 +11820,7 @@ reference,mvreference,inreference]{volume}{% \setunit{\addspace}}{}% \iffieldequalstr{relatedtype}{multivolume}{% \setunit{\addcomma\space}}{}% - }}{}{} +}}{}{\wlog{WARNING: biblatex-oxref failed to append to begrelated}} % \end{macrocode} % @@ -12234,14 +12278,6 @@ reference,mvreference,inreference]{volume}{% \pertype{jurisdiction} \step[fieldsource=reporter, fieldtarget=journaltitle] - \step[fieldsource=parvolume, - fieldtarget=userb] - \step[fieldsource=parreporter, - fieldtarget=userc] - \step[fieldsource=parseries, - fieldtarget=userd] - \step[fieldsource=parpages, - fieldtarget=usere] \step[fieldsource=court, fieldtarget=institution] \step[fieldsource=additionalreports, @@ -12263,7 +12299,7 @@ reference,mvreference,inreference]{volume}{% } % \end{macrocode} % -% This is how \textsf{oscola} removes dots from entries. +% This is how \pkg{oscola} removes dots from entries. % % \begin{macrocode} \map[overwrite=true]{ @@ -12294,16 +12330,16 @@ reference,mvreference,inreference]{volume}{% \step [fieldsource=shorttitle, match=\regexp{(\D)\.}, replace=\regexp{$1}] - \step[fieldsource=userc, + \step[fieldsource=parreporter, match=\regexp{(\d)\.(\d)}, replace=\regexp{$1.$2}] - \step[fieldsource=userc, + \step[fieldsource=parreporter, match=\regexp{(\D)\.(\d)}, replace=\regexp{$1 $2}] - \step[fieldsource=userc, + \step[fieldsource=parreporter, match=\regexp{\.(\D)}, replace=\regexp{$1}] - \step [fieldsource=userc, + \step [fieldsource=parreporter, match=\regexp{(\D)\.}, replace=\regexp{$1}] \step[fieldsource=journaltitle, @@ -12379,8 +12415,20 @@ reference,mvreference,inreference]{volume}{% match=\regexp{(\D)\.}, replace=\regexp{$1}] } +% \end{macrocode} +% +% If |casenumber| is given, it is converted to |number| or, if the |number| is +% already set, |userb|. +% +% \begin{macrocode} + \map[overwrite=false]{ + \step[fieldsource=casenumber, final] + \step[notfield=number, fieldsource=casenumber, fieldtarget=number] + \step[fieldsource=casenumber, fieldtarget=userb] + } }% } + % \end{macrocode} % % \subsection{Sorting schemes} @@ -12550,7 +12598,7 @@ reference,mvreference,inreference]{volume}{% }{% \iftoggle{blx@ox@scnames}{\bibcplstring[\textsc]{anon}}{\bibcplstring{anon}}% }% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxnotes) failed to patch author}} % \end{macrocode} % % \subsection{Page ranges in citations} @@ -12640,7 +12688,7 @@ reference,mvreference,inreference]{volume}{% }{% \iftoggle{blx@ox@scnames}{\bibcplstring[\textsc]{anon}}{\bibcplstring{anon}}% }% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxnum) failed to patch author}} % \end{macrocode} % % \subsection{Label numbers} @@ -13088,25 +13136,25 @@ reference,mvreference,inreference]{volume}{% % % \begin{macrocode} \xpatchcmd{\mkdaterangefull}{% - \iffieldundef{#2year} {}% + \iffieldundef{#2year} {\blx@nounit}% }{% \iffieldundef{#2year} {\mknoyeardaterangefull{#1}{#2}}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangefull}} \xpatchcmd{\mkdaterangetrunc}{% - \iffieldundef{#2year} {}% + \iffieldundef{#2year} {\blx@nounit}% }{% \iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangetrunc}} \xpatchcmd{\mkdaterangefullextra}{% - \iffieldundef{#2year} {}% + \iffieldundef{#2year} {\blx@nounit}% }{% \iffieldundef{#2year} {\mknoyeardaterangefull{#1}{#2}}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangefullextra}} \xpatchcmd{\mkdaterangetruncextra}{% - \iffieldundef{#2year} {}% + \iffieldundef{#2year} {\blx@nounit}% }{% \iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangetruncextra}} % \end{macrocode} % @@ -13126,7 +13174,7 @@ reference,mvreference,inreference]{volume}{% \xpretonameformat{family-given}{% \iffieldannotation{inferred}{\ifnumequal{\value{listcount}}{1}{\bibopenbracket}{}}{}% \ifitemannotation{inferred}{\bibopenbracket}{}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to prepend to family-given}} \xpatchnameformat{family-given}{% \usebibmacro{name:andothers}% }{% @@ -13146,7 +13194,7 @@ reference,mvreference,inreference]{volume}{% test {\ifnumgreater{\value{listtotal}}{\value{maxnames}}} ) }{\bibclosebracket}{}% }{}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch family-given}} \DeclareNameAlias{shortauthor}{family-given} \DeclareNameAlias{shorteditor}{family-given} % \end{macrocode} @@ -13205,9 +13253,11 @@ reference,mvreference,inreference]{volume}{% % % \begin{macrocode} \xapptobibmacro{begrelated}{% - \booltrue{bbx@inset}}{}{} + \booltrue{bbx@inset}}% +{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to append to begrelated}} \xapptobibmacro{endrelated}{% - \usebibmacro*{bbx:savehash}}{}{} + \usebibmacro*{bbx:savehash}}% +{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to append to endrelated}} % \end{macrocode} % % We patch the |author| macro so that the date label information appears @@ -13220,7 +13270,7 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{date+extradate}% \setunit*{\addspace}% \iffieldundef{authortype}% -}{}{}% +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch author (authortype)}}% \xpatchbibmacro{author}{% \global\undef\bbx@lasthash }{% @@ -13228,7 +13278,7 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{labeltitle}% \setunit*{\addspace}% \usebibmacro{date+extradate}% -}{}{}% +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch author (lasthash)}}% % \end{macrocode} % % We patch it further so that, where an author name has a corresponding @@ -13241,7 +13291,7 @@ reference,mvreference,inreference]{volume}{% \printnames[by#1]% }{% \printnames[#1]% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch namepairs}} \xpatchbibmacro{author+altauthor}{% \printnames{author}% }{% @@ -13254,7 +13304,7 @@ reference,mvreference,inreference]{volume}{% }{% \printnames{author}% }% -}{}{}% +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch author+altauthor}}% % \end{macrocode} % % We apply the same patches to |bbx:editor|, but also move the editor @@ -13267,7 +13317,7 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{date+extradate}% \setunit*{\addspace}% \usebibmacro{#1}% -}{}{}% +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch bbx:editor}}% \xpatchbibmacro{bbx:editor}{% \global\undef\bbx@lasthash }{% @@ -13275,12 +13325,12 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{labeltitle}% \setunit*{\addspace}% \usebibmacro{date+extradate}% -}{}{}% +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch bbx:editor (lasthash)}}% \xpatchbibmacro{editor+alteditor}{% \printnames[byeditor]% }{% \printnames[editor]% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch editor+alteditor}} \xpatchbibmacro{editor+alteditor}{% \printnames{editor}% }{% @@ -13293,7 +13343,7 @@ reference,mvreference,inreference]{volume}{% }{% \printnames{editor}% }% -}{}{}% +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch editor+alteditor (shorteditor)}}% % \end{macrocode} % % We apply the same patches to |bbx:translator| as we do for @@ -13307,14 +13357,14 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{labeltitle}% \setunit*{\addspace}% \usebibmacro{date+extradate}% -}{}{}% +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch bbx:translator (lasthash)}}% \xpatchbibmacro{bbx:translator}{% \usebibmacro{#1}% }{% \usebibmacro{date+extradate}% \setunit*{\addspace}% \usebibmacro{#1}% -}{}{}% +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch bbx:translator}}% % \end{macrocode} % % The |labeltitle| macro differs from the one from |authoryear| in that @@ -13362,7 +13412,7 @@ reference,mvreference,inreference]{volume}{% \clearfield{maintitle}% \clearfield{volume}% }{}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to prepend to maintitle+title}} \DeclareFieldFormat[mvbook,mvcollection,mvreference,proceedings,mvproceedings]{maintitle+volume}{#1} % \end{macrocode} % @@ -13379,7 +13429,7 @@ reference,mvreference,inreference]{volume}{% and test {\iffieldundef{month}} }% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch online}} % \end{macrocode} % % We ensure the label title in citations matches the formatting used for @@ -13582,22 +13632,22 @@ reference,mvreference,inreference]{volume}{% \printdateextra }{% \printdate -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxalph) failed to patch bbx@opt@mergedate@maximum (print)}} \xpatchcmd{\bbx@opt@mergedate@maximum}{% - \csuse{print\thefield{labeldatesource}dateextra} + \csuse{print\thefield{labeldatesource}dateextra}% }{% - \csuse{print\thefield{labeldatesource}date} -}{}{} + \csuse{print\thefield{labeldatesource}date}% +}{}{\wlog{WARNING: biblatex-oxref (oxalph) failed to patch bbx@opt@mergedate@maximum (label)}} \xpatchcmd{\bbx@opt@mergedate@compact}{% - \csuse{print\thefield{labeldatesource}dateextra} + \csuse{print\thefield{labeldatesource}dateextra}% }{% - \csuse{print\thefield{labeldatesource}date} -}{}{} + \csuse{print\thefield{labeldatesource}date}% +}{}{\wlog{WARNING: biblatex-oxref (oxalph) failed to patch bbx@opt@mergedate@compact}} \xpatchbibmacro{labeldate}{% \printlabeldateextra }{% \printlabeldate -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxalph) failed to patch labeldate}} \ExecuteBibliographyOptions{mergedate} % \end{macrocode} @@ -13757,7 +13807,7 @@ reference,mvreference,inreference]{volume}{% }{% \printnames{labelname}% }% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch cite}} % \end{macrocode} % % The name and year are usually separated by a space, but if the date is @@ -13875,7 +13925,7 @@ reference,mvreference,inreference]{volume}{% }{% \printnames{labelname}% }% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} % \end{macrocode} % % \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -13952,7 +14002,11 @@ reference,mvreference,inreference]{volume}{% % % \begin{macrocode} \DeclareDatamodelFields[type=field,datatype=date]{pardate} -\DeclareDatamodelEntryfields[jurisdiction]{pardate} +\DeclareDatamodelFields[type=field,datatype=literal]{parreporter,parseries} +\DeclareDatamodelFields[type=field,datatype=integer]{parvolume} +\DeclareDatamodelFields[type=field,datatype=range]{parpages} +\DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,% + parvolume,parpages} % \end{macrocode} % % \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -14362,6 +14416,12 @@ reference,mvreference,inreference]{volume}{% % \begin{macrocode} \InheritBibliographyExtras{british} \DeclareBibliographyExtras{% +% \end{macrocode} +% +% The only difference from the standard British date format is that we print it +% \enquote{clean}, with a cardinal instead of an ordinal day. +% +% \begin{macrocode} \protected\def\mkbibdatelong#1#2#3{% \iffieldundef{#3} {} @@ -14371,7 +14431,15 @@ reference,mvreference,inreference]{volume}{% {} {\mkbibmonth{\thefield{#2}}% \iffieldundef{#1}{}{\space}}% - \stripzeros{\thefield{#1}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% +% \end{macrocode} +% +% As you'd expect from an Oxford style, we use the Oxford comma, and use a +% period as the time separator. +% +% \begin{macrocode} \def\finalandcomma{\addcomma}% \def\bibtimesep{\addperiod}% } @@ -14381,7 +14449,7 @@ reference,mvreference,inreference]{volume}{% % % \begin{macrocode} \DeclareBibliographyStrings{% - inherit = {english-oxref}, + inherit = {english}, am = {{a\adddot m\adddot}{a\adddot m\adddot}}, pm = {{p\adddot m\adddot}{p\adddot m\adddot}}, } @@ -14397,9 +14465,9 @@ reference,mvreference,inreference]{volume}{% % \setcounter{FancyVerbLine}{19} % % \begin{macrocode} -\InheritBibliographyExtras{english-oxref} +\InheritBibliographyExtras{english} \DeclareBibliographyExtras{\uspunctuation} -\InheritBibliographyStrings{english-oxref} +\InheritBibliographyStrings{english} % \end{macrocode} % % \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/source/latex/biblatex-oxref/oxref.ins b/Master/texmf-dist/source/latex/biblatex-oxref/oxref.ins index c48826f2574..ed3bd754a7d 100644 --- a/Master/texmf-dist/source/latex/biblatex-oxref/oxref.ins +++ b/Master/texmf-dist/source/latex/biblatex-oxref/oxref.ins @@ -37,7 +37,7 @@ See: http://www.latex-project.org/lppl.txt \endpreamble \postamble -Copyright (C) 2016–2018 Alex Ball +Copyright (C) 2016–2019 Alex Ball \endpostamble \usedir{tex/latex/\jobname} @@ -65,6 +65,6 @@ Copyright (C) 2016–2018 Alex Ball } \endbatchfile %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxref.ins'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx b/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx index 2d5b7073fd7..a565ffc592a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx @@ -13,14 +13,14 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{american-oxref.lbx} [\Version\space American English conventions required by the biblatex-oxref styles] -\InheritBibliographyExtras{english-oxref} +\InheritBibliographyExtras{english} \DeclareBibliographyExtras{\uspunctuation} -\InheritBibliographyStrings{english-oxref} +\InheritBibliographyStrings{english} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `american-oxref.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx b/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx index 3bbb4ff5003..e97b6dfca54 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{british-oxref.lbx} [\Version\space British English conventions required by the biblatex-oxref styles] @@ -28,16 +28,18 @@ {} {\mkbibmonth{\thefield{#2}}% \iffieldundef{#1}{}{\space}}% - \stripzeros{\thefield{#1}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% \def\finalandcomma{\addcomma}% \def\bibtimesep{\addperiod}% } \DeclareBibliographyStrings{% - inherit = {english-oxref}, + inherit = {english}, am = {{a\adddot m\adddot}{a\adddot m\adddot}}, pm = {{p\adddot m\adddot}{p\adddot m\adddot}}, } %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `british-oxref.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx b/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx index b7d66667c75..b727e58e9c9 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{english-oxref.lbx} [\Version\space Generic English conventions required by the biblatex-oxref styles] @@ -269,6 +269,6 @@ langswedish = {{Swedish}{Swed\adddot}}, } %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `english-oxref.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx index 7c5a7f8abce..de9438edf65 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxalph.bbx} [\Version\space Alphabetic bibliography style inspired by the Oxford Guide to Style] @@ -22,22 +22,22 @@ \printdateextra }{% \printdate -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxalph) failed to patch bbx@opt@mergedate@maximum (print)}} \xpatchcmd{\bbx@opt@mergedate@maximum}{% - \csuse{print\thefield{labeldatesource}dateextra} + \csuse{print\thefield{labeldatesource}dateextra}% }{% - \csuse{print\thefield{labeldatesource}date} -}{}{} + \csuse{print\thefield{labeldatesource}date}% +}{}{\wlog{WARNING: biblatex-oxref (oxalph) failed to patch bbx@opt@mergedate@maximum (label)}} \xpatchcmd{\bbx@opt@mergedate@compact}{% - \csuse{print\thefield{labeldatesource}dateextra} + \csuse{print\thefield{labeldatesource}dateextra}% }{% - \csuse{print\thefield{labeldatesource}date} -}{}{} + \csuse{print\thefield{labeldatesource}date}% +}{}{\wlog{WARNING: biblatex-oxref (oxalph) failed to patch bbx@opt@mergedate@compact}} \xpatchbibmacro{labeldate}{% \printlabeldateextra }{% \printlabeldate -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxalph) failed to patch labeldate}} \ExecuteBibliographyOptions{mergedate} \ExecuteBibliographyOptions{labelalpha,sorting=anyt} @@ -98,6 +98,6 @@ } } %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxalph.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx index 72864e74f02..cb1fe0a35aa 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxalph.cbx} [\Version\space Alphabetic citation style inspired by the Oxford Guide to Style] @@ -35,8 +35,8 @@ }{% \printnames{labelname}% }% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxalph.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx index f62f22d2af1..755ea260ed1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxalph.dbx} [\Version\space Data model for the Oxref family of styles] @@ -36,8 +36,12 @@ shortcollection,columns,languages,collection,usualtitle,shelfmark,% sortshelfmark,support,columns,origin,scribe,owner} \DeclareDatamodelFields[type=field,datatype=date]{pardate} -\DeclareDatamodelEntryfields[jurisdiction]{pardate} +\DeclareDatamodelFields[type=field,datatype=literal]{parreporter,parseries} +\DeclareDatamodelFields[type=field,datatype=integer]{parvolume} +\DeclareDatamodelFields[type=field,datatype=range]{parpages} +\DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,% + parvolume,parpages} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxalph.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx index 9b4b607cf20..846bb78a317 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] @@ -30,7 +30,7 @@ }{% \iftoggle{blx@ox@scnames}{\bibcplstring[\textsc]{anon}}{\bibcplstring{anon}}% }% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxnotes) failed to patch author}} \renewbibmacro*{postnote}{% \iffieldundef{postnote}{}{% \iffieldundef{pages}{% @@ -58,6 +58,6 @@ }% } %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxnotes.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx index e525ac8db3f..5e4e1c1a644 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] @@ -32,8 +32,8 @@ }{% \printnames{labelname}% }% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxnotes.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx index a1b9e8b83b2..cb56d6af769 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes.dbx} [\Version\space Data model for the Oxref family of styles] @@ -36,8 +36,12 @@ shortcollection,columns,languages,collection,usualtitle,shelfmark,% sortshelfmark,support,columns,origin,scribe,owner} \DeclareDatamodelFields[type=field,datatype=date]{pardate} -\DeclareDatamodelEntryfields[jurisdiction]{pardate} +\DeclareDatamodelFields[type=field,datatype=literal]{parreporter,parseries} +\DeclareDatamodelFields[type=field,datatype=integer]{parvolume} +\DeclareDatamodelFields[type=field,datatype=range]{parpages} +\DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,% + parvolume,parpages} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxnotes.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx index 66330d82aab..cf60a17bcdd 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnum.bbx} [\Version\space Numeric bibliography style inspired by the Oxford Guide to Style] @@ -30,7 +30,7 @@ }{% \iftoggle{blx@ox@scnames}{\bibcplstring[\textsc]{anon}}{\bibcplstring{anon}}% }% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxnum) failed to patch author}} \ExecuteBibliographyOptions{labelnumber} \providebool{bbx:subentry} @@ -81,6 +81,6 @@ \usebibmacro{setpageref}% \finentry} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxnum.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx index 02dafba84ea..ea044eaa82f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnum.cbx} [\Version\space Numeric citation style inspired by the Oxford Guide to Style] @@ -35,8 +35,8 @@ }{% \printnames{labelname}% }% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxnum.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx index c6aa1fb296c..595605f83fd 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnum.dbx} [\Version\space Data model for the Oxref family of styles] @@ -36,8 +36,12 @@ shortcollection,columns,languages,collection,usualtitle,shelfmark,% sortshelfmark,support,columns,origin,scribe,owner} \DeclareDatamodelFields[type=field,datatype=date]{pardate} -\DeclareDatamodelEntryfields[jurisdiction]{pardate} +\DeclareDatamodelFields[type=field,datatype=literal]{parreporter,parseries} +\DeclareDatamodelFields[type=field,datatype=integer]{parvolume} +\DeclareDatamodelFields[type=field,datatype=range]{parpages} +\DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,% + parvolume,parpages} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxnum.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx index acfede01a6d..9e1bb4ab6e0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxref.bbx} [\Version\space Base settings for bibliography styles inspired by the Oxford Guide to Style] @@ -235,10 +235,12 @@ \usebibmacro{name:andothers}} \xpatchbibmacro{name:given-family}% {\bibnamedelimd\mkbibnamesuffix{#4}}% - {\ifnumeral{#4}{}{\addcomma}\bibnamedelimd\mkbibnamesuffix{#4}}{}{} + {\ifnumeral{#4}{}{\addcomma}\bibnamedelimd\mkbibnamesuffix{#4}}% +{}{\wlog{WARNING: biblatex-oxref failed to patch name:given-family}} \xpatchbibmacro{name:family-given}% {\bibnamedelimd\mkbibnamesuffix{#4}}% - {\ifnumeral{#4}{}{\addcomma}\bibnamedelimd\mkbibnamesuffix{#4}}{}{} + {\ifnumeral{#4}{}{\addcomma}\bibnamedelimd\mkbibnamesuffix{#4}}% +{}{\wlog{WARNING: biblatex-oxref failed to patch name:family-given}} \DeclareFieldFormat{nameaddon}{\mkbibbrackets{#1}} \DeclareFieldFormat{namevariant}{\mkbibparens{\bibstring{equals}\space #1}} \newcounter{namepairs} @@ -500,7 +502,8 @@ {\global\undef\bbx@lasthash}} \xpatchbibmacro{translatorstrg}% {\bibstring}% - {\bibstring[\mkbibparens]}{}{}% + {\bibstring[\mkbibparens]}% +{}{\wlog{WARNING: biblatex-oxref failed to patch translatorstrg}}% \xpatchbibmacro{translator+othersstrg}% {\bibstring}% {\bibstring[\mkbibparens]}{}{}% @@ -574,14 +577,17 @@ \def\num@two{#2}% \StrLen{\num@one}[\num@one@len]% \StrLen{\num@two}[\num@two@len]% - \IfEq{\num@one@len}{\num@two@len}% - {\StrCompare{\num@one}{\num@two}[\Result]% + \ifboolexpr{ + test {\ifnumequal{\num@one@len}{\num@two@len}} + and + test {\ifnumless{\num@one}{\num@two}} + }{% + \StrCompare{\num@one}{\num@two}[\Result]% \ifnum\num@two@len>3% - \IfStrEq{\Result}{2}{\def\Result{1}}{}% + \IfStrEq{\Result}{2}{\def\Result{1}}{}% \fi - \StrGobbleLeft{0\num@two}{\Result}}% - {\num@two}% -} + \StrGobbleLeft{0\num@two}{\Result}% + }{\num@two}} \patchcmd{\mkdaterangefull}{% \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% }{% @@ -676,11 +682,10 @@ \def\currentfield{eventdate}% \iffieldannotation{inferred}{\mkbibbrackets{#1}}{#1}% \undef\currentfield} -\xpatchfieldformat{edition}{% - #1\isdot -}{% - \ifbibstring{#1}{\bibstring{#1}}{#1\isdot}% -}{}{} +\xpatchfieldformat{edition}% + {#1\isdot}% + {\ifbibstring{#1}{\bibstring{#1}}{#1\isdot}}% +{}{\wlog{WARNING: biblatex-oxref failed to patch edition}} \DeclareFieldFormat{pages}{% \iffieldundef{bookpagination}% {\mkcomprange{#1}}% @@ -774,13 +779,16 @@ \DeclareFieldFormat{urldate}{\bibstring{urlseen}\space#1} \xpatchbibmacro{url+urldate}% {\setunit*{\addspace}}% - {\setunit*{\addcomma\addspace}}{}{} + {\setunit*{\addcomma\addspace}}% +{}{\wlog{WARNING: biblatex-oxref failed to patch url+urldate}} \xpatchfieldformat{doi}% {\mkbibacro{DOI}}% - {\printtext{doi}}{}{} + {\printtext{doi}}% +{}{\wlog{WARNING: biblatex-oxref failed to patch doi}} \xpatchbibmacro{doi+eprint+url}% {\printfield{doi}}% - {\setunit{\addperiod\space}\printfield{doi}}{}{} + {\setunit{\addperiod\space}\printfield{doi}}% +{}{\wlog{WARNING: biblatex-oxref failed to patch doi+eprint+url}} \renewbibmacro*{addendum+pubstate}{% \ifboolexpr{ @@ -1931,11 +1939,12 @@ reference,mvreference,inreference]{volume}{% \printfield{number}}} \renewbibmacro*{institution+location+date}{% \ifboolexpr{ - test {\iffieldundef{type}} - and - test {\iffieldundef{series}} - and - test {\iffieldundef{number}} + ( test {\iffieldundef{number}} + or + not test {\iffieldundef{type}} + or + not test {\iffieldundef{series}} + ) and test {\iflistundef{institution}} and @@ -1984,7 +1993,7 @@ reference,mvreference,inreference]{volume}{% }{% \togglefalse{blx@ox@altthesis}% \ifstrequal{#1}{out}{}{% - \PackageError{oxref} + \PackageError{biblatex-oxref} {Invalid option 'bookseries=#1'} {Valid values are 'in', 'out', and 'plain'.}}}}} \newbibmacro*{type+institution+location+date}{% @@ -2112,7 +2121,7 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{institution+location+date}% }{% \usebibmacro{type+institution+location+date}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref failed to patch thesis}} \DeclareFieldFormat[booklet]{title}{% \def\currentfield{title}% \iffieldannotation{descriptor}{#1}{% @@ -2547,7 +2556,7 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{finentry}} \DeclareBibliographyAlias{image}{performance} \DeclareBibliographyAlias{artwork}{performance} -\renewbibmacro*{event+venue+location+date}{% +\newbibmacro*{event+venue+location+date}{% \printfield{eventtitle}% \newunit \printfield{eventtitleaddon}% @@ -2905,7 +2914,7 @@ reference,mvreference,inreference]{volume}{% \setunit{\addspace}% \printfield{pages}}} \newbibmacro{pcitenote}{% - \iffieldundef{userc}{}{% parreporter + \iffieldundef{parreporter}{}{% \setunit{\addcomma\space}% \iffieldundef{postnote}{}{% \printfield{postnote}% @@ -2974,22 +2983,32 @@ reference,mvreference,inreference]{volume}{% \docsvlist{eu,echr,int,ca,us}% \iftoggle{bbx@juriscitedone}{}{\usebibmacro{enjuriscitation}}% } +\newtoggle{bbx@commissiondecision} \newbibmacro*{eujuriscitation}{% - \iflistcontains{institution}{\commission}{}{% + \ifboolexpr{ + test {\iflistcontains{institution}{\commission}} + or + test {\iflistcontains{institution}{\Commission}} + }{% + \toggletrue{bbx@commissiondecision}% + }{% + \togglefalse{bbx@commissiondecision}}% + \iftoggle{bbx@commissiondecision}{}{% \usebibmacro{eucasenumber}}% \usebibmacro{title}% \setunit{\addspace}% - \iflistcontains{institution}{\commission}{% + \iftoggle{bbx@commissiondecision}{% \usebibmacro{eucommissiondecision}}{}% \setunit{\addspace}% \usebibmacro{eu:reportinfo}% - \iflistcontains{institution}{\commission}{% + \iftoggle{bbx@commissiondecision}{% \setunit{\addcomma\space}% }{% \setunit{\addspace}}% + \usebibmacro{altreportdetails}% \usebibmacro{court-note}% } -\newbibmacro{eucasenumber}{% +\newbibmacro{eucasetype}{% \iffieldundef{type}{% \ifboolexpr{ test {\IfSubStr{\thefield{number}}{,}} @@ -3003,19 +3022,33 @@ reference,mvreference,inreference]{volume}{% \bibstring{eucase}}% }{% \printfield{type}}% +} +\newbibmacro{eucasenumber}{% + \usebibmacro{eucasetype}% \setunit{\addnbspace}% \printfield{number}% \setunit{\addspace}} \newbibmacro{eucommissiondecision}{% - \iffieldundef{userb}{}{% - \printfield[parens]{userb}}% - \setunit{\addspace}% - \iffieldundef{number}{}{% - \iffieldundef{type}{% - \setunit{\addspace\bibstring{commissiondecision}\addspace}% - }{% - \setunit{\addspace\printfield{type}\addspace}}% - \printfield{number}}} + \iffieldundef{userb}{% + \iffieldundef{number}{}{% + \printtext[parens]{% + \usebibmacro{eucasetype}% + \setunit{\addnbspace}% + \printfield{number}}}% + }{% + \printtext[parens]{% + \usebibmacro{eucasetype}% + \setunit{\addnbspace}% + \printfield{userb}}% + \setunit{\addspace}% + \iffieldundef{number}{}{% + \iffieldundef{type}{% + \setunit{\addspace\bibstring{commissiondecision}\addspace}% + }{% + \setunit{\addspace\printfield{type}\addspace}}% + \printfield{number}}% + }% +} \newbibmacro*{eu:reportinfo}{% \iftoggle{bbx@eclionly}{% \iffieldundef{verba}{% @@ -3269,7 +3302,7 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{court-note}} \newbibmacro{altreportdetails}{% \restorefield{prenote}{\postnotesecond}% - \iffieldundef{userc}{}{% parreporter + \iffieldundef{parreporter}{}{% \usebibmacro{journaldate}[par]% \setunit{\addspace}\newblock \usebibmacro{altreportvolume}% @@ -3283,26 +3316,17 @@ reference,mvreference,inreference]{volume}{% \setunit{\addcomma\space}% \printfield[postnote]{prenote}}}} \newbibmacro*{altreportvolume}{% - \iffieldundef{userb}{% parvolume - \printfield{volume}% - }{% - \printfield{userb}}} + \iffieldundef{parvolume}{}{% + \printfield{parvolume}}} \newbibmacro*{altjournaltitle}{% - \iffieldundef{userc}{% parreporter - \printfield{journaltitle}% - \setunit{\addspace}% - }{ - \printfield{userc}}} + \iffieldundef{parreporter}{}{ + \printfield{parreporter}}} \newbibmacro*{altseries}{% - \iffieldundef{userd}{% parseries - \printfield{series}% - }{% - \printfield{userd}}} + \iffieldundef{parseries}{}{% + \printfield{parseries}}} \newbibmacro*{altjurisdictionpages}{% - \iffieldundef{usere}{% parpages - \usebibmacro{jurisdictionpages}% - }{% - \printfield{usere}}}% + \iffieldundef{parpages}{}{% + \printfield{parpages}}}% \newcommand*{\subtypecourtrules}{procedure-rule} \DeclareBibliographyDriver{legislation}{% @@ -3705,14 +3729,14 @@ reference,mvreference,inreference]{volume}{% }{% \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} -}{}{} +}{}{\wlog{WARNING: biblatex-oxref failed to patch booklet}} \xpatchbibdriver{misc}{% \newunit\newblock \iftoggle{bbx:related} }{% \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} -}{}{} +}{}{\wlog{WARNING: biblatex-oxref failed to patch misc}} \DeclareBibliographyOption{relationpunct}[semicolon]{% \ifcsdef{add#1}{% \ifstrequal{#1}{space}{% @@ -3763,7 +3787,7 @@ reference,mvreference,inreference]{volume}{% \setunit{\addspace}}{}% \iffieldequalstr{relatedtype}{multivolume}{% \setunit{\addcomma\space}}{}% - }}{}{} +}}{}{\wlog{WARNING: biblatex-oxref failed to append to begrelated}} \newbibmacro*{rellanguage}{% \def\do##1{% @@ -4071,14 +4095,6 @@ reference,mvreference,inreference]{volume}{% \pertype{jurisdiction} \step[fieldsource=reporter, fieldtarget=journaltitle] - \step[fieldsource=parvolume, - fieldtarget=userb] - \step[fieldsource=parreporter, - fieldtarget=userc] - \step[fieldsource=parseries, - fieldtarget=userd] - \step[fieldsource=parpages, - fieldtarget=usere] \step[fieldsource=court, fieldtarget=institution] \step[fieldsource=additionalreports, @@ -4126,16 +4142,16 @@ reference,mvreference,inreference]{volume}{% \step [fieldsource=shorttitle, match=\regexp{(\D)\.}, replace=\regexp{$1}] - \step[fieldsource=userc, + \step[fieldsource=parreporter, match=\regexp{(\d)\.(\d)}, replace=\regexp{$1.$2}] - \step[fieldsource=userc, + \step[fieldsource=parreporter, match=\regexp{(\D)\.(\d)}, replace=\regexp{$1 $2}] - \step[fieldsource=userc, + \step[fieldsource=parreporter, match=\regexp{\.(\D)}, replace=\regexp{$1}] - \step [fieldsource=userc, + \step [fieldsource=parreporter, match=\regexp{(\D)\.}, replace=\regexp{$1}] \step[fieldsource=journaltitle, @@ -4211,8 +4227,14 @@ reference,mvreference,inreference]{volume}{% match=\regexp{(\D)\.}, replace=\regexp{$1}] } + \map[overwrite=false]{ + \step[fieldsource=casenumber, final] + \step[notfield=number, fieldsource=casenumber, fieldtarget=number] + \step[fieldsource=casenumber, fieldtarget=userb] + } }% } + \DeclareSortingTemplate{nty}{ \sort{ \field{presort} @@ -4330,6 +4352,6 @@ reference,mvreference,inreference]{volume}{% [proceedings,report,artwork,audio,image,music,movie,performance,video,% manuscript,unpublished,review]{useeditor=false} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxref.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx index 63af99d76be..0993633927a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.bbx} [\Version\space Author-year bibliography style inspired by the Oxford Guide to Style] @@ -237,31 +237,31 @@ \csuse{mkbibseasondate#1}{}{#2endseason}}% \enddateuncertainprint}}}}} \xpatchcmd{\mkdaterangefull}{% - \iffieldundef{#2year} {}% + \iffieldundef{#2year} {\blx@nounit}% }{% \iffieldundef{#2year} {\mknoyeardaterangefull{#1}{#2}}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangefull}} \xpatchcmd{\mkdaterangetrunc}{% - \iffieldundef{#2year} {}% + \iffieldundef{#2year} {\blx@nounit}% }{% \iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangetrunc}} \xpatchcmd{\mkdaterangefullextra}{% - \iffieldundef{#2year} {}% + \iffieldundef{#2year} {\blx@nounit}% }{% \iffieldundef{#2year} {\mknoyeardaterangefull{#1}{#2}}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangefullextra}} \xpatchcmd{\mkdaterangetruncextra}{% - \iffieldundef{#2year} {}% + \iffieldundef{#2year} {\blx@nounit}% }{% \iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangetruncextra}} \DeclareFieldFormat{shorthandwidth}{#1} \xpretonameformat{family-given}{% \iffieldannotation{inferred}{\ifnumequal{\value{listcount}}{1}{\bibopenbracket}{}}{}% \ifitemannotation{inferred}{\bibopenbracket}{}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to prepend to family-given}} \xpatchnameformat{family-given}{% \usebibmacro{name:andothers}% }{% @@ -281,7 +281,7 @@ test {\ifnumgreater{\value{listtotal}}{\value{maxnames}}} ) }{\bibclosebracket}{}% }{}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch family-given}} \DeclareNameAlias{shortauthor}{family-given} \DeclareNameAlias{shorteditor}{family-given} \DeclareNameAlias{sortname}{family-given} @@ -311,16 +311,18 @@ {\item} \InitializeBibliographyStyle{\global\undef\bbx@lasthash} \xapptobibmacro{begrelated}{% - \booltrue{bbx@inset}}{}{} + \booltrue{bbx@inset}}% +{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to append to begrelated}} \xapptobibmacro{endrelated}{% - \usebibmacro*{bbx:savehash}}{}{} + \usebibmacro*{bbx:savehash}}% +{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to append to endrelated}} \xpatchbibmacro{author}{% \iffieldundef{authortype}% }{% \usebibmacro{date+extradate}% \setunit*{\addspace}% \iffieldundef{authortype}% -}{}{}% +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch author (authortype)}}% \xpatchbibmacro{author}{% \global\undef\bbx@lasthash }{% @@ -328,12 +330,12 @@ \usebibmacro{labeltitle}% \setunit*{\addspace}% \usebibmacro{date+extradate}% -}{}{}% +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch author (lasthash)}}% \xpatchbibmacro{namepairs}{% \printnames[by#1]% }{% \printnames[#1]% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch namepairs}} \xpatchbibmacro{author+altauthor}{% \printnames{author}% }{% @@ -346,14 +348,14 @@ }{% \printnames{author}% }% -}{}{}% +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch author+altauthor}}% \xpatchbibmacro{bbx:editor}{% \usebibmacro{#1}% }{% \usebibmacro{date+extradate}% \setunit*{\addspace}% \usebibmacro{#1}% -}{}{}% +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch bbx:editor}}% \xpatchbibmacro{bbx:editor}{% \global\undef\bbx@lasthash }{% @@ -361,12 +363,12 @@ \usebibmacro{labeltitle}% \setunit*{\addspace}% \usebibmacro{date+extradate}% -}{}{}% +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch bbx:editor (lasthash)}}% \xpatchbibmacro{editor+alteditor}{% \printnames[byeditor]% }{% \printnames[editor]% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch editor+alteditor}} \xpatchbibmacro{editor+alteditor}{% \printnames{editor}% }{% @@ -379,7 +381,7 @@ }{% \printnames{editor}% }% -}{}{}% +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch editor+alteditor (shorteditor)}}% \xpatchbibmacro{bbx:translator}{% \global\undef\bbx@lasthash }{% @@ -387,14 +389,14 @@ \usebibmacro{labeltitle}% \setunit*{\addspace}% \usebibmacro{date+extradate}% -}{}{}% +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch bbx:translator (lasthash)}}% \xpatchbibmacro{bbx:translator}{% \usebibmacro{#1}% }{% \usebibmacro{date+extradate}% \setunit*{\addspace}% \usebibmacro{#1}% -}{}{}% +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch bbx:translator}}% \newtoggle{blx@ox@clearedtitle} \newbibmacro*{labeltitle}{% \iffieldundef{label}{% @@ -429,7 +431,7 @@ \clearfield{maintitle}% \clearfield{volume}% }{}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to prepend to maintitle+title}} \DeclareFieldFormat[mvbook,mvcollection,mvreference,proceedings,mvproceedings]{maintitle+volume}{#1} \xpatchbibdriver{online}{% \iffieldundef{year}% @@ -439,7 +441,7 @@ and test {\iffieldundef{month}} }% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch online}} \DeclareFieldFormat[bookinbook]{citetitle}{% \ifboolexpr{ test {\iffieldequalstr{entrysubtype}{poem}} @@ -568,6 +570,6 @@ }} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxyear.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx index 047dbed9316..0c8d18faf3c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.cbx} [\Version\space Author-year citation style inspired by the Oxford Guide to Style] @@ -41,7 +41,7 @@ }{% \printnames{labelname}% }% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch cite}} \DeclareDelimFormat{nameyeardelim}{% \iflabeldateisanydate {\addspace}% @@ -67,8 +67,8 @@ }{% \printnames{labelname}% }% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxyear.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx index 3cc2c63eed0..506962c0ab7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.dbx} [\Version\space Data model for the Oxref family of styles] @@ -36,8 +36,12 @@ shortcollection,columns,languages,collection,usualtitle,shelfmark,% sortshelfmark,support,columns,origin,scribe,owner} \DeclareDatamodelFields[type=field,datatype=date]{pardate} -\DeclareDatamodelEntryfields[jurisdiction]{pardate} +\DeclareDatamodelFields[type=field,datatype=literal]{parreporter,parseries} +\DeclareDatamodelFields[type=field,datatype=integer]{parvolume} +\DeclareDatamodelFields[type=field,datatype=range]{parpages} +\DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,% + parvolume,parpages} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxyear.dbx'. |