CTAN sync 202410020303

6 files changed, 58 insertions, 48 deletions

diff --git a/macros/jptex/latex/jlreq/Makefile b/macros/jptex/latex/jlreq/Makefile
index ed84b71336..9a615ebc0a 100644
--- a/macros/jptex/latex/jlreq/Makefile
+++ b/macros/jptex/latex/jlreq/Makefile
@@ -1,51 +1,53 @@
 TEXMF:=$(shell kpsewhich -var-value=TEXMFHOME)
 MAKEJVFCNF:=$(shell ls -R $(shell kpsewhich --var-value=TEXMFDIST)/fonts/source | awk '/:$$/{sub(/:$$/,"");f=$$0} tolower($$0) ~ /makejvf-upjpn\.cnf$$/{print f"/"$$0}' | head -n 1)
 
-.PHONY: all jfm doc latexdoc pdfdoc htmldoc jfm-install cls-install sty-install install tds uninstall jfmclean docclean clean
-
-all: jfm
-
-jfm: \
-	jfm-jlreqv.lua jfm-jlreqv-jidori.lua \
-	jlreq.tfm bjlreq.tfm zjlreq.tfm bzjlreq.tfm \
-	jlreq.vf bjlreq.vf zjlreq.vf bzjlreq.vf \
-	ujlreq.tfm ubjlreq.tfm uzjlreq.tfm ubzjlreq.tfm \
+VFS = jlreq.vf bjlreq.vf zjlreq.vf bzjlreq.vf \
 	ujlreq.vf ubjlreq.vf uzjlreq.vf ubzjlreq.vf \
-	ujlreq-q.tfm ubjlreq-q.tfm uzjlreq-q.tfm ubzjlreq-q.tfm \
 	ujlreq-q.vf ubjlreq-q.vf uzjlreq-q.vf ubzjlreq-q.vf \
-	jlreqg.tfm bjlreqg.tfm zjlreqg.tfm bzjlreqg.tfm \
 	jlreqg.vf bjlreqg.vf zjlreqg.vf bzjlreqg.vf \
-	ujlreqg.tfm ubjlreqg.tfm uzjlreqg.tfm ubzjlreqg.tfm \
 	ujlreqg.vf ubjlreqg.vf uzjlreqg.vf ubzjlreqg.vf \
-	ujlreqg-q.tfm ubjlreqg-q.tfm uzjlreqg-q.tfm ubzjlreqg-q.tfm \
 	ujlreqg-q.vf ubjlreqg-q.vf uzjlreqg-q.vf ubzjlreqg-q.vf \
-	jlreq-v.tfm bjlreq-v.tfm zjlreq-v.tfm bzjlreq-v.tfm \
 	jlreq-v.vf bjlreq-v.vf zjlreq-v.vf bzjlreq-v.vf \
-	ujlreq-v.tfm ubjlreq-v.tfm uzjlreq-v.tfm ubzjlreq-v.tfm \
 	ujlreq-v.vf ubjlreq-v.vf uzjlreq-v.vf ubzjlreq-v.vf \
-	jlreqg-v.tfm bjlreqg-v.tfm zjlreqg-v.tfm bzjlreqg-v.tfm \
 	jlreqg-v.vf bjlreqg-v.vf zjlreqg-v.vf bzjlreqg-v.vf \
-	ujlreqg-v.tfm ubjlreqg-v.tfm uzjlreqg-v.tfm ubzjlreqg-v.tfm \
 	ujlreqg-v.vf ubjlreqg-v.vf uzjlreqg-v.vf ubzjlreqg-v.vf \
 	jlreq-jidori.tfm jlreq-jidori.vf jlreqg-jidori.tfm jlreqg-jidori.vf \
 	jlreq-v-jidori.tfm jlreq-v-jidori.vf jlreqg-v-jidori.tfm jlreqg-v-jidori.vf \
 	ujlreq-jidori.tfm ujlreq-jidori.vf ujlreqg-jidori.tfm ujlreqg-jidori.vf \
 	ujlreq-jidori-q.tfm ujlreq-jidori-q.vf ujlreqg-jidori-q.tfm ujlreqg-jidori-q.vf \
 	ujlreq-v-jidori.tfm ujlreq-v-jidori.vf ujlreqg-v-jidori.tfm ujlreqg-v-jidori.vf
