From b2d6b6ee55083fba2aa66ac9f7c8a56eb181ae8c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 5 Oct 2015 20:58:39 +0000 Subject: kotex-oblivoir (5oct15) git-svn-id: svn://tug.org/texlive/trunk@38557 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/kotex-oblivoir/ChangeLog | 20 +++++- .../memhangul-ucs/memhangul-common.sty | 8 ++- .../memhangul-ucs/ob-koreanappendix.sty | 8 ++- .../kotex-oblivoir/memhangul-x/memhangul-x.sty | 29 +++++--- .../tex/latex/kotex-oblivoir/oblivoir-base.cls | 82 ++++++++++++++-------- 5 files changed, 104 insertions(+), 43 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/kotex-oblivoir/ChangeLog b/Master/texmf-dist/doc/latex/kotex-oblivoir/ChangeLog index 203b8238eb9..21241939f31 100644 --- a/Master/texmf-dist/doc/latex/kotex-oblivoir/ChangeLog +++ b/Master/texmf-dist/doc/latex/kotex-oblivoir/ChangeLog @@ -1,10 +1,28 @@ +2015-10-05 Kangsoo Kim + + Version 2.1.5 + + * oblivor-base.cls: version 0.8 + enhance dhucs-eumerate compatibility. + * ob-koreanappendix.sty + improve Korean appendix typesetting. + * memhangul-x.sty: version 11.10 + change \sethangulfont command for polyglossia. + +2015-08-07 Kangsoo Kim + + Version 2.1.4a + + * memhangul-common.sty + fix default chapter style, postchapternum (hoze & gromov). + 2015-08-01 Kangsoo Kim Version 2.1.4 * oblivoir-base.sty: versin 0.7 etex.sty dropped. - * oblivoir-: version 0.8.2a + * oblivoir-xlua.cls: version 0.8.2a etex.sty dropped. 2015-07-27 Kangsoo Kim diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memhangul-common.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memhangul-common.sty index 76efd7e80c8..d730ad6b07d 100644 --- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memhangul-common.sty +++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memhangul-common.sty @@ -1,6 +1,6 @@ %% File `memhangul-common.sty` %% -%% (C) Copyright 2013-2014 Kangsoo Kim +%% (C) Copyright 2013-2015 Kangsoo Kim %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -17,7 +17,7 @@ %%% 편, 장 섹션 타이틀 재설정 %%% 절의 섹션 타이틀은 수정하지 않음. %% -\ProvidesPackage{memhangul-common}[2014/06/12] +\ProvidesPackage{memhangul-common}[2015/08/07] \let\@CHAPAPP\@chapapp \def\refreshprepostchapters{% @@ -522,7 +522,7 @@ %%% CHAPTERSTYLE \makechapterstyle{default}{% - \renewcommand{\post@chapter}{장}% + \renewcommand{\post@chapter}{\chaptername}% \renewcommand{\chapnamefont}{\normalfont\huge\bfseries} \renewcommand{\chapnumfont}{\normalfont\huge\bfseries} \renewcommand{\chaptitlefont}{\normalfont\Huge\bfseries} @@ -1139,3 +1139,5 @@ \ExplSyntaxOff \endinput + +%%% 2015/08/07: default chapter style, postchapternum (hoze & gromov) diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/ob-koreanappendix.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/ob-koreanappendix.sty index 1046b7e0233..9c46eaa9c58 100644 --- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/ob-koreanappendix.sty +++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/ob-koreanappendix.sty @@ -1,6 +1,6 @@ %% File `ob-koreanappendix.sty` %% -%% Copyright (c) 2007-2013 Kangsoo Kim +%% Copyright (c) 2007-2015 Kangsoo Kim %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -14,8 +14,12 @@ %% \appendix (부록) %% \gdef\set@appendix@chapter{% - \ifanappendix\counterwithout{APPsection}{APPchapter}\fi% \renewcommand\thesection{\Alph{APPsection}}% + \renewcommand\thesubsection{\thesection.\arabic{APPsubsection}} + \ifanappendix + \counterwithout{APPsection}{APPchapter} + \counterwithin{APPsubsection}{APPsection} + \fi% \counterwithin{figure}{APPsection}\counterwithin{table}{APPsection}% \counterwithin{equation}{APPsection}% \renewcommand\thefigure{\Alph{APPsection}.\arabic{figure}}% diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/memhangul-x.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/memhangul-x.sty index 7a5b74ae1d0..787df1d0dbf 100644 --- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/memhangul-x.sty +++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/memhangul-x.sty @@ -1,6 +1,6 @@ %% File `memhangul-x.sty` %% -%% (C) Copyright 2006-2013 Kangsoo Kim +%% (C) Copyright 2006-2015 Kangsoo Kim %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -14,8 +14,8 @@ %% part of oblivoir v2 %% \NeedsTeXFormat{LaTeX2e} -\def\filedate{2015/07/27} -\def\fileversion{11.9} +\def\filedate{2015/10/05} +\def\fileversion{11.10} \ProvidesPackage{memhangul-x}[\filedate Hangul Typography for (x)oblivoir] %\typeout{Hangul Typography for (x)oblivoir} @@ -124,13 +124,23 @@ \if@polyglos \RequirePackage{polyglossia} \RequirePackage{xparse} - \NewDocumentCommand\sethangulfont{mo}{% - \IfValueTF{#2}{% - \newfontfamily\hangulfont{#1}[#2]% - }{% - \newfontfamily\hangulfont{#1}% +%%% \sethangulfont{FONTNAME} or \sethangulfont[tt]{FONTNAME}[FEATURES] + \NewDocumentCommand\sethangulfont{omo}{% + \IfValueTF{#1}{% + \IfValueTF{#3}{% + \expandafter\newfontfamily\csname hangulfont#1\endcsname + {#2}[#3]}{% + \expandafter\newfontfamily\csname hangulfont#1\endcsname + {#2}}% + }% + {% + \IfValueTF{#3}{% + \newfontfamily\hangulfont{#2}[#3]% + }{% + \newfontfamily\hangulfont{#2}% + }% + }% } - } \else \ifluatex \RequirePackage{luatexko} @@ -358,6 +368,7 @@ \endinput % CHANGE LOG +% 2015/10/05 : change \sethangulfont command for polyglossia % 2014/04/29 : fix a bug reported by Progress % 2013/10/22 : introduce memhangul-common.sty % 2013/10/16 : \kscntformat and [kosection] bug fix. diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-base.cls b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-base.cls index 8274a9c8221..fd8c3370d25 100644 --- a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-base.cls +++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-base.cls @@ -11,7 +11,7 @@ %% version 2006/05/20 or later. %% \ProvidesClass{oblivoir-base} - [2015/08/01 v0.7 article-like class to typeset UTF-8 korean using memoir.] + [2015/08/24 v0.8 article-like class to typeset UTF-8 korean using memoir.] %\typeout{oblivoir requires memoir, dhucs, and memhangul. 2008/10/23.} %%% Acknowledgements: @@ -466,35 +466,60 @@ %%% modified from dhucs-enumerate.sty \ifnokorean\else -\g@addto@macro\@enhook{% - \ifx^^ea\@entemp % 가, - \let\@memtempa\@dhucs@enumerate\else %%%%% +\def\@enloop@{% + \ifx A\@entemp \def\@memtempa{\@enLabel\Alph }\else + \ifx a\@entemp \def\@memtempa{\@enLabel\alph }\else + \ifx i\@entemp \def\@memtempa{\@enLabel\roman }\else + \ifx I\@entemp \def\@memtempa{\@enLabel\Roman }\else + \ifx 1\@entemp \def\@memtempa{\@enLabel\arabic}\else + \ifx \@sptoken\@entemp \let\@memtempa\@enSpace \else + \ifx \bgroup\@entemp \let\@memtempa\@enGroup \else + \ifx \@enum@\@entemp \let\@memtempa\@gobble \else + \ifx^^ea\@entemp % 가, + \let\@memtempa\@dhucs@enumerate@EA\else %%%%% \ifx^^e2\@entemp % ①, ⑴, ⒜, ⓐ, ⅰ, Ⅰ - \let\@memtempa\@dhucs@enumerate\else %%%%% + \let\@memtempa\@dhucs@enumerate@Eii\else %%%%% \ifx^^e3\@entemp % ㄱ, ㉠, ㉮, ㈀, ㈎ - \let\@memtempa\@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\@memtempa\@dhucs@enumerate@Eiii\else + \let\@memtempa\@enOther + \@enhook + \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi + \@memtempa} + +\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 +} + \fi %%% subsection까지 항번을 붙이고 toc에 두자. @@ -525,6 +550,7 @@ \endinput %%% ChangeLog: +%%% 2015/08/24 : dhuce-enumerate compatibility. %%% 2015/08/01 : etex.sty dropped %%% ver0.6 2014/06/12 : introduce new xob-font.sty %%% ver0.5 2014/06/06 : replace \renewcommand's with \setlength's. -- cgit v1.2.3