texlive[48335] Master/texmf-dist: xetexko (2aug18)

commits+karl at tug.org commits+karl at tug.org
Thu Aug 2 22:32:28 CEST 2018 

Revision: 48335
          http://tug.org/svn/texlive?view=revision&revision=48335
Author:   karl
Date:     2018-08-02 22:32:27 +0200 (Thu, 02 Aug 2018)
Log Message:
-----------
xetexko (2aug18)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
    trunk/Master/texmf-dist/doc/xetex/xetexko/README
    trunk/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.pdf
    trunk/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex
    trunk/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty

Modified: trunk/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/doc/xetex/xetexko/ChangeLog	2018-08-02 20:32:09 UTC (rev 48334)
+++ trunk/Master/texmf-dist/doc/xetex/xetexko/ChangeLog	2018-08-02 20:32:27 UTC (rev 48335)
@@ -1,3 +1,9 @@
+2018-08-02      Dohyun Kim <nomos at ktug org>
+
+	Version 2.20
+
+	* xetexko-font.sty: adapt to the fontspec v2.6h
+
 2018-04-19      Dohyun Kim <nomos at ktug org>
 
 	Version 2.19

Modified: trunk/Master/texmf-dist/doc/xetex/xetexko/README
===================================================================
--- trunk/Master/texmf-dist/doc/xetex/xetexko/README	2018-08-02 20:32:09 UTC (rev 48334)
+++ trunk/Master/texmf-dist/doc/xetex/xetexko/README	2018-08-02 20:32:27 UTC (rev 48335)
@@ -1,4 +1,4 @@
-XeTeX-ko Package version 2.19 (2018/04/19)
+XeTeX-ko Package version 2.20 (2018/08/02)
 =========================================
 
 XeTeX-ko is a macro package for Xe(La)TeX which supports typesetting

