add \selectlgcfont.

simplify code.
fix: use clearocplists instead of \NilOCP.

diff --git a/chise.sty b/chise.sty
index c99a865..a00e928 100644 (file)
--- a/chise.sty
+++ b/chise.sty
@@ -198,29 +198,31 @@
 \def\selectgbsfont{\fontencoding{OT1}\fontfamily{omgbs}\selectfont}
 \def\selectcnsfont{\fontencoding{OT1}\fontfamily{omcns}\selectfont}
 \def\selectksxfont{\fontencoding{OT1}\fontfamily{omksx}\selectfont}
+\def\selectlgcfont{\fontencoding{OT1}\fontfamily{\rmdefault}\selectfont}
 
-\newenvironment{JISfont}{\pushocplist\uniJIS\selectjisfont}{}
-\newenvironment{GBfont}{\pushocplist\uniGB\selectgbsfont}{}
-\newenvironment{KSfont}{\pushocplist\uniKS\selectksxfont}{}
-\newenvironment{CNSfont}{\pushocplist\uniCNS\selectcnsfont}{}
+\newenvironment{JISfont}{\pushocplist\uniJIS}{}
+\newenvironment{GBfont}{\pushocplist\uniGB}{}
+\newenvironment{KSfont}{\pushocplist\uniKS}{}
+\newenvironment{CNSfont}{\pushocplist\uniCNS}{}
 \newenvironment{Multifont}{\pushocplist\uniMulti}{}
-\newenvironment{NonCJK}{\pushocplist\inutf\fontencoding{OT1}\fontfamily{omlgc}\selectfont}{}
-\newenvironment{ASCII}{\pushocplist\NilOCP\fontencoding{T1}\fontfamily{\rmdefault}\selectfont}{}
+\newenvironment{NonCJK}{\pushocplist\inutf\selectlgcfont}{}
+\newenvironment{ASCII}{\clearocplists\fontencoding{T1}\selectnormalfont}{}
 
 \newcommand{\jisfont}[1]{\begingroup%
-  \pushocplist\uniJIS\selectjisfont #1\endgroup}
+  \pushocplist\uniJIS #1\endgroup}
 \newcommand{\gbfont}[1]{\begingroup%
-  \pushocplist\uniGB\selectgbsfont #1\endgroup}
+  \pushocplist\uniGB #1\endgroup}
 \newcommand{\ksfont}[1]{\begingroup%
-  \pushocplist\uniKS\selectksxfont #1\endgroup}
+  \pushocplist\uniKS #1\endgroup}
 \newcommand{\cnsfont}[1]{\begingroup%
-  \pushocplist\uniCNS\selectcnsfont #1\endgroup}
+  \pushocplist\uniCNS #1\endgroup}
 \newcommand{\multifont}[1]{\begingroup%
   \pushocplist\uniMulti #1\endgroup}
 \newcommand{\noncjk}[1]{\begingroup%
-  \normalfont\pushocplist\inutf #1\endgroup}
+  \pushocplist\inutf\selectlgcfont #1\endgroup}
+%  \normalfont\pushocplist\inutf #1\endgroup}
 \newcommand{\ascii}[1]{\begingroup%
-  \pushocplist\NilOCP\fontencoding{T1}\fontfamily{\rmdefault}\selectfont #1\endgroup}
+  \clearocplists\selectlgcfont #1\endgroup}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Entity Reference
 % ----------------