luatexko (1nov22)

git-svn-id: svn://tug.org/texlive/trunk@64893 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 43 insertions, 35 deletions

diff --git a/Master/texmf-dist/doc/luatex/luatexko/ChangeLog b/Master/texmf-dist/doc/luatex/luatexko/ChangeLog
index 208b56d08ce..6cffa0112e0 100644
--- a/Master/texmf-dist/doc/luatex/luatexko/ChangeLog
+++ b/Master/texmf-dist/doc/luatex/luatexko/ChangeLog
@@ -1,3 +1,10 @@
+2022-11-01	Dohyun Kim <nomos at ktug org>
+
+	Version 3.5
+
+	* luatexko.sty:
+	prevent clash with pgfpicture (use kernel's selectfont)
+
 2022-03-20	Dohyun Kim <nomos at ktug org>
 
 	Version 3.4
diff --git a/Master/texmf-dist/doc/luatex/luatexko/README b/Master/texmf-dist/doc/luatex/luatexko/README
index da8e77294cd..1cfabaf2610 100644
--- a/Master/texmf-dist/doc/luatex/luatexko/README
+++ b/Master/texmf-dist/doc/luatex/luatexko/README
@@ -1,4 +1,4 @@
-LuaTeX-ko Package version 3.4 (2022/03/20)
+LuaTeX-ko Package version 3.5 (2022/11/01)
 ===========================================
 
 This is a Lua(La)TeX macro package that supports typesetting Korean
diff --git a/Master/texmf-dist/doc/luatex/luatexko/luatexko-doc.pdf b/Master/texmf-dist/doc/luatex/luatexko/luatexko-doc.pdf
index 7f2be3cd7bb..351e5397a76 100644
--- a/Master/texmf-dist/doc/luatex/luatexko/luatexko-doc.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexko/luatexko-doc.pdf
diff --git a/Master/texmf-dist/doc/luatex/luatexko/luatexko-doc.tex b/Master/texmf-dist/doc/luatex/luatexko/luatexko-doc.tex
index deb48a91bd1..ddec12b794e 100644
--- a/Master/texmf-dist/doc/luatex/luatexko/luatexko-doc.tex
+++ b/Master/texmf-dist/doc/luatex/luatexko/luatexko-doc.tex
@@ -142,7 +142,7 @@
 \author{Dohyun Kim \normalsize |<nomos at ktug org>| \and
         Soojin Nam \normalsize |<jsunam at gmail com>| \and
   \normalsize <\url{http://github.com/dohyunkim/luatexko}>}
-\date{Version 3.4\quad 2022/03/20}
+\date{Version 3.5\quad 2022/11/01}
 \maketitle
 
 \begin{quote}
diff --git a/Master/texmf-dist/tex/luatex/luatexko/luatexko-normalize.lua b/Master/texmf-dist/tex/luatex/luatexko/luatexko-normalize.lua
index 49c076915bb..68e9227c386 100644
--- a/Master/texmf-dist/tex/luatex/luatexko/luatexko-normalize.lua
+++ b/Master/texmf-dist/tex/luatex/luatexko/luatexko-normalize.lua
@@ -13,8 +13,8 @@
 
 luatexbase.provides_module({
   name        = "luatexko-normalize",
-  version     = "3.4",
-  date        = "2022/03/20",
+  version     = "3.5",
+  date        = "2022/11/01",
   author      = "Dohyun Kim, Soojin Nam",
   description = "Hangul normalization",
   license     = "LPPL v1.3+",
diff --git a/Master/texmf-dist/tex/luatex/luatexko/luatexko-uhc2utf8.lua b/Master/texmf-dist/tex/luatex/luatexko/luatexko-uhc2utf8.lua
index 59517fbcc7b..5d5fed591fc 100644
--- a/Master/texmf-dist/tex/luatex/luatexko/luatexko-uhc2utf8.lua
+++ b/Master/texmf-dist/tex/luatex/luatexko/luatexko-uhc2utf8.lua
@@ -13,8 +13,8 @@
 
 luatexbase.provides_module({
   name        = "luatexko-uhc2utf8",
-  version     = "3.4",
-  date        = "2022/03/20",
+  version     = "3.5",
+  date        = "2022/11/01",
   author      = "Dohyun Kim, Soojin Nam",
   description = "UHC (CP949) input encoding",
   license     = "LPPL v1.3+",
diff --git a/Master/texmf-dist/tex/luatex/luatexko/luatexko.lua b/Master/texmf-dist/tex/luatex/luatexko/luatexko.lua
index b46abe07a2c..940efb43c32 100644
--- a/Master/texmf-dist/tex/luatex/luatexko/luatexko.lua
+++ b/Master/texmf-dist/tex/luatex/luatexko/luatexko.lua
@@ -13,8 +13,8 @@
 
 luatexbase.provides_module {
   name        = 'luatexko',
-  date        = '2022/03/20',
-  version     = '3.4',
+  date        = '2022/11/01',
+  version     = '3.5',
   description = 'typesetting Korean with LuaTeX',
   author      = 'Dohyun Kim, Soojin Nam',
   license     = 'LPPL v1.3+',
diff --git a/Master/texmf-dist/tex/luatex/luatexko/luatexko.sty b/Master/texmf-dist/tex/luatex/luatexko/luatexko.sty
index a6d4419d262..0cedb2a5d85 100644
--- a/Master/texmf-dist/tex/luatex/luatexko/luatexko.sty
+++ b/Master/texmf-dist/tex/luatex/luatexko/luatexko.sty
@@ -14,9 +14,10 @@
 \ifdefined\luatexkohangulfontattr \endinput\fi
 \ifdefined\ProvidesPackage
   \NeedsTeXFormat{LaTeX2e}[2021/06/01]
-  \ProvidesPackage{luatexko}[2022/03/20 v3.4 typesetting Korean with LuaTeX]
+  \ProvidesPackage{luatexko}[2022/11/01 v3.5 typesetting Korean with LuaTeX]
   \RequirePackage{luatexbase}
   \RequirePackage{fontspec}[2020/02/03]
+  \let\luatexkoselectfont\selectfont
 \else
   \input luatexbase.sty
   \input luaotfload.sty
@@ -289,7 +290,7 @@
     \ifdefined\rubyfont \rubyfont \fi
     \ifcsname ver@luatexko.sty\endcsname % <- latex
       \dimen@\dimexpr\rubysize em\relax
-      \fontsize\dimen@\dimen@\selectfont
+      \fontsize\dimen@\dimen@\luatexkoselectfont
     \fi
     #2}%
   \hbadness\@M % supress underfull warning
@@ -426,32 +427,32 @@
     \Umathcode\count@ = 7 \symmathhangul\count@
     \ifnum\count@<"#2 \advance\count@\@ne \repeat}
 % font fallback
-\newif\ifluatexkoselectfontrunning
+\newif\ifluatexkorunningselectfont
 \def\luatexkohangulselectfont{%
-  \ifluatexkoselectfontrunning \else
+  \ifluatexkorunningselectfont \else
     \ifdefined\luatexkohangulfont
       \begingroup
-      \luatexkoselectfontrunningtrue
+      \luatexkorunningselectfonttrue
       \luatexkohangulfont
       \expandafter\expandafter\expandafter\endgroup
       \expandafter\luatexkohangulfontattr\fontid\font\relax
     \fi
   \fi }
 \def\luatexkohanjaselectfont{%
-  \ifluatexkoselectfontrunning \else
+  \ifluatexkorunningselectfont \else
     \ifdefined\luatexkohanjafont
       \begingroup
-      \luatexkoselectfontrunningtrue
+      \luatexkorunningselectfonttrue
       \luatexkohanjafont
       \expandafter\expandafter\expandafter\endgroup
       \expandafter\luatexkohanjafontattr\fontid\font\relax
     \fi
   \fi }
 \def\luatexkofallbackselectfont{%
-  \ifluatexkoselectfontrunning \else
+  \ifluatexkorunningselectfont \else
     \ifdefined\luatexkofallbackfont
       \begingroup
-      \luatexkoselectfontrunningtrue
+      \luatexkorunningselectfonttrue
       \luatexkofallbackfont
       \expandafter\expandafter\expandafter\endgroup
       \expandafter\luatexkofallbackfontattr\fontid\font\relax
@@ -585,7 +586,7 @@
   \cs_set_protected_nopar:Npn \luatexkomainhangulfont
   {
     \fontencoding \g_fontspec_encoding_tl
-    \fontfamily \luatexkomainhangulfamily \selectfont
+    \fontfamily \luatexkomainhangulfamily \luatexkoselectfont
   }
   \str_if_eq:eeT \familydefault \rmdefault
   {
@@ -601,7 +602,7 @@
   \cs_set_protected_nopar:Npn \luatexkosanshangulfont
   {
     \fontencoding \g_fontspec_encoding_tl
-    \fontfamily \luatexkosanshangulfamily \selectfont
+    \fontfamily \luatexkosanshangulfamily \luatexkoselectfont
   }
   \str_if_eq:eeT \familydefault \sfdefault
   {
@@ -617,7 +618,7 @@
   \cs_set_protected_nopar:Npn \luatexkomonohangulfont
   {
     \fontencoding \g_fontspec_encoding_tl
-    \fontfamily \luatexkomonohangulfamily \selectfont
+    \fontfamily \luatexkomonohangulfamily \luatexkoselectfont
   }
   \str_if_eq:eeT \familydefault \ttdefault
   {
@@ -635,7 +636,7 @@
     \cs_set_nopar:Npn \luatexkohangulfont
     {
       \fontencoding \g_fontspec_encoding_tl
-      \exp_args:Nc \fontfamily { luatexko_user_family_ \cs_to_str:N #1 } \selectfont
+      \exp_args:Nc \fontfamily { luatexko_user_family_ \cs_to_str:N #1 } \luatexkoselectfont
     }
     \luatexkohangulselectfont
   }
@@ -651,7 +652,7 @@
   \cs_set_nopar:Npn \luatexkohangulfont
   {
     \fontencoding \g_fontspec_encoding_tl
-    \fontfamily \luatexkohangulfontfamily \selectfont
+    \fontfamily \luatexkohangulfontfamily \luatexkoselectfont
   }
   \luatexkohangulselectfont
   \ignorespaces
@@ -662,7 +663,7 @@
   \cs_set_protected_nopar:Npn \luatexkomainhanjafont
   {
     \fontencoding \g_fontspec_encoding_tl
-    \fontfamily \luatexkomainhanjafamily \selectfont
+    \fontfamily \luatexkomainhanjafamily \luatexkoselectfont
   }
   \str_if_eq:eeT \familydefault \rmdefault
   {
@@ -678,7 +679,7 @@
   \cs_set_protected_nopar:Npn \luatexkosanshanjafont
   {
     \fontencoding \g_fontspec_encoding_tl
-    \fontfamily \luatexkosanshanjafamily \selectfont
+    \fontfamily \luatexkosanshanjafamily \luatexkoselectfont
   }
   \str_if_eq:eeT \familydefault \sfdefault
   {
@@ -694,7 +695,7 @@
   \cs_set_protected_nopar:Npn \luatexkomonohanjafont
   {
     \fontencoding \g_fontspec_encoding_tl
-    \fontfamily \luatexkomonohanjafamily \selectfont
+    \fontfamily \luatexkomonohanjafamily \luatexkoselectfont
   }
   \str_if_eq:eeT \familydefault \ttdefault
   {
@@ -712,7 +713,7 @@
     \cs_set_nopar:Npn \luatexkohanjafont
     {
       \fontencoding \g_fontspec_encoding_tl
-      \exp_args:Nc \fontfamily { luatexko_user_family_ \cs_to_str:N #1 } \selectfont
+      \exp_args:Nc \fontfamily { luatexko_user_family_ \cs_to_str:N #1 } \luatexkoselectfont
     }
     \luatexkohanjaselectfont
   }
@@ -728,7 +729,7 @@
   \cs_set_nopar:Npn \luatexkohanjafont
   {
     \fontencoding \g_fontspec_encoding_tl
-    \fontfamily \luatexkohanjafontfamily \selectfont
+    \fontfamily \luatexkohanjafontfamily \luatexkoselectfont
   }
   \luatexkohanjaselectfont
   \ignorespaces
@@ -740,7 +741,7 @@
   \cs_set_protected_nopar:Npn \luatexkomainfallbackfont
   {
     \fontencoding \g_fontspec_encoding_tl
-    \fontfamily \luatexkomainfallbackfamily \selectfont
+    \fontfamily \luatexkomainfallbackfamily \luatexkoselectfont
   }
   \str_if_eq:eeT \familydefault \rmdefault
   {
@@ -756,7 +757,7 @@
   \cs_set_protected_nopar:Npn \luatexkosansfallbackfont
   {
     \fontencoding \g_fontspec_encoding_tl
-    \fontfamily \luatexkosansfallbackfamily \selectfont
+    \fontfamily \luatexkosansfallbackfamily \luatexkoselectfont
   }
   \str_if_eq:eeT \familydefault \sfdefault
   {
@@ -772,7 +773,7 @@
   \cs_set_protected_nopar:Npn \luatexkomonofallbackfont
   {
     \fontencoding \g_fontspec_encoding_tl
-    \fontfamily \luatexkomonofallbackfamily \selectfont
+    \fontfamily \luatexkomonofallbackfamily \luatexkoselectfont
   }
   \str_if_eq:eeT \familydefault \ttdefault
   {
@@ -790,7 +791,7 @@
     \cs_set_nopar:Npn \luatexkofallbackfont
     {
       \fontencoding \g_fontspec_encoding_tl
-      \exp_args:Nc \fontfamily { luatexko_user_family_ \cs_to_str:N #1 } \selectfont
+      \exp_args:Nc \fontfamily { luatexko_user_family_ \cs_to_str:N #1 } \luatexkoselectfont
     }
     \luatexkofallbackselectfont
   }
@@ -806,7 +807,7 @@
   \cs_set_nopar:Npn \luatexkofallbackfont
   {
     \fontencoding \g_fontspec_encoding_tl
-    \fontfamily \luatexkofallbackfontfamily \selectfont
+    \fontfamily \luatexkofallbackfontfamily \luatexkoselectfont
   }
   \luatexkofallbackselectfont
   \ignorespaces
@@ -835,7 +836,7 @@
   \edef\x{\endgroup
     \def\noexpand\luatexkohangulfont{%
       \noexpand\fontencoding{\UTFencname}%
-      \noexpand\fontfamily{\f@family}\noexpand\selectfont}}\x
+      \noexpand\fontfamily{\f@family}\noexpand\luatexkoselectfont}}\x
   \luatexkohangulselectfont
   \ignorespaces}
 \let\addhangulfontfeatures\addhangulfontfeature
@@ -847,7 +848,7 @@
   \edef\x{\endgroup
     \def\noexpand\luatexkohanjafont{%
       \noexpand\fontencoding{\UTFencname}%
-      \noexpand\fontfamily{\f@family}\noexpand\selectfont}}\x
+      \noexpand\fontfamily{\f@family}\noexpand\luatexkoselectfont}}\x
   \luatexkohanjaselectfont
   \ignorespaces}
 \let\addhanjafontfeatures\addhanjafontfeature
@@ -859,7 +860,7 @@
   \edef\x{\endgroup
     \def\noexpand\luatexkofallbackfont{%
       \noexpand\fontencoding{\UTFencname}%
-      \noexpand\fontfamily{\f@family}\noexpand\selectfont}}\x
+      \noexpand\fontfamily{\f@family}\noexpand\luatexkoselectfont}}\x
   \luatexkofallbackselectfont
   \ignorespaces}
 \let\addfallbackfontfeatures\addfallbackfontfeature