From 64a9666ca25a8d05aea954ca90d7a8d5c4638e4d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 5 Apr 2022 21:57:20 +0000 Subject: kotex-oblivoir (1apr22) git-svn-id: svn://tug.org/texlive/trunk@62924 c570f23f-e606-0410-a88d-b1316a301751 --- .../memhangul-common/fapapersize.sty | 8 +- .../memhangul-common/memhangul-common.sty | 190 +++++++++++---------- .../memhangul-common/ob-koreanappendix.sty | 5 + .../memhangul-common/oblivoir-misc.sty | 7 +- .../kotex-oblivoir/memhangul-x/ob-mathleading.sty | 10 +- .../tex/latex/kotex-oblivoir/oblivoir.cls | 2 +- 6 files changed, 118 insertions(+), 104 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/fapapersize.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/fapapersize.sty index 7d072a293e2..275139c9479 100644 --- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/fapapersize.sty +++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/fapapersize.sty @@ -24,8 +24,10 @@ %% ver 0.2 (2022) %% option a4 added %% \definefageometry, \selectfageometry added. +%% ver 0.3 (2022) +%% bug fix about trimmargin and paperwidth in the changetext. %% -\ProvidesPackage{fapapersize}[2022/03/01 v0.2] +\ProvidesPackage{fapapersize}[2022/03/08 v0.3] %%% %%% 옵션 %%% dbl4x6 : 사륙배판 @@ -156,7 +158,7 @@ %%%% %%% fapapersize.sty, 2021-06-21 -%%% \deffageometry, \setfageometry +%%% \definefageometry, \selectfageometry %%% \ExplSyntaxOn \NewDocumentCommand \definefageometry { m o m o } @@ -182,7 +184,7 @@ { \IfBooleanT { #1 } { \clearpage } \tl_use:c { g_famarginsetopt_#2_tl } - \exp_args:Nx \usefapapersize{*,*, \use:c{ g_famarginset_#2_tl } } + \exp_args:Nx \usefapapersize{\fa@paperwidth,\fa@paperheight, \use:c{ g_famarginset_#2_tl } } \tl_if_empty:cF { g_famarginsetoptpost_#2_tl } { \tl_use:c { g_famarginsetoptpost_#2_tl } 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 5e842135637..3ae0084e721 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 @@ -17,7 +17,7 @@ %%% 편, 장 섹션 타이틀 재설정 %%% 절의 섹션 타이틀은 수정하지 않음. %% -\ProvidesPackage{memhangul-common}[2021/03/03] +\ProvidesPackage{memhangul-common}[2022/03/31] \let\@CHAPAPP\@chapapp \def\refreshprepostchapters{% @@ -842,10 +842,12 @@ %% 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} + \abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@ + \abovedisplayshortskip 1\p@ \@plus2\p@ %\@minus1\p@ + \belowdisplayskip 6\p@ \@plus2\p@ \@minus4\p@ + \belowdisplayshortskip 7\p@ \@plus2\p@ %\@minus1\p@ +% \belowdisplayskip \abovedisplayskip +} \fi %% arabic frontmatter numbering @@ -1035,6 +1037,7 @@ %% for Appendix \makechapterstyle{appendixdefault}{% + \renewcommand*{\chaptername}{\appendixname} \renewcommand{\chapnamefont}{\normalfont\huge\bfseries} \renewcommand{\chapnumfont}{\normalfont\huge\bfseries} \renewcommand{\chaptitlefont}{\normalfont\Huge\bfseries} @@ -1045,6 +1048,7 @@ \setlength{\beforechapskip}{50pt} \setlength{\midchapskip}{20pt} \setlength{\afterchapskip}{40pt} + \renewcommand*{\hchaptertitlehead}{\chaptername~\thechapter} } \makechapterstyle{section}{% @@ -1161,94 +1165,94 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%% appendix %%%%%%%%%%%%%%%%%%%%%%%%% - -\def\set@appendix@chapsec{% - %%% SECTION in APPENDIX - \renewcommand{\section}{% - \sechook\memucsinterwordhook% - \@startsection{section}{1}% level 1 - {\secindent}% heading indent - {\beforesecskip}% skip before the heading - {\aftersecskip}% skip after the heading - {\normalfont\secheadstyle}} % font - \def\M@sect##1##2##3##4##5##6[##7][##8]##9{% - \ifheadnameref\M@gettitle{##8}\else\M@gettitle{##7}\fi - \ifnum ##2>\c@secnumdepth - \let\@svsec\@empty - \else - \refstepcounter{APP##1}% - \protected@edef\@svsec{\@seccntformat{##1}\relax}% - \fi - \@tempskipa ##5\relax - \ifdim \@tempskipa>\z@ - \begingroup - ##6{% - \@hangfrom{\hskip ##3\relax\@svsec}% - \interlinepenalty \@M ##9\@@par}% - \endgroup - \csname ##1mark\endcsname{##8}% - \addcontentsline{toc}{##1}{% - \ifnum ##2>\c@secnumdepth \else - \protect\numberline{\noexpand\protect\csname the##1\endcsname}% - \fi - ##7}% - \else - \def\@svsechd{% - ##6{\hskip ##3\relax - \@svsec ##9}% - \csname ##1mark\endcsname{##8}% - \addcontentsline{toc}{##1}{% - \ifnum ##2>\c@secnumdepth \else - \protect\numberline{\csname the##1\endcsname}% - \fi - ##7}}% - \fi - \@xsect{##5}}% -} - -\def\restorechapsec{% - %%% SECTION in APPENDIX - \renewcommand{\section}{% - \sechook\memucsinterwordhook% - \@startsection{section}{1}% level 1 - {\secindent}% heading indent - {\beforesecskip}% skip before the heading - {\aftersecskip}% skip after the heading - {\normalfont\secheadstyle}} % font - \def\M@sect##1##2##3##4##5##6[##7][##8]##9{% - \ifheadnameref\M@gettitle{##8}\else\M@gettitle{##7}\fi - \ifnum ##2>\c@secnumdepth - \let\@svsec\@empty - \else - \refstepcounter{##1}% - \protected@edef\@svsec{\@seccntformat{##1}\relax}% - \fi - \@tempskipa ##5\relax - \ifdim \@tempskipa>\z@ - \begingroup - ##6{% - \@hangfrom{\hskip ##3\relax\@svsec}% - \interlinepenalty \@M ##9\@@par}% - \endgroup - \csname ##1mark\endcsname{##8}% - \addcontentsline{toc}{##1}{% - \ifnum ##2>\c@secnumdepth \else - \protect\numberline{\noexpand\protect\csname the##1\endcsname}% - \fi - ##7}% - \else - \def\@svsechd{% - ##6{\hskip ##3\relax - \@svsec ##9}% - \csname ##1mark\endcsname{##8}% - \addcontentsline{toc}{##1}{% - \ifnum ##2>\c@secnumdepth \else - \protect\numberline{\csname the##1\endcsname}% - \fi - ##7}}% - \fi - \@xsect{##5}} -} +%%% moved to ob-[no]koreanappendix.sty +%\def\set@appendix@chapsec{% +% %%% SECTION in APPENDIX +% \renewcommand{\section}{% +% \sechook\memucsinterwordhook% +% \@startsection{section}{1}% level 1 +% {\secindent}% heading indent +% {\beforesecskip}% skip before the heading +% {\aftersecskip}% skip after the heading +% {\normalfont\secheadstyle}} % font +% \def\M@sect##1##2##3##4##5##6[##7][##8]##9{% +% \ifheadnameref\M@gettitle{##8}\else\M@gettitle{##7}\fi +% \ifnum ##2>\c@secnumdepth +% \let\@svsec\@empty +% \else +% \refstepcounter{APP##1}% +% \protected@edef\@svsec{\@seccntformat{##1}\relax}% +% \fi +% \@tempskipa ##5\relax +% \ifdim \@tempskipa>\z@ +% \begingroup +% ##6{% +% \@hangfrom{\hskip ##3\relax\@svsec}% +% \interlinepenalty \@M ##9\@@par}% +% \endgroup +% \csname ##1mark\endcsname{##8}% +% \addcontentsline{toc}{##1}{% +% \ifnum ##2>\c@secnumdepth \else +% \protect\numberline{\noexpand\protect\csname the##1\endcsname}% +% \fi +% ##7}% +% \else +% \def\@svsechd{% +% ##6{\hskip ##3\relax +% \@svsec ##9}% +% \csname ##1mark\endcsname{##8}% +% \addcontentsline{toc}{##1}{% +% \ifnum ##2>\c@secnumdepth \else +% \protect\numberline{\csname the##1\endcsname}% +% \fi +% ##7}}% +% \fi +% \@xsect{##5}}% +%} +% +%\def\restorechapsec{% +% %%% SECTION in APPENDIX +% \renewcommand{\section}{% +% \sechook\memucsinterwordhook% +% \@startsection{section}{1}% level 1 +% {\secindent}% heading indent +% {\beforesecskip}% skip before the heading +% {\aftersecskip}% skip after the heading +% {\normalfont\secheadstyle}} % font +% \def\M@sect##1##2##3##4##5##6[##7][##8]##9{% +% \ifheadnameref\M@gettitle{##8}\else\M@gettitle{##7}\fi +% \ifnum ##2>\c@secnumdepth +% \let\@svsec\@empty +% \else +% \refstepcounter{##1}% +% \protected@edef\@svsec{\@seccntformat{##1}\relax}% +% \fi +% \@tempskipa ##5\relax +% \ifdim \@tempskipa>\z@ +% \begingroup +% ##6{% +% \@hangfrom{\hskip ##3\relax\@svsec}% +% \interlinepenalty \@M ##9\@@par}% +% \endgroup +% \csname ##1mark\endcsname{##8}% +% \addcontentsline{toc}{##1}{% +% \ifnum ##2>\c@secnumdepth \else +% \protect\numberline{\noexpand\protect\csname the##1\endcsname}% +% \fi +% ##7}% +% \else +% \def\@svsechd{% +% ##6{\hskip ##3\relax +% \@svsec ##9}% +% \csname ##1mark\endcsname{##8}% +% \addcontentsline{toc}{##1}{% +% \ifnum ##2>\c@secnumdepth \else +% \protect\numberline{\csname the##1\endcsname}% +% \fi +% ##7}}% +% \fi +% \@xsect{##5}} +%} \renewcommand{\appendix}{\par % \setcounter{chapter}{0}% diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/ob-koreanappendix.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/ob-koreanappendix.sty index 9c46eaa9c58..c88e4557d65 100644 --- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/ob-koreanappendix.sty +++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/ob-koreanappendix.sty @@ -13,6 +13,9 @@ %% oblivoir sub-style. part of oblivoir %% \appendix (부록) %% +%% +\newcommand*\clearforappendix{\clearpage} + \gdef\set@appendix@chapter{% \renewcommand\thesection{\Alph{APPsection}}% \renewcommand\thesubsection{\thesection.\arabic{APPsubsection}} @@ -25,6 +28,7 @@ \renewcommand\thefigure{\Alph{APPsection}.\arabic{figure}}% \renewcommand\thetable{\Alph{APPsection}.\arabic{table}}% \renewcommand\theequation{\Alph{APPsection}.\arabic{equation}}% + \if@chapter\renewcommand*{\thechapter}{\Roman{APPchapter}}\fi \set@appendix@chapsec } @@ -36,6 +40,7 @@ } \renewcommand{\appendix}{\par + \if@chapter\clearforappendix\fi \set@appendix@chapter \anappendixtrue % \chapterstyle{appendixdefault}% diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/oblivoir-misc.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/oblivoir-misc.sty index 8d81ccefbf2..d55aa900156 100644 --- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/oblivoir-misc.sty +++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-common/oblivoir-misc.sty @@ -3,9 +3,9 @@ %% %% (c) 2022 Kangsoo Kim %% -%% 2022-03-01 +%% 2022-03-01, 03-06 %% -\ProvidesPackage{oblivoir-misc}[2022/03/01 version0.1] +\ProvidesPackage{oblivoir-misc}[2022/03/06 version0.2] \RequirePackage{etoolbox} @@ -13,7 +13,7 @@ %%% see http://www.ktug.org/xe/index.php?mid=KTUG_QnA_board&document_srl=253542 \AtEndPreamble{% -\ifx\pgfkeys\undefined\else +\@ifpackageloaded{pgf}{% \newcommand\setpagenode{% \expandafter\def\csname pgf@sh@ns@current page\endcsname{rectangle}% \strictpagecheck% @@ -35,6 +35,7 @@ \pgfkeys{/tikz/overlay/.add code={}{\setpagenode}} \fi +}{} } %%% \texthl 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 index 010c83ec2aa..2bad8f4a7f8 100644 --- 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 @@ -1,7 +1,8 @@ %% %% file: ob-mathleading.sty %% -%% written by nova +%% written by Kangsoo Kim, +%% part of kotex-oblivoir %% %% a supplementary package to oblivoir %% set lineskips in multi-lined math environments @@ -10,12 +11,13 @@ %% v. 0.1alpha : 2018/12/22 %% v. 0.0.1-pr2 : 2018/12/24 %% v. 0.0.1 : 2018/12/25 +%% v. 0.1 : 2022/04/01 : fixed. %% \RequirePackage{expl3} \ProvidesExplPackage {ob-mathleading} - {2018/12/25} - {v0.0.1} + {2022/04/01} + {v0.1} {adjust math leadings for oblivoir} \@ifpackageloaded{amsmath}{}{\RequirePackage{amsmath}} @@ -78,7 +80,7 @@ { \clist_if_in:NnF \g_opt_mlexception_clist { split } { - \patchcmd \start@split + \patchcmd \gather@split { \spread@equation } { \linespread { #1 } \selectfont \spread@equation } { } diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir.cls b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir.cls index 2a03b4be50f..d7efd823206 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/05 v3.1.1] +\ProvidesClass{oblivoir}[2022/04/01 v3.1.3] \RequirePackage{xkeyval} \RequirePackage{xparse} -- cgit v1.2.3