Modify for OTF package on upLaTeX:

- Use \otf@JYn instead of JY1.
- Use \otf@JTn instead of JT1.
(\GTpj[A-M]): Use ugt{01..13} instead of gto{01..13}.
(\ThaiTIS): New command.

diff --git a/uplatex/chiseotf.sty b/uplatex/chiseotf.sty
index 2157826..172059f 100644 (file)
--- a/uplatex/chiseotf.sty
+++ b/uplatex/chiseotf.sty
@@ -3,8 +3,8 @@
 
 \RequirePackage[multi]{otf}
 
-\DeclareKanjiFamily{JY1}{urui6}{}
-\DeclareKanjiFamily{JT1}{urui6}{}
+\DeclareKanjiFamily{\otf@JYn}{urui6}{}
+\DeclareKanjiFamily{\otf@JTn}{urui6}{}
 \Declare@FontShape{urui6}{m}{0123456789abcdef}{urui6}
 \Declare@FontShape{urui6}{bx}{0123456789abcdef}{urui6}
 
@@ -14,52 +14,52 @@
         \endgroup%
 }
 
-\DeclareKanjiFamily{JY1}{uhzk1}{}
-\DeclareKanjiFamily{JT1}{uhzk1}{}
+\DeclareKanjiFamily{\otf@JYn}{uhzk1}{}
+\DeclareKanjiFamily{\otf@JTn}{uhzk1}{}
 \Declare@FontShape{uhzk1}{m}{0123456789abcdef}{uhzk1}
 \Declare@FontShape{uhzk1}{bx}{0123456789abcdef}{uhzk1}
-\DeclareKanjiFamily{JY1}{uhzk2}{}
-\DeclareKanjiFamily{JT1}{uhzk2}{}
+\DeclareKanjiFamily{\otf@JYn}{uhzk2}{}
+\DeclareKanjiFamily{\otf@JTn}{uhzk2}{}
 \Declare@FontShape{uhzk2}{m}{0123456789abcdef}{uhzk2}
 \Declare@FontShape{uhzk2}{bx}{0123456789abcdef}{uhzk2}
-\DeclareKanjiFamily{JY1}{uhzk3}{}
-\DeclareKanjiFamily{JT1}{uhzk3}{}
+\DeclareKanjiFamily{\otf@JYn}{uhzk3}{}
+\DeclareKanjiFamily{\otf@JTn}{uhzk3}{}
 \Declare@FontShape{uhzk3}{m}{0123456789abcdef}{uhzk3}
 \Declare@FontShape{uhzk3}{bx}{0123456789abcdef}{uhzk3}
-\DeclareKanjiFamily{JY1}{uhzk4}{}
-\DeclareKanjiFamily{JT1}{uhzk4}{}
+\DeclareKanjiFamily{\otf@JYn}{uhzk4}{}
+\DeclareKanjiFamily{\otf@JTn}{uhzk4}{}
 \Declare@FontShape{uhzk4}{m}{0123456789abcdef}{uhzk4}
 \Declare@FontShape{uhzk4}{bx}{0123456789abcdef}{uhzk4}
-\DeclareKanjiFamily{JY1}{uhzk5}{}
-\DeclareKanjiFamily{JT1}{uhzk5}{}
+\DeclareKanjiFamily{\otf@JYn}{uhzk5}{}
+\DeclareKanjiFamily{\otf@JTn}{uhzk5}{}
 \Declare@FontShape{uhzk5}{m}{0123456789abcdef}{uhzk5}
 \Declare@FontShape{uhzk5}{bx}{0123456789abcdef}{uhzk5}
-\DeclareKanjiFamily{JY1}{uhzk6}{}
-\DeclareKanjiFamily{JT1}{uhzk6}{}
+\DeclareKanjiFamily{\otf@JYn}{uhzk6}{}
+\DeclareKanjiFamily{\otf@JTn}{uhzk6}{}
 \Declare@FontShape{uhzk6}{m}{0123456789abcdef}{uhzk6}
 \Declare@FontShape{uhzk6}{bx}{0123456789abcdef}{uhzk6}
