Skip to content

Commit

Permalink
Merge branch 'master' into build/work000 r71300 #158
Browse files Browse the repository at this point in the history
  • Loading branch information
t-tk committed May 19, 2024
2 parents ef1d5d4 + 47de62d commit 61277af
Show file tree
Hide file tree
Showing 26 changed files with 7,667 additions and 1,486 deletions.
2 changes: 1 addition & 1 deletion source/libs/README
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ graphite2 1.3.14 - checked 10apr20
https://sourceforge.net/projects/silgraphite/files/graphite2/
(requires C++11)

harfbuzz 8.4.0 - checked 30mar24
harfbuzz 8.5.0 - checked 14may24
https://github.com/harfbuzz/harfbuzz/releases/latest

icu 74.2 - checked 22dec23
Expand Down
8 changes: 8 additions & 0 deletions source/texk/dvipdfm-x/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2024-05-18 TANAKA Takuji <[email protected]>

* dvi.c: Remove obsolete comments.
* dvipdfmx-upjf3.test, tests/upj{f,v}4_full.{vf,zvp0},
tests/upjf-ipa.map, tests/Makefile_upjf, Makefile.am: Add
a test for upTeX new encoding. It requires IPA MJ Mincho font.
https://github.com/texjporg/tex-jp-build/issues/46

2024-05-11 TANAKA Takuji <[email protected]>

* dvi.c: Ensure enc_name "UTF16" prior to encoding conversion
Expand Down
4 changes: 3 additions & 1 deletion source/texk/dvipdfm-x/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -319,9 +319,11 @@ DISTCLEANFILES += upjf2_*.pdf
## dvipdfmx-upjf3.test
EXTRA_DIST += tests/upjf3_full.zvp0 tests/upjf3_full.vf
EXTRA_DIST += tests/upjv3_full.zvp0 tests/upjv3_full.vf
EXTRA_DIST += tests/upjf4_full.zvp0 tests/upjf4_full.vf
EXTRA_DIST += tests/upjv4_full.zvp0 tests/upjv4_full.vf
EXTRA_DIST += tests/upjf-hu.tfm tests/upjf-hi.tfm
EXTRA_DIST += tests/upjv-hu.tfm tests/upjv-hi.tfm
EXTRA_DIST += tests/upjf-noto.map
EXTRA_DIST += tests/upjf-noto.map tests/upjf-ipa.map
DISTCLEANFILES += upjf3_*.pdf
## dvipdfmx-incl.test
EXTRA_DIST += tests/multi_incl.dvi tests/multi_incl.tex tests/sue-mp.pdf
Expand Down
9 changes: 6 additions & 3 deletions source/texk/dvipdfm-x/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -858,10 +858,13 @@ EXTRA_DIST = $(TESTS) tests/dvipdfmx.cfg tests/psfonts.map \
tests/upjv2_full.zvp0 tests/upjv2_full.vf tests/upjf-c.pl \
tests/upjf-c.tfm tests/upjv-c.pl tests/upjv-c.tfm \
tests/upjf-hara.map tests/upjf3_full.zvp0 tests/upjf3_full.vf \
tests/upjv3_full.zvp0 tests/upjv3_full.vf tests/upjf-hu.tfm \
tests/upjv3_full.zvp0 tests/upjv3_full.vf \
tests/upjf4_full.zvp0 tests/upjf4_full.vf \
tests/upjv4_full.zvp0 tests/upjv4_full.vf tests/upjf-hu.tfm \
tests/upjf-hi.tfm tests/upjv-hu.tfm tests/upjv-hi.tfm \
tests/upjf-noto.map tests/multi_incl.dvi tests/multi_incl.tex \
tests/sue-mp.pdf tests/fullmap.dvi tests/fullmap.tex
tests/upjf-noto.map tests/upjf-ipa.map tests/multi_incl.dvi \
tests/multi_incl.tex tests/sue-mp.pdf tests/fullmap.dvi \
tests/fullmap.tex
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am

