CTAN sync 202203060301

5 files changed, 178 insertions, 4 deletions

diff --git a/language/japanese/japanese-otf/doc/test/uplatex/Makefile b/language/japanese/japanese-otf/doc/test/uplatex/Makefile
index 227e3dcd1d..bb5ba6d3f6 100644
--- a/language/japanese/japanese-otf/doc/test/uplatex/Makefile
+++ b/language/japanese/japanese-otf/doc/test/uplatex/Makefile
@@ -6,7 +6,7 @@ DVIPS = dvips
 DVIPDFMX = dvipdfmx -v
 PDVITYPE = pdvitype
 
-all: otf sp art brsg jis04 scale prop punct exclam mltwght
+all: otf sp art brsg jis04 scale prop punct exclam dir
 
 otf: uplatex-otf platex-otf
 sp: uplatex-sp platex-sp
@@ -17,6 +17,7 @@ scale: uplatex-scale platex-scale
 prop: uplatex-prop platex-prop
 exclam: uplatex-exclam platex-exclam
 utfmacro: uplatex-utfmacro platex-utfmacro
+dir: uplatex-dir platex-dir
 
 uplatex-otf:
 	for opt in default deluxe expert bold noreplace; do \
@@ -227,5 +228,21 @@ mltwght:
 	$(UPLATEX) cjk-pxbabel-v.tex ; \
 	$(DVIPDFMX) -l -f utfmacro-haranoaji.map cjk-pxbabel-v.dvi
 
+uplatex-dir:
+	for opt in default expert noreplace; do \
+		$(UPLATEX) "\def\option{$$opt}\def\class{ujarticle}\input" direction-utf8.tex ; \
+		mv direction-utf8.dvi direction-$$opt-uplatex.dvi ; \
+		$(DVIPDFMX) -f utfmacro-haranoaji.map direction-$$opt-uplatex.dvi ; \
+		$(DVIPS) -u jotf-psfonts.map direction-$$opt-uplatex.dvi ; \
+	done
+
+platex-dir:
+	for opt in default expert noreplace; do \
+		$(PLATEX) "\def\option{$$opt}\def\class{jarticle}\input" direction-utf8.tex ; \
+		mv direction-utf8.dvi direction-$$opt-platex.dvi ; \
+		$(DVIPDFMX) -f utfmacro-haranoaji.map direction-$$opt-platex.dvi ; \
+		$(DVIPS) -u jotf-psfonts.map direction-$$opt-platex.dvi ; \
+	done
+
 clean:
 	rm -f *.aux *.log *.dvi *.pdf
