From fa270934a06684f332679e4d5d35972734403b36 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 26 Jun 2014 21:35:57 +0000 Subject: kotex-oblivoir (26jun14) git-svn-id: svn://tug.org/texlive/trunk@34430 c570f23f-e606-0410-a88d-b1316a301751 --- .../memhangul-ucs/memhangul-common.sty | 258 ++++- .../memhangul-ucs/memhangul-patch.sty | 171 +--- .../kotex-oblivoir/memhangul-ucs/memhangul-ucs.sty | 44 +- .../kotex-oblivoir/memhangul-ucs/memucs-gremph.sty | 5 +- .../memhangul-x/luatexko-xobfont.sty | 608 ----------- .../kotex-oblivoir/memhangul-x/memhangul-x.sty | 34 +- .../kotex-oblivoir/memhangul-x/xetexko-var.sty | 28 +- .../kotex-oblivoir/memhangul-x/xetexko-xobfont.sty | 1060 -------------------- .../kotex-oblivoir/memhangul-x/xob-dotemph.sty | 52 +- .../latex/kotex-oblivoir/memhangul-x/xob-font.sty | 678 +++++++++++++ .../kotex-oblivoir/memhangul-x/xob-paralist.sty | 8 +- .../tex/latex/kotex-oblivoir/oblivoir-base.cls | 34 +- .../tex/latex/kotex-oblivoir/oblivoir-xlua.cls | 38 +- .../tex/latex/kotex-oblivoir/xoblivoir.cls | 14 +- 14 files changed, 1066 insertions(+), 1966 deletions(-) delete mode 100644 Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/luatexko-xobfont.sty delete mode 100644 Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xetexko-xobfont.sty create mode 100644 Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xob-font.sty (limited to 'Master/texmf-dist/tex/latex/kotex-oblivoir') 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 f4681e39a9f..76efd7e80c8 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 Kangsoo Kim +%% (C) Copyright 2013-2014 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}[2013/10/22] +\ProvidesPackage{memhangul-common}[2014/06/12] \let\@CHAPAPP\@chapapp \def\refreshprepostchapters{% @@ -46,27 +46,53 @@ \newcommand\hparttitlehead{\pre@part\partnamenum\thepart\partnamenum\post@part} %% PART +%\long\def\@part[#1]#2{% +% \M@gettitle{#1}% +% \ifnum \c@secnumdepth >-2\relax +% \refstepcounter{part}% +% \addcontentsline{toc}{part}% +% {\protect\partnumberline{\hparttitlehead}#1}% +% \else +% \addcontentsline{toc}{part}{#1}% +% \fi +%% \markboth{}{}% +% \ifx#1\@empty\partmark{#2}\else\partmark{#1}\fi +% {\centering +% \interlinepenalty \@M +% \normalfont +% \ifnum \c@secnumdepth >-2\relax +% \prepartnum \partnamenum \printpartnum \partnamenum \postpartnum +% \midpartskip +% \fi +% \printparttitle{#2}\par}% +% \@endpart} \long\def\@part[#1]#2{% +% \ifx#1\@empty\PrerenderUnicode{#2}\else\PrerenderUnicode{#1}\fi \M@gettitle{#1}% \ifnum \c@secnumdepth >-2\relax \refstepcounter{part}% \addcontentsline{toc}{part}% +% {\protect\partnumberline{\thepart}#1}% {\protect\partnumberline{\hparttitlehead}#1}% + \mempartinfo{\thepart}{#1}{#2}% \else \addcontentsline{toc}{part}{#1}% + \mempartinfo{}{#1}{#2}% \fi -% \markboth{}{}% - \ifx#1\@empty\partmark{#2}\else\partmark{#1}\fi + \partmark{#1}% {\centering \interlinepenalty \@M \normalfont \ifnum \c@secnumdepth >-2\relax +% \printpartname \partnamenum \printpartnum +% \midpartskip \prepartnum \partnamenum \printpartnum \partnamenum \postpartnum \midpartskip \fi \printparttitle{#2}\par}% \@endpart} + \def\@spart#1{% \M@gettitle{#1}% {\centering @@ -89,31 +115,136 @@ %% CHAPTER %%%%%%%%%%% -%% we don't adapt mempatch 3.6, just retrieved to memoir-original manner. \renewcommand{\@m@mchapter}[1][\@empty]{% \def\ch@pt@c{#1}% capture first optional arg \@dblarg{\@chapter}} %%\def\m@m@empty{\@empty} +%%%%\def\@chapter[#1]#2{% +%%%% \ifx\ch@pt@c\m@m@empty % no optional args +%%%% \def\f@rtoc{#1}% +%%%% \def\f@rhdr{#1}% +%%%% \else % at least one opt arg +%%%% \def\f@rtoc{\ch@pt@c}% +%%%% \nametest{#1}{#2}% +%%%% \ifsamename % one opt arg +%%%% \def\f@rhdr{\ch@pt@c}% +%%%% \else % two opt args +%%%% \def\f@rhdr{#1}% +%%%% \fi +%%%% \fi +%%%% \ifnum \c@secnumdepth >\m@ne +%%%% \if@mainmatter +%%%% \refstepcounter{chapter}% +%%%% \fi +%%%% \fi +%%%% \chaptermark{\f@rhdr}% +%%%% \ifartopt +%%%% \@makechapterhead{#2}% +%%%% \@afterheading +%%%% \else +%%%% \insertchapterspace +%%%% \if@twocolumn +%%%% \@topnewpage[\@makechapterhead{#2}]% +%%%% \else +%%%% \@makechapterhead{#2}% +%%%% \fi +%%%% \@afterheading +%%%% \fi +%%%% \ifnum \c@secnumdepth >\m@ne +%%%% \if@mainmatter +%%%% \addcontentsline{toc}{chapter}{% +%%%%% \protect\chapternumberline{\thechapter}\f@rtoc}% +%%%% \protect\chapternumberline{\hchaptertitlehead}\f@rtoc}% +%%%% \else +%%%% \addcontentsline{toc}{chapter}{\f@rtoc}% +%%%% \fi +%%%% \else +%%%% \addcontentsline{toc}{chapter}{\f@rtoc}% +%%%% \fi +%%%% \ifheadnameref\M@gettitle{\f@rhdr}\else\M@gettitle{\f@rtoc}\fi +%%%%} +%%%% +%%%%\def\@makechapterhead#1{% +%%%% \chapterheadstart% \vspace*{50\p@}% +%%%% {\parindent \z@ \raggedright \normalfont +%%%% \ifnum \c@secnumdepth >\m@ne +%%%% \if@mainmatter +%%%% \memucsinterwordchapterskiphook +%%%%% \printchaptername \chapternamenum \printchapternum \chapternamenum \postchapternum +%%%% \prechapternum \chapternamenum \printchapternum \chapternamenum \postchapternum +%%%% \afterchapternum % \par\nobreak \vskip 20\p@ +%%%% \else +%%%% \printchapternonum +%%%% \fi +%%%% \else +%%%% \printchapternonum +%%%% \fi +%%%% \interlinepenalty\@M +%%%% \printchaptertitle{#1} % \Huge \bfseries #1 +%%%% \afterchaptertitle % \par\nobreak \vskip 40\p@ +%%%% }} +%%%% +%%%%\def\@makeschapterhead#1{% +%%%% \chapterheadstart +%%%% {\parindent \z@ \raggedright \normalfont \memucsinterwordchapterskiphook +%%%% \printchapternonum +%%%% \interlinepenalty\@M +%%%% \printchaptertitle{#1} +%%%% \afterchaptertitle +%%%% } +%%%%} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% CHAPTER +%% memhangul : opt args : different from memoir 1.618 +%% \chapter[toc][hdr]{title} +%% \chapter[toc]{hdr/title} +%% \chapter{toc/hdr/title} \def\@chapter[#1]#2{% +% \ifx\ch@pt@c\@empty % no optional args +% \def\f@rtoc{#2}% +% \def\f@rhdr{#2}% +% \PrerenderUnicode{#2}% +% \else % at least one opt arg +% \let\f@rtoc\ch@pt@c +% \ifx\@empty#1\@empty +% \let\f@rhdr\ch@pt@c +% \PrerenderUnicode{#1#2}% +% \else +% \def\f@rhdr{#1}% +% \PrerenderUnicode{#1}% +% \fi +% \fi \ifx\ch@pt@c\m@m@empty % no optional args \def\f@rtoc{#1}% \def\f@rhdr{#1}% +% \PrerenderUnicode{#1}% \else % at least one opt arg \def\f@rtoc{\ch@pt@c}% \nametest{#1}{#2}% \ifsamename % one opt arg \def\f@rhdr{\ch@pt@c}% +% \PrerenderUnicode{#1#2}% \else % two opt args \def\f@rhdr{#1}% +% \PrerenderUnicode{#1}% \fi \fi + \m@m@Andfalse \ifnum \c@secnumdepth >\m@ne \if@mainmatter - \refstepcounter{chapter}% + \m@m@Andtrue \fi \fi - \chaptermark{\f@rhdr}% + \ifm@m@And + \ifanappendix + \refstepcounter{APPchapter}% + \else + \refstepcounter{chapter}% + \fi + \fi + \chaptermark{\f@rhdr} \ifartopt \@makechapterhead{#2}% \@afterheading @@ -126,42 +257,73 @@ \fi \@afterheading \fi - \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \ifm@m@And + \ifanappendix + \addcontentsline{toc}{appendix}{% +% \protect\chapternumberline{\thechapter}\f@rtoc}% + \protect\chapternumberline{\hchaptertitlehead}\f@rtoc}% +% \memappchapinfo{\thechapter}{\f@rtoc}{\f@rhdr}{#2}% + \memappchapinfo{\thechapter}{\f@rtoc}{\f@rhdr}{#2}% + \else \addcontentsline{toc}{chapter}{% % \protect\chapternumberline{\thechapter}\f@rtoc}% \protect\chapternumberline{\hchaptertitlehead}\f@rtoc}% - \else - \addcontentsline{toc}{chapter}{\f@rtoc}% +% \memchapinfo{\thechapter}{\f@rtoc}{\f@rhdr}{#2}% + \memchapinfo{\hchaptertitlehead}{\f@rtoc}{\f@rhdr}{#2}% \fi \else \addcontentsline{toc}{chapter}{\f@rtoc}% + \ifanappendix + \memappchapinfo{}{\f@rtoc}{\f@rhdr}{#2}% + \else + \memchapinfo{\hchaptertitlehead}{\f@rtoc}{\f@rhdr}{#2}% + \fi \fi \ifheadnameref\M@gettitle{\f@rhdr}\else\M@gettitle{\f@rtoc}\fi -} +%%% for chapter + \ifanappendix + \protected@edef\@currentlabel{\thechapter}% + \fi +} \def\@makechapterhead#1{% \chapterheadstart% \vspace*{50\p@}% {\parindent \z@ \raggedright \normalfont - \ifnum \c@secnumdepth >\m@ne - \if@mainmatter - \memucsinterwordchapterskiphook -% \printchaptername \chapternamenum \printchapternum \chapternamenum \postchapternum - \prechapternum \chapternamenum \printchapternum \chapternamenum \postchapternum - \afterchapternum % \par\nobreak \vskip 20\p@ - \else - \printchapternonum - \fi + \ifm@m@And + \memucsinterwordchapterskiphook +% \printchaptername \chapternamenum \printchapternum +% \afterchapternum % \par\nobreak \vskip 20\p@ + \prechapternum \chapternamenum \printchapternum \chapternamenum \postchapternum + \afterchapternum % \par\nobreak \vskip 20\p@ \else \printchapternonum \fi \interlinepenalty\@M \printchaptertitle{#1} % \Huge \bfseries #1 - \afterchaptertitle % \par\nobreak \vskip 40\p@ + \afterchaptertitle % \par\nobreak \vskip 40\p@ }} +\renewcommand{\@m@mschapter}[2][\@empty]{% + \@schapter{#2}% + \ifx \@empty#1 + \def\f@rhdr{#2}% +% \PrerenderUnicode{#2}% + \else % opt arg + \def\f@rhdr{#1}% +% \PrerenderUnicode{#1}% + \setcounter{secnumdepth}{-10}% + \chaptermark{#1}% + \setcounter{secnumdepth}{\value{maxsecnumdepth}}% + \fi + \ifanappendix + \memappchapstarinfo{\f@rhdr}{#2}% + \else + \memchapstarinfo{\f@rhdr}{#2}% + \fi} + \def\@makeschapterhead#1{% \chapterheadstart +% {\parindent \z@ \raggedright \normalfont {\parindent \z@ \raggedright \normalfont \memucsinterwordchapterskiphook \printchapternonum \interlinepenalty\@M @@ -170,6 +332,8 @@ } } +%%%%%%%%%%%%% + \renewcommand{\@chs@def@ult}{% \def\chapterheadstart{\vspace*{\beforechapskip}} % \def\printchaptername{\chapnamefont \@chapapp} @@ -904,19 +1068,22 @@ \fi %% 할주. -%% still experimental not complete. +%% still experimental %% \hbox로 처리하기 때문에 행끝에서 할주 행나눔은 이루어지지 않는다. %% 글꼴이 \tiny로 고정. \footnotesize를 쓰면 행간이 흐트러짐. %% TODO: 현재 설정은 10pt 문서에서 1pt정도가 행간에 추가됨. %% \lineskiplimit를 이용해서 행간을 고정시켜둘 것인지는 아직 %% 결정하지 못하였음. \newskip\divnoteskip +\def\divnotedelimopen{\hskip.1em$\big($} +\def\divnotedelimclose{$\big)$\hskip.1em} \divnoteskip = .18em plus .02em minus .02em \def\divnotestyle{% \spaceskip\divnoteskip\normalfont\tiny} -\def\divnote#1{% +\protected\def\divnote#1{% \settowidth{\@tempdima}{\divnotestyle #1}% - \hskip.1em$\big($\raise.2em\hbox{\parbox{.525\@tempdima}{\divnotestyle\singlespace #1}}$\big)$\hskip.1em% + \ifvmode\leavevmode\fi\divnotedelimopen + \raise.2em\hbox{\parbox{.525\@tempdima}{\divnotestyle\singlespace #1}}\divnotedelimclose } %% 각주 설정을 위한 추가 매크로 @@ -936,14 +1103,39 @@ \def\obCaptionFont#1{\def\@figtabcaptfont@{#1}} \providecommand\@figtabcaptfont@{\normalfont} \if@figtabcapt@ -\precaption{{\@figtabcaptfont@\cnm@char@open}} -\captiondelim{{\@figtabcaptfont@\cnm@char@close}\quad} -\renewcommand\cfttablepresnum{\cnm@char@open\tablename\space} -\renewcommand\cfttableaftersnum{\cnm@char@close} -\renewcommand\cfttablenumwidth{3.8em} -\renewcommand\cftfigurepresnum{\cnm@char@open\figurename\space} -\renewcommand\cftfigureaftersnum{\cnm@char@close} -\renewcommand\cftfigurenumwidth{4.5em} +\AtBeginDocument{ +\@ifpackageloaded{caption}{% requested by Progress + \DeclareCaptionLabelFormat{xob-cnm-parens}{\cnm{#1~#2}} + \captionsetup{labelformat=xob-cnm-parens,labelsep=space} +}% +{% + \precaption{{\@figtabcaptfont@\cnm@char@open}} + \captiondelim{{\@figtabcaptfont@\cnm@char@close}\quad} + \renewcommand\cfttablepresnum{\cnm@char@open\tablename\space} + \renewcommand\cfttableaftersnum{\cnm@char@close} + \setlength\cfttablenumwidth{3.8em} + \renewcommand\cftfigurepresnum{\cnm@char@open\figurename\space} + \renewcommand\cftfigureaftersnum{\cnm@char@close} + \setlength\cftfigurenumwidth{4.5em} +} +} \fi +%%% LuaTeX, XeTeX logos +\RequirePackage{xparse} +\ExplSyntaxOn +\tl_if_exist:NF \XeTeX +{ + \RequirePackage{hologo} + \ProvideDocumentCommand \XeTeX { } { \hologo{XeTeX} } + \ProvideDocumentCommand \XeLaTeX { } { \hologo{XeLaTeX} } +} +\tl_if_exist:NF \LuaTeX +{ + \RequirePackage{hologo} + \ProvideDocumentCommand \LuaTeX { } { \hologo{LuaTeX} } + \ProvideDocumentCommand \LuaLaTeX { } { \hologo{LuaLaTeX} } +} +\ExplSyntaxOff + \endinput diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memhangul-patch.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memhangul-patch.sty index 260e711ffe4..b3cf7299587 100644 --- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memhangul-patch.sty +++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memhangul-patch.sty @@ -17,173 +17,4 @@ %% 2006/04/27 %% remove redundant prerenderunicodes according to dhucs 3.0.0 %% -\typeout{memhangul-ucs patch for memoir 1.618, 2006/04/27} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% PART -\long\def\@part[#1]#2{% -% \ifx#1\@empty\PrerenderUnicode{#2}\else\PrerenderUnicode{#1}\fi - \M@gettitle{#1}% - \ifnum \c@secnumdepth >-2\relax - \refstepcounter{part}% - \addcontentsline{toc}{part}% -% {\protect\partnumberline{\thepart}#1}% - {\protect\partnumberline{\hparttitlehead}#1}% - \mempartinfo{\thepart}{#1}{#2}% - \else - \addcontentsline{toc}{part}{#1}% - \mempartinfo{}{#1}{#2}% - \fi - \partmark{#1}% - {\centering - \interlinepenalty \@M - \normalfont - \ifnum \c@secnumdepth >-2\relax -% \printpartname \partnamenum \printpartnum -% \midpartskip - \prepartnum \partnamenum \printpartnum \partnamenum \postpartnum - \midpartskip - \fi - \printparttitle{#2}\par}% - \@endpart} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% CHAPTER -%% memhangul : opt args : different from memoir 1.618 -%% \chapter[toc][hdr]{title} -%% \chapter[toc]{hdr/title} -%% \chapter{toc/hdr/title} -\def\@chapter[#1]#2{% -% \ifx\ch@pt@c\@empty % no optional args -% \def\f@rtoc{#2}% -% \def\f@rhdr{#2}% -% \PrerenderUnicode{#2}% -% \else % at least one opt arg -% \let\f@rtoc\ch@pt@c -% \ifx\@empty#1\@empty -% \let\f@rhdr\ch@pt@c -% \PrerenderUnicode{#1#2}% -% \else -% \def\f@rhdr{#1}% -% \PrerenderUnicode{#1}% -% \fi -% \fi - \ifx\ch@pt@c\m@m@empty % no optional args - \def\f@rtoc{#1}% - \def\f@rhdr{#1}% -% \PrerenderUnicode{#1}% - \else % at least one opt arg - \def\f@rtoc{\ch@pt@c}% - \nametest{#1}{#2}% - \ifsamename % one opt arg - \def\f@rhdr{\ch@pt@c}% -% \PrerenderUnicode{#1#2}% - \else % two opt args - \def\f@rhdr{#1}% -% \PrerenderUnicode{#1}% - \fi - \fi - \m@m@Andfalse - \ifnum \c@secnumdepth >\m@ne - \if@mainmatter - \m@m@Andtrue - \fi - \fi - \ifm@m@And - \ifanappendix - \refstepcounter{APPchapter}% - \else - \refstepcounter{chapter}% - \fi - \fi - \chaptermark{\f@rhdr} - \ifartopt - \@makechapterhead{#2}% - \@afterheading - \else - \insertchapterspace - \if@twocolumn - \@topnewpage[\@makechapterhead{#2}]% - \else - \@makechapterhead{#2}% - \fi - \@afterheading - \fi - \ifm@m@And - \ifanappendix - \addcontentsline{toc}{appendix}{% -% \protect\chapternumberline{\thechapter}\f@rtoc}% - \protect\chapternumberline{\hchaptertitlehead}\f@rtoc}% -% \memappchapinfo{\thechapter}{\f@rtoc}{\f@rhdr}{#2}% - \memappchapinfo{\thechapter}{\f@rtoc}{\f@rhdr}{#2}% - \else - \addcontentsline{toc}{chapter}{% -% \protect\chapternumberline{\thechapter}\f@rtoc}% - \protect\chapternumberline{\hchaptertitlehead}\f@rtoc}% -% \memchapinfo{\thechapter}{\f@rtoc}{\f@rhdr}{#2}% - \memchapinfo{\hchaptertitlehead}{\f@rtoc}{\f@rhdr}{#2}% - \fi - \else - \addcontentsline{toc}{chapter}{\f@rtoc}% - \ifanappendix - \memappchapinfo{}{\f@rtoc}{\f@rhdr}{#2}% - \else - \memchapinfo{\hchaptertitlehead}{\f@rtoc}{\f@rhdr}{#2}% - \fi - \fi - \ifheadnameref\M@gettitle{\f@rhdr}\else\M@gettitle{\f@rtoc}\fi -%%% for chapter - \ifanappendix - \protected@edef\@currentlabel{\thechapter}% - \fi -} - -\def\@makechapterhead#1{% - \chapterheadstart% \vspace*{50\p@}% - {\parindent \z@ \raggedright \normalfont - \ifm@m@And - \memucsinterwordchapterskiphook -% \printchaptername \chapternamenum \printchapternum -% \afterchapternum % \par\nobreak \vskip 20\p@ - \prechapternum \chapternamenum \printchapternum \chapternamenum \postchapternum - \afterchapternum % \par\nobreak \vskip 20\p@ - \else - \printchapternonum - \fi - \interlinepenalty\@M - \printchaptertitle{#1} % \Huge \bfseries #1 - \afterchaptertitle % \par\nobreak \vskip 40\p@ - }} - - -\renewcommand{\@m@mschapter}[2][\@empty]{% - \@schapter{#2}% - \ifx \@empty#1 - \def\f@rhdr{#2}% -% \PrerenderUnicode{#2}% - \else % opt arg - \def\f@rhdr{#1}% -% \PrerenderUnicode{#1}% - \setcounter{secnumdepth}{-10}% - \chaptermark{#1}% - \setcounter{secnumdepth}{\value{maxsecnumdepth}}% - \fi - \ifanappendix - \memappchapstarinfo{\f@rhdr}{#2}% - \else - \memchapstarinfo{\f@rhdr}{#2}% - \fi} - -\def\@makeschapterhead#1{% - \chapterheadstart -% {\parindent \z@ \raggedright \normalfont - {\parindent \z@ \raggedright \normalfont \memucsinterwordchapterskiphook - \printchapternonum - \interlinepenalty\@M - \printchaptertitle{#1} - \afterchaptertitle - } -} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\endinput +\endinput \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memhangul-ucs.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memhangul-ucs.sty index d624cf26562..cb62187ed8d 100644 --- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memhangul-ucs.sty +++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memhangul-ucs.sty @@ -12,8 +12,8 @@ %% %% \NeedsTeXFormat{LaTeX2e} -\def\filedate{2013/10/22} -\def\fileversion{1.7.6} +\def\filedate{2014/06/12} +\def\fileversion{1.7.7} \ProvidesPackage{memhangul-ucs}[\filedate UCS Hangul Package for memoir class] \typeout{memhangul-ucs\space v\fileversion\space \filedate} @@ -388,7 +388,7 @@ \def\bfemtrue{\@bfemtrue} \def\bfemfalse{\@bfemfalse} -\if@unfonts +\if@unfont \if@bfem \def\GrEmphFont{outbt} \def\GrEmphHanjaFont{outbt} @@ -493,7 +493,7 @@ \newdimen\useremphraisedim\useremphraisedim\z@ -\protected\def\useremph#1{\begingroup +\def\@@user@emph#1{\begingroup \ifdim\useremphraisedim=\z@\relax \settoheight{\dhucs@emph@raise}{#1}% \addtolength{\dhucs@emph@raise}{-.4em}% @@ -511,10 +511,46 @@ \let\useremph\@firstofone } +\RequirePackage{xparse} +\ExplSyntaxOn + +\dim_new:N \tmp_user_emph_dim +\dim_set:Nn \tmp_user_emph_dim { 1ex } +\tl_set:Nn \tmp_user_emph_char { ˚ } +\DeclareDocumentCommand \useremph { o o m } +{ + \IfValueT { #1 } + { + \tl_if_empty:nF { #1 } + { + \settoheight \tmp_user_emph_dim { #3 } + \dim_add:Nn \tmp_user_emph_dim { #1 } + } + } + \IfValueT { #2 } + { + \tl_if_empty:nF { #2 } + { + \tl_set:Nn \tmp_user_emph_char { #2 } + } + } + + \dim_set_eq:NN \useremphraisedim \tmp_user_emph_dim + \tl_set_eq:NN \useremphchar \tmp_user_emph_char + \@@user@emph{#3} +} + +\ExplSyntaxOff + +\def\useremphstarblack{\tiny★} +\def\useremphstarwhite{\tiny☆} + \endinput % CHANGE LOG % +% 2014/06/15: \useremph[raise][char]{text} compatible to xoblivoir +% 2014/06/12: \if@unfonts => \if@unfont % 2013/10/22: introduce memhangul-common.sty % 2013/10/16: [kosection] bug fix % 2013/09/27: xoblivoir-related fixes. diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memucs-gremph.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memucs-gremph.sty index 24268f96710..475fa8238c8 100644 --- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memucs-gremph.sty +++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memucs-gremph.sty @@ -1,6 +1,6 @@ %% File `memucs-gremph.sty` %% -%% Copyright (c) 2006-2013 Kangsoo Kim +%% Copyright (c) 2006-2014 Kangsoo Kim %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -33,7 +33,7 @@ % \def\GrEmphFont{utbt} % \def\GrEmphHanjaFont{utbt} %\else -\if@unfonts +\if@unfont \if@vargremphhangulfont\else \def\GrEmphFont{outgr}\fi \if@vargremphhanjafont\else @@ -109,6 +109,7 @@ % end of style. % % CHANGE LOG. +% * 2014/06/12. \if@unfonts => \if@unfont % * 2007/08/02. redundant space bug fix % * 2007/06/08. \slshape independent from \itshape % * 2005/08/17. \slhangul added. diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/luatexko-xobfont.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/luatexko-xobfont.sty deleted file mode 100644 index 6fe0a4e97c1..00000000000 --- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/luatexko-xobfont.sty +++ /dev/null @@ -1,608 +0,0 @@ -%% luatexko-xobfont.sty -%% -%% Copyright (c) 2012-2013 Kangsoo Kim -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3c -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3c or later is part of all distributions of LaTeX -%% version 2006/05/20 or later. -%% -%% oblivoir style font commands for luatex -%% part of oblivoir package -%% -%% Version 0.1: oldhangul option is not implemented -%% 0.1.1: bug fix (2012/07/28) -%% 0.1.2: [unfonts], [nounfonts] (2012/10/29) -%% -\ProvidesPackage{luatexko-xobfont}[2012/07/12] - -%% options: latinquote,oldhangul,gremph,itemph,nowinname,manualfontspec -\newif\if@latinquote\@latinquotefalse -\DeclareOption{latinquote}{\@latinquotetrue} -\newif\if@oldhangul\@oldhangulfalse -\DeclareOption{oldhangul}{\@oldhangultrue} -\newif\if@gremph\@gremphtrue -\DeclareOption{gremph}{\@gremphtrue} -\DeclareOption{itemph}{\@gremphfalse} -\newif\if@nowin\@nowinfalse -\DeclareOption{nowinname}{\@nowintrue} -\newif\if@manualfontspec\@manualfontspecfalse -\DeclareOption{manualfontspec}{\@manualfontspectrue} -\newif\if@unfonts\@unfontstrue -\DeclareOption{unfonts}{\@unfontstrue} -\DeclareOption{nounfonts}{\@unfontsfalse} -\newif\if@nanumfonts\@nanumfontsfalse -\DeclareOption{nanum}{\@nanumfontstrue} -\ProcessOptions - -%%% -\if@manualfontspec \endinput \fi - -%%% fixed options -\if@oldhangul - \edef\LKOV@oldhangulscript{Script=Hangul} - \edef\LKOV@oldhangullanguage{Language=Korean} - \edef\LKOV@oldhangulfeatures{RawFeature=+ccmp;+ljmo;+vjmo;+tjmo} -\else - \edef\LKOV@oldhangulscript{} - \edef\LKOV@oldhangullanguage{} - \edef\LKOV@oldhangulfeatures{} -\fi - -%%% note: FakeBold is disabled under LuaTeX -\if@gremph - \edef\LKOV@italicfeatures{} -\else - \edef\LKOV@italicfeatures{slant=0.17} -\fi - -\def\LKOV@externallocation{} - -\newcommand*\setmonoscale[1]{% - \edef\LKOV@monoscale{#1} -} -\setmonoscale{1} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%% main -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% top level command -\def\setkormainfont{% - \@ifstar {\setk@rm@inf@nt}{% - \@ifnextchar[{\m@inf@ntbracket}{% - \@ifnextchar(\m@inf@ntparen\m@inf@ntnoparen}% - } -} - -\def\m@inf@ntbracket[#1]#2{% - \@ifnextchar[{\m@inf@ntbrackettrail[#1]{#2}}{\m@inf@ntbracketnotrail[#1]{#2}} -} - -%%% \setkormainfont[foo]{bar} -\def\m@inf@ntbracketnotrail[#1]#2{% - \setmainhangulfont[#1]{#2} -} - -%%% \setkormainfont[foo1]{bar1}[foo2]{bar2} -\def\m@inf@ntbrackettrail[#1]#2[#3]#4{% - \setmainhangulfont[#1]{#2} - \setmainhanjafont[#3]{#4} -} - -%%% \setkormainfont{foo} -\def\m@inf@ntnoparen#1{\setmainhangulfont{#1}} - -\def\m@inf@ntparen(#1){% - \@ifnextchar({\m@inf@ntdoubleparen(#1)}{\m@inf@ntsingleparen(#1)} -} - -\def\m@inf@ntsingleparen(#1)#2{% - \@ifnextchar({\m@inf@ntsingleparentrail(#1){#2}}{\m@inf@ntsingleparennotrail(#1){#2}} -} - -\def\m@inf@ntsingleparentrail(#1)#2(#3){% - \@ifnextchar({\m@inf@ntsingleparentraildouble(#1){#2}(#3)}{\m@inf@ntsingleparentrailsingle(#1){#2}(#3)} -} - -\def\m@inf@ntdoubleparen(#1)(#2)#3{% - \@ifnextchar({\m@inf@ntdoubleparentrail(#1)(#2){#3}}{\m@inf@ntdoubleparennotrail(#1)(#2){#3}} -} - -\def\m@inf@ntdoubleparentrail(#1)(#2)#3(#4){% - \@ifnextchar({\m@inf@ntdoubleparentraildouble(#1)(#2){#3}(#4)}{\m@inf@ntdoubleparentrailsingle(#1)(#2){#3}(#4)} -} - -%%% \setkormainfont(foo){bar} -\def\m@inf@ntsingleparennotrail(#1)#2{% - \setmainhangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#2,ItalicFeatures={RawFeature={\LKOV@italicfeatures}}]{#2} -} - -%%% \setkormainfont(foo1){bar1}(foo2){bar2} -\def\m@inf@ntsingleparentrailsingle(#1)#2(#3)#4{% - \setmainhangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#2,ItalicFeatures={RawFeature={\LKOV@italicfeatures}}]{#2} - \setmainhanjafont[BoldFont=#3,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#4,ItalicFeatures={RawFeature={\LKOV@italicfeatures}}]{#4} -} - -%%% \setkormainfont(foo1){bar1}(foo2)(foo3){bar2} -\def\m@inf@ntsingleparentraildouble(#1)#2(#3)(#4)#5{% - \setmainhangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#2,ItalicFeatures={RawFeature={\LKOV@italicfeatures}}]{#2} - \if#4* \def\LKOV@temp{#5}\else \def\LKOV@temp{#4}\fi - \setmainhanjafont[BoldFont=#3,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}}]{#5} -} - -%%% \setkormainfont(foo1)(foo2){bar} -\def\m@inf@ntdoubleparennotrail(#1)(#2)#3{% - \if#2* \def\LKOV@temp{#3}\else\def\LKOV@temp{#2}\fi - \setmainhangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}}]{#3} -} - -%%% \setkormainfont(foo1)(foo2){bar1}(foo3){bar2} -\def\m@inf@ntdoubleparentrailsingle(#1)(#2)#3(#4)#5{% - \if#2* \def\LKOV@temp{#3}\else\def\LKOV@temp{#2}\fi - \setmainhangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}}]{#3} - \setmainhanjafont[BoldFont=#4,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#5,ItalicFeatures={RawFeature={\LKOV@italicfeatures}}]{#5} -} - -%%% \setkormainfont(foo1)(foo2){bar1}(foo3)(foo4){bar2} -\def\m@inf@ntdoubleparentraildouble(#1)(#2)#3(#4)(#5)#6{% - \if#2* \def\LKOV@temp{#3}\else\def\LKOV@temp{#2}\fi - \setmainhangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}}]{#3} - \if#5* \def\LKOV@temp{#6}\else\def\LKOV@temp{#5}\fi - \setmainhanjafont[BoldFont=#4,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}}]{#5} -} - -%%%%%%%%%%%%%%%%%%%%%% main: ExternalLocation %%%%%%%%%%%%%%%%%%%% -%%% top level command -\def\setk@rst@rm@inf@nt*{% - \@ifnextchar[{\st@rm@inf@ntbracket*}{% - \@ifnextchar({\st@rm@inf@ntparen*}{\st@rm@inf@ntnoparen*}}% -} - -\def\st@rm@inf@ntbracket*[#1]#2{% - \@ifnextchar[{\st@rm@inf@ntbrackettrail*[#1]{#2}}{\st@rm@inf@ntbracketnotrail*[#1]{#2}} -} - -%%% \setkormainfont*{bar} -\def\setk@rm@inf@nt#1{% - \setmainhangulfont[ExternalLocation]{#1} -} - -%%% \setkormainfont*[foo]{bar} -\def\st@rm@inf@ntbracketnotrail*[#1]#2{% - \setmainhangulfont[#1,ExternalLocation]{#2} -} - -%%% \setkormainfont*[foo1]{bar1}[foo2]{bar2} -\def\st@rm@inf@ntbrackettrail*[#1]#2[#3]#4{% - \setmainhangulfont[#1,ExternalLocation]{#2} - \setmainhanjafont[#3,ExternalLocation]{#4} -} - -%%% \setk@rst@rm@inf@nt*{foo} -\def\st@rm@inf@ntnoparen*#1{\setmainhangulfont[ExternalLocation]{#1}} - -\def\st@rm@inf@ntparen*(#1){% - \@ifnextchar({\st@rm@inf@ntdoubleparen*(#1)}{\st@rm@inf@ntsingleparen*(#1)} -} - -\def\st@rm@inf@ntsingleparen*(#1)#2{% - \@ifnextchar({\st@rm@inf@ntsingleparentrail*(#1){#2}}{\st@rm@inf@ntsingleparennotrail*(#1){#2}} -} - -\def\st@rm@inf@ntsingleparentrail*(#1)#2(#3){% - \@ifnextchar({\st@rm@inf@ntsingleparentraildouble*(#1){#2}(#3)}{\st@rm@inf@ntsingleparentrailsingle*(#1){#2}(#3)} -} - -\def\st@rm@inf@ntdoubleparen*(#1)(#2)#3{% - \@ifnextchar({\st@rm@inf@ntdoubleparentrail*(#1)(#2){#3}}{\st@rm@inf@ntdoubleparennotrail*(#1)(#2){#3}} -} - -\def\st@rm@inf@ntdoubleparentrail*(#1)(#2)#3(#4){% - \@ifnextchar({\st@rm@inf@ntdoubleparentraildouble*(#1)(#2){#3}(#4)}{\st@rm@inf@ntdoubleparentrailsingle*(#1)(#2){#3}(#4)} -} - -%%% \setk@rst@rm@inf@nt*(foo){bar} -\def\st@rm@inf@ntsingleparennotrail*(#1)#2{% - \setmainhangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#2,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation]{#2} -} - -%%% \setk@rst@rm@inf@nt*(foo1){bar1}(foo2){bar2} -\def\st@rm@inf@ntsingleparentrailsingle*(#1)#2(#3)#4{% - \setmainhangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#2,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation]{#2} - \setmainhanjafont[BoldFont=#3,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#4,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation]{#4} -} - -%%% \setk@rst@rm@inf@nt*(foo1){bar1}(foo2)(foo3){bar2} -\def\st@rm@inf@ntsingleparentraildouble*(#1)#2(#3)(#4)#5{% - \setmainhangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#2,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation]{#2} - \if#4* \def\LKOV@temp{#5}\else \def\LKOV@temp{#4}\fi - \setmainhanjafont[BoldFont=#3,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation]{#5} -} - -%%% \setk@rst@rm@inf@nt*(foo1)(foo2){bar} -\def\st@rm@inf@ntdoubleparennotrail(#1)(#2)#3{% - \if#2* \def\LKOV@temp{#3}\else\def\LKOV@temp{#2}\fi - \setmainhangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation]{#3} -} - -%%% \setk@rst@rm@inf@nt*(foo1)(foo2){bar1}(foo3){bar2} -\def\st@rm@inf@ntdoubleparentrailsingle(#1)(#2)#3(#4)#5{% - \if#2* \def\LKOV@temp{#3}\else\def\LKOV@temp{#2}\fi - \setmainhangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation]{#3} - \setmainhanjafont[BoldFont=#4,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#5,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation]{#5} -} - -%%% \setk@rst@rm@inf@nt*(foo1)(foo2){bar1}(foo3)(foo4){bar2} -\def\st@rm@inf@ntdoubleparentraildouble*(#1)(#2)#3(#4)(#5)#6{% - \if#2* \def\LKOV@temp{#3}\else\def\LKOV@temp{#2}\fi - \setmainhangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation]{#3} - \if#5* \def\LKOV@temp{#6}\else\def\LKOV@temp{#5}\fi - \setmainhanjafont[BoldFont=#4,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation]{#5} -} - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%% sans -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% top level command -\def\setkorsansfont{% - \@ifstar {\setk@rs@nsf@nt}{% - \@ifnextchar[{\s@nsf@ntbracket}{% - \@ifnextchar(\s@nsf@ntparen\s@nsf@ntnoparen}% - } -} - -\def\s@nsf@ntbracket[#1]#2{% - \@ifnextchar[{\s@nsf@ntbrackettrail[#1]{#2}}{\s@nsf@ntbracketnotrail[#1]{#2}} -} - -%%% \setkorsansfont[foo]{bar} -\def\s@nsf@ntbracketnotrail[#1]#2{% - \setsanshangulfont[#1]{#2} -} - -%%% \setkorsansfont[foo1]{bar1}[foo2]{bar2} -\def\s@nsf@ntbrackettrail[#1]#2[#3]#4{% - \setsanshangulfont[#1]{#2} - \setsanshanjafont[#3]{#4} -} - -%%% \setkorsansfont{foo} -\def\s@nsf@ntnoparen#1{\setsanshangulfont{#1}} - -\def\s@nsf@ntparen(#1){% - \@ifnextchar({\s@nsf@ntdoubleparen(#1)}{\s@nsf@ntsingleparen(#1)} -} - -\def\s@nsf@ntsingleparen(#1)#2{% - \@ifnextchar({\s@nsf@ntsingleparentrail(#1){#2}}{\s@nsf@ntsingleparennotrail(#1){#2}} -} - -\def\s@nsf@ntsingleparentrail(#1)#2(#3){% - \@ifnextchar({\s@nsf@ntsingleparentraildouble(#1){#2}(#3)}{\s@nsf@ntsingleparentrailsingle(#1){#2}(#3)} -} - -\def\s@nsf@ntdoubleparen(#1)(#2)#3{% - \@ifnextchar({\s@nsf@ntdoubleparentrail(#1)(#2){#3}}{\s@nsf@ntdoubleparennotrail(#1)(#2){#3}} -} - -\def\s@nsf@ntdoubleparentrail(#1)(#2)#3(#4){% - \@ifnextchar({\s@nsf@ntdoubleparentraildouble(#1)(#2){#3}(#4)}{\s@nsf@ntdoubleparentrailsingle(#1)(#2){#3}(#4)} -} - -%%% \setkorsansfont(foo){bar} -\def\s@nsf@ntsingleparennotrail(#1)#2{% - \setsanshangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#2,ItalicFeatures={RawFeature={\LKOV@italicfeatures}}]{#2} -} - -%%% \setkorsansfont(foo1){bar1}(foo2){bar2} -\def\s@nsf@ntsingleparentrailsingle(#1)#2(#3)#4{% - \setsanshangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#2,ItalicFeatures={RawFeature={\LKOV@italicfeatures}}]{#2} - \setsanshanjafont[BoldFont=#3,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#4,ItalicFeatures={RawFeature={\LKOV@italicfeatures}}]{#4} -} - -%%% \setkorsansfont(foo1){bar1}(foo2)(foo3){bar2} -\def\s@nsf@ntsingleparentraildouble(#1)#2(#3)(#4)#5{% - \setsanshangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#2,ItalicFeatures={RawFeature={\LKOV@italicfeatures}}]{#2} - \if#4* \def\LKOV@temp{#5}\else \def\LKOV@temp{#4}\fi - \setsanshanjafont[BoldFont=#3,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}}]{#5} -} - -%%% \setkorsansfont(foo1)(foo2){bar} -\def\s@nsf@ntdoubleparennotrail(#1)(#2)#3{% - \if#2* \def\LKOV@temp{#3}\else\def\LKOV@temp{#2}\fi - \setsanshangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}}]{#3} -} - -%%% \setkorsansfont(foo1)(foo2){bar1}(foo3){bar2} -\def\s@nsf@ntdoubleparentrailsingle(#1)(#2)#3(#4)#5{% - \if#2* \def\LKOV@temp{#3}\else\def\LKOV@temp{#2}\fi - \setsanshangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}}]{#3} - \setsanshanjafont[BoldFont=#4,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#5,ItalicFeatures={RawFeature={\LKOV@italicfeatures}}]{#5} -} - -%%% \setkorsansfont(foo1)(foo2){bar1}(foo3)(foo4){bar2} -\def\s@nsf@ntdoubleparentraildouble(#1)(#2)#3(#4)(#5)#6{% - \if#2* \def\LKOV@temp{#3}\else\def\LKOV@temp{#2}\fi - \setsanshangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}}]{#3} - \if#5* \def\LKOV@temp{#6}\else\def\LKOV@temp{#5}\fi - \setsanshanjafont[BoldFont=#4,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}}]{#5} -} - -%%%%%%%%%%%%%%%%%%%%%% sans: ExternalLocation %%%%%%%%%%%%%%%%%%%% -%%% top level command -\def\setk@rst@rs@nsf@nt*{% - \@ifnextchar[{\st@rs@nsf@ntbracket*}{% - \@ifnextchar({\st@rs@nsf@ntparen*}{\st@rs@nsf@ntnoparen*}}% -} - -\def\st@rs@nsf@ntbracket*[#1]#2{% - \@ifnextchar[{\st@rs@nsf@ntbrackettrail*[#1]{#2}}{\st@rs@nsf@ntbracketnotrail*[#1]{#2}} -} - -%%% \setkorsansfont*{bar} -\def\setk@rs@nsf@nt#1{% - \setsanshangulfont[ExternalLocation]{#1} -} - -%%% \setkorsansfont*[foo]{bar} -\def\st@rs@nsf@ntbracketnotrail*[#1]#2{% - \setsanshangulfont[#1,ExternalLocation]{#2} -} - -%%% \setkorsansfont*[foo1]{bar1}[foo2]{bar2} -\def\st@rs@nsf@ntbrackettrail*[#1]#2[#3]#4{% - \setsanshangulfont[#1,ExternalLocation]{#2} - \setsanshanjafont[#3,ExternalLocation]{#4} -} - -%%% \setk@rst@rs@nsf@nt*{foo} -\def\st@rs@nsf@ntnoparen*#1{\setsanshangulfont[ExternalLocation]{#1}} - -\def\st@rs@nsf@ntparen*(#1){% - \@ifnextchar({\st@rs@nsf@ntdoubleparen*(#1)}{\st@rs@nsf@ntsingleparen*(#1)} -} - -\def\st@rs@nsf@ntsingleparen*(#1)#2{% - \@ifnextchar({\st@rs@nsf@ntsingleparentrail*(#1){#2}}{\st@rs@nsf@ntsingleparennotrail*(#1){#2}} -} - -\def\st@rs@nsf@ntsingleparentrail*(#1)#2(#3){% - \@ifnextchar({\st@rs@nsf@ntsingleparentraildouble*(#1){#2}(#3)}{\st@rs@nsf@ntsingleparentrailsingle*(#1){#2}(#3)} -} - -\def\st@rs@nsf@ntdoubleparen*(#1)(#2)#3{% - \@ifnextchar({\st@rs@nsf@ntdoubleparentrail*(#1)(#2){#3}}{\st@rs@nsf@ntdoubleparennotrail*(#1)(#2){#3}} -} - -\def\st@rs@nsf@ntdoubleparentrail*(#1)(#2)#3(#4){% - \@ifnextchar({\st@rs@nsf@ntdoubleparentraildouble*(#1)(#2){#3}(#4)}{\st@rs@nsf@ntdoubleparentrailsingle*(#1)(#2){#3}(#4)} -} - -%%% \setk@rst@rs@nsf@nt*(foo){bar} -\def\st@rs@nsf@ntsingleparennotrail*(#1)#2{% - \setsanshangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#2,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation]{#2} -} - -%%% \setk@rst@rs@nsf@nt*(foo1){bar1}(foo2){bar2} -\def\st@rs@nsf@ntsingleparentrailsingle*(#1)#2(#3)#4{% - \setsanshangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#2,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation]{#2} - \setsanshanjafont[BoldFont=#3,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#4,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation]{#4} -} - -%%% \setk@rst@rs@nsf@nt*(foo1){bar1}(foo2)(foo3){bar2} -\def\st@rs@nsf@ntsingleparentraildouble*(#1)#2(#3)(#4)#5{% - \setsanshangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#2,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation]{#2} - \if#4* \def\LKOV@temp{#5}\else \def\LKOV@temp{#4}\fi - \setsanshanjafont[BoldFont=#3,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation]{#5} -} - -%%% \setk@rst@rs@nsf@nt*(foo1)(foo2){bar} -\def\st@rs@nsf@ntdoubleparennotrail(#1)(#2)#3{% - \if#2* \def\LKOV@temp{#3}\else\def\LKOV@temp{#2}\fi - \setsanshangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation]{#3} -} - -%%% \setk@rst@rs@nsf@nt*(foo1)(foo2){bar1}(foo3){bar2} -\def\st@rs@nsf@ntdoubleparentrailsingle(#1)(#2)#3(#4)#5{% - \if#2* \def\LKOV@temp{#3}\else\def\LKOV@temp{#2}\fi - \setsanshangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation]{#3} - \setsanshanjafont[BoldFont=#4,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#5,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation]{#5} -} - -%%% \setk@rst@rs@nsf@nt*(foo1)(foo2){bar1}(foo3)(foo4){bar2} -\def\st@rs@nsf@ntdoubleparentraildouble*(#1)(#2)#3(#4)(#5)#6{% - \if#2* \def\LKOV@temp{#3}\else\def\LKOV@temp{#2}\fi - \setsanshangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation]{#3} - \if#5* \def\LKOV@temp{#6}\else\def\LKOV@temp{#5}\fi - \setsanshanjafont[BoldFont=#4,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation]{#5} -} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%% mono -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% top level command -\def\setkormonofont{% - \@ifstar {\setk@rm@n@f@nt}{% - \@ifnextchar[{\m@n@f@ntbracket}{% - \@ifnextchar(\m@n@f@ntparen\m@n@f@ntnoparen}% - } -} - -\def\m@n@f@ntbracket[#1]#2{% - \@ifnextchar[{\m@n@f@ntbrackettrail[#1]{#2}}{\m@n@f@ntbracketnotrail[#1]{#2}} -} - -%%% \setkormonofont[foo]{bar} -\def\m@n@f@ntbracketnotrail[#1]#2{% - \setmonohangulfont[#1,Scale=\LKOV@monoscale]{#2} -} - -%%% \setkormonofont[foo1]{bar1}[foo2]{bar2} -\def\m@n@f@ntbrackettrail[#1]#2[#3]#4{% - \setmonohangulfont[#1,Scale=\LKOV@monoscale]{#2} - \setmonohanjafont[#3,Scale=\LKOV@monoscale]{#4} -} - -%%% \setkormonofont{foo} -\def\m@n@f@ntnoparen#1{\setmonohangulfont{#1}} - -\def\m@n@f@ntparen(#1){% - \@ifnextchar({\m@n@f@ntdoubleparen(#1)}{\m@n@f@ntsingleparen(#1)} -} - -\def\m@n@f@ntsingleparen(#1)#2{% - \@ifnextchar({\m@n@f@ntsingleparentrail(#1){#2}}{\m@n@f@ntsingleparennotrail(#1){#2}} -} - -\def\m@n@f@ntsingleparentrail(#1)#2(#3){% - \@ifnextchar({\m@n@f@ntsingleparentraildouble(#1){#2}(#3)}{\m@n@f@ntsingleparentrailsingle(#1){#2}(#3)} -} - -\def\m@n@f@ntdoubleparen(#1)(#2)#3{% - \@ifnextchar({\m@n@f@ntdoubleparentrail(#1)(#2){#3}}{\m@n@f@ntdoubleparennotrail(#1)(#2){#3}} -} - -\def\m@n@f@ntdoubleparentrail(#1)(#2)#3(#4){% - \@ifnextchar({\m@n@f@ntdoubleparentraildouble(#1)(#2){#3}(#4)}{\m@n@f@ntdoubleparentrailsingle(#1)(#2){#3}(#4)} -} - -%%% \setkormonofont(foo){bar} -\def\m@n@f@ntsingleparennotrail(#1)#2{% - \setmonohangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#2,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},Scale=\LKOV@monoscale]{#2} -} - -%%% \setkormonofont(foo1){bar1}(foo2){bar2} -\def\m@n@f@ntsingleparentrailsingle(#1)#2(#3)#4{% - \setmonohangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#2,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},Scale=\LKOV@monoscale]{#2} - \setmonohanjafont[BoldFont=#3,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#4,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},Scale=\LKOV@monoscale]{#4} -} - -%%% \setkormonofont(foo1){bar1}(foo2)(foo3){bar2} -\def\m@n@f@ntsingleparentraildouble(#1)#2(#3)(#4)#5{% - \setmonohangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#2,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},Scale=\LKOV@monoscale]{#2} - \if#4* \def\LKOV@temp{#5}\else \def\LKOV@temp{#4}\fi - \setmonohanjafont[BoldFont=#3,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},Scale=\LKOV@monoscale]{#5} -} - -%%% \setkormonofont(foo1)(foo2){bar} -\def\m@n@f@ntdoubleparennotrail(#1)(#2)#3{% - \if#2* \def\LKOV@temp{#3}\else\def\LKOV@temp{#2}\fi - \setmonohangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},Scale=\LKOV@monoscale]{#3} -} - -%%% \setkormonofont(foo1)(foo2){bar1}(foo3){bar2} -\def\m@n@f@ntdoubleparentrailsingle(#1)(#2)#3(#4)#5{% - \if#2* \def\LKOV@temp{#3}\else\def\LKOV@temp{#2}\fi - \setmonohangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},Scale=\LKOV@monoscale]{#3} - \setmonohanjafont[BoldFont=#4,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#5,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},Scale=\LKOV@monoscale]{#5} -} - -%%% \setkormonofont(foo1)(foo2){bar1}(foo3)(foo4){bar2} -\def\m@n@f@ntdoubleparentraildouble(#1)(#2)#3(#4)(#5)#6{% - \if#2* \def\LKOV@temp{#3}\else\def\LKOV@temp{#2}\fi - \setmonohangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},Scale=\LKOV@monoscale]{#3} - \if#5* \def\LKOV@temp{#6}\else\def\LKOV@temp{#5}\fi - \setmonohanjafont[BoldFont=#4,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},Scale=\LKOV@monoscale]{#5} -} - -%%%%%%%%%%%%%%%%%%%%%% mono: ExternalLocation %%%%%%%%%%%%%%%%%%%% -%%% top level command -\def\setk@rst@rm@n@f@nt*{% - \@ifnextchar[{\st@rm@n@f@ntbracket*}{% - \@ifnextchar({\st@rm@n@f@ntparen*}{\st@rm@n@f@ntnoparen*}}% -} - -\def\st@rm@n@f@ntbracket*[#1]#2{% - \@ifnextchar[{\st@rm@n@f@ntbrackettrail*[#1]{#2}}{\st@rm@n@f@ntbracketnotrail*[#1]{#2}} -} - -%%% \setkormonofont*{bar} -\def\setk@rm@n@f@nt#1{% - \setmonohangulfont[ExternalLocation]{#1} -} - - -%%% \setkormonofont*[foo]{bar} -\def\st@rm@n@f@ntbracketnotrail*[#1]#2{% - \setmonohangulfont[#1,ExternalLocation,Scale=\LKOV@monoscale]{#2} -} - -%%% \setkormonofont*[foo1]{bar1}[foo2]{bar2} -\def\st@rm@n@f@ntbrackettrail*[#1]#2[#3]#4{% - \setmonohangulfont[#1,ExternalLocation,Scale=\LKOV@monoscale]{#2} - \setmonohanjafont[#3,ExternalLocation,Scale=\LKOV@monoscale]{#4} -} - -%%% \setk@rst@rm@n@f@nt*{foo} -\def\st@rm@n@f@ntnoparen*#1{\setmonohangulfont[ExternalLocation]{#1}} - -\def\st@rm@n@f@ntparen*(#1){% - \@ifnextchar({\st@rm@n@f@ntdoubleparen*(#1)}{\st@rm@n@f@ntsingleparen*(#1)} -} - -\def\st@rm@n@f@ntsingleparen*(#1)#2{% - \@ifnextchar({\st@rm@n@f@ntsingleparentrail*(#1){#2}}{\st@rm@n@f@ntsingleparennotrail*(#1){#2}} -} - -\def\st@rm@n@f@ntsingleparentrail*(#1)#2(#3){% - \@ifnextchar({\st@rm@n@f@ntsingleparentraildouble*(#1){#2}(#3)}{\st@rm@n@f@ntsingleparentrailsingle*(#1){#2}(#3)} -} - -\def\st@rm@n@f@ntdoubleparen*(#1)(#2)#3{% - \@ifnextchar({\st@rm@n@f@ntdoubleparentrail*(#1)(#2){#3}}{\st@rm@n@f@ntdoubleparennotrail*(#1)(#2){#3}} -} - -\def\st@rm@n@f@ntdoubleparentrail*(#1)(#2)#3(#4){% - \@ifnextchar({\st@rm@n@f@ntdoubleparentraildouble*(#1)(#2){#3}(#4)}{\st@rm@n@f@ntdoubleparentrailsingle*(#1)(#2){#3}(#4)} -} - -%%% \setk@rst@rm@n@f@nt*(foo){bar} -\def\st@rm@n@f@ntsingleparennotrail*(#1)#2{% - \setmonohangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#2,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation,Scale=\LKOV@monoscale]{#2} -} - -%%% \setk@rst@rm@n@f@nt*(foo1){bar1}(foo2){bar2} -\def\st@rm@n@f@ntsingleparentrailsingle*(#1)#2(#3)#4{% - \setmonohangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#2,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation,Scale=\LKOV@monoscale]{#2} - \setmonohanjafont[BoldFont=#3,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#4,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation,Scale=\LKOV@monoscale]{#4} -} - -%%% \setk@rst@rm@n@f@nt*(foo1){bar1}(foo2)(foo3){bar2} -\def\st@rm@n@f@ntsingleparentraildouble*(#1)#2(#3)(#4)#5{% - \setmonohangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#2,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation,Scale=\LKOV@monoscale]{#2} - \if#4* \def\LKOV@temp{#5}\else \def\LKOV@temp{#4}\fi - \setmonohanjafont[BoldFont=#3,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation,Scale=\LKOV@monoscale]{#5} -} - -%%% \setk@rst@rm@n@f@nt*(foo1)(foo2){bar} -\def\st@rm@n@f@ntdoubleparennotrail(#1)(#2)#3{% - \if#2* \def\LKOV@temp{#3}\else\def\LKOV@temp{#2}\fi - \setmonohangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation,Scale=\LKOV@monoscale]{#3} -} - -%%% \setk@rst@rm@n@f@nt*(foo1)(foo2){bar1}(foo3){bar2} -\def\st@rm@n@f@ntdoubleparentrailsingle(#1)(#2)#3(#4)#5{% - \if#2* \def\LKOV@temp{#3}\else\def\LKOV@temp{#2}\fi - \setmonohangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation,Scale=\LKOV@monoscale]{#3} - \setmonohanjafont[BoldFont=#4,BoldFeatures={RawFeature={embolden=2}},ItalicFont=#5,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation,Scale=\LKOV@monoscale]{#5} -} - -%%% \setk@rst@rm@n@f@nt*(foo1)(foo2){bar1}(foo3)(foo4){bar2} -\def\st@rm@n@f@ntdoubleparentraildouble*(#1)(#2)#3(#4)(#5)#6{% - \if#2* \def\LKOV@temp{#3}\else\def\LKOV@temp{#2}\fi - \setmonohangulfont[BoldFont=#1,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation,Scale=\LKOV@monoscale]{#3} - \if#5* \def\LKOV@temp{#6}\else\def\LKOV@temp{#5}\fi - \setmonohanjafont[BoldFont=#4,BoldFeatures={RawFeature={embolden=2}},ItalicFont=\LKOV@temp,ItalicFeatures={RawFeature={\LKOV@italicfeatures}},ExternalLocation,Scale=\LKOV@monoscale]{#5} -} - -\if@nanumfonts -\setmainhangulfont{NanumMyeongjo} -\setsanshangulfont{NanumGothic} -\setmonohangulfont{NanumGothic} -\fi - -\endinput 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 3b54c614f22..e55fadebe03 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 @@ -14,8 +14,8 @@ %% part of oblivoir v2 %% \NeedsTeXFormat{LaTeX2e} -\def\filedate{2014/04/29} -\def\fileversion{11.7.17} +\def\filedate{2014/06/12} +\def\fileversion{11.8} \ProvidesPackage{memhangul-x}[\filedate Hangul Typography for (x)oblivoir] \typeout{Hangul Typography for (x)oblivoir} @@ -76,19 +76,24 @@ \DeclareOption{nowinname}{\PassOptionsToPackage{\CurrentOption}{xetexko-var}} \DeclareOption{unfonts}{\PassOptionsToPackage{\CurrentOption}{xetexko-var}} \DeclareOption{nounfonts}{\PassOptionsToPackage{\CurrentOption}{xetexko-var}} +\DeclareOption{nanum}{\PassOptionsToPackage{\CurrentOption}{xetexko-var}} +\DeclareOption{hcr}{\PassOptionsToPackage{\CurrentOption}{xetexko-var}} \else\ifluatex %%% luatexko options -\DeclareOption{gremph}{\PassOptionsToPackage{\CurrentOption}{luatexko-xobfont}} -\DeclareOption{itemph}{\PassOptionsToPackage{\CurrentOption}{luatexko-xobfont}} +\DeclareOption{gremph}{\PassOptionsToPackage{\CurrentOption}{xob-font}} +\DeclareOption{itemph}{\PassOptionsToPackage{\CurrentOption}{xob-font}} %%% new option -\DeclareOption{latinquote}{\PassOptionsToPackage{\CurrentOption}{luatexko-xobfont}} -\DeclareOption{oldhangul}{\PassOptionsToPackage{\CurrentOption}{luatexko-xobfont}} -\DeclareOption{manualfontspec}{\PassOptionsToPackage{\CurrentOption}{luatexko-xobfont}} -\DeclareOption{nowinname}{\PassOptionsToPackage{\CurrentOption}{luatexko-xobfont}} -\DeclareOption{unfonts}{\PassOptionsToPackage{\CurrentOption}{luatexko-xobfont}} -\DeclareOption{nounfonts}{\PassOptionsToPackage{\CurrentOption}{luatexko-xobfont}} +\DeclareOption{latinquote}{\PassOptionsToPackage{\CurrentOption}{xob-font}} +\DeclareOption{oldhangul}{\PassOptionsToPackage{\CurrentOption}{xob-font}} +\DeclareOption{manualfontspec}{\PassOptionsToPackage{\CurrentOption}{xob-font}} +\DeclareOption{nowinname}{\PassOptionsToPackage{\CurrentOption}{xob-font}} +\DeclareOption{unfonts}{\PassOptionsToPackage{\CurrentOption}{xob-font}} +\DeclareOption{nounfonts}{\PassOptionsToPackage{\CurrentOption}{xob-font}} +\DeclareOption{nanum}{\PassOptionsToPackage{\CurrentOption}{xob-font}} +\DeclareOption{hcr}{\PassOptionsToPackage{\CurrentOption}{xob-font}} \else %%% pdftex options +\ifPDFTeX \DeclareOption{gremph}{\DisabledOption{gremph}} \DeclareOption{itemph}{\DisabledOption{itemph}} \DeclareOption{latinquote}{\DisabledOption{latinquote}} @@ -97,6 +102,9 @@ \DeclareOption{nowinname}{\DisabledOption{nowinname}} \DeclareOption{unfonts}{\DisabledOption{unfonts}} \DeclareOption{nounfonts}{\DisabledOption{nounfonts}} +\DeclareOption{nanum}{\DisabledOption{nanum}} +\DeclareOption{hcr}{\DisabledOption{hcr}} +\fi \fi\fi %%% figtabcapt @@ -109,11 +117,11 @@ \DeclareOption{uset1font}{\PassOptionsToPackage{usecjkt1font}{cjkutf8-ko}} \DeclareOption{usedotemph}{\PassOptionsToPackage{\CurrentOption}{cjkutf8-ko}} -\ProcessOptions +\ProcessOptions \relax \ifluatex \RequirePackage{luatexko} - \RequirePackage{luatexko-xobfont} + \RequirePackage{xob-font} \RequirePackage{xob-dotemph} \else\ifxetex \RequirePackage{xetexko-var} @@ -347,7 +355,7 @@ % 2012/11/29 : \pdfstringdefDisableCommands % 2012/11/22 : [figtabcapt] opton introduced % 2012/11/01 : avoid error in \cnm, \ccnm etc. -% 2012/07/12 : introduce luatexko-xobfont +% 2012/07/12 : introduce xob-font % 2011/09/15 : changes according to xoblivoir % 2010/09/16 : cntrdot, adjustmath % 2009/05/11 : protect bnm commands diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xetexko-var.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xetexko-var.sty index 2aaf1e8b97d..27768dbda6c 100644 --- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xetexko-var.sty +++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xetexko-var.sty @@ -1,6 +1,6 @@ %% xetexko-var.sty %% -%% Copyright (c) 2007-2013 Kangsoo Kim +%% Copyright (c) 2007-2014 Kangsoo Kim %% Copyright (c) 2013 Kihwang Lee %% %% This work may be distributed and/or modified under the @@ -17,14 +17,14 @@ %% 2013.08.26 %% \ProvidesPackage{xetexko-var} - [2013/08/26 v0.12 Korean Typesetting under XeTeX] + [2014/06/12 v0.13 Korean Typesetting under XeTeX] %%% common options for xob-font -\DeclareOption{gremph}{\PassOptionsToPackage{\CurrentOption}{xetexko-xobfont}} -\DeclareOption{itemph}{\PassOptionsToPackage{\CurrentOption}{xetexko-xobfont}} -\DeclareOption{oldhangul}{\PassOptionsToPackage{\CurrentOption}{xetexko-xobfont}} -\DeclareOption{latinquote}{\PassOptionsToPackage{\CurrentOption}{xetexko-xobfont}} -\DeclareOption{nowinname}{\PassOptionsToPackage{\CurrentOption}{xetexko-xobfont}} +\DeclareOption{gremph}{\PassOptionsToPackage{\CurrentOption}{xob-font}} +\DeclareOption{itemph}{\PassOptionsToPackage{\CurrentOption}{xob-font}} +\DeclareOption{oldhangul}{\PassOptionsToPackage{\CurrentOption}{xob-font}} +\DeclareOption{latinquote}{\PassOptionsToPackage{\CurrentOption}{xob-font}} +\DeclareOption{nowinname}{\PassOptionsToPackage{\CurrentOption}{xob-font}} %%% for kolabels \newif\if@hangul \newif\if@hanja @@ -35,8 +35,10 @@ \DeclareOption{manualfontspec}{\@extfontspectrue} %%% unfonts -\DeclareOption{unfonts}{\PassOptionsToPackage{\CurrentOption}{xetexko-xobfont}} -\DeclareOption{nounfonts}{\PassOptionsToPackage{\CurrentOption}{xetexko-xobfont}} +\DeclareOption{unfonts}{\PassOptionsToPackage{\CurrentOption}{xob-font}} +\DeclareOption{nounfonts}{\PassOptionsToPackage{\CurrentOption}{xob-font}} +\DeclareOption{nanum}{\PassOptionsToPackage{\CurrentOption}{xob-font}} +\DeclareOption{hcr}{\PassOptionsToPackage{\CurrentOption}{xob-font}} \ProcessOptions\relax %%% xetexko sub-styles @@ -49,10 +51,11 @@ \RequirePackage{xob-hyper} \if@extfontspec - \PackageWarning{xetexko-var}{Load xetexko-xobfont and configure Korean Fonts manually!}{} - \RequirePackage{xetexko-font} + \PackageWarning{xetexko-var}{Load xetexko-font and configure Korean Fonts manually!}{} \else - \RequirePackage{xetexko-xobfont} +%%% We will never use xetexko/luatexko's unfonts option. + \newif\if@unfonts\@unfontsfalse + \RequirePackage{xob-font} \fi \RequirePackage{kolabels-utf} @@ -60,6 +63,7 @@ \endinput +%%% 2014-06-12: new xob-font.sty %%% 2013-09-27, nounfonts. %%% 오후 3:22 2008-11-16 %%% 오후 17:59 2008-12-03 : nowinname 옵션 추가 diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xetexko-xobfont.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xetexko-xobfont.sty deleted file mode 100644 index abe3c7e1885..00000000000 --- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xetexko-xobfont.sty +++ /dev/null @@ -1,1060 +0,0 @@ -%% xetexko-xobfont.sty -%% -%% Copyright (c) 2007-2013 Kangsoo Kim -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3c -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3c or later is part of all distributions of LaTeX -%% version 2006/05/20 or later. -%% -%% a variant of xetexko-font.sty -% -\ifdefined\ProvidesPackage - \ProvidesPackage{xetexko-xobfont}[2014/05/12 v0.77 Korean font definition in conjunction with xetexko-space, a variant] -\fi - -\@ifpackageloaded{xetexko-space}{}{% - \PackageError{xetexko-xob}{xetexko-space must be loaded before}{}% -} - -\newif\if@latinquote\@latinquotefalse -\DeclareOption{latinquote}{\@latinquotetrue} -\newif\if@oldhangul\@oldhangulfalse -\DeclareOption{oldhangul}{\@oldhangultrue} -\newif\if@gremph\@gremphtrue -\DeclareOption{gremph}{\@gremphtrue} -\DeclareOption{itemph}{\@gremphfalse} -\newif\if@nowin\@nowinfalse -\DeclareOption{nowinname}{\@nowintrue} - -\newif\if@unfonts\@unfontsfalse -\DeclareOption{unfonts}{\@unfontstrue} -\DeclareOption{nounfonts}{\@unfontsfalse} -\newif\if@nanumfonts\@nanumfontsfalse -\DeclareOption{nanum}{\@nanumfontstrue} - -\ProcessOptions - -\RequirePackage{xetexko-font} - -\if@oldhangul - \def\XKOV@oldhangulscript{Script=Hangul} - \def\XKOV@oldhangullanguage{Language=Korean} - \def\XKOV@oldhangulfeatures{RawFeature=+ccmp;+ljmo;+vjmo;+tjmo} -\else - \def\XKOV@oldhangulscript{} - \def\XKOV@oldhangullanguage{} - \def\XKOV@oldhangulfeatures{} -\fi - -\if@gremph - \def\XKOV@italicfeatures{} - \def\XKOV@bolditalicfeatures{RawFeature={embolden=2}} - \def\XKOV@boldfeatures{RawFeature={embolden=2}} -\else - \def\XKOV@italicfeatures{RawFeature={slant=0.17}} - \def\XKOV@bolditalicfeatures{RawFeature={embolden=2;slant=0.17}} - \def\XKOV@boldfeatures{RawFeature={embolden=2}} -\fi - -\newcommand\setmonoscale[1]{% - \def\XKOV@monoscale{#1}% -} -\setmonoscale{1.05} - -%%% 괄호 재설정 -%\if@latinquote -% \XeTeXcharclass "2018 = 4 % ‘ -% \XeTeXcharclass "201C = 4 % “ -% \XeTeXcharclass "2019 = 5 % ’ -% \XeTeXcharclass "201D = 5 % ” -%\else -% \XeTeXcharclass "2018 = 2 % ‘ -% \XeTeXcharclass "201C = 2 % “ -% \XeTeXcharclass "2019 = 3 % ’ -% \XeTeXcharclass "201D = 3 % ” -%\fi - -%%% 한글 기호 문자 일부. xkospace에 정의되지 않은 것. -%%% 추후 삭제할 수 있는 코드. -%%% ※… = class 1 (한자) -%\XeTeXcharclass "007D = 7 %… class 7 ("AC00) -%%\count255 = "203B -%%\loop \XeTeXcharclass\count255 = 1 -%% \ifnum\count255 < "24EA -%% \advance\count255 1 \repeat -%%\count255 = "3200 -%%\loop \XeTeXcharclass\count255 = 1 -%% \ifnum\count255 < "33DE -%% \advance\count255 1 \repeat -%%\count255 = "25A0 -%%\loop \XeTeXcharclass\count255 = 1 -%% \ifnum\count255 < "266E -%% \advance\count255 1 \repeat - -% \XeTeXcharclass "223C = 1 % ∼ - -%% 한글폰트 지정하기 : -\@ifpackageloaded{xltxtra}{}{\RequirePackage{xltxtra}} - \def\CallKorFont#1{% - \expandafter\newfontfamily\csname kor#1font\endcsname[\XKOV@externallocation,% - BoldFont=\csname XKOV@kor#1@bold\endcsname,% - ItalicFont=\csname XKOV@kor#1@italic\endcsname,% - ItalicFeatures={\XKOV@italicfeatures},% - BoldItalicFont=\csname XKOV@kor#1@bolditalic\endcsname,% - BoldItalicFeatures={\XKOV@italicfeatures},% -% Script=Hangul,% -% Language=Korean,% -% RawFeature=+ccmp;+ljmo;+vjmo;+tjmo - \XKOV@oldhangulscript,\XKOV@oldhangullanguage,% - \XKOV@oldhangulfeatures - ]% - {\csname XKOV@kor#1@regular\endcsname}% - } -%%%%%%%%% mono 폰트는 특별하게 취급한다. - \def\CallKorFontmono{% - \newfontfamily\kormonofont[\XKOV@externallocation,% - BoldFont=\XKOV@kormono@bold,% - BoldFeatures={\XKOV@boldfeatures},% - ItalicFont=\XKOV@kormono@italic,% - ItalicFeatures={\XKOV@italicfeatures},% - BoldItalicFont=\XKOV@kormono@bolditalic,% - BoldItalicFeatures={\XKOV@bolditalicfeatures},% - Scale=\XKOV@monoscale]% - {\XKOV@kormono@regular} - } -% \newfontfamily\korvertfont[ExternalLocation, -% BoldFont=UnBatang, -% BoldFeatures={RawFeature={embolden=2}}, -% ItalicFont=UnBatang, -% ItalicFeatures={RawFeature={slant=0.17}}, -% BoldItalicFont=UnBatang, -% BoldItalicFeatures={RawFeature={embolden=2;slant=0.17}}, -% Script=Hangul, -% Language=Korean, -% Vertical=RotatedGlyphs] -% {UnBatang} - \def\CallHnjFont#1{% - \expandafter\newfontfamily\csname hnj#1font\endcsname[\XKOV@externallocation,% - BoldFont=\csname XKOV@hnj#1@bold\endcsname,% - ItalicFont=\csname XKOV@hnj#1@italic\endcsname,% - ItalicFeatures={\XKOV@italicfeatures},% - BoldItalicFont=\csname XKOV@hnj#1@bolditalic\endcsname,% - BoldItalicFeatures={\XKOV@italicfeatures},% -% Script=Hangul,% -% Language=Korean,% -% RawFeature=+ccmp;+ljmo;+vjmo;+tjmo - \XKOV@oldhangulscript,\XKOV@oldhangullanguage,% - \XKOV@oldhangulfeatures - ]% - {\csname XKOV@hnj#1@regular\endcsname}% - } - \def\CallHnjFontmono{% - \newfontfamily\hnjmonofont[\XKOV@externallocation,% - BoldFont=\XKOV@hnjmono@bold,% - BoldFeatures={\XKOV@boldfeatures},% - ItalicFont=\XKOV@hnjmono@italic,% - ItalicFeatures={\XKOV@italicfeatures},% - BoldItalicFont=\XKOV@hnjmono@bolditalic,% - BoldItalicFeatures={\XKOV@bolditalicfeatures},% - Scale=\XKOV@monoscale - ]% - {\XKOV@hnjmono@regular} - } - \def\CallHnjDefault{% - \let\hnjmainfont\kormainfont - \let\hnjsansfont\korsansfont - \let\hnjmonofont\korsansfont - } - -%%% 사용자 명령 -%%% from here, Karnes writes: - -\RequirePackage{twoopt} -\newif\if@korfnt@external\@korfnt@externaltrue -\newif\if@XKOV@extendcommand\@XKOV@extendcommandfalse - -\let\XKOV@XP\expandafter - -%%%%%%%%%%%%%%%%%%%%%% main -%%% 아무래도 잊어버릴 듯해서... -%%% 다음 네 가지는 xetexko-font의 방식 -%%% \setkormainfont{FontName} -%%% \setkormainfont[Options]{FontName} -%%% \setkormainfont{FontName}[Hanja_Opt]{FontName} -%%% \setkormainfont[Options]{FontName}[Hanja_Opt]{FontName} -%%% xoblivoir 방식은 -%%% \setkormainfont*{FontName} -%%% \setkormainfont(Bold)(Italic){FontName} -%%% \setkormainfont*(Bold)(Italic){FontName} -%%% \setkormainfont(Bold)(Italic){FontName}(Bold)(Italic){FontName} -%%% \setkormainfont*(Bold)(Italic){FontName}(Bold)(Italic){FontName} -%%% (Bold)(Italic)은 optional. -%%% -\def\setkormainfont{% - \@ifnextchar[\setkormainATYPE{% - \@ifnextchar(\setkormainBTYPE{% - \@ifnextchar*\setkormainCTYPE\setkormainDTYPE}}% -} - -\def\setkormainATYPE[#1]#2{% - \gdef\@ATYPEopt@ne{#1}% - \gdef\@ATYPEarg@ne{#2}% - \@ifnextchar[\setkormainATYPEA\setkormainATYPEB -} - -\def\setkormainATYPEA[#1]#2{% - \XKOV@XP\setmainhangulfont\XKOV@XP[\@ATYPEopt@ne]{\@ATYPEarg@ne}% - \setmainhanjafont[#1]{#2}% -} - -\def\setkormainATYPEB{% - \XKOV@XP\setmainhangulfont\XKOV@XP[\@ATYPEopt@ne]{\@ATYPEarg@ne}% -} - -\def\setkormainDTYPE#1{% - \gdef\@ATYPEarg@ne{#1}% - \@ifnextchar[\setkormainDTYPEA\setkormainDTYPEB -} - -\def\setkormainDTYPEA[#1]#2{% - \setmainhangulfont{\@AgTYPEarg@ne}% - \setmainhanjafont[#1]{#2}% -} - -\def\setkormainDTYPEB{% - \setmainhangulfont{\@ATYPEarg@ne}% -} - -\def\setkormainBTYPE(#1){% - \long\gdef\@BTYPEopt@ne{#1}% - \@ifnextchar(\setkormainBTYPEA\setkormainBTYPEB -} - -\def\setkormainBTYPEA(#1)#2{% - \long\gdef\@BTYPEopttw@{#1}% - \long\gdef\@BTYPEarg@ne{#2}% - \@ifnextchar(\setkormainBTYPEC\setkormainBTYPED -} - -\def\setkormainBTYPEB#1{% - \gdef\@BTYPEarg@ne{#1}% - \@ifnextchar(\setkormainBTYPEBA\setkormainBTYPEBB -} - -\def\setkormainBTYPEBB{% - \s@tk@rm@inf@nt[\@BTYPEopt@ne]{\@BTYPEarg@ne}% -} - -\def\setkormainBTYPEBA({% - \@ifnextchar)\setkormainBTYPEBNO\setkormainBTYPEBYES -} - -\def\setkormainBTYPEBNO)#1{% - \s@tk@rm@inf@nt[\@BTYPEopt@ne]{\@BTYPEarg@ne}% - []{#1}% -} - -\def\setkormainBTYPEBYES#1){% - \gdef\@BTYPEoptthr@@{#1}% - \@ifnextchar(\setkormainBTYPEBE\setkormainBTYPEBF -} - -\def\setkormainBTYPEBE(#1)#2{% - \gdef\@BTYPEoptf@ur{#1}% - \s@tk@rm@inf@nt[\@BTYPEopt@ne]{\@BTYPEarg@ne}% - [\@BTYPEoptthr@@][\@BTYPEoptf@ur]{#2}% -} - -\def\setkormainBTYPEBF#1{% - \s@tk@rm@inf@nt[\@BTYPEopt@ne]{\@BTYPEarg@ne}% - [\@BTYPEoptthr@@]{#1}% -} - -\def\setkormainBTYPEC({% - \@ifnextchar)\setkormainBTYPECNO\setkormainBTYPECYES -} - -\def\setkormainBTYPED{% - \s@tk@rm@inf@nt[\@BTYPEopt@ne][\@BTYPEopttw@]{\@BTYPEarg@ne}% -} - -\def\setkormainBTYPECNO)#1{% - \s@tk@rm@inf@nt[\@BTYPEopt@ne][\@BTYPEopttw@]{\@BTYPEarg@ne}% - []{#1}% -} - -\def\setkormainBTYPECYES#1){% - \gdef\@BTYPEoptthr@@{#1}% - \@ifnextchar(\setkormainBTYPEE\setkormainBTYPEF -} - -\def\setkormainBTYPEE(#1)#2{% - \gdef\@BTYPEoptf@ur{#1}% - \s@tk@rm@inf@nt[\@BTYPEopt@ne][\@BTYPEopttw@]{\@BTYPEarg@ne}% - [\@BTYPEoptthr@@][\@BTYPEoptf@ur]{#2}% -} - -\def\setkormainBTYPEF#1{% - \s@tk@rm@inf@nt[\@BTYPEopt@ne][\@BTYPEopttw@]{\@BTYPEarg@ne}% - [\@BTYPEoptthr@@]{#1}% -} - -\def\setkormainCTYPE*{ - \@ifnextchar(\setkormainCTYPEALPHA\setkormainCTYPEBETA -} - -\def\setkormainCTYPEBETA#1{% - \s@tk@rm@inf@nt*{#1}% -} - -\def\setkormainCTYPEALPHA(#1){% - \gdef\@CTYPEopt@ne{#1}% - \@ifnextchar(\setkormainCTYPEA\setkormainCTYPEB -} - -\def\setkormainCTYPEA(#1)#2{% - \gdef\@CTYPEopttw@{#1}% - \gdef\@CTYPEarg@ne{#2}% - \@ifnextchar(\setkormainCTYPEC\setkormainCTYPED -} - -\def\setkormainCTYPEB#1{% - \gdef\@CTYPEarg@ne{#1}% - \@ifnextchar(\setkormainCTYPEBA\setkormainCTYPEBB -} - -\def\setkormainCTYPEBB{% - \s@tk@rm@inf@nt*[\@CTYPEopt@ne]{\@CTYPEarg@ne}% -} - -\def\setkormainCTYPEBA({% - \@ifnextchar)\setkormainCTYPEBNO\setkormainCTYPEBYES -} - -\def\setkormainCTYPEBNO)#1{% - \s@tk@rm@inf@nt*[\@CTYPEopt@ne]{\@CTYPEarg@ne}% - []{#1}% -} - -\def\setkormainCTYPEBYES#1){% - \gdef\@CTYPEoptthr@@{#1}% - \@ifnextchar(\setkormainCTYPEBE\setkormainCTYPEBF -} - -\def\setkormainCTYPEBE(#1)#2{% - \gdef\@CTYPEoptf@ur{#1}% - \s@tk@rm@inf@nt*[\@CTYPEopt@ne]{\@CTYPEarg@ne}% - [\@CTYPEoptthr@@][\@CTYPEoptf@ur]{#2}% -} - -\def\setkormainCTYPEBF#1{% - \s@tk@rm@inf@nt*[\@CTYPEopt@ne]{\@CTYPEarg@ne}% - [\@CTYPEoptthr@@]{#1}% -} - -\def\setkormainCTYPEC({% - \@ifnextchar)\setkormainCTYPECNO\setkormainCTYPECYES -} - -\def\setkormainCTYPED{% - \s@tk@rm@inf@nt*[\@CTYPEopt@ne][\@CTYPEopttw@]{\@CTYPEarg@ne}% -} - -\def\setkormainCTYPECNO)#1{% - \s@tk@rm@inf@nt*[\@CTYPEopt@ne][\@CTYPEopttw@]{\@CTYPEarg@ne}% - []{#1}% -} - -\def\setkormainCTYPECYES#1){% - \gdef\@CTYPEoptthr@@{#1}% - \@ifnextchar(\setkormainCTYPEE\setkormainCTYPEF -} - -\def\setkormainCTYPEE(#1)#2{% - \gdef\@CTYPEoptf@ur{#1}% - \s@tk@rm@inf@nt*[\@CTYPEopt@ne][\@CTYPEopttw@]{\@CTYPEarg@ne}% - [\@CTYPEoptthr@@][\@CTYPEoptf@ur]{#2}% -} - -\def\setkormainCTYPEF#1{% - \s@tk@rm@inf@nt*[\@CTYPEopt@ne][\@CTYPEopttw@]{\@CTYPEarg@ne}% - [\@CTYPEoptthr@@]{#1}% -} - -%%%%%%%%%%%%%%%%%%%%%%%% - -\def\setkorsansfont{% - \@ifnextchar[\setkorsansATYPE{% - \@ifnextchar(\setkorsansBTYPE{% - \@ifnextchar*\setkorsansCTYPE\setkorsansDTYPE}}% -} - -\def\setkorsansATYPE[#1]#2{% - \gdef\@ATYPEopt@ne{#1}% - \gdef\@ATYPEarg@ne{#2}% - \@ifnextchar[\setkorsansATYPEA\setkorsansATYPEB -} - -\def\setkorsansATYPEA[#1]#2{% - \XKOV@XP\setsanshangulfont\XKOV@XP[\@ATYPEopt@ne]{\@ATYPEarg@ne}% - \setsanshanjafont[#1]{#2}% -} - -\def\setkorsansATYPEB{% - \XKOV@XP\setsanshangulfont\XKOV@XP[\@ATYPEopt@ne]{\@ATYPEarg@ne}% -} - -\def\setkorsansDTYPE#1{% - \gdef\@ATYPEarg@ne{#1}% - \@ifnextchar[\setkorsansDTYPEA\setkorsansDTYPEB -} - -\def\setkorsansDTYPEA[#1]#2{% - \setsanshangulfont{\@ATYPEarg@ne}% - \setsanshanjafont[#1]{#2}% -} - -\def\setkorsansDTYPEB{% - \setsanshangulfont{\@ATYPEarg@ne}% -} - -\def\setkorsansBTYPE(#1){% - \long\gdef\@BTYPEopt@ne{#1}% - \@ifnextchar(\setkorsansBTYPEA\setkorsansBTYPEB -} - -\def\setkorsansBTYPEA(#1)#2{% - \long\gdef\@BTYPEopttw@{#1}% - \long\gdef\@BTYPEarg@ne{#2}% - \@ifnextchar(\setkorsansBTYPEC\setkorsansBTYPED -} - -\def\setkorsansBTYPEB#1{% - \gdef\@BTYPEarg@ne{#1}% - \@ifnextchar(\setkorsansBTYPEBA\setkorsansBTYPEBB -} - -\def\setkorsansBTYPEBB{% - \s@tk@rs@nsf@nt[\@BTYPEopt@ne]{\@BTYPEarg@ne}% -} - -\def\setkorsansBTYPEBA({% - \@ifnextchar)\setkorsansBTYPEBNO\setkorsansBTYPEBYES -} - -\def\setkorsansBTYPEBNO)#1{% - \s@tk@rs@nsf@nt[\@BTYPEopt@ne]{\@BTYPEarg@ne}% - []{#1}% -} - -\def\setkorsansBTYPEBYES#1){% - \gdef\@BTYPEoptthr@@{#1}% - \@ifnextchar(\setkorsansBTYPEBE\setkorsansBTYPEBF -} - -\def\setkorsansBTYPEBE(#1)#2{% - \gdef\@BTYPEoptf@ur{#1}% - \s@tk@rs@nsf@nt[\@BTYPEopt@ne]{\@BTYPEarg@ne}% - [\@BTYPEoptthr@@][\@BTYPEoptf@ur]{#2}% -} - -\def\setkorsansBTYPEBF#1{% - \s@tk@rs@nsf@nt[\@BTYPEopt@ne]{\@BTYPEarg@ne}% - [\@BTYPEoptthr@@]{#1}% -} - -\def\setkorsansBTYPEC({% - \@ifnextchar)\setkorsansBTYPECNO\setkorsansBTYPECYES -} - -\def\setkorsansBTYPED{% - \s@tk@rs@nsf@nt[\@BTYPEopt@ne][\@BTYPEopttw@]{\@BTYPEarg@ne}% -} - -\def\setkorsansBTYPECNO)#1{% - \s@tk@rs@nsf@nt[\@BTYPEopt@ne][\@BTYPEopttw@]{\@BTYPEarg@ne}% - []{#1}% -} - -\def\setkorsansBTYPECYES#1){% - \gdef\@BTYPEoptthr@@{#1}% - \@ifnextchar(\setkorsansBTYPEE\setkorsansBTYPEF -} - -\def\setkorsansBTYPEE(#1)#2{% - \gdef\@BTYPEoptf@ur{#1}% - \s@tk@rs@nsf@nt[\@BTYPEopt@ne][\@BTYPEopttw@]{\@BTYPEarg@ne}% - [\@BTYPEoptthr@@][\@BTYPEoptf@ur]{#2}% -} - -\def\setkorsansBTYPEF#1{% - \s@tk@rs@nsf@nt[\@BTYPEopt@ne][\@BTYPEopttw@]{\@BTYPEarg@ne}% - [\@BTYPEoptthr@@]{#1}% -} - -\def\setkorsansCTYPE*{ - \@ifnextchar(\setkorsansCTYPEALPHA\setkorsansCTYPEBETA -} - -\def\setkorsansCTYPEBETA#1{% - \s@tk@rs@nsf@nt*{#1}% -} - -\def\setkorsansCTYPEALPHA(#1){% - \gdef\@CTYPEopt@ne{#1}% - \@ifnextchar(\setkorsansCTYPEA\setkorsansCTYPEB -} - -\def\setkorsansCTYPEA(#1)#2{% - \gdef\@CTYPEopttw@{#1}% - \gdef\@CTYPEarg@ne{#2}% - \@ifnextchar(\setkorsansCTYPEC\setkorsansCTYPED -} - -\def\setkorsansCTYPEB#1{% - \gdef\@CTYPEarg@ne{#1}% - \@ifnextchar(\setkorsansCTYPEBA\setkorsansCTYPEBB -} - -\def\setkorsansCTYPEBB{% - \s@tk@rs@nsf@nt*[\@CTYPEopt@ne]{\@CTYPEarg@ne}% -} - -\def\setkorsansCTYPEBA({% - \@ifnextchar)\setkorsansCTYPEBNO\setkorsansCTYPEBYES -} - -\def\setkorsansCTYPEBNO)#1{% - \s@tk@rs@nsf@nt*[\@CTYPEopt@ne]{\@CTYPEarg@ne}% - []{#1}% -} - -\def\setkorsansCTYPEBYES#1){% - \gdef\@CTYPEoptthr@@{#1}% - \@ifnextchar(\setkorsansCTYPEBE\setkorsansCTYPEBF -} - -\def\setkorsansCTYPEBE(#1)#2{% - \gdef\@CTYPEoptf@ur{#1}% - \s@tk@rs@nsf@nt*[\@CTYPEopt@ne]{\@CTYPEarg@ne}% - [\@CTYPEoptthr@@][\@CTYPEoptf@ur]{#2}% -} - -\def\setkorsansCTYPEBF#1{% - \s@tk@rs@nsf@nt*[\@CTYPEopt@ne]{\@CTYPEarg@ne}% - [\@CTYPEoptthr@@]{#1}% -} - -\def\setkorsansCTYPEC({% - \@ifnextchar)\setkorsansCTYPECNO\setkorsansCTYPECYES -} - -\def\setkorsansCTYPED{% - \s@tk@rs@nsf@nt*[\@CTYPEopt@ne][\@CTYPEopttw@]{\@CTYPEarg@ne}% -} - -\def\setkorsansCTYPECNO)#1{% - \s@tk@rs@nsf@nt*[\@CTYPEopt@ne][\@CTYPEopttw@]{\@CTYPEarg@ne}% - []{#1}% -} - -\def\setkorsansCTYPECYES#1){% - \gdef\@CTYPEoptthr@@{#1}% - \@ifnextchar(\setkorsansCTYPEE\setkorsansCTYPEF -} - -\def\setkorsansCTYPEE(#1)#2{% - \gdef\@CTYPEoptf@ur{#1}% - \s@tk@rs@nsf@nt*[\@CTYPEopt@ne][\@CTYPEopttw@]{\@CTYPEarg@ne}% - [\@CTYPEoptthr@@][\@CTYPEoptf@ur]{#2}% -} - -\def\setkorsansCTYPEF#1{% - \s@tk@rs@nsf@nt*[\@CTYPEopt@ne][\@CTYPEopttw@]{\@CTYPEarg@ne}% - [\@CTYPEoptthr@@]{#1}% -} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\def\setkormonofont{% - \@ifnextchar[\setkormonoATYPE{% - \@ifnextchar(\setkormonoBTYPE{% - \@ifnextchar*\setkormonoCTYPE\setkormonoDTYPE}}% -} - -\def\setkormonoATYPE[#1]#2{% - \gdef\@ATYPEopt@ne{#1}% - \gdef\@ATYPEarg@ne{#2}% - \@ifnextchar[\setkormonoATYPEA\setkormonoATYPEB -} - -\def\setkormonoATYPEA[#1]#2{% - \XKOV@XP\setmonohangulfont\XKOV@XP[\@ATYPEopt@ne]{\@ATYPEarg@ne}% - \setmonohanjafont[#1]{#2}% -} - -\def\setkormonoATYPEB{% - \XKOV@XP\setmonohangulfont\XKOV@XP[\@ATYPEopt@ne]{\@ATYPEarg@ne}% -} - -\def\setkormonoDTYPE#1{% - \gdef\@ATYPEarg@ne{#1}% - \@ifnextchar[\setkormonoDTYPEA\setkormonoDTYPEB -} - -\def\setkormonoDTYPEA[#1]#2{% - \setmonohangulfont{\@ATYPEarg@ne}% - \setmonohanjafont[#1]{#2}% -} - -\def\setkormonoDTYPEB{% - \setmonohangulfont{\@ATYPEarg@ne}% -} - -\def\setkormonoBTYPE(#1){% - \long\gdef\@BTYPEopt@ne{#1}% - \@ifnextchar(\setkormonoBTYPEA\setkormonoBTYPEB -} - -\def\setkormonoBTYPEA(#1)#2{% - \long\gdef\@BTYPEopttw@{#1}% - \long\gdef\@BTYPEarg@ne{#2}% - \@ifnextchar(\setkormonoBTYPEC\setkormonoBTYPED -} - -\def\setkormonoBTYPEB#1{% - \gdef\@BTYPEarg@ne{#1}% - \@ifnextchar(\setkormonoBTYPEBA\setkormonoBTYPEBB -} - -\def\setkormonoBTYPEBB{% - \s@tk@rm@n@f@nt[\@BTYPEopt@ne]{\@BTYPEarg@ne}% -} - -\def\setkormonoBTYPEBA({% - \@ifnextchar)\setkormonoBTYPEBNO\setkormonoBTYPEBYES -} - -\def\setkormonoBTYPEBNO)#1{% - \s@tk@rm@n@f@nt[\@BTYPEopt@ne]{\@BTYPEarg@ne}% - []{#1}% -} - -\def\setkormonoBTYPEBYES#1){% - \gdef\@BTYPEoptthr@@{#1}% - \@ifnextchar(\setkormonoBTYPEBE\setkormonoBTYPEBF -} - -\def\setkormonoBTYPEBE(#1)#2{% - \gdef\@BTYPEoptf@ur{#1}% - \s@tk@rm@n@f@nt[\@BTYPEopt@ne]{\@BTYPEarg@ne}% - [\@BTYPEoptthr@@][\@BTYPEoptf@ur]{#2}% -} - -\def\setkormonoBTYPEBF#1{% - \s@tk@rm@n@f@nt[\@BTYPEopt@ne]{\@BTYPEarg@ne}% - [\@BTYPEoptthr@@]{#1}% -} - -\def\setkormonoBTYPEC({% - \@ifnextchar)\setkormonoBTYPECNO\setkormonoBTYPECYES -} - -\def\setkormonoBTYPED{% - \s@tk@rm@n@f@nt[\@BTYPEopt@ne][\@BTYPEopttw@]{\@BTYPEarg@ne}% -} - -\def\setkormonoBTYPECNO)#1{% - \s@tk@rm@n@f@nt[\@BTYPEopt@ne][\@BTYPEopttw@]{\@BTYPEarg@ne}% - []{#1}% -} - -\def\setkormonoBTYPECYES#1){% - \gdef\@BTYPEoptthr@@{#1}% - \@ifnextchar(\setkormonoBTYPEE\setkormonoBTYPEF -} - -\def\setkormonoBTYPEE(#1)#2{% - \gdef\@BTYPEoptf@ur{#1}% - \s@tk@rm@n@f@nt[\@BTYPEopt@ne][\@BTYPEopttw@]{\@BTYPEarg@ne}% - [\@BTYPEoptthr@@][\@BTYPEoptf@ur]{#2}% -} - -\def\setkormonoBTYPEF#1{% - \s@tk@rm@n@f@nt[\@BTYPEopt@ne][\@BTYPEopttw@]{\@BTYPEarg@ne}% - [\@BTYPEoptthr@@]{#1}% -} - -\def\setkormonoCTYPE*{ - \@ifnextchar(\setkormonoCTYPEALPHA\setkormonoCTYPEBETA -} - -\def\setkormonoCTYPEBETA#1{% - \s@tk@rm@n@f@nt*{#1}% -} - -\def\setkormonoCTYPEALPHA(#1){% - \gdef\@CTYPEopt@ne{#1}% - \@ifnextchar(\setkormonoCTYPEA\setkormonoCTYPEB -} - -\def\setkormonoCTYPEA(#1)#2{% - \gdef\@CTYPEopttw@{#1}% - \gdef\@CTYPEarg@ne{#2}% - \@ifnextchar(\setkormonoCTYPEC\setkormonoCTYPED -} - -\def\setkormonoCTYPEB#1{% - \gdef\@CTYPEarg@ne{#1}% - \@ifnextchar(\setkormonoCTYPEBA\setkormonoCTYPEBB -} - -\def\setkormonoCTYPEBB{% - \s@tk@rm@n@f@nt*[\@CTYPEopt@ne]{\@CTYPEarg@ne}% -} - -\def\setkormonoCTYPEBA({% - \@ifnextchar)\setkormonoCTYPEBNO\setkormonoCTYPEBYES -} - -\def\setkormonoCTYPEBNO)#1{% - \s@tk@rm@n@f@nt*[\@CTYPEopt@ne]{\@CTYPEarg@ne}% - []{#1}% -} - -\def\setkormonoCTYPEBYES#1){% - \gdef\@CTYPEoptthr@@{#1}% - \@ifnextchar(\setkormonoCTYPEBE\setkormonoCTYPEBF -} - -\def\setkormonoCTYPEBE(#1)#2{% - \gdef\@CTYPEoptf@ur{#1}% - \s@tk@rm@n@f@nt*[\@CTYPEopt@ne]{\@CTYPEarg@ne}% - [\@CTYPEoptthr@@][\@CTYPEoptf@ur]{#2}% -} - -\def\setkormonoCTYPEBF#1{% - \s@tk@rm@n@f@nt*[\@CTYPEopt@ne]{\@CTYPEarg@ne}% - [\@CTYPEoptthr@@]{#1}% -} - -\def\setkormonoCTYPEC({% - \@ifnextchar)\setkormonoCTYPECNO\setkormonoCTYPECYES -} - -\def\setkormonoCTYPED{% - \s@tk@rm@n@f@nt*[\@CTYPEopt@ne][\@CTYPEopttw@]{\@CTYPEarg@ne}% -} - -\def\setkormonoCTYPECNO)#1{% - \s@tk@rm@n@f@nt*[\@CTYPEopt@ne][\@CTYPEopttw@]{\@CTYPEarg@ne}% - []{#1}% -} - -\def\setkormonoCTYPECYES#1){% - \gdef\@CTYPEoptthr@@{#1}% - \@ifnextchar(\setkormonoCTYPEE\setkormonoCTYPEF -} - -\def\setkormonoCTYPEE(#1)#2{% - \gdef\@CTYPEoptf@ur{#1}% - \s@tk@rm@n@f@nt*[\@CTYPEopt@ne][\@CTYPEopttw@]{\@CTYPEarg@ne}% - [\@CTYPEoptthr@@][\@CTYPEoptf@ur]{#2}% -} - -\def\setkormonoCTYPEF#1{% - \s@tk@rm@n@f@nt*[\@CTYPEopt@ne][\@CTYPEopttw@]{\@CTYPEarg@ne}% - [\@CTYPEoptthr@@]{#1}% -} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\if@unfonts - \def\UnBatang{UnBatang} - \def\UnBatangBold{UnBatang-Bold} - \def\UnDotum{UnDotum} - \def\UnDotumBold{UnDotum-Bold} - \def\UnTaza{UnTaza} -\else -\if@nanumfonts - \setmainhangulfont{NanumMyeongjo} - \setsanshangulfont{NanumGothic} - \setmonohangulfont{NanumGothic} -\fi -\fi - -\def\s@tk@rm@inf@nt{% - \@ifnextchar*\s@setk@rmainf@nt\l@setk@rmainf@nt -} -\def\s@setk@rmainf@nt*{\SETKORMAINFONTEL} -\def\l@setk@rmainf@nt{\SETKORMAINFONT} - -\def\NOEXTSETKORMAINFONT{% - \let\hnjmainfont\kormainfont -} - -\def\RESstar{*} - -\newcommandtwoopt{\SETKORMAINFONTEL}[3][][]{% - \def\XKOV@externallocation{ExternalLocation}% - \@korfnt@externaltrue - \def\XKOV@kormain@regular{#3}% - \def\XKOV@kormain@bold{#1}% - \ifx#2\RESstar - \def\XKOV@kormain@italic{#3}% - \else - \def\XKOV@kormain@italic{#2}% - \fi - \def\XKOV@kormain@bolditalic{#2}% - \CallKorFont{main}% - \@korfnt@externaltrue - \@ifnextchar[\EXTSETKORMAINFONTEL\NOEXTSETKORMAINFONT -} - -\newcommandtwoopt{\EXTSETKORMAINFONTEL}[3][][]{% - \def\XKOV@externallocation{ExternalLocation}% - \@korfnt@externaltrue - \def\XKOV@hnjmain@regular{#3}% - \def\XKOV@hnjmain@bold{#1}% - \ifx#2\RESstar - \def\XKOV@hnjmain@italic{#3}% - \else - \def\XKOV@hnjmain@italic{#2}% - \fi - \def\XKOV@hnjmain@bolditalic{#2}% - \CallHnjFont{main}% - \@XKOV@extendcommandfalse -} - -\newcommandtwoopt{\SETKORMAINFONT}[3][][]{% - \def\XKOV@externallocation{}% - \@korfnt@externalfalse - \def\XKOV@kormain@regular{#3}% - \def\XKOV@kormain@bold{#1}% - \ifx#2\RESstar - \def\XKOV@kormain@italic{#3}% - \else - \def\XKOV@kormain@italic{#2}% - \fi - \def\XKOV@kormain@bolditalic{#2}% - \CallKorFont{main}% - \@korfnt@externaltrue - \@ifnextchar[\EXTSETKORMAINFONT\NOEXTSETKORMAINFONT -} - -\newcommandtwoopt{\EXTSETKORMAINFONT}[3][][]{% - \def\XKOV@externallocation{}% - \@korfnt@externalfalse - \def\XKOV@hnjmain@regular{#3}% - \def\XKOV@hnjmain@bold{#1}% - \ifx#2\RESstar - \def\XKOV@hnjmain@italic{#3}% - \else - \def\XKOV@hnjmain@italic{#2}% - \fi - \def\XKOV@hnjmain@bolditalic{#2}% - \CallHnjFont{main}% - \@XKOV@extendcommandfalse -} - -%%%%%%%%%%%%%%%%%%%%%%% sans - -\def\s@tk@rs@nsf@nt{% - \@ifnextchar*\s@setk@rsansf@nt\l@setk@rsansf@nt -} -\def\s@setk@rsansf@nt*{\SETKORSANSFONTEL} -\def\l@setk@rsansf@nt{\SETKORSANSFONT} - -\newcommandtwoopt{\SETKORSANSFONTEL}[3][][]{% - \def\XKOV@externallocation{ExternalLocation}% - \@korfnt@externaltrue - \def\XKOV@korsans@regular{#3}% - \def\XKOV@korsans@bold{#1}% - \ifx#2\RESstar - \def\XKOV@korsans@italic{#3}% - \else - \def\XKOV@korsans@italic{#2}% - \fi - \def\XKOV@korsans@bolditalic{#2}% - \CallKorFont{sans}% - \@korfnt@externaltrue - \@ifnextchar[\EXTSETKORSANSFONTEL\NOEXTSETKORSANSFONT -} - -\newcommandtwoopt{\EXTSETKORSANSFONTEL}[3][][]{% - \def\XKOV@externallocation{ExternalLocation}% - \@korfnt@externaltrue - \def\XKOV@hnjsans@regular{#3}% - \def\XKOV@hnjsans@bold{#1}% - \ifx#2\RESstar - \def\XKOV@hnjsans@italic{#3}% - \else - \def\XKOV@hnjsans@italic{#2}% - \fi - \def\XKOV@hnjsans@bolditalic{#2}% - \CallHnjFont{sans}% - \@XKOV@extendcommandfalse -} - -\newcommandtwoopt{\SETKORSANSFONT}[3][][]{% - \def\XKOV@externallocation{}% - \@korfnt@externalfalse - \def\XKOV@korsans@regular{#3}% - \def\XKOV@korsans@bold{#1}% - \ifx#2\RESstar - \def\XKOV@korsans@italic{#3}% - \else - \def\XKOV@korsans@italic{#2}% - \fi - \def\XKOV@korsans@bolditalic{#2}% - \CallKorFont{sans}% - \@korfnt@externaltrue - \@ifnextchar[\EXTSETKORSANSFONT\NOEXTSETKORSANSFONT -} - -\newcommandtwoopt{\EXTSETKORSANSFONT}[3][][]{% - \def\XKOV@externallocation{}% - \@korfnt@externalfalse - \def\XKOV@hnjsans@regular{#3}% - \def\XKOV@hnjsans@bold{#1}% - \ifx#2\RESstar - \def\XKOV@hnjsans@italic{#3}% - \else - \def\XKOV@hnjsans@italic{#2}% - \fi - \def\XKOV@hnjsans@bolditalic{#2}% - \CallHnjFont{sans}% - \@XKOV@extendcommandfalse -} - -\def\NOEXTSETKORSANSFONT{% - \let\hnjsansfont\korsansfont -} - -%%%%%%%%%%%%%%%%%%%%%%% mono - -\def\s@tk@rm@n@f@nt{% - \@ifnextchar*\s@setk@rmonof@nt\l@setk@rmonof@nt -} -\def\s@setk@rmonof@nt*{\SETKORMONOFONTEL} -\def\l@setk@rmonof@nt{\SETKORMONOFONT} - -\newcommandtwoopt{\SETKORMONOFONTEL}[3][][]{% - \def\XKOV@externallocation{ExternalLocation}% - \@korfnt@externaltrue - \def\XKOV@kormono@regular{#3}% - \def\XKOV@kormono@bold{#1}% - \def\XKOV@kormono@italic{#2}% - \def\XKOV@kormono@bolditalic{#2}% - \CallKorFontmono% - \@korfnt@externaltrue - \@ifnextchar[\EXTSETKORMONOFONTEL\NOEXTSETKORMONOFONT -} - -\newcommandtwoopt{\EXTSETKORMONOFONTEL}[3][][]{% - \setmonoscale{1.0}% - \def\XKOV@externallocation{ExternalLocation}% - \@korfnt@externaltrue - \def\XKOV@hnjmono@regular{#3}% - \def\XKOV@hnjmono@bold{#1}% - \def\XKOV@hnjmono@italic{#2}% - \def\XKOV@hnjmono@bolditalic{#2}% - \CallHnjFontmono% - \@XKOV@extendcommandfalse -} - -\newcommandtwoopt{\SETKORMONOFONT}[3][][]{% - \def\XKOV@externallocation{}% - \@korfnt@externalfalse - \def\XKOV@kormono@regular{#3}% - \def\XKOV@kormono@bold{#1}% - \def\XKOV@kormono@italic{#2}% - \def\XKOV@kormono@bolditalic{#2}% - \CallKorFontmono% - \@korfnt@externaltrue - \@ifnextchar[\EXTSETKORMONOFONT\NOEXTSETKORMONOFONT -} - -\newcommandtwoopt{\EXTSETKORMONOFONT}[3][][]{% - \setmonoscale{1.0}% - \def\XKOV@externallocation{}% - \@korfnt@externalfalse - \def\XKOV@hnjmono@regular{#3}% - \def\XKOV@hnjmono@bold{#1}% - \def\XKOV@hnjmono@italic{#2}% - \def\XKOV@hnjmono@bolditalic{#2}% - \CallHnjFontmono% - \@XKOV@extendcommandfalse -} - -\def\NOEXTSETKORMONOFONT{% - \let\hnjmonofont\korsansfont -} - -%% dummy call -\def\SetDefaultKorFonts{% -\if@unfonts -\if@korfnt@external - \ifx\XKOV@kormain@regular\undefined\def\XKOV@kormain@regular{UnBatang}\fi - \ifx\XKOV@kormain@bold\undefined\def\XKOV@kormain@bold{UnBatangBold}\fi - \ifx\XKOV@kormain@italic\undefined\def\XKOV@kormain@italic{UnBatang}\fi - \ifx\XKOV@kormain@bolditalic\undefined\def\XKOV@kormain@bolditalic{UnBatangBold}\fi - \ifx\XKOV@korsans@regular\undefined\def\XKOV@korsans@regular{UnDotum}\fi - \ifx\XKOV@korsans@bold\undefined\def\XKOV@korsans@bold{UnDotumBold}\fi - \ifx\XKOV@korsans@italic\undefined\def\XKOV@korsans@italic{UnDotum}\fi - \ifx\XKOV@korsans@bolditalic\undefined\def\XKOV@korsans@bolditalic{UnDotumBold}\fi - \ifx\XKOV@kormono@regular\undefined\def\XKOV@kormono@regular{UnTaza}\fi - \ifx\XKOV@kormono@bold\undefined\def\XKOV@kormono@bold{UnTaza}\fi - \ifx\XKOV@kormono@italic\undefined\def\XKOV@kormono@italic{UnTaza}\fi - \ifx\XKOV@kormono@bolditalic\undefined\def\XKOV@kormono@bolditalic{UnTaza}\fi -\else - \ifx\XKOV@kormain@regular\undefined\def\XKOV@kormain@regular{\UnBatang}\fi - \ifx\XKOV@kormain@bold\undefined\def\XKOV@kormain@bold{\UnBatangBold}\fi - \ifx\XKOV@kormain@italic\undefined\def\XKOV@kormain@italic{\UnBatang}\fi - \ifx\XKOV@kormain@bolditalic\undefined\def\XKOV@kormain@bolditalic{\UnBatangBold}\fi - \ifx\XKOV@korsans@regular\undefined\def\XKOV@korsans@regular{\UnDotum}\fi - \ifx\XKOV@korsans@bold\undefined\def\XKOV@korsans@bold{\UnDotumBold}\fi - \ifx\XKOV@korsans@italic\undefined\def\XKOV@korsans@italic{\UnDotum}\fi - \ifx\XKOV@korsans@bolditalic\undefined\def\XKOV@korsans@bolditalic{\UnDotumBold}\fi - \ifx\XKOV@kormono@regular\undefined\def\XKOV@kormono@regular{\UnTaza}\fi - \ifx\XKOV@kormono@bold\undefined\def\XKOV@kormono@bold{\UnTaza}\fi - \ifx\XKOV@kormono@italic\undefined\def\XKOV@kormono@italic{\UnTaza}\fi - \ifx\XKOV@kormono@bolditalic\undefined\def\XKOV@kormono@bolditalic{\UnTaza}\fi -\fi -\else\fi -} - -%%% dummy declaration, to avoid errors! -\if@unfonts -\s@tk@rm@inf@nt*{UnBatang} -\s@tk@rs@nsf@nt*{UnDotum} -\s@tk@rm@n@f@nt*{UnTaza} -\CallHnjDefault -\else -%\input TnX-xob-default.tex -\fi - -\AtBeginDocument{ - \ifx\XKOV@externallocation\undefined\def\XKOV@externallocation{ExternalLocation}\@korfnt@externaltrue\fi -%% \SetDefaultKorFonts -%% \CallKorFont{main}% -%% \CallKorFont{sans}% -%% \CallKorFontmono -} - -\endinput - -%%% 2014-05-12 : disable "223C assignment -%%% 2013-09-27 : nounfonts set to default. -%%% 2012-12-31 : [unfonts], [nounfonts] -%%% 오전 1:21 2008-10-13 : xetexko-xobfont 작성 -%%% 오전 12:12 2008-11-09 : \setkor...font 명령 재작성 -%%% 오후 17:59 2008-12-02 : nowinname 옵션 추가 -%%% 오후 22:05 2008-12-02 : Italic 옵션에 (*) 추가 -%%% 오전 04:04 2008-12-08 : \XKOV@XP -%%% 오전 1:18 2009-08-25 : sans/mono bug fixed (thanks to DH Kim and YW Kim) -%%% 오전 12:22 2009-10-13 : 따옴표 설정을 xetexko에게. diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xob-dotemph.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xob-dotemph.sty index e2997e94746..87285578b27 100644 --- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xob-dotemph.sty +++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xob-dotemph.sty @@ -1,6 +1,6 @@ %% xob-dotemph.sty %% -%% Copyright (c) 2007-2013 Kangsoo Kim +%% Copyright (c) 2007-2014 Kangsoo Kim %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -11,13 +11,14 @@ %% version 2006/05/20 or later. %% %% xob-dotemph +%% 2014-06-15, \useremph redefined %% 2014-04-29 %% 2010-03-18 %% 오전 9:01 2008-10-22 %% xetexko-dotemph의 확장 %% dhucs/hangul compatible (\dotemph, \circemph, \useremph) %% ---------- -%% \useremph is different from xetexko's \useremph *** +%% \useremph is different from kotex-utf's \useremph *** %% %% Updated for xetexko v2.1 %% Kihwang Lee @@ -30,28 +31,45 @@ \endgroup } -\def\dhucs@useremph#1{\begingroup +\def\xob@useremph#1{\begingroup \let\dotemphchar\useremphchar \let\dotemphraise\useremphraisedim \dotemph{#1}\endgroup} -\protected\def\useremph{% - \@ifnextchar[\@user@emph{% - \@ifnextchar*\@orig@useremph\@@user@emph}% -} +%%%%% 2014/06/15 +%%%%% \useremph[dim][char]{letter} +%%%%% +\RequirePackage{xparse} -\def\@orig@useremph*#1{\dhucs@useremph{#1}} +\ExplSyntaxOn -\def\@user@emph[#1]#2#3{% - \def\useremphchar{#2}% - \def\useremphraisedim{#1}% - \dhucs@useremph{#3}% -} +\dim_new:N \useremphraisedim \dim_set:Nn \useremphraisedim { 1ex } +\tl_set:Nn \useremphchar { ^^^^02da } -\def\@@user@emph#1#2{% - \def\useremphchar{#1}% - \def\useremphraisedim{6pt}% - \dhucs@useremph{#2}% +\DeclareDocumentCommand \useremph { o o m } +{ + \IfValueT { #1 } + { + \tl_if_empty:nF { #1 } + { + \settoheight \useremphraisedim { #3 } + \dim_add:Nn \useremphraisedim { #1 } + } + } + + \IfValueT { #2 } + { + \tl_if_empty:nF { #2 } + { + \tl_set:Nn \useremphchar { #2 } + } + } + \xob@useremph { #3 } } +\ExplSyntaxOff + +\def\useremphstarblack{\tiny★} +\def\useremphstarwhite{\tiny☆} + \endinput diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xob-font.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xob-font.sty new file mode 100644 index 00000000000..fa9bf736cf2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xob-font.sty @@ -0,0 +1,678 @@ +%% xob-font.sty +%% +%% Copyright (c) 2014 Kangsoo Kim +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3c +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3c or later is part of all distributions of LaTeX +%% version 2006/05/20 or later. +%% +%% +%% oblivoir hangul/hanja font setting. +%% part of oblivoir +%% +\ProvidesPackage{xob-font}[2014/06/24 v0.6 select hangul/hanja fonts for oblivoir] + +%%% obsolete options: retain \if@.. conditions for backward compatibility +\newif\if@nowin\@nowinfalse +\newif\if@latinquote\@latinquotefalse +\newif\if@unfont\@unfontfalse +\DeclareOption{nowinname}{} +\DeclareOption{latinquote}{} +\DeclareOption{unfonts}{\@unfonttrue} +\DeclareOption{nounfonts}{\@unfontfalse} + +%%% active optoins +\newif\if@oldhangul\@oldhangulfalse +\DeclareOption{oldhangul}{\@oldhangultrue} +\newif\if@gremph\@gremphtrue +\DeclareOption{gremph}{\@gremphtrue} +\DeclareOption{itemph}{\@gremphfalse} + +\newif\if@nanumfonts\@nanumfontsfalse +\newif\if@nanumxfonts\@nanumxfontsfalse +\DeclareOption{nanum}{\@nanumfontstrue} +\DeclareOption{nanumx}{\@nanumfontstrue\@nanumxfontstrue} +\newif\if@hcrfonts\@hcrfontsfalse +\DeclareOption{hcr}{\@hcrfontstrue\@oldhangultrue} + +\ProcessOptions +\relax + +\RequirePackage{xparse} +\@ifclassloaded{oblivoir}{}{% + \RequirePackage{fontspec} + \RequirePackage{kotex} +} + +\ExplSyntaxOn + +\xetex_if_engine:T +{ + \RequirePackage{xetexko-space} + \RequirePackage{xetexko-font} +} + +\if@gremph \bool_set_false:N \ital_fake_bool \else \bool_set_true:N \ital_fake_bool \fi +\if@oldhangul \bool_set_true:N \hangulscript_bool \else \bool_set_false:N \hangulscript_bool \fi + +\bool_set_false:N \bold_prov_bool +\bool_set_false:N \in_hanja_mode +\bool_set_false:N \mono_mode + +\DeclareDocumentCommand \setmonoscale { m } +{ + \tl_set:Nn \_mono_scale { #1 } +} + +\setmonoscale{0.95} + +\DeclareDocumentCommand \treat_feature_name_options { d() d() m o } +{ + \tl_set:Nn \_regu_font_name { #3 } + + \IfValueTF { #1 } + { + \tl_set:Nn \_bold_font_name { #1 } \bool_set_true:N \bold_prov_bool + } + { + \tl_clear:N \_bold_font_name \bool_set_false:N \bold_prov_bool + } + + \IfValueTF { #2 } + { + \tl_if_eq:nnTF { #2 } { * } + { \tl_set_eq:NN \_ital_font_name \_regu_font_name } + { \tl_set:Nn \_ital_font_name { #2 } } + } + { + \tl_set_eq:NN \_ital_font_name \_regu_font_name + } + \IfValueTF { #4 } + { \tl_set:Nn \_additional_feature_str { #4 } } + { \tl_clear:N \_additional_feature_str } + + \bool_if:nTF { \mono_mode || \in_hanja_mode } + { + \tl_clear:N \_font_feature_str + } + { + \tl_set:Nn \_font_feature_str { Ligatures = TeX, } + } + + \bool_if:nT \ital_fake_bool + { + \tl_if_eq:NNTF \_ital_font_name \_regu_font_name + { + \tl_put_right:Nn \_font_feature_str { AutoFakeSlant, } + } + { + \tl_put_right:Nn \_font_feature_str { ItalicFeatures = { FakeSlant = { 0.15 } }, } + } + \tl_put_right:Nn \_font_feature_str { BoldItalicFeatures = { FakeSlant = { 0.15 } }, } + } + + \bool_if:nT \bold_prov_bool + { + \tl_put_right:Nn \_font_feature_str { BoldFont = \_bold_font_name, + BoldItalicFont = \_bold_font_name, + ItalicFont = \_ital_font_name, } + } + + \bool_if:nF \in_hanja_mode + { + \bool_if:nT \hangulscript_bool + { \tl_put_right:Nn \_font_feature_str { Script = Hangul, } } + } + + \bool_if:nT \mono_mode + { + \tl_put_right:Nn \_font_feature_str { Scale = \_mono_scale, } + } +} + +\DeclareDocumentCommand \set_kor_sub_hanja_font { m d() d() m o } +{ + \bool_set_true:N \in_hanja_mode +% \treat_feature_name_options ( #2 ) ( #3 ) { #4 } [ #5 ] + \IfValueTF { #2 } + { + \IfValueTF { #3 } + { + \treat_feature_name_options ( #2 ) ( #3 ) { #4 } [ #5 ] + } + { + \treat_feature_name_options ( #2 ) { #4 } [ #5 ] + } + } + { + \treat_feature_name_options { #4 } [ #5 ] + } + \setmainhanjafont [ \_font_feature_str, \_additional_feature_str ] { \_regu_font_name } + + \luatex_if_engine:T + { + \tl_if_exist:NT \hanjabyhanjafont + { + \AtBeginDocument { \hanjabyhanjafont 1 } + } + } +} + +\DeclareDocumentCommand \setkorfont { m d() d() m o d() } +{ + \bool_set_false:N \in_hanja_mode + + \str_if_eq:nnTF { #1 } { mono } + { \bool_set_true:N \mono_mode } + { \bool_set_false:N \mono_mode } + + %%% when regular fontname contains "HCR", input [ Script=Hangul ] to font features. + \tl_if_in:nnT { #4 } { HCR } + { \bool_set_true:N \hangulscript_bool } + \tl_if_in:nnT { #4 } { hcr } + { \bool_set_true:N \hangulscript_bool } +% \tl_if_in:nnT { #4 } { HAN } +% { \bool_set_true:N \hangulscript_bool } + %%% the following three \tl_if_in's for \setkomainfont + \tl_if_in:NnT { #4 } { HCR } + { \bool_set_true:N \hangulscript_bool } + \tl_if_in:NnT { #4 } { hcr } + { \bool_set_true:N \hangulscript_bool } +% \tl_if_in:NnT { #4 } { HAN } +% { \bool_set_true:N \hangulscript_bool } + + \IfValueTF { #2 } + { + \IfValueTF { #3 } + { + \treat_feature_name_options ( #2 ) ( #3 ) { #4 } [ #5 ] + } + { + \treat_feature_name_options ( #2 ) { #4 } [ #5 ] + } + } + { + \treat_feature_name_options { #4 } [ #5 ] + } + + \cs:w set #1 hangulfont \cs_end: + [ \_font_feature_str, \_additional_feature_str ] { \_regu_font_name } + + %%% \set_kor_sub_hanja_font will take more optional arguments, + %%% hence, this codes have to be located at the end of code block. + \IfValueT { #6 } + { + \set_kor_sub_hanja_font { #1 } ( #6 ) + } +} + +%%% new \setko(main|sans|mono)font +%\bool_new:N \setko_bold_process \bool_set_false:N \setko_bold_process + +\NewDocumentCommand \process_set_korob_hanja { m o d() d() d() o } +{ + \IfValueTF { #2 } + { + \tl_set:Nn \ko_hanja_base_font_name { #2 } + \tl_set_eq:NN \ko_hanja_regu_font_name \ko_hanja_base_font_name + \tl_put_right:Nn \ko_hanja_regu_font_name { #3 } + \IfValueTF { #4 } + { + \tl_if_empty:nTF { #4 } + { + \tl_set_eq:NN \ko_hanja_bold_font_name \ko_hanja_regu_font_name + } + { + \tl_set_eq:NN \ko_hanja_bold_font_name \ko_hanja_base_font_name + \tl_put_right:Nn \ko_hanja_bold_font_name { #4 } + } + \bool_set_false:N \setko_hanja_bold_process + } + { +% \tl_clear:N \ko_hanja_bold_font_name + \bool_set_true:N \setko_hanja_bold_process + } + \IfValueTF { #5 } + { + \tl_if_empty:nTF { #5 } + { + \tl_set_eq:NN \ko_hanja_ital_font_name \ko_hanja_regu_font_name + } + { + \tl_set_eq:NN \ko_hanja_ital_font_name \ko_hanja_base_font_name + \tl_put_right:Nn \ko_hanja_ital_font_name { #5 } + } + } + { + \tl_set_eq:NN \ko_hanja_ital_font_name \ko_hanja_regu_font_name + } + } + { + \tl_clear:N \ko_hanja_base_font_name + \tl_set:Nn \ko_hanja_regu_font_name { #3 } + + \IfValueTF { #4 } + { + \tl_set:Nn \ko_hanja_bold_font_name { #4 } + \bool_set_false:N \setko_hanja_bold_process + } + { +% \tl_clear:N \ko_hanja_bold_font_name + \bool_set_true:N \setko_hanja_bold_process + } + + \IfValueTF { #5 } + { + \tl_set:Nn \ko_hanja_ital_font_name { #5 } + } + { + \tl_set_eq:NN \ko_hanja_ital_font_name \ko_hanja_regu_font_name + } + } + + \IfValueTF { #6 } + { + \tl_set:Nn \ko_hanja_features { #6 } + } + { + \tl_clear:N \ko_hanja_features + } + + \bool_if:nTF \setko_bold_process + { + \bool_if:nTF \setko_hanja_bold_process + { + \cs:w setkor #1 font \cs_end: + { \ko_regu_font_name } + [ \ko_features ] + \bool_if:nTF \ital_fake_bool + { + \cs:w set #1 hanjafont \cs_end: + [ \ko_hanja_features, AutoFakeSlant, BoldItalicFeatures={FakeSlant={0.15}} ] + { \ko_hanja_regu_font_name } + } + { + \cs:w set #1 hanjafont \cs_end: + [ \ko_hanja_features ] + { \ko_hanja_regu_font_name } + } + } + { + \cs:w setkor #1 font \cs_end: + { \ko_regu_font_name } + [ \ko_features ] + ( \ko_hanja_bold_font_name ) + ( \ko_hanja_ital_font_name ) + { \ko_hanja_regu_font_name } + [ \ko_hanja_features ] + } + } + { + \bool_if:nTF \setko_hanja_bold_process + { + \cs:w setkor #1 font \cs_end: + ( \ko_bold_font_name ) + ( \ko_ital_font_name ) + { \ko_regu_font_name } + \bool_if:nTF \ital_fake_bool + { + \cs:w set #1 hanjafont \cs_end: + [ \ko_hanja_features, AutoFakeSlant, BoldItalicFeatures={FakeSlant={0.15}} ] + { \ko_hanja_regu_font_name } + } + { + \cs:w set #1 hanjafont \cs_end: + [ \ko_hanja_features ] + { \ko_hanja_regu_font_name } + } + } + { + \cs:w setkor #1 font \cs_end: + ( \ko_bold_font_name ) + ( \ko_ital_font_name ) + { \ko_regu_font_name } + [ \ko_features ] + ( \ko_hanja_bold_font_name ) + ( \ko_hanja_ital_font_name ) + { \ko_hanja_regu_font_name } + [ \ko_hanja_features ] + } + } + + \luatex_if_engine:T + { + \tl_if_exist:NT \hanjabyhanjafont + { + \AtBeginDocument { \hanjabyhanjafont 1 } + } + } +} + +\NewDocumentCommand \process_korob_only_hangul { m } +{ + \bool_if:nTF \setko_bold_process + { + \cs:w setkor #1 font \cs_end: + { \ko_regu_font_name } + [ \ko_features ] + } + { + \cs:w setkor #1 font \cs_end: + ( \ko_bold_font_name ) + ( \ko_ital_font_name ) + { \ko_regu_font_name } + [ \ko_features ] + } +} + +\DeclareDocumentCommand \setkorfontxob { m o d() d() d() o o d() } +{ + \IfValueTF { #2 } + { \tl_set:Nn \ko_base_font_name { #2 } + \tl_set_eq:NN \ko_regu_font_name \ko_base_font_name + \tl_put_right:Nn \ko_regu_font_name { #3 } + \IfValueTF { #4 } + { + \tl_if_empty:nTF { #4 } + { + \tl_set_eq:NN \ko_bold_font_name \ko_regu_font_name + } + { + \tl_set_eq:NN \ko_bold_font_name \ko_base_font_name + \tl_put_right:Nn \ko_bold_font_name { #4 } + } + \bool_set_false:N \setko_bold_process + } + { +% \tl_set_eq:NN \ko_bold_font_name \ko_regu_font_name + \bool_set_true:N \setko_bold_process + } + \IfValueTF { #5 } + { + \tl_if_empty:nTF { #5} + { + \tl_set_eq:NN \ko_ital_font_name \ko_regu_font_name + } + { + \tl_set_eq:NN \ko_ital_font_name \ko_base_font_name + \tl_put_right:Nn \ko_ital_font_name { #5 } + } + } + { + \tl_set_eq:NN \ko_ital_font_name \ko_regu_font_name + } + } + { + \tl_clear:N \ko_base_font_name + \tl_set:Nn \ko_regu_font_name { #3 } + + \IfValueTF { #4 } + { + \tl_set:Nn \ko_bold_font_name { #4 } + \bool_set_false:N \setko_bold_process + } + { +% \tl_set_eq:NN \ko_bold_font_name \ko_regu_font_name + \bool_set_true:N \setko_bold_process + } + + \IfValueTF { #5 } + { + \tl_set:Nn \ko_ital_font_name { #5 } + } + { + \tl_set_eq:NN \ko_ital_font_name \ko_regu_font_name + } + + } + + \IfValueTF { #6 } + { + \tl_set:Nn \ko_features { #6 } + } + { + \tl_clear:N \ko_features + } + + \IfValueTF { #7 } + { + \IfValueTF { #8 } + { + \process_set_korob_hanja { #1 } [ #7 ] ( #8 ) + } + { + \process_set_korob_hanja { #1 } [ #7 ] + } + } + { + \IfValueTF { #8 } + { + \process_set_korob_hanja { #1 } ( #8 ) + } + { + \process_korob_only_hangul { #1 } + } + } +} + +%%% bracket version. +\bool_set_false:N \ext_loc_bool + +\DeclareDocumentCommand \set_kor_font_orig_method_sub_hanja { m o m } +{ + \IfValueTF { #2 } + { + \cs:w set #1 hanjafont \cs_end: [ #2, \ext_loc_feature ] { #3 } + } + { + \cs:w set #1 hanjafont \cs_end: [ \ext_loc_feature ]{ #3 } + } + \bool_set_false:N \ext_loc_bool +} + +\DeclareDocumentCommand \setkorfontorigmethod { m o m o } +{ + \bool_if:nTF \ext_loc_bool + { + \tl_set:Nn \ext_loc_feature { ExternalLocation, } + } + { + \tl_clear:N \ext_loc_feature + } + \IfValueTF { #2 } + { + \cs:w set #1 hangulfont \cs_end: [ #2, \ext_loc_feature ] { #3 } + } + { + \cs:w set #1 hangulfont \cs_end: [ \ext_loc_feature ] { #3 } + } + + \IfValueTF { #4 } + { + \set_kor_font_orig_method_sub_hanja { #1 } [ #4 ] + } + { + \bool_set_false:N \ext_loc_bool + } +} + +%%% starred version. +\DeclareDocumentCommand \setkorfontorigstar { s m } +{ + \bool_set_true:N \ext_loc_bool + \setkorfontorigmethod { #2 } +} + +%%% \setobmainfont +\DeclareDocumentCommand \setxoblatinfont { m o d() d() d() o } +{ + \IfValueTF { #2 } + { + \tl_set:Nn \latin_base_font_name { #2 } + \tl_set_eq:NN \latin_regu_font_name \latin_base_font_name + \tl_put_right:Nn \latin_regu_font_name { #3 } + \IfValueTF { #4 } + { + \tl_if_empty:nTF { #4 } + { + \tl_set_eq:NN \latin_bold_font_name \latin_regu_font_name + } + { + \tl_set_eq:NN \latin_bold_font_name \latin_base_font_name + \tl_put_right:Nn \latin_bold_font_name { #4 } + } + \bool_set_false:N \setlatin_bold_process + } + { + \bool_set_true:N \setlatin_bold_process + } + \IfValueTF { #5 } + { + \tl_if_empty:nTF { #5} + { + \tl_set_eq:NN \latin_ital_font_name \latin_regu_font_name + } + { + \tl_set_eq:NN \latin_ital_font_name \latin_base_font_name + \tl_put_right:Nn \latin_ital_font_name { #5 } + } + \bool_set_false:N \setlatin_ital_process + } + { + \bool_set_true:N \setlatin_ital_process + } + } + { + \tl_clear:N \latin_base_font_name + \tl_set:Nn \latin_regu_font_name { #3 } + + \IfValueTF { #4 } + { + \tl_set:Nn \latin_bold_font_name { #4 } + \bool_set_false:N \setlatin_bold_process + } + { + \bool_set_true:N \setlatin_bold_process + } + + \IfValueTF { #5 } + { + \tl_set:Nn \latin_ital_font_name { #5 } + \bool_set_false:N \setlatin_ital_process + } + { + \bool_set_true:N \setlatin_ital_process + } + + } + + \tl_if_eq:nnTF { #1 } { mono } + { + \bool_set_true:N \latin_mono_mode + } + { + \bool_set_false:N \latin_mono_mode + } + + \bool_if:nTF \latin_mono_mode + { + \tl_clear:N \latin_feature + } + { + \tl_set:Nn \latin_feature { Ligatures=TeX, } + } + + \bool_if:nF \setlatin_bold_process + { + \tl_put_right:Nn \latin_feature { + BoldFont = { \latin_bold_font_name }, + } + } + + \bool_if:nF \setlatin_ital_process + { + \tl_put_right:Nn \latin_feature { + ItalicFont = { \latin_ital_font_name }, + } + } + + \IfValueT { #6 } + { + \tl_put_right:Nn \latin_feature { #6 } + } + + \cs:w set #1 font \cs_end: + [ \latin_feature ] + { \latin_regu_font_name } + +} + +\ExplSyntaxOff + +%%% starred version commands are provided for backward compatibility. +\protected\def\setkormainfont{% + \@ifstar{\setkorfontorigstar*{main}}{% + \@ifnextchar[{\setkorfontorigmethod{main}}{\setkorfont{main}}}} +\protected\def\setkorsansfont{% + \@ifstar{\setkorfontorigstar*{sans}}{% + \@ifnextchar[{\setkorfontorigmethod{sans}}{\setkorfont{sans}}}} +\protected\def\setkormonofont{% + \@ifstar{\setkorfontorigstar*{mono}}{% + \@ifnextchar[{\setkorfontorigmethod{mono}}{\setkorfont{mono}}}} + +%%% newly defined commands: +%%% \setkomainfont[BASENAME](Regu)(Bold)(Ital)[Feature]% +%%% [HJBASENAME](HJREGU)(HJBOLD)(HJITAL)[HJFeatures] +%%% no spaces allowed between optional arguments, e.g., [...]*nospace*[...] +\protected\def\setkomainfont{\setkorfontxob{main}} +\protected\def\setkosansfont{\setkorfontxob{sans}} +\protected\def\setkomonofont{\setkorfontxob{mono}} + +%%% \setobmainfont(regu)[features] = \setmainfont[features]{regu} +\protected\def\setobmainfont{\setxoblatinfont{main}} +\protected\def\setobsansfont{\setxoblatinfont{sans}} +\protected\def\setobmonofont{\setxoblatinfont{mono}} + +%%% [unfonts] will be deprecated shortly. +\if@unfont + \if@gremph + \setkomainfont(UnBatang.ttf)(UnBatangBold.ttf)(UnGraphic.ttf)[Script=Hangul]% + (UnBatang.ttf)(UnBatangBold.ttf)(UnBatang.ttf)[Script=Hangul] + \else + \setkomainfont(UnBatang.ttf)(UnBatangBold.ttf)(UnBatang.ttf)[Script=Hangul] + \fi + \setkosansfont[UnDotum](.ttf)(Bold.ttf)(.ttf) + \setmonoscale{1.05} + \setkomonofont(UnTaza.ttf) +\fi + +\if@nanumfonts + \if@nanumxfonts + \setkomainfont(NanumMyeongjo)(*ExtraBold)(*)[](NanumGothic)(*Bold) + \else + \setkomainfont(NanumMyeongjo)(*Bold)(*)[](NanumGothic)(*Bold) + \fi + \setkosansfont(NanumGothic)(*Bold)(*) + \setkomonofont(NanumGothic) +\fi + +%%% [hcr] adds [Script=Hangul] feature automatically. +\if@hcrfonts + \setkomainfont(HCRBatangLVT)(*-Bold)(*) + \setkosansfont(HCRDotumLVT)(*-Bold)(*) + \setkomonofont(HCRDotumLVT) +\fi + +\endinput + +%%% end of file `xob-font.sty` +%% CHANGES +%% v0.6 : HCR auto insert Script=Hangul, HAN disabled +%% v0.5 : [nanum] sets Bold, [nanumx] sets ExtraBold for NanumMyeongjo +%% v0.4 : hangul_bold_exist && hanja_bold_no_exist bug fixed. +%% v0.3 : \setobmainfont ( = \setmainfont ) introduced. +%% v0.2 : do not insert [ Ligatures=TeX ] in mono_mode diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xob-paralist.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xob-paralist.sty index d090882ab20..534d2b80663 100644 --- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xob-paralist.sty +++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xob-paralist.sty @@ -13,7 +13,10 @@ %% paralist, %% \@ifpackageloaded{paralist}{}{\RequirePackage{paralist}} -\makeatletter +\RequirePackage{iftex} +\ifPDFTeX + \RequirePackage{dhucs-paralist} +\else \def\pl@loop@{% \ifx 가\pl@temp \def\@tempa{\pl@label\gana }\else \ifx ㈎\pl@temp \def\@tempa{\pl@label\pgana }\else @@ -41,6 +44,5 @@ \fi\fi\fi\fi\fi\fi\fi\fi \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi \@tempa} -\makeatother - +\fi \endinput 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 48950391112..dcd3ff77576 100644 --- a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-base.cls +++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-base.cls @@ -1,6 +1,6 @@ %% File `oblivoir.cls` %% -%% (C) Copyright 2006-2013 Kangsoo Kim +%% (C) Copyright 2006-2014 Kangsoo Kim %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -11,7 +11,7 @@ %% version 2006/05/20 or later. %% \ProvidesClass{oblivoir-base} - [2013/10/26 v0.4.3 article-like class to typeset UTF-8 korean using memoir.] + [2014/06/12 v0.6 article-like class to typeset UTF-8 korean using memoir.] %\typeout{oblivoir requires memoir, dhucs, and memhangul. 2008/10/23.} %%% Acknowledgements: @@ -94,15 +94,19 @@ \DeclareOptionX{figtabcapt}[]{\PassOptionsToPackage{\CurrentOption}{memhangul-ucs}} %%% 2013-09-26 -\newif\if@unfonts\@unfontsfalse -\DeclareOptionX{unfonts}{\@unfontstrue} -\DeclareOptionX{nounfonts}{\@unfontsfalse} -\DeclareOptionX{nanum}{\@unfontsfalse} +%%% disabled option unfonts/nounfonts, 2014-06-13 +\newif\if@unfont\@unfontfalse +\DeclareOptionX{unfonts}{\@unfonttrue} +\DeclareOptionX{nounfonts}{\@unfontfalse} +\DeclareOptionX{nanum}{\@unfontfalse} \DeclareOptionX{uset1font}{\PassOptionsToPackage{\CurrentOption}{nanumfontsel}} \DeclareOptionX{cjk}{\PassOptionsToPackage{\CurrentOption}{memhangul-ucs}} \DeclareOptionX{dhucs}{\PassOptionsToPackage{\CurrentOption}{memhangul-ucs}} +%%% Disabled Options +\DeclareOptionX{hcr}{} % do nothing + \newif\if@AMSmath\@AMSmathfalse \DeclareOptionX{amsmath}{\@AMSmathtrue} @@ -180,7 +184,7 @@ %%% korean fontsettings \ifnokorean\else - \if@unfonts + \if@unfont \RequirePackage{hfontsel} \usehangulfontspec{obut} \else @@ -214,7 +218,7 @@ \if@itemph\else \ifnokorean\else % \ifpdf - \if@unfonts + \if@unfont \SetGremphFonts{outgr}{outgt} \else \SetGremphFonts{nanumgt}{nanumgt} @@ -302,15 +306,15 @@ \renewcommand\chaptitlefont{\Large\bfseries} \renewcommand\printchapternonum{} \renewcommand\printchaptertitle[1]{\chaptitlefont #1} -\renewcommand\afterchapskip{\onelineskip} -\renewcommand\beforechapskip{1.5\onelineskip} +\setlength\afterchapskip{\onelineskip} +\setlength\beforechapskip{1.5\onelineskip} \fi -\renewcommand\cftsectionindent{0pt} +\setlength\cftsectionindent{0pt} \ifnokorean\else -\renewcommand\cftsectionnumwidth{1.8em} -\renewcommand\cftsubsectionindent{1.8em} -\renewcommand\cftsubsectionnumwidth{2.5em} +\setlength\cftsectionnumwidth{1.8em} +\setlength\cftsubsectionindent{1.8em} +\setlength\cftsubsectionnumwidth{2.5em} \fi \if@chapter\else \let\cftchapterindent\cftsectionindent @@ -520,6 +524,8 @@ \endinput %%% ChangeLog: +%%% ver0.6 2014/06/12 : introduce new xob-font.sty +%%% ver0.5 2014/06/06 : replace \renewcommand's with \setlength's. %%% ver0.4.3 2013/10/26 : move \kscntformat definition to memhangul-ucs %%% ver0.4.2 2013/10/03 : fix a typo. %%% ver0.4.1 2013/09/26 : [moreroom] thanks to Juho.Lee diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-xlua.cls b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-xlua.cls index 01b7d0a0757..21299498c23 100644 --- a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-xlua.cls +++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-xlua.cls @@ -1,6 +1,6 @@ %% File `oblivoir-xlua.cls` %% -%% (C) Copyright 2006-2013 Kangsoo Kim +%% (C) Copyright 2006-2014 Kangsoo Kim %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -14,7 +14,7 @@ %% depends upon Dohyun Kim's xetexko and the author's memhangul-x. %% \ProvidesClass{oblivoir-xlua} - [2013/09/01 v0.4.5 article-like class to typeset UTF-8 korean using memoir.] + [2014/06/12 v0.7 article-like class to typeset UTF-8 korean using memoir.] \typeout{A variant of oblivoir class for Lua- or XeLaTeX.} \providecommand\@DisabledOption[1]{% @@ -48,7 +48,7 @@ \DeclareOptionX{footnote}{\@koreanfntrue} \newif\if@toclofentry\@toclofentryfalse \DeclareOptionX{tocentry}{\@toclofentrytrue} -\newif\if@itemph\@itemphfalse +%\newif\if@itemph\@itemphfalse \DeclareOptionX{itemph}{\PassOptionsToPackage{\CurrentOption}{memhangul-x}} \DeclareOptionX{gremph}{\PassOptionsToPackage{\CurrentOption}{memhangul-x}} \newif\if@chapter\@chapterfalse @@ -80,9 +80,10 @@ \DeclareOptionX{preloadoption}[]{\def\PRELOADoptstr{#1}} %% [nounfonts] -\newif\if@unfonts\@unfontstrue \DeclareOptionX{unfonts}{\PassOptionsToPackage{\CurrentOption}{memhangul-x}} \DeclareOptionX{nounfonts}{\PassOptionsToPackage{\CurrentOption}{memhangul-x}} +\DeclareOptionX{nanum}{\PassOptionsToPackage{\CurrentOption}{memhangul-x}} +\DeclareOptionX{hcr}{\PassOptionsToPackage{\CurrentOption}{memhangul-x}} \DeclareOptionX{figtabcapt}{\PassOptionsToPackage{\CurrentOption}{memhangul-x}} @@ -148,21 +149,6 @@ \RequirePackage{ifluatex} \RequirePackage{ifxetex} -%%% ifluaorxetex.sty -%\RequirePackage{iftex} -% -%\newif\ifLuaOrXeTeX -%\ifXeTeX\global\LuaOrXeTeXtrue -% \else\ifLuaTeX\global\LuaOrXeTeXtrue -% \else\global\LuaOrXeTeXfalse -%\fi\fi - -\ifx\XeTeX\undefined - \def\Xe{X\kern-.0833em\lower.5ex\hbox{\reflectbox{E}}} - \def\XeTeX{\Xe\kern-.1667em\TeX} - \def\XeLaTeX{\Xe\kern-0.0833em\LaTeX} -\fi - %%\RequirePackage{comment} %%\def\finemath@status{} @@ -255,15 +241,15 @@ \renewcommand\chaptitlefont{\Large\bfseries} \renewcommand\printchapternonum{} \renewcommand\printchaptertitle[1]{\chaptitlefont #1} -\renewcommand\afterchapskip{\onelineskip} -\renewcommand\beforechapskip{1.5\onelineskip} +\setlength\afterchapskip{\onelineskip} +\setlength\beforechapskip{1.5\onelineskip} \fi -\renewcommand\cftsectionindent{0pt} +\setlength\cftsectionindent{0pt} \ifnokorean\else -\renewcommand\cftsectionnumwidth{1.8em} -\renewcommand\cftsubsectionindent{1.8em} -\renewcommand\cftsubsectionnumwidth{2.5em} +\setlength\cftsectionnumwidth{1.8em} +\setlength\cftsubsectionindent{1.8em} +\setlength\cftsubsectionnumwidth{2.5em} \fi \if@chapter\else \let\cftchapterindent\cftsectionindent @@ -464,6 +450,8 @@ \endinput %%% ChangeLog: +%%% 2014-06-12 : introduce new xob-font.sty +%%% 2014-06-06 : replace false \renewcommand with \setlength %%% 2013-10-26 : moved \kscntformat definition to memhangul. %%% 2013-09-12 : integrate ifluaorxetex.sty %%% 2013-09-01 : [cjk], [dhucs] option introduced. diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/xoblivoir.cls b/Master/texmf-dist/tex/latex/kotex-oblivoir/xoblivoir.cls index 1723b2beada..f7afbac9044 100644 --- a/Master/texmf-dist/tex/latex/kotex-oblivoir/xoblivoir.cls +++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/xoblivoir.cls @@ -1,6 +1,6 @@ %% File `xoblivoir.cls` %% -%% (C) Copyright 2006-2013 Kangsoo Kim +%% (C) Copyright 2006-2014 Kangsoo Kim %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -10,7 +10,7 @@ %% and version 1.3c or later is part of all distributions of LaTeX %% version 2006/05/20 or later. %% -\ProvidesClass{xoblivoir}[2013/10/26] +\ProvidesClass{xoblivoir}[2014/06/12] \RequirePackage{xkeyval} @@ -36,14 +36,18 @@ \ifLuaOrXeTeX \LoadClassWithOptions{oblivoir-xlua} -\typeout{HANGUL DRIVER: xetexko/luatexko running} + \ifLuaTeX + \typeout{HANGUL DRIVER: luatexko} + \else + \typeout{HANGUL DRIVER: xetexko} + \fi \else \if@CJK \LoadClassWithOptions{oblivoir-xlua} - \typeout{HANGUL DRIVER: cjk-ko running} + \typeout{HANGUL DRIVER: cjk-ko} \else \LoadClassWithOptions{oblivoir-base} - \typeout{HANGUL DRIVER: dhucs running} + \typeout{HANGUL DRIVER: kotex-utf} \fi \fi -- cgit v1.2.3