kotex-plain (21apr15)

git-svn-id: svn://tug.org/texlive/trunk@36990 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 50 insertions, 73 deletions

diff --git a/Master/texmf-dist/tex/plain/kotex-plain/kotexutf-core.tex b/Master/texmf-dist/tex/plain/kotex-plain/kotexutf-core.tex
index 98bf4ce5959..aa79d8e1d61 100644
--- a/Master/texmf-dist/tex/plain/kotex-plain/kotexutf-core.tex
+++ b/Master/texmf-dist/tex/plain/kotex-plain/kotexutf-core.tex
@@ -19,90 +19,17 @@
 %% frenchspacing is default
 \frenchspacing
 
-%% modifying commands from utf8.def
-\def\UTFviii@two@octets#1#2{%
-  \ifx\protect\noexpand
-    \string#1\string#2%
-  \else
-    \ifx\protect\string
-      \string#1\string#2%
-    \else
-      \ifcsname u8:\string#1\string#2\endcsname
-	\csname u8:\string#1\string#2%
-	\expandafter\expandafter\expandafter\expandafter
-	\expandafter\expandafter\expandafter\endcsname
-      \else
-	\expandafter\expandafter\expandafter\expandafter
-	\expandafter\expandafter\expandafter\unihangul@two@octets
-	\expandafter\expandafter\expandafter\expandafter
-	\expandafter\expandafter\expandafter#1%
-	\expandafter\expandafter\expandafter\expandafter
-	\expandafter\expandafter\expandafter#2%
-      \fi
-    \fi
-  \fi
-}
 \def\unihangul@two@octets#1#2{%
     \expandafter\unihangulchar\expandafter{%
       \number\numexpr
 	(`#1 - 192) * 64 +
 	(`#2 - 128) \relax}}
-\def\UTFviii@three@octets#1#2#3{%
-  \ifx\protect\noexpand
-    \string#1\string#2\string#3%
-  \else
-    \ifx\protect\string
-      \string#1\string#2\string#3%
-    \else
-      \ifcsname u8:\string#1\string#2\string#3\endcsname
-	\csname u8:\string#1\string#2\string#3%
-	\expandafter\expandafter\expandafter\expandafter
-	\expandafter\expandafter\expandafter\endcsname
-      \else
-	\expandafter\expandafter\expandafter\expandafter
-	\expandafter\expandafter\expandafter\unihangul@three@octets
-	\expandafter\expandafter\expandafter\expandafter
-	\expandafter\expandafter\expandafter#1%
-	\expandafter\expandafter\expandafter\expandafter
-	\expandafter\expandafter\expandafter#2%
-	\expandafter\expandafter\expandafter\expandafter
-	\expandafter\expandafter\expandafter#3%
-      \fi
-    \fi
-  \fi
-}
 \def\unihangul@three@octets#1#2#3{%
     \expandafter\unihangulchar\expandafter{%
       \number\numexpr
 	(`#1 - 224) * 4096 +
 	(`#2 - 128) * 64 +
 	(`#3 - 128) \relax}}
-\def\UTFviii@four@octets#1#2#3#4{%
-  \ifx\protect\noexpand
-    \string#1\string#2\string#3\string#4%
-  \else
-    \ifx\protect\string
-      \string#1\string#2\string#3\string#4%
-    \else
-      \ifcsname u8:\string#1\string#2\string#3\string#4\endcsname
-	\csname u8:\string#1\string#2\string#3\string#4%
-	\expandafter\expandafter\expandafter\expandafter
-	\expandafter\expandafter\expandafter\endcsname
-      \else
-	\expandafter\expandafter\expandafter\expandafter
-	\expandafter\expandafter\expandafter\unihangul@four@octets
-	\expandafter\expandafter\expandafter\expandafter
-	\expandafter\expandafter\expandafter#1%
-	\expandafter\expandafter\expandafter\expandafter
-	\expandafter\expandafter\expandafter#2%
-	\expandafter\expandafter\expandafter\expandafter
-	\expandafter\expandafter\expandafter#3%
-	\expandafter\expandafter\expandafter\expandafter
-	\expandafter\expandafter\expandafter#4%
-      \fi
-    \fi
-  \fi
-}
 \def\unihangul@four@octets#1#2#3#4{%
     \expandafter\unihangulchar\expandafter{%
       \number\numexpr
@@ -111,6 +38,56 @@
 	(`#3 - 128) * 64 +
 	(`#4 - 128) \relax}}
 
+\count@"80 \loop
+  \uccode\count@\z@
+  \lccode\count@\z@
+  \catcode\count@=12
+\ifnum\count@<"BF \advance\count@\@ne \repeat
+
+\count@"C2 \loop
+  \uccode\count@\z@
+  \lccode\count@\z@
+  \begingroup
+  \lccode`\~\count@
+  \lowercase{\endgroup
+    \protected\def~##1{%
+      \ifcsname U8:\string~\string##1\endcsname
+        \csname U8:\string~\string##1\expandafter\endcsname
+      \else
+        \expandafter\unihangul@two@octets
+        \expandafter~\expandafter##1%
+      \fi }}
+\ifnum\count@<"DF \advance\count@\@ne \repeat
+
+\count@"E0 \loop
+  \uccode\count@\z@
+  \lccode\count@\z@
+  \begingroup
+  \lccode`\~\count@
+  \lowercase{\endgroup
+  \protected\def~##1##2{%
+    \ifcsname U8:\string~\string##1\string##2\endcsname
+      \csname U8:\string~\string##1\string##2\expandafter\endcsname
+    \else
+      \expandafter\unihangul@three@octets
+      \expandafter~\expandafter##1\expandafter##2%
+    \fi }}
+\ifnum\count@<"EF \advance\count@\@ne \repeat
+
+\count@"F0 \loop
+  \uccode\count@\z@
+  \lccode\count@\z@
+  \begingroup
+  \lccode`\~\count@
+  \lowercase{\endgroup
+    \protected\def~##1##2##3{%
+      \ifcsname U8:\string~\string##1\string##2\string##3\endcsname
+        \csname U8:\string~\string##1\string##2\string##3\expandafter\endcsname
+      \else
+        \expandafter\unihangul@four@octets
+        \expandafter~\expandafter##1\expandafter##2\expandafter##3%
+      \fi }}
+\ifnum\count@<"F4 \advance\count@\@ne \repeat
 
 %% subfont plane and char slot
 \def\geth@ngulpl@ne@ndch@r{%