Expand Down
6 changes: 2 additions & 4 deletions source/texk/dvipdfm-x/dvi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1477,7 +1477,6 @@ dvi_set (int32_t ch)
switch (font->type) {
case PHYSICAL:
if (ch > 65535) {
/* FIXME: uptex specific undocumented */
if (font->is_unicode == ENC_UTF16 && tfm_is_jfm(font->tfm_id)) {
wbuf[0] = (UTF32toUTF16HS(ch) >> 8) & 0xff;
wbuf[1] = UTF32toUTF16HS(ch) & 0xff;
Expand Down Expand Up @@ -1563,12 +1562,11 @@ dvi_put (int32_t ch)
switch (font->type) {
case PHYSICAL:
width = tfm_get_fw_width(font->tfm_id, ch);
width = sqxfw(font->size, width);
width = sqxfw(font->size, width);
/* Treat a single character as a one byte string and use the
* string routine.
*/
*/
if (ch > 65535) {
/* FIXME: uptex specific undocumented */
if (font->is_unicode == ENC_UTF16 && tfm_is_jfm(font->tfm_id)) {
wbuf[0] = (UTF32toUTF16HS(ch) >> 8) & 0xff;
wbuf[1] = UTF32toUTF16HS(ch) & 0xff;
Expand Down
12 changes: 12 additions & 0 deletions source/texk/dvipdfm-x/dvipdfmx-upjf3.test
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,18 @@ echo "*** dvipdfmx: test for upjf3_full-noto.pdf" && echo \
&& echo && echo "dvipdfmx-upjf3-vf_full-noto tests OK" && echo \
|| failed="$failed dvipdfmx-upjf3-vf_full-noto"

##### following tests require IPA MJ Mincho font #####

$_kpsewhich ipamjm.ttf || exit 77

echo "*** dvipdfmx: test for upjf3_full-ipa.pdf" && echo \
&& cp $srcdir/tests/upjf4_full.vf ./upjf.vf \
&& cp $srcdir/tests/upjv4_full.vf ./upjv.vf \
&& $_xdvipdfmx --dvipdfmx -vv --pdfm-str-utf8 -f upjf-ipa.map -o upjf3.pdf $srcdir/tests/upjf3.dvi \
&& mv ./upjf3.pdf ./upjf3_full-ipa.pdf \
&& echo && echo "dvipdfmx-upjf3-vf_full-ipa tests OK" && echo \
|| failed="$failed dvipdfmx-upjf3-vf_full-ipa"


test -z "$failed" && exit 0
echo
Expand Down
6 changes: 6 additions & 0 deletions source/texk/dvipdfm-x/tests/Makefile_upjf
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@ upjf3_full.vf: upjf3_full.zvp0
upjv3_full.vf: upjv3_full.zvp0
jfmutil zvp02vf upjv3_full.zvp0

upjf4_full.vf: upjf4_full.zvp0
jfmutil zvp02vf upjf4_full.zvp0

upjv4_full.vf: upjv4_full.zvp0
jfmutil zvp02vf upjv4_full.zvp0

upjf-c.tfm:
uppltotf upjf-c.pl

Expand Down
12 changes: 12 additions & 0 deletions source/texk/dvipdfm-x/tests/upjf-ipa.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
upjf-r unicode ipamjm.ttf
upjf-g unicode HaranoAjiGothic-Regular.otf
upjf-c Identity-H HaranoAjiMincho-Regular.otf
upjf-hu unicode ipamjm.ttf
upjf-hi Identity-H ipamjm.ttf
upjv-r unicode ipamjm.ttf -w 1
upjv-g unicode HaranoAjiGothic-Regular.otf -w 1
upjv-c Identity-V HaranoAjiMincho-Regular.otf
upjv-hu unicode ipamjm.ttf -w 1
upjv-hi Identity-V ipamjm.ttf

ptmr8r 8r Times-Roman
Binary file added source/texk/dvipdfm-x/tests/upjf4_full.vf
Binary file not shown.
Loading

0 comments on commit 61277af

Please sign in to comment.