-\DeclareKanjiFamily{JY1}{uhzk7}{}
-\DeclareKanjiFamily{JT1}{uhzk7}{}
+\DeclareKanjiFamily{\otf@JYn}{uhzk7}{}
+\DeclareKanjiFamily{\otf@JTn}{uhzk7}{}
 \Declare@FontShape{uhzk7}{m}{0123456789abcdef}{uhzk7}
 \Declare@FontShape{uhzk7}{bx}{0123456789abcdef}{uhzk7}
-\DeclareKanjiFamily{JY1}{uhzk8}{}
-\DeclareKanjiFamily{JT1}{uhzk8}{}
+\DeclareKanjiFamily{\otf@JYn}{uhzk8}{}
+\DeclareKanjiFamily{\otf@JTn}{uhzk8}{}
 \Declare@FontShape{uhzk8}{m}{0123456789abcdef}{uhzk8}
 \Declare@FontShape{uhzk8}{bx}{0123456789abcdef}{uhzk8}
-\DeclareKanjiFamily{JY1}{uhzk9}{}
-\DeclareKanjiFamily{JT1}{uhzk9}{}
+\DeclareKanjiFamily{\otf@JYn}{uhzk9}{}
+\DeclareKanjiFamily{\otf@JTn}{uhzk9}{}
 \Declare@FontShape{uhzk9}{m}{0123456789abcdef}{uhzk9}
 \Declare@FontShape{uhzk9}{bx}{0123456789abcdef}{uhzk9}
-\DeclareKanjiFamily{JY1}{uhzka}{}
-\DeclareKanjiFamily{JT1}{uhzka}{}
+\DeclareKanjiFamily{\otf@JYn}{uhzka}{}
+\DeclareKanjiFamily{\otf@JTn}{uhzka}{}
 \Declare@FontShape{uhzka}{m}{0123456789abcdef}{uhzka}
 \Declare@FontShape{uhzka}{bx}{0123456789abcdef}{uhzka}
-\DeclareKanjiFamily{JY1}{uhzkb}{}
-\DeclareKanjiFamily{JT1}{uhzkb}{}
+\DeclareKanjiFamily{\otf@JYn}{uhzkb}{}
+\DeclareKanjiFamily{\otf@JTn}{uhzkb}{}
 \Declare@FontShape{uhzkb}{m}{0123456789abcdef}{uhzkb}
 \Declare@FontShape{uhzkb}{bx}{0123456789abcdef}{uhzkb}
-\DeclareKanjiFamily{JY1}{uhzkc}{}
-\DeclareKanjiFamily{JT1}{uhzkc}{}
+\DeclareKanjiFamily{\otf@JYn}{uhzkc}{}
+\DeclareKanjiFamily{\otf@JTn}{uhzkc}{}
 \Declare@FontShape{uhzkc}{m}{0123456789abcdef}{uhzkc}
 \Declare@FontShape{uhzkc}{bx}{0123456789abcdef}{uhzkc}
 
@@ -124,8 +124,8 @@
         \endgroup%
 }
 
-\DeclareKanjiFamily{JY1}{ucdp}{}
-\DeclareKanjiFamily{JT1}{ucdp}{}
+\DeclareKanjiFamily{\otf@JYn}{ucdp}{}
+\DeclareKanjiFamily{\otf@JTn}{ucdp}{}
 \Declare@FontShape{ucdp}{m}{0123456789abcdef}{ucdp}
 \Declare@FontShape{ucdp}{bx}{0123456789abcdef}{ucdp}
 
@@ -135,123 +135,123 @@
         \endgroup%
 }
 
