diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x')
4 files changed, 233 insertions, 36 deletions
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 787df1d0dbf..31a600349ec 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-2015 Kangsoo Kim <karnes at ktug org> +%% (C) Copyright 2006-2020 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,8 +14,8 @@ %% part of oblivoir v2 %% \NeedsTeXFormat{LaTeX2e} -\def\filedate{2015/10/05} -\def\fileversion{11.10} +\def\filedate{2020/02/05} +\def\fileversion{11.11} \ProvidesPackage{memhangul-x}[\filedate Hangul Typography for (x)oblivoir] %\typeout{Hangul Typography for (x)oblivoir} @@ -37,6 +37,7 @@ %\newif\if@dvips{\@dvipsfalse} \DeclareOption{dvips}{\DisabledOption{dvips}} \DeclareOption{strictcharcheck}{\DisabledOption{strictcharcheck}} +\DeclareOption{adjustmath}{\DisabledOption{adjustmath}} %%%% active options \newif\if@hsspace\@hsspacetrue @@ -55,8 +56,8 @@ \DeclareOption{nonfrench}{\@nonfrenchtrue} \newif\if@hanja\@hanjafalse \DeclareOption{hanja}{\@hanjatrue} -\newif\if@mathdisp\@mathdispfalse -\DeclareOption{adjustmath}{\@mathdisptrue} +\newif\if@mathdisp\@mathdisptrue +\DeclareOption{mathdisp}{\@mathdispfalse} \newif\if@arabicfrontmatter{\@arabicfrontmatterfalse} \DeclareOption{arabicfront}{\@arabicfrontmattertrue} @@ -80,6 +81,7 @@ \DeclareOption{nounfonts}{\PassOptionsToPackage{\CurrentOption}{xetexko-var}} \DeclareOption{nanum}{\PassOptionsToPackage{\CurrentOption}{xetexko-var}} \DeclareOption{hcr}{\PassOptionsToPackage{\CurrentOption}{xetexko-var}} +\DeclareOption{noto}{\PassOptionsToPackage{\CurrentOption}{xetexko-var}} \else\ifluatex %%% luatexko options \DeclareOption{gremph}{\PassOptionsToPackage{\CurrentOption}{xob-font}} @@ -93,6 +95,7 @@ \DeclareOption{nounfonts}{\PassOptionsToPackage{\CurrentOption}{xob-font}} \DeclareOption{nanum}{\PassOptionsToPackage{\CurrentOption}{xob-font}} \DeclareOption{hcr}{\PassOptionsToPackage{\CurrentOption}{xob-font}} +\DeclareOption{noto}{\PassOptionsToPackage{\CurrentOption}{xob-font}} \else %%% pdftex options \ifPDFTeX @@ -106,6 +109,7 @@ \DeclareOption{nounfonts}{\DisabledOption{nounfonts}} \DeclareOption{nanum}{\DisabledOption{nanum}} \DeclareOption{hcr}{\DisabledOption{hcr}} +\DeclareOption{noto}{\DisableOption{noto}} \fi \fi\fi @@ -143,7 +147,7 @@ } \else \ifluatex - \RequirePackage{luatexko} + \@ifpackageloaded{luatexko}{}{\RequirePackage{luatexko}} \RequirePackage{xob-font} \RequirePackage{xob-dotemph} \else\ifxetex @@ -339,7 +343,7 @@ \if@hsspacenoquote\else\adjustquotespacing\fi \else \RequirePackage{memucs-setspace} - \linespread{1.333} + \linespread{1.33} \fi %\SetHangulspace{1.333}{1.1} diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xetexko-var.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xetexko-var.sty index 27768dbda6c..f8acc43a231 100644 --- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xetexko-var.sty +++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xetexko-var.sty @@ -1,6 +1,6 @@ %% xetexko-var.sty %% -%% Copyright (c) 2007-2014 Kangsoo Kim <karnes at ktug org> +%% Copyright (c) 2007-2020 Kangsoo Kim <karnes at ktug org> %% Copyright (c) 2013 Kihwang Lee <leekh at ktug org> %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% 2013.08.26 %% \ProvidesPackage{xetexko-var} - [2014/06/12 v0.13 Korean Typesetting under XeTeX] + [2020/02/05 v0.14 Korean Typesetting under XeTeX] %%% common options for xob-font \DeclareOption{gremph}{\PassOptionsToPackage{\CurrentOption}{xob-font}} @@ -35,8 +35,8 @@ \DeclareOption{manualfontspec}{\@extfontspectrue} %%% unfonts -\DeclareOption{unfonts}{\PassOptionsToPackage{\CurrentOption}{xob-font}} -\DeclareOption{nounfonts}{\PassOptionsToPackage{\CurrentOption}{xob-font}} +%\DeclareOption{unfonts}{\PassOptionsToPackage{\CurrentOption}{xob-font}} +%\DeclareOption{nounfonts}{\PassOptionsToPackage{\CurrentOption}{xob-font}} \DeclareOption{nanum}{\PassOptionsToPackage{\CurrentOption}{xob-font}} \DeclareOption{hcr}{\PassOptionsToPackage{\CurrentOption}{xob-font}} \ProcessOptions\relax @@ -44,7 +44,9 @@ %%% xetexko sub-styles \RequirePackage{xetexko-space} \RequirePackage{xetexko-josa} +\if@lwarp\else \RequirePackage{xetexko-vertical} +\fi %%% xoblivoir sub-styles \RequirePackage{xob-dotemph} @@ -54,7 +56,7 @@ \PackageWarning{xetexko-var}{Load xetexko-font and configure Korean Fonts manually!}{} \else %%% We will never use xetexko/luatexko's unfonts option. - \newif\if@unfonts\@unfontsfalse +% \newif\if@unfonts\@unfontsfalse \RequirePackage{xob-font} \fi 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 16095498f7b..cab543826df 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,12 +1,12 @@ %% xob-font.sty %% -%% Copyright (c) 2014 Kangsoo Kim <karnes at ktug org> -%% Copyright (c) 2017 Kihwang Lee <leekh at ktug org> +%% Copyright (c) 2014-2020 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 %% conditions of the LaTeX Project Public License, either version 1.3c %% of this license or (at your option) any later version. -%% The latest version of this license is in +%% The latest version otef this license is in %% http://www.latex-project.org/lppl.txt %% and version 1.3c or later is part of all distributions of LaTeX %% version 2006/05/20 or later. @@ -15,7 +15,7 @@ %% oblivoir hangul/hanja font setting. %% part of oblivoir %% -\ProvidesPackage{xob-font}[2017/02/03 v0.7 select hangul/hanja fonts for oblivoir] +\ProvidesPackage{xob-font}[2020/02/04 v0.8 select hangul/hanja fonts for oblivoir] %%% obsolete options: retain \if@.. conditions for backward compatibility \newif\if@nowin\@nowinfalse @@ -118,9 +118,15 @@ \bool_if:nT \bold_prov_bool { - \tl_put_right:Nn \_font_feature_str { BoldFont = \_bold_font_name, - BoldItalicFont = \_bold_font_name, - ItalicFont = \_ital_font_name, } + \tl_put_right:Nn \_font_feature_str + { + BoldFont = \_bold_font_name, + BoldItalicFont = \_bold_font_name, + ItalicFont = \_ital_font_name, +% FontFace = {bx}{n} {Font = {\_bold_font_name}}, +% FontFace = {bx}{it} {Font = {\_bold_font_name}}, +% FontFace = {m}{up} {Font = {\_regu_font_name}} + } } \bool_if:nF \in_hanja_mode @@ -200,8 +206,14 @@ \treat_feature_name_options { #4 } [ #5 ] } +% \tl_set:Nx \l_tmpa_tl { \_font_feature_str, \_additional_feature_str } + \cs:w set #1 hangulfont \cs_end: - [ \_font_feature_str, \_additional_feature_str ] { \_regu_font_name } + [ \_font_feature_str, \_additional_feature_str, + FontFace = {bx}{n}{ Font={\_bold_font_name} , \_font_feature_str }, + FontFace = {m}{up}{ Font={\_regu_font_name} , \_font_feature_str } + ] + { \_regu_font_name } %%% \set_kor_sub_hanja_font will take more optional arguments, %%% hence, this codes have to be located at the end of code block. @@ -639,17 +651,17 @@ \protected\def\setobmonofont{\setxoblatinfont{mono}} %%% [unfonts] will be deprecated shortly. -\if@unfont - \if@gremph - \setkomainfont(UnBatang.ttf)(UnBatangBold.ttf)(UnGraphic.ttf)[Script=Hangul]% - (UnBatang.ttf)(UnBatangBold.ttf)(UnBatang.ttf)[Script=Hangul] - \else - \setkomainfont(UnBatang.ttf)(UnBatangBold.ttf)(UnBatang.ttf)[Script=Hangul] - \fi - \setkosansfont[UnDotum](.ttf)(Bold.ttf)(.ttf) - \setmonoscale{1.05} - \setkomonofont(UnTaza.ttf) -\fi +%\if@unfont +% \if@gremph +% \setkomainfont(UnBatang.ttf)(UnBatangBold.ttf)(UnGraphic.ttf)[Script=Hangul]% +% (UnBatang.ttf)(UnBatangBold.ttf)(UnBatang.ttf)[Script=Hangul] +% \else +% \setkomainfont(UnBatang.ttf)(UnBatangBold.ttf)(UnBatang.ttf)[Script=Hangul] +% \fi +% \setkosansfont[UnDotum](.ttf)(Bold.ttf)(.ttf) +% \setmonoscale{1.05} +% \setkomonofont(UnTaza.ttf) +%\fi \if@nanumfonts \if@nanumxfonts @@ -659,19 +671,21 @@ \fi \setkosansfont(NanumGothic)(*Bold)(*) \setkomonofont(NanumGothic) -\fi - +\else %%% [hcr] adds [Script=Hangul] feature automatically. \if@hcrfonts - \setkomainfont(HCRBatangLVT)(*-Bold)(*) - \setkosansfont(HCRDotumLVT)(*-Bold)(*) + \setkomainfont(HCRBatangLVT)(HCRBatangLVT-Bold)(HCRBatangLVT) + \setkosansfont(HCRDotumLVT)(HCRDotumLVT-Bold)(HCRDotumLVT) \setkomonofont(HCRDotumLVT) -\fi +\else +\setkomainfont(UnBatang.ttf)(UnBatangBold.ttf)(UnGraphic.ttf) +\fi\fi \endinput %%% end of file `xob-font.sty` %% CHANGES +%% 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. %% v0.6 : HCR auto insert Script=Hangul, HAN disabled %% v0.5 : [nanum] sets Bold, [nanumx] sets ExtraBold for NanumMyeongjo diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xob-lwarp.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xob-lwarp.sty new file mode 100644 index 00000000000..bbfea75956d --- /dev/null +++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/xob-lwarp.sty @@ -0,0 +1,177 @@ +%% xob-lwarp.sty +%% +%% part of xoblivoir package bundle +%% 2020/02/09 +%% +\ProvidesPackage{xob-lwarp} + +\if@lwarp + \def\makerunningwidth#1#2{% + \expandafter\let\csname #1headrunwidth\endcsname\textwidth + \expandafter\let\csname #1footrunwidth\endcsname\textwidth + } + \def\makeheadposition#1#2#3#4#5{} + \def\copypagestyle#1#2{\makepagestyle{#1}} + \AtBeginDocument{ + \def\@partapp{Part} + \def\@chapapp{Chapter} + } + \AtEndPreamble{ + \HTMLLanguage{\LWARPlan} + } + + \let\if@bsstyle\iftrue + \let\abstitlestyle\textbf +% + %%%% copy-paste from xetexko-vertical.sty + \ifxetex + % do not veticalize headline/footline + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname selectfont\endcsname\relax % plain + \protected\def\verticaltypesetting{% + \dimen@\hsize\hsize\vsize\vsize\dimen@ + \edef\plainoutput{\unexpanded{\dimen@\hsize\hsize\vsize\vsize\dimen@}% + \unexpanded\expandafter{\plainoutput}}% + \def\pagebody{\setbox\z@\vbox to\hsize{\boxmaxdepth=\maxdepth + \pagecontents}\xetexko@rotatebox\z@\box\z@}% + \maxdepth\z@ \XK@vertical@spacing} + \else % latex + \protected\def\verticaltypesetting{% + \AtBeginDocument{\XK@vertical@spacing}% + \maxdepth\z@ + \dimen@\textwidth + \textwidth\textheight + \textheight\dimen@ + \edef\@outputpage{% + \unexpanded{\xetexko@rotatebox\@outputbox\textwidth\textheight}% + \unexpanded\expandafter{\@outputpage}}% + } + \@onlypreamble\verticaltypesetting + \fi + + \def\xetexko@rotatebox#1{% + \ifvbox#1\count@\@ne\else\count@\z@\fi + \dimen@\wd#1\dimen@ii\dimexpr\ht#1+\dp#1\relax + \setbox#1\ifnum\count@=\@ne + \vbox to\dimen@\bgroup\hbox to\dimen@ii\bgroup\hfil\else + \hbox to\dimen@ii\bgroup\vbox to\dimen@\bgroup\fi + \wd#1\z@ \ht#1\z@ \dp#1\z@ + \special{x:gsave}\special{x:rotate -90}\box#1\special{x:grestore}% + \ifnum\count@=\@ne\egroup\vfil\else\vfil\egroup\hfil\fi\egroup + } + + % users can declare vertical EM size, which might be different from 1em. + \newdimen\verticalem + + \def\XK@vertical@spacing{% + \ifnum\verticalem > \z@ + \def\XK@vert@half@em{.5\verticalem}% + \else + \def\XK@vert@half@em{.5em}% + \fi + \let\xk@horiz@precjkopenparen \precjkopenparen + \let\xk@horiz@precjkcloseparen\precjkcloseparen + \let\xk@horiz@precjkfullstop \precjkfullstop + \ifx\precjkopenparen\relax\else + \def\precjkopenparen {\leavevmode + \ifx\empty\xetexkocharraise\else\raise\xetexkocharraise\fi + \hbox + \ifx\XKdisablecjksymbolspacing\empty + \bgroup + \else + to\XK@vert@half@em \bgroup \hss + \fi + }% + \fi + \ifx\precjkcloseparen\relax\else + \def\precjkcloseparen{\leavevmode + \ifx\empty\xetexkocharraise\else\raise\xetexkocharraise\fi + \hbox + \ifx\XKdisablecjksymbolspacing\empty\else + to\XK@vert@half@em + \fi + \bgroup}% + \fi + \ifx\precjkfullstop\relax\else + \def\precjkfullstop {\leavevmode + \ifx\empty\xetexkocharraise\else\raise\xetexkocharraise\fi + \hbox + \ifx\XKdisablecjksymbolspacing\empty\else + to\XK@vert@half@em + \fi + \bgroup}% + \fi + \spaceskip\XK@vert@half@em plus\XK@vert@half@em\relax + \parindent\XK@vert@half@em \parindent2\parindent + } + + \protected\def\vertical#1{% + \setbox\z@\vbox\bgroup + \hsize=#1% + \leftskip\z@ + \rightskip\z@ + \parindent\z@ + \everypar{}% + \XK@vertical@spacing + } + + \protected\def\endvertical{% + \egroup + \dimen@\dimexpr\ht\z@+\dp\z@\relax + \dimen@ii\dimexpr\wd\z@-\dp\z@\relax + \setbox\z@\hbox{% + \kern\dimexpr\ht\z@+0.5em\relax + \wd\z@\z@ + \ht\z@\z@ + \dp\z@\z@ + \special{x:gsave}% + \special{x:rotate -90}% + \box\z@ + \special{x:grestore}}% + \wd\z@\dimen@ + \ht\z@\z@ + \dp\z@\z@ + \leavevmode + \raise\dimen@ii\box\z@ + } + + % horizontal box inside vertical typesetting + \protected\def\horizontal#1{% + \setbox\z@\vbox\bgroup + \hsize=#1% + \leftskip \z@ + \rightskip\z@ + \parindent\z@ + \everypar {}% + \spaceskip \fontdimen2\font + plus \fontdimen3\font + minus\fontdimen4\font + \ifdefined\xk@horiz@precjkopenparen + \let\precjkopenparen \xk@horiz@precjkopenparen + \let\precjkcloseparen\xk@horiz@precjkcloseparen + \let\precjkfullstop \xk@horiz@precjkfullstop + \fi + } + \protected\def\endhorizontal{% + \egroup + \dimen@\dimexpr\ht\z@+\dp\z@\relax + \dimen@ii\dimexpr\wd\z@+.5ex\relax + \setbox\z@\hbox\bgroup + \wd\z@\z@\ht\z@\z@\dp\z@\z@ + \special{x:gsave}% + \special{x:rotate 90}% + \box\z@ + \special{x:grestore}% + \egroup + \wd\z@\dimen@ + \ht\z@\dimen@ii + \dp\z@\z@ + \fboxsep=-\fboxrule + \leavevmode\lower.5ex\box\z@ + } + + \protected\def\vertlatin#1{\leavevmode\lower0.5ex\hbox{\latinmarks #1}} + \fi % end of vertical +\fi +\endinput + |