summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/biblatex-oxref
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-11-23 21:11:23 +0000
committerKarl Berry <karl@freefriends.org>2023-11-23 21:11:23 +0000
commit0dd53c7b461addea689854febc342cf29cabe54d (patch)
tree61750470e3f679e6c9ea27bea809874862ae0dc4 /Master/texmf-dist/source/latex/biblatex-oxref
parente11c7e66293c58bf67ff65b9a2d84a5548982907 (diff)
biblatex-oxref (23nov23)
git-svn-id: svn://tug.org/texlive/trunk@68945 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/biblatex-oxref')
-rw-r--r--Master/texmf-dist/source/latex/biblatex-oxref/Makefile29
-rw-r--r--Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx212
2 files changed, 144 insertions, 97 deletions
diff --git a/Master/texmf-dist/source/latex/biblatex-oxref/Makefile b/Master/texmf-dist/source/latex/biblatex-oxref/Makefile
index d60109f0e16..c51927feb8b 100644
--- a/Master/texmf-dist/source/latex/biblatex-oxref/Makefile
+++ b/Master/texmf-dist/source/latex/biblatex-oxref/Makefile
@@ -4,6 +4,8 @@ STY1 = oxnotes
STYS = oxnotes oxyear oxnum oxalph
VARS = ibid note inote trad1 trad2 trad3
LANGS = american british english spanish
+LANGX = spanish
+TESTS = $(STYS) $(foreach sty, $(STYS), $(LANGX:%=%-$(sty)))
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)
@@ -26,22 +28,37 @@ $(NAME).pdf: $(NAME).dtx $(NAME).bbx $(STY1).bbx $(STY1).cbx british-$(NAME).lbx
$(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
-test-oxalph.tex : test-template.tex
+test-oxalph.tex: test-template.tex
sed 's/style=oxref/style=oxalph/' $< > $@
-test-oxnotes.tex : test-template.tex
+test-oxnotes.tex: test-template.tex
sed 's/style=oxref/style=oxnotes,scnames/' $< > $@
-test-oxnum.tex : test-template.tex
+test-oxnum.tex: test-template.tex
sed 's/style=oxref/style=oxnum,scnames,backref=true/' $< > $@
-test-oxyear.tex : test-template.tex
+test-oxyear.tex: test-template.tex
sed 's/style=oxref/style=oxyear/' $< > $@
$(STYS:%=test-%.pdf): test-%.pdf : test-%.tex $(NAME).bbx %.bbx %.cbx british-$(NAME).lbx english-$(NAME).lbx
latexmk -silent -lualatex -shell-escape -interaction=nonstopmode $< >/dev/null
-$(STYS:%=%.bbi): %.bbi : test-%.pdf
+
+define LANGTESTTEX =
+test-$(1)-$(2).tex: test-template.tex
+ sed -e 's/british/$(1)/' -e 's/style=oxref/style=$(2)/' $$< > $$@
+endef
+
+$(foreach lang, $(LANGX), $(foreach sty, $(STYS), $(eval $(call LANGTESTTEX,$(lang),$(sty)))))
+
+define LANGTESTPDF =
+test-$(1)-$(2).pdf: test-$(1)-$(2).tex $(NAME).bbx $(2).bbx $(2).cbx $(1)-$(NAME).lbx
+ latexmk -silent -lualatex -shell-escape -interaction=nonstopmode $$< >/dev/null
+endef
+
+$(foreach lang, $(LANGX), $(foreach sty, $(STYS), $(eval $(call LANGTESTPDF,$(lang),$(sty)))))
+
+$(TESTS:%=%.bbi): %.bbi : test-%.pdf
pdftotext $< $@
clean:
@for log in *.log; do [ -e "$$log" ] || continue; grep "WARNING: biblatex-oxref" $$log; test $$? -eq 1; done
- rm -f $(NAME).{$(AUX)} $(STYS:%=%-doc.{$(AUX)}) $(STYS:%=test-%.{tex,pdf}) $(STYS:%=test-%.{$(AUX)})
+ rm -f $(NAME).{$(AUX)} $(STYS:%=%-doc.{$(AUX)}) $(TESTS:%=test-%.{tex,pdf}) $(TESTS:%=test-%.{$(AUX)})
rm -f $(STYS:%=%.doc) $(LANGS:%=%-$(NAME).doc)
rm -rf _minted-*
rm -f $(NAME).markdown.in
diff --git a/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx b/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx
index ba420f12ddb..8c8c94d432f 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{2023/06/06 v3.1}
+\def\Version{2023/11/23 v3.2}
%</internal|bbx|cbx|dbx|lbx|doc>
%<*internal>
\iffalse
@@ -7926,20 +7926,43 @@ rather than \pkg[biblatex]{oxref}.}
)
}{}{\usebibmacro{name:revsdelim}}%
}{%
+% \end{macrocode}
+%
+% Some implementations of |\lbx@finalnamedelim| do not allow logical tests to
+% be included in the argument, so we need to spell out all these alternatives
+% longhand.
+%
+% \begin{macrocode}
\ifgiveninits{%
- \usebibmacro{name:title-given-family}%
- {\ifitemannotation{pseudo}{\biblstring{pseudo}}{}\namepartfamily}%
- {\namepartgiveni}%
- {\namepartprefix}%
- {\namepartsuffix}%
- {\nameparttitle}%
+ \ifitemannotation{pseudo}{%
+ \usebibmacro{name:title-given-family}%
+ {\biblstring{pseudo}\namepartfamily}%
+ {\namepartgiveni}%
+ {\namepartprefix}%
+ {\namepartsuffix}%
+ {\nameparttitle}%
+ }{%
+ \usebibmacro{name:title-given-family}%
+ {\namepartfamily}%
+ {\namepartgiveni}%
+ {\namepartprefix}%
+ {\namepartsuffix}%
+ {\nameparttitle}}%
}{%
- \usebibmacro{name:title-given-family}%
- {\ifitemannotation{pseudo}{\biblstring{pseudo}}{}\namepartfamily}%
- {\namepartgiven}%
- {\namepartprefix}%
- {\namepartsuffix}%
- {\nameparttitle}%
+ \ifitemannotation{pseudo}{%
+ \usebibmacro{name:title-given-family}%
+ {\biblstring{pseudo}\namepartfamily}%
+ {\namepartgiven}%
+ {\namepartprefix}%
+ {\namepartsuffix}%
+ {\nameparttitle}%
+ }{%
+ \usebibmacro{name:title-given-family}%
+ {\namepartfamily}%
+ {\namepartgiven}%
+ {\namepartprefix}%
+ {\namepartsuffix}%
+ {\nameparttitle}}%
}%
\savefield{hash}{\blx@ox@lasthash}%
}%
@@ -13821,6 +13844,13 @@ reference,mvreference,inreference]{volume}{%
and
togl {blx@ox@nonodate}
}{}{\printtext[datelabel]{\printlabeldateextra}}}
+% \end{macrocode}
+%
+% Since v3.12, authoryear.bbx has had an |bbx:ifmergeddate| test. We don't use
+% it, but if we define it too it suppresses redefinition warnings later.
+%
+% \begin{macrocode}
+\newbibmacro*{bbx:ifmergeddate}{\@secondoftwo}
% \end{macrocode}
%
@@ -15538,7 +15568,7 @@ reference,mvreference,inreference]{volume}{%
conductors = {{directores}{dirs\adddot}},
serieseditor = {{editor de la serie}{ed\adddotspace ser\adddot}},
serieseditors = {{editores de la serie}{eds\adddotspace ser\adddot}},
- holder = {{titular}{tit\adddot},
+ holder = {{titular}{tit\adddot}},
holders = {{titulares}{tits\adddot}},
editorcm = {{editor y compilador}{ed\adddotspace y comp\adddot}},
editorcms = {{editores y compiladores}{eds\adddotspace y comps\adddot}},
@@ -15705,83 +15735,83 @@ reference,mvreference,inreference]{volume}{%
% the abbreviated versions of the roles expressed as actions.
%
% \begin{macrocode}
- byeditor = {{editado}{ed\adddotspace}},
+ byeditor = {{editado por}{ed\adddotspace}},
byredactor = {{redacci\'on de}{red\adddotspace de}},
- byreviser = {{revisado}{rev\adddotspace}},
- byreviewer = {{rese\~nado}{res\adddotspace}},
- byfounder = {{fundado}{fund\adddotspace}},
- bycontinuator = {{continuado}{cont\adddotspace}},
+ byreviser = {{revisado por}{rev\adddotspace}},
+ byreviewer = {{rese\~nado por}{res\adddotspace}},
+ byfounder = {{fundado por}{fund\adddotspace}},
+ bycontinuator = {{continuado por}{cont\adddotspace}},
bycollaborator = {{colaboraci\'on de}{col\adddotspace de}},
- bytranslator = {{traducido \lbx@lfromlang\}{trad\adddotspace \lbx@sfromlang\}},
- bycommentator = {{comentado}{com\adddotspace}},
- byannotator = {{anotado}{anot\adddotspace}},
- byeditortr = {{editado y traducido \lbx@lfromlang\}%
- {ed\adddotspace y trad\adddotspace \lbx@sfromlang\}},
- byeditorco = {{editado y comentado}%
- {ed\adddotspace y com\adddotspace}},
- byeditoran = {{editado y anotado}%
- {ed\adddotspace y anot\adddotspace}},
- byeditorin = {{editado e introducido}%
+ bytranslator = {{traducido \lbx@lfromlang\ por}{trad\adddotspace \lbx@sfromlang}},
+ bycommentator = {{comentado por}{com\adddotspace}},
+ byannotator = {{anotado por}{anot\adddotspace}},
+ byeditortr = {{editado y traducido \lbx@lfromlang\ por}%
+ {ed\adddotspace y trad\adddotspace \lbx@sfromlang}},
+ byeditorco = {{editado y comentado por}%
+ {ed\adddotspace y com\adddotspace }},
+ byeditoran = {{edici\'on y notas de}%
+ {ed\adddotspace y not\adddotspace}},
+ byeditorin = {{edici\'on e introducci\'on de}%
{ed\adddotspace e intr\adddotspace}},
- byeditorfo = {{editado y prologado}%
+ byeditorfo = {{edici\'on y pr\'ologo de}%
{ed\adddotspace y pr\'ol\adddotspace}},
- byeditoraf = {{editado y epilogado}%
+ byeditoraf = {{edici\'on y ep\'ilogo de}%
{ed\adddotspace y ep\'il\adddotspace}},
- byeditortrco = {{editado, traducido \lbx@lfromlang\ y comentado}%
+ byeditortrco = {{editado, traducido \lbx@lfromlang\ y comentado por}%
{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y com\adddotspace}},
- byeditortran = {{editado, traducido \lbx@lfromlang\ y anotado}%
- {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y anot\adddotspace}},
- byeditortrin = {{editado, traducido \lbx@lfromlang\ e introducido}%
+ byeditortran = {{edici\'on, traducci\'on \lbx@lfromlang\ y notas de}%
+ {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y not\adddotspace}},
+ byeditortrin = {{edici\'on, traducci\'on \lbx@lfromlang\ e introducci\'on de}%
{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ e intr\adddotspace}},
- byeditortrfo = {{editado, traducido \lbx@lfromlang\ y prologado}%
+ byeditortrfo = {{edici\'on, traducci\'on \lbx@lfromlang\ y pr\'ologo de}%
{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y pr\'ol\adddotspace}},
byeditortraf = {{editado, traducido \lbx@lfromlang\ y epilogado}%
{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y ep\'il\adddotspace}},
byeditorcoin = {{editado, comentado e introducido}%
{ed.,\addabbrvspace com\adddotspace e intr\adddotspace}},
- byeditorcofo = {{editado, comentado y prologado}%
+ byeditorcofo = {{edici\'on, comentarios y pr\'ologo de}%
{ed.,\addabbrvspace com\adddotspace y pr\'ol\adddotspace}},
- byeditorcoaf = {{editado, comentado y epilogado}%
+ byeditorcoaf = {{edici\'on, comentarios y ep\'ilogo de}%
{ed.,\addabbrvspace com\adddotspace y ep\'il\adddotspace}},
- byeditoranin = {{editado, anotado e introducido}%
+ byeditoranin = {{edici\'on, notas e introducci\'on de}%
{ed.,\addabbrvspace anot\adddotspace e intr\adddotspace}},
- byeditoranfo = {{editado, anotado y prologado}%
+ byeditoranfo = {{edici\'on, notas y pr\'ologo de}%
{ed.,\addabbrvspace anot\adddotspace y pr\'ol\adddotspace}},
- byeditoranaf = {{editado, anotado y epilogado}%
+ byeditoranaf = {{edici\'on, notas y ep\'ilogo de}%
{ed.,\addabbrvspace anot\adddotspace y ep\'il\adddotspace}},
- byeditortrcoin = {{editado, traducido \lbx@lfromlang, comentado e introducido}%
+ byeditortrcoin = {{edici\'on, traducci\'on \lbx@lfromlang, comentarios e introducci\'on de}%
{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, com\adddotspace e intr\adddotspace}},
- byeditortrcofo = {{editado, traducido \lbx@lfromlang, comentado y prologado}%
+ byeditortrcofo = {{edici\'on, traducci\'on \lbx@lfromlang, comentarios y pr\'ologo de}%
{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, com\adddotspace y pr\'ol\adddotspace}},
- byeditortrcoaf = {{editado, traducido \lbx@lfromlang, comentado y epilogado}%
+ byeditortrcoaf = {{edici\'on, traducci\'on \lbx@lfromlang, comentarios y ep\'ilogo de}%
{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, com\adddotspace y ep\'il\adddotspace}},
- byeditortranin = {{editado, traducido \lbx@lfromlang, anotado e introducido}%
+ byeditortranin = {{edici\'on, traducci\'on \lbx@lfromlang, notas e introducci\'on de}%
{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, anot\adddotspace e intr\adddotspace}},
- byeditortranfo = {{editado, traducido \lbx@lfromlang, anotado y prologado}%
+ byeditortranfo = {{edici\'on, traducci\'on \lbx@lfromlang, notas y pr\'ologo de}%
{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, anot\adddotspace y pr\'ol\adddotspace}},
- byeditortranaf = {{editado, traducido \lbx@lfromlang, anotado y epilogado}%
+ byeditortranaf = {{edici\'on, traducci\'on \lbx@lfromlang, notas y ep\'ilogo de}%
{ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, anot\adddotspace y ep\'il\adddotspace}},
- bytranslatorco = {{traducido \lbx@lfromlang\ y comentado}%
+ bytranslatorco = {{traducci\'on \lbx@lfromlang\ y comentarios de}%
{trad\adddotspace \lbx@sfromlang\ y com\adddotspace}},
- bytranslatoran = {{traducido \lbx@lfromlang\ y anotado}%
- {trad\adddotspace \lbx@sfromlang\ y anot\adddotspace}},
- bytranslatorin = {{traducido \lbx@lfromlang\ e introducido}%
+ bytranslatoran = {{traducci\'on \lbx@lfromlang\ y notas de}%
+ {trad\adddotspace \lbx@sfromlang\ y not\adddotspace}},
+ bytranslatorin = {{traducci\'on \lbx@lfromlang\ e introducci\'on de}%
{trad\adddotspace \lbx@sfromlang\ e introd\adddotspace}},
- bytranslatorfo = {{traducido \lbx@lfromlang\ y prologado}%
+ bytranslatorfo = {{traducci\'on \lbx@lfromlang\ y pr\'ologo de}%
{trad\adddotspace \lbx@sfromlang\ y pr\'ol\adddotspace}},
- bytranslatoraf = {{traducido \lbx@lfromlang\ y epilogado}%
+ bytranslatoraf = {{traducci\'on \lbx@lfromlang\ y ep\'ilogo de}%
{trad\adddotspace \lbx@sfromlang\ y ep\'il\adddotspace}},
- bytranslatorcoin = {{traducido \lbx@lfromlang, comentado e introducido}%
+ bytranslatorcoin = {{traducci\'on \lbx@lfromlang, comentarios e introducci\'on de}%
{trad\adddotspace \lbx@sfromlang, com\adddotspace e intr\adddotspace}},
- bytranslatorcofo = {{traducido \lbx@lfromlang, comentado y prologado}%
+ bytranslatorcofo = {{traducci\'on \lbx@lfromlang, comentarios y pr\'ologo de}%
{trad\adddotspace \lbx@sfromlang, com\adddotspace y pr\'ol\adddotspace}},
- bytranslatorcoaf = {{traducido \lbx@lfromlang, comentado y epilogado}%
+ bytranslatorcoaf = {{traducci\'on \lbx@lfromlang, comentarios y ep\'ilogo de}%
{trad\adddotspace \lbx@sfromlang, com\adddotspace y ep\'il\adddotspace}},
- bytranslatoranin = {{traducido \lbx@lfromlang, anotado e introducido}%
+ bytranslatoranin = {{traducci\'on \lbx@lfromlang, notas e introducci\'on de}%
{trad\adddotspace \lbx@sfromlang, anot\adddotspace e intr\adddotspace}},
- bytranslatoranfo = {{traducido \lbx@lfromlang, anotado y prologado}%
+ bytranslatoranfo = {{traducci\'on \lbx@lfromlang, notas y pr\'ologo}%
{trad\adddotspace \lbx@sfromlang, anot\adddotspace y pr\'ol\adddotspace}},
- bytranslatoranaf = {{traducido \lbx@lfromlang, anotado y epilogado}%
+ bytranslatoranaf = {{traducci\'on \lbx@lfromlang, notas y ep\'ilogo}%
{trad\adddotspace \lbx@sfromlang, anot\adddotspace y ep\'il\adddotspace}},
% \end{macrocode}
%
@@ -15811,50 +15841,50 @@ reference,mvreference,inreference]{volume}{%
% \emph{New Hart's Rules} uses \enquote{accessed} for URL dates.
%
% \begin{macrocode}
- urlseen = {{accessed}{accessed}},
+ urlseen = {{accedido}{accedido}},
% \end{macrocode}
%
% Oxford style is to use \enquote{henceforth}
% for shorthands and \enquote{at} to cite a page within a range.
%
% \begin{macrocode}
- citedas = {{henceforth}{henceforth}},
- thiscite = {{at}{at}},
+ citedas = {{en adelante}{en adelante}},
+ thiscite = {{en}{en}},
% \end{macrocode}
%
% Languages are abbreviated.
%
% \begin{macrocode}
- langamerican = {{ingl\'es americano}{ingl\'es americano}},
- langbrazilian = {{brasile\~no}{brasile\~no}},
- langbulgarian = {{b\'ulgaro}{b\'ulgaro}},
- langcatalan = {{catal\'an}{catal\'an}},
- langcroatian = {{croata}{croata}},
- langczech = {{checo}{checo}},
- langdanish = {{dan\'es}{dan\'es}},
- langdutch = {{neerland\'es}{neerland\'es}},
- langenglish = {{ingl\'es}{ingl\'es}},
- langestonian = {{estonio}{estonio}},
- langfinnish = {{fin\'es}{fin\'es}},
- langfrench = {{franc\'es}{franc\'es}},
- langgalician = {{gallego}{gallego}},
- langgerman = {{alem\'an}{alem\'an}},
- langgreek = {{griego}{griego}},
- langhungarian = {{h\'ungaro}{h\'ungaro}},
- langitalian = {{italiano}{italiano}},
- langjapanese = {{japon\'es}{japon\'es}},
- langlatin = {{lat\'in}{lat\'in}},
- langlatvian = {{lituano}{lituano}},
- langnorwegian = {{noruego}{noruego}},
- langpolish = {{polaco}{polaco}},
- langportuguese = {{portugu\'es}{portugu\'es}},
- langrussian = {{ruso}{ruso}},
- langserbian = {{serbio}{serbio}},
- langslovak = {{eslovaco}{eslovaco}},
- langslovene = {{esloveno}{esloveno}},
- langspanish = {{espa\~nol}{espa\~nol}},
+ langamerican = {{ingl\'es americano}{ing\adddotspace amer\adddotspace}},
+ langbrazilian = {{brasile\~no}{por\adddotspace bras\adddotspace}},
+ langbulgarian = {{b\'ulgaro}{bul\adddotspace}},
+ langcatalan = {{catal\'an}{cat\adddotspace}},
+ langcroatian = {{croata}{hrv\adddotspace}},
+ langczech = {{checo}{ces\adddotspace}},
+ langdanish = {{dan\'es}{dan\adddotspace}},
+ langdutch = {{neerland\'es}{nld\adddotspace}},
+ langenglish = {{ingl\'es}{ing\adddotspace}},
+ langestonian = {{estonio}{est\adddotspace}},
+ langfinnish = {{fin\'es}{fin\adddotspace}},
+ langfrench = {{franc\'es}{fra\adddotspace}},
+ langgalician = {{gallego}{glg\adddotspace}},
+ langgerman = {{alem\'an}{ale\adddotspace}},
+ langgreek = {{griego}{gr\adddotspace}},
+ langhungarian = {{h\'ungaro}{hun\adddotspace}},
+ langitalian = {{italiano}{ita\adddotspace}},
+ langjapanese = {{japon\'es}{jap\adddotspace}},
+ langlatin = {{lat\'in}{lat\adddotspace}},
+ langlatvian = {{lituano}{lit\adddotspace}},
+ langnorwegian = {{noruego}{nor\adddotspace}},
+ langpolish = {{polaco}{pol\adddotspace}},
+ langportuguese = {{portugu\'es}{port\adddotspace}},
+ langrussian = {{ruso}{rus\adddotspace}},
+ langserbian = {{serbio}{srp\adddotspace}},
+ langslovak = {{eslovaco}{slk\adddotspace}},
+ langslovene = {{esloveno}{slv\adddotspace}},
+ langspanish = {{espa\~nol}{esp\adddotspace}},
langswedish = {{sueco}{sueco}},
- langukrainian = {{ucraniano}{ucraniano}},
+ langukrainian = {{ucraniano}{ucr\adddotspace}},
}
% \end{macrocode}
%