summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/kotex-oblivoir
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-03-12 23:30:42 +0000
committerKarl Berry <karl@freefriends.org>2021-03-12 23:30:42 +0000
commit0c4f41d2d7d60b48d60d5c43d11efd0ac2559eab (patch)
treeaf0dcadba965a377b4c73b008da29d25dca5c981 /Master/texmf-dist/tex/latex/kotex-oblivoir
parent1693549f9000660a7545f69e6296e37daea79429 (diff)
kotex-oblivoir (9mar21)
git-svn-id: svn://tug.org/texlive/trunk@58310 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/memhangul-common.sty376
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/memucs-setspace.sty127
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/obchaptertoc.sty223
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/ob-mathleading.sty144
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/ob-unfontsdefault.sty143
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xob-font.sty52
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-xl.cls4
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir.cls4
-rw-r--r--Master/texmf-dist/tex/latex/kotex-oblivoir/xoblivoir.cls2
9 files changed, 987 insertions, 88 deletions
diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/memhangul-common.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/memhangul-common.sty
index 4550be54675..f96aafc7317 100644
--- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/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-2020 Kangsoo Kim <karnes at ktug org>
+%% (C) Copyright 2013-2021 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}[2020/02/05]
+\ProvidesPackage{memhangul-common}[2021/03/03]
\let\@CHAPAPP\@chapapp
\def\refreshprepostchapters{%
@@ -66,8 +66,41 @@
% \fi
% \printparttitle{#2}\par}%
% \@endpart}
+%%%%\long\def\@part[#1]#2{%
+%%%%% \ifx#1\@empty\PrerenderUnicode{#2}\else\PrerenderUnicode{#1}\fi
+%%%% \M@gettitle{#1}%
+%%%% \def\f@rtoc{#1}%
+%%%% \@nameuse{part@f@rtoc@before@write@hook}%
+%%%% \phantomsection
+%%%% \mempreaddparttotochook
+%%%% \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
+%%%% \mempostaddparttotochook
+%%%% \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\obparttitlealignment{\centering}
+
\long\def\@part[#1]#2{%
-% \ifx#1\@empty\PrerenderUnicode{#2}\else\PrerenderUnicode{#1}\fi
\M@gettitle{#1}%
\def\f@rtoc{#1}%
\@nameuse{part@f@rtoc@before@write@hook}%
@@ -76,17 +109,19 @@
\ifnum \c@secnumdepth >-2\relax
\refstepcounter{part}%
\addcontentsline{toc}{part}%
-% {\protect\partnumberline{\thepart}#1}%
- {\protect\partnumberline{\hparttitlehead}#1}%
- \mempartinfo{\thepart}{#1}{#2}%
+% {\protect\partnumberline{\thepart}\f@rtoc}%
+ {\protect\partnumberline{\hparttitlehead}\f@rtoc}%
+ \mempartinfo{\thepart}{\f@rtoc}{#2}%
\else
- \addcontentsline{toc}{part}{#1}%
- \mempartinfo{}{#1}{#2}%
+ \addcontentsline{toc}{part}{\f@rtoc}%
+ \mempartinfo{}{\f@rtoc}{#2}%
\fi
\mempostaddparttotochook
\partmark{#1}%
- {\centering
+ {%\centering
+ \obparttitlealignment
\interlinepenalty \@M
+ \parskip\z@
\normalfont
\ifnum \c@secnumdepth >-2\relax
% \printpartname \partnamenum \printpartnum
@@ -227,16 +262,13 @@
\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
@@ -296,6 +328,75 @@
\memendofchapterhook%
}
+%%%\def\@chapter[#1]#2{%
+%%% \m@mpn@new@chaptrue%
+%%% \m@mpn@new@schapfalse%
+%%% \def\f@rbdy{#2}%
+%%% \ifx\ch@pt@c\@empty % no optional args
+%%% \def\f@rtoc{#2}%
+%%% \def\f@rhdr{#2}%
+%%% \else % at least one opt arg
+%%% \let\f@rtoc\ch@pt@c
+%%% \ifx\@empty#1\@empty
+%%% \let\f@rhdr\ch@pt@c
+%%% \else
+%%% \def\f@rhdr{#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
+%%% \@nameuse{chapter@f@rtoc@before@write@hook}%
+%%% \mempreaddchaptertotochook%
+%%% \ifm@m@And
+%%% \ifanappendix
+%%% \addcontentsline{toc}{appendix}{%
+%%% \protect\chapternumberline{\hchaptertitlehead}\f@rtoc}%
+%%% \memappchapinfo{\thechapter}{\f@rtoc}{\f@rhdr}{#2}%
+%%% \else
+%%% \addcontentsline{toc}{chapter}{%
+%%% \protect\chapternumberline{\hchaptertitlehead}\f@rtoc}%
+%%% \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
+%%% \mempostaddchaptertotochook%
+%%% \ifheadnameref\M@gettitle{\f@rhdr}\else\M@gettitle{\f@rtoc}\fi
+%%% \ifanappendix
+%%% \protected@edef\@currentlabel{\thechapter}%
+%%% \fi
+%%% \memendofchapterhook%
+%%%}
+
%\def\@makechapterhead#1{%
% \chapterheadstart% \vspace*{50\p@}%
% {\parindent \z@ \raggedright \normalfont
@@ -319,14 +420,30 @@
\prechapternum \chapternamenum \printchapternum
\chapternamenum \postchapternum \afterchapternum}{}{}
+%%%\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}
+
\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}}%
@@ -335,18 +452,20 @@
\memappchapstarinfo{\f@rhdr}{#2}%
\else
\memchapstarinfo{\f@rhdr}{#2}%
- \fi}
+ \fi
+ \ifheadnameref\M@gettitle{\f@rhdr}\else\M@gettitle{#2}\fi}
-\def\@makeschapterhead#1{%
- \chapterheadstart
-% {\parindent \z@ \raggedright \normalfont
- {\parindent \z@ \raggedright \normalfont \memucsinterwordchapterskiphook
- \printchapternonum
- \interlinepenalty\@M
- \printchaptertitle{#1}
- \afterchaptertitle
- }
-}
+
+%%%%\def\@makeschapterhead#1{%
+%%%% \chapterheadstart
+%%%%% {\parindent \z@ \raggedright \normalfont
+%%%% {\parindent \z@ \raggedright \normalfont \memucsinterwordchapterskiphook
+%%%% \printchapternonum
+%%%% \interlinepenalty\@M
+%%%% \printchaptertitle{#1}
+%%%% \afterchaptertitle
+%%%% }
+%%%%}
%%%%%%%%%%%%%
@@ -759,24 +878,47 @@
\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
+
\def\obCaptionFont#1{\def\@figtabcaptfont@{#1}}
+\def\obCaptionnameOpen{\cnm@char@open}
+\def\obCaptionnameClose{\cnm@char@close}
\providecommand\@figtabcaptfont@{\normalfont}
\if@figtabcapt@
-\AtBeginDocument{
+\AtBeginDocument{%
\@ifpackageloaded{caption}{% requested by Progress
- \DeclareCaptionLabelFormat{xob-cnm-parens}{\cnm{#1~#2}}
- \captionsetup{labelformat=xob-cnm-parens,labelsep=space}
+ \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}
-}
+ \precaption{{\@figtabcaptfont@\obCaptionnameOpen}}
+ \captiondelim{{\@figtabcaptfont@\obCaptionnameClose}\quad}
+ \renewcommand\cfttablepresnum{\obCaptionnameOpen\tablename\space}
+ \renewcommand\cfttableaftersnum{\obCaptionnameClose}
+ \setlength\cfttablenumwidth{3.8em}
+ \renewcommand\cftfigurepresnum{\obCaptionnameOpen\figurename\space}
+ \renewcommand\cftfigureaftersnum{\obCaptionnameClose}
+ \setlength\cftfigurenumwidth{4.5em}
+}%
}
\fi
@@ -1176,6 +1318,166 @@
\pagestyle{hangul}
\fi
+%%% 2021/03/03: adjustwidth
+\newdimen\memucsadjustwidthtopsep
+\renewenvironment{adjustwidth}[2]{%
+ \begin{list}{}{%
+ \ifdim\onelineskip=\baselineskip
+ \memucsadjustwidthtopsep\z@\else
+ \memucsadjustwidthtopsep=\dimexpr\onelineskip-\baselineskip\relax
+ \fi
+% \topsep\z@%
+ \topsep.5\memucsadjustwidthtopsep
+ \listparindent\parindent%
+ \parsep\parskip%
+ \@ifmtarg{#1}{\setlength{\leftmargin}{\z@}}%
+ {\setlength{\leftmargin}{#1}}%
+ \@ifmtarg{#2}{\setlength{\rightmargin}{\z@}}%
+ {\setlength{\rightmargin}{#2}}%
+ }
+ \item[]}{\end{list}}
+
+\renewenvironment{adjustwidth*}[2]{%
+ \begin{list}{}{%
+% \topsep\z@%
+ \topsep.5\memucsadjustwidthtopsep
+ \listparindent\parindent%
+ \parsep\parskip%
+ \checkoddpage
+ \ifoddpage % odd numbered page
+ \@ifmtarg{#1}{\setlength{\leftmargin}{\z@}}%
+ {\setlength{\leftmargin}{#1}}%
+ \@ifmtarg{#2}{\setlength{\rightmargin}{\z@}}%
+ {\setlength{\rightmargin}{#2}}%
+ \else % even numbered page
+ \@ifmtarg{#2}{\setlength{\leftmargin}{\z@}}%
+ {\setlength{\leftmargin}{#2}}%
+ \@ifmtarg{#1}{\setlength{\rightmargin}{\z@}}%
+ {\setlength{\rightmargin}{#1}}%
+ \fi
+ }
+ \item[]}{\end{list}}
+
+
+%%% lists
+%%% newly added
+\newcommand*{\oblivoirlists}{%
+ \@ifstar{\ob@sfirmlists}{\ob@firmlists}}
+
+\newcommand*{\ob@sfirmlists}{
+ \setlength{\partopsep}{\z@ \@plus \p@ \@minus \p@}%
+ \parsepi = 0.0833\onelineskip \@plus 0.04\onelineskip \@minus \p@
+ \itemsepi = \parsepi
+ \topsepi = \parsepi
+ \parsepii = 0.04\onelineskip \@plus \p@ \@minus \p@
+ \topsepii = \parsepi
+ \topsepiii = \parsepii
+ \everylistparindent\listparindent}
+
+\newcommand*{\ob@firmlists}{
+ \setlength{\partopsep}{0.05\onelineskip \@plus 0.02\onelineskip
+ \@minus 0.02\onelineskip}%
+ \parsepi = 0.0833\onelineskip \@plus 0.04\onelineskip \@minus \p@
+ \itemsepi = \parsepi
+ \topsepi = \parsepi
+ \parsepii = 0.04\onelineskip \@plus \p@ \@minus \p@
+ \topsepii = \parsepi
+ \topsepiii = \parsepii
+ \everylistparindent\listparindent}
+
+\newcommand{\oblivoirlist}{%
+ \setlength{\itemsep}{0.3\itemsep}\setlength{\parskip}{0.3\parskip}}
+
+\newcommand\obadjustlists{%
+ \global\let\defaultlist\firmlist
+ \global\let\defaultlists\firmlists
+ \global\let\firmlist\oblivoirlist
+ \global\let\firmlists\oblivoirlists
+ \defaultlists
+}
+
+
+%%% \ReleaseMacros
+%%% newly added
+\ExplSyntaxOn
+\NewDocumentCommand \ReleaseMacros { m }
+{
+ \clist_set:Nn \l_tmpa_clist { #1 }
+ \clist_map_inline:Nn \l_tmpa_clist
+ {
+ \cs_undefine:N ##1
+ }
+}
+\@onlypreamble\ReleaseMacros
+
+\ExplSyntaxOff
+
+
+%%%% trim K mark
+\providecommand*{\tmarkKtm}{%
+ \begin{picture}(0,0)%
+ \unitlength 1mm
+ \thinlines
+ \put(0,4){\line(0,1){8}}
+ \end{picture}}
+\providecommand*{\tmarkKml}{%
+ \begin{picture}(0,0)%
+ \unitlength 1mm
+ \thinlines
+ \put(-4,0){\line(-1,0){8}}
+ \end{picture}}
+\providecommand*{\tmarkKmr}{%
+ \begin{picture}(0,0)%
+ \unitlength 1mm
+ \thinlines
+ \put(4,0){\line(1,0){8}}
+ \end{picture}}
+\providecommand*{\tmarkKbm}{%
+ \begin{picture}(0,0)%
+ \unitlength 1mm
+ \thinlines
+ \put(0,-12){\line(0,1){8}}
+ \end{picture}}
+\providecommand*{\Ktrimpictl}{%
+ \begin{picture}(0,0)
+ \unitlength 1mm
+ \thinlines
+ \put(-4,0){\line(-1,0){10}}
+ \put(0,4){\line(0,1){10}}
+ \end{picture}}
+\providecommand*{\Ktrimpictr}{%
+ \begin{picture}(0,0)
+ \unitlength 1mm
+ \thinlines
+ \put(4,0){\line(1,0){10}}
+ \put(0,4){\line(0,1){10}}
+ \end{picture}}
+\providecommand*{\Ktrimpicbl}{%
+ \begin{picture}(0,0)
+ \unitlength 1mm
+ \thinlines
+ \put(-4,0){\line(-1,0){10}}
+ \put(0,-4){\line(0,-1){10}}
+ \end{picture}}
+\providecommand*{\Ktrimpicbr}{%
+ \begin{picture}(0,0)
+ \unitlength 1mm
+ \thinlines
+ \put(4,0){\line(1,0){10}}
+ \put(0,-4){\line(0,-1){10}}
+ \end{picture}}
+
+\providecommand*{\trimKmarks}{%
+ \let\tmarktl\Ktrimpictl
+ \let\tmarktr\Ktrimpictr
+ \let\tmarkbl\Ktrimpicbl
+ \let\tmarkbr\Ktrimpicbr
+ \let\tmarktm\tmarkKtm
+ \let\tmarkbm\tmarkKbm
+ \let\tmarkml\tmarkKml
+ \let\tmarkmr\tmarkKmr
+}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/memucs-setspace.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/memucs-setspace.sty
index a4353ab9715..69e6c8d6114 100644
--- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/memucs-setspace.sty
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/memucs-setspace.sty
@@ -1,6 +1,6 @@
%% File `memucs-setspace.sty`
%%
-%% Copyright (c) 2007-2013 Kangsoo Kim <karnes at ktug org>
+%% Copyright (c) 2007-2021 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
@@ -50,8 +50,8 @@
\NeedsTeXFormat {LaTeX2e}[1994/12/09]
\def \filename {memucs-setspace.sty}
-\def \filedate {2007/09/21}
-\def \fileversion {6.7-memucs8}
+\def \filedate {2021/03/03}
+\def \fileversion {6.7-mu9}
\ProvidesPackage {memucs-setspace}[\filedate\space\fileversion\space
Contributed and Supported LaTeX2e package]
\typeout {Package: `memucs-setspace', a modified version of `setspace', \fileversion\space <\filedate>}
@@ -334,42 +334,117 @@
% cannot (AFAIK) be avoided, because LaTeX (2e) LACKS appropriate
% standard hooks and/or context markers.
\if@singlespacefn
-\def\m@mold@footnotetext{\@memsetspace@footnotetext}
-\renewcommand{\@footnotetext}[1]{\m@mold@footnotetext{#1}\m@mmf@prepare}
-\long\def\@memsetspace@footnotetext#1{%
- \insert\footins{%
-% GT: Next line added. Hook desired here!
- \@floatfnspacinghook\memucsfninterwordhook
-% \def\baselinestretch {\setspace@hangulfspace}%
-% \@SetFloatspaces
- \reset@font\footnotesize
- \interlinepenalty\interfootnotelinepenalty
- \splittopskip\footnotesep
- \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
+%%%%\def\m@mold@footnotetext{\@memsetspace@footnotetext}
+%%%%\renewcommand{\@footnotetext}[1]{\m@mold@footnotetext{#1}\m@mmf@prepare}
+%%%%\long\def\@memsetspace@footnotetext#1{%
+%%%% \insert\footins{%
+%%%%% GT: Next line added. Hook desired here!
+%%%% \@floatfnspacinghook\memucsfninterwordhook
+%%%%% \def\baselinestretch {\setspace@hangulfspace}%
+%%%%% \@SetFloatspaces
+%%%% \reset@font\footnotesize
+%%%% \interlinepenalty\interfootnotelinepenalty
+%%%% \splittopskip\footnotesep
+%%%% \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
+%%%% \hsize\columnwidth
+%%%% \@parboxrestore
+%%%% \protected@edef\@currentlabel{%
+%%%% \csname p@footnote\endcsname\@thefnmark
+%%%% }%
+%%%% \color@begingroup
+%%%% \@makefntext{%
+%%%% \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+%%%% \color@endgroup}}
+%%%%
+%%%%% Minipage footnotes.
+%%%%\renewcommand{\@mpfootnotetext}[1]{%
+%%%% \global\setbox\@mpfootins\vbox{%
+%%%% \unvbox\@mpfootins
+%%%%% GT: Next line added. Hook desired here!
+%%%% \@floatfnspacinghook\memucsfninterwordhook
+%%%%% \def\baselinestretch {\setspace@hangulfspace}%
+%%%% \foottextfont \hsize\columnwidth \@parboxrestore
+%%%% \protected@edef\@currentlabel{\csname p@mpfootnote\endcsname\@thefnmark}%
+%%%% \color@begingroup
+%%%% \@makefntext{%
+%%%% \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+%%%% \color@endgroup}}
+
+\renewcommand{\@footnotetext}[1]{%
+ \ifm@mfnmargin% use marginpar
+ \marginpar{%
+% \def\baselinestretch{\m@m@footnote@spacing}%
+ \@floatfnspacinghook\memucsfninterwordhook
+ \reset@font
+ \foottextfont
+ \protected@edef\@currentlabel{%
+ \csname p@footnote\endcsname\@thefnmark}%
+ \color@begingroup
+ \@makefntext{\ignorespaces#1}%
+ \color@endgroup}%
+ \else% regular feet
+ \insert\footins{%
+ % \def\baselinestretch{\m@m@footnote@spacing}%
+ \@floatfnspacinghook\memucsfninterwordhook
+ \reset@font
+ \foottextfont
+ \@preamfntext
\hsize\columnwidth
- \@parboxrestore
\protected@edef\@currentlabel{%
- \csname p@footnote\endcsname\@thefnmark
- }%
+ \csname p@footnote\endcsname\@thefnmark}%
\color@begingroup
\@makefntext{%
- \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
- \color@endgroup}}
+ \rule\z@\footnotesep\ignorespaces{\foottextfont #1}%
+ \@finalstrut\strutbox}%
+ \color@endgroup}%
+ \fi%
+ \m@mmf@prepare}
-% Minipage footnotes.
\renewcommand{\@mpfootnotetext}[1]{%
\global\setbox\@mpfootins\vbox{%
\unvbox\@mpfootins
-% GT: Next line added. Hook desired here!
- \@floatfnspacinghook\memucsfninterwordhook
-% \def\baselinestretch {\setspace@hangulfspace}%
+% \def\baselinestretch{\m@m@footnote@spacing}%
+ \@floatfnspacinghook\memucsfninterwordhook
\foottextfont \hsize\columnwidth \@parboxrestore
- \protected@edef\@currentlabel{\csname p@mpfootnote\endcsname\@thefnmark}%
+ \protected@edef\@currentlabel{%
+ \csname p@mpfootnote\endcsname\@thefnmark}%
\color@begingroup
+ \reset@font%
\@makefntext{%
- \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+ \rule\z@\footnotesep\ignorespaces{\foottextfont #1}%
+ \@finalstrut\strutbox}%
\color@endgroup}}
+\renewcommand{\@sidefootnotetext}[1]{\insert\sidefootins{%
+ \hsize\sidefootwidth
+ \@parboxrestore
+% \def\baselinestretch{\m@m@footnote@spacing}%
+ \@floatfnspacinghook\memucsfninterwordhook
+ \sidefootform \normalsize\normalfont\sidefoottextfont
+ \splittopskip=\ht\strutbox
+ \splitmaxdepth=\dp\strutbox
+ \allowbreak
+ \prevdepth=\dp\strutbox
+ \vskip-\parskip
+ \protected@edef\@currentlabel{%
+ \csname p@sidefootnote\endcsname\@thesidefnmark}%
+\color@begingroup
+\@makesidefntext{{\sidefoottextfont #1}}%
+\color@endgroup
+ \ifvmode\else
+ \unskip\@finalstrut\strutbox
+ \fi
+ \par
+ \ifdim\prevdepth>\dp\strutbox \prevdepth=\dp\strutbox\fi
+ \ifdim\prevdepth>99\p@
+ \nobreak
+ \vskip-\prevdepth
+ \allowbreak
+ \vskip\dp\strutbox
+ \fi
+ \vskip\sidefootvsep}%
+ \m@mmf@prepare}
+
\else\fi
% ** Line space environments.
diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/obchaptertoc.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/obchaptertoc.sty
new file mode 100644
index 00000000000..3e9b5eb4af5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/obchaptertoc.sty
@@ -0,0 +1,223 @@
+%%%
+%%% \chaptertoc for oblivoir
+%%% part of kotex-oblivoir package.
+%%%
+%%% written by Nova de Hi
+%%%
+\ProvidesPackage{obchaptertoc}[2020/09/03, v2.0]
+\RequirePackage{l3keys2e}
+
+\ExplSyntaxOn
+\msg_new:nnn { obchaptertoc } { haltmsg } { class~oblivoir~not~loaded }
+\@ifclassloaded{oblivoir}{}{\msg_error:nn { obchaptertoc } { haltmsg }}
+
+\keys_define:nn { obchaptoc }
+{
+ level .tl_set:N = \opt_level_tl
+}
+
+\tl_set:Nn \opt_level_tl { chapter } % default
+\ProcessKeysOptions { obchaptoc }
+
+\ExplSyntaxOff
+
+\RequirePackage{etoolbox}
+%%%
+%%%%%% hooking oblivoir's chapter command
+%%%\def\@chapter[#1]#2{%
+%%% \m@mpn@new@chaptrue%
+%%% \m@mpn@new@schapfalse%
+%%% \def\f@rbdy{#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
+%%% \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
+%%% \@nameuse{chapter@f@rtoc@before@write@hook}%
+%%% \mempreaddchaptertotochook%
+%%% \ifm@m@And
+%%% \ifanappendix
+%%% \addcontentsline{toc}{appendix}{%
+%%% \protect\chapternumberline{\hchaptertitlehead}\f@rtoc}%
+%%% \memappchapinfo{\thechapter}{\f@rtoc}{\f@rhdr}{#2}%
+%%% \else
+%%% \addcontentsline{toc}{chapter}{%
+%%% \protect\chapternumberline{\hchaptertitlehead}\f@rtoc}%
+%%% \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
+%%% \mempostaddchaptertotochook%
+%%% \ifheadnameref\M@gettitle{\f@rhdr}\else\M@gettitle{\f@rtoc}\fi
+%%% \ifanappendix
+%%% \protected@edef\@currentlabel{\thechapter}%
+%%% \fi
+%%% \memendofchapterhook%
+%%%}
+
+\newcounter{tocmarker}
+% start marker
+\ExplSyntaxOn
+
+\clist_new:N \l_upperlevel_clist
+
+\str_case_e:nnTF { \opt_level_tl }
+{
+ { book } { \clist_set:Nn \l_upperlevel_clist { book } }
+ { chapter } { \clist_set:Nn \l_upperlevel_clist { part, book, chapter } }
+ { part } { \clist_set:Nn \l_upperlevel_clist { book, part } }
+ { apppage } { \clist_set:Nn \l_upperlevel_clist { apppage } }
+}
+{
+ \cs_set:cn { mempostadd \opt_level_tl totochook: }
+ {
+ \stepcounter{tocmarker}\cftinserthook{toc}{start-\thetocmarker}
+ }
+ \cs_set_eq:cc { mempostadd \opt_level_tl totochook } { mempostadd \opt_level_tl totochook: }
+
+ \clist_map_inline:Nn \l_upperlevel_clist
+ {
+ \cs_set:cn { mempreadd #1 totochook: }
+ {
+ \cftinserthook{toc}{end-\thetocmarker}
+ }
+ \cs_set_eq:cc { mempreadd #1 totochook } { mempreadd #1 totochook: }
+ }
+}
+{
+ \renewcommand\mempreaddchaptertotochook{\cftinserthook{toc}{end-\thetocmarker}}
+ \renewcommand\mempreaddparttotochook {\cftinserthook{toc}{end-\thetocmarker}}
+ \renewcommand\mempreaddbooktotochook {\cftinserthook{toc}{end-\thetocmarker}}
+ \renewcommand\mempreaddapppagetotochook{\cftinserthook{toc}{end-\thetocmarker}}
+
+ \renewcommand\mempostaddchaptertotochook{%
+ \stepcounter{tocmarker}\cftinserthook{toc}{start-\thetocmarker}}
+}
+\ExplSyntaxOff
+
+\let\normalchangetocdepth\changetocdepth
+
+\def\chaptertocfont{\rmfamily}
+\def\chaptertocsecfont{\normalfont\normalsize}
+
+\NewDocumentCommand\@ChapterTOCFormat{}
+{%
+ \setlength{\cftsectionindent}{0pt}
+ \setlength{\cftsubsectionindent}{\cftsectionnumwidth}
+ \setlength{\cftsubsubsectionindent}{\cftsubsectionindent}
+ \addtolength{\cftsubsubsectionindent}{\cftsubsectionnumwidth}
+ \renewcommand\cftsectionfont{\chaptertocsecfont}
+% \renewcommand\cftsectionpresnum{}
+% \renewcommand\cftsectionaftersnum{}
+% \renewcommand\cftsectiondotsep{\cftnodots}
+% \renewcommand\cftsubsectiondotsep{\cftnodots}
+% \renewcommand\cftsectionpagefont{\chaptertocsecfont}
+% \renewcommand\cftsubsectionfont{\chaptertocsecfont}
+% \renewcommand\cftsubsectionpagefont{\chaptertocsecfont}
+% \renewcommand\cftsubsubsectionfont{\chaptertocsecfont}
+% \renewcommand\cftsubsubsectionpagefont{\chaptertocsecfont}
+% \renewcommand\cftsectionformatpnum[1]{}
+% \renewcommand\cftsubsectionformatpnum[1]{}
+}
+
+\NewDocumentCommand\ChapterTOCFormat{+m}
+{
+ \apptocmd\@ChapterTOCFormat{#1}{}{}
+}
+
+\newskip\afterchaptertocskip
+\let\afterchaptertocskip\bigskip
+
+\ExplSyntaxOn
+
+\newcounter{obchaptocmaxdepth}\setcounter{obchaptocmaxdepth}{2} % default = subsection
+\NewDocumentCommand \chaptertocmaxlevel { m }
+{
+ \regex_match:nnTF { [0-9] } { #1 }
+ {
+ \setcounter{obchaptocmaxdepth} { #1 }
+ }
+ {
+ \@setclcnt{#1}{obchaptocmaxdepth}
+ }
+}
+
+\NewDocumentCommand \TOCFormatsameas { m m m }
+{
+ \clist_set:Nn \l_tmpa_clist { #3 }
+ \clist_map_inline:Nn \l_tmpa_clist
+ {
+ \cs_set_eq:cc { cft #1 ##1 } { cft #2 ##1 }
+ }
+}
+
+\ExplSyntaxOff
+
+\newif\ifChapterTOCafterskip
+\ChapterTOCafterskiptrue
+
+\newcommand\chaptertoc{
+ \begingroup
+ \chaptertocfont
+ \let\@orig@markboth\markboth
+ \renewcommand\markboth[2]{}
+ \setcounter{@memmarkcntra}{\value{tocdepth}}
+ \let\changetocdepth\@gobble
+ \normalchangetocdepth{-10}
+ \cftinsertcode{start-\thetocmarker}{\normalchangetocdepth{\theobchaptocmaxdepth}}
+ \cftinsertcode{end-\thetocmarker}{\normalchangetocdepth{-10}}
+ \let\tocheadstart\relax
+ \let\printtoctitle\@gobble
+ \let\aftertoctitle\relax
+ %%% formatting chaptertoc
+ \@ChapterTOCFormat
+ \tableofcontents*
+ \endgroup
+ \setcounter{tocdepth}{\value{@memmarkcntra}}
+ \m@mindentafterchapter
+ \ifChapterTOCafterskip
+ \par\afterchaptertocskip
+ \fi
+ \@afterheading
+}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/ob-mathleading.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/ob-mathleading.sty
new file mode 100644
index 00000000000..010c83ec2aa
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/ob-mathleading.sty
@@ -0,0 +1,144 @@
+%%
+%% file: ob-mathleading.sty
+%%
+%% written by nova
+%%
+%% a supplementary package to oblivoir
+%% set lineskips in multi-lined math environments
+%% (amsmath required)
+%%
+%% v. 0.1alpha : 2018/12/22
+%% v. 0.0.1-pr2 : 2018/12/24
+%% v. 0.0.1 : 2018/12/25
+%%
+\RequirePackage{expl3}
+\ProvidesExplPackage
+ {ob-mathleading}
+ {2018/12/25}
+ {v0.0.1}
+ {adjust math leadings for oblivoir}
+
+\@ifpackageloaded{amsmath}{}{\RequirePackage{amsmath}}
+\RequirePackage{xparse}
+\RequirePackage{etoolbox}
+\RequirePackage{l3keys2e}
+
+\keys_define:nn { obmathleading }
+{
+ default .bool_set:N = \l_defaultopt_bool,
+ mathleading .fp_set:N = \l_opt_mathleading_fp,
+ exception .clist_set:N = \g_opt_mlexception_clist,
+ noallowdisplaybreaks .bool_set:N = \g_noallowdispbreak_bool
+}
+
+\keys_set:nn { obmathleading }
+{
+ default = true,
+ mathleading = 1.0,
+ exception = {},
+ noallowdisplaybreaks = false
+}
+
+\ProcessKeysOptions { obmathleading }
+
+\scan_stop:
+
+\bool_if:NTF \l_defaultopt_bool
+{
+ \tl_set:Nn \l_obml_stretch_tl { \fp_use:N \l_opt_mathleading_fp }
+}
+{
+ \tl_set:No \l_obml_stretch_tl { \baselinestretch }
+}
+
+\NewDocumentCommand \obmathleading { m }
+{
+ \tl_set:Nn \l_obml_stretch_tl { #1 }
+}
+
+\NewDocumentEnvironment { obMathLeading } { O{1.0} }
+{
+ \obmathleading { #1 }
+}
+{
+}
+
+\cs_new:Npn \mathleading_set_default:nN #1 #2
+{
+ \clist_if_in:NnF \g_opt_mlexception_clist { #1 }
+ {
+ \AtBeginEnvironment { #1 }
+ {
+ \linespread { #2 } \selectfont \ignorespaces
+ }
+ }
+}
+
+\cs_new:Npn \splitleading_set_default:N #1
+{
+ \clist_if_in:NnF \g_opt_mlexception_clist { split }
+ {
+ \patchcmd \start@split
+ { \spread@equation }
+ { \linespread { #1 } \selectfont \spread@equation }
+ { }
+ { }
+ }
+}
+
+\mathleading_set_default:nN { array } \l_obml_stretch_tl
+\mathleading_set_default:nN { matrix } \l_obml_stretch_tl
+\mathleading_set_default:nN { matrix* } \l_obml_stretch_tl
+\mathleading_set_default:nN { pmatrix } \l_obml_stretch_tl
+\mathleading_set_default:nN { pmatrix* } \l_obml_stretch_tl
+\mathleading_set_default:nN { bmatrix } \l_obml_stretch_tl
+\mathleading_set_default:nN { bmatrix* } \l_obml_stretch_tl
+\mathleading_set_default:nN { Bmatrix } \l_obml_stretch_tl
+\mathleading_set_default:nN { Bmatrix* } \l_obml_stretch_tl
+\mathleading_set_default:nN { vmatrix } \l_obml_stretch_tl
+\mathleading_set_default:nN { vmatrix* } \l_obml_stretch_tl
+\mathleading_set_default:nN { Vmatrix } \l_obml_stretch_tl
+\mathleading_set_default:nN { Vmatrix* } \l_obml_stretch_tl
+\mathleading_set_default:nN { cases } \l_obml_stretch_tl
+\mathleading_set_default:nN { cases* } \l_obml_stretch_tl
+\mathleading_set_default:nN { aligned } \l_obml_stretch_tl
+\mathleading_set_default:nN { alignedat } \l_obml_stretch_tl
+\mathleading_set_default:nN { gathered } \l_obml_stretch_tl
+
+\splitleading_set_default:N \l_obml_stretch_tl
+
+\clist_if_in:NnF \g_opt_mlexception_clist { gather }
+{
+ \patchcmd \start@gather
+ { \collect@body }
+ { \linespread { \l_obml_stretch_tl } \selectfont \collect@body }
+ { }
+ { }
+}
+
+\clist_if_in:NnF \g_opt_mlexception_clist { align }
+{
+ \patchcmd \start@align
+ { \collect@body }
+ { \linespread { \l_obml_stretch_tl } \selectfont \collect@body }
+ { }
+ { }
+}
+
+\clist_if_in:NnF \g_opt_mlexception_clist { multline }
+{
+ \patchcmd \start@multline
+ { \collect@body }
+ { \linespread { \l_obml_stretch_tl } \selectfont \collect@body }
+ { }
+ { }
+}
+
+
+
+\bool_if:NF \g_noallowdispbreak_bool
+{
+ \AtBeginDocument { \allowdisplaybreaks }
+}
+
+%% end of file
diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/ob-unfontsdefault.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/ob-unfontsdefault.sty
new file mode 100644
index 00000000000..853643763e9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/ob-unfontsdefault.sty
@@ -0,0 +1,143 @@
+%%
+%% ob-unfontsdefault.sty
+%% part of xob-font.sty
+%%
+%% public domain
+%%
+\ProvidesExplPackage{ob-unfontsdefault}
+ {2020/10/26}
+ {v0.4}
+ {Un and Baekmuk Fonts for xetexko}
+
+\RequirePackage{l3keys2e}
+
+\msg_new:nnn { ksxeunfonts } { errormsg } { Legacy~TeX~engine~not~supported }
+
+\sys_if_engine_pdftex:T {
+ \msg_error:nn { ksxeunfonts } { errormsg }
+}
+
+\keys_define:nn { ksxeunfonts }
+{
+ mj .tl_set:N = \opt_mjfont_tl,
+ mjbold .tl_set:N = \opt_mjboldfont_tl,
+ mjitalic .tl_set:N = \opt_mjitalicfont_tl,
+ mjbolditalic .tl_set:N = \opt_mjbolditalicfont_tl,
+ gt .tl_set:N = \opt_gtfont_tl,
+ gtbold .tl_set:N = \opt_gtboldfont_tl,
+ gtitalic .tl_set:N = \opt_gtitalicfont_tl,
+ gtbolditalic .tl_set:N = \opt_gtbolditalicfont_tl,
+ renderer .tl_set:N = \opt_renderer_tl,
+ fakeitalic .bool_set:N = \opt_fakeitalic_bool,
+ jamo .bool_set:N = \opt_script_bool,
+ mjinterhangul .tl_set:N = \opt_mjinterhangul_tl,
+ gtinterhangul .tl_set:N = \opt_gtinterhangul_tl,
+ mjwordspace .tl_set:N = \opt_mjwordspace_tl,
+ gtwordspace .tl_set:N = \opt_gtwordspace_tl,
+ untaza .bool_set:N = \opt_untaza_bool,
+ more .tl_set:N = \opt_moreopt_tl,
+ other .tl_set:N = \opt_otheropt_tl,
+ baekmuk .bool_set:N = \opt_baekmuk_bool,
+}
+
+\keys_set:nn { ksxeunfonts }
+{
+ mj = UnBatang.ttf,
+ mjbold = UnBatangBold.ttf,
+ mjitalic = UnGraphic.ttf,
+ mjbolditalic = UnGraphicBold.ttf,
+ gt = UnDotum.ttf,
+ gtbold = UnDotumBold.ttf,
+ gtitalic = UnDinaru.ttf,
+ gtbolditalic = UnYetgul.ttf,
+ renderer = OpenType,
+ fakeitalic = false,
+ jamo = false,
+ mjinterhangul = .06em,
+ gtinterhangul = .04em,
+ mjwordspace = {.95,.45,.25},
+ gtwordspace = {.96,.45,.2},
+ more = {},
+ other = {},
+ baekmuk = false,
+}
+
+\ProcessKeysOptions { ksxeunfonts }
+
+\bool_if:NT \opt_baekmuk_bool
+{
+ \keys_set:nn { ksxeunfonts }
+ {
+ mj = batang.ttf,
+ mjbold = *,
+ mjitalic = *,
+ mjbolditalic = *,
+ gt = dotum.ttf,
+ gtbold = *,
+ gtitalic = gulim.ttf,
+ gtbolditalic = hline.ttf,
+ renderer = OpenType,
+ fakeitalic = true,
+ jamo = false,
+ mjinterhangul = .06em,
+ gtinterhangul = .045em,
+ mjwordspace = {.48,.3,.2},
+ gtwordspace = {.50,.3,.2},
+ more = {BoldFeatures={FakeBold=1.1},BoldItalicFeatures={FakeBold=1.1}},
+ }
+}
+
+\sys_if_engine_luatex:T {
+ \hangulbyhangulfont=1
+}
+
+\bool_if:NTF \opt_fakeitalic_bool
+{
+ \tl_set:Nn \l_fakeitalic_option_tl {
+ BoldItalicFeatures = { FakeSlant = { 0.167 } },
+ AutoFakeSlant,
+ }
+}
+{
+ \tl_set:Nn \l_fakeitalic_option_tl { }
+}
+
+\bool_if:NTF \opt_script_bool
+{
+ \tl_set:Nn \l_script_option_tl { Script = Hangul, }
+}
+{
+ \tl_set:Nn \l_script_option_tl {}
+}
+
+\setmainhangulfont{\opt_mjfont_tl}[
+ BoldFont = \opt_mjboldfont_tl,
+ ItalicFont = \opt_mjitalicfont_tl,
+ BoldItalicFont = \opt_mjbolditalicfont_tl,
+ Renderer = \opt_renderer_tl,
+ InterHangul = -\opt_mjinterhangul_tl,
+ WordSpace = {\opt_mjwordspace_tl},
+ \l_script_option_tl \l_fakeitalic_option_tl
+ \opt_moreopt_tl,
+ \opt_otheropt_tl
+]
+
+\setsanshangulfont{\opt_gtfont_tl}[
+ BoldFont = \opt_gtboldfont_tl,
+ ItalicFont = \opt_gtitalicfont_tl,
+ BoldItalicFont = \opt_gtbolditalicfont_tl,
+ Renderer = \opt_renderer_tl,
+ InterHangul = -\opt_gtinterhangul_tl,
+ WordSpace = {\opt_gtwordspace_tl},
+ \l_fakeitalic_option_tl
+ \opt_moreopt_tl,
+ \opt_otheropt_tl
+]
+
+\bool_if:NT \opt_untaza_bool
+{
+ \setmonohangulfont { UnTaza.ttf }
+ \setmonohanjafont { UnDotum.ttf }
+}
+
+\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
index d47b3da1253..95172457541 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,6 +1,6 @@
%% xob-font.sty
%%
-%% Copyright (c) 2014-2020 Kangsoo Kim <karnes at ktug org>
+%% Copyright (c) 2014-2021 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
@@ -15,7 +15,7 @@
%% oblivoir hangul/hanja font setting.
%% part of oblivoir
%%
-\ProvidesPackage{xob-font}[2020/03/20 v0.8.1 select hangul/hanja fonts for oblivoir]
+\ProvidesPackage{xob-font}[2021/03/03 v0.9 select hangul/hanja fonts for oblivoir]
%%% obsolete options: retain \if@.. conditions for backward compatibility
\newif\if@nowin\@nowinfalse
@@ -60,6 +60,8 @@
\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_new:N \opt_mainfontdeclared_bool
+
\bool_set_false:N \bold_prov_bool
\bool_set_false:N \in_hanja_mode
\bool_set_false:N \mono_mode
@@ -624,8 +626,6 @@
}
-\ExplSyntaxOff
-
%%% starred version commands are provided for backward compatibility.
\protected\def\setkormainfont{%
\@ifstar{\setkorfontorigstar*{main}}{%
@@ -641,7 +641,7 @@
%%% \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\setkomainfont{\bool_set_true:N \opt_mainfontdeclared_bool\setkorfontxob{main}}
\protected\def\setkosansfont{\setkorfontxob{sans}}
\protected\def\setkomonofont{\setkorfontxob{mono}}
@@ -663,28 +663,40 @@
% \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)(HCRBatangLVT-Bold)(HCRBatangLVT)
- \setkosansfont(HCRDotumLVT)(HCRDotumLVT-Bold)(HCRDotumLVT)
- \setkomonofont(HCRDotumLVT)
-\fi
+\AddToHook{env/document/before}{%
+ \bool_if:NF \opt_mainfontdeclared_bool
+ {
+ \if@nanumfonts
+ \if@nanumxfonts
+ \setkomainfont(NanumMyeongjo)(*ExtraBold)(*)[](NanumGothic)(*Bold)
+ \else
+ \setkomainfont(NanumMyeongjo)(*Bold)(*)[](NanumGothic)(*Bold)
+ \fi
+ \setkosansfont(NanumGothic)(*Bold)(*)
+ \setkomonofont(NanumGothic)
+ \else
+ %%% [hcr] adds [Script=Hangul] feature automatically.
+ \if@hcrfonts
+ \setkomainfont(HCRBatangLVT)(HCRBatangLVT-Bold)(HCRBatangLVT)
+ \setkosansfont(HCRDotumLVT)(HCRDotumLVT-Bold)(HCRDotumLVT)
+ \setkomonofont(HCRDotumLVT)
+ \else
+ %%% 2020/03/03: Now UnFonts is set to default
+ \RequirePackage{ob-unfontsdefault}
+ \fi
+ \fi
+ }
+}
%\setkomainfont(UnBatang.ttf)(UnBatangBold.ttf)(UnGraphic.ttf)
%\fi\fi
+\ExplSyntaxOff
+
\endinput
%%% end of file `xob-font.sty`
%% CHANGES
+%% v0.9 : unfontsxe introduced
%% v0.8.1 : minor bug fix
%% 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.
diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-xl.cls b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-xl.cls
index c4ab0916fb1..a56abb6c7bc 100644
--- a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-xl.cls
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-xl.cls
@@ -1,6 +1,6 @@
%% File `oblivoir-xl.cls`
%%
-%% (C) Copyright 2006-2020 Kangsoo Kim <karnes at ktug org>
+%% (C) Copyright 2006-2021 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,7 +14,7 @@
%% depends upon Dohyun Kim's xetexko and the author's memhangul-x.
%%
\ProvidesClass{oblivoir-xl}
- [2020/02/05 v0.8.4 article-like class to typeset Korean]
+ [2020/03/03 v0.8.5 article-like class to typeset Korean]
%\typeout{A variant of oblivoir class for Lua- or XeLaTeX.}
\providecommand\@DisabledOption[1]{%
diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir.cls b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir.cls
index 79a0f8f908b..e6d1d7c1109 100644
--- a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir.cls
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir.cls
@@ -1,6 +1,6 @@
%% File `oblivoir.cls`
%%
-%% (C) Copyright 2006-2020 Kangsoo Kim <karnes at ktug org>
+%% (C) Copyright 2006-2021 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
@@ -10,7 +10,7 @@
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2006/05/20 or later.
%%
-\ProvidesClass{oblivoir}[2020/02/09 v2.2]
+\ProvidesClass{oblivoir}[2021/03/03 v3.0]
\RequirePackage{xkeyval}
\RequirePackage{xparse}
diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/xoblivoir.cls b/Master/texmf-dist/tex/latex/kotex-oblivoir/xoblivoir.cls
index 4d2c8424255..a825b59adfd 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-2020 Kangsoo Kim <karnes at ktug org>
+%% (C) Copyright 2006-2021 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