From 0a334de875944625912f2bf2d918122bb55c0dad Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 2 Apr 2022 03:01:41 +0000 Subject: CTAN sync 202204020301 --- language/korean/kotex-oblivoir/README | 2 + language/korean/kotex-oblivoir/doc/ChangeLog | 12 ++ language/korean/kotex-oblivoir/doc/chapstyfig.pdf | Bin 0 -> 59797 bytes .../kotex-oblivoir/doc/ob-mathleading-doc.pdf | Bin 95320 -> 98088 bytes .../kotex-oblivoir/doc/ob-mathleading-doc.tex | 13 +- .../kotex-oblivoir/doc/oblivoir-simpledoc.pdf | Bin 256845 -> 316665 bytes .../kotex-oblivoir/doc/oblivoir-simpledoc.tex | 18 +- .../tex/memhangul-common/fapapersize.sty | 8 +- .../tex/memhangul-common/memhangul-common.sty | 190 +++++++++++---------- .../tex/memhangul-common/ob-koreanappendix.sty | 5 + .../tex/memhangul-common/oblivoir-misc.sty | 7 +- .../tex/memhangul-x/ob-mathleading.sty | 10 +- language/korean/kotex-oblivoir/tex/oblivoir.cls | 2 +- 13 files changed, 156 insertions(+), 111 deletions(-) create mode 100644 language/korean/kotex-oblivoir/doc/chapstyfig.pdf (limited to 'language/korean') diff --git a/language/korean/kotex-oblivoir/README b/language/korean/kotex-oblivoir/README index 3232f7018e..5b2629ab48 100644 --- a/language/korean/kotex-oblivoir/README +++ b/language/korean/kotex-oblivoir/README @@ -4,6 +4,8 @@ kotex-oblivoir Current State ------------- +* 2022/04/01, bug fixed concerning ob-mathleading etc., Version 3.1.3 +* 2022/03/08, bug fixed about fapapersize, Version 3.1.2 * 2022/03/05, bug fixed and uploaded. Version 3.1.1 * 2022/03/01, uploaded to CTAN. Version 3.1 diff --git a/language/korean/kotex-oblivoir/doc/ChangeLog b/language/korean/kotex-oblivoir/doc/ChangeLog index 8daa96ce55..174efcaeeb 100644 --- a/language/korean/kotex-oblivoir/doc/ChangeLog +++ b/language/korean/kotex-oblivoir/doc/ChangeLog @@ -1,3 +1,15 @@ +2022-04-01 Kangsoo Kim + + Version 3.1.3 + + * bug fix concerning ob-mathleading and memhangul-common (mathdiap) + +2022-03-08 Kangsoo Kim + + Version 3.1.2 + + * bug fix concerning fapapersize and trimmarks + 2022-03-05 Kangsoo Kim Version 3.1.1 diff --git a/language/korean/kotex-oblivoir/doc/chapstyfig.pdf b/language/korean/kotex-oblivoir/doc/chapstyfig.pdf new file mode 100644 index 0000000000..bb8917c2b2 Binary files /dev/null and b/language/korean/kotex-oblivoir/doc/chapstyfig.pdf differ diff --git a/language/korean/kotex-oblivoir/doc/ob-mathleading-doc.pdf b/language/korean/kotex-oblivoir/doc/ob-mathleading-doc.pdf index ef86c8a924..177640b01c 100644 Binary files a/language/korean/kotex-oblivoir/doc/ob-mathleading-doc.pdf and b/language/korean/kotex-oblivoir/doc/ob-mathleading-doc.pdf differ diff --git a/language/korean/kotex-oblivoir/doc/ob-mathleading-doc.tex b/language/korean/kotex-oblivoir/doc/ob-mathleading-doc.tex index 47f8b06dbc..caefd6023b 100644 --- a/language/korean/kotex-oblivoir/doc/ob-mathleading-doc.tex +++ b/language/korean/kotex-oblivoir/doc/ob-mathleading-doc.tex @@ -9,8 +9,8 @@ \setmainfont{Crimson Pro} \setsansfont{Open Sans} \setmonofont{Roboto Mono} -\setkomainfont[Noto Serif CJK KR]()( Bold) -\setkosansfont[Noto Sans CJK KR]()( Bold) +\setkomainfont[Noto Serif KR]()( Bold) +\setkosansfont[Noto Sans KR]()( Bold) \usepackage[default=false,exception={vmatrix}]{ob-mathleading} \usepackage{mathtools} @@ -24,7 +24,7 @@ \title{ob-mathleading} \author{Nova de Hi} -\date{2018/12/25, v0.0.1} +\date{2022/04/01, v0.1} \maketitle @@ -170,5 +170,12 @@ 테스트 문서와 예제 소스를 제공하신 ktug 게시판의 Progress 님, 패키지 제작의 동기를 제공하신 조인성 교수께 감사드린다. +\section{변경이력} + +\begin{description} +\item [2022/04/01] \texttt{split} 환경에 적용되지 않는 최근 발생한 이슈 해결. +\item [2021/03/09] oblivoir의 일부로 포함하여 배포. +\end{description} + \end{document} diff --git a/language/korean/kotex-oblivoir/doc/oblivoir-simpledoc.pdf b/language/korean/kotex-oblivoir/doc/oblivoir-simpledoc.pdf index fc2916f03f..4628a73082 100644 Binary files a/language/korean/kotex-oblivoir/doc/oblivoir-simpledoc.pdf and b/language/korean/kotex-oblivoir/doc/oblivoir-simpledoc.pdf differ diff --git a/language/korean/kotex-oblivoir/doc/oblivoir-simpledoc.tex b/language/korean/kotex-oblivoir/doc/oblivoir-simpledoc.tex index f48873d430..48151dc6fe 100644 --- a/language/korean/kotex-oblivoir/doc/oblivoir-simpledoc.tex +++ b/language/korean/kotex-oblivoir/doc/oblivoir-simpledoc.tex @@ -32,6 +32,7 @@ \usepackage{afterpage} \usepackage{oblivoir-misc} +\usepackage{graphicx} %%% ifpxltex can be installed from KTUG Private Repository. not included in TeX Live \usepackage{ifpxltex} @@ -103,16 +104,16 @@ \begin{document} -\title{초간단 \obclass{} v3.1 사용법} +\title{초간단 \obclass{} v3.1.3 사용법} -\date{2022년 3월} +\date{2022년 4월} \author{x-ob-liv-oir } \maketitle \begin{abstract} -\obclass{} 클래스 3.0 버전은 그 동안 별도의 브랜치로 개발되어 오던 +\obclass{} 클래스 3.0 이후 버전은 그 동안 별도의 브랜치로 개발되어 오던 \xobclass와 \obclass를 통합하여 완전히 동일한 클래스가 되었다. 이 문서는 \obclass{} 즉 \xobclass를 사용하는 방법을 간략히 기술한다. @@ -1289,7 +1290,7 @@ oblivoir에서 제공된다. 여기 before와 after 위치에는 레이아웃을 바꾸기 전과 후에 실행할 토큰을 둘 수 있다. -\item[\cs{selectfagemetry}] 정의된 페이지 레이아웃을 적용한다. +\item[\cs{selectfageometry}] 정의된 페이지 레이아웃을 적용한다. 레이아웃 변경의 효과는 반드시 새로운 페이지가 시작되어야 나타나기 때문에 \cs{newpage} 또는 \cs{clearpage}를 직접 지정하여야 하나, 이 명령에 별표를 붙이면 페이지 레이아웃을 정의하기 전에 \cs{clearpage}를 @@ -1490,6 +1491,15 @@ oblivoir에서 조금 확장했다. 기본인 \item \cs{hchaptertitlehead}라는 명령이 사용된다. 이것은 특히 running heading과 관련이 있다. \end{itemize} +\begin{figure} +\centering +\includegraphics[width=\textwidth]{chapstyfig} +\caption{oblivoir의 장 표제 스타일}\label{fig:chapsty} +\end{figure} + +\fref{fig:chapsty}\는 \textsf{oblivoir}의 장 표제 스타일에서 사용되는 +매크로를 도시한 것이다. + KTUG 사설 저장소를 통하여 설치할 수 있는\footnote{% 사설 저장소를 등록할 수 없는 상황이라면 직접 다운로드하라. \url{http://ftp.ktug.org/KTUG/texlive/tlnet/archive/} diff --git a/language/korean/kotex-oblivoir/tex/memhangul-common/fapapersize.sty b/language/korean/kotex-oblivoir/tex/memhangul-common/fapapersize.sty index 7d072a293e..275139c947 100644 --- a/language/korean/kotex-oblivoir/tex/memhangul-common/fapapersize.sty +++ b/language/korean/kotex-oblivoir/tex/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/language/korean/kotex-oblivoir/tex/memhangul-common/memhangul-common.sty b/language/korean/kotex-oblivoir/tex/memhangul-common/memhangul-common.sty index 5e84213563..3ae0084e72 100644 --- a/language/korean/kotex-oblivoir/tex/memhangul-common/memhangul-common.sty +++ b/language/korean/kotex-oblivoir/tex/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/language/korean/kotex-oblivoir/tex/memhangul-common/ob-koreanappendix.sty b/language/korean/kotex-oblivoir/tex/memhangul-common/ob-koreanappendix.sty index 9c46eaa9c5..c88e4557d6 100644 --- a/language/korean/kotex-oblivoir/tex/memhangul-common/ob-koreanappendix.sty +++ b/language/korean/kotex-oblivoir/tex/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/language/korean/kotex-oblivoir/tex/memhangul-common/oblivoir-misc.sty b/language/korean/kotex-oblivoir/tex/memhangul-common/oblivoir-misc.sty index 8d81ccefbf..d55aa90015 100644 --- a/language/korean/kotex-oblivoir/tex/memhangul-common/oblivoir-misc.sty +++ b/language/korean/kotex-oblivoir/tex/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/language/korean/kotex-oblivoir/tex/memhangul-x/ob-mathleading.sty b/language/korean/kotex-oblivoir/tex/memhangul-x/ob-mathleading.sty index 010c83ec2a..2bad8f4a7f 100644 --- a/language/korean/kotex-oblivoir/tex/memhangul-x/ob-mathleading.sty +++ b/language/korean/kotex-oblivoir/tex/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/language/korean/kotex-oblivoir/tex/oblivoir.cls b/language/korean/kotex-oblivoir/tex/oblivoir.cls index 2a03b4be50..d7efd82320 100644 --- a/language/korean/kotex-oblivoir/tex/oblivoir.cls +++ b/language/korean/kotex-oblivoir/tex/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