diff options
3 files changed, 111 insertions, 62 deletions
diff --git a/Master/texmf-dist/doc/latex/kotex-utf/ChangeLog b/Master/texmf-dist/doc/latex/kotex-utf/ChangeLog index 95fb0ac10fb..338a2ef6784 100644 --- a/Master/texmf-dist/doc/latex/kotex-utf/ChangeLog +++ b/Master/texmf-dist/doc/latex/kotex-utf/ChangeLog @@ -1,3 +1,10 @@ +2015-09-14 Dohyun Kim <nomos at ktug org> + + Version 2.1.2 + + * dhucs-enumerate.sty, dhucs-paralist.sty + fixed a bug regarding enumeration reported at KTUG BBS 213198. + 2015-07-18 Dohyun Kim <nomos at ktug org> Version 2.1.1 diff --git a/Master/texmf-dist/tex/latex/kotex-utf/contrib/dhucs-enumerate.sty b/Master/texmf-dist/tex/latex/kotex-utf/contrib/dhucs-enumerate.sty index e8fac0f6940..0e812b62fae 100644 --- a/Master/texmf-dist/tex/latex/kotex-utf/contrib/dhucs-enumerate.sty +++ b/Master/texmf-dist/tex/latex/kotex-utf/contrib/dhucs-enumerate.sty @@ -11,17 +11,17 @@ %% version 2006/05/20 or later. %% \ProvidesPackage{dhucs-enumerate} - [2009/03/15 partially support enumrate.sty under dhucs] + [2015/09/10 partially support enumerate.sty under dhucs] -\@ifpackageloaded{enumerate}{}{\RequirePackage{enumerate}} +\RequirePackage{enumerate} -\ifx가가\g@addto@macro\@enhook{% +\ifx 가가\g@addto@macro\@enhook{% \ifx ^^^^ac00\@entemp \def\@tempa{\@enLabel\gana}\else \ifx ^^^^2170\@entemp \def\@tempa{\@enLabel\hroman}\else \ifx ^^^^2160\@entemp \def\@tempa{\@enLabel\hRoman}\else \ifx ^^^^249c\@entemp \def\@tempa{\@enLabel\peng}\else \ifx ^^^^24d0\@entemp \def\@tempa{\@enLabel\oeng}\else - \ifx ^^^^2474\@entemp \def\@tempa{\@enLabel\pnum}\else + \ifx ^^^^2474\@entemp \def\@tempa{\@enLabel\pnum}\else \ifx ^^^^2460\@entemp \def\@tempa{\@enLabel\onum}\else \ifx ^^^^320e\@entemp \def\@tempa{\@enLabel\pgana}\else \ifx ^^^^326e\@entemp \def\@tempa{\@enLabel\ogana}\else @@ -33,32 +33,45 @@ \fi \g@addto@macro\@enhook{% - \ifx^^ea\@entemp % 가, - \let\@tempa\@dhucs@enumerate\else %%%%% + \ifx^^ea\@entemp % 가, + \let\@tempa\@dhucs@enumerate@EA\else %%%%% \ifx^^e2\@entemp % ①, ⑴, ⒜, ⓐ, ⅰ, Ⅰ - \let\@tempa\@dhucs@enumerate\else %%%%% + \let\@tempa\@dhucs@enumerate@Eii\else %%%%% \ifx^^e3\@entemp % ㄱ, ㉠, ㉮, ㈀, ㈎ - \let\@tempa\@dhucs@enumerate - \fi\fi\fi} -\def\@dhucs@enumerate#1#2#3{% - \bgroup\let\unihangulchar\@firstofone - \xdef\@dhucs@enum@temp{#1#2#3}\egroup - \ifnum\@dhucs@enum@temp=44032 \def\@tempa{\@enLabel\gana}\else - \ifnum\@dhucs@enum@temp=8560 \def\@tempa{\@enLabel\hroman}\else - \ifnum\@dhucs@enum@temp=8544 \def\@tempa{\@enLabel\hRoman}\else - \ifnum\@dhucs@enum@temp=9372 \def\@tempa{\@enLabel\peng}\else - \ifnum\@dhucs@enum@temp=9424 \def\@tempa{\@enLabel\oeng}\else - \ifnum\@dhucs@enum@temp=9332 \def\@tempa{\@enLabel\pnum}\else - \ifnum\@dhucs@enum@temp=9312 \def\@tempa{\@enLabel\onum}\else - \ifnum\@dhucs@enum@temp=12814 \def\@tempa{\@enLabel\pgana}\else - \ifnum\@dhucs@enum@temp=12910 \def\@tempa{\@enLabel\ogana}\else - \ifnum\@dhucs@enum@temp=12896 \def\@tempa{\@enLabel\ojaso}\else - \ifnum\@dhucs@enum@temp=12593 \def\@tempa{\@enLabel\jaso}\else - \ifnum\@dhucs@enum@temp=12800 \def\@tempa{\@enLabel\pjaso}\else - \PackageError{dhucs-enumerate} - {You can't use `\unexpanded{#1#2#3}' as enum label} - {Legal enum labels of hangul-ucs are: \MessageBreak\space\space - \unexpanded{가, ㄱ, ㉠, ㉮, ㈀, ㈎, ①, ⑴, ⒜, ⓐ, ⅰ, Ⅰ}.} - \fi\fi\fi\fi\fi \fi\fi\fi\fi\fi \fi\fi - \@tempa\relax} + \let\@tempa\@dhucs@enumerate@Eiii + \fi\fi\fi +} +\def\@dhucs@enumerate@error#1{% + \PackageError{dhucs-enumerate} + {You can't use `\unexpanded{#1}' as enum label} + {Legal enum labels of hangul-ucs are: \MessageBreak\space\space + \unexpanded{가, ㄱ, ㉠, ㉮, ㈀, ㈎, ①, ⑴, ⒜, ⓐ, ⅰ, Ⅰ}.}% +} +\def\@dhucs@enumerate@EA#1#2#3{% + \ifnum\pdfstrcmp{#1#2#3}{^^ea^^b0^^80}=\z@ \def\@tempa{\@enLabel\gana}\else + \@dhucs@enumerate@error{#1#2#3}% + \fi + \@tempa\relax +} +\def\@dhucs@enumerate@Eii#1#2#3{% + \ifnum\pdfstrcmp{#1#2#3}{^^e2^^85^^b0}=\z@ \def\@tempa{\@enLabel\hroman}\else + \ifnum\pdfstrcmp{#1#2#3}{^^e2^^85^^a0}=\z@ \def\@tempa{\@enLabel\hRoman}\else + \ifnum\pdfstrcmp{#1#2#3}{^^e2^^92^^9c}=\z@ \def\@tempa{\@enLabel\peng}\else + \ifnum\pdfstrcmp{#1#2#3}{^^e2^^93^^90}=\z@ \def\@tempa{\@enLabel\oeng}\else + \ifnum\pdfstrcmp{#1#2#3}{^^e2^^91^^b4}=\z@ \def\@tempa{\@enLabel\pnum}\else + \ifnum\pdfstrcmp{#1#2#3}{^^e2^^91^^a0}=\z@ \def\@tempa{\@enLabel\onum}\else + \@dhucs@enumerate@error{#1#2#3}% + \fi\fi\fi\fi\fi\fi + \@tempa\relax +} +\def\@dhucs@enumerate@Eiii#1#2#3{% + \ifnum\pdfstrcmp{#1#2#3}{^^e3^^88^^8e}=\z@ \def\@tempa{\@enLabel\pgana}\else + \ifnum\pdfstrcmp{#1#2#3}{^^e3^^89^^ae}=\z@ \def\@tempa{\@enLabel\ogana}\else + \ifnum\pdfstrcmp{#1#2#3}{^^e3^^89^^a0}=\z@ \def\@tempa{\@enLabel\ojaso}\else + \ifnum\pdfstrcmp{#1#2#3}{^^e3^^84^^b1}=\z@ \def\@tempa{\@enLabel\jaso}\else + \ifnum\pdfstrcmp{#1#2#3}{^^e3^^88^^80}=\z@ \def\@tempa{\@enLabel\pjaso}\else + \@dhucs@enumerate@error{#1#2#3}% + \fi\fi\fi\fi\fi + \@tempa\relax +} \endinput diff --git a/Master/texmf-dist/tex/latex/kotex-utf/contrib/dhucs-paralist.sty b/Master/texmf-dist/tex/latex/kotex-utf/contrib/dhucs-paralist.sty index 81f4a3e161b..71a5827f1d5 100644 --- a/Master/texmf-dist/tex/latex/kotex-utf/contrib/dhucs-paralist.sty +++ b/Master/texmf-dist/tex/latex/kotex-utf/contrib/dhucs-paralist.sty @@ -1,7 +1,7 @@ %% File `dhucs-paralist.sty` %% %% Copyright (c) 2007-2013 Dohyun Kim <nomos at krug org> -%% modification from dhucs-enumerate.sty by Kangsoo Kim <karnes at ktug org>. +%% modification from dhucs-enumerate.sty by Kangsoo Kim <karnes at ktug org>. %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -12,38 +12,67 @@ %% version 2006/05/20 or later. %% \ProvidesPackage{dhucs-paralist} - [2006/07/09 partially support paralist.sty under dhucs] + [2015/09/10 partially support paralist.sty under dhucs] -\@ifpackageloaded{paralist}{}{\RequirePackage{paralist}} +\RequirePackage{paralist} + +\ifx 가가\g@addto@macro\pl@hook{% + \ifx ^^^^ac00\pl@temp \def\@tempa{\pl@label\gana}\else + \ifx ^^^^2170\pl@temp \def\@tempa{\pl@label\hroman}\else + \ifx ^^^^2160\pl@temp \def\@tempa{\pl@label\hRoman}\else + \ifx ^^^^249c\pl@temp \def\@tempa{\pl@label\peng}\else + \ifx ^^^^24d0\pl@temp \def\@tempa{\pl@label\oeng}\else + \ifx ^^^^2474\pl@temp \def\@tempa{\pl@label\pnum}\else + \ifx ^^^^2460\pl@temp \def\@tempa{\pl@label\onum}\else + \ifx ^^^^320e\pl@temp \def\@tempa{\pl@label\pgana}\else + \ifx ^^^^326e\pl@temp \def\@tempa{\pl@label\ogana}\else + \ifx ^^^^3260\pl@temp \def\@tempa{\pl@label\ojaso}\else + \ifx ^^^^3131\pl@temp \def\@tempa{\pl@label\jaso}\else + \ifx ^^^^3200\pl@temp \def\@tempa{\pl@label\pjaso}% + \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi} + \expandafter\endinput +\fi \g@addto@macro\pl@hook{% - \ifx^^ea\pl@temp % 가, - \let\@tempa\@dhucs@enumerate\else %%%%% - \ifx^^e2\pl@temp % ①, ⑴, ⒜, ⓐ, ⅰ, Ⅰ - \let\@tempa\@dhucs@enumerate\else %%%%% - \ifx^^e3\pl@temp % ㄱ, ㉠, ㉮, ㈀, ㈎ - \let\@tempa\@dhucs@enumerate - \fi\fi\fi} -\def\@dhucs@enumerate#1#2#3{% - \bgroup\let\unihangulchar\@firstofone - \xdef\@dhucs@enum@temp{#1#2#3}\egroup - \ifnum\@dhucs@enum@temp=44032 \def\@tempa{\pl@label\gana}\else - \ifnum\@dhucs@enum@temp=8560 \def\@tempa{\pl@label\hroman}\else - \ifnum\@dhucs@enum@temp=8544 \def\@tempa{\pl@label\hRoman}\else - \ifnum\@dhucs@enum@temp=9372 \def\@tempa{\pl@label\peng}\else - \ifnum\@dhucs@enum@temp=9424 \def\@tempa{\pl@label\oeng}\else - \ifnum\@dhucs@enum@temp=9332 \def\@tempa{\pl@label\pnum}\else - \ifnum\@dhucs@enum@temp=9312 \def\@tempa{\pl@label\onum}\else - \ifnum\@dhucs@enum@temp=12814 \def\@tempa{\pl@label\pgana}\else - \ifnum\@dhucs@enum@temp=12910 \def\@tempa{\pl@label\ogana}\else - \ifnum\@dhucs@enum@temp=12896 \def\@tempa{\pl@label\ojaso}\else - \ifnum\@dhucs@enum@temp=12593 \def\@tempa{\pl@label\jaso}\else - \ifnum\@dhucs@enum@temp=12800 \def\@tempa{\pl@label\pjaso}\else - \PackageError{dhucs-paralist} - {You can't use `\unexpanded{#1#2#3}' as enum label} - {Legal enum labels of hangul-ucs are: \MessageBreak\space\space - \unexpanded{가, ㄱ, ㉠, ㉮, ㈀, ㈎, ①, ⑴, ⒜, ⓐ, ⅰ, Ⅰ}.} - \fi\fi\fi\fi\fi \fi\fi\fi\fi\fi \fi\fi - \@tempa\relax} - + \ifx ^^ea\pl@temp % 가, + \let\@tempa\@dhucs@paralist@EA\else %%%%% + \ifx ^^e2\pl@temp % ①, ⑴, ⒜, ⓐ, ⅰ, Ⅰ + \let\@tempa\@dhucs@paralist@Eii\else %%%%% + \ifx ^^e3\pl@temp % ㄱ, ㉠, ㉮, ㈀, ㈎ + \let\@tempa\@dhucs@paralist@Eiii + \fi\fi\fi +} +\def\@dhucs@paralist@error#1{% + \PackageError{dhucs-paralist} + {You can't use `\unexpanded{#1}' as enum label} + {Legal enum labels of hangul-ucs are: \MessageBreak\space\space + \unexpanded{가, ㄱ, ㉠, ㉮, ㈀, ㈎, ①, ⑴, ⒜, ⓐ, ⅰ, Ⅰ}.}% +} +\def\@dhucs@paralist@EA#1#2#3{% + \ifnum\pdfstrcmp{#1#2#3}{^^ea^^b0^^80}=\z@ \def\@tempa{\pl@label\gana}\else + \@dhucs@paralist@error{#1#2#3}% + \fi + \@tempa\relax +} +\def\@dhucs@paralist@Eii#1#2#3{% + \ifnum\pdfstrcmp{#1#2#3}{^^e2^^85^^b0}=\z@ \def\@tempa{\pl@label\hroman}\else + \ifnum\pdfstrcmp{#1#2#3}{^^e2^^85^^a0}=\z@ \def\@tempa{\pl@label\hRoman}\else + \ifnum\pdfstrcmp{#1#2#3}{^^e2^^92^^9c}=\z@ \def\@tempa{\pl@label\peng}\else + \ifnum\pdfstrcmp{#1#2#3}{^^e2^^93^^90}=\z@ \def\@tempa{\pl@label\oeng}\else + \ifnum\pdfstrcmp{#1#2#3}{^^e2^^91^^b4}=\z@ \def\@tempa{\pl@label\pnum}\else + \ifnum\pdfstrcmp{#1#2#3}{^^e2^^91^^a0}=\z@ \def\@tempa{\pl@label\onum}\else + \@dhucs@paralist@error{#1#2#3}% + \fi\fi\fi\fi\fi\fi + \@tempa\relax +} +\def\@dhucs@paralist@Eiii#1#2#3{% + \ifnum\pdfstrcmp{#1#2#3}{^^e3^^88^^8e}=\z@ \def\@tempa{\pl@label\pgana}\else + \ifnum\pdfstrcmp{#1#2#3}{^^e3^^89^^ae}=\z@ \def\@tempa{\pl@label\ogana}\else + \ifnum\pdfstrcmp{#1#2#3}{^^e3^^89^^a0}=\z@ \def\@tempa{\pl@label\ojaso}\else + \ifnum\pdfstrcmp{#1#2#3}{^^e3^^84^^b1}=\z@ \def\@tempa{\pl@label\jaso}\else + \ifnum\pdfstrcmp{#1#2#3}{^^e3^^88^^80}=\z@ \def\@tempa{\pl@label\pjaso}\else + \@dhucs@paralist@error{#1#2#3}% + \fi\fi\fi\fi\fi + \@tempa\relax +} \endinput |