Modified: trunk/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex	2018-08-02 20:32:09 UTC (rev 48334)
+++ trunk/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex	2018-08-02 20:32:27 UTC (rev 48335)
@@ -59,7 +59,7 @@
 \title{\xetexko\ 간단 매뉴얼}
 \author{Dohyun Kim \normalsize <\texttt{nomos at ktug org}> \and
   \normalsize <\url{http://github.com/dohyunkim/xetexko}>}
-\date{Version 2.19\quad 2018/04/19}
+\date{Version 2.20\quad 2018/08/02}
 \maketitle
 
 \begin{quote}\small
@@ -187,7 +187,7 @@
 \end{plaintex}
 
 \cs{fallbackhanjafont}를 정의해두면 \hemph{한자 글꼴에도 없는 한자}를
-이 글꼴에서 찾아 식자한다. \verb|\newfontfamily| 명령으로 정의한다.
+이 글꼴에서 찾아 식자한다. \verb|\newfontfamily| 명령 등으로 정의한다.
 
 \section{글꼴 명령 (계속)}
 \begin{verbatim}
@@ -203,7 +203,7 @@
   \newhangulfontface  \myhangul{NanumGothic Bold}[Ligatures=TeX]
   \newhanjafontface   \myhanja {UnDotumBold}[Ligatures=TeX]
 \end{verbatim}
-fontspec 패키지의 \verb+\newfontfamily+ \verb+\newfontface+ 명령에 해당한다.
+fontspec 패키지의 \verb+\setfontfamily+ \verb+\newfontface+ 명령에 해당한다.
 
 \begin{verbatim}
   \addhangulfontfeature{Color=FF0000,InterHangul=-.1em}

Modified: trunk/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty	2018-08-02 20:32:09 UTC (rev 48334)
+++ trunk/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty	2018-08-02 20:32:27 UTC (rev 48335)
@@ -10,10 +10,10 @@
 % and version 1.3c or later is part of all distributions of LaTeX
 % version 2006/05/20 or later.
 
-\ProvidesPackage{xetexko-font}[2018/04/06 v2.18 LaTeX Font commands for XeTeX-ko]
+\ProvidesPackage{xetexko-font}[2018/08/02 v2.20 LaTeX Font commands for XeTeX-ko]
 
 \let\xetexko at f@size\f at size
-\RequirePackage{fontspec}[2014/05/25]
+\RequirePackage{fontspec}[2018/07/30]
 \let\f at size\xetexko at f@size
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -137,7 +137,7 @@
 \DeclareDocumentCommand \setmainhangulfont { O{} m O{} }
   {
     \__xtxko_hangul_assign_font_opts:n {#1,#3}
-    \newfontfamily \kormainfont [\l_xtxko_rem_tl] {#2}
+    \setfontfamily \kormainfont [\l_xtxko_rem_tl] {#2}
     \tl_put_right:NV \kormainfont \l_xtxko_font_opts_tl
     \__xtxko_def_XKhan__fonts:nnn \XKhangulfont \rmdefault \kormainfont
     \ignorespaces
@@ -145,7 +145,7 @@
 \DeclareDocumentCommand \setsanshangulfont { O{} m O{} }
   {
     \__xtxko_hangul_assign_font_opts:n {#1,#3}
-    \newfontfamily \korsansfont [\l_xtxko_rem_tl] {#2}
+    \setfontfamily \korsansfont [\l_xtxko_rem_tl] {#2}
     \tl_put_right:NV \korsansfont \l_xtxko_font_opts_tl
     \__xtxko_def_XKhan__fonts:nnn \XKhangulfont \sfdefault \korsansfont
     \ignorespaces
@@ -152,7 +152,7 @@
   }
 \DeclareDocumentCommand \setmonohangulfont { O{} m O{} }
   {
-    \newfontfamily \kormonofont [#1,#3] {#2}
+    \setfontfamily \kormonofont [#1,#3] {#2}
     \__xtxko_def_XKhan__fonts:nnn \XKhangulfont \ttdefault \kormonofont
     \ignorespaces
   }
@@ -159,7 +159,7 @@
 \DeclareDocumentCommand \setmainhanjafont { O{} m O{} }
   {
     \__xtxko_hanja_assign_font_opts:n {#1,#3}
-    \newfontfamily \hnjmainfont [\l_xtxko_rem_tl] {#2}
+    \setfontfamily \hnjmainfont [\l_xtxko_rem_tl] {#2}
     \tl_put_right:NV \hnjmainfont \l_xtxko_font_opts_tl
     \__xtxko_def_XKhan__fonts:nnn \XKhanjafont \rmdefault \hnjmainfont
     \ignorespaces
@@ -167,7 +167,7 @@
 \DeclareDocumentCommand \setsanshanjafont { O{} m O{} }
   {
     \__xtxko_hanja_assign_font_opts:n {#1,#3}
-    \newfontfamily \hnjsansfont [\l_xtxko_rem_tl] {#2}
+    \setfontfamily \hnjsansfont [\l_xtxko_rem_tl] {#2}
     \tl_put_right:NV \hnjsansfont \l_xtxko_font_opts_tl
     \__xtxko_def_XKhan__fonts:nnn \XKhanjafont \sfdefault \hnjsansfont
     \ignorespaces
@@ -174,7 +174,7 @@
   }
 \DeclareDocumentCommand \setmonohanjafont { O{} m O{} }
   {
-    \newfontfamily \hnjmonofont [#1,#3] {#2}
+    \setfontfamily \hnjmonofont [#1,#3] {#2}
     \__xtxko_def_XKhan__fonts:nnn \XKhanjafont \ttdefault \hnjmonofont
     \ignorespaces
   }
@@ -182,7 +182,7 @@
 \DeclareDocumentCommand \adhochangulfont { O{} m O{} }
   {
     \__xtxko_hangul_assign_font_opts:n {#1,#3}
-    \newfontfamily \XK at adhoc@hangul at font [\l_xtxko_rem_tl] {#2}
+    \setfontfamily \XK at adhoc@hangul at font [\l_xtxko_rem_tl] {#2}
     \tl_put_right:NV \XK at adhoc@hangul at font \l_xtxko_font_opts_tl
     \tl_set:Nn \XKhangulfont
       {
@@ -197,7 +197,7 @@
 \DeclareDocumentCommand \adhochanjafont { O{} m O{} }
   {
     \__xtxko_hanja_assign_font_opts:n {#1,#3}
-    \newfontfamily \XK at adhoc@hanja at font [\l_xtxko_rem_tl] {#2}
+    \setfontfamily \XK at adhoc@hanja at font [\l_xtxko_rem_tl] {#2}
     \tl_put_right:NV \XK at adhoc@hanja at font \l_xtxko_font_opts_tl
     \tl_set:Nn \XKhanjafont
       {
@@ -213,7 +213,7 @@
 \DeclareDocumentCommand \newhangulfontfamily { m O{} m O{} }
   {
     \__xtxko_hangul_assign_font_opts:n {#2,#4}
-    \exp_args:Nc \newfontfamily { XK at newfont@family \token_to_str:N #1 }
+    \exp_args:Nc \setfontfamily { XK at newfont@family \token_to_str:N #1 }
       [\l_xtxko_rem_tl] {#3}
     \tl_put_right:cV { XK at newfont@family \token_to_str:N #1 }
       \l_xtxko_font_opts_tl
@@ -231,7 +231,7 @@
 \DeclareDocumentCommand \newhanjafontfamily { m O{} m O{} }
   {
     \__xtxko_hanja_assign_font_opts:n {#2,#4}
-    \exp_args:Nc \newfontfamily { XK at newfont@family \token_to_str:N #1 }
+    \exp_args:Nc \setfontfamily { XK at newfont@family \token_to_str:N #1 }
       [\l_xtxko_rem_tl] {#3}
     \tl_put_right:cV { XK at newfont@family \token_to_str:N #1 }
       \l_xtxko_font_opts_tl
@@ -378,58 +378,26 @@
     \use:c { #2marks }
     \keys_set:nn { xtxko-char } { #1,#3 }
   }
-% fontspec 2017
+%% fontspec 2018
 \RenewDocumentCommand \setmainfont { O{} m O{} }
- {
-  \fontspec_set_family:Nnn \g__fontspec_rmfamily_family {#1,#3} {#2}
-  \tl_set_eq:NN \rmdefault \g__fontspec_rmfamily_family
-  \use:x { \exp_not:n { \DeclareRobustCommand \rmfamily }
-   {
-    \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl }
-    \exp_not:N \fontfamily { \g__fontspec_rmfamily_family }
-    \exp_not:N \selectfont
-		\exp_not:N \XK at rm@korean at font
-   }
+  {
+    \__fontspec_main_setmainfont:nn {#1,#3} {#2}
+    \edef\rmfamily{\unexpanded\expandafter{\rmfamily\XK at rm@korean at font}}
+    \ignorespaces
   }
-  \str_if_eq_x:nnT {\familydefault} {\rmdefault}
-    { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl }
-  \normalfont
-  \ignorespaces
- }
 \RenewDocumentCommand \setsansfont { O{} m O{} }
- {
-  \fontspec_set_family:Nnn \g__fontspec_sffamily_family {#1,#3} {#2}
-  \tl_set_eq:NN \sfdefault \g__fontspec_sffamily_family
-  \use:x { \exp_not:n { \DeclareRobustCommand \sffamily }
-   {
-    \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl }
-    \exp_not:N \fontfamily { \g__fontspec_sffamily_family }
-    \exp_not:N \selectfont
-		\exp_not:N \XK at sf@korean at font
-   }
+  {
+    \__fontspec_main_setsansfont:nn {#1,#3} {#2}
+    \edef\sffamily{\unexpanded\expandafter{\sffamily\XK at sf@korean at font}}
+    \ignorespaces
   }
-  \str_if_eq_x:nnT {\familydefault} {\sfdefault}
-    { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl }
-  \normalfont
-  \ignorespaces
- }
 \RenewDocumentCommand \setmonofont { O{} m O{} }
- {
-  \fontspec_set_family:Nnn \g__fontspec_ttfamily_family {#1,#3} {#2}
-  \tl_set_eq:NN \ttdefault \g__fontspec_ttfamily_family
-  \use:x { \exp_not:n { \DeclareRobustCommand \ttfamily }
-   {
-    \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl }
-    \exp_not:N \fontfamily { \g__fontspec_ttfamily_family }
-    \exp_not:N \selectfont
-		\exp_not:N \XK at tt@korean at font \exp_not:N \disablehangulspacing
-   }
+  {
+    \__fontspec_main_setmonofont:nn {#1,#3} {#2}
+    \edef\ttfamily{\unexpanded\expandafter{\ttfamily\XK at tt@korean at font
+      \disablehangulspacing}}
+    \ignorespaces
   }
-  \str_if_eq_x:nnT {\familydefault} {\ttdefault}
-    { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl }
-  \normalfont
-  \ignorespaces
- }
 \cs_set_eq:NN \setromanfont \setmainfont
 \ExplSyntaxOff

More information about the tex-live-commits mailing list