jlreq (29dec20)

git-svn-id: svn://tug.org/texlive/trunk@57255 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 113 insertions, 3 deletions

diff --git a/Master/texmf-dist/source/latex/jlreq/Makefile b/Master/texmf-dist/source/latex/jlreq/Makefile
index 06bcae19943..b9b9eca5d27 100644
--- a/Master/texmf-dist/source/latex/jlreq/Makefile
+++ b/Master/texmf-dist/source/latex/jlreq/Makefile
@@ -6,7 +6,7 @@ MAKEJVFCNF:=$(shell ls -R $(shell kpsewhich --var-value=TEXMFDIST)/fonts/source
 all: jfm
 
 jfm: \
-	jfm-jlreqv.lua \
+	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 \
@@ -27,6 +27,11 @@ jfm: \
 	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
 	
 	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
 
@@ -43,6 +48,19 @@ u%.pl: jfm-%-pl.lua luajfm2pl.lua
 %.pl: jfm-%-pl.lua luajfm2pl.lua
 	texlua luajfm2pl.lua --noutf $*-pl $@
 
+jlreq-jidori.pl: jfm-jlreq-jidori-pl.lua
+	texlua luajfm2pl.lua --noutf jlreq-jidori-pl $@
+
+jlreq-v-jidori.pl: jfm-jlreqv-jidori-pl.lua
+	texlua luajfm2pl.lua --noutf jlreqv-jidori-pl $@
+
+ujlreq-jidori.pl: jfm-jlreq-jidori-pl.lua
+	texlua luajfm2pl.lua jlreq-jidori-pl $@
+
+ujlreq-v-jidori.pl: jfm-jlreqv-jidori-pl.lua
+	texlua luajfm2pl.lua jlreqv-jidori-pl $@
+
+
 # .vf
 u%g-q.vf: u%g-q.tfm
 	makejvf -i -u jisq $< upgbm-hq.tfm
@@ -74,6 +92,37 @@ u%.vf: u%.tfm u%-q.tfm
 %.vf: %.tfm
 	makejvf -i $< rml.tfm
 
+jlreq-jidori.vf: jlreq-jidori.tfm
+	makejvf  -i $< rml.tfm
+
+jlreq-v-jidori.vf: jlreq-v-jidori.tfm
+	makejvf  -i $< rmlv.tfm
+
+jlreqg-jidori.vf: jlreqg-jidori.tfm
+	makejvf  -i $< gbm.tfm
+
+jlreqg-v-jidori.vf: jlreqg-v-jidori.tfm
+	makejvf  -i $< gbmv.tfm
+
+ujlreq-jidori-q.vf: ujlreq-jidori-q.tfm
+	makejvf -i -u jisq $< uprml-hq.tfm
+
+ujlreqg-jidori-q.vf: ujlreqg-jidori-q.tfm
+	makejvf -i -u jisq $< upgbm-hq.tfm
+
+ujlreq-jidori.vf: ujlreq-jidori.tfm ujlreq-jidori-q.tfm
+	makejvf -i -u custom -t ${MAKEJVFCNF} -H -U ujlreq-jidori-q $< uprml-h.tfm
+
+ujlreq-v-jidori.vf: ujlreq-v-jidori.tfm
+	makejvf -i -u custom -t ${MAKEJVFCNF} -H $< uprml-v.tfm
+
+ujlreqg-jidori.vf: ujlreqg-jidori.tfm ujlreqg-jidori-q.tfm
+	makejvf -i -u custom -t ${MAKEJVFCNF} -H -U ujlreqg-jidori-q $< upgbm-h.tfm
+
+ujlreqg-v-jidori.vf: ujlreqg-v-jidori.tfm
+	makejvf -i -u custom -t ${MAKEJVFCNF} -H $< upgbm-v.tfm
+
+
 # .tfm
 u%-q.tfm: u%.pl
 	uppltotf -kanji=uptex $< $@
@@ -93,7 +142,32 @@ u%.tfm: u%.pl
 %.tfm: %.pl
 	ppltotf -kanji=utf8 $< $@
 
-jfm-jlreqv.lua jfm-jlreq-pl.lua jfm-bjlreq-pl.lua jfm-zjlreq-pl.lua jfm-bzjlreq-pl.lua jfm-jlreqv-pl.lua jfm-bjlreqv-pl.lua jfm-zjlreqv-pl.lua jfm-bzjlreqv-pl.lua: make_variant_jfm.lua jfm-jlreq.lua
+ujlreq%-jidori.tfm: ujlreq%-jidori.pl
+	uppltotf -kanji=uptex $< $@
+
+jlreq%-jidori.tfm: jlreq%-jidori.pl
+	ppltotf -kanji=utf8 $< $@
+
+ujlreqg-jidori.tfm: ujlreq-jidori.tfm
+	cp $< $@
+
+ujlreqg-v-jidori.tfm: ujlreq-v-jidori.tfm
+	cp $< $@
+
+jlreqg-jidori.tfm: jlreq-jidori.tfm
+	cp $< $@
+
+jlreqg-v-jidori.tfm: jlreq-v-jidori.tfm
+	cp $< $@
+
+ujlreq-jidori-q.tfm: ujlreq-jidori.pl
+	uppltotf -kanji=uptex $< $@
+
+ujlreqg-jidori-q.tfm: ujlreq-jidori-q.tfm
+	cp $< $@
+
+
+jfm-jlreqv.lua jfm-jlreq-pl.lua jfm-bjlreq-pl.lua jfm-zjlreq-pl.lua jfm-bzjlreq-pl.lua jfm-jlreqv-pl.lua jfm-bjlreqv-pl.lua jfm-zjlreqv-pl.lua jfm-bzjlreqv-pl.lua jfm-jlreqv-jidori.lua jfm-jlreq-jidori-pl.lua jfm-jlreqv-jidori-pl.lua: make_variant_jfm.lua jfm-jlreq.lua jfm-jlreq-jidori.lua
 	texlua make_variant_jfm.lua
 
 doc: pdfdoc htmldoc
@@ -132,7 +206,7 @@ jfm-install: jfm
 	mkdir -p ${TEXMF}/fonts/vf/public/jlreq
 	install *.vf ${TEXMF}/fonts/vf/public/jlreq
 	mkdir -p ${TEXMF}/tex/luatex/jlreq
-	install jfm-jlreqv.lua jfm-jlreq.lua ${TEXMF}/tex/luatex/jlreq
+	install jfm-jlreqv.lua jfm-jlreq.lua jfm-jlreq-jidori.lua jfm-jlreqv-jidori.lua ${TEXMF}/tex/luatex/jlreq
 
 cls-install:
 	mkdir -p ${TEXMF}/tex/latex/jlreq
@@ -153,6 +227,8 @@ tds: jfm jlreq.cls README.md README-ja.md LICENSE jlreq.html jlreq-ja.html jlreq
 	mkdir -p ./tds/tex/luatex/jlreq
 	cp jfm-jlreq.lua ./tds/tex/luatex/jlreq
 	cp jfm-jlreqv.lua ./tds/tex/luatex/jlreq
+	cp jfm-jlreq-jidori.lua ./tds/tex/luatex/jlreq
+	cp jfm-jlreqv-jidori.lua ./tds/tex/luatex/jlreq
 	mkdir -p ./tds/tex/latex/jlreq
 	cp jlreq.cls ./tds/tex/latex/jlreq
 	cp jlreq-helpers.sty ./tds/tex/latex/jlreq
@@ -186,6 +262,7 @@ jfmclean:
 	rm -f *jlreq*.tfm *jlreq*.pl *jlreq*.vf
 	rm -f jfm-jlreqv.lua
 	rm -f jfm-*jlreq*-pl.lua
+	rm -f jfm-jlreqv-jidori.lua
 
 docclean:
 	rm -f jlreq.tex jlreq.pdf jlreq.html jlreq-ja.tex jlreq-ja.pdf jlreq-ja.html jlreq-trimmarks.html jlreq-trimmarks-ja.html
diff --git a/Master/texmf-dist/source/latex/jlreq/make_variant_jfm.lua b/Master/texmf-dist/source/latex/jlreq/make_variant_jfm.lua
index e91e85cc338..a38ddd13916 100644
--- a/Master/texmf-dist/source/latex/jlreq/make_variant_jfm.lua
+++ b/Master/texmf-dist/source/latex/jlreq/make_variant_jfm.lua
@@ -97,6 +97,7 @@ function tolf(file)
 end
 
 local originaljfm = "jlreq"
+local originaljfm_jidori = "jlreq-jidori"
 
 local jfmfile = kpse.find_file("jfm-" .. originaljfm .. ".lua")
 if jfmfile == nil then
@@ -175,3 +176,35 @@ fp:close()
 
 tolf(file);
 
+
+jfmfile = kpse.find_file("jfm-" .. originaljfm_jidori .. ".lua")
+if jfmfile == nil then
+	print("JFM " .. originaljfm_jidori .. " is not found")
+	os.exit(1)
+end
+
+jfm = nil
+function luatexja.jfont.define_jfm(j)
+	jfm = j
+end
+dofile(jfmfile)
+
+function to_jidori_pl(t)
+	t = table.fastcopy(t)
+	-- kanjiskipに任せているところを15zwに変更
+	for cl1,val in pairs(t) do
+		if type(cl1) == "number" then
+			for cl2,glue in pairs(val.glue) do
+				if glue.kanjiskip_stretch == 1 then
+					t[cl1].glue[cl2][2] = 15
+				end
+			end
+		end
+	end
+	return t
+end
+
+
+make_jfmfile(to_jidori_pl(jfm),"jfm-jlreq-jidori-pl.lua")
+make_jfmfile(to_jidori_pl(tate(jfm)),"jfm-jlreqv-jidori-pl.lua")
+make_jfmfile(tate(jfm),"jfm-jlreqv-jidori.lua")