summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/biblatex-oxref
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-02-19 22:19:07 +0000
committerKarl Berry <karl@freefriends.org>2019-02-19 22:19:07 +0000
commit4cbd171caf00fc7956bd4d7ca79bcecd0cc34526 (patch)
tree7514dc296c89c2700fc8322b4d8ee658225ba831 /Master/texmf-dist/source/latex/biblatex-oxref
parent549c5b5143e9ae63dbce060b6460b8e0995d7dc8 (diff)
biblatex-oxref (19feb19)
git-svn-id: svn://tug.org/texlive/trunk@50061 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/biblatex-oxref')
-rw-r--r--Master/texmf-dist/source/latex/biblatex-oxref/Makefile42
-rw-r--r--Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx275
-rw-r--r--Master/texmf-dist/source/latex/biblatex-oxref/oxref.ins24
3 files changed, 242 insertions, 99 deletions
diff --git a/Master/texmf-dist/source/latex/biblatex-oxref/Makefile b/Master/texmf-dist/source/latex/biblatex-oxref/Makefile
index f4f53aa573f..ee024a4bf68 100644
--- a/Master/texmf-dist/source/latex/biblatex-oxref/Makefile
+++ b/Master/texmf-dist/source/latex/biblatex-oxref/Makefile
@@ -1,9 +1,9 @@
NAME = oxref
PFX = biblatex-
STY1 = oxnotes
-STY2 = oxyear
-STY3 = oxnum
-STY4 = oxalph
+STYS = oxnotes oxyear oxnum oxalph
+VARS = ibid note inote trad1 trad2 trad3
+AUX = 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
SHELL = bash
PWD = $(shell pwd)
TEMP := $(shell mktemp -d -t tmp.XXXXXXXXXX)
@@ -14,38 +14,32 @@ 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 clean
+all: $(NAME).pdf $(STYS:%=%-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
+source $(NAME).bbx american-$(NAME).lbx british-$(NAME).lbx english-$(NAME).lbx $(STYS:%=%-doc.tex) $(STYS:%=%.bbx) $(STYS:%=%.cbx) $(STYS:%=%.dbx) $(VARS:%=$(STY1)-%.bbx) $(VARS:%=$(STY1)-%.cbx) $(VARS:%=$(STY1)-%.dbx): $(NAME).dtx
luatex -interaction=nonstopmode $(NAME).dtx >/dev/null
-$(NAME).pdf: $(NAME).dtx $(NAME).bbx $(STY1).bbx $(STY1).cbx american-$(NAME).lbx british-$(NAME).lbx english-$(NAME).lbx
+$(NAME).pdf: $(NAME).dtx $(NAME).bbx $(STY1).bbx $(STY1).cbx british-$(NAME).lbx english-$(NAME).lbx
latexmk -silent -lualatex -shell-escape -interaction=nonstopmode $(NAME).dtx >/dev/null
-$(STY1)-doc.pdf: $(STY1)-doc.tex $(NAME).bbx $(STY1).bbx $(STY1).cbx american-$(NAME).lbx british-$(NAME).lbx english-$(NAME).lbx
- latexmk -silent -lualatex -shell-escape -interaction=nonstopmode $(STY1)-doc.tex >/dev/null
-$(STY2)-doc.pdf: $(STY2)-doc.tex $(NAME).bbx $(STY2).bbx $(STY2).cbx american-$(NAME).lbx british-$(NAME).lbx english-$(NAME).lbx
- latexmk -silent -lualatex -shell-escape -interaction=nonstopmode $(STY2)-doc.tex >/dev/null
-$(STY3)-doc.pdf: $(STY3)-doc.tex $(NAME).bbx $(STY3).bbx $(STY3).cbx american-$(NAME).lbx british-$(NAME).lbx english-$(NAME).lbx
- latexmk -silent -lualatex -shell-escape -interaction=nonstopmode $(STY3)-doc.tex >/dev/null
-$(STY4)-doc.pdf: $(STY4)-doc.tex $(NAME).bbx $(STY4).bbx $(STY4).cbx american-$(NAME).lbx british-$(NAME).lbx english-$(NAME).lbx
- latexmk -silent -lualatex -shell-escape -interaction=nonstopmode $(STY4)-doc.tex >/dev/null
+$(STYS:%=%-doc.pdf): %-doc.pdf : %-doc.tex $(NAME).bbx %.bbx %.cbx british-$(NAME).lbx english-$(NAME).lbx
+ latexmk -silent -lualatex -shell-escape -interaction=nonstopmode $< >/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
+ for log in *.log; do [ -e "$$log" ] || continue; grep "WARNING: biblatex-oxref" $$log; test $$? -eq 1; done
+ rm -f $(NAME).{$(AUX)} $(STYS:%=%-doc.{$(AUX)})
+ rm -f $(STYS:%=%.doc) {american,british,english}-$(NAME).doc
rm -rf _minted-*
rm -f $(NAME).markdown.in
rm -rf _markdown_*
distclean: clean
- rm -f $(NAME).{bbx,bib,ins,pdf} {$(STY1),$(STY2),$(STY3),$(STY4)}.{b,c,d}bx {american,british,english}-$(NAME).lbx {$(STY1),$(STY2),$(STY3),$(STY4)}-doc.{tex,pdf}
+ rm -f $(NAME).{bbx,bib,ins,pdf} $(STYS:%=%.{b,c,d}bx) $(VARS:%=$(STY1)-%.{b,c,d}bx) {american,british,english}-$(NAME).lbx $(STYS:%=%-doc.{tex,pdf})
inst: all
mkdir -p $(UTREE)/{tex,source,doc}/latex/$(PFX)$(NAME)
cp $(NAME).{dtx,ins} $(UTREE)/source/latex/$(PFX)$(NAME)
- cp $(NAME).bbx {$(STY1),$(STY2),$(STY3),$(STY4)}.{b,c,d}bx {american,british,english}-$(NAME).lbx $(UTREE)/tex/latex/$(PFX)$(NAME)
- cp $(NAME).{bib,pdf} {$(STY1),$(STY2),$(STY3),$(STY4)}-doc.{tex,pdf} $(UTREE)/doc/latex/$(PFX)$(NAME)
+ cp $(NAME).bbx $(STYS:%=%.{b,c,d}bx) $(VARS:%=$(STY1)-%.{b,c,d}bx) {american,british,english}-$(NAME).lbx $(UTREE)/tex/latex/$(PFX)$(NAME)
+ cp $(NAME).{bib,pdf} $(STYS:%=%-doc.{tex,pdf}) $(UTREE)/doc/latex/$(PFX)$(NAME)
mktexlsr
uninst:
rm -r $(UTREE)/{tex,source,doc}/latex/$(PFX)$(NAME)
@@ -54,8 +48,8 @@ uninst:
install: all
sudo mkdir -p $(LOCAL)/{tex,source,doc}/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)
+ sudo cp $(NAME).bbx $(STYS:%=%.{b,c,d}bx) $(VARS:%=$(STY1)-%.{b,c,d}bx) {american,british,english}-$(NAME).lbx $(LOCAL)/tex/latex/$(PFX)$(NAME)
+ sudo cp $(NAME).{bib,pdf} $(STYS:%=%-doc.{tex,pdf}) $(LOCAL)/doc/latex/$(PFX)$(NAME)
sudo mktexlsr
uninstall:
sudo rm -r $(LOCAL)/{tex,source,doc}/latex/$(PFX)$(NAME)
@@ -63,9 +57,9 @@ uninstall:
zip: all
mkdir $(TDIR)
- cp $(NAME).{dtx,pdf} {$(STY1),$(STY2),$(STY3),$(STY4)}-doc.pdf README.md Makefile $(NAME).bbx {$(STY1),$(STY2),$(STY3),$(STY4)}.{b,c,d}bx {american,british,english}-$(NAME).lbx $(TDIR)
+ cp $(NAME).{dtx,pdf} $(STYS:%=%-doc.pdf) README.md Makefile $(NAME).bbx $(STYS:%=%.{b,c,d}bx) $(VARS:%=$(STY1)-%.{b,c,d}bx) {american,british,english}-$(NAME).lbx $(TDIR)
cd $(TEMP); zip -Drq $(PWD)/$(PFX)$(NAME)-$(VERS).zip $(NAME)
ctan: all
mkdir $(TDIR)
- cp $(NAME).{dtx,pdf} {$(STY1),$(STY2),$(STY3),$(STY4)}-doc.pdf README.md Makefile $(TDIR)
+ cp $(NAME).{dtx,pdf} $(STYS:%=%-doc.pdf) README.md Makefile $(TDIR)
cd $(TEMP); zip -Drq $(PWD)/$(PFX)$(NAME)-$(VERS).zip $(NAME)
diff --git a/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx b/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx
index e9d5b7cc4c3..b762e178c25 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{2019/02/15 v1.0}
+\def\Version{2019/02/19 v1.1}
%</internal|bbx|cbx|dbx|lbx|doc>
%<*internal>
\iffalse
@@ -13,7 +13,13 @@
[\Version\space Base settings for bibliography styles inspired by the Oxford Guide to Style]
%</bbx&o>
%<*bbx&n>
-\ProvidesFile{oxnotes.bbx}
+%<default>\ProvidesFile{oxnotes.bbx}
+%<ibid>\ProvidesFile{oxnotes-ibid.bbx}
+%<note>\ProvidesFile{oxnotes-note.bbx}
+%<inote>\ProvidesFile{oxnotes-inote.bbx}
+%<trad1>\ProvidesFile{oxnotes-trad1.bbx}
+%<trad2>\ProvidesFile{oxnotes-trad2.bbx}
+%<trad3>\ProvidesFile{oxnotes-trad3.bbx}
[\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style]
%</bbx&n>
%<*bbx&m>
@@ -29,7 +35,13 @@
[\Version\space Author-year bibliography style inspired by the Oxford Guide to Style]
%</bbx&y>
%<*cbx&n>
-\ProvidesFile{oxnotes.cbx}
+%<default>\ProvidesFile{oxnotes.cbx}
+%<ibid>\ProvidesFile{oxnotes-ibid.cbx}
+%<note>\ProvidesFile{oxnotes-note.cbx}
+%<inote>\ProvidesFile{oxnotes-inote.cbx}
+%<trad1>\ProvidesFile{oxnotes-trad1.cbx}
+%<trad2>\ProvidesFile{oxnotes-trad2.cbx}
+%<trad3>\ProvidesFile{oxnotes-trad3.cbx}
[\Version\space Footnote-based citation style inspired by the Oxford Guide to Style]
%</cbx&n>
%<*cbx&m>
@@ -45,7 +57,15 @@
[\Version\space Author-year citation style inspired by the Oxford Guide to Style]
%</cbx&y>
%<*dbx>
-%<n>\ProvidesFile{oxnotes.dbx}
+%<*n>
+%<default>\ProvidesFile{oxnotes.dbx}
+%<ibid>\ProvidesFile{oxnotes-ibid.dbx}
+%<note>\ProvidesFile{oxnotes-note.dbx}
+%<inote>\ProvidesFile{oxnotes-inote.dbx}
+%<trad1>\ProvidesFile{oxnotes-trad1.dbx}
+%<trad2>\ProvidesFile{oxnotes-trad2.dbx}
+%<trad3>\ProvidesFile{oxnotes-trad3.dbx}
+%</n>
%<m>\ProvidesFile{oxnum.dbx}
%<a>\ProvidesFile{oxalph.dbx}
%<y>\ProvidesFile{oxyear.dbx}
@@ -152,15 +172,33 @@ Copyright (C) 2016–2019 Alex Ball
\usedir{tex/latex/\jobname}
\generate{
\file{\jobname.bbx}{\from{\jobname.dtx}{bbx,o}}
- \file{oxnotes.bbx}{\from{\jobname.dtx}{bbx,n}}
+ \file{oxnotes.bbx}{\from{\jobname.dtx}{bbx,n,default}}
+ \file{oxnotes-ibid.bbx}{\from{\jobname.dtx}{bbx,n,ibid}}
+ \file{oxnotes-note.bbx}{\from{\jobname.dtx}{bbx,n,note}}
+ \file{oxnotes-inote.bbx}{\from{\jobname.dtx}{bbx,n,inote}}
+ \file{oxnotes-trad1.bbx}{\from{\jobname.dtx}{bbx,n,trad1}}
+ \file{oxnotes-trad2.bbx}{\from{\jobname.dtx}{bbx,n,trad2}}
+ \file{oxnotes-trad3.bbx}{\from{\jobname.dtx}{bbx,n,trad3}}
\file{oxnum.bbx}{\from{\jobname.dtx}{bbx,m}}
\file{oxalph.bbx}{\from{\jobname.dtx}{bbx,a}}
\file{oxyear.bbx}{\from{\jobname.dtx}{bbx,y}}
- \file{oxnotes.cbx}{\from{\jobname.dtx}{cbx,n}}
+ \file{oxnotes.cbx}{\from{\jobname.dtx}{cbx,n,default}}
+ \file{oxnotes-ibid.cbx}{\from{\jobname.dtx}{cbx,n,ibid}}
+ \file{oxnotes-note.cbx}{\from{\jobname.dtx}{cbx,n,note}}
+ \file{oxnotes-inote.cbx}{\from{\jobname.dtx}{cbx,n,inote}}
+ \file{oxnotes-trad1.cbx}{\from{\jobname.dtx}{cbx,n,trad1}}
+ \file{oxnotes-trad2.cbx}{\from{\jobname.dtx}{cbx,n,trad2}}
+ \file{oxnotes-trad3.cbx}{\from{\jobname.dtx}{cbx,n,trad3}}
\file{oxnum.cbx}{\from{\jobname.dtx}{cbx,m}}
\file{oxalph.cbx}{\from{\jobname.dtx}{cbx,a}}
\file{oxyear.cbx}{\from{\jobname.dtx}{cbx,y}}
- \file{oxnotes.dbx}{\from{\jobname.dtx}{dbx,n}}
+ \file{oxnotes.dbx}{\from{\jobname.dtx}{dbx,n,default}}
+ \file{oxnotes-ibid.dbx}{\from{\jobname.dtx}{dbx,n,ibid}}
+ \file{oxnotes-note.dbx}{\from{\jobname.dtx}{dbx,n,note}}
+ \file{oxnotes-inote.dbx}{\from{\jobname.dtx}{dbx,n,inote}}
+ \file{oxnotes-trad1.dbx}{\from{\jobname.dtx}{dbx,n,trad1}}
+ \file{oxnotes-trad2.dbx}{\from{\jobname.dtx}{dbx,n,trad2}}
+ \file{oxnotes-trad3.dbx}{\from{\jobname.dtx}{dbx,n,trad3}}
\file{oxnum.dbx}{\from{\jobname.dtx}{dbx,m}}
\file{oxalph.dbx}{\from{\jobname.dtx}{dbx,a}}
\file{oxyear.dbx}{\from{\jobname.dtx}{dbx,y}}
@@ -627,8 +665,8 @@ This document provides the documented sources for the \pkg[biblatex]{oxref}
biblography styles:
\begin{itemize}
\item
- \textsf{oxnotes}: a style similar to the standard \textsf{verbose},
- intended for use with footnotes;
+ \textsf{oxnotes}: a style similar to the standard \textsf{verbose}
+ and its variants, intended for use with footnotes;
\item
\textsf{oxnum}: a style similar to the standard \textsf{numeric},
intended for use with numeric in-text citation labels;
@@ -674,6 +712,7 @@ and
\href{./oxyear-doc.pdf}{\texttt{oxyear-doc.pdf}}
respectively.
+\sloppy
\begin{markdown*}{hybrid=true}
%</driver>
%<*driver|readme>
@@ -702,10 +741,16 @@ UNIX-like systems:
* Running `make source` generates the derived files
- README.md
- - oxref.bbx, oxnotes.bbx, oxyear.bbx, oxnum.bbx, oxalph.bbx
- - oxnotes.cbx, oxyear.cbx, oxnum.cbx, oxalph.cbx
+ - oxref.bbx, oxnotes.bbx, oxnotes-ibid.bbx, oxnotes-note.bbx,
+ oxnotes-inote.bbx, oxnotes-trad1.bbx, oxnotes-trad2.bbx,
+ oxnotes-trad3.bbx, oxyear.bbx, oxnum.bbx, oxalph.bbx
+ - oxnotes.cbx, oxnotes-ibid.cbx, oxnotes-note.cbx, oxnotes-inote.cbx,
+ oxnotes-trad1.cbx, oxnotes-trad2.cbx, oxnotes-trad3.cbx, oxyear.cbx,
+ oxnum.cbx, oxalph.cbx
- american-oxref.lbx, british-oxref.lbx, english-oxref.lbx
- - oxnotes.dbx, oxyear.dbx, oxnum.dbx, oxalph.dbx
+ - oxnotes.dbx, oxnotes-ibid.dbx, oxnotes-note.dbx, oxnotes-inote.dbx,
+ oxnotes-trad1.dbx, oxnotes-trad2.dbx, oxnotes-trad3.dbx, oxyear.dbx,
+ oxnum.dbx, oxalph.dbx
- oxref.bib
- oxref.ins
- oxnotes-doc.tex, oxyear-doc.tex, oxnum-doc.tex, oxalph-doc.tex
@@ -751,6 +796,24 @@ first two steps.
oxnotes.bbx,
oxnotes.cbx,
oxnotes.dbx,
+ oxnotes-ibid.bbx,
+ oxnotes-ibid.cbx,
+ oxnotes-ibid.dbx,
+ oxnotes-inote.bbx,
+ oxnotes-inote.cbx,
+ oxnotes-inote.dbx,
+ oxnotes-note.bbx,
+ oxnotes-note.cbx,
+ oxnotes-note.dbx,
+ oxnotes-trad1.bbx,
+ oxnotes-trad1.cbx,
+ oxnotes-trad1.dbx,
+ oxnotes-trad2.bbx,
+ oxnotes-trad2.cbx,
+ oxnotes-trad2.dbx,
+ oxnotes-trad3.bbx,
+ oxnotes-trad3.cbx,
+ oxnotes-trad3.dbx,
oxnum.bbx,
oxnum.cbx,
oxnum.dbx,
@@ -797,6 +860,7 @@ This work is ‘maintained’ (as per LPPL maintenance status) by [Alex Ball][me
%<*driver>
\end{markdown*}
+\fussy
\iffalse % syntax highlighting \fix
%</driver>
%<*doc|bib>
@@ -1088,7 +1152,7 @@ and indeed loads a tweaked version of a standard \textsf{biblatex} one.
\section{Test citations}
%<*n>
-Following the advice of \emph{New Hart's Rules}, \textsf{oxnotes} loads by default the standard \textsf{verbose} citation style, in which repeated citations are abbreviated to the author surname and a short title.
+Following the advice of \emph{New Hart's Rules}, \textsf{oxnotes} loads by default a tweaked version of the standard \textsf{verbose} citation style, in which repeated citations are abbreviated to the author surname and a short title.
%</n>
%</n|m|a|y>
@@ -1125,12 +1189,14 @@ Test\footcite[49-50]{faith1997epg}
\end{egcite}
\addtocategory{hidden}{cobban}
-Both the \emph{Oxford Guide to Style} and \emph{New Hart's Rules} describe an alternative system that uses the abbreviations \enquote{ibid.\@}, \enquote{op.\@ cit.\@}, \enquote{loc.\@ cit.\@}, and \enquote{id.\@} and friends, though with underwhelming enthusiasm. If you would like to use these abbreviations, load the \textsf{verbose-trad1} citation scheme instead (and remember to use the \code{gender} field):
+Both the \emph{Oxford Guide to Style} and \emph{New Hart's Rules} describe an alternative system that uses the abbreviations \enquote{ibid.\@}, \enquote{op.\@ cit.\@}, \enquote{loc.\@ cit.\@}, and \enquote{id.\@} and friends, though with underwhelming enthusiasm. If you would like to use these abbreviations, you can use the \textsf{oxnotes-trad1} citation style instead (and remember to use the \code{gender} field). As with the standard styles, a bibliographic style alias has been provided so you can just do this:
\begin{tcblisting}{listing only}
-\usepackage[bibstyle=oxnotes,citestyle=verbose-trad1]{biblatex}
+\usepackage[style=oxnotes-trad1]{biblatex}
\end{tcblisting}
+If you are particularly keen to use the other variants that \pkg{biblatex} provides, then parallel \textsf{oxnotes} variants have been provided for your convenience: \textsf{oxnotes-ibid}, \textsf{oxnotes-note}, \textsf{oxnotes-inote}, \textsf{oxnotes-trad2}, and \textsf{oxnotes-trad3}.
+
%</n>
%<*m|a>
Both the \emph{Oxford Guide to Style} and \emph{New Hart's Rules} describe a system that uses simple numbers as citation labels, almost as if they were endnotes. This system does not support page references, unlike the citation labels familiar to \LaTeX\ users. In the absence of a better idea, therefore, this style treats citation labels rather like author–year parenthetical citations and adopts the conventions from \textsf{oxyear}. Pages are set off with a colon, and multiple works are separated with a semicolon.
@@ -6084,6 +6150,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{The number will be classed as \enquote{Joined Cases} if it contains a comma, a double hyphen (\code{--}),
+ or the string \cs{oxrefand}, which defaults to \enquote{\code{\textvisiblespace and\textvisiblespace}}.}
+
\tip{For ECR cases, you can use either \code{number} or the non-standard \code{casenumber} field
for the case number.}
@@ -6098,7 +6167,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--118/07},
+ number = {C\textendash118/07},
journaltitle = {ECR},
volume = {I},
pages = {10889},
@@ -6878,6 +6947,7 @@ will trigger the use of parentheses.
% \setcounter{FancyVerbLine}{19}
%
% \subsection{Loading dependencies, setting up languages, applying options}
+% \label{sec:setup}
%
% Dependencies:
% \begin{itemize}
@@ -6891,6 +6961,7 @@ will trigger the use of parentheses.
% \end{itemize}
%
% \begin{macrocode}
+\RequirePackage{etoolbox}
\RequirePackage{xpatch}
\RequirePackage{xstring}
\RequirePackage{graphicx}
@@ -7504,7 +7575,7 @@ will trigger the use of parentheses.
\ifcsdef{blx@ox@opt@anon@#1}{%
\csuse{blx@ox@opt@anon@#1}%
}{%
- \PackageError{oxref}
+ \PackageError{biblatex-oxref}
{Invalid option 'anon=#1'}
{Valid values are 'long', 'short', and 'literal'.}}}
\csdef{blx@ox@opt@anon@literal}{\togglefalse{blx@ox@autoanon}}
@@ -8230,7 +8301,7 @@ will trigger the use of parentheses.
\ifcsdef{blx@ox@issuestyle@#1}{%
\csuse{blx@ox@issuestyle@#1}%
}{%
- \PackageError{biblatex}
+ \PackageError{biblatex-oxref}
{Invalid option 'issuestyle=#1'}
{Valid values are 'slash', 'colon', 'comma', 'parens'}%
}%
@@ -8582,7 +8653,7 @@ reference,mvreference,inreference]{volume}{%
}{%
\togglefalse{blx@ox@altbookseries}%
\ifstrequal{#1}{in}{}{%
- \PackageError{oxref}
+ \PackageError{biblatex-oxref}
{Invalid option 'bookseries=#1'}
{Valid values are 'in' and 'out'.}}}}
% \end{macrocode}
@@ -10909,6 +10980,7 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{altreportdetails}%
\usebibmacro{court-note}%
}
+\newcommand*\oxrefand{ and }
\newbibmacro{eucasetype}{%
\iffieldundef{type}{%
\ifboolexpr{
@@ -10916,7 +10988,7 @@ reference,mvreference,inreference]{volume}{%
or
test {\IfSubStr{\thefield{number}}{--}}
or
- test {\IfSubStr{\thefield{number}}{ and }}
+ test {\IfSubStr{\thefield{number}}{\oxrefand}}
}{%
\bibstring{eujoinedcases}%
}{%
@@ -11821,6 +11893,7 @@ reference,mvreference,inreference]{volume}{%
\iffieldequalstr{relatedtype}{multivolume}{%
\setunit{\addcomma\space}}{}%
}}{}{\wlog{WARNING: biblatex-oxref failed to append to begrelated}}
+\renewcommand*{\begrelateddelimmultivolume}{\newunitpunct}
% \end{macrocode}
%
@@ -12563,6 +12636,7 @@ reference,mvreference,inreference]{volume}{%
% \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%</o>
%<*n>
+%<*default>
% \fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% \section{Notes style: oxnotes.bbx}
@@ -12601,24 +12675,6 @@ reference,mvreference,inreference]{volume}{%
}{}{\wlog{WARNING: biblatex-oxref (oxnotes) failed to patch author}}
% \end{macrocode}
%
-% \subsection{Page ranges in citations}
-%
-% If specifying a page within a range in the course of a citation note,
-% Oxford style is to format that as \enquote{\emph{range} at
-% \emph{page}}; if no page range is specified, the page is printed as
-% normal.
-%
-% \begin{macrocode}
-\renewbibmacro*{postnote}{%
- \iffieldundef{postnote}{}{%
- \iffieldundef{pages}{%
- \setunit{\postnotedelim}%
- \printfield{postnote}%
- }{%
- \printtext{\addspace\bibstring{thiscite}\space}%
- \printfield{postnote}}}}
-% \end{macrocode}
-%
% \subsection{Source maps}
%
% \begin{macrocode}
@@ -12651,6 +12707,10 @@ reference,mvreference,inreference]{volume}{%
% \end{macrocode}
%
% \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%</default>
+%<*ibid|note|inote|trad1|trad2|trad3>
+\RequireBibliographyStyle{oxnotes}
+%</ibid|note|inote|trad1|trad2|trad3>
%</n>
%<*m>
% \fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -12787,14 +12847,14 @@ reference,mvreference,inreference]{volume}{%
\DeclareBibliographyOption{mergedate}[true]{%
\ifcsdef{bbx@opt@mergedate@#1}
{\csuse{bbx@opt@mergedate@#1}}
- {\PackageError{biblatex}
+ {\PackageError{biblatex-oxref}
{Invalid option 'mergedate=#1'}
{Valid values are 'maximum', 'compact', 'basic', 'minimum',\MessageBreak
'year', 'true' (=year), and 'false'.}}}
\DeclareTypeOption{mergedate}[true]{%
\ifcsdef{bbx@opt@mergedate@#1}
{\csuse{bbx@opt@mergedate@#1}}
- {\PackageError{biblatex}
+ {\PackageError{biblatex-oxref}
{Invalid option 'mergedate=#1'}
{Valid values are 'maximum', 'compact', 'basic', 'minimum',\MessageBreak
'year', 'true' (=year), and 'false'.}}}
@@ -13740,20 +13800,101 @@ reference,mvreference,inreference]{volume}{%
%
% \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%<*n>
+%<*default>
% \fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% \section{Notes style: oxnotes.cbx}
%
% \setcounter{FancyVerbLine}{19}
%
-% The standard |verbose| style works without further adjustment.
+% The standard |verbose| style is a close match for what we need.
%
% \begin{macrocode}
\RequireCitationStyle{verbose}
% \end{macrocode}
%
% \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%</default>
+%<*ibid>
+% \begin{macrocode}
+\RequireCitationStyle{verbose-ibid}
+% \end{macrocode}
+%</ibid>
+%<*note>
+% \begin{macrocode}
+\RequireCitationStyle{verbose-note}
+% \end{macrocode}
+%</note>
+%<*inote>
+% \begin{macrocode}
+\RequireCitationStyle{verbose-inote}
+% \end{macrocode}
+%</inote>
+%<*trad1>
+% \begin{macrocode}
+\RequireCitationStyle{verbose-trad1}
+% \end{macrocode}
+%</trad1>
+%<*trad2>
+% \begin{macrocode}
+\RequireCitationStyle{verbose-trad2}
+% \end{macrocode}
+%</trad2>
+%<*trad3>
+% \begin{macrocode}
+\RequireCitationStyle{verbose-trad3}
+% \end{macrocode}
+%</trad3>
+% \fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Variants are also provided that load the respective variant of |verbose|
+% at this point.
+%
+% The main difference is that the \key{citepages} option from these styles
+% needs to be \val{separate} by default, and the \cs{postnotedelim} before
+% the bibliography string |thiscite| (\enquote{at}) is replaced by a simple
+% space.
+%
+% \begin{macrocode}
+\newbibmacro*{cite:postnote:pages}{%
+ \setunit{\addspace}%
+ \bibstring{thiscite}%
+ \setunit{\addspace}%
+ \printfield{postnote}}
+\ExecuteBibliographyOptions{citepages=separate}
+% \end{macrocode}
+%
+% \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%</n>
+%<*m>
+% \fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% \section{Numeric style: oxnum.cbx}
+%
+% \setcounter{FancyVerbLine}{19}
+%
+% The standard |numeric| style works, needing only a little configuration.
+%
+% \begin{macrocode}
+\RequireCitationStyle{numeric-comp}
+% \end{macrocode}
+%
+% Compressed citations are delimited with a semicolon, just like
+% non-compressed citations.
+%
+% \begin{macrocode}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
+\renewcommand*{\compcitedelim}{\addsemicolon\space}
+% \end{macrocode}
+%
+% The page reference postnote is given after a colon.
+%
+% \begin{macrocode}
+\renewcommand*{\postnotedelim}{\addcolon\space}
+% \end{macrocode}
+%
+% \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%</m>
%<*y>
% \fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
@@ -13841,39 +13982,10 @@ reference,mvreference,inreference]{volume}{%
%
% \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%</y>
-%<*m>
-% \fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% \section{Notes style: oxnum.cbx}
-%
-% \setcounter{FancyVerbLine}{19}
-%
-% The standard |numeric| style works, needing only a little configuration.
-%
-% \begin{macrocode}
-\RequireCitationStyle{numeric-comp}
-% \end{macrocode}
-%
-% Compressed citations are delimited with a semicolon, just like
-% non-compressed citations.
-%
-% \begin{macrocode}
-\renewcommand*{\multicitedelim}{\addsemicolon\space}
-\renewcommand*{\compcitedelim}{\addsemicolon\space}
-% \end{macrocode}
-%
-% The page reference postnote is given after a colon.
-%
-% \begin{macrocode}
-\renewcommand*{\postnotedelim}{\addcolon\space}
-% \end{macrocode}
-%
-% \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%</m>
%<*a>
% \fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% \section{Notes style: oxalph.cbx}
+% \section{Alphabetic style: oxalph.cbx}
%
% \setcounter{FancyVerbLine}{19}
%
@@ -13907,8 +14019,19 @@ reference,mvreference,inreference]{volume}{%
%
% This code is appended to all the citation style files.
%
+% Just in case someone loaded this without loading |oxref.bbx|, we ensure the
+% necessary definitions are in place.
+%
+% \begin{macrocode}
+\RequirePackage{etoolbox}
+\RequirePackage{xpatch}
+\providetoggle{blx@ox@autoanon}
+\providetoggle{blx@ox@abbranon}
+% \end{macrocode}
+%
% We fix the |textcite| macro so if the \key{anon} option is set to \val{long}
-% or \val{short}, a value of \enquote{Anonymous} is replaced by the bibstring.
+% or \val{short}, a value of \enquote{Anonymous} is replaced by the bibliography
+% string |anon|.
%
% \begin{macrocode}
\xpatchbibmacro{textcite}{%
@@ -14470,6 +14593,14 @@ reference,mvreference,inreference]{volume}{%
\InheritBibliographyStrings{english}
% \end{macrocode}
%
+% \section{Other languages}
+%
+% Currently \pkg[biblatex]{oxref} only supports British and American
+% English explicitly, but if there is demand more languages may be
+% added. If you would like to contribute support for your language, a
+% list of the non-standard bibliography strings requiring definition may
+% be found in section~\ref{sec:setup}.
+%
% \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%</us>
%</lbx>
diff --git a/Master/texmf-dist/source/latex/biblatex-oxref/oxref.ins b/Master/texmf-dist/source/latex/biblatex-oxref/oxref.ins
index ed3bd754a7d..77b7681f592 100644
--- a/Master/texmf-dist/source/latex/biblatex-oxref/oxref.ins
+++ b/Master/texmf-dist/source/latex/biblatex-oxref/oxref.ins
@@ -43,15 +43,33 @@ Copyright (C) 2016–2019 Alex Ball
\usedir{tex/latex/\jobname}
\generate{
\file{\jobname.bbx}{\from{\jobname.dtx}{bbx,o}}
- \file{oxnotes.bbx}{\from{\jobname.dtx}{bbx,n}}
+ \file{oxnotes.bbx}{\from{\jobname.dtx}{bbx,n,default}}
+ \file{oxnotes-ibid.bbx}{\from{\jobname.dtx}{bbx,n,ibid}}
+ \file{oxnotes-note.bbx}{\from{\jobname.dtx}{bbx,n,note}}
+ \file{oxnotes-inote.bbx}{\from{\jobname.dtx}{bbx,n,inote}}
+ \file{oxnotes-trad1.bbx}{\from{\jobname.dtx}{bbx,n,trad1}}
+ \file{oxnotes-trad2.bbx}{\from{\jobname.dtx}{bbx,n,trad2}}
+ \file{oxnotes-trad3.bbx}{\from{\jobname.dtx}{bbx,n,trad3}}
\file{oxnum.bbx}{\from{\jobname.dtx}{bbx,m}}
\file{oxalph.bbx}{\from{\jobname.dtx}{bbx,a}}
\file{oxyear.bbx}{\from{\jobname.dtx}{bbx,y}}
- \file{oxnotes.cbx}{\from{\jobname.dtx}{cbx,n}}
+ \file{oxnotes.cbx}{\from{\jobname.dtx}{cbx,n,default}}
+ \file{oxnotes-ibid.cbx}{\from{\jobname.dtx}{cbx,n,ibid}}
+ \file{oxnotes-note.cbx}{\from{\jobname.dtx}{cbx,n,note}}
+ \file{oxnotes-inote.cbx}{\from{\jobname.dtx}{cbx,n,inote}}
+ \file{oxnotes-trad1.cbx}{\from{\jobname.dtx}{cbx,n,trad1}}
+ \file{oxnotes-trad2.cbx}{\from{\jobname.dtx}{cbx,n,trad2}}
+ \file{oxnotes-trad3.cbx}{\from{\jobname.dtx}{cbx,n,trad3}}
\file{oxnum.cbx}{\from{\jobname.dtx}{cbx,m}}
\file{oxalph.cbx}{\from{\jobname.dtx}{cbx,a}}
\file{oxyear.cbx}{\from{\jobname.dtx}{cbx,y}}
- \file{oxnotes.dbx}{\from{\jobname.dtx}{dbx,n}}
+ \file{oxnotes.dbx}{\from{\jobname.dtx}{dbx,n,default}}
+ \file{oxnotes-ibid.dbx}{\from{\jobname.dtx}{dbx,n,ibid}}
+ \file{oxnotes-note.dbx}{\from{\jobname.dtx}{dbx,n,note}}
+ \file{oxnotes-inote.dbx}{\from{\jobname.dtx}{dbx,n,inote}}
+ \file{oxnotes-trad1.dbx}{\from{\jobname.dtx}{dbx,n,trad1}}
+ \file{oxnotes-trad2.dbx}{\from{\jobname.dtx}{dbx,n,trad2}}
+ \file{oxnotes-trad3.dbx}{\from{\jobname.dtx}{dbx,n,trad3}}
\file{oxnum.dbx}{\from{\jobname.dtx}{dbx,m}}
\file{oxalph.dbx}{\from{\jobname.dtx}{dbx,a}}
\file{oxyear.dbx}{\from{\jobname.dtx}{dbx,y}}