fix space between punctuation and CJK character.

[chise/omega.git] / chise.sty

diff --git a/chise.sty b/chise.sty
index 2c94bbe..c99a865 100644 (file)
--- a/chise.sty
+++ b/chise.sty
@@ -2,7 +2,7 @@
 \ProvidesPackage{chise}[2003/11/26 v.0.2 (Omega/CHISE Team)]
 % based on mulambda and omega-japanese
 %\RequirePackage{omega}
-\RequirePackage[UT1]{fontenc}
+\RequirePackage[OT1]{fontenc}
 
 %% options %%
 
@@ -48,7 +48,7 @@
   \ocplist\uniKS=
     \addbeforeocplist 1 \OCPuniKS
     \nullocplist
-  \externalocp\OCPuniMulti=/usr/local/share/texmf/omega/ocp/local/chise/Utf8mcsToUniMulti {}
+  \externalocp\OCPuniMulti=/usr/local/share/texmf/omega/ocp/local/chise/Utf8gbToUniMulti {}
   \ocplist\uniMulti=
     \addbeforeocplist 1 \OCPuniMulti
     \nullocplist
@@ -70,7 +70,7 @@
   \ocplist\uniKS=
     \addbeforeocplist 1 \OCPuniKS
     \nullocplist
-  \externalocp\OCPuniMulti=/usr/local/share/texmf/omega/ocp/local/chise/Utf8mcsToUniMulti {}
+  \externalocp\OCPuniMulti=/usr/local/share/texmf/omega/ocp/local/chise/Utf8cnsToUniMulti {}
   \ocplist\uniMulti=
     \addbeforeocplist 1 \OCPuniMulti
     \nullocplist
@@ -92,7 +92,7 @@
   \ocplist\uniKS=
     \addbeforeocplist 1 \OCPuniKS
     \nullocplist
-  \externalocp\OCPuniMulti=/usr/local/share/texmf/omega/ocp/local/chise/Utf8mcsToUniMulti {}
+  \externalocp\OCPuniMulti=/usr/local/share/texmf/omega/ocp/local/chise/Utf8jisToUniMulti {}
   \ocplist\uniMulti=
     \addbeforeocplist 1 \OCPuniMulti
     \nullocplist
@@ -114,7 +114,29 @@
   \ocplist\uniKS=
     \addbeforeocplist 1 \OCPuniKS
     \nullocplist