+
+TFMS = jlreq.tfm bjlreq.tfm zjlreq.tfm bzjlreq.tfm \
+	ujlreq.tfm ubjlreq.tfm uzjlreq.tfm ubzjlreq.tfm \
+	ujlreq-q.tfm ubjlreq-q.tfm uzjlreq-q.tfm ubzjlreq-q.tfm \
+	jlreqg.tfm bjlreqg.tfm zjlreqg.tfm bzjlreqg.tfm \
+	ujlreqg.tfm ubjlreqg.tfm uzjlreqg.tfm ubzjlreqg.tfm \
+	ujlreqg-q.tfm ubjlreqg-q.tfm uzjlreqg-q.tfm ubzjlreqg-q.tfm \
+	jlreq-v.tfm bjlreq-v.tfm zjlreq-v.tfm bzjlreq-v.tfm \
+	ujlreq-v.tfm ubjlreq-v.tfm uzjlreq-v.tfm ubzjlreq-v.tfm \
+	jlreqg-v.tfm bjlreqg-v.tfm zjlreqg-v.tfm bzjlreqg-v.tfm \
+	ujlreqg-v.tfm ubjlreqg-v.tfm uzjlreqg-v.tfm ubzjlreqg-v.tfm
+
+
+.PHONY: all jfm doc latexdoc pdfdoc htmldoc jfm-install cls-install sty-install install tds uninstall jfmclean docclean clean
+
+all: jfm
+
+jfm: jfm-jlreqv.lua jfm-jlreqv-jidori.lua $(VFS) $(TFMS)
 	
 	rm -f rml.tfm rmlv.tfm gbm.tfm gbmv.tfm uprml-h.tfm uprml-hq.tfm upgbm-h.tfm upgbm-hq.tfm uprml-v.tfm uprml-vq.tfm upgbm-v.tfm upgbm-vq.tfm
 
 # .pl
-u%-v.pl: jfm-%v-pl.lua luajfm2pl.lua
+ujlreq-v.pl ubjlreq-v.pl uzjlreq-v.pl ubzjlreq-v.pl: u%-v.pl: jfm-%v-pl.lua luajfm2pl.lua
 	texlua luajfm2pl.lua $*v-pl $@
 
-%-v.pl: jfm-%v-pl.lua luajfm2pl.lua
+jlreq-v.pl bjlreq-v.pl zjlreq-v.pl bzjlreq-v.pl: %-v.pl: jfm-%v-pl.lua luajfm2pl.lua
 	texlua luajfm2pl.lua --noutf $*v-pl $@
 
-u%.pl: jfm-%-pl.lua luajfm2pl.lua
+ujlreq.pl ubjlreq.pl uzjlreq.pl ubzjlreq.pl: u%.pl: jfm-%-pl.lua luajfm2pl.lua
 	texlua luajfm2pl.lua $*-pl $@
 
-%.pl: jfm-%-pl.lua luajfm2pl.lua
+jlreq.pl bjlreq.pl zjlreq.pl bzjlreq.pl: %.pl: jfm-%-pl.lua luajfm2pl.lua
 	texlua luajfm2pl.lua --noutf $*-pl $@
 
 jlreq-jidori.pl: jfm-jlreq-jidori-pl.lua
@@ -62,34 +64,34 @@ ujlreq-v-jidori.pl: jfm-jlreqv-jidori-pl.lua
 
 
 # .vf
-u%g-q.vf: u%g-q.tfm
+ujlreqg-q.vf ubjlreqg-q.vf uzjlreqg-q.vf ubzjlreqg-q.vf: %.vf: %.tfm
 	makejvf -i -u jisq $< upgbm-hq.tfm
 
-u%-q.vf: u%-q.tfm
+ujlreq-q.vf ubjlreq-q.vf uzjlreq-q.vf ubzjlreq-q.vf: %.vf: %.tfm
 	makejvf -i -u jisq $< uprml-hq.tfm
 
-u%g-v.vf: u%g-v.tfm
+ujlreqg-v.vf ubjlreqg-v.vf uzjlreqg-v.vf ubzjlreqg-v.vf: %.vf: %.tfm
 	makejvf -i -u custom -t ${MAKEJVFCNF} $< upgbm-v.tfm
 
-u%g.vf: u%g.tfm u%g-q.tfm
-	makejvf -i -u custom -t ${MAKEJVFCNF} -H -U u$*g-q $< upgbm-h.tfm
+ujlreqg.vf ubjlreqg.vf uzjlreqg.vf ubzjlreqg.vf: %.vf: %.tfm %-q.tfm
+	makejvf -i -u custom -t ${MAKEJVFCNF} -H -U $*-q $< upgbm-h.tfm
 
-%g-v.vf: %g-v.tfm
+jlreqg-v.vf bjlreqg-v.vf zjlreqg-v.vf bzjlreqg-v.vf: %.vf: %.tfm
 	makejvf -i $< gbmv.tfm
 
-%g.vf: %g.tfm
+jlreqg.vf bjlreqg.vf zjlreqg.vf bzjlreqg.vf: %.vf: %.tfm
 	makejvf -i $< gbm.tfm
 
