summaryrefslogtreecommitdiff
path: root/macros/luatex/generic/luatexja/src
diff options
context:
space:
mode:
Diffstat (limited to 'macros/luatex/generic/luatexja/src')
-rw-r--r--macros/luatex/generic/luatexja/src/ltj-debug.lua3
-rw-r--r--macros/luatex/generic/luatexja/src/ltj-inputbuf.lua1
-rw-r--r--macros/luatex/generic/luatexja/src/luatexja.sty2
-rw-r--r--macros/luatex/generic/luatexja/src/patches/lltjfont.sty6
4 files changed, 5 insertions, 7 deletions
diff --git a/macros/luatex/generic/luatexja/src/ltj-debug.lua b/macros/luatex/generic/luatexja/src/ltj-debug.lua
index 912242615a..97105e69c1 100644
--- a/macros/luatex/generic/luatexja/src/ltj-debug.lua
+++ b/macros/luatex/generic/luatexja/src/ltj-debug.lua
@@ -86,10 +86,9 @@ end
ltjdbg.pformat = pformat
-------------------- 所要時間合計
-require("socket")
do
local max = math.max
- local gettime = socket.gettime
+ local gettime = os.socketgettime or (socket and socket.gettime)
local time_stat = {}
local function start_time_measure(n)
if not time_stat[n] then
diff --git a/macros/luatex/generic/luatexja/src/ltj-inputbuf.lua b/macros/luatex/generic/luatexja/src/ltj-inputbuf.lua
index 66a466ec0c..70195d4a83 100644
--- a/macros/luatex/generic/luatexja/src/ltj-inputbuf.lua
+++ b/macros/luatex/generic/luatexja/src/ltj-inputbuf.lua
@@ -57,7 +57,6 @@ end
end
--- the following function is modified from jafontspec.lua (by K. Maeda).
--- Instead of "%", we use U+FFFFF for suppressing spaces.
---DEBUG require"socket"
local time_line = 0
local start_time_measure, stop_time_measure
= ltjb.start_time_measure, ltjb.stop_time_measure
diff --git a/macros/luatex/generic/luatexja/src/luatexja.sty b/macros/luatex/generic/luatexja/src/luatexja.sty
index d355b39003..5d04d1d460 100644
--- a/macros/luatex/generic/luatexja/src/luatexja.sty
+++ b/macros/luatex/generic/luatexja/src/luatexja.sty
@@ -27,7 +27,7 @@
\newif\ifltj@disablejfam
%%%% VERSION
-\def\LuaTeXjaversion{20230211.0}
+\def\LuaTeXjaversion{20230503.0}
%% Check if LaTeX is used.
\begingroup\expandafter\expandafter\expandafter\endgroup
diff --git a/macros/luatex/generic/luatexja/src/patches/lltjfont.sty b/macros/luatex/generic/luatexja/src/patches/lltjfont.sty
index f86dec1de6..2efc9435ab 100644
--- a/macros/luatex/generic/luatexja/src/patches/lltjfont.sty
+++ b/macros/luatex/generic/luatexja/src/patches/lltjfont.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjfont}[2023-04-06 Patch to NFSS2 for LuaTeX-ja]
+\ProvidesPackage{lltjfont}[2023-04-13 Patch to NFSS2 for LuaTeX-ja]
%%%%%%%% LaTeX2e version detection
\newcount\ltj@@latex@plv \ltj@@latex@plv=-1
@@ -1316,12 +1316,12 @@
}
\luadef\ltj@@jfont@@jfmonly \ltj@@jfont@@jfmonly@@inner
\def\extract@jfont@onlyjfm{%
- \get@external@font
+ \get@external@font\ltj@@convert@input@path@to@lua
\csxdef{ltj@@fontjfm/\expandafter\string\font@name}{%
\ltj@@jfont@@jfmonly{\external@font}{yoko}%
}}
\def\extract@tfont@onlyjfm{%
- \get@external@font
+ \get@external@font\ltj@@convert@input@path@to@lua
\csxdef{ltj@@fontjfm/\expandafter\string\font@name}{%
\ltj@@jfont@@jfmonly{\external@font}{tate}%
}}