From 17d86dd07c77d1ea319ed6c93a568fe59cb95a30 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 19 Oct 2020 21:09:49 +0000 Subject: biblatex-oxref (19oct20) git-svn-id: svn://tug.org/texlive/trunk@56706 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/biblatex-oxref/Makefile | 6 +++--- .../source/latex/biblatex-oxref/oxref.dtx | 25 ++++++++++------------ 2 files changed, 14 insertions(+), 17 deletions(-) (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/latex/biblatex-oxref/Makefile b/Master/texmf-dist/source/latex/biblatex-oxref/Makefile index ee024a4bf68..527f4146c6f 100644 --- a/Master/texmf-dist/source/latex/biblatex-oxref/Makefile +++ b/Master/texmf-dist/source/latex/biblatex-oxref/Makefile @@ -7,7 +7,7 @@ AUX = aux,bbl,bcf,blg,doc,fdb_latexmk,fls,glo,gls,hd,idx,ilg,ind,listing,log,n SHELL = bash PWD = $(shell pwd) TEMP := $(shell mktemp -d -t tmp.XXXXXXXXXX) -TDIR = $(TEMP)/$(NAME) +TDIR = $(TEMP)/$(PFX)$(NAME) VERS = $(shell ltxfileinfo -v $(NAME).dtx) LOCAL = $(shell kpsewhich --var-value TEXMFLOCAL) UTREE = $(shell kpsewhich --var-value TEXMFHOME) @@ -58,8 +58,8 @@ uninstall: zip: all mkdir $(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) + cd $(TEMP); zip -Drq $(PWD)/$(PFX)$(NAME)-$(VERS).zip $(PFX)$(NAME) ctan: all mkdir $(TDIR) cp $(NAME).{dtx,pdf} $(STYS:%=%-doc.pdf) README.md Makefile $(TDIR) - cd $(TEMP); zip -Drq $(PWD)/$(PFX)$(NAME)-$(VERS).zip $(NAME) + cd $(TEMP); zip -Drq $(PWD)/$(PFX)$(NAME)-$(VERS).zip $(PFX)$(NAME) diff --git a/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx b/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx index 5677b16828b..32c12f7cb7a 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{2020/01/27 v2.0.1} +\def\Version{2020/10/19 v2.1} % %<*internal> \iffalse @@ -5334,7 +5334,7 @@ The \emph{Oxford Guide to Style} prints all information about the transmission, \section{Images and works of art} -\tip{If you need the type of image or arrtwork to appear in square brackets, +\tip{If you need the type of image or artwork to appear in square brackets, put it in \code{titleaddon}. Otherwise, put it in \code{type}.} \tip{Use \code{institution} (a list) or \code{venue} (a literal) for the @@ -12142,21 +12142,21 @@ reference,mvreference,inreference]{volume}{% % \subsubsection{Related editions} % % This macro is based on the \enquote{bytranslator} one, but more general. +% Note that |\mkrelatedstringtext| was introduced in \pkg{biblatex} v3.16, +% so we backport it if an earlier version is used. % % \begin{macrocode} +\providecommand*{\mkrelatedstringtext}[1]{{{\mainlang #1}}} \newbibmacro*{related:editedas}[1]{% \entrydata{#1}{% \renewbibmacro*{name:hook}[1]{% - \ifnumequal{\value{listcount}}{1}{% - \begingroup - \mkrelatedstring% - \lbx@initnamehook{#1}% - \endgroup - }{}}% + \ifnumequal{\value{listcount}}{1} + {\mkrelatedstringtext{\lbx@initnamehook{#1}}} + {}}% \printfield{edition}% \setunit{\addspace}% \usebibmacro{byeditor+others}% - \setunit*{\addcomma\space\bibstring[\mkrelatedstring]{astitle}\space}% + \setunit*{\addcomma\space\bibstring[\mkrelatedstringtext]{astitle}\space}% \usebibmacro{maintitle+title}% \setunit{\addspace}% \printfield{note}% @@ -12168,13 +12168,10 @@ reference,mvreference,inreference]{volume}{% \entrydata{#1}{% \renewbibmacro*{name:hook}[1]{% \ifnumequal{\value{listcount}}{1} - {\begingroup - \mkrelatedstring% - \lbx@initnamehook{#1}% - \endgroup} + {\mkrelatedstringtext{\lbx@initnamehook{#1}}} {}}% \printnames[bytranslator]{translator}% - \setunit*{\addspace\bibstring[\mkrelatedstring]{astitle}\space}% + \setunit*{\addspace\bibstring[\mkrelatedstringtext]{astitle}\space}% \usebibmacro{maintitle+title}% \setunit{\addspace}% \printfield{note}% -- cgit v1.2.3