-u%-v.vf: u%-v.tfm
+ujlreq-v.vf ubjlreq-v.vf uzjlreq-v.vf ubzjlreq-v.vf: %.vf: %.tfm
 	makejvf -i -u custom -t ${MAKEJVFCNF} $< uprml-v.tfm
 
-%-v.vf: %-v.tfm
+jlreq-v.vf bjlreq-v.vf zjlreq-v.vf bzjlreq-v.vf: %.vf: %.tfm
 	makejvf -i $< rmlv.tfm
 
-u%.vf: u%.tfm u%-q.tfm
-	makejvf -i -u custom -t ${MAKEJVFCNF} -H -U u$*-q $< uprml-h.tfm
+ujlreq.vf ubjlreq.vf uzjlreq.vf ubzjlreq.vf: %.vf: %.tfm %-q.tfm
+	makejvf -i -u custom -t ${MAKEJVFCNF} -H -U $*-q $< uprml-h.tfm
 
-%.vf: %.tfm
+jlreq.vf bjlreq.vf zjlreq.vf bzjlreq.vf: %.vf: %.tfm
 	makejvf -i $< rml.tfm
 
 jlreq-jidori.vf: jlreq-jidori.tfm
@@ -124,28 +126,28 @@ ujlreqg-v-jidori.vf: ujlreqg-v-jidori.tfm
 
 
 # .tfm
-u%-q.tfm: u%.pl
+ujlreq-q.tfm ubjlreq-q.tfm uzjlreq-q.tfm ubzjlreq-q.tfm: %-q.tfm: %.pl
 	uppltotf -kanji=uptex $< $@
 
-u%g-q.tfm: u%-q.tfm
+ujlreqg-q.tfm ubjlreqg-q.tfm uzjlreqg-q.tfm ubzjlreqg-q.tfm: %g-q.tfm: %-q.tfm
 	cp $< $@
 
-%g-v.tfm: %-v.tfm
+jlreqg-v.tfm bjlreqg-v.tfm zjlreqg-v.tfm bzjlreqg-v.tfm ujlreqg-v.tfm ubjlreqg-v.tfm uzjlreqg-v.tfm ubzjlreqg-v.tfm: %g-v.tfm: %-v.tfm
 	cp $< $@
 
-%g.tfm: %.tfm
+jlreqg.tfm bjlreqg.tfm zjlreqg.tfm bzjlreqg.tfm ujlreqg.tfm ubjlreqg.tfm uzjlreqg.tfm ubzjlreqg.tfm: %g.tfm: %.tfm
 	cp $< $@
 
-u%.tfm: u%.pl
+ujlreq.tfm ubjlreq.tfm uzjlreq.tfm ubzjlreq.tfm ujlreq-v.tfm ubjlreq-v.tfm uzjlreq-v.tfm ubzjlreq-v.tfm: %.tfm: %.pl
 	uppltotf -kanji=uptex $< $@
 
-%.tfm: %.pl
+jlreq.tfm bjlreq.tfm zjlreq.tfm bzjlreq.tfm jlreq-v.tfm bjlreq-v.tfm zjlreq-v.tfm bzjlreq-v.tfm: %.tfm: %.pl
 	ppltotf -kanji=utf8 $< $@
 
-ujlreq%-jidori.tfm: ujlreq%-jidori.pl
+ujlreq-jidori.tfm ujlreq-v-jidori.tfm: %.tfm: %.pl
 	uppltotf -kanji=uptex $< $@
 
-jlreq%-jidori.tfm: jlreq%-jidori.pl
+jlreq-jidori.tfm jlreq-v-jidori.tfm: %.tfm: %.pl
 	ppltotf -kanji=utf8 $< $@
 
 ujlreqg-jidori.tfm: ujlreq-jidori.tfm
@@ -202,9 +204,9 @@ jlreq-trimmarks.html: jlreq-trimmarks.md README-template.html
 
 jfm-install: jfm
 	mkdir -p ${TEXMF}/fonts/tfm/public/jlreq
-	install *.tfm ${TEXMF}/fonts/tfm/public/jlreq
+	install ${TFMS} ${TEXMF}/fonts/tfm/public/jlreq
 	mkdir -p ${TEXMF}/fonts/vf/public/jlreq
-	install *.vf ${TEXMF}/fonts/vf/public/jlreq
+	install ${VFS} ${TEXMF}/fonts/vf/public/jlreq
 	mkdir -p ${TEXMF}/tex/luatex/jlreq
 	install jfm-jlreqv.lua jfm-jlreq.lua jfm-jlreq-jidori.lua jfm-jlreqv-jidori.lua ${TEXMF}/tex/luatex/jlreq
 
@@ -222,9 +224,9 @@ install: jfm-install cls-install sty-install
 
 tds: jfm jlreq.cls README.md README-ja.md LICENSE jlreq.html jlreq-ja.html jlreq-trimmarks.html jlreq-trimmarks-ja.html jlreq.pdf jlreq-ja.pdf
 	mkdir -p ./tds/fonts/tfm/public/jlreq