diff --git a/language/japanese/japanese-otf/doc/test/uplatex/direction-utf8.tex b/language/japanese/japanese-otf/doc/test/uplatex/direction-utf8.tex
new file mode 100644
index 0000000000..9cadc7c5a6
--- /dev/null
+++ b/language/japanese/japanese-otf/doc/test/uplatex/direction-utf8.tex
@@ -0,0 +1,110 @@
+% -*- coding: utf-8 -*-
+\newif\ifuptexmode\uptexmodefalse
+\ifnum\jis"2121="3000 \uptexmodetrue\fi
+
+\makeatletter
+
+\def\@opt@{multi}
+\def\@default{default}
+\def\@jarticle{jarticle}
+\def\@tarticle{tarticle}
+\def\@utarticle{utarticle}
+
+\ifx\option\@undefined
+ \def\option{default}
+\fi
+\ifx\option\@default
+\else
+ \edef\@opt@{\option,\@opt@}
+\fi
+
+\ifx\class\@undefined
+ \ifuptexmode
+  \def\class{ujarticle}
+ \else
+  \def\class{jarticle}
+ \fi
+\fi
+
+\ifuptexmode
+ \edef\@opt@{uplatex,\@opt@}
+\fi
+\documentclass[a4paper,titlepage,draft,twocolumn]{\class}
+%\documentclass[a4paper,titlepage, draft,landscape]{\class}
+
+\usepackage[\@opt@]{otf}
+\usepackage[T1]{fontenc}
+%\usepackage{bookman}
+%\usepackage{helvet}
+\usepackage{mathptmx}
+%\usepackage{mathpazo}
+\usepackage{courier}
+%\usepackage{txfonts}
+\usepackage{plext}
+\usepackage{graphicx}
+
+\makeatother
+
+\usepackage{redeffont}
+
+
+\AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}}
+
+\pagestyle{empty}
+
+\makeatother
+\begin{document}
+\parindent0mm
+クラス：\texttt{\class}\\
+オプション：\texttt{\option}
+
+\section{Horizontal Writing}
+\parbox<y>{13zw}{
+\fbox{\hbox{\large 「縦横無尽」}}\\
+\fbox{\hbox{\large キュート。Cute.}}\\
+\fbox{\hbox{\large \CID{8215}\CID{8216}\CID{8217}\CID{8218}\UTF{301C}\UTF{337C}\UTF{337B}\UTF{32FF}}}\\
+\ifuptexmode
+\fbox{\hbox{\large ㌐㌹㌨㍍㌰㌲㍿ｱｲｳｴｵ}}\\
+\fi
+\fbox{\hbox{\large ＴＬＴ． TLT.}}
+}
+
+\section{Vertical Writing}
+\parbox<t>{10.5zw}{
+\fbox{\hbox{\large 「縦横無尽」}}\\
+\fbox{\hbox{\large キュート。Cute.}}\\
+\fbox{\hbox{\large \CID{8215}\CID{8216}\CID{8217}\CID{8218}\UTF{301C}\UTF{337C}\UTF{337B}\UTF{32FF}}}\\
+\ifuptexmode
+\fbox{\hbox{\large ㌐㌹㌨㍍㌰㌲㍿}}\\
+\fi
+\fbox{\hbox{\large ＲＴＴ． RTR.}}
+}
+
+\section{Horizontal Writing, Rotate 270 deg}
+\rotatebox{-90}{
+\parbox<y>{13zw}{
+\fbox{\hbox{\large 「縦横無尽」}}\\
+\fbox{\hbox{\large キュート。Cute.}}\\
+\fbox{\hbox{\large \CID{8215}\CID{8216}\CID{8217}\CID{8218}\UTF{301C}\UTF{337C}\UTF{337B}\UTF{32FF}}}\\
+\ifuptexmode
+\fbox{\hbox{\large ㌐㌹㌨㍍㌰㌲㍿ｱｲｳｴｵ}}\\
+\fi
+\fbox{\hbox{\large ＲＴＲ． RTR.}}
+}
+}
+
+
+\section{Vertical Writing, Rotate 90 deg}
+\rotatebox{90}{
+\parbox<t>{10.5zw}{
+\fbox{\hbox{\large 「縦横無尽」}}\\
+\fbox{\hbox{\large キュート。Cute.}}\\
+\fbox{\hbox{\large \CID{8215}\CID{8216}\CID{8217}\CID{8218}\UTF{301C}\UTF{337C}\UTF{337B}\UTF{32FF}}}\\
+\ifuptexmode
+\fbox{\hbox{\large ㌐㌹㌨㍍㌰㌲㍿}}\\
+\fi
+\fbox{\hbox{\large ＴＬＬ． TLT.}}
+}
+}
+
+\end{document}
diff --git a/language/japanese/japanese-otf/doc/test/uplatex/jotf-psfonts.map b/language/japanese/japanese-otf/doc/test/uplatex/jotf-psfonts.map
new file mode 100644
index 0000000000..12d8ec0858
--- /dev/null
+++ b/language/japanese/japanese-otf/doc/test/uplatex/jotf-psfonts.map
@@ -0,0 +1,27 @@
+rml   Ryumin-Light-H
+rmlv  Ryumin-Light-V
+
+uprml-h  Ryumin-Light-UniJIS-UTF16-H
+uprml-v  Ryumin-Light-UniJIS-UTF16-V
+
+hminr-h  Ryumin-Light-H
+hminr-v  Ryumin-Light-V
+
+uphminr-h  Ryumin-Light-UniJIS-UTF16-H
+uphminr-v  Ryumin-Light-UniJIS-UTF16-V
+
+otf-cjmr-h   Ryumin-Light-Identity-H
+otf-cjmr-v   Ryumin-Light-Identity-V
+
+otf-ujmr-h   Ryumin-Light-UniJIS-UTF16-H
+otf-ujmr-v   Ryumin-Light-UniJIS-UTF16-V
+
+pcrr8r	 Courier	"TeXBase1Encoding ReEncodeFont"	<8r.enc
+pplr8r	 Palatino-Roman	"TeXBase1Encoding ReEncodeFont"	<8r.enc
+pplb8r	 Palatino-Bold	"TeXBase1Encoding ReEncodeFont"	<8r.enc
+ptmr8r	 Times-Roman	"TeXBase1Encoding ReEncodeFont"	<8r.enc
+ptmb8r	 Times-Bold	"TeXBase1Encoding ReEncodeFont"	<8r.enc
+pbkl8r	 Bookman-Light	"TeXBase1Encoding ReEncodeFont"	<8r.enc
+pbkd8r	 Bookman-Demi	"TeXBase1Encoding ReEncodeFont"	<8r.enc
+
+
diff --git a/language/japanese/japanese-otf/doc/test/uplatex/uotftest-utf8.tex b/language/japanese/japanese-otf/doc/test/uplatex/uotftest-utf8.tex
index 45f57f8390..2b112b0834 100644
--- a/language/japanese/japanese-otf/doc/test/uplatex/uotftest-utf8.tex
+++ b/language/japanese/japanese-otf/doc/test/uplatex/uotftest-utf8.tex
@@ -61,6 +61,10 @@
 \ifx\rubyfamily\@undefined\let\rubyfamily=\relax\fi
 \ifx\mgfamily\@undefined\let\mgfamily=\relax\fi
 \makeatother
