diff options
author | Karl Berry <karl@freefriends.org> | 2019-02-19 22:19:07 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-02-19 22:19:07 +0000 |
commit | 4cbd171caf00fc7956bd4d7ca79bcecd0cc34526 (patch) | |
tree | 7514dc296c89c2700fc8322b4d8ee658225ba831 | |
parent | 549c5b5143e9ae63dbce060b6460b8e0995d7dc8 (diff) |
biblatex-oxref (19feb19)
git-svn-id: svn://tug.org/texlive/trunk@50061 c570f23f-e606-0410-a88d-b1316a301751
48 files changed, 1065 insertions, 147 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/README.md b/Master/texmf-dist/doc/latex/biblatex-oxref/README.md index 1e6ba1b6a51..09191692d92 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/README.md +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/README.md @@ -39,10 +39,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 @@ -88,6 +94,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, 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 e428aa0dc24..3318c0adc96 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 aac80d43212..bb0d45b3ecf 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{2019/02/15 v1.0} +\def\Version{2019/02/19 v1.1} \ProvidesFile{oxalph-doc.tex} [\Version\space Alphabetic biblatex style inspired by the Oxford Guide to Style] \PassOptionsToPackage{style=oxalph,varissuedate,anon}{biblatex} @@ -4047,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{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.} @@ -4060,7 +4063,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}, 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 2198155f1a3..4d116444379 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 9003096a2a9..7a06c67c09d 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{2019/02/15 v1.0} +\def\Version{2019/02/19 v1.1} \ProvidesFile{oxnotes-doc.tex} [\Version\space Footnote-based biblatex style inspired by the Oxford Guide to Style] \PassOptionsToPackage{style=oxnotes,scnames,varissuedate,anon}{biblatex} @@ -501,7 +501,7 @@ there is a difference in how author names are printed. \section{Test citations} -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. \begin{egcite}{} Test\footcite{faith1997epg} @@ -515,12 +515,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}. + \section{Missing or inferred attribution} @@ -4036,6 +4038,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.} @@ -4049,7 +4054,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}, 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 658dcefc15e..c9fb5f9fea3 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 3766ad65c3f..f56c54c7170 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{2019/02/15 v1.0} +\def\Version{2019/02/19 v1.1} \ProvidesFile{oxnum-doc.tex} [\Version\space Numeric biblatex style inspired by the Oxford Guide to Style] \PassOptionsToPackage{style=oxnum,scnames,varissuedate,anon}{biblatex} @@ -3982,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{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.} @@ -3995,7 +3998,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}, diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.bib b/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.bib index 5aeaea33ce3..ed0d2c8373d 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.bib +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.bib @@ -1503,7 +1503,7 @@ 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}, 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 5d16afabd3a..65562befd06 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 50f723060f2..423360b5822 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 6cafb88d25a..d60d9db3f3f 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{2019/02/15 v1.0} +\def\Version{2019/02/19 v1.1} \ProvidesFile{oxyear-doc.tex} [\Version\space Author-year biblatex style inspired by the Oxford Guide to Style] \PassOptionsToPackage{style=oxyear,varissuedate,anon}{biblatex} @@ -4087,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{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.} @@ -4100,7 +4103,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}, 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}} 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 a565ffc592a..87e9a3c2006 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/15 v1.0} +\def\Version{2019/02/19 v1.1} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{american-oxref.lbx} [\Version\space American English conventions required by the biblatex-oxref styles] 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 e97b6dfca54..64ea7bdb7a3 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{2019/02/15 v1.0} +\def\Version{2019/02/19 v1.1} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{british-oxref.lbx} [\Version\space British English conventions required by the biblatex-oxref styles] 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 b727e58e9c9..2576d94b388 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{2019/02/15 v1.0} +\def\Version{2019/02/19 v1.1} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{english-oxref.lbx} [\Version\space Generic English conventions required by the biblatex-oxref styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx index de9438edf65..833d995eb6e 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{2019/02/15 v1.0} +\def\Version{2019/02/19 v1.1} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxalph.bbx} [\Version\space Alphabetic bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx index cb1fe0a35aa..00f58d92f46 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{2019/02/15 v1.0} +\def\Version{2019/02/19 v1.1} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxalph.cbx} [\Version\space Alphabetic citation style inspired by the Oxford Guide to Style] @@ -21,6 +21,10 @@ \renewcommand*{\multicitedelim}{\addsemicolon\space} \renewcommand*{\compcitedelim}{\addsemicolon\space} \renewcommand*{\postnotedelim}{\addcolon\space} +\RequirePackage{etoolbox} +\RequirePackage{xpatch} +\providetoggle{blx@ox@autoanon} +\providetoggle{blx@ox@abbranon} \xpatchbibmacro{textcite}{% \printnames{labelname}% }{% diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx index 755ea260ed1..e8a4931d7c0 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{2019/02/15 v1.0} +\def\Version{2019/02/19 v1.1} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxalph.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx new file mode 100644 index 00000000000..1994645949b --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx @@ -0,0 +1,24 @@ +%% +%% This is file `oxnotes-ibid.bbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% oxref.dtx (with options: `bbx,n,ibid') +%% ---------------------------------------------------------------- +%% biblatex-oxref --- Biblatex styles inspired by the Oxford Guide to Style +%% Author: Alex Ball +%% E-mail: a.j.ball@bath.ac.uk +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\Version{2019/02/19 v1.1} +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesFile{oxnotes-ibid.bbx} + [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] +\RequireBibliographyStyle{oxnotes} +%% +%% Copyright (C) 2016–2019 Alex Ball +%% +%% End of file `oxnotes-ibid.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx new file mode 100644 index 00000000000..f6cb79ce1d0 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx @@ -0,0 +1,49 @@ +%% +%% This is file `oxnotes-ibid.cbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% oxref.dtx (with options: `cbx,n,ibid') +%% ---------------------------------------------------------------- +%% biblatex-oxref --- Biblatex styles inspired by the Oxford Guide to Style +%% Author: Alex Ball +%% E-mail: a.j.ball@bath.ac.uk +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\Version{2019/02/19 v1.1} +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesFile{oxnotes-ibid.cbx} + [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] +\RequireCitationStyle{verbose-ibid} +\newbibmacro*{cite:postnote:pages}{% + \setunit{\addspace}% + \bibstring{thiscite}% + \setunit{\addspace}% + \printfield{postnote}} +\ExecuteBibliographyOptions{citepages=separate} +\RequirePackage{etoolbox} +\RequirePackage{xpatch} +\providetoggle{blx@ox@autoanon} +\providetoggle{blx@ox@abbranon} +\xpatchbibmacro{textcite}{% + \printnames{labelname}% +}{% + \ifboolexpr{ + test {\iffieldequalstr{labelnamesource}{author}} + and + togl {blx@ox@autoanon} + and + test {\iffieldequals{rawauthor}{\oxrefanon}} + }{% + \iftoggle{blx@ox@abbranon}{\bibcpsstring{anon}}{\bibcplstring{anon}}% + }{% + \printnames{labelname}% + }% +}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} +%% +%% Copyright (C) 2016–2019 Alex Ball +%% +%% End of file `oxnotes-ibid.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx new file mode 100644 index 00000000000..75cafb0eb97 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx @@ -0,0 +1,47 @@ +%% +%% This is file `oxnotes-ibid.dbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% oxref.dtx (with options: `dbx,n,ibid') +%% ---------------------------------------------------------------- +%% biblatex-oxref --- Biblatex styles inspired by the Oxford Guide to Style +%% Author: Alex Ball +%% E-mail: a.j.ball@bath.ac.uk +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\Version{2019/02/19 v1.1} +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesFile{oxnotes-ibid.dbx} + [\Version\space Data model for the Oxref family of styles] +\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,title} +\DeclareDatamodelFields[type=field,datatype=literal]{datetype,origdatetype} +\DeclareDatamodelFields[type=list,datatype=name]{authoraddon,editoraddon,serieseditor} +\DeclareDatamodelFields[type=list,datatype=name]{jointauthor} +\DeclareDatamodelFields[type=field,datatype=literal]{jointauthortype} +\DeclareDatamodelFields[type=field,datatype=literal]{rawauthor} +\DeclareDatamodelEntryfields{datetype,origdatetype,authoraddon,editoraddon,% + serieseditor,jointauthor,jointauthortype,rawauthor} +\DeclareDatamodelFields[type=field,datatype=literal]{shortlabeltitle} +\DeclareDatamodelEntrytypes{manuscript} +\DeclareDatamodelFields[type=field,datatype=literal]{catalog,dating,% + shortlibrary,columns, collection,shortcollection,usualtitle,shelfmark,% + sortshelfmark,support,columns,layer} +\DeclareDatamodelFields[type=list,datatype=name]{scribe,owner} +\DeclareDatamodelFields[type=list,datatype=literal]{origin} +\DeclareDatamodelEntryfields[manuscript]{catalog,dating,shortlibrary,% + shortcollection,columns,languages,collection,usualtitle,shelfmark,% + sortshelfmark,support,columns,origin,scribe,owner} +\DeclareDatamodelFields[type=field,datatype=date]{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–2019 Alex Ball +%% +%% End of file `oxnotes-ibid.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx new file mode 100644 index 00000000000..e767f01c4b3 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx @@ -0,0 +1,24 @@ +%% +%% This is file `oxnotes-inote.bbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% oxref.dtx (with options: `bbx,n,inote') +%% ---------------------------------------------------------------- +%% biblatex-oxref --- Biblatex styles inspired by the Oxford Guide to Style +%% Author: Alex Ball +%% E-mail: a.j.ball@bath.ac.uk +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\Version{2019/02/19 v1.1} +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesFile{oxnotes-inote.bbx} + [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] +\RequireBibliographyStyle{oxnotes} +%% +%% Copyright (C) 2016–2019 Alex Ball +%% +%% End of file `oxnotes-inote.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx new file mode 100644 index 00000000000..2185adbb98d --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx @@ -0,0 +1,49 @@ +%% +%% This is file `oxnotes-inote.cbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% oxref.dtx (with options: `cbx,n,inote') +%% ---------------------------------------------------------------- +%% biblatex-oxref --- Biblatex styles inspired by the Oxford Guide to Style +%% Author: Alex Ball +%% E-mail: a.j.ball@bath.ac.uk +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\Version{2019/02/19 v1.1} +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesFile{oxnotes-inote.cbx} + [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] +\RequireCitationStyle{verbose-inote} +\newbibmacro*{cite:postnote:pages}{% + \setunit{\addspace}% + \bibstring{thiscite}% + \setunit{\addspace}% + \printfield{postnote}} +\ExecuteBibliographyOptions{citepages=separate} +\RequirePackage{etoolbox} +\RequirePackage{xpatch} +\providetoggle{blx@ox@autoanon} +\providetoggle{blx@ox@abbranon} +\xpatchbibmacro{textcite}{% + \printnames{labelname}% +}{% + \ifboolexpr{ + test {\iffieldequalstr{labelnamesource}{author}} + and + togl {blx@ox@autoanon} + and + test {\iffieldequals{rawauthor}{\oxrefanon}} + }{% + \iftoggle{blx@ox@abbranon}{\bibcpsstring{anon}}{\bibcplstring{anon}}% + }{% + \printnames{labelname}% + }% +}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} +%% +%% Copyright (C) 2016–2019 Alex Ball +%% +%% End of file `oxnotes-inote.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx new file mode 100644 index 00000000000..47755b21efd --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx @@ -0,0 +1,47 @@ +%% +%% This is file `oxnotes-inote.dbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% oxref.dtx (with options: `dbx,n,inote') +%% ---------------------------------------------------------------- +%% biblatex-oxref --- Biblatex styles inspired by the Oxford Guide to Style +%% Author: Alex Ball +%% E-mail: a.j.ball@bath.ac.uk +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\Version{2019/02/19 v1.1} +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesFile{oxnotes-inote.dbx} + [\Version\space Data model for the Oxref family of styles] +\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,title} +\DeclareDatamodelFields[type=field,datatype=literal]{datetype,origdatetype} +\DeclareDatamodelFields[type=list,datatype=name]{authoraddon,editoraddon,serieseditor} +\DeclareDatamodelFields[type=list,datatype=name]{jointauthor} +\DeclareDatamodelFields[type=field,datatype=literal]{jointauthortype} +\DeclareDatamodelFields[type=field,datatype=literal]{rawauthor} +\DeclareDatamodelEntryfields{datetype,origdatetype,authoraddon,editoraddon,% + serieseditor,jointauthor,jointauthortype,rawauthor} +\DeclareDatamodelFields[type=field,datatype=literal]{shortlabeltitle} +\DeclareDatamodelEntrytypes{manuscript} +\DeclareDatamodelFields[type=field,datatype=literal]{catalog,dating,% + shortlibrary,columns, collection,shortcollection,usualtitle,shelfmark,% + sortshelfmark,support,columns,layer} +\DeclareDatamodelFields[type=list,datatype=name]{scribe,owner} +\DeclareDatamodelFields[type=list,datatype=literal]{origin} +\DeclareDatamodelEntryfields[manuscript]{catalog,dating,shortlibrary,% + shortcollection,columns,languages,collection,usualtitle,shelfmark,% + sortshelfmark,support,columns,origin,scribe,owner} +\DeclareDatamodelFields[type=field,datatype=date]{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–2019 Alex Ball +%% +%% End of file `oxnotes-inote.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx new file mode 100644 index 00000000000..591eca3532a --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx @@ -0,0 +1,24 @@ +%% +%% This is file `oxnotes-note.bbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% oxref.dtx (with options: `bbx,n,note') +%% ---------------------------------------------------------------- +%% biblatex-oxref --- Biblatex styles inspired by the Oxford Guide to Style +%% Author: Alex Ball +%% E-mail: a.j.ball@bath.ac.uk +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\Version{2019/02/19 v1.1} +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesFile{oxnotes-note.bbx} + [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] +\RequireBibliographyStyle{oxnotes} +%% +%% Copyright (C) 2016–2019 Alex Ball +%% +%% End of file `oxnotes-note.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx new file mode 100644 index 00000000000..fe389b8a2b0 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx @@ -0,0 +1,49 @@ +%% +%% This is file `oxnotes-note.cbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% oxref.dtx (with options: `cbx,n,note') +%% ---------------------------------------------------------------- +%% biblatex-oxref --- Biblatex styles inspired by the Oxford Guide to Style +%% Author: Alex Ball +%% E-mail: a.j.ball@bath.ac.uk +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\Version{2019/02/19 v1.1} +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesFile{oxnotes-note.cbx} + [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] +\RequireCitationStyle{verbose-note} +\newbibmacro*{cite:postnote:pages}{% + \setunit{\addspace}% + \bibstring{thiscite}% + \setunit{\addspace}% + \printfield{postnote}} +\ExecuteBibliographyOptions{citepages=separate} +\RequirePackage{etoolbox} +\RequirePackage{xpatch} +\providetoggle{blx@ox@autoanon} +\providetoggle{blx@ox@abbranon} +\xpatchbibmacro{textcite}{% + \printnames{labelname}% +}{% + \ifboolexpr{ + test {\iffieldequalstr{labelnamesource}{author}} + and + togl {blx@ox@autoanon} + and + test {\iffieldequals{rawauthor}{\oxrefanon}} + }{% + \iftoggle{blx@ox@abbranon}{\bibcpsstring{anon}}{\bibcplstring{anon}}% + }{% + \printnames{labelname}% + }% +}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} +%% +%% Copyright (C) 2016–2019 Alex Ball +%% +%% End of file `oxnotes-note.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx new file mode 100644 index 00000000000..bc3d60ac469 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx @@ -0,0 +1,47 @@ +%% +%% This is file `oxnotes-note.dbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% oxref.dtx (with options: `dbx,n,note') +%% ---------------------------------------------------------------- +%% biblatex-oxref --- Biblatex styles inspired by the Oxford Guide to Style +%% Author: Alex Ball +%% E-mail: a.j.ball@bath.ac.uk +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\Version{2019/02/19 v1.1} +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesFile{oxnotes-note.dbx} + [\Version\space Data model for the Oxref family of styles] +\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,title} +\DeclareDatamodelFields[type=field,datatype=literal]{datetype,origdatetype} +\DeclareDatamodelFields[type=list,datatype=name]{authoraddon,editoraddon,serieseditor} +\DeclareDatamodelFields[type=list,datatype=name]{jointauthor} +\DeclareDatamodelFields[type=field,datatype=literal]{jointauthortype} +\DeclareDatamodelFields[type=field,datatype=literal]{rawauthor} +\DeclareDatamodelEntryfields{datetype,origdatetype,authoraddon,editoraddon,% + serieseditor,jointauthor,jointauthortype,rawauthor} +\DeclareDatamodelFields[type=field,datatype=literal]{shortlabeltitle} +\DeclareDatamodelEntrytypes{manuscript} +\DeclareDatamodelFields[type=field,datatype=literal]{catalog,dating,% + shortlibrary,columns, collection,shortcollection,usualtitle,shelfmark,% + sortshelfmark,support,columns,layer} +\DeclareDatamodelFields[type=list,datatype=name]{scribe,owner} +\DeclareDatamodelFields[type=list,datatype=literal]{origin} +\DeclareDatamodelEntryfields[manuscript]{catalog,dating,shortlibrary,% + shortcollection,columns,languages,collection,usualtitle,shelfmark,% + sortshelfmark,support,columns,origin,scribe,owner} +\DeclareDatamodelFields[type=field,datatype=date]{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–2019 Alex Ball +%% +%% End of file `oxnotes-note.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx new file mode 100644 index 00000000000..df84e66851b --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx @@ -0,0 +1,24 @@ +%% +%% This is file `oxnotes-trad1.bbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% oxref.dtx (with options: `bbx,n,trad1') +%% ---------------------------------------------------------------- +%% biblatex-oxref --- Biblatex styles inspired by the Oxford Guide to Style +%% Author: Alex Ball +%% E-mail: a.j.ball@bath.ac.uk +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\Version{2019/02/19 v1.1} +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesFile{oxnotes-trad1.bbx} + [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] +\RequireBibliographyStyle{oxnotes} +%% +%% Copyright (C) 2016–2019 Alex Ball +%% +%% End of file `oxnotes-trad1.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx new file mode 100644 index 00000000000..15563029b5c --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx @@ -0,0 +1,49 @@ +%% +%% This is file `oxnotes-trad1.cbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% oxref.dtx (with options: `cbx,n,trad1') +%% ---------------------------------------------------------------- +%% biblatex-oxref --- Biblatex styles inspired by the Oxford Guide to Style +%% Author: Alex Ball +%% E-mail: a.j.ball@bath.ac.uk +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\Version{2019/02/19 v1.1} +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesFile{oxnotes-trad1.cbx} + [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] +\RequireCitationStyle{verbose-trad1} +\newbibmacro*{cite:postnote:pages}{% + \setunit{\addspace}% + \bibstring{thiscite}% + \setunit{\addspace}% + \printfield{postnote}} +\ExecuteBibliographyOptions{citepages=separate} +\RequirePackage{etoolbox} +\RequirePackage{xpatch} +\providetoggle{blx@ox@autoanon} +\providetoggle{blx@ox@abbranon} +\xpatchbibmacro{textcite}{% + \printnames{labelname}% +}{% + \ifboolexpr{ + test {\iffieldequalstr{labelnamesource}{author}} + and + togl {blx@ox@autoanon} + and + test {\iffieldequals{rawauthor}{\oxrefanon}} + }{% + \iftoggle{blx@ox@abbranon}{\bibcpsstring{anon}}{\bibcplstring{anon}}% + }{% + \printnames{labelname}% + }% +}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} +%% +%% Copyright (C) 2016–2019 Alex Ball +%% +%% End of file `oxnotes-trad1.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx new file mode 100644 index 00000000000..3bdc4a2435a --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx @@ -0,0 +1,47 @@ +%% +%% This is file `oxnotes-trad1.dbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% oxref.dtx (with options: `dbx,n,trad1') +%% ---------------------------------------------------------------- +%% biblatex-oxref --- Biblatex styles inspired by the Oxford Guide to Style +%% Author: Alex Ball +%% E-mail: a.j.ball@bath.ac.uk +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\Version{2019/02/19 v1.1} +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesFile{oxnotes-trad1.dbx} + [\Version\space Data model for the Oxref family of styles] +\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,title} +\DeclareDatamodelFields[type=field,datatype=literal]{datetype,origdatetype} +\DeclareDatamodelFields[type=list,datatype=name]{authoraddon,editoraddon,serieseditor} +\DeclareDatamodelFields[type=list,datatype=name]{jointauthor} +\DeclareDatamodelFields[type=field,datatype=literal]{jointauthortype} +\DeclareDatamodelFields[type=field,datatype=literal]{rawauthor} +\DeclareDatamodelEntryfields{datetype,origdatetype,authoraddon,editoraddon,% + serieseditor,jointauthor,jointauthortype,rawauthor} +\DeclareDatamodelFields[type=field,datatype=literal]{shortlabeltitle} +\DeclareDatamodelEntrytypes{manuscript} +\DeclareDatamodelFields[type=field,datatype=literal]{catalog,dating,% + shortlibrary,columns, collection,shortcollection,usualtitle,shelfmark,% + sortshelfmark,support,columns,layer} +\DeclareDatamodelFields[type=list,datatype=name]{scribe,owner} +\DeclareDatamodelFields[type=list,datatype=literal]{origin} +\DeclareDatamodelEntryfields[manuscript]{catalog,dating,shortlibrary,% + shortcollection,columns,languages,collection,usualtitle,shelfmark,% + sortshelfmark,support,columns,origin,scribe,owner} +\DeclareDatamodelFields[type=field,datatype=date]{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–2019 Alex Ball +%% +%% End of file `oxnotes-trad1.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx new file mode 100644 index 00000000000..50adbb884d3 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx @@ -0,0 +1,24 @@ +%% +%% This is file `oxnotes-trad2.bbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% oxref.dtx (with options: `bbx,n,trad2') +%% ---------------------------------------------------------------- +%% biblatex-oxref --- Biblatex styles inspired by the Oxford Guide to Style +%% Author: Alex Ball +%% E-mail: a.j.ball@bath.ac.uk +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\Version{2019/02/19 v1.1} +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesFile{oxnotes-trad2.bbx} + [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] +\RequireBibliographyStyle{oxnotes} +%% +%% Copyright (C) 2016–2019 Alex Ball +%% +%% End of file `oxnotes-trad2.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx new file mode 100644 index 00000000000..8908c982edf --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx @@ -0,0 +1,49 @@ +%% +%% This is file `oxnotes-trad2.cbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% oxref.dtx (with options: `cbx,n,trad2') +%% ---------------------------------------------------------------- +%% biblatex-oxref --- Biblatex styles inspired by the Oxford Guide to Style +%% Author: Alex Ball +%% E-mail: a.j.ball@bath.ac.uk +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\Version{2019/02/19 v1.1} +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesFile{oxnotes-trad2.cbx} + [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] +\RequireCitationStyle{verbose-trad2} +\newbibmacro*{cite:postnote:pages}{% + \setunit{\addspace}% + \bibstring{thiscite}% + \setunit{\addspace}% + \printfield{postnote}} +\ExecuteBibliographyOptions{citepages=separate} +\RequirePackage{etoolbox} +\RequirePackage{xpatch} +\providetoggle{blx@ox@autoanon} +\providetoggle{blx@ox@abbranon} +\xpatchbibmacro{textcite}{% + \printnames{labelname}% +}{% + \ifboolexpr{ + test {\iffieldequalstr{labelnamesource}{author}} + and + togl {blx@ox@autoanon} + and + test {\iffieldequals{rawauthor}{\oxrefanon}} + }{% + \iftoggle{blx@ox@abbranon}{\bibcpsstring{anon}}{\bibcplstring{anon}}% + }{% + \printnames{labelname}% + }% +}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} +%% +%% Copyright (C) 2016–2019 Alex Ball +%% +%% End of file `oxnotes-trad2.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx new file mode 100644 index 00000000000..d706a526f8a --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx @@ -0,0 +1,47 @@ +%% +%% This is file `oxnotes-trad2.dbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% oxref.dtx (with options: `dbx,n,trad2') +%% ---------------------------------------------------------------- +%% biblatex-oxref --- Biblatex styles inspired by the Oxford Guide to Style +%% Author: Alex Ball +%% E-mail: a.j.ball@bath.ac.uk +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\Version{2019/02/19 v1.1} +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesFile{oxnotes-trad2.dbx} + [\Version\space Data model for the Oxref family of styles] +\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,title} +\DeclareDatamodelFields[type=field,datatype=literal]{datetype,origdatetype} +\DeclareDatamodelFields[type=list,datatype=name]{authoraddon,editoraddon,serieseditor} +\DeclareDatamodelFields[type=list,datatype=name]{jointauthor} +\DeclareDatamodelFields[type=field,datatype=literal]{jointauthortype} +\DeclareDatamodelFields[type=field,datatype=literal]{rawauthor} +\DeclareDatamodelEntryfields{datetype,origdatetype,authoraddon,editoraddon,% + serieseditor,jointauthor,jointauthortype,rawauthor} +\DeclareDatamodelFields[type=field,datatype=literal]{shortlabeltitle} +\DeclareDatamodelEntrytypes{manuscript} +\DeclareDatamodelFields[type=field,datatype=literal]{catalog,dating,% + shortlibrary,columns, collection,shortcollection,usualtitle,shelfmark,% + sortshelfmark,support,columns,layer} +\DeclareDatamodelFields[type=list,datatype=name]{scribe,owner} +\DeclareDatamodelFields[type=list,datatype=literal]{origin} +\DeclareDatamodelEntryfields[manuscript]{catalog,dating,shortlibrary,% + shortcollection,columns,languages,collection,usualtitle,shelfmark,% + sortshelfmark,support,columns,origin,scribe,owner} +\DeclareDatamodelFields[type=field,datatype=date]{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–2019 Alex Ball +%% +%% End of file `oxnotes-trad2.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx new file mode 100644 index 00000000000..711d247f64c --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx @@ -0,0 +1,24 @@ +%% +%% This is file `oxnotes-trad3.bbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% oxref.dtx (with options: `bbx,n,trad3') +%% ---------------------------------------------------------------- +%% biblatex-oxref --- Biblatex styles inspired by the Oxford Guide to Style +%% Author: Alex Ball +%% E-mail: a.j.ball@bath.ac.uk +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\Version{2019/02/19 v1.1} +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesFile{oxnotes-trad3.bbx} + [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] +\RequireBibliographyStyle{oxnotes} +%% +%% Copyright (C) 2016–2019 Alex Ball +%% +%% End of file `oxnotes-trad3.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx new file mode 100644 index 00000000000..e25f8dd5bdc --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx @@ -0,0 +1,49 @@ +%% +%% This is file `oxnotes-trad3.cbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% oxref.dtx (with options: `cbx,n,trad3') +%% ---------------------------------------------------------------- +%% biblatex-oxref --- Biblatex styles inspired by the Oxford Guide to Style +%% Author: Alex Ball +%% E-mail: a.j.ball@bath.ac.uk +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\Version{2019/02/19 v1.1} +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesFile{oxnotes-trad3.cbx} + [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] +\RequireCitationStyle{verbose-trad3} +\newbibmacro*{cite:postnote:pages}{% + \setunit{\addspace}% + \bibstring{thiscite}% + \setunit{\addspace}% + \printfield{postnote}} +\ExecuteBibliographyOptions{citepages=separate} +\RequirePackage{etoolbox} +\RequirePackage{xpatch} +\providetoggle{blx@ox@autoanon} +\providetoggle{blx@ox@abbranon} +\xpatchbibmacro{textcite}{% + \printnames{labelname}% +}{% + \ifboolexpr{ + test {\iffieldequalstr{labelnamesource}{author}} + and + togl {blx@ox@autoanon} + and + test {\iffieldequals{rawauthor}{\oxrefanon}} + }{% + \iftoggle{blx@ox@abbranon}{\bibcpsstring{anon}}{\bibcplstring{anon}}% + }{% + \printnames{labelname}% + }% +}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} +%% +%% Copyright (C) 2016–2019 Alex Ball +%% +%% End of file `oxnotes-trad3.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx new file mode 100644 index 00000000000..2f3094d903a --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx @@ -0,0 +1,47 @@ +%% +%% This is file `oxnotes-trad3.dbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% oxref.dtx (with options: `dbx,n,trad3') +%% ---------------------------------------------------------------- +%% biblatex-oxref --- Biblatex styles inspired by the Oxford Guide to Style +%% Author: Alex Ball +%% E-mail: a.j.ball@bath.ac.uk +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\Version{2019/02/19 v1.1} +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesFile{oxnotes-trad3.dbx} + [\Version\space Data model for the Oxref family of styles] +\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,title} +\DeclareDatamodelFields[type=field,datatype=literal]{datetype,origdatetype} +\DeclareDatamodelFields[type=list,datatype=name]{authoraddon,editoraddon,serieseditor} +\DeclareDatamodelFields[type=list,datatype=name]{jointauthor} +\DeclareDatamodelFields[type=field,datatype=literal]{jointauthortype} +\DeclareDatamodelFields[type=field,datatype=literal]{rawauthor} +\DeclareDatamodelEntryfields{datetype,origdatetype,authoraddon,editoraddon,% + serieseditor,jointauthor,jointauthortype,rawauthor} +\DeclareDatamodelFields[type=field,datatype=literal]{shortlabeltitle} +\DeclareDatamodelEntrytypes{manuscript} +\DeclareDatamodelFields[type=field,datatype=literal]{catalog,dating,% + shortlibrary,columns, collection,shortcollection,usualtitle,shelfmark,% + sortshelfmark,support,columns,layer} +\DeclareDatamodelFields[type=list,datatype=name]{scribe,owner} +\DeclareDatamodelFields[type=list,datatype=literal]{origin} +\DeclareDatamodelEntryfields[manuscript]{catalog,dating,shortlibrary,% + shortcollection,columns,languages,collection,usualtitle,shelfmark,% + sortshelfmark,support,columns,origin,scribe,owner} +\DeclareDatamodelFields[type=field,datatype=date]{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–2019 Alex Ball +%% +%% End of file `oxnotes-trad3.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx index 846bb78a317..69a74949379 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx @@ -4,7 +4,7 @@ %% %% The original source files were: %% -%% oxref.dtx (with options: `bbx,n') +%% oxref.dtx (with options: `bbx,n,default') %% ---------------------------------------------------------------- %% biblatex-oxref --- Biblatex styles inspired by the Oxford Guide to Style %% Author: Alex Ball @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/15 v1.0} +\def\Version{2019/02/19 v1.1} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] @@ -31,14 +31,6 @@ \iftoggle{blx@ox@scnames}{\bibcplstring[\textsc]{anon}}{\bibcplstring{anon}}% }% }{}{\wlog{WARNING: biblatex-oxref (oxnotes) failed to patch author}} -\renewbibmacro*{postnote}{% - \iffieldundef{postnote}{}{% - \iffieldundef{pages}{% - \setunit{\postnotedelim}% - \printfield{postnote}% - }{% - \printtext{\addspace\bibstring{thiscite}\space}% - \printfield{postnote}}}} \DeclareStyleSourcemap{% \maps[datatype=bibtex]{% \map{ diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx index 5e4e1c1a644..ea7fc8ce88e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx @@ -4,7 +4,7 @@ %% %% The original source files were: %% -%% oxref.dtx (with options: `cbx,n') +%% oxref.dtx (with options: `cbx,n,default') %% ---------------------------------------------------------------- %% biblatex-oxref --- Biblatex styles inspired by the Oxford Guide to Style %% Author: Alex Ball @@ -13,11 +13,21 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/15 v1.0} +\def\Version{2019/02/19 v1.1} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] \RequireCitationStyle{verbose} +\newbibmacro*{cite:postnote:pages}{% + \setunit{\addspace}% + \bibstring{thiscite}% + \setunit{\addspace}% + \printfield{postnote}} +\ExecuteBibliographyOptions{citepages=separate} +\RequirePackage{etoolbox} +\RequirePackage{xpatch} +\providetoggle{blx@ox@autoanon} +\providetoggle{blx@ox@abbranon} \xpatchbibmacro{textcite}{% \printnames{labelname}% }{% diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx index cb56d6af769..e15a82772e5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx @@ -4,7 +4,7 @@ %% %% The original source files were: %% -%% oxref.dtx (with options: `dbx,n') +%% oxref.dtx (with options: `dbx,n,default') %% ---------------------------------------------------------------- %% biblatex-oxref --- Biblatex styles inspired by the Oxford Guide to Style %% Author: Alex Ball @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/15 v1.0} +\def\Version{2019/02/19 v1.1} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx index cf60a17bcdd..597219dae44 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{2019/02/15 v1.0} +\def\Version{2019/02/19 v1.1} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnum.bbx} [\Version\space Numeric bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx index ea044eaa82f..b8751b37895 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{2019/02/15 v1.0} +\def\Version{2019/02/19 v1.1} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnum.cbx} [\Version\space Numeric citation style inspired by the Oxford Guide to Style] @@ -21,6 +21,10 @@ \renewcommand*{\multicitedelim}{\addsemicolon\space} \renewcommand*{\compcitedelim}{\addsemicolon\space} \renewcommand*{\postnotedelim}{\addcolon\space} +\RequirePackage{etoolbox} +\RequirePackage{xpatch} +\providetoggle{blx@ox@autoanon} +\providetoggle{blx@ox@abbranon} \xpatchbibmacro{textcite}{% \printnames{labelname}% }{% diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx index 595605f83fd..005016e3fe1 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{2019/02/15 v1.0} +\def\Version{2019/02/19 v1.1} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnum.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx index 9e1bb4ab6e0..b1a43dc325e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx @@ -13,10 +13,11 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/15 v1.0} +\def\Version{2019/02/19 v1.1} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxref.bbx} [\Version\space Base settings for bibliography styles inspired by the Oxford Guide to Style] +\RequirePackage{etoolbox} \RequirePackage{xpatch} \RequirePackage{xstring} \RequirePackage{graphicx} @@ -405,7 +406,7 @@ \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}} @@ -873,7 +874,7 @@ \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'}% }% @@ -1131,7 +1132,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'.}}}} \newcounter{locpubpairs} @@ -3008,6 +3009,7 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{altreportdetails}% \usebibmacro{court-note}% } +\newcommand*\oxrefand{ and } \newbibmacro{eucasetype}{% \iffieldundef{type}{% \ifboolexpr{ @@ -3015,7 +3017,7 @@ reference,mvreference,inreference]{volume}{% or test {\IfSubStr{\thefield{number}}{--}} or - test {\IfSubStr{\thefield{number}}{ and }} + test {\IfSubStr{\thefield{number}}{\oxrefand}} }{% \bibstring{eujoinedcases}% }{% @@ -3788,6 +3790,7 @@ reference,mvreference,inreference]{volume}{% \iffieldequalstr{relatedtype}{multivolume}{% \setunit{\addcomma\space}}{}% }}{}{\wlog{WARNING: biblatex-oxref failed to append to begrelated}} +\renewcommand*{\begrelateddelimmultivolume}{\newunitpunct} \newbibmacro*{rellanguage}{% \def\do##1{% diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx index 0993633927a..6bef2cba858 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{2019/02/15 v1.0} +\def\Version{2019/02/19 v1.1} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.bbx} [\Version\space Author-year bibliography style inspired by the Oxford Guide to Style] @@ -22,14 +22,14 @@ \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'.}}} diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx index 0c8d18faf3c..1b687ca5ceb 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{2019/02/15 v1.0} +\def\Version{2019/02/19 v1.1} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.cbx} [\Version\space Author-year citation style inspired by the Oxford Guide to Style] @@ -53,6 +53,10 @@ \renewcommand*{\multicitedelim}{\addsemicolon\space} \renewcommand*{\compcitedelim}{\addsemicolon\space} \renewcommand*{\postnotedelim}{\addcolon\space} +\RequirePackage{etoolbox} +\RequirePackage{xpatch} +\providetoggle{blx@ox@autoanon} +\providetoggle{blx@ox@abbranon} \xpatchbibmacro{textcite}{% \printnames{labelname}% }{% diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx index 506962c0ab7..0d9d8bca0a7 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{2019/02/15 v1.0} +\def\Version{2019/02/19 v1.1} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.dbx} [\Version\space Data model for the Oxref family of styles] |