From 8e3f6719efcec4164954a85d35e427662715d9f0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 9 Mar 2023 21:14:52 +0000 Subject: kotex-oblivoir (9mar23) (branch) git-svn-id: svn://tug.org/texlive/branches/branch2022.final@66502 c570f23f-e606-0410-a88d-b1316a301751 --- .../memhangul-common/oblivoir-misc.sty | 39 +++++++++ .../kotex-oblivoir/memhangul-x/memhangul-x.sty | 93 +++++++++++++++++----- .../tex/latex/kotex-oblivoir/oblivoir-xl.cls | 9 ++- .../tex/latex/kotex-oblivoir/oblivoir.cls | 3 +- 4 files changed, 119 insertions(+), 25 deletions(-) (limited to 'Master/texmf-dist/tex') 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 9712b947b74..d02172211fe 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 @@ -6,6 +6,7 @@ %% 2022-03-01, 03-06 %% 2022-04-07, bugfix %% 2023-02-14, tikzpagenodes-conflict fixed +%% 2023-03-08, hverse environment %% \ProvidesPackage{oblivoir-misc}[2023/02/14 version0.4] @@ -130,6 +131,44 @@ % } } } + +%%%% +%%%% 2023-03-08, hverse +%%%% write external file and read in. +%%%% + +\tl_set:Nx \temp_filename_tl { \jobname.hverse } +\ior_new:N \l_txp_file + +\skip_set:Nn \stanzaskip { .63\onelineskip } + +\NewDocumentEnvironment {hverse} {o} +{ + \exp_args:Nx \verbatimoutput {\temp_filename_tl} +} +{ + \endverbatimoutput + + \begin{verse} + + \exp_args:NNx \ior_open:Nn \l_txp_file {\temp_filename_tl} + + \ior_str_map_inline:Nn \l_txp_file + { + \tl_if_empty:nTF { ##1 } + { + \par\vskip\stanzaskip + } + { + ##1 \\ + } + } + \ior_close:N \l_txp_file + + \end{verse} +} + + \ExplSyntaxOff 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 a94bce08e61..0f3f729e533 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-2021 Kangsoo Kim +%% (C) Copyright 2006-2023 Kangsoo Kim %% %% 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{2021/09/21} -\def\fileversion{11.12} +\def\filedate{2023/03/08} +\def\fileversion{23.03} \ProvidesPackage{memhangul-x}[\filedate Hangul Typography for (x)oblivoir] %\typeout{Hangul Typography for (x)oblivoir} @@ -66,7 +66,11 @@ \newif\if@pdfbookmark{\@pdfbookmarkfalse} \DeclareOption{pdfbookmark}{\@pdfbookmarktrue} \newif\if@polyglos\@polyglosfalse -\DeclareOption{polyglossia}{\@polyglostrue} +\newif\if@babelhangul\@babelhangulfalse +\newif\if@babelvacant\@babelvacantfalse +\DeclareOption{polyglossia}{\@polyglostrue\@babelhangulfalse\@babelvacantfalse} +\DeclareOption{babelhangul}{\@polyglostrue\@babelhangultrue\@babelvacantfalse} +\DeclareOption{babelvacant}{\@polyglostrue\@babelhangultrue\@babelvacanttrue} \ifxetex %%% xetexko options @@ -125,26 +129,73 @@ \ProcessOptions \relax +\newif\if@@babelkorfontdeclared\@@babelkorfontdeclaredfalse + \if@polyglos - \RequirePackage{polyglossia} - \RequirePackage{xparse} -%%% \sethangulfont{FONTNAME} or \sethangulfont[tt]{FONTNAME}[FEATURES] - \NewDocumentCommand\sethangulfont{omo}{% - \IfValueTF{#1}{% - \IfValueTF{#3}{% - \expandafter\newfontfamily\csname hangulfont#1\endcsname - {#2}[#3]}{% - \expandafter\newfontfamily\csname hangulfont#1\endcsname - {#2}}% - }% - {% - \IfValueTF{#3}{% - \newfontfamily\hangulfont{#2}[#3]% - }{% - \newfontfamily\hangulfont{#2}% - }% + \if@babelhangul + \if@babelvacant \else + \ifluatex + \RequirePackage{babel} + \AtEndPreamble{ + \babelprovide[import, onchar=ids fonts]{korean} + \if@@babelkorfontdeclared\else + \babelfont[korean]{rm}{UnBatang} + \fi + } + \ProvideDocumentCommand\setobmainfont{mo}{% + \IfValueTF{#2}{% + \babelfont{rm}[#2]{#1}}% + {\babelfont{rm}{#1}}} + \ProvideDocumentCommand\setobsansfont{mo}{% + \IfValueTF{#2}{% + \babelfont{sf}[#2]{#1}}% + {\babelfont{sf}{#1}}} + \ProvideDocumentCommand\setobmonofont{mo}{% + \IfValueTF{#2}{% + \babelfont{tt}[#2]{#1}}% + {\babelfont{tt}{#1}}} + \ProvideDocumentCommand\setkomainfont{mo}{% + \IfValueTF{#2}{% + \babelfont[korean]{rm}[#2]{#1}}% + {\babelfont[korean]{rm}{#1}}% + \@@babelkorfontdeclaredtrue + } + \ProvideDocumentCommand\setkosansfont{mo}{% + \IfValueTF{#2}{% + \babelfont[korean]{sf}[#2]{#1}}% + {\babelfont[korean]{sf}{#1}}} + \ProvideDocumentCommand\setkomonofont{mo}{% + \IfValueTF{#2}{% + \babelfont[korean]{tt}[#2]{#1}}% + {\babelfont[korean]{tt}{#1}}} + \else\ifxetex + \RequirePackage{fontspec} + \setmainfont{UnBatang} + \XeTeXlinebreaklocale="ko" + \fi + \fi + \fi +\else + \RequirePackage{polyglossia} + \RequirePackage{xparse} + %%% \sethangulfont{FONTNAME} or \sethangulfont[tt]{FONTNAME}[FEATURES] + \NewDocumentCommand\sethangulfont{omo}{% + \IfValueTF{#1}{% + \IfValueTF{#3}{% + \expandafter\newfontfamily\csname hangulfont#1\endcsname + {#2}[#3]}{% + \expandafter\newfontfamily\csname hangulfont#1\endcsname + {#2}}% }% + {% + \IfValueTF{#3}{% + \newfontfamily\hangulfont{#2}[#3]% + }{% + \newfontfamily\hangulfont{#2}% + }% + }% } + \fi \else \ifluatex \@ifpackageloaded{luatexko}{}{\RequirePackage{luatexko}} 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 4c87c9d62ab..6a884288f63 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-2022 Kangsoo Kim +%% (C) Copyright 2006-2023 Kangsoo Kim %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -14,8 +14,7 @@ %% depends upon Dohyun Kim's xetexko and the author's memhangul-x. %% \ProvidesClass{oblivoir-xl} - [2022/04/07 v0.8.8 article-like class to typeset Korean] -%\typeout{A variant of oblivoir class for Lua- or XeLaTeX.} + [2023/03/08 v3.2.1 memoir-based class to typeset Korean] \providecommand\@DisabledOption[1]{% \typeout{[#1] option is deprecated}} @@ -37,6 +36,9 @@ \DeclareOptionX{nokorean}{\nokoreantrue} \newif\if@polyglossia\@polyglossiafalse \DeclareOptionX{polyglossia}{\@polyglossiatrue} +\newif\if@babelhangul\@babelhangulfalse +\DeclareOptionX{babelhangul}{\PassOptionsToPackage{\CurrentOption}{memhangul-x}} %%2023-03 +\DeclareOptionX{babelvacant}{\PassOptionsToPackage{\CurrentOption}{memhangul-x}} %%2023-03 \newif\iftwosidedoc\twosidedocfalse \DeclareOptionX{twoside}{\twosidedoctrue} \newif\ifopenrightdoc\openrightdocfalse @@ -514,6 +516,7 @@ \endinput %%% ChangeLog: +%%% 2023-03-08 : polyglossia, babel, babelvacant added. %%% 2015-10-19 : fix conflicts with etextools package. %%%% 2015-08-01 : drop etex.sty %%% 2015-07-27 : fix nokorean bug diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir.cls b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir.cls index e514073a2ec..6ccea1b70c5 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}[2023/02/28 v3.2] +\ProvidesClass{oblivoir}[2023/03/09 v3.2.1] \RequirePackage{xkeyval} \RequirePackage{xparse} @@ -66,5 +66,6 @@ \endinput %%% Recent Changes: +%%% v3.2.1: 2023-03-08, memhangul-x %%% v3.1.5: 2022-04-11, xob-font \setmainhangulfont problem %%% -- cgit v1.2.3