From f5c7c9695f181a8fd6e28b572edea03ffc59de93 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 4 May 2023 03:00:41 +0000 Subject: CTAN sync 202305040300 --- macros/luatex/generic/luatexja/README | 8 ++++---- macros/luatex/generic/luatexja/doc/luatexja-en.pdf | Bin 701830 -> 702456 bytes macros/luatex/generic/luatexja/doc/luatexja-ja.pdf | Bin 1148687 -> 1143943 bytes macros/luatex/generic/luatexja/src/ltj-debug.lua | 3 +-- .../luatex/generic/luatexja/src/ltj-inputbuf.lua | 1 - macros/luatex/generic/luatexja/src/luatexja.sty | 2 +- .../generic/luatexja/src/patches/lltjfont.sty | 6 +++--- 7 files changed, 9 insertions(+), 11 deletions(-) (limited to 'macros/luatex/generic/luatexja') diff --git a/macros/luatex/generic/luatexja/README b/macros/luatex/generic/luatexja/README index 8f5f043144..69b4ebef3a 100644 --- a/macros/luatex/generic/luatexja/README +++ b/macros/luatex/generic/luatexja/README @@ -1,4 +1,4 @@ -The LuaTeX-ja Package 20230409.0 +The LuaTeX-ja Package 20230503.0 -------------------------------- Copyright (c) 2011--2023 The LuaTeX-ja project License: modified BSD (see COPYING) @@ -42,9 +42,9 @@ Installation 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20230409.0 in the Git repository by + or tagged as 20230503.0 in the Git repository by + ;a=snapshot;h=refs/tags/20230503.0;sf=tgz> b. Extract the archive and process following three files by LuaLaTeX to generate classes for Japanese typesetting: @@ -93,4 +93,4 @@ Notes This file and ltj-kinsoku.lua are not used anymore. (Do not remove ltj-kinsoku.tex.) -Last commit date: Sun Apr 9 08:12:48 2023 +0900 +Last commit date: Wed May 3 07:10:30 2023 +0900 diff --git a/macros/luatex/generic/luatexja/doc/luatexja-en.pdf b/macros/luatex/generic/luatexja/doc/luatexja-en.pdf index 47df10cd7d..794fce564d 100644 Binary files a/macros/luatex/generic/luatexja/doc/luatexja-en.pdf and b/macros/luatex/generic/luatexja/doc/luatexja-en.pdf differ diff --git a/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf b/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf index 0cad34ccec..1aad471bbe 100644 Binary files a/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf and b/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf differ 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}% }} -- cgit v1.2.3