-\DeclareKanjiFamily{JY1}{gto01}{}
-\DeclareFontShape{JY1}{gto01}{m}{n}{<-> s * [0.961] gto01}{}
-\DeclareFontShape{JY1}{gto01}{bx}{n}{<-> s * [0.961] gto01}{}
-\DeclareKanjiFamily{JY1}{gto02}{}
-\DeclareFontShape{JY1}{gto02}{m}{n}{<-> s * [0.961] gto02}{}
-\DeclareFontShape{JY1}{gto02}{bx}{n}{<-> s * [0.961] gto02}{}
-\DeclareKanjiFamily{JY1}{gto03}{}
-\DeclareFontShape{JY1}{gto03}{m}{n}{<-> s * [0.961] gto03}{}
-\DeclareFontShape{JY1}{gto03}{bx}{n}{<-> s * [0.961] gto03}{}
-\DeclareKanjiFamily{JY1}{gto04}{}
-\DeclareFontShape{JY1}{gto04}{m}{n}{<-> s * [0.961] gto04}{}
-\DeclareFontShape{JY1}{gto04}{bx}{n}{<-> s * [0.961] gto04}{}
-\DeclareKanjiFamily{JY1}{gto05}{}
-\DeclareFontShape{JY1}{gto05}{m}{n}{<-> s * [0.961] gto05}{}
-\DeclareFontShape{JY1}{gto05}{bx}{n}{<-> s * [0.961] gto05}{}
-\DeclareKanjiFamily{JY1}{gto06}{}
-\DeclareFontShape{JY1}{gto06}{m}{n}{<-> s * [0.961] gto06}{}
-\DeclareFontShape{JY1}{gto06}{bx}{n}{<-> s * [0.961] gto06}{}
-\DeclareKanjiFamily{JY1}{gto07}{}
-\DeclareFontShape{JY1}{gto07}{m}{n}{<-> s * [0.961] gto07}{}
-\DeclareFontShape{JY1}{gto07}{bx}{n}{<-> s * [0.961] gto07}{}
-\DeclareKanjiFamily{JY1}{gto08}{}
-\DeclareFontShape{JY1}{gto08}{m}{n}{<-> s * [0.961] gto08}{}
-\DeclareFontShape{JY1}{gto08}{bx}{n}{<-> s * [0.961] gto08}{}
-\DeclareKanjiFamily{JY1}{gto09}{}
-\DeclareFontShape{JY1}{gto09}{m}{n}{<-> s * [0.961] gto09}{}
-\DeclareFontShape{JY1}{gto09}{bx}{n}{<-> s * [0.961] gto09}{}
-\DeclareKanjiFamily{JY1}{gto10}{}
-\DeclareFontShape{JY1}{gto10}{m}{n}{<-> s * [0.961] gto10}{}
-\DeclareFontShape{JY1}{gto10}{bx}{n}{<-> s * [0.961] gto10}{}
-\DeclareKanjiFamily{JY1}{gto11}{}
-\DeclareFontShape{JY1}{gto11}{m}{n}{<-> s * [0.961] gto11}{}
-\DeclareFontShape{JY1}{gto11}{bx}{n}{<-> s * [0.961] gto11}{}
-\DeclareKanjiFamily{JY1}{gto12}{}
-\DeclareFontShape{JY1}{gto12}{m}{n}{<-> s * [0.961] gto12}{}
-\DeclareFontShape{JY1}{gto12}{bx}{n}{<-> s * [0.961] gto12}{}
-\DeclareKanjiFamily{JY1}{gto13}{}
-\DeclareFontShape{JY1}{gto13}{m}{n}{<-> s * [0.961] gto13}{}
-\DeclareFontShape{JY1}{gto13}{bx}{n}{<-> s * [0.961] gto13}{}
-\DeclareKanjiFamily{JT1}{gto01}{}
-\DeclareFontShape{JT1}{gto01}{m}{n}{<-> s * [0.961] gto01-v}{}
-\DeclareFontShape{JT1}{gto01}{bx}{n}{<-> s * [0.961] gto01-v}{}
-\DeclareKanjiFamily{JT1}{gto02}{}
-\DeclareFontShape{JT1}{gto02}{m}{n}{<-> s * [0.961] gto02-v}{}
-\DeclareFontShape{JT1}{gto02}{bx}{n}{<-> s * [0.961] gto02-v}{}
-\DeclareKanjiFamily{JT1}{gto03}{}
-\DeclareFontShape{JT1}{gto03}{m}{n}{<-> s * [0.961] gto03-v}{}
-\DeclareFontShape{JT1}{gto03}{bx}{n}{<-> s * [0.961] gto03-v}{}
-\DeclareKanjiFamily{JT1}{gto04}{}
-\DeclareFontShape{JT1}{gto04}{m}{n}{<-> s * [0.961] gto04-v}{}
-\DeclareFontShape{JT1}{gto04}{bx}{n}{<-> s * [0.961] gto04-v}{}
-\DeclareKanjiFamily{JT1}{gto05}{}
-\DeclareFontShape{JT1}{gto05}{m}{n}{<-> s * [0.961] gto05-v}{}
-\DeclareFontShape{JT1}{gto05}{bx}{n}{<-> s * [0.961] gto05-v}{}
-\DeclareKanjiFamily{JT1}{gto06}{}
-\DeclareFontShape{JT1}{gto06}{m}{n}{<-> s * [0.961] gto06-v}{}
-\DeclareFontShape{JT1}{gto06}{bx}{n}{<-> s * [0.961] gto06-v}{}
-\DeclareKanjiFamily{JT1}{gto07}{}
-\DeclareFontShape{JT1}{gto07}{m}{n}{<-> s * [0.961] gto07-v}{}
-\DeclareFontShape{JT1}{gto07}{bx}{n}{<-> s * [0.961] gto07-v}{}
-\DeclareKanjiFamily{JT1}{gto08}{}
-\DeclareFontShape{JT1}{gto08}{m}{n}{<-> s * [0.961] gto08-v}{}
-\DeclareFontShape{JT1}{gto08}{bx}{n}{<-> s * [0.961] gto08-v}{}
-\DeclareKanjiFamily{JT1}{gto09}{}
-\DeclareFontShape{JT1}{gto09}{m}{n}{<-> s * [0.961] gto09-v}{}
-\DeclareFontShape{JT1}{gto09}{bx}{n}{<-> s * [0.961] gto09-v}{}
-\DeclareKanjiFamily{JT1}{gto10}{}
-\DeclareFontShape{JT1}{gto10}{m}{n}{<-> s * [0.961] gto10-v}{}
-\DeclareFontShape{JT1}{gto10}{bx}{n}{<-> s * [0.961] gto10-v}{}
-\DeclareKanjiFamily{JT1}{gto11}{}
-\DeclareFontShape{JT1}{gto11}{m}{n}{<-> s * [0.961] gto11-v}{}
-\DeclareFontShape{JT1}{gto11}{bx}{n}{<-> s * [0.961] gto11-v}{}
-\DeclareKanjiFamily{JT1}{gto12}{}
-\DeclareFontShape{JT1}{gto12}{m}{n}{<-> s * [0.961] gto12-v}{}
-\DeclareFontShape{JT1}{gto12}{bx}{n}{<-> s * [0.961] gto12-v}{}
-\DeclareKanjiFamily{JT1}{gto13}{}
-\DeclareFontShape{JT1}{gto13}{m}{n}{<-> s * [0.961] gto13-v}{}
-\DeclareFontShape{JT1}{gto13}{bx}{n}{<-> s * [0.961] gto13-v}{}
+\DeclareKanjiFamily{\otf@JYn}{ugt01}{}
+\DeclareFontShape{\otf@JYn}{ugt01}{m}{n}{<-> s * [0.961] ugt01}{}
+\DeclareFontShape{\otf@JYn}{ugt01}{bx}{n}{<-> s * [0.961] ugt01}{}
+\DeclareKanjiFamily{\otf@JYn}{ugt02}{}
+\DeclareFontShape{\otf@JYn}{ugt02}{m}{n}{<-> s * [0.961] ugt02}{}
+\DeclareFontShape{\otf@JYn}{ugt02}{bx}{n}{<-> s * [0.961] ugt02}{}
+\DeclareKanjiFamily{\otf@JYn}{ugt03}{}
+\DeclareFontShape{\otf@JYn}{ugt03}{m}{n}{<-> s * [0.961] ugt03}{}
+\DeclareFontShape{\otf@JYn}{ugt03}{bx}{n}{<-> s * [0.961] ugt03}{}
+\DeclareKanjiFamily{\otf@JYn}{ugt04}{}
+\DeclareFontShape{\otf@JYn}{ugt04}{m}{n}{<-> s * [0.961] ugt04}{}
+\DeclareFontShape{\otf@JYn}{ugt04}{bx}{n}{<-> s * [0.961] ugt04}{}
+\DeclareKanjiFamily{\otf@JYn}{ugt05}{}
+\DeclareFontShape{\otf@JYn}{ugt05}{m}{n}{<-> s * [0.961] ugt05}{}
+\DeclareFontShape{\otf@JYn}{ugt05}{bx}{n}{<-> s * [0.961] ugt05}{}
+\DeclareKanjiFamily{\otf@JYn}{ugt06}{}
+\DeclareFontShape{\otf@JYn}{ugt06}{m}{n}{<-> s * [0.961] ugt06}{}
+\DeclareFontShape{\otf@JYn}{ugt06}{bx}{n}{<-> s * [0.961] ugt06}{}
+\DeclareKanjiFamily{\otf@JYn}{ugt07}{}
+\DeclareFontShape{\otf@JYn}{ugt07}{m}{n}{<-> s * [0.961] ugt07}{}
+\DeclareFontShape{\otf@JYn}{ugt07}{bx}{n}{<-> s * [0.961] ugt07}{}
+\DeclareKanjiFamily{\otf@JYn}{ugt08}{}
+\DeclareFontShape{\otf@JYn}{ugt08}{m}{n}{<-> s * [0.961] ugt08}{}
+\DeclareFontShape{\otf@JYn}{ugt08}{bx}{n}{<-> s * [0.961] ugt08}{}
+\DeclareKanjiFamily{\otf@JYn}{ugt09}{}
+\DeclareFontShape{\otf@JYn}{ugt09}{m}{n}{<-> s * [0.961] ugt09}{}
+\DeclareFontShape{\otf@JYn}{ugt09}{bx}{n}{<-> s * [0.961] ugt09}{}
+\DeclareKanjiFamily{\otf@JYn}{ugt10}{}
+\DeclareFontShape{\otf@JYn}{ugt10}{m}{n}{<-> s * [0.961] ugt10}{}
+\DeclareFontShape{\otf@JYn}{ugt10}{bx}{n}{<-> s * [0.961] ugt10}{}
+\DeclareKanjiFamily{\otf@JYn}{ugt11}{}
+\DeclareFontShape{\otf@JYn}{ugt11}{m}{n}{<-> s * [0.961] ugt11}{}
+\DeclareFontShape{\otf@JYn}{ugt11}{bx}{n}{<-> s * [0.961] ugt11}{}
+\DeclareKanjiFamily{\otf@JYn}{ugt12}{}
+\DeclareFontShape{\otf@JYn}{ugt12}{m}{n}{<-> s * [0.961] ugt12}{}
+\DeclareFontShape{\otf@JYn}{ugt12}{bx}{n}{<-> s * [0.961] ugt12}{}
+\DeclareKanjiFamily{\otf@JYn}{ugt13}{}
+\DeclareFontShape{\otf@JYn}{ugt13}{m}{n}{<-> s * [0.961] ugt13}{}
+\DeclareFontShape{\otf@JYn}{ugt13}{bx}{n}{<-> s * [0.961] ugt13}{}
+\DeclareKanjiFamily{\otf@JTn}{ugt01}{}
+\DeclareFontShape{\otf@JTn}{ugt01}{m}{n}{<-> s * [0.961] ugt01-v}{}
+\DeclareFontShape{\otf@JTn}{ugt01}{bx}{n}{<-> s * [0.961] ugt01-v}{}
+\DeclareKanjiFamily{\otf@JTn}{ugt02}{}
+\DeclareFontShape{\otf@JTn}{ugt02}{m}{n}{<-> s * [0.961] ugt02-v}{}
+\DeclareFontShape{\otf@JTn}{ugt02}{bx}{n}{<-> s * [0.961] ugt02-v}{}
+\DeclareKanjiFamily{\otf@JTn}{ugt03}{}
+\DeclareFontShape{\otf@JTn}{ugt03}{m}{n}{<-> s * [0.961] ugt03-v}{}
+\DeclareFontShape{\otf@JTn}{ugt03}{bx}{n}{<-> s * [0.961] ugt03-v}{}
+\DeclareKanjiFamily{\otf@JTn}{ugt04}{}
+\DeclareFontShape{\otf@JTn}{ugt04}{m}{n}{<-> s * [0.961] ugt04-v}{}
+\DeclareFontShape{\otf@JTn}{ugt04}{bx}{n}{<-> s * [0.961] ugt04-v}{}
+\DeclareKanjiFamily{\otf@JTn}{ugt05}{}
+\DeclareFontShape{\otf@JTn}{ugt05}{m}{n}{<-> s * [0.961] ugt05-v}{}
+\DeclareFontShape{\otf@JTn}{ugt05}{bx}{n}{<-> s * [0.961] ugt05-v}{}
+\DeclareKanjiFamily{\otf@JTn}{ugt06}{}
+\DeclareFontShape{\otf@JTn}{ugt06}{m}{n}{<-> s * [0.961] ugt06-v}{}
+\DeclareFontShape{\otf@JTn}{ugt06}{bx}{n}{<-> s * [0.961] ugt06-v}{}
+\DeclareKanjiFamily{\otf@JTn}{ugt07}{}
+\DeclareFontShape{\otf@JTn}{ugt07}{m}{n}{<-> s * [0.961] ugt07-v}{}
+\DeclareFontShape{\otf@JTn}{ugt07}{bx}{n}{<-> s * [0.961] ugt07-v}{}
+\DeclareKanjiFamily{\otf@JTn}{ugt08}{}
+\DeclareFontShape{\otf@JTn}{ugt08}{m}{n}{<-> s * [0.961] ugt08-v}{}
+\DeclareFontShape{\otf@JTn}{ugt08}{bx}{n}{<-> s * [0.961] ugt08-v}{}
+\DeclareKanjiFamily{\otf@JTn}{ugt09}{}
+\DeclareFontShape{\otf@JTn}{ugt09}{m}{n}{<-> s * [0.961] ugt09-v}{}
+\DeclareFontShape{\otf@JTn}{ugt09}{bx}{n}{<-> s * [0.961] ugt09-v}{}
+\DeclareKanjiFamily{\otf@JTn}{ugt10}{}
+\DeclareFontShape{\otf@JTn}{ugt10}{m}{n}{<-> s * [0.961] ugt10-v}{}
+\DeclareFontShape{\otf@JTn}{ugt10}{bx}{n}{<-> s * [0.961] ugt10-v}{}
+\DeclareKanjiFamily{\otf@JTn}{ugt11}{}
+\DeclareFontShape{\otf@JTn}{ugt11}{m}{n}{<-> s * [0.961] ugt11-v}{}
+\DeclareFontShape{\otf@JTn}{ugt11}{bx}{n}{<-> s * [0.961] ugt11-v}{}
+\DeclareKanjiFamily{\otf@JTn}{ugt12}{}
+\DeclareFontShape{\otf@JTn}{ugt12}{m}{n}{<-> s * [0.961] ugt12-v}{}
+\DeclareFontShape{\otf@JTn}{ugt12}{bx}{n}{<-> s * [0.961] ugt12-v}{}
+\DeclareKanjiFamily{\otf@JTn}{ugt13}{}
+\DeclareFontShape{\otf@JTn}{ugt13}{m}{n}{<-> s * [0.961] ugt13-v}{}
+\DeclareFontShape{\otf@JTn}{ugt13}{bx}{n}{<-> s * [0.961] ugt13-v}{}
 
 \DeclareRobustCommand{\GTpjA}[1]{\begingroup%
-  \kanjifamily{gto01}\selectfont\char\jis"#1\endgroup
+  \kanjifamily{ugt01}\selectfont\char\jis"#1\endgroup
 }
 \DeclareRobustCommand{\GTpjB}[1]{\begingroup%
-  \kanjifamily{gto02}\selectfont\char\jis"#1\endgroup
+  \kanjifamily{ugt02}\selectfont\char\jis"#1\endgroup
 }
 \DeclareRobustCommand{\GTpjC}[1]{\begingroup%
-  \kanjifamily{gto03}\selectfont\char\jis"#1\endgroup
+  \kanjifamily{ugt03}\selectfont\char\jis"#1\endgroup
 }
 \DeclareRobustCommand{\GTpjD}[1]{\begingroup%
-  \kanjifamily{gto04}\selectfont\char\jis"#1\endgroup
+  \kanjifamily{ugt04}\selectfont\char\jis"#1\endgroup
 }
 \DeclareRobustCommand{\GTpjE}[1]{\begingroup%
-  \kanjifamily{gto05}\selectfont\char\jis"#1\endgroup
+  \kanjifamily{ugt05}\selectfont\char\jis"#1\endgroup
 }
 \DeclareRobustCommand{\GTpjF}[1]{\begingroup%
-  \kanjifamily{gto06}\selectfont\char\jis"#1\endgroup
+  \kanjifamily{ugt06}\selectfont\char\jis"#1\endgroup
 }
 \DeclareRobustCommand{\GTpjG}[1]{\begingroup%
-  \kanjifamily{gto07}\selectfont\char\jis"#1\endgroup
+  \kanjifamily{ugt07}\selectfont\char\jis"#1\endgroup
 }
 \DeclareRobustCommand{\GTpjH}[1]{\begingroup%
-  \kanjifamily{gto08}\selectfont\char\jis"#1\endgroup
+  \kanjifamily{ugt08}\selectfont\char\jis"#1\endgroup
 }
 \DeclareRobustCommand{\GTpjI}[1]{\begingroup%
-  \kanjifamily{gto09}\selectfont\char\jis"#1\endgroup
+  \kanjifamily{ugt09}\selectfont\char\jis"#1\endgroup
 }
 \DeclareRobustCommand{\GTpjJ}[1]{\begingroup%
-  \kanjifamily{gto10}\selectfont\char\jis"#1\endgroup
+  \kanjifamily{ugt10}\selectfont\char\jis"#1\endgroup
 }
 \DeclareRobustCommand{\GTpjK}[1]{\begingroup%
-  \kanjifamily{gto11}\selectfont\char\jis"#1\endgroup
+  \kanjifamily{ugt11}\selectfont\char\jis"#1\endgroup
 }
 \DeclareRobustCommand{\GTpjL}[1]{\begingroup%
-  \kanjifamily{gto12}\selectfont\char\jis"#1\endgroup
+  \kanjifamily{ugt12}\selectfont\char\jis"#1\endgroup
 }
 \DeclareRobustCommand{\GTpjM}[1]{\begingroup%
-  \kanjifamily{gto13}\selectfont\char\jis"#1\endgroup
+  \kanjifamily{ugt13}\selectfont\char\jis"#1\endgroup
 }
 
 \DeclareFontFamily{T1}{chisesub000}{}
@@ -311,3 +311,4 @@
 \newcommand{\UCSks}[1]{\UTFK{#1}}
 \newcommand{\UCScns}[1]{\UTFT{#1}}
 \newcommand{\AdobeJP}[1]{\CID{#1}}
+\newcommand{\ThaiTIS}[1]{\fontencoding{LTH}\selectfont\char"#1\fontencoding{T1}\selectfont}