kotex-oblivoir (4mar22)

git-svn-id: svn://tug.org/texlive/trunk@62397 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 101 insertions, 84 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 7742b961e0d..5e842135637 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
@@ -155,9 +155,15 @@
 
 %% CHAPTER
 %%%%%%%%%%%
-\renewcommand{\@m@mchapter}[1][\@empty]{%
-  \def\ch@pt@c{#1}% capture first optional arg
-  \@dblarg{\@chapter}}
+%%\renewcommand{\@m@mchapter}[1][\@empty]{%
+%%  \def\ch@pt@c{#1}% capture first optional arg
+%%  \@dblarg{\@chapter}}
+%\renewcommand{\@m@mchapter}[1][]{%
+%  \def\ch@pt@c{#1}% capture first optional arg
+%  \@ifnextchar[{\@chapter}{\@chapter[]}%
+%}
+%\def\m@m@empty{\@empty}
+
 %%\def\m@m@empty{\@empty} 
 
 %%%%\def\@chapter[#1]#2{%
diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/ob-toclof.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/ob-toclof.sty
index 5ef56b463fb..1320b3f5556 100644
--- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/ob-toclof.sty
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/ob-toclof.sty
@@ -1,6 +1,6 @@
 %% File `ob-toclof.sty`
 %%
-%% Copyright (c) 2007-2013 Kangsoo Kim <karnes at ktug org>
+%% Copyright (c) 2007-2022 Kangsoo Kim <modviv2k15 at gmail.com>
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3c
@@ -71,69 +71,69 @@
 %  \@namedef{print#2title}##1{\printchaptertitle{##1}}
 } % end \newlistof
 
-\def\@chapter[#1]#2{%
-  \ifx\ch@pt@c\m@m@empty % no optional args
-    \def\f@rtoc{#1}%
-    \def\f@rhdr{#1}%
-  \else                  % at least one opt arg
-    \def\f@rtoc{\ch@pt@c}%
-    \nametest{#1}{#2}%
-    \ifsamename          % one opt arg
-      \def\f@rhdr{\ch@pt@c}%
-    \else                % two opt args
-      \def\f@rhdr{#1}%
-    \fi
-  \fi 
-  \m@m@Andfalse
-  \ifnum \c@secnumdepth >\m@ne
-    \if@mainmatter
-      \m@m@Andtrue
-    \fi
-  \fi
-  \ifm@m@And
-   \ifanappendix
-    \refstepcounter{APPchapter}%
-   \else
-    \refstepcounter{chapter}%
-   \fi
-  \fi
-  \chaptermark{\f@rhdr}
-  \ifartopt
-    \@makechapterhead{#2}%
-    \@afterheading
-  \else
-    \insertchapterspace
-    \if@twocolumn
-      \@topnewpage[\@makechapterhead{#2}]%
-    \else
-      \@makechapterhead{#2}%
-    \fi
-    \@afterheading
-  \fi
-  \ifm@m@And
-    \ifanappendix
-      \addcontentsline{toc}{appendix}{%
-       \protect\chapternumberline{\hchaptertitlehead}\f@rtoc}%
-       \memappchapinfo{\thechapter}{\f@rtoc}{\f@rhdr}{#2}%
-    \else
-      \addcontentsline{toc}{section}{%
-        \protect\chapternumberline{\hchaptertitlehead}\f@rtoc}%
-       \memchapinfo{\hchaptertitlehead}{\f@rtoc}{\f@rhdr}{#2}%
-    \fi
-  \else
-    \addcontentsline{toc}{section}{\f@rtoc}%
-    \ifanappendix
-      \memappchapinfo{}{\f@rtoc}{\f@rhdr}{#2}%
-    \else
-      \memchapinfo{\hchaptertitlehead}{\f@rtoc}{\f@rhdr}{#2}%
-    \fi
-  \fi
-  \ifheadnameref\M@gettitle{\f@rhdr}\else\M@gettitle{\f@rtoc}\fi
-%%% for chapter
-  \ifanappendix
-     \protected@edef\@currentlabel{\thechapter}%
-  \fi
-}
+%\def\@chapter[#1]#2{%
+%  \ifx\ch@pt@c\m@m@empty % no optional args
+%    \def\f@rtoc{#1}%
+%    \def\f@rhdr{#1}%
+%  \else                  % at least one opt arg
+%    \def\f@rtoc{\ch@pt@c}%
+%    \nametest{#1}{#2}%
+%    \ifsamename          % one opt arg
+%      \def\f@rhdr{\ch@pt@c}%
+%    \else                % two opt args
+%      \def\f@rhdr{#1}%
+%    \fi
+%  \fi 
+%  \m@m@Andfalse
+%  \ifnum \c@secnumdepth >\m@ne
+%    \if@mainmatter
+%      \m@m@Andtrue
+%    \fi
+%  \fi
+%  \ifm@m@And
+%   \ifanappendix
+%    \refstepcounter{APPchapter}%
+%   \else
+%    \refstepcounter{chapter}%
+%   \fi
+%  \fi
+%  \chaptermark{\f@rhdr}
+%  \ifartopt
+%    \@makechapterhead{#2}%
+%    \@afterheading
+%  \else
+%    \insertchapterspace
+%    \if@twocolumn
+%      \@topnewpage[\@makechapterhead{#2}]%
+%    \else
+%      \@makechapterhead{#2}%
+%    \fi
+%    \@afterheading
+%  \fi
+%  \ifm@m@And
+%    \ifanappendix
+%      \addcontentsline{toc}{appendix}{%
+%       \protect\chapternumberline{\hchaptertitlehead}\f@rtoc}%
+%       \memappchapinfo{\thechapter}{\f@rtoc}{\f@rhdr}{#2}%
+%    \else
+%      \addcontentsline{toc}{section}{%
+%        \protect\chapternumberline{\hchaptertitlehead}\f@rtoc}%
+%       \memchapinfo{\hchaptertitlehead}{\f@rtoc}{\f@rhdr}{#2}%
+%    \fi
+%  \else
+%    \addcontentsline{toc}{section}{\f@rtoc}%
+%    \ifanappendix
+%      \memappchapinfo{}{\f@rtoc}{\f@rhdr}{#2}%
+%    \else
+%      \memchapinfo{\hchaptertitlehead}{\f@rtoc}{\f@rhdr}{#2}%
+%    \fi
+%  \fi
+%  \ifheadnameref\M@gettitle{\f@rhdr}\else\M@gettitle{\f@rtoc}\fi
+%%%% for chapter
+%  \ifanappendix
+%     \protected@edef\@currentlabel{\thechapter}%
+%  \fi
+%}
 
 \newlistof{tableofcontents}{toc}{\contentsname}
 \newlistof{listoffigures}{lof}{\listfigurename}
@@ -142,3 +142,5 @@
 \fi % of \if@toclofentry
 
 \endinput
+
+%%% redefinition of \@chapter deprecated, 2022/03/05
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 e68aa40c940..7023eea5502 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-2021 Kangsoo Kim <karnes at ktug org>
+%% (C) Copyright 2006-2022 Kangsoo Kim <modviv2k15 at gmail dot com>
 %%
 %% 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}
-  [2021/09/21 v0.8.6 article-like class to typeset Korean]
+  [2022/03/05 v0.8.7 article-like class to typeset Korean]
 %\typeout{A variant of oblivoir class for Lua- or XeLaTeX.}
 
 \providecommand\@DisabledOption[1]{%
@@ -45,8 +45,11 @@
 \DeclareOptionX{kosection}{\kosectiontrue}
 \newif\ifnobookmarks\nobookmarksfalse
 \DeclareOptionX{nobookmarks}{\nobookmarkstrue}
+\newif\ifbookmarkpkg\bookmarkpkgfalse
+\DeclareOptionX{bookmark}{\bookmarkpkgtrue}
 \newif\ifhyperrefwithlyx\hyperrefwithlyxfalse
 \DeclareOptionX{lyxhyper}{\hyperrefwithlyxtrue}{\hyperrefwithlyxfalse}
+\DeclareOptionX{nohyperref}{\hyperrefwithlyxtrue}{\hyperrefwithlyxfalse}
 \newif\if@tendotfive\@tendotfivefalse
 \DeclareOptionX{10.5pt}{\@tendotfivetrue}
 \newif\if@koreanfn\@koreanfnfalse
@@ -348,30 +351,36 @@
  \else 
    \@Call@Hyperref@With@Bookmarks
  \fi
+ \ifbookmarkpkg
+   \RequirePackage{bookmark}
+ \fi
 }
 
 \def\@Call@Hyperref@Without@Bookmarks{%
- \ifluatex
-  \usepackage[unicode,bookmarks=false]{hyperref}
- \else\ifxetex
-  \usepackage[bookmarks=false]{hyperref}
- \else
-  \usepackage[unicode,bookmarks=false]{hyperref}
- \fi\fi
+% \ifluatex
+%  \usepackage[unicode,bookmarks=false]{hyperref}
+% \else\ifxetex
+%  \usepackage[bookmarks=false]{hyperref}
+% \else
+%  \usepackage[unicode,bookmarks=false]{hyperref}
+% \fi\fi
+  \RequirePackage[bookmarks=false]{hyperref}
 }
 
 \def\@Call@Hyperref@With@Bookmarks{%
- \ifluatex
-  \usepackage[unicode]{hyperref}
- \else\ifxetex
-  \usepackage{hyperref}
- \else
-  \usepackage[unicode]{hyperref}
- \fi\fi 
+% \ifluatex
+%  \usepackage[unicode]{hyperref}
+% \else\ifxetex
+%  \usepackage{hyperref}
+% \else
+%  \usepackage[unicode]{hyperref}
+% \fi\fi 
+  \RequirePackage{hyperref}
 }
 
 %% LyX 1.6.x의 Insert-Hyperlink 기능과 충돌하지 않게 하기 위하여
 %% hyperref을 로드하지 않음. (lyxhyper 옵션)
+%% lyxhyper = nohyperref
 %% note: memhfixc는 memoir 자신이 로드해준다.
 \ifnokorean\relax\else
   \ifhyperrefwithlyx\relax\else
diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir.cls b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir.cls
index 2ccb1f0fc25..2a03b4be50f 100644
--- a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir.cls
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir.cls
@@ -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}[2022/03/01 v3.1]
+\ProvidesClass{oblivoir}[2022/03/05 v3.1.1]
 
 \RequirePackage{xkeyval}
 \RequirePackage{xparse}