summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/kotex-oblivoir
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-03-14 21:01:21 +0000
committerKarl Berry <karl@freefriends.org>2020-03-14 21:01:21 +0000
commit58c4ce1681c0ba0f511802729b1409b92a864617 (patch)
tree1979db7169a2800b64a53be8756252699f30e0d5 /Master/texmf-dist/tex/latex/kotex-oblivoir
parent5539e90b9707a375e00782a39510a63435afd840 (diff)
kotex-oblivoir (14mar20)
git-svn-id: svn://tug.org/texlive/trunk@54302 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/kotex-oblivoir')
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/10_5.sty (renamed from Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/10_5.sty)0
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/fapapersize.sty (renamed from Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/fapapersize.sty)8
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/memhangul-common.sty (renamed from Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memhangul-common.sty)692
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/memhangul-patch.sty (renamed from Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memhangul-patch.sty)0
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/memucs-enumerate.sty (renamed from Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memucs-enumerate.sty)0
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/memucs-setspace.sty (renamed from Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memucs-setspace.sty)58
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/ob-koreanappendix.sty (renamed from Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/ob-koreanappendix.sty)0
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/ob-nokoreanappendix.sty (renamed from Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/ob-nokoreanappendix.sty)0
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/ob-toclof.sty (renamed from Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/ob-toclof.sty)0
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/memhangul-x.sty18
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xetexko-var.sty12
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xob-font.sty62
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xob-lwarp.sty177
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-utf.cls (renamed from Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-base.cls)20
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-xl.cls (renamed from Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-xlua.cls)80
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir.cls59
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/xoblivoir.cls47
17 files changed, 761 insertions, 472 deletions
diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/10_5.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/10_5.sty
index 401c569ff9a..401c569ff9a 100644
--- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/10_5.sty
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/10_5.sty
diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/fapapersize.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/fapapersize.sty
index 4cb7d1ffd6b..a1a57f113fc 100644
--- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/fapapersize.sty
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/fapapersize.sty
@@ -18,7 +18,10 @@
%% ver 0.02
%% 사륙배판, 국판, 신국판 정의.
%% marginnote 영역 설정은 제외되어 있음.
-\ProvidesPackage{fapapersize}
+%% ver 0.1
+%% option 1in added
+%%
+\ProvidesPackage{fapapersize}[2020/02/10 v0.1]
%%%
%%% 옵션
%%% dbl4x6 : 사륙배판
@@ -33,6 +36,9 @@
\DeclareOption{newmum}{%
\AtEndOfPackage{\usefapapersize{154mm,225mm,25mm,*,25mm,*}}%
}
+\DeclareOption{1in}{%
+ \AtEndOfPackage{\usefapapersize{*,*,1in,*,1in,*}}%
+ }
\newif\ifStockSize@\StockSize@false
\DeclareOption{stock}{%
\StockSize@true
diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memhangul-common.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/memhangul-common.sty
index 2b0ae2ef71e..4550be54675 100644
--- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memhangul-common.sty
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/memhangul-common.sty
@@ -1,6 +1,6 @@
%% File `memhangul-common.sty`
%%
-%% (C) Copyright 2013-2015 Kangsoo Kim <karnes at ktug org>
+%% (C) Copyright 2013-2020 Kangsoo Kim <karnes at ktug org>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -17,7 +17,7 @@
%%% 편, 장 섹션 타이틀 재설정
%%% 절의 섹션 타이틀은 수정하지 않음.
%%
-\ProvidesPackage{memhangul-common}[2015/10/15]
+\ProvidesPackage{memhangul-common}[2020/02/05]
\let\@CHAPAPP\@chapapp
\def\refreshprepostchapters{%
@@ -296,22 +296,28 @@
\memendofchapterhook%
}
-\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@
- }}
+%\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@
+% }}
+\RequirePackage{etoolbox}
+\patchcmd\@makechapterhead{%
+ \printchaptername \chapternamenum \printchapternum
+ \afterchapternum}{%
+ \prechapternum \chapternamenum \printchapternum
+ \chapternamenum \postchapternum \afterchapternum}{}{}
\renewcommand{\@m@mschapter}[2][\@empty]{%
\@schapter{#2}%
@@ -456,6 +462,341 @@
\makeevenhead{ruled}{\normalfont\scshape\leftmark}{}{}
\makeoddhead{ruled}{}{}{\normalfont\rightmark}
+
+%%% References
+\renewcommand\Cref[1]{%
+ \pre@chapter\,\ref{#1}\,\chapterrefname%
+}
+\renewcommand\Pref[1]{%
+ \pre@part\,\ref{#1}\,\partrefname%
+}
+\renewcommand\pref[1]{%
+ \pageref{#1}~\pagerefname
+}
+\renewcommand\tref[1]{%
+ \tablerefname~\ref{#1}%
+}
+\renewcommand\fref[1]{%
+ \figurerefname~\ref{#1}%
+}
+
+%% arabic, roman... etc.
+%%\def\HArabic#1{\arabic{#1}}
+\def\HAlph#1{\Alph{#1}}
+\def\Halph#1{\alph{#1}}
+\def\HROMAN#1{\hRoman{#1}}
+\def\Hroman#1{\hroman{#1}}
+%%
+
+%% phantomchapter = phantomsection
+\def\phantomchapter{%
+ \Hy@GlobalStepCount\Hy@linkcounter
+ \xdef\@currentHref{chapter*.\the\Hy@linkcounter}%
+ \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}%
+}
+
+%%% index
+\renewcommand{\@wrindexm@m}[1]{\@@wrindexhyp#1||\\}
+
+
+%%% 한글 문장부호 관련 명령
+%%% \hfontfamilynameprefix is deprecated. (ver1.5.0)
+\def\hfontfamilynameprefix{ut} % for compatibility only
+
+\def\cnm@char@open{〈}
+\def\cnm@char@close{〉}
+\def\ccnm@char@open{《}
+\def\ccnm@char@close{》}
+\def\snm@char@open{「}
+\def\snm@char@close{」}
+\def\bnm@char@open{『}
+\def\bnm@char@close{』}
+
+\ExplSyntaxOn
+\NewDocumentCommand \memx@make@bnmcmd { mm }
+{
+ \ifvmode\leavevmode\fi
+ \memx@bnmcmd@prekern
+ \use:c { #1@char@open }
+ #2
+ \use:c { #1@char@close }
+ \memx@bnmcmd@postkern
+}
+\ExplSyntaxOff
+
+\protected\def\cnm{%
+ \@ifnextchar*\cnm@star\cnm@nostar
+}
+
+\def\cnm@star*#1{%
+ \def\memx@bnmcmd@prekern{\kern-.35em}%
+ \def\memx@bnmcmd@postkern{\kern-.4em}%
+ \memx@make@bnmcmd{cnm}{#1}%
+}
+
+\def\cnm@nostar#1{%
+ \let\memx@bnmcmd@prekern\relax
+ \let\memx@bnmcmd@postkern\relax
+ \memx@make@bnmcmd{cnm}{#1}%
+}
+
+\protected\def\ccnm{%
+ \@ifnextchar*\ccnm@star\ccnm@nostar
+}
+
+\def\ccnm@star*#1{%
+ \def\memx@bnmcmd@prekern{\kern-.35em}%
+ \def\memx@bnmcmd@postkern{\kern-.4em}%
+ \memx@make@bnmcmd{ccnm}{#1}%
+}
+
+\def\ccnm@nostar#1{%
+ \let\memx@bnmcmd@prekern\relax
+ \let\memx@bnmcmd@postkern\relax
+ \memx@make@bnmcmd{ccnm}{#1}%
+}
+
+\protected\def\snm{%
+ \@ifnextchar*\snm@star\snm@nostar
+}
+
+\def\snm@star*#1{%
+ \def\memx@bnmcmd@prekern{\kern-.35em}%
+ \def\memx@bnmcmd@postkern{\kern-.4em}%
+ \memx@make@bnmcmd{snm}{#1}%
+}
+
+\def\snm@nostar#1{%
+ \let\memx@bnmcmd@prekern\relax
+ \let\memx@bnmcmd@postkern\relax
+ \memx@make@bnmcmd{snm}{#1}%
+}
+
+\protected\def\bnm{%
+ \@ifnextchar*\bnm@star\bnm@nostar
+}
+
+\def\bnm@star*#1{%
+ \def\memx@bnmcmd@prekern{\kern-.35em}%
+ \def\memx@bnmcmd@postkern{\kern-.4em}%
+ \memx@make@bnmcmd{bnm}{#1}%
+}
+
+\def\bnm@nostar#1{%
+ \let\memx@bnmcmd@prekern\relax
+ \let\memx@bnmcmd@postkern\relax
+ \memx@make@bnmcmd{bnm}{#1}%
+}
+
+%%% ldots, hdots,
+\ExplSyntaxOn
+
+\NewDocumentCommand \obldots {} {
+ .\kern\fontdimen3\font
+ .\kern\fontdimen3\font
+ .\kern\fontdimen3\font
+}
+
+\NewDocumentCommand \obellipsis {} {
+ \nobreak \mbox{\textellipsis\textellipsis}
+}
+
+\ExplSyntaxOff
+
+
+\AtBeginDocument{
+ \@ifpackageloaded{hyperref}{%
+ \pdfstringdefDisableCommands{%
+ \def\cnm#1{\ifx#1*\expandafter\@@cnm\else <#1>\fi}
+ \def\@@cnm#1{<#1>}
+ \def\snm#1{\ifx#1*\expandafter\@@cnm\else <#1>\fi}
+ \def\ccnm#1{\ifx#1*\expandafter\@@cnm\else <#1>\fi}
+ \def\bnm#1{\ifx#1*\expandafter\@@cnm\else <#1>\fi}
+ \def\oblivoirdblquote#1{\ifx#1*\expandafter\@@obquote\else "#1"\fi}
+ \def\@@obquote#1{"#1"}
+ \def\oblivoirquote#1{\ifx#1*\expandafter\@@obsquote\else '#1'\fi}
+ \def\@@obsquote#1{'#1'}
+ \def\cntrdots{…}
+ }%
+ }{}
+}
+
+%%%% 따옴표
+\def\oblivoirdblquote@char@open{“}
+\def\oblivoirdblquote@char@close{”}
+\def\oblivoirquote@char@open{‘}
+\def\oblivoirquote@char@close{’}
+
+\protected\def\oblivoirdblquote{%
+ \@ifnextchar*\oblivoirdblquote@star\oblivoirdblquote@nostar
+}
+
+\def\oblivoirdblquote@star*#1{%
+ \def\memx@bnmcmd@prekern{\kern-.35em}%
+ \def\memx@bnmcmd@postkern{\kern-.4em}%
+ \memx@make@bnmcmd{oblivoirdblquote}{#1}%
+}
+
+\def\oblivoirdblquote@nostar#1{%
+ \let\memx@bnmcmd@prekern\relax
+ \let\memx@bnmcmd@postkern\relax
+ \memx@make@bnmcmd{oblivoirdblquote}{#1}%
+}
+
+\protected\def\oblivoirquote{%
+ \@ifnextchar*\oblivoirquote@star\oblivoirquote@nostar
+}
+
+\def\oblivoirquote@star*#1{%
+ \def\memx@bnmcmd@prekern{\kern-.35em}%
+ \def\memx@bnmcmd@postkern{\kern-.4em}%
+ \memx@make@bnmcmd{oblivoirquote}{#1}%
+}
+
+\def\oblivoirquote@nostar#1{%
+ \let\memx@bnmcmd@prekern\relax
+ \let\memx@bnmcmd@postkern\relax
+ \memx@make@bnmcmd{oblivoirquote}{#1}%
+}
+
+%%%% cntrdots
+
+\ifx\cntrdot\undefined
+\DeclareRobustCommand{\cntrdot}{%
+ \@ifnextchar*\@cntrd@t\@@cntrd@t
+}
+\else
+\renewcommand{\cntrdot}{%
+ \@ifnextchar*\@cntrd@t\@@cntrd@t
+}
+\fi
+
+\ifx\oblivoirallowbreak\undefined
+\let\oblivoirallowbreak\allowbreak
+\fi
+
+\def\@cntrd@t*{%
+ \leavevmode\kern.2em\@@cntrd@t\hskip.2em\oblivoirallowbreak
+}
+\def\@@cntrd@t{%
+ \leavevmode\nobreak\raise.02ex\hbox{·}\oblivoirallowbreak
+}
+
+\DeclareRobustCommand{\cntrdots}{%
+ \leavevmode…%\oblivoirallowbreak
+}
+
+\DeclareRobustCommand{\cntrdotss}{%
+ \leavevmode ……%
+}
+
+%% Punctuation Explanation Rule.
+%% usage: \explpunc.Some_running_texts.\ % last space must not be succeeded by ^M.
+\protected\def\explpunc.#1.\ {\leavevmode\,\XBrule#1\XErule\,}
+\protected\def\expldash{\leavevmode\,\XBrule\,}
+%
+\newsavebox\togetheightoffont\sbox\togetheightoffont{!}
+\newlength\htoffnt\setlength\htoffnt{\ht\togetheightoffont}
+\addtolength\htoffnt{\dp\togetheightoffont}
+\def\XBrule{\raise.45\htoffnt\hbox{\rule{1.25em}{.25pt}}}
+\def\XErule{\raise.45\htoffnt\hbox{\hskip1pt\rule{1.25em}{.25pt}}}
+
+%% Misc def.
+%\def\PageName{페이지}
+%\def\AltPageName{쪽}
+
+%% \titleref
+%% -- 2009/02/11. revert to original definition.
+\let\M@TitleReference\@firstoftwo
+\let\M@M@TitleReference\@firstoftwo
+\def\@mem@theTR{\let\M@M@TitleReference\@firstoftwo\theTitleReference}
+
+%% vertical distance of math display
+\if@mathdisp
+\addtodef{\normalsize}{}{%
+ \abovedisplayskip 6\p@ \@plus2\p@ \@minus1\p@
+ \abovedisplayshortskip .5\p@ \@plus2\p@ \@minus1\p@
+ \belowdisplayshortskip 6\p@ \@plus2\p@ \@minus1\p@
+ \belowdisplayskip \abovedisplayskip}
+\fi
+
+%% arabic frontmatter numbering
+\if@arabicfrontmatter
+\renewcommand{\@memfront}{%
+ \@smemfront\pagenumbering{arabic}}
+\fi
+
+%% 할주.
+%% 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}
+\protected\def\divnote#1{%
+ \settowidth{\@tempdima}{\divnotestyle #1}%
+ \ifvmode\leavevmode\fi\divnotedelimopen
+ \raise.2em\hbox{\parbox{.525\@tempdima}{\divnotestyle\singlespace #1}}\divnotedelimclose
+}
+
+%% 각주 설정을 위한 추가 매크로
+\def\SetFnmark#1#2{%
+ \expandafter\def\csname @makefnmark\endcsname{\bgroup #1\@thefnmark#2\egroup}%
+}
+
+%% chapter의 첫 단락 들여쓰기.
+\newcommand*\chapterindentfirst{%
+ \addtodef{\@afterheading}{\@afterindenttrue}{}
+}
+
+%% memhangul-patch
+\InputIfFileExists{memhangul-patch.sty}{}{}
+
+%%% fig, tab caption
+\def\obCaptionFont#1{\def\@figtabcaptfont@{#1}}
+\providecommand\@figtabcaptfont@{\normalfont}
+\if@figtabcapt@
+\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
+
%% Pagestyle Ruled
\makepagestyle{Ruled}
@@ -529,8 +870,7 @@
\makeoddhead{hangul}{}{}{\normalfont\small\rightmark~\makebox[2em][r]{\normalfont\normalsize\sffamily\thepage}}
\makeevenhead{hangul}{\makebox[2em][l]{\normalfont\normalsize\sffamily\thepage}~\normalfont\small\leftmark}{}{}
-%%% CHAPTERSTYLE
-
+%%%%%%%%%%%%%%%% chapterstyles %%%%%%%%%%%%%%%
\makechapterstyle{default}{%
\renewcommand{\post@chapter}{\chaptername}%
\renewcommand{\chapnamefont}{\normalfont\huge\bfseries}
@@ -667,6 +1007,7 @@
\renewcommand{\afterchaptertitle}{\vskip\onelineskip \hrule\vskip \afterchapskip}
}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%% appendix %%%%%%%%%%%%%%%%%%%%%%%%%
@@ -830,323 +1171,12 @@
\fi
}{}
-%%% References
-\renewcommand\Cref[1]{%
- \pre@chapter\,\ref{#1}\,\chapterrefname%
-}
-\renewcommand\Pref[1]{%
- \pre@part\,\ref{#1}\,\partrefname%
-}
-\renewcommand\pref[1]{%
- \pageref{#1}~\pagerefname
-}
-\renewcommand\tref[1]{%
- \tablerefname~\ref{#1}%
-}
-\renewcommand\fref[1]{%
- \figurerefname~\ref{#1}%
-}
-
-%% arabic, roman... etc.
-%%\def\HArabic#1{\arabic{#1}}
-\def\HAlph#1{\Alph{#1}}
-\def\Halph#1{\alph{#1}}
-\def\HROMAN#1{\hRoman{#1}}
-\def\Hroman#1{\hroman{#1}}
-%%
-
-%% phantomchapter = phantomsection
-\def\phantomchapter{%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{chapter*.\the\Hy@linkcounter}%
- \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}%
-}
-
-%%% index
-\renewcommand{\@wrindexm@m}[1]{\@@wrindexhyp#1||\\}
-
-
-%%% 한글 문장부호 관련 명령
-%%% \hfontfamilynameprefix is deprecated. (ver1.5.0)
-\def\hfontfamilynameprefix{ut} % for compatibility only
-
-\def\cnm@char@open{〈}
-\def\cnm@char@close{〉}
-\def\ccnm@char@open{《}
-\def\ccnm@char@close{》}
-\def\snm@char@open{「}
-\def\snm@char@close{」}
-\def\bnm@char@open{『}
-\def\bnm@char@close{』}
-
-\def\memx@make@bnmcmd#1#2{%
- \leavevmode
- \unhbox0\memx@bnmcmd@prekern\csname #1@char@open\endcsname
- #2\csname #1@char@close\endcsname\memx@bnmcmd@postkern
-}
-
-\protected\def\cnm{%
- \@ifnextchar*\cnm@star\cnm@nostar
-}
-
-\def\cnm@star*#1{%
- \def\memx@bnmcmd@prekern{\kern-.35em}%
- \def\memx@bnmcmd@postkern{\kern-.4em}%
- \memx@make@bnmcmd{cnm}{#1}%
-}
-
-\def\cnm@nostar#1{%
- \let\memx@bnmcmd@prekern\relax
- \let\memx@bnmcmd@postkern\relax
- \memx@make@bnmcmd{cnm}{#1}%
-}
-
-\protected\def\ccnm{%
- \@ifnextchar*\ccnm@star\ccnm@nostar
-}
-
-\def\ccnm@star*#1{%
- \def\memx@bnmcmd@prekern{\kern-.35em}%
- \def\memx@bnmcmd@postkern{\kern-.4em}%
- \memx@make@bnmcmd{ccnm}{#1}%
-}
-
-\def\ccnm@nostar#1{%
- \let\memx@bnmcmd@prekern\relax
- \let\memx@bnmcmd@postkern\relax
- \memx@make@bnmcmd{ccnm}{#1}%
-}
-
-
-\protected\def\snm{%
- \@ifnextchar*\snm@star\snm@nostar
-}
-
-\def\snm@star*#1{%
- \def\memx@bnmcmd@prekern{\kern-.35em}%
- \def\memx@bnmcmd@postkern{\kern-.4em}%
- \memx@make@bnmcmd{snm}{#1}%
-}
-
-\def\snm@nostar#1{%
- \let\memx@bnmcmd@prekern\relax
- \let\memx@bnmcmd@postkern\relax
- \memx@make@bnmcmd{snm}{#1}%
-}
-
-
-\protected\def\bnm{%
- \@ifnextchar*\bnm@star\bnm@nostar
-}
-
-\def\bnm@star*#1{%
- \def\memx@bnmcmd@prekern{\kern-.35em}%
- \def\memx@bnmcmd@postkern{\kern-.4em}%
- \memx@make@bnmcmd{bnm}{#1}%
-}
-
-\def\bnm@nostar#1{%
- \let\memx@bnmcmd@prekern\relax
- \let\memx@bnmcmd@postkern\relax
- \memx@make@bnmcmd{bnm}{#1}%
-}
-
-\AtBeginDocument{
- \@ifpackageloaded{hyperref}{%
- \pdfstringdefDisableCommands{%
- \def\cnm#1{\ifx#1*\expandafter\@@cnm\else <#1>\fi}
- \def\@@cnm#1{<#1>}
- \def\snm#1{\ifx#1*\expandafter\@@cnm\else <#1>\fi}
- \def\ccnm#1{\ifx#1*\expandafter\@@cnm\else <#1>\fi}
- \def\bnm#1{\ifx#1*\expandafter\@@cnm\else <#1>\fi}
- \def\oblivoirdblquote#1{\ifx#1*\expandafter\@@obquote\else "#1"\fi}
- \def\@@obquote#1{"#1"}
- \def\oblivoirquote#1{\ifx#1*\expandafter\@@obsquote\else '#1'\fi}
- \def\@@obsquote#1{'#1'}
- \def\cntrdots{…}
- }%
- }{}
-}
-
-%%%% 따옴표
-\def\oblivoirdblquote@char@open{“}
-\def\oblivoirdblquote@char@close{”}
-\def\oblivoirquote@char@open{‘}
-\def\oblivoirquote@char@close{’}
-
-\protected\def\oblivoirdblquote{%
- \@ifnextchar*\oblivoirdblquote@star\oblivoirdblquote@nostar
-}
-
-\def\oblivoirdblquote@star*#1{%
- \def\memx@bnmcmd@prekern{\kern-.35em}%
- \def\memx@bnmcmd@postkern{\kern-.4em}%
- \memx@make@bnmcmd{oblivoirdblquote}{#1}%
-}
-
-\def\oblivoirdblquote@nostar#1{%
- \let\memx@bnmcmd@prekern\relax
- \let\memx@bnmcmd@postkern\relax
- \memx@make@bnmcmd{oblivoirdblquote}{#1}%
-}
-
-\protected\def\oblivoirquote{%
- \@ifnextchar*\oblivoirquote@star\oblivoirquote@nostar
-}
-
-\def\oblivoirquote@star*#1{%
- \def\memx@bnmcmd@prekern{\kern-.35em}%
- \def\memx@bnmcmd@postkern{\kern-.4em}%
- \memx@make@bnmcmd{oblivoirquote}{#1}%
-}
-
-\def\oblivoirquote@nostar#1{%
- \let\memx@bnmcmd@prekern\relax
- \let\memx@bnmcmd@postkern\relax
- \memx@make@bnmcmd{oblivoirquote}{#1}%
-}
-
-%%%% cntrdots
-
-\ifx\cntrdot\undefined
-\DeclareRobustCommand{\cntrdot}{%
- \@ifnextchar*\@cntrd@t\@@cntrd@t
-}
-\else
-\renewcommand{\cntrdot}{%
- \@ifnextchar*\@cntrd@t\@@cntrd@t
-}
-\fi
-
-\ifx\oblivoirallowbreak\undefined
-\let\oblivoirallowbreak\allowbreak
-\fi
-
-\def\@cntrd@t*{%
- \leavevmode\kern.2em\@@cntrd@t\hskip.2em\oblivoirallowbreak
-}
-\def\@@cntrd@t{%
- \leavevmode\nobreak\raise.02ex\hbox{·}\oblivoirallowbreak
-}
-
-\DeclareRobustCommand{\cntrdots}{%
- \leavevmode…%\oblivoirallowbreak
-}
-
-\DeclareRobustCommand{\cntrdotss}{%
- \leavevmode ……%
-}
-
-%% Punctuation Explanation Rule.
-%% usage: \explpunc.Some_running_texts.\ % last space must not be succeeded by ^M.
-\protected\def\explpunc.#1.\ {\leavevmode\,\XBrule#1\XErule\,}
-\protected\def\expldash{\leavevmode\,\XBrule\,}
-%
-\newsavebox\togetheightoffont\sbox\togetheightoffont{!}
-\newlength\htoffnt\setlength\htoffnt{\ht\togetheightoffont}
-\addtolength\htoffnt{\dp\togetheightoffont}
-\def\XBrule{\raise.45\htoffnt\hbox{\rule{1.25em}{.25pt}}}
-\def\XErule{\raise.45\htoffnt\hbox{\hskip1pt\rule{1.25em}{.25pt}}}
-
-%% Misc def.
-%\def\PageName{페이지}
-%\def\AltPageName{쪽}
-
-%% \titleref
-%% -- 2009/02/11. revert to original definition.
-\let\M@TitleReference\@firstoftwo
-\let\M@M@TitleReference\@firstoftwo
-\def\@mem@theTR{\let\M@M@TitleReference\@firstoftwo\theTitleReference}
-
-%% vertical distance of math display
-\if@mathdisp
-\addtodef{\normalsize}{}{\abovedisplayskip 6\p@ \@plus2\p@ \@minus5\p@
- \abovedisplayshortskip \z@ \@plus3\p@
- \belowdisplayshortskip 3\p@ \@plus3\p@ \@minus3\p@
- \belowdisplayskip \abovedisplayskip}
-\fi
-
-%% arabic frontmatter numbering
-\if@arabicfrontmatter
-\renewcommand{\@memfront}{%
- \@smemfront\pagenumbering{arabic}}
-\fi
-
%% default pagestyle
\if@defaulthangulpagestyle
\pagestyle{hangul}
\fi
-%% 할주.
-%% 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}
-\protected\def\divnote#1{%
- \settowidth{\@tempdima}{\divnotestyle #1}%
- \ifvmode\leavevmode\fi\divnotedelimopen
- \raise.2em\hbox{\parbox{.525\@tempdima}{\divnotestyle\singlespace #1}}\divnotedelimclose
-}
-
-%% 각주 설정을 위한 추가 매크로
-\def\SetFnmark#1#2{%
- \expandafter\def\csname @makefnmark\endcsname{\bgroup #1\@thefnmark#2\egroup}%
-}
-
-%% chapter의 첫 단락 들여쓰기.
-\newcommand*\chapterindentfirst{%
- \addtodef{\@afterheading}{\@afterindenttrue}{}
-}
-
-%% memhangul-patch
-\InputIfFileExists{memhangul-patch.sty}{}{}
-
-%%% fig, tab caption
-\def\obCaptionFont#1{\def\@figtabcaptfont@{#1}}
-\providecommand\@figtabcaptfont@{\normalfont}
-\if@figtabcapt@
-\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-common/memhangul-patch.sty
index b3cf7299587..b3cf7299587 100644
--- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memhangul-patch.sty
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/memhangul-patch.sty
diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memucs-enumerate.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/memucs-enumerate.sty
index c3fd53f85ed..c3fd53f85ed 100644
--- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memucs-enumerate.sty
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/memucs-enumerate.sty
diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memucs-setspace.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/memucs-setspace.sty
index 8db9d17acfa..a4353ab9715 100644
--- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/memucs-setspace.sty
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/memucs-setspace.sty
@@ -58,8 +58,8 @@
% BP: add nodisplayskipstretch option and \setdisplayskipstretch command.
-\newcommand{\displayskipstretch}{\baselinestretch}
-\newcommand{\setdisplayskipstretch}[1]{\renewcommand{\displayskipstretch}{#1}}
+\providecommand{\displayskipstretch}{\baselinestretch}
+\providecommand{\setdisplayskipstretch}[1]{\renewcommand{\displayskipstretch}{#1}}
\DeclareOption{nodisplayskipstretch}{\setdisplayskipstretch{1.0}}
% GT: add George Pearsons' suggested options.
@@ -100,28 +100,28 @@
\fi
}
-\newcommand\noadjustquotespacing{%
+\providecommand\noadjustquotespacing{%
\@singlespacequotefalse
}
-\newcommand\adjustquotespacing{%
+\providecommand\adjustquotespacing{%
\@singlespacequotetrue
}
-\newcommand\adjustfloatfnspacing{%
+\providecommand\adjustfloatfnspacing{%
\@singlespacefntrue
}
-\newcommand\noadjustfloatfnspacing{%
+\providecommand\noadjustfloatfnspacing{%
\@singlespacefnfalse
}
-% GT: Sat 28 Sep 1996: Widely using \newcommand, \renewcommand, and
-% \newenvironment, instead of \def.
+% GT: Sat 28 Sep 1996: Widely using \providecommand, \renewcommand, and
+% \provideenvironment, instead of \def.
% ** Line space commands.
-\newcommand{\setstretch}[1]{%
+\providecommand{\setstretch}[1]{%
\def\baselinestretch{#1}%
\@currsize
}
@@ -142,12 +142,12 @@
% float environments. The one and a half, double, and arbitrary
% spacing commands are unaltered.
-\newcommand{\SetSinglespace}[1]{%
+\providecommand{\SetSinglespace}[1]{%
\def\setspace@singlespace{#1}%
}
%% Karnes.
-\newcommand{\Set@Hangulspace}[2]{%
+\providecommand{\Set@Hangulspace}[2]{%
\def\setspace@hangulspace{#1}%
\def\setspace@hangulfspace{#2}%
\setstretch{#1}%
@@ -161,20 +161,20 @@
\setstretch{#1}%
}
-\newcommand{\SetHangulVerbatimSpace}[1]{%
+\providecommand{\SetHangulVerbatimSpace}[1]{%
\def\setspace@hangulverbspace{#1}%
}
\let\tmp@current@hangulspace\setspace@hangulspace
\let\tmp@current@hangulfspace\setspace@hangulfspace
-\newcommand{\ResetHangulspace}[2]{%
+\providecommand{\ResetHangulspace}[2]{%
\let\tmp@current@hangulspace\setspace@hangulspace%
\let\tmp@current@hangulfspace\setspace@hangulfspace%
\Set@Hangulspace{#1}{#2}%
}
-\newcommand{\RestoreHangulspace}{%
+\providecommand{\RestoreHangulspace}{%
\Set@Hangulspace{\tmp@current@hangulspace}{\tmp@current@hangulfspace}%
}
@@ -188,25 +188,25 @@
\Set@Hangulspace{1.0}{1.0}
\fi
-\newcommand{\singlespacing}{%
+\providecommand{\singlespacing}{%
\setstretch {\setspace@singlespace}% normally 1
\vskip \baselineskip % Correction for coming into singlespace
}
%% Karnes.
-\newcommand{\hangulspacing}{%
+\providecommand{\hangulspacing}{%
\setstretch{\setspace@hangulspace}% default
}
-\newcommand{\hangulfspacing}{%
+\providecommand{\hangulfspacing}{%
\setstretch{\setspace@hangulfspace}%
}
-\newcommand{\hangulverbspacing}{%
+\providecommand{\hangulverbspacing}{%
\setstretch{\setspace@hangulverbspace}%
}
-\newcommand{\onehalfspacing}{%
+\providecommand{\onehalfspacing}{%
\setstretch{1.25}% default
\ifcase \@ptsize \relax % 10pt
\setstretch {1.25}%
@@ -217,7 +217,7 @@
\fi
}
-\newcommand{\doublespacing}{%
+\providecommand{\doublespacing}{%
\setstretch {1.667}% default
\ifcase \@ptsize \relax % 10pt
\setstretch {1.667}%
@@ -376,7 +376,7 @@
% A single spaced quote (say) is done by surrounding singlespace with quote.
-\newenvironment{singlespace}{%
+\provideenvironment{singlespace}{%
\vskip \baselineskip
\setstretch {\setspace@singlespace}%
\vskip -\baselineskip
@@ -386,7 +386,7 @@
% GT (c/o Mark Olesen), Wed 15 April 1998.
-\newenvironment{singlespace*}{%
+\provideenvironment{singlespace*}{%
\setstretch {\setspace@singlespace}%
\vskip -\baselineskip
}{%
@@ -399,11 +399,11 @@
%
% Next two definitions fixed for consistency with TeX 3.x
-% In order to use \newenvironment, while easily using same code for
+% In order to use \provideenvironment, while easily using same code for
% end of each environment, the code that used to be in \endspacing has
% been moved into a new (but internal) macro, \restore@spacing.
-\newcommand{\restore@spacing}{%
+\providecommand{\restore@spacing}{%
\par
\vskip \parskip
\vskip \baselineskip
@@ -412,7 +412,7 @@
\vskip -\baselineskip
}
-\newenvironment{spacing}[1]{%
+\provideenvironment{spacing}[1]{%
\par
\begingroup % moved from \endspacing by PGBR 29-1-91
\setstretch {#1}%
@@ -421,7 +421,7 @@
}
% one and a half spacing is 1.5 x pt size
-\newenvironment{onehalfspace}{%
+\provideenvironment{onehalfspace}{%
\begingroup
\onehalfspacing
}{%
@@ -429,7 +429,7 @@
}
% double spacing is 2 x pt size
-\newenvironment{doublespace}{%
+\provideenvironment{doublespace}{%
\begingroup
\doublespacing
}{%
@@ -533,8 +533,8 @@
\wrapright\the\afterevery@verbatim}
%% Karnes : epigraph
-\newcommand\epigraphspacinghook{\setstretch{1.0}}
-\newcommand\epigraphspacing[1]{%
+\providecommand\epigraphspacinghook{\setstretch{1.0}}
+\providecommand\epigraphspacing[1]{%
\renewcommand\epigraphspacinghook{\setstretch{#1}}%
}
diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/ob-koreanappendix.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/ob-koreanappendix.sty
index 9c46eaa9c58..9c46eaa9c58 100644
--- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/ob-koreanappendix.sty
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/ob-koreanappendix.sty
diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/ob-nokoreanappendix.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/ob-nokoreanappendix.sty
index 69044f5eba1..69044f5eba1 100644
--- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/ob-nokoreanappendix.sty
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/ob-nokoreanappendix.sty
diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/ob-toclof.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/ob-toclof.sty
index 5ef56b463fb..5ef56b463fb 100644
--- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-ucs/ob-toclof.sty
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/ob-toclof.sty
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 787df1d0dbf..31a600349ec 100644
--- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/memhangul-x.sty
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/memhangul-x.sty
@@ -1,6 +1,6 @@
%% File `memhangul-x.sty`
%%
-%% (C) Copyright 2006-2015 Kangsoo Kim <karnes at ktug org>
+%% (C) Copyright 2006-2020 Kangsoo Kim <karnes at ktug org>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -14,8 +14,8 @@
%% part of oblivoir v2
%%
\NeedsTeXFormat{LaTeX2e}
-\def\filedate{2015/10/05}
-\def\fileversion{11.10}
+\def\filedate{2020/02/05}
+\def\fileversion{11.11}
\ProvidesPackage{memhangul-x}[\filedate Hangul Typography for (x)oblivoir]
%\typeout{Hangul Typography for (x)oblivoir}
@@ -37,6 +37,7 @@
%\newif\if@dvips{\@dvipsfalse}
\DeclareOption{dvips}{\DisabledOption{dvips}}
\DeclareOption{strictcharcheck}{\DisabledOption{strictcharcheck}}
+\DeclareOption{adjustmath}{\DisabledOption{adjustmath}}
%%%% active options
\newif\if@hsspace\@hsspacetrue
@@ -55,8 +56,8 @@
\DeclareOption{nonfrench}{\@nonfrenchtrue}
\newif\if@hanja\@hanjafalse
\DeclareOption{hanja}{\@hanjatrue}
-\newif\if@mathdisp\@mathdispfalse
-\DeclareOption{adjustmath}{\@mathdisptrue}
+\newif\if@mathdisp\@mathdisptrue
+\DeclareOption{mathdisp}{\@mathdispfalse}
\newif\if@arabicfrontmatter{\@arabicfrontmatterfalse}
\DeclareOption{arabicfront}{\@arabicfrontmattertrue}
@@ -80,6 +81,7 @@
\DeclareOption{nounfonts}{\PassOptionsToPackage{\CurrentOption}{xetexko-var}}
\DeclareOption{nanum}{\PassOptionsToPackage{\CurrentOption}{xetexko-var}}
\DeclareOption{hcr}{\PassOptionsToPackage{\CurrentOption}{xetexko-var}}
+\DeclareOption{noto}{\PassOptionsToPackage{\CurrentOption}{xetexko-var}}
\else\ifluatex
%%% luatexko options
\DeclareOption{gremph}{\PassOptionsToPackage{\CurrentOption}{xob-font}}
@@ -93,6 +95,7 @@
\DeclareOption{nounfonts}{\PassOptionsToPackage{\CurrentOption}{xob-font}}
\DeclareOption{nanum}{\PassOptionsToPackage{\CurrentOption}{xob-font}}
\DeclareOption{hcr}{\PassOptionsToPackage{\CurrentOption}{xob-font}}
+\DeclareOption{noto}{\PassOptionsToPackage{\CurrentOption}{xob-font}}
\else
%%% pdftex options
\ifPDFTeX
@@ -106,6 +109,7 @@
\DeclareOption{nounfonts}{\DisabledOption{nounfonts}}
\DeclareOption{nanum}{\DisabledOption{nanum}}
\DeclareOption{hcr}{\DisabledOption{hcr}}
+\DeclareOption{noto}{\DisableOption{noto}}
\fi
\fi\fi
@@ -143,7 +147,7 @@
}
\else
\ifluatex
- \RequirePackage{luatexko}
+ \@ifpackageloaded{luatexko}{}{\RequirePackage{luatexko}}
\RequirePackage{xob-font}
\RequirePackage{xob-dotemph}
\else\ifxetex
@@ -339,7 +343,7 @@
\if@hsspacenoquote\else\adjustquotespacing\fi
\else
\RequirePackage{memucs-setspace}
- \linespread{1.333}
+ \linespread{1.33}
\fi
%\SetHangulspace{1.333}{1.1}
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 27768dbda6c..f8acc43a231 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-2014 Kangsoo Kim <karnes at ktug org>
+%% Copyright (c) 2007-2020 Kangsoo Kim <karnes at ktug org>
%% Copyright (c) 2013 Kihwang Lee <leekh at ktug org>
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%% 2013.08.26
%%
\ProvidesPackage{xetexko-var}
- [2014/06/12 v0.13 Korean Typesetting under XeTeX]
+ [2020/02/05 v0.14 Korean Typesetting under XeTeX]
%%% common options for xob-font
\DeclareOption{gremph}{\PassOptionsToPackage{\CurrentOption}{xob-font}}
@@ -35,8 +35,8 @@
\DeclareOption{manualfontspec}{\@extfontspectrue}
%%% unfonts
-\DeclareOption{unfonts}{\PassOptionsToPackage{\CurrentOption}{xob-font}}
-\DeclareOption{nounfonts}{\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}}
\ProcessOptions\relax
@@ -44,7 +44,9 @@
%%% xetexko sub-styles
\RequirePackage{xetexko-space}
\RequirePackage{xetexko-josa}
+\if@lwarp\else
\RequirePackage{xetexko-vertical}
+\fi
%%% xoblivoir sub-styles
\RequirePackage{xob-dotemph}
@@ -54,7 +56,7 @@
\PackageWarning{xetexko-var}{Load xetexko-font and configure Korean Fonts manually!}{}
\else
%%% We will never use xetexko/luatexko's unfonts option.
- \newif\if@unfonts\@unfontsfalse
+% \newif\if@unfonts\@unfontsfalse
\RequirePackage{xob-font}
\fi
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
index 16095498f7b..cab543826df 100644
--- 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
@@ -1,12 +1,12 @@
%% xob-font.sty
%%
-%% Copyright (c) 2014 Kangsoo Kim <karnes at ktug org>
-%% Copyright (c) 2017 Kihwang Lee <leekh at ktug org>
+%% Copyright (c) 2014-2020 Kangsoo Kim <karnes at ktug org>
+%% Copyright (c) 2017-2020 Kihwang Lee <leekh at ktug org>
%%
%% 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
+%% The latest version otef 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.
@@ -15,7 +15,7 @@
%% oblivoir hangul/hanja font setting.
%% part of oblivoir
%%
-\ProvidesPackage{xob-font}[2017/02/03 v0.7 select hangul/hanja fonts for oblivoir]
+\ProvidesPackage{xob-font}[2020/02/04 v0.8 select hangul/hanja fonts for oblivoir]
%%% obsolete options: retain \if@.. conditions for backward compatibility
\newif\if@nowin\@nowinfalse
@@ -118,9 +118,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, }
+ \tl_put_right:Nn \_font_feature_str
+ {
+ BoldFont = \_bold_font_name,
+ BoldItalicFont = \_bold_font_name,
+ ItalicFont = \_ital_font_name,
+% FontFace = {bx}{n} {Font = {\_bold_font_name}},
+% FontFace = {bx}{it} {Font = {\_bold_font_name}},
+% FontFace = {m}{up} {Font = {\_regu_font_name}}
+ }
}
\bool_if:nF \in_hanja_mode
@@ -200,8 +206,14 @@
\treat_feature_name_options { #4 } [ #5 ]
}
+% \tl_set:Nx \l_tmpa_tl { \_font_feature_str, \_additional_feature_str }
+
\cs:w set #1 hangulfont \cs_end:
- [ \_font_feature_str, \_additional_feature_str ] { \_regu_font_name }
+ [ \_font_feature_str, \_additional_feature_str,
+ FontFace = {bx}{n}{ Font={\_bold_font_name} , \_font_feature_str },
+ FontFace = {m}{up}{ Font={\_regu_font_name} , \_font_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.
@@ -639,17 +651,17 @@
\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@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
@@ -659,19 +671,21 @@
\fi
\setkosansfont(NanumGothic)(*Bold)(*)
\setkomonofont(NanumGothic)
-\fi
-
+\else
%%% [hcr] adds [Script=Hangul] feature automatically.
\if@hcrfonts
- \setkomainfont(HCRBatangLVT)(*-Bold)(*)
- \setkosansfont(HCRDotumLVT)(*-Bold)(*)
+ \setkomainfont(HCRBatangLVT)(HCRBatangLVT-Bold)(HCRBatangLVT)
+ \setkosansfont(HCRDotumLVT)(HCRDotumLVT-Bold)(HCRDotumLVT)
\setkomonofont(HCRDotumLVT)
-\fi
+\else
+\setkomainfont(UnBatang.ttf)(UnBatangBold.ttf)(UnGraphic.ttf)
+\fi\fi
\endinput
%%% end of file `xob-font.sty`
%% CHANGES
+%% v0.8 : suport fontspec’s FontFace feature.
%% v0.7 : Use \sys_if_engine_xetex and \sys_if_engine_luatex instead of xetex_if_engine and luatex_if_engine to be compatible with latest l3kernel.
%% v0.6 : HCR auto insert Script=Hangul, HAN disabled
%% v0.5 : [nanum] sets Bold, [nanumx] sets ExtraBold for NanumMyeongjo
diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xob-lwarp.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xob-lwarp.sty
new file mode 100644
index 00000000000..bbfea75956d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xob-lwarp.sty
@@ -0,0 +1,177 @@
+%% xob-lwarp.sty
+%%
+%% part of xoblivoir package bundle
+%% 2020/02/09
+%%
+\ProvidesPackage{xob-lwarp}
+
+\if@lwarp
+ \def\makerunningwidth#1#2{%
+ \expandafter\let\csname #1headrunwidth\endcsname\textwidth
+ \expandafter\let\csname #1footrunwidth\endcsname\textwidth
+ }
+ \def\makeheadposition#1#2#3#4#5{}
+ \def\copypagestyle#1#2{\makepagestyle{#1}}
+ \AtBeginDocument{
+ \def\@partapp{Part}
+ \def\@chapapp{Chapter}
+ }
+ \AtEndPreamble{
+ \HTMLLanguage{\LWARPlan}
+ }
+
+ \let\if@bsstyle\iftrue
+ \let\abstitlestyle\textbf
+%
+ %%%% copy-paste from xetexko-vertical.sty
+ \ifxetex
+ % do not veticalize headline/footline
+ \begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname selectfont\endcsname\relax % plain
+ \protected\def\verticaltypesetting{%
+ \dimen@\hsize\hsize\vsize\vsize\dimen@
+ \edef\plainoutput{\unexpanded{\dimen@\hsize\hsize\vsize\vsize\dimen@}%
+ \unexpanded\expandafter{\plainoutput}}%
+ \def\pagebody{\setbox\z@\vbox to\hsize{\boxmaxdepth=\maxdepth
+ \pagecontents}\xetexko@rotatebox\z@\box\z@}%
+ \maxdepth\z@ \XK@vertical@spacing}
+ \else % latex
+ \protected\def\verticaltypesetting{%
+ \AtBeginDocument{\XK@vertical@spacing}%
+ \maxdepth\z@
+ \dimen@\textwidth
+ \textwidth\textheight
+ \textheight\dimen@
+ \edef\@outputpage{%
+ \unexpanded{\xetexko@rotatebox\@outputbox\textwidth\textheight}%
+ \unexpanded\expandafter{\@outputpage}}%
+ }
+ \@onlypreamble\verticaltypesetting
+ \fi
+
+ \def\xetexko@rotatebox#1{%
+ \ifvbox#1\count@\@ne\else\count@\z@\fi
+ \dimen@\wd#1\dimen@ii\dimexpr\ht#1+\dp#1\relax
+ \setbox#1\ifnum\count@=\@ne
+ \vbox to\dimen@\bgroup\hbox to\dimen@ii\bgroup\hfil\else
+ \hbox to\dimen@ii\bgroup\vbox to\dimen@\bgroup\fi
+ \wd#1\z@ \ht#1\z@ \dp#1\z@
+ \special{x:gsave}\special{x:rotate -90}\box#1\special{x:grestore}%
+ \ifnum\count@=\@ne\egroup\vfil\else\vfil\egroup\hfil\fi\egroup
+ }
+
+ % users can declare vertical EM size, which might be different from 1em.
+ \newdimen\verticalem
+
+ \def\XK@vertical@spacing{%
+ \ifnum\verticalem > \z@
+ \def\XK@vert@half@em{.5\verticalem}%
+ \else
+ \def\XK@vert@half@em{.5em}%
+ \fi
+ \let\xk@horiz@precjkopenparen \precjkopenparen
+ \let\xk@horiz@precjkcloseparen\precjkcloseparen
+ \let\xk@horiz@precjkfullstop \precjkfullstop
+ \ifx\precjkopenparen\relax\else
+ \def\precjkopenparen {\leavevmode
+ \ifx\empty\xetexkocharraise\else\raise\xetexkocharraise\fi
+ \hbox
+ \ifx\XKdisablecjksymbolspacing\empty
+ \bgroup
+ \else
+ to\XK@vert@half@em \bgroup \hss
+ \fi
+ }%
+ \fi
+ \ifx\precjkcloseparen\relax\else
+ \def\precjkcloseparen{\leavevmode
+ \ifx\empty\xetexkocharraise\else\raise\xetexkocharraise\fi
+ \hbox
+ \ifx\XKdisablecjksymbolspacing\empty\else
+ to\XK@vert@half@em
+ \fi
+ \bgroup}%
+ \fi
+ \ifx\precjkfullstop\relax\else
+ \def\precjkfullstop {\leavevmode
+ \ifx\empty\xetexkocharraise\else\raise\xetexkocharraise\fi
+ \hbox
+ \ifx\XKdisablecjksymbolspacing\empty\else
+ to\XK@vert@half@em
+ \fi
+ \bgroup}%
+ \fi
+ \spaceskip\XK@vert@half@em plus\XK@vert@half@em\relax
+ \parindent\XK@vert@half@em \parindent2\parindent
+ }
+
+ \protected\def\vertical#1{%
+ \setbox\z@\vbox\bgroup
+ \hsize=#1%
+ \leftskip\z@
+ \rightskip\z@
+ \parindent\z@
+ \everypar{}%
+ \XK@vertical@spacing
+ }
+
+ \protected\def\endvertical{%
+ \egroup
+ \dimen@\dimexpr\ht\z@+\dp\z@\relax
+ \dimen@ii\dimexpr\wd\z@-\dp\z@\relax
+ \setbox\z@\hbox{%
+ \kern\dimexpr\ht\z@+0.5em\relax
+ \wd\z@\z@
+ \ht\z@\z@
+ \dp\z@\z@
+ \special{x:gsave}%
+ \special{x:rotate -90}%
+ \box\z@
+ \special{x:grestore}}%
+ \wd\z@\dimen@
+ \ht\z@\z@
+ \dp\z@\z@
+ \leavevmode
+ \raise\dimen@ii\box\z@
+ }
+
+ % horizontal box inside vertical typesetting
+ \protected\def\horizontal#1{%
+ \setbox\z@\vbox\bgroup
+ \hsize=#1%
+ \leftskip \z@
+ \rightskip\z@
+ \parindent\z@
+ \everypar {}%
+ \spaceskip \fontdimen2\font
+ plus \fontdimen3\font
+ minus\fontdimen4\font
+ \ifdefined\xk@horiz@precjkopenparen
+ \let\precjkopenparen \xk@horiz@precjkopenparen
+ \let\precjkcloseparen\xk@horiz@precjkcloseparen
+ \let\precjkfullstop \xk@horiz@precjkfullstop
+ \fi
+ }
+ \protected\def\endhorizontal{%
+ \egroup
+ \dimen@\dimexpr\ht\z@+\dp\z@\relax
+ \dimen@ii\dimexpr\wd\z@+.5ex\relax
+ \setbox\z@\hbox\bgroup
+ \wd\z@\z@\ht\z@\z@\dp\z@\z@
+ \special{x:gsave}%
+ \special{x:rotate 90}%
+ \box\z@
+ \special{x:grestore}%
+ \egroup
+ \wd\z@\dimen@
+ \ht\z@\dimen@ii
+ \dp\z@\z@
+ \fboxsep=-\fboxrule
+ \leavevmode\lower.5ex\box\z@
+ }
+
+ \protected\def\vertlatin#1{\leavevmode\lower0.5ex\hbox{\latinmarks #1}}
+ \fi % end of vertical
+\fi
+\endinput
+
diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-base.cls b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-utf.cls
index bff68d1565e..535b74dbd4c 100644
--- a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-base.cls
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-utf.cls
@@ -1,4 +1,4 @@
-%% File `oblivoir.cls`
+%% File `oblivoir-utf.cls`
%%
%% (C) Copyright 2006-2015 Kangsoo Kim <karnes at ktug org>
%%
@@ -10,8 +10,8 @@
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2006/05/20 or later.
%%
-\ProvidesClass{oblivoir-base}
- [2015/10/19 v0.8.1 article-like class to typeset UTF-8 korean using memoir.]
+\ProvidesClass{oblivoir-utf}
+ [2020/02/10 v0.8.2 article-like class to typeset UTF-8 korean using memoir.]
%\typeout{oblivoir requires memoir, dhucs, and memhangul. 2008/10/23.}
%%% Acknowledgements:
@@ -96,8 +96,8 @@
%%% 2013-09-26
%%% disabled option unfonts/nounfonts, 2014-06-13
\newif\if@unfont\@unfontfalse
-\DeclareOptionX{unfonts}{\@unfonttrue}
-\DeclareOptionX{nounfonts}{\@unfontfalse}
+%\DeclareOptionX{unfonts}{\@unfonttrue}
+%\DeclareOptionX{nounfonts}{\@unfontfalse}
\DeclareOptionX{nanum}{\@unfontfalse}
\DeclareOptionX{uset1font}{\PassOptionsToPackage{\CurrentOption}{nanumfontsel}}
@@ -116,8 +116,18 @@
\DeclareOptionX*{%
\PassOptionsToClass{\CurrentOption}{memoir}%
}
+\newif\if@lwarp\@lwarpfalse
+\DeclareOptionX{lwarp}{}
+\DeclareOptionX{lwarpoption}[]{}
+\DeclareOptionX{lwarplanguage}[]{}
+
\ProcessOptionsX
+%%% \ifLwarp compatibility
+\ExplSyntaxOn
+\tl_new:N \g_lwarp_option_str
+\ExplSyntaxOff
+
%%% moreroom, reported by Juho Lee, 2013-09-26.
%%% 2015-08-01: LaTeX will do auto-alloc.
%\if@FULLROOM
diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-xlua.cls b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-xl.cls
index 5afc06b4b9e..c4ab0916fb1 100644
--- a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-xlua.cls
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-xl.cls
@@ -1,6 +1,6 @@
-%% File `oblivoir-xlua.cls`
+%% File `oblivoir-xl.cls`
%%
-%% (C) Copyright 2006-2015 Kangsoo Kim <karnes at ktug org>
+%% (C) Copyright 2006-2020 Kangsoo Kim <karnes at ktug org>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -13,14 +13,16 @@
%% an oblivoir-compatible package for using with LuaLaTeX or XeLaTeX.
%% depends upon Dohyun Kim's xetexko and the author's memhangul-x.
%%
-\ProvidesClass{oblivoir-xlua}
- [2015/10/19 v0.8.3 article-like class to typeset UTF-8 korean using memoir.]
-\typeout{A variant of oblivoir class for Lua- or XeLaTeX.}
+\ProvidesClass{oblivoir-xl}
+ [2020/02/05 v0.8.4 article-like class to typeset Korean]
+%\typeout{A variant of oblivoir class for Lua- or XeLaTeX.}
\providecommand\@DisabledOption[1]{%
\typeout{[#1] option is deprecated}}
-\RequirePackage{xkeyval}
+%\RequirePackage{xkeyval}
+%% expl3 and xparse
+%\RequirePackage{xparse}
%%% Disabled Options
\DeclareOptionX{dvips}{\@DisabledOption{\CurrentOption}}
@@ -60,9 +62,10 @@
\DeclareOptionX{microtype}{\@microtypetrue}
\newif\if@subfigure\@subfigurefalse
\DeclareOptionX{subfigure}{\@subfiguretrue}
-\DeclareOptionX{adjustmath}{\PassOptionsToPackage{\CurrentOption}{memhangul-x}}
\newif\if@manspace\@manspacefalse
\DeclareOptionX{obspace}{\@manspacetrue}
+\DeclareOptionX{adjustmath}{\PassOptionsToPackage{\CurrentOption}{memhangul-x}} %%% disabled 2020
+\DeclareOptionX{mathdisp}{\PassOptionsToPackage{\CurrentOption}{memhangul-x}}
%
%%% new Options
\DeclareOptionX{latinquote}{\PassOptionsToPackage{\CurrentOption}{memhangul-x}}
@@ -78,9 +81,25 @@
\DeclareOptionX{nowinname}{\PassOptionsToPackage{\CurrentOption}{memhangul-x}}
%
\newif\ifPRELOAD\PRELOADfalse
-\DeclareOptionX{preload}[]{\PRELOADtrue\def\PRELOADstr{#1}}
-\def\PRELOADoptstr{}
-\DeclareOptionX{preloadoption}[]{\def\PRELOADoptstr{#1}}
+\DeclareOptionX{preload}[]{\PRELOADtrue\gdef\PRELOADstr{#1}}
+
+\ExplSyntaxOn
+\tl_new:N \g_preload_option_str
+\DeclareOptionX{preloadoption}[]{
+ \tl_gset:Nn \g_preload_option_str { #1 }
+}
+\ExplSyntaxOff
+
+\newif\if@lwarp\@lwarpfalse
+\DeclareOptionX{lwarp}{\@lwarptrue}{\@lwarpfalse}
+\ExplSyntaxOn
+\tl_new:N \g_lwarp_option_str
+\DeclareOptionX{lwarpoption}[]{%
+ \tl_gset:Nn \g_lwarp_option_str { #1 }
+}
+\ExplSyntaxOff
+\def\LWARPlan{en-US}
+\DeclareOptionX{lwarplanguage}[]{\gdef\LWARPlan{#1}}
%% [nounfonts]
\DeclareOptionX{unfonts}{\PassOptionsToPackage{\CurrentOption}{memhangul-x}}
@@ -105,9 +124,6 @@
%
\ProcessOptionsX
-% expl3
-\RequirePackage{expl3,xparse}
-
%%% moreverb
\if@moreverb
\RequirePackage{moreverb}
@@ -115,14 +131,16 @@
%%% preload
\ifPRELOAD
- \RequirePackage[\PRELOADoptstr]{\PRELOADstr}
- \ifx\medspace\undefined\relax\else\let\medspace\relax\fi
+\ExplSyntaxOn
+ \RequirePackage[\g_preload_option_str]{\PRELOADstr}
+\ExplSyntaxOff
+\ifx\medspace\undefined\relax\else\let\medspace\relax\fi
\fi
%% LyX compatibility
-\ifx\@textsubscript\undefined\else
- \let\@textsubscript\relax
-\fi
+%\ifx\@textsubscript\undefined\else
+% \let\@textsubscript\relax
+%\fi
%%% memoir/memhangul-ucs 로드.
\if@chapter
@@ -144,11 +162,6 @@
\fa@dblfoursix
\fi
-%%% ams{math|symb}
-\if@amsmath
- \RequirePackage{amsmath,xob-amssymb}
-\fi
-
%%%
\ifopenrightdoc\openright\fi
@@ -162,6 +175,24 @@
% \PackageError{xoblivoir}{This Document requires Xe(La)TeX or Lua(La)TeX!}{}
%\fi\fi
+%%% lwarp
+\ExplSyntaxOn
+
+\if@lwarp
+ \ifluatex
+ \RequirePackage{luatexko}
+ \fi
+ \RequirePackage[\g_lwarp_option_str]{lwarp}
+ \RequirePackage{xob-lwarp}
+\fi
+
+\ExplSyntaxOff
+
+%%% ams{math|symb}
+\if@amsmath
+ \RequirePackage{amsmath,xob-amssymb}
+\fi
+
\def\@Load@Memhangul{%
\if@polyglossia
\RequirePackage[polyglossia]{memhangul-x}
@@ -464,6 +495,9 @@
{ \let\globcount\newcount }
\ExplSyntaxOff
+%%% for LaTeX programmers
+\let\ifLwarp\if@lwarp
+
\endinput
%%% ChangeLog:
diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir.cls b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir.cls
index 82c2faa98db..79a0f8f908b 100644
--- a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir.cls
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir.cls
@@ -1,7 +1,6 @@
%% File `oblivoir.cls`
%%
-%% (C) Copyright 2006-2013 Kangsoo Kim <karnes at ktug org>
-%% (C) Copyright 2013 Kihwang Lee <leekh at ktug org>
+%% (C) Copyright 2006-2020 Kangsoo Kim <karnes at ktug org>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -11,13 +10,57 @@
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2006/05/20 or later.
%%
-%% Read LICENSE included in the package.
-%%
-%% --------------------------------------------------------
-%% oblivoir.cls
+\ProvidesClass{oblivoir}[2020/02/09 v2.2]
+
+\RequirePackage{xkeyval}
+\RequirePackage{xparse}
+
+\newif\if@CJK\@CJKfalse
+\DeclareOptionX{cjk}[]{\@CJKtrue}
+\DeclareOptionX{dhucs}[]{\@CJKfalse}
+%%%
+%%% [fontspec] option introduced
+\DeclareOptionX{fontspec}[]{\PassOptionsToPackage{{#1}}{fontspec}}
+\DeclareOptionX{hyperref}[]{\PassOptionsToPackage{#1}{hyperref}}
+\DeclareOptionX{xcolor}[]{\PassOptionsToPackage{#1}{xcolor}}
+\DeclareOptionX{chapter}[]{}
+
+\ProcessOptionsX
+
+%%% ifluaorxetex.sty
+\RequirePackage{iftex}
+
+\newif\ifLuaOrXeTeX
+%\ifXeTeX\global\LuaOrXeTeXtrue
+% \else\ifLuaTeX\global\LuaOrXeTeXtrue
+% \else\global\LuaOrXeTeXfalse
+%\fi\fi
+\ExplSyntaxOn
+\bool_if:nTF { \sys_if_engine_xetex_p: || \sys_if_engine_luatex_p: }
+{
+ \LuaOrXeTeXtrue
+}
+{
+ \LuaOrXeTeXfalse
+}
+\ExplSyntaxOff
-\ProvidesClass{oblivoir}
-\LoadClassWithOptions{xoblivoir}
+\ifLuaOrXeTeX
+\LoadClassWithOptions{oblivoir-xl}
+% \ifLuaTeX
+% \typeout{HANGUL DRIVER: luatexko}
+% \else
+% \typeout{HANGUL DRIVER: xetexko}
+% \fi
+\else
+ \if@CJK
+ \LoadClassWithOptions{oblivoir-xl}
+ \typeout{HANGUL DRIVER: cjk-ko}
+ \else
+ \LoadClassWithOptions{oblivoir-utf}
+ \typeout{HANGUL DRIVER: kotex-utf}
+ \fi
+\fi
\endinput
diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/xoblivoir.cls b/Master/texmf-dist/tex/latex/kotex-oblivoir/xoblivoir.cls
index 4d7851eba89..4d2c8424255 100644
--- a/Master/texmf-dist/tex/latex/kotex-oblivoir/xoblivoir.cls
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/xoblivoir.cls
@@ -1,6 +1,7 @@
%% File `xoblivoir.cls`
%%
-%% (C) Copyright 2006-2015 Kangsoo Kim <karnes at ktug org>
+%% (C) Copyright 2006-2020 Kangsoo Kim <karnes at ktug org>
+%% (C) Copyright 2013 Kihwang Lee <leekh at ktug org>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -10,45 +11,13 @@
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2006/05/20 or later.
%%
-\ProvidesClass{xoblivoir}[2015/07/27]
-
-\RequirePackage{xkeyval}
-
-\newif\if@CJK\@CJKfalse
-\DeclareOptionX{cjk}[]{\@CJKtrue}
-\DeclareOptionX{dhucs}[]{\@CJKfalse}
-%%%
-%%% [fontspec] option introduced
-\DeclareOptionX{fontspec}[]{\PassOptionsToPackage{{#1}}{fontspec}}
-\DeclareOptionX{hyperref}[]{\PassOptionsToPackage{#1}{hyperref}}
-\DeclareOptionX{xcolor}[]{\PassOptionsToPackage{#1}{xcolor}}
-
-\ProcessOptionsX
-
-%%% ifluaorxetex.sty
-\RequirePackage{iftex}
+%% Read LICENSE included in the package.
+%%
+%% --------------------------------------------------------
+%% oblivoir.cls
-\newif\ifLuaOrXeTeX
-\ifXeTeX\global\LuaOrXeTeXtrue
- \else\ifLuaTeX\global\LuaOrXeTeXtrue
- \else\global\LuaOrXeTeXfalse
-\fi\fi
+\ProvidesClass{xoblivoir}
-\ifLuaOrXeTeX
-\LoadClassWithOptions{oblivoir-xlua}
-% \ifLuaTeX
-% \typeout{HANGUL DRIVER: luatexko}
-% \else
-% \typeout{HANGUL DRIVER: xetexko}
-% \fi
-\else
- \if@CJK
- \LoadClassWithOptions{oblivoir-xlua}
- \typeout{HANGUL DRIVER: cjk-ko}
- \else
- \LoadClassWithOptions{oblivoir-base}
- \typeout{HANGUL DRIVER: kotex-utf}
- \fi
-\fi
+\LoadClassWithOptions{oblivoir}
\endinput