-	cp -f *.tfm ./tds/fonts/tfm/public/jlreq
+	cp -f ${TFMS} ./tds/fonts/tfm/public/jlreq
 	mkdir -p ./tds/fonts/vf/public/jlreq
-	cp -f *.vf ./tds/fonts/vf/public/jlreq
+	cp -f ${VFS} ./tds/fonts/vf/public/jlreq
 	mkdir -p ./tds/tex/luatex/jlreq
 	cp jfm-jlreq.lua ./tds/tex/luatex/jlreq
 	cp jfm-jlreqv.lua ./tds/tex/luatex/jlreq
@@ -261,7 +263,7 @@ uninstall:
 	rm -rf ${TEXMF}/tex/latex/jlreq
 
 jfmclean:
-	rm -f *jlreq*.tfm *jlreq*.pl *jlreq*.vf
+	rm -f *jlreq*.pl ${VFS} ${TFMS}
 	rm -f jfm-jlreqv.lua
 	rm -f jfm-*jlreq*-pl.lua
 	rm -f jfm-jlreqv-jidori.lua
diff --git a/macros/jptex/latex/jlreq/README-ja.md b/macros/jptex/latex/jlreq/README-ja.md
index 3d4f146f11..7194c81133 100644
--- a/macros/jptex/latex/jlreq/README-ja.md
+++ b/macros/jptex/latex/jlreq/README-ja.md
@@ -596,6 +596,8 @@ JFMの名前は次の通りです．`[]`で囲まれている文字は設定に�
     - 英語ドキュメントに使い方を書いた
     - `\DeclareKeys`などを使うようにした．
     - 行見出しの内部処理をちょっとだけ変更．
+* 2024-09-26
+    - Makefileでのパターンマッチングの使用をやめた
 
 --------------
 Noriyuki Abe
diff --git a/macros/jptex/latex/jlreq/README.md b/macros/jptex/latex/jlreq/README.md
index 3c7ec380ee..cac8ab9149 100644
--- a/macros/jptex/latex/jlreq/README.md
+++ b/macros/jptex/latex/jlreq/README.md
@@ -243,7 +243,10 @@ You can specify gyo-dori setting in one of the following ways.
 You can set the gyo-dori settings for block headings that are placed consecutively with `\SetBlockHeadingSpaces`. `\SetBlockHeadingSpaces` is used as follows: 
 
 ```latex
-\SetBlockHeadingSpaces { {_part{lines=3,before_lines=1},_section{lines=2},_subsection{lines=2}} [lines=5]{_section,23pt,_subsection,16pt} }
+\SetBlockHeadingSpaces {
+	{_part{lines=3,before_lines=1},_section{lines=2},_subsection{lines=2}}
+	[lines=5]{_section,23pt,_subsection,16pt}
+}
 ```
 
 This means the following.
@@ -579,6 +582,9 @@ This package is distributed under the BSD 2-Clause License. See [LICENSE](LICENS
     - Added the usage of this class to English document.
     - Use `\DeclareKeys` etc.
     - Changed the internal processing of block headings a little.
+* 2024-09-26
+    - Removed pattern matchings from Makefile.
+
 
 --------------
 Noriyuki Abe
diff --git a/macros/jptex/latex/jlreq/jlreq-ja.pdf b/macros/jptex/latex/jlreq/jlreq-ja.pdf
index ed4fb07f5d..9866c5f9f9 100644
--- a/macros/jptex/latex/jlreq/jlreq-ja.pdf
+++ b/macros/jptex/latex/jlreq/jlreq-ja.pdf
diff --git a/macros/jptex/latex/jlreq/jlreq.cls b/macros/jptex/latex/jlreq/jlreq.cls
index 8f14372b38..8ad7d8c9f7 100644
--- a/macros/jptex/latex/jlreq/jlreq.cls
+++ b/macros/jptex/latex/jlreq/jlreq.cls
@@ -5,7 +5,7 @@
 %%
 % (based on JLReq 20200811 https://www.w3.org/TR/2020/NOTE-jlreq-20200811/)
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jlreq}[2024/08/23 jlreq]
+\ProvidesClass{jlreq}[2024/09/26 jlreq]
 \RequirePackage{etoolbox}
 \RequirePackage{jlreq-helpers}[2024/02/13]
 
diff --git a/macros/jptex/latex/jlreq/jlreq.pdf b/macros/jptex/latex/jlreq/jlreq.pdf
index fe98bc8adc..175765edf1 100644
--- a/macros/jptex/latex/jlreq/jlreq.pdf
+++ b/macros/jptex/latex/jlreq/jlreq.pdf