-  \externalocp\OCPuniMulti=/usr/local/share/texmf/omega/ocp/local/chise/Utf8mcsToUniMulti {}
+  \externalocp\OCPuniMulti=/usr/local/share/texmf/omega/ocp/local/chise/Utf8ksToUniMulti {}
+  \ocplist\uniMulti=
+    \addbeforeocplist 1 \OCPuniMulti
+    \nullocplist
+}
+\DeclareOption{utf8big5}{
+  \externalocp\OCPuniGB=/usr/local/share/texmf/omega/ocp/local/chise/Utf8big5ToUniGB {}
+  \ocplist\uniGB=
+    \addbeforeocplist 1 \OCPuniGB
+    \nullocplist
+  \externalocp\OCPuniCNS=/usr/local/share/texmf/omega/ocp/local/chise/Utf8big5ToUniCNS {}
+  \ocplist\uniCNS=
+    \addbeforeocplist 1 \OCPuniCNS
+    \nullocplist
+  \externalocp\OCPuniJIS=/usr/local/share/texmf/omega/ocp/local/chise/Utf8big5ToUniJIS {}
+  \ocplist\uniJIS=
+    \addbeforeocplist 1 \OCPuniJIS
+    \nullocplist
+  \externalocp\OCPuniKS=/usr/local/share/texmf/omega/ocp/local/chise/Utf8big5ToUniKS {}
+  \ocplist\uniKS=
+    \addbeforeocplist 1 \OCPuniKS
+    \nullocplist
+  \externalocp\OCPuniMulti=/usr/local/share/texmf/omega/ocp/local/chise/Utf8big5ToUniMulti {}
   \ocplist\uniMulti=
     \addbeforeocplist 1 \OCPuniMulti
     \nullocplist
@@ -165,9 +187,12 @@
   \addbeforeocplist 1 \OCPutf
   \nullocplist
 \AtBeginDocument{
-  \pushocplist\inutf
+  \NonCJK
 }
 
+\def\rmdefault{omlgc}
+\def\ttdefault{uctt}
+
 % Settings for CJK
 \def\selectjisfont{\fontencoding{OT1}\fontfamily{omjis}\selectfont}
 \def\selectgbsfont{\fontencoding{OT1}\fontfamily{omgbs}\selectfont}
@@ -179,6 +204,7 @@
 \newenvironment{KSfont}{\pushocplist\uniKS\selectksxfont}{}
 \newenvironment{CNSfont}{\pushocplist\uniCNS\selectcnsfont}{}
 \newenvironment{Multifont}{\pushocplist\uniMulti}{}
+\newenvironment{NonCJK}{\pushocplist\inutf\fontencoding{OT1}\fontfamily{omlgc}\selectfont}{}
 \newenvironment{ASCII}{\pushocplist\NilOCP\fontencoding{T1}\fontfamily{\rmdefault}\selectfont}{}
 
 \newcommand{\jisfont}[1]{\begingroup%
@@ -580,42 +606,42 @@
 
 %%%% redundant font definition to avoid bug of omega.
 
-\DeclareFontFamily{UT1}{omlgc}{}
+\DeclareFontFamily{OT1}{omlgc}{}
 
-\DeclareFontShape{UT1}{omlgc}{m}{n}{
+\DeclareFontShape{OT1}{omlgc}{m}{n}{
    <->omlgc
 }{}
-\DeclareFontShape{UT1}{omlgc}{m}{sc}{
+\DeclareFontShape{OT1}{omlgc}{m}{sc}{
    <-> ssub * omlgc/m/n
 }{}
-\DeclareFontShape{UT1}{omlgc}{m}{it}{
+\DeclareFontShape{OT1}{omlgc}{m}{it}{
    <->omlgci
 }{}
-\DeclareFontShape{UT1}{omlgc}{m}{sl}{
+\DeclareFontShape{OT1}{omlgc}{m}{sl}{
    <-> ssub * omlgc/m/it
 }{}
-\DeclareFontShape{UT1}{omlgc}{m}{itsc}{
+\DeclareFontShape{OT1}{omlgc}{m}{itsc}{
    <-> ssub * omlgc/m/it
 }{}
-\DeclareFontShape{UT1}{omlgc}{m}{slsc}{
+\DeclareFontShape{OT1}{omlgc}{m}{slsc}{
    <-> ssub * omlgc/m/it
 }{}
-\DeclareFontShape{UT1}{omlgc}{bx}{n}{
+\DeclareFontShape{OT1}{omlgc}{bx}{n}{
    <->omlgcb
 }{}
-\DeclareFontShape{UT1}{omlgc}{bx}{sc}{
+\DeclareFontShape{OT1}{omlgc}{bx}{sc}{
    <-> ssub * omlgc/bx/n
 }{}
-\DeclareFontShape{UT1}{omlgc}{bx}{it}{
+\DeclareFontShape{OT1}{omlgc}{bx}{it}{
    <->omlgcbi
 }{}
-\DeclareFontShape{UT1}{omlgc}{bx}{itsc}{
+\DeclareFontShape{OT1}{omlgc}{bx}{itsc}{
    <-> ssub * omlgc/bx/it
 }{}
-\DeclareFontShape{UT1}{omlgc}{bx}{sl}{
+\DeclareFontShape{OT1}{omlgc}{bx}{sl}{
    <-> ssub * omlgc/bx/it
 }{}
-\DeclareFontShape{UT1}{omlgc}{bx}{slsc}{
+\DeclareFontShape{OT1}{omlgc}{bx}{slsc}{
    <-> ssub * omlgc/bx/it
 }{}