summaryrefslogtreecommitdiff
path: root/macros/latex/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib')
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile29
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdfbin465449 -> 465495 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdfbin473126 -> 473027 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdfbin469581 -> 469483 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx212
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdfbin597300 -> 597953 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdfbin469561 -> 469617 bytes
-rw-r--r--macros/latex/contrib/mandi/README.md39
-rw-r--r--macros/latex/contrib/mandi/mandi.dtx80
-rw-r--r--macros/latex/contrib/mandi/mandi.ins22
-rw-r--r--macros/latex/contrib/mandi/mandi.pdfbin515270 -> 514465 bytes
-rw-r--r--macros/latex/contrib/mandi/mandiexp.dtx20
-rw-r--r--macros/latex/contrib/mandi/mandistudent.dtx41
13 files changed, 249 insertions, 194 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile
index d60109f0e1..c51927feb8 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile
+++ b/macros/latex/contrib/biblatex-contrib/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/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf
index e4bea5bdcf..0ce372ce9b 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf
index d21bb281b3..649083bbef 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf
index e331370beb..7c8b8360de 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx
index ba420f12dd..8c8c94d432 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx
+++ b/macros/latex/contrib/biblatex-contrib/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}
%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf
index 0511bca7f4..08147694cc 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf
index b9a60cde4a..89a6515237 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/mandi/README.md b/macros/latex/contrib/mandi/README.md
index bc2d56ec0a..08370223e0 100644
--- a/macros/latex/contrib/mandi/README.md
+++ b/macros/latex/contrib/mandi/README.md
@@ -1,9 +1,34 @@
-`mandi` provides commands for introductory physics. To install, open a command
-line and type the following, repeating 2-4 until there are no warnings:
+# mandi - Macros for introductory physics
- 1. `lualatex mandi.ins` (can also use latex)
- 2. `lualatex mandi.dtx` (lualatex is required)
- 3. `makeindex -s gind.ist -o mandi.ind mandi.idx`
- 4. `makeindex -s gglo.ist -o mandi.gls mandi.glo`
+## Description
+`mandi` (which can be pronounced with two syllables rhyming with _candy_, or with three
+as _M and I_, referencing a popular introductory physics textbook) is for students and
+instructors in an introductory physics course. They can use `mandi` to write solutions,
+class notes, handouts, assessments, and other such documents. Using physical quantities
+(and constants) by name eliminates missing units. Step-by-step solutions and reasoning
+eliminates missing work, and consistent notation can be employed.
-Move the `*.sty` files into a directory searched by TeX. Delete `vdemo.py`.
+### `mandi`
+The `mandi` package defines every physical quantity and constant used in introductory
+physics by its name. SI units are included by default in any of three different kinds
+(base, derived, and alternate). A simple interface for defining additional quantities
+and constants is provided.
+
+### `mandistudent`
+The `mandistudent` package defines additional commands and environments for writing
+solutions to physics problems. The `physicsproblem` and `physicssolution` environments
+allow for semantically structured solutions. Computational problems are accommodated
+as [Web VPython](https://glowscript.org/) and [VPython](https://vpython.org/) code.
+
+### `mandiexp`
+The `mandiexp` package defines commands for typesetting the equations and expressions
+most frequently used in introductory physics. The equations and expressions are based
+on those found in [*Matter & Interactions*](https://matterandinteractions.org/) but
+are certainly applicable to any introductory physics textbook.
+
+## Author and Maintainer
+`mandi` is authored and maintained by
+[Paul J. Heafner](mailto:heafnerj@gmail.com?subject=[Heafner]%20mandi).
+
+## License
+`mandi` is released under [LPPL](https://www.latex-project.org/lppl.txt) 1.3c and later.
diff --git a/macros/latex/contrib/mandi/mandi.dtx b/macros/latex/contrib/mandi/mandi.dtx
index 745b779af6..3907b21e1b 100644
--- a/macros/latex/contrib/mandi/mandi.dtx
+++ b/macros/latex/contrib/mandi/mandi.dtx
@@ -4,10 +4,10 @@
% Copyright (C) 2023 by Paul J. Heafner <heafnerj@gmail.com>
% ---------------------------------------------------------------------------
% This work may be distributed and/or modified under the conditions of the
-% LaTeX Project Public License, either version 1.3 of this license or (at
+% LaTeX Project Public License, either version 1.3c of this license or (at
% your option) any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX version
+% https://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions of LaTeX version
% 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
@@ -27,10 +27,6 @@
% vdemo.py (not needed)
% ---------------------------------------------------------------------------
%
-% \fi
-%
-% \iffalse
-%
%<*internal>
\iffalse
%</internal>
@@ -58,10 +54,11 @@
% This can be changed in a local ltxdoc.cfg file but it is
% easier to just use the article class and the doc package
% instead and force letterpaper size.
-\documentclass[10pt,letterpaper]{ltxdoc}
-\SetupDoc{reportchangedates}
-%\documentclass[10pt,letterpaper]{article}
-%\usepackage[nohyperref,reportchangedates]{doc} % doc v3 zzzz
+%\documentclass[10pt,letterpaper]{ltxdoc}
+%\SetupDoc{reportchangedates}
+\documentclass[10pt,letterpaper]{article}
+\usepackage[reportchangedates]{doc} % THIS SUDDENLY WORKS!
+%\usepackage{hypdoc} % THIS ALSO WORKS!
\PassOptionsToPackage{listings,documentation}{tcolorbox} % prevent option clash
\usepackage{\jobname} % load mandi.sty
\usepackage{mandistudent} % load mandistudent.sty
@@ -236,15 +233,32 @@
% \listoffigures
% \restoregeometry
%
-% \changes{v3.0.0}{2021-08-22}{\linktoplace{sec:mandia}{mandi} Initial release}
-% \changes{v3.0.0}{2021-08-22}{\linktoplace{sec:mandib}{mandistudent} Initial release}
-% \changes{v3.0.0}{2021-08-22}{\linktoplace{sec:mandic}{mandiexp} Initial release}
-% \changes{v3.0.1}{2021-08-24}{\linktoplace{sec:mandia}{mandi} Minor doc changes}
-% \changes{v3.0.1}{2021-08-24}{\linktoplace{sec:mandib}{mandistudent} Minor doc changes}
-% \changes{v3.0.1}{2021-08-24}{\linktoplace{sec:mandic}{mandiexp} Minor doc changes}
-% \changes{v3.2.0}{2023-08-01}{\linktoplace{sec:mandia}{mandi} Source updated}
-% \changes{v3.2.0}{2023-08-01}{\linktoplace{sec:mandib}{mandistudent} Source updated}
-% \changes{v3.2.0}{2023-08-01}{\linktoplace{sec:mandic}{mandiexp} Source updated}
+% \changes{v3.0.0}{2021-08-22}
+% {\linktoplace{sec:mandia}{mandi} \linktoplace{sec:mandib}{mandistudent}
+% \linktoplace{sec:mandic}{mandiexp} Initial release}
+% \changes{v3.0.1}{2021-08-24}
+% {\linktoplace{sec:mandia}{mandi} \linktoplace{sec:mandib}{mandistudent}
+% \linktoplace{sec:mandic}{mandiexp}Minor doc changes}
+% \changes{v3.1.0}{2022-01-27}
+% {\linktoplace{sec:mandia}{mandi} \linktoplace{sec:mandib}{mandistudent}
+% \linktoplace{sec:mandic}{mandiexp} Code formatted for better readability}
+% \changes{v3.1.0}{2022-01-27}
+% {\linktoplace{sec:mandia}{mandi} \linktoplace{sec:mandib}{mandistudent}
+% \linktoplace{sec:mandic}{mandiexp} \pkg{xparse} is loaded for older formats}
+% \changes{v3.1.0}{2022-01-27}
+% {\linktoplace{sec:mandia}{mandi} \linktoplace{sec:mandib}{mandistudent}
+% \LaTeX3 code now conforms to formatting standards}
+% \changes{v3.2.0}{2023-08-01}
+% {\linktoplace{sec:mandia}{mandi} \linktoplace{sec:mandib}{mandistudent}
+% \linktoplace{sec:mandic}{mandiexp} Source updated}
+% \changes{v3.2.1}{2023-11-22}{Improved \texttt{README.md} at request of \texttt{CTAN}
+% maintainer}
+% \changes{v3.2.1}{2023-11-22}{\linktoplace{sec:mandia}{mandi} Minor changes to
+% \texttt{mandi.ins} inside \texttt{mandi.dtx}}
+% \changes{v3.2.1}{2023-11-22}
+% {\linktoplace{sec:mandia}{mandi} \linktoplace{sec:mandib}{mandistudent}
+% \linktoplace{sec:mandic}{mandiexp} Source updated and bumped version for new
+% \texttt{CTAN} upload}
%
% \section{Introduction}
% The \mandi \footnote{The bundle name can be pronounced either with two
@@ -262,13 +276,13 @@
% {\emph{Matter \& Interactions}} and
% \url{https://matterandinteractions.org/} for details.}
%
-% So many changes have been made that I think the best approach for former,
-% as well as new, users is to treat this as a brand new experience. I think
-% the most important thing to keep in mind is that I assume users,
-% especially new users, will have a relatively recent TeX distribution
-% (like TeX Live) that includes a recently updated \LaTeXe{} kernel. If users
-% report that this is a major problem, I can provide some degree of
-% backwards compatibility. However, I use a fully updated TeX Live distribution.
+% So many changes have been made that I think the best approach for all
+% users is to treat this as a brand new experience. I think the most
+% important thing to keep in mind is that I assume all users will have a
+% relatively recent \TeX\ distribution (like \TeX~Live) that includes an
+% updated kernel. If users report that this is a major problem, I can provide
+% some degree of backwards compatibility. However, I use a fully updated
+% \TeX~Live distribution.
%
% \section{Getting Help}
% If you have a question about \mandi, first please read this documentation to make
@@ -1951,13 +1965,11 @@
% |\makeatother|. This simplifies defining internal commands (with |@|
% in the name) that are not for the user to know about.
%
-% \changes{v3.1.0}{2022-01-27}
-% {\linktoplace{sec:mandia}{mandi} Code formatted for better readability}
% \begin{macrocode}
-\def\mandi@version{3.2.0}
-\def\mandi@date{2023-08-01}
+\def\mandi@version{3.2.1}
+\def\mandi@date{2023-11-22}
\NeedsTeXFormat{LaTeX2e}[2020-02-02]
-\DeclareRelease{v3.2.0}{2023-08-01}{mandi.sty}
+\DeclareRelease{v3.2.1}{2023-11-22}{mandi.sty}
\DeclareCurrentRelease{v\mandi@version}{\mandi@date}
\ProvidesPackage{mandi}
[\mandi@date\space v\mandi@version\space Macros for physical quantities]
@@ -2009,8 +2021,6 @@
%
% Load \pkg{xparse} if necessary.
%
-% \changes{v3.1.0}{2022-01-27}
-% {\linktoplace{sec:mandia}{mandi} \pkg{xparse} is loaded for older formats}
% \begin{macrocode}
\IfFormatAtLeastTF{2020-10-01}
{}%
@@ -2241,8 +2251,6 @@
\NewDocumentCommand{\xtento}{ m }{\times\tento{#1}}
% \end{macrocode}
%
-% \changes{v3.1.0}{2022-01-27}
-% {\linktoplace{sec:mandia}{mandi} \LaTeX3 code now conforms to formatting standards}
% \begin{macrocode}
\ExplSyntaxOn
\cs_new:Npn \__mandi_newscalarquantity:nnnn #1#2#3#4
diff --git a/macros/latex/contrib/mandi/mandi.ins b/macros/latex/contrib/mandi/mandi.ins
index e235a16fbe..a479906b68 100644
--- a/macros/latex/contrib/mandi/mandi.ins
+++ b/macros/latex/contrib/mandi/mandi.ins
@@ -9,10 +9,10 @@
%% Copyright (C) 2023 by Paul J. Heafner <heafnerj@gmail.com>
%% ---------------------------------------------------------------------------
%% This work may be distributed and/or modified under the conditions of the
-%% LaTeX Project Public License, either version 1.3 of this license or (at
+%% LaTeX Project Public License, either version 1.3c of this license or (at
%% your option) any later version. The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX version
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX version
%% 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
@@ -41,10 +41,10 @@
Copyright (C) 2023 by Paul J. Heafner <heafnerj@gmail.com>
---------------------------------------------------------------------------
This work may be distributed and/or modified under the conditions of the
- LaTeX Project Public License, either version 1.3 of this license or (at
+ LaTeX Project Public License, either version 1.3c of this license or (at
your option) any later version. The latest version of this license is in
- http://www.latex-project.org/lppl.txt
- and version 1.3 or later is part of all distributions of LaTeX version
+ https://www.latex-project.org/lppl.txt
+ and version 1.3c or later is part of all distributions of LaTeX version
2005/12/01 or later.
This work has the LPPL maintenance status `maintained'.
@@ -75,12 +75,12 @@
\obeyspaces
\Msg{**************************************************************}
\Msg{* *}
-\Msg{* To finish the installation, open a command line and *}
-\Msg{* type the following, repeating 2-4 until there are no *}
+\Msg{* Process this file with lualatex or pdflatex and then *}
+\Msg{* type the following, repeating 1-3 until there are no *}
\Msg{* warnings: *}
-\Msg{* 2. lualatex mandi.dtx (lualatex is required) *}
-\Msg{* 3. makeindex -s gind.ist -o mandi.ind mandi.idx *}
-\Msg{* 4. makeindex -s gglo.ist -o mandi.gls mandi.glo *}
+\Msg{* 1. lualatex mandi.dtx (lualatex is required) *}
+\Msg{* 2. makeindex -s gind.ist -o mandi.ind mandi.idx *}
+\Msg{* 3. makeindex -s gglo.ist -o mandi.gls mandi.glo *}
\Msg{* Move the *.sty files into a directory searched by TeX. *}
\Msg{* Delete vdemo.py. *}
\Msg{* *}
diff --git a/macros/latex/contrib/mandi/mandi.pdf b/macros/latex/contrib/mandi/mandi.pdf
index 02dbcf4efd..9b3fa83b44 100644
--- a/macros/latex/contrib/mandi/mandi.pdf
+++ b/macros/latex/contrib/mandi/mandi.pdf
Binary files differ
diff --git a/macros/latex/contrib/mandi/mandiexp.dtx b/macros/latex/contrib/mandi/mandiexp.dtx
index 3e4f83f419..bbd1501a73 100644
--- a/macros/latex/contrib/mandi/mandiexp.dtx
+++ b/macros/latex/contrib/mandi/mandiexp.dtx
@@ -4,10 +4,10 @@
% Copyright (C) 2023 by Paul J. Heafner <heafnerj@gmail.com>
% ---------------------------------------------------------------------------
% This work may be distributed and/or modified under the conditions of the
-% LaTeX Project Public License, either version 1.3 of this license or (at
+% LaTeX Project Public License, either version 1.3c of this license or (at
% your option) any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX version
+% https://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions of LaTeX version
% 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
@@ -27,10 +27,6 @@
% vdemo.py (not needed)
% ---------------------------------------------------------------------------
%
-% \fi
-%
-% \iffalse
-%
%<*internal>
\iffalse
%</internal>
@@ -574,13 +570,11 @@
%
% \changes{v3.1.0}{2022-01-27}
% {\linktoplace{sec:mandic}{mandiexp} Version number works}
-% \changes{v3.1.0}{2022-01-27}
-% {\linktoplace{sec:mandic}{mandiexp} Code formatted for better readability}
% \begin{macrocode}
-\def\mandiexp@version{3.2.0}
-\def\mandiexp@date{2023-08-01}
+\def\mandiexp@version{3.2.1}
+\def\mandiexp@date{2023-11-22}
\NeedsTeXFormat{LaTeX2e}[2020-02-02]
-\DeclareRelease{v3.2.0}{2023-08-01}{mandiexp.sty}
+\DeclareRelease{v3.2.1}{2023-11-22}{mandiexp.sty}
\DeclareCurrentRelease{v\mandiexp@version}{\mandiexp@date}
\ProvidesPackage{mandiexp}
[\mandiexp@date\space v\mandiexp@version\space Macros for Matter & Interactions]
@@ -617,8 +611,6 @@
%
% Load \pkg{xparse} if necessary.
%
-% \changes{v3.1.0}{2022-01-27}
-% {\linktoplace{sec:mandic}{mandiexp} \pkg{xparse} is loaded for older formats}
% \begin{macrocode}
\IfFormatAtLeastTF{2020-10-01}%
{}%
diff --git a/macros/latex/contrib/mandi/mandistudent.dtx b/macros/latex/contrib/mandi/mandistudent.dtx
index 90b4a3dbd7..da277a0baa 100644
--- a/macros/latex/contrib/mandi/mandistudent.dtx
+++ b/macros/latex/contrib/mandi/mandistudent.dtx
@@ -4,10 +4,10 @@
% Copyright (C) 2023 by Paul J. Heafner <heafnerj@gmail.com>
% ---------------------------------------------------------------------------
% This work may be distributed and/or modified under the conditions of the
-% LaTeX Project Public License, either version 1.3 of this license or (at
+% LaTeX Project Public License, either version 1.3c of this license or (at
% your option) any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX version
+% https://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions of LaTeX version
% 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
@@ -27,10 +27,6 @@
% vdemo.py (not needed)
% ---------------------------------------------------------------------------
%
-% \fi
-%
-% \iffalse
-%
%<*internal>
\iffalse
%</internal>
@@ -826,7 +822,7 @@ while t < 10:
},%
}%
Typesets tensor contraction in coordinate-free notation. There
- is no standard on this so we assert one here.
+ is no standard for this so we assert one here.
\end{docCommands}
\begin{dispExample}
\( \contraction{1,2} \) \\
@@ -1246,13 +1242,11 @@ while t < 10:
%
% \changes{v3.1.0}{2022-01-27}
% {\linktoplace{sec:mandib}{mandistudent} Version number works}
-% \changes{v3.1.0}{2022-01-27}
-% {\linktoplace{sec:mandib}{mandistudent} Code formatted for better readability}
% \begin{macrocode}
-\def\mandistudent@version{3.2.0}
-\def\mandistudent@date{2023-08-01}
+\def\mandistudent@version{3.2.1}
+\def\mandistudent@date{2023-11-22}
\NeedsTeXFormat{LaTeX2e}[2020-02-02]
-\DeclareRelease{v3.2.0}{2023-08-01}{mandistudent.sty}
+\DeclareRelease{v3.2.1}{2023-11-22}{mandistudent.sty}
\DeclareCurrentRelease{v\mandistudent@version}{\mandistudent@date}
\ProvidesPackage{mandistudent}
[\mandistudent@date\space v\mandistudent@version\space Macros for introductory physics]
@@ -1364,8 +1358,6 @@ while t < 10:
%
% Load \pkg{xparse} if necessary.
%
-% \changes{v3.1.0}{2022-01-27}
-% {\linktoplace{sec:mandib}{mandistudent} \pkg{xparse} is loaded for older formats}
% \begin{macrocode}
\IfFormatAtLeastTF{2020-10-01}
{}%
@@ -1572,8 +1564,8 @@ while t < 10:
% See also \url{https://tex.stackexchange.com/a/531037/218142}.
%
% \changes{v3.1.0}{2022-01-27}
-% {\linktoplace{sec:mandib}{mandistudent} \refCom{vec}%
-% no longer adds \cs{scriptspace} when no sub/superscript is given}
+% {\linktoplace{sec:mandib}{mandistudent} \refCom{vec} and \refCom{dirvec}%
+% no longer add \cs{scriptspace} when no sub/superscript is given}
% \begin{macrocode}
\RenewDocumentCommand{\vec}{ s m e{_^} }%
{%
@@ -1592,16 +1584,12 @@ while t < 10:
{\sb{#3\vphantom{\smash[b]{|}}}}
}%
% \end{macrocode}
-%
-% A command for the direction of a vector.
+%% A command for the direction of a vector.
% We use a slight tweak to get uniform hats that
% requires the \href{https://www.ctan.org/pkg/makebox}{\pkg{makebox}}
% package.\newline
% See \url{https://tex.stackexchange.com/a/391204/218142}.
%
-% \changes{v3.1.0}{2022-01-27}
-% {\linktoplace{sec:mandib}{mandistudent} \refCom{dirvec}%
-% no longer adds \cs{scriptspace} when no sub/superscript is given}
% \begin{macrocode}
\NewDocumentCommand{\dirvec}{ s m e{_^} }%
{%
@@ -1641,8 +1629,6 @@ while t < 10:
% Notation for column and row vectors.\newline
% See \url{https://tex.stackexchange.com/a/39054/218142}.
%
-% \changes{v3.1.0}{2022-01-27}
-% {\linktoplace{sec:mandib}{mandistudent} \LaTeX3 code now conforms to formatting standards}
% \begin{macrocode}
\ExplSyntaxOn
\NewDocumentCommand{\colvec}{ O{,} m }
@@ -2040,8 +2026,8 @@ while t < 10:
% {\linktoplace{sec:mandib}{mandistudent} \refEnv{webvpythonblock} now automatically
% generates QR codes for program listings}
% \changes{v3.2.0}{2023-08-01}
-% {\linktoplace{sec:mandib}{mandistudent} \refEnv{webvpythonblock} now shows
-% URL in header}
+% {\linktoplace{sec:mandib}{mandistudent} \refEnv{webvpythonblock} and
+% \refEnv{webvpythonblock*} now show URL in header}
% \begin{macrocode}
\AtBeginEnvironment{webvpythonblock}{\catcode`\#=12}
\AtEndEnvironment{webvpythonblock}{\catcode`\#=6}
@@ -2076,9 +2062,6 @@ while t < 10:
% \changes{v3.1.0}{2022-01-27}
% {\linktoplace{sec:mandib}{mandistudent} \refEnv{webvpythonblock*} is a variant
% of \refEnv{webvpythonblock} that omits the QR code}
-% \changes{v3.2.0}{2023-08-01}
-% {\linktoplace{sec:mandib}{mandistudent} \refEnv{webvpythonblock*} now shows
-% URL in header}
% \begin{macrocode}
\AtBeginEnvironment{webvpythonblock*}{\catcode`\#=12}
\AtEndEnvironment{webvpythonblock*}{\catcode`\#=6}