9 files changed, 23 insertions, 6 deletions
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index 7d86b8981aa..c7c4967ba61 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,9 @@
+2020-05-10  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* uptex-vf.test, testdata/upjf.{tex,dvi,tfm},
+	testdata/upjf_{full,omit}.vf, testdata/upjf_{full,omit}.cnf:
+	Update the test.
+
 2020-04-26  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
 
 	* Makefile.{am,in}, uptex-vf.test,
diff --git a/Build/source/texk/dvipsk/testdata/upjf.dvi b/Build/source/texk/dvipsk/testdata/upjf.dvi
index d755a9d3bbe..1e5473dc81b 100644
--- a/Build/source/texk/dvipsk/testdata/upjf.dvi
+++ b/Build/source/texk/dvipsk/testdata/upjf.dvi
diff --git a/Build/source/texk/dvipsk/testdata/upjf.tex b/Build/source/texk/dvipsk/testdata/upjf.tex
index 47695baa151..de471281b2f 100644
--- a/Build/source/texk/dvipsk/testdata/upjf.tex
+++ b/Build/source/texk/dvipsk/testdata/upjf.tex
@@ -4,12 +4,16 @@
 \documentclass{ujarticle}
 
 % for dvipdfmx
-\AtBeginDvi{\special{pdf:mapline upjf-r unicode HaranoAjiMincho-Regular.otf}}
-\AtBeginDvi{\special{pdf:mapline upjf-g unicode HaranoAjiGothic-Regular.otf}}
+%\AtBeginDvi{\special{pdf:mapline upjf-r UniJIS-UTF16-H HaranoAjiMincho-Regular.otf}}
+%\AtBeginDvi{\special{pdf:mapline upjf-g UniJIS-UTF16-H HaranoAjiGothic-Regular.otf}}
+%\AtBeginDvi{\special{pdf:mapline upjf-r UniJIS-UTF16-H !Ryumin-Light}}
+%\AtBeginDvi{\special{pdf:mapline upjf-g UniJIS-UTF16-H !GothicBBB-Medium}}
+%\AtBeginDvi{\special{pdf:mapline upjf-r UPJF-UTF16-H !Ryumin-Light}}
+%\AtBeginDvi{\special{pdf:mapline upjf-g UPJF-UTF16-H !GothicBBB-Medium}}
 
 \begin{document}
 \pagestyle{empty}
 \font\upjf=upjf at 10pt
-\upjf あいうえおｱｲｳｴｵ、雪𠮟。
+\upjf あいうえおｱｲｳｴｵ、☃~雪晴☀𠮟。
 \end{document}
 
diff --git a/Build/source/texk/dvipsk/testdata/upjf.tfm b/Build/source/texk/dvipsk/testdata/upjf.tfm
index 2cbd365ee50..d18f4d546c8 100644
--- a/Build/source/texk/dvipsk/testdata/upjf.tfm
+++ b/Build/source/texk/dvipsk/testdata/upjf.tfm
diff --git a/Build/source/texk/dvipsk/testdata/upjf_full.cnf b/Build/source/texk/dvipsk/testdata/upjf_full.cnf
index 83248850d74..5ba8a501631 100644
--- a/Build/source/texk/dvipsk/testdata/upjf_full.cnf
+++ b/Build/source/texk/dvipsk/testdata/upjf_full.cnf
@@ -2,8 +2,11 @@
 % You may freely use, modify and/or distribute this file.
 
 CHARSET	%
++	2600,% ☀
++	2603,% ☃
 +	3000..303F,% CJK Symbols and Punctuation
 +	3040..309F,% Hiragana
++	6674,% 晴
 +	96EA,% 雪
 +	FF00..FFEF,% Halfwidth and Fullwidth Forms
 +	20B9F% 𠮟
diff --git a/Build/source/texk/dvipsk/testdata/upjf_full.vf b/Build/source/texk/dvipsk/testdata/upjf_full.vf
index 1a25014b0ef..342ea0fdc38 100644
--- a/Build/source/texk/dvipsk/testdata/upjf_full.vf
+++ b/Build/source/texk/dvipsk/testdata/upjf_full.vf
diff --git a/Build/source/texk/dvipsk/testdata/upjf_omit.cnf b/Build/source/texk/dvipsk/testdata/upjf_omit.cnf
index 3a96f137fe3..dbb1af7ffc2 100644
--- a/Build/source/texk/dvipsk/testdata/upjf_omit.cnf
+++ b/Build/source/texk/dvipsk/testdata/upjf_omit.cnf
@@ -2,8 +2,11 @@
 % You may freely use, modify and/or distribute this file.
 
 CHARSET	%
++	2600,% ☀
++	2603,% ☃
 +	3000..303F,% CJK Symbols and Punctuation
 +	3040..309F,% Hiragana
++	6674,% 晴
 %+	96EA,% 雪
 +	FF00..FFEF,% Halfwidth and Fullwidth Forms
 %+	20B9F% 𠮟
diff --git a/Build/source/texk/dvipsk/testdata/upjf_omit.vf b/Build/source/texk/dvipsk/testdata/upjf_omit.vf
index 79e0f654d08..e9bbe6ea2fb 100644
--- a/Build/source/texk/dvipsk/testdata/upjf_omit.vf
+++ b/Build/source/texk/dvipsk/testdata/upjf_omit.vf
diff --git a/Build/source/texk/dvipsk/uptex-vf.test b/Build/source/texk/dvipsk/uptex-vf.test
index 97b4c1d4407..a8e3f83d918 100755
--- a/Build/source/texk/dvipsk/uptex-vf.test
+++ b/Build/source/texk/dvipsk/uptex-vf.test
@@ -4,14 +4,15 @@
 # You may freely use, modify and/or distribute this file.
 
 TEXFONTS="$srcdir/testdata;."
-export TEXFONTS
+SOURCE_DATE_EPOCH=1588474800
+export TEXFONTS SOURCE_DATE_EPOCH
 
 cp $srcdir/testdata/upjf_full.vf ./upjf.vf && \
-./dvips -d 4 $srcdir/testdata/upjf.dvi -o upjf.ps -u $srcdir/testdata/upjf.map -N && \
+./dvips -d 4 $srcdir/testdata/upjf.dvi -o upjf.ps -u $srcdir/testdata/upjf.map && \
 mv upjf.ps upjf_full.ps || exit 1
 
 cp $srcdir/testdata/upjf_omit.vf ./upjf.vf && \
-./dvips -d 4 $srcdir/testdata/upjf.dvi -o upjf.ps -u $srcdir/testdata/upjf.map -N && \
+./dvips -d 4 $srcdir/testdata/upjf.dvi -o upjf.ps -u $srcdir/testdata/upjf.map && \
 mv upjf.ps upjf_omit.ps || exit 2
 
 diff upjf_full.ps upjf_omit.ps || exit 3