+\textwidth160mm
+\oddsidemargin0mm
+\evensidemargin0mm
+
 \begin{document}
 \section{見出し}
 
@@ -83,6 +87,8 @@ mg/m & {\mgfamily ひらかな} & {\mgfamily 漢字} & {\mgfamily\UTF{9DD7}} & {
 
 日本：\UTF{6d77}　簡体字：\UTFC{6d77}　繁體字：\UTFT{6d77}　朝鮮：\UTFK{6d77}
 
+日本：\UTF{8FF0}　簡体字：\UTFC{8FF0}　繁體字：\UTFT{8FF0}　朝鮮：\UTFK{8FF0}
+
 % with furikana.sty
 \makeatletter
 \ifx\kana\@undefined
@@ -101,17 +107,25 @@ mg/m & {\mgfamily ひらかな} & {\mgfamily 漢字} & {\mgfamily\UTF{9DD7}} & {
 
 アイウエオ\raisebox\baseshift{\frame{ア}\frame{イ}\frame{ウ}\frame{エ}\frame{オ}}
 
+\ifuptexmode
 ｱｲｳｴｵ\raisebox\baseshift{\frame{ｱ}\frame{ｲ}\frame{ｳ}\frame{ｴ}\frame{ｵ}}
+\fi
 
-% \UTF{}はまだ半角片仮名に対応していない。
 UTF:\UTF{FF71}\UTF{FF72}\UTF{FF73}\UTF{FF74}\UTF{FF75}%
-\raisebox\baseshift{\frame{\UTF{FF71}}\frame{\UTF{FF72}}\frame{\UTF{FF73}}\frame{\UTF{FF74}}\frame{\UTF{FF75}}}
+\raisebox\baseshift{\frame{\UTF{FF71}}\frame{\UTF{FF72}}\frame{\UTF{FF73}}\frame{\UTF{FF74}}\frame{\UTF{FF75}}}\\
+UTFM:\UTFM{FF71}\UTFM{FF72}\UTFM{FF73}\UTFM{FF74}\UTFM{FF75}%
+\raisebox\baseshift{\frame{\UTFM{FF71}}\frame{\UTFM{FF72}}\frame{\UTFM{FF73}}\frame{\UTFM{FF74}}\frame{\UTFM{FF75}}}
 
 UTF:%
 \UTF{FF61}\UTF{FF62}\UTF{FF63}\UTF{FF64}\UTF{FF65}\UTF{FF66}\UTF{FF67}\UTF{FF68}\UTF{FF69}\UTF{FF6A}\UTF{FF6B}\UTF{FF6C}\UTF{FF6D}\UTF{FF6E}\UTF{FF6F},%
 \UTF{FF70}\UTF{FF71}\UTF{FF72}\UTF{FF73}\UTF{FF74}\UTF{FF75}\UTF{FF76}\UTF{FF77}\UTF{FF78}\UTF{FF79}\UTF{FF7A}\UTF{FF7B}\UTF{FF7C}\UTF{FF7D}\UTF{FF7E}\UTF{FF7F},%
 \UTF{FF80}\UTF{FF81}\UTF{FF82}\UTF{FF83}\UTF{FF84}\UTF{FF85}\UTF{FF86}\UTF{FF87}\UTF{FF88}\UTF{FF89}\UTF{FF8A}\UTF{FF8B}\UTF{FF8C}\UTF{FF8D}\UTF{FF8E}\UTF{FF8F},%
-\UTF{FF90}\UTF{FF91}\UTF{FF92}\UTF{FF93}\UTF{FF94}\UTF{FF95}\UTF{FF96}\UTF{FF97}\UTF{FF98}\UTF{FF99}\UTF{FF9A}\UTF{FF9B}\UTF{FF9C}\UTF{FF9D}\UTF{FF9E}\UTF{FF9F}
+\UTF{FF90}\UTF{FF91}\UTF{FF92}\UTF{FF93}\UTF{FF94}\UTF{FF95}\UTF{FF96}\UTF{FF97}\UTF{FF98}\UTF{FF99}\UTF{FF9A}\UTF{FF9B}\UTF{FF9C}\UTF{FF9D}\UTF{FF9E}\UTF{FF9F}=\\
+UTFM:%
+\UTFM{FF61}\UTFM{FF62}\UTFM{FF63}\UTFM{FF64}\UTFM{FF65}\UTFM{FF66}\UTFM{FF67}\UTFM{FF68}\UTFM{FF69}\UTFM{FF6A}\UTFM{FF6B}\UTFM{FF6C}\UTFM{FF6D}\UTFM{FF6E}\UTFM{FF6F},%
+\UTFM{FF70}\UTFM{FF71}\UTFM{FF72}\UTFM{FF73}\UTFM{FF74}\UTFM{FF75}\UTFM{FF76}\UTFM{FF77}\UTFM{FF78}\UTFM{FF79}\UTFM{FF7A}\UTFM{FF7B}\UTFM{FF7C}\UTFM{FF7D}\UTFM{FF7E}\UTFM{FF7F},%
+\UTFM{FF80}\UTFM{FF81}\UTFM{FF82}\UTFM{FF83}\UTFM{FF84}\UTFM{FF85}\UTFM{FF86}\UTFM{FF87}\UTFM{FF88}\UTFM{FF89}\UTFM{FF8A}\UTFM{FF8B}\UTFM{FF8C}\UTFM{FF8D}\UTFM{FF8E}\UTFM{FF8F},%
+\UTFM{FF90}\UTFM{FF91}\UTFM{FF92}\UTFM{FF93}\UTFM{FF94}\UTFM{FF95}\UTFM{FF96}\UTFM{FF97}\UTFM{FF98}\UTFM{FF99}\UTFM{FF9A}\UTFM{FF9B}\UTFM{FF9C}\UTFM{FF9D}\UTFM{FF9E}\UTFM{FF9F}=
 
 \clearpage
 [mc/m]
diff --git a/language/japanese/japanese-otf/doc/test/uplatex/utfmacro-haranoaji.map b/language/japanese/japanese-otf/doc/test/uplatex/utfmacro-haranoaji.map
index 732b35cf5a..3aada8b0bb 100644
--- a/language/japanese/japanese-otf/doc/test/uplatex/utfmacro-haranoaji.map
+++ b/language/japanese/japanese-otf/doc/test/uplatex/utfmacro-haranoaji.map
@@ -1,3 +1,9 @@
+rml  H HaranoAjiMincho-Regular.otf
+rmlv V HaranoAjiMincho-Regular.otf
+
+uprml-h UniJISup-UTF16-H HaranoAjiMincho-Regular.otf
+uprml-v UniJISup-UTF16-V HaranoAjiMincho-Regular.otf
+
 hminr-h H HaranoAjiMincho-Regular.otf
 hminb-h H HaranoAjiMincho-Bold.otf
 hminl-h H HaranoAjiMincho-Light.otf