From 58aa1ac09b1d9e4769d0a0661cf12e2b2db41b14 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 22 May 2021 03:00:53 +0000 Subject: CTAN sync 202105220300 --- macros/luatex/generic/luatexja/README | 8 ++++---- macros/luatex/generic/luatexja/doc/luatexja-en.pdf | Bin 693538 -> 693535 bytes macros/luatex/generic/luatexja/doc/luatexja-ja.pdf | Bin 1130313 -> 1130307 bytes .../luatex/generic/luatexja/src/ltj-inputbuf.lua | 8 +++----- .../luatex/generic/luatexja/src/luatexja-core.sty | 4 ++-- macros/luatex/generic/luatexja/src/luatexja.sty | 4 ++-- 6 files changed, 11 insertions(+), 13 deletions(-) (limited to 'macros/luatex/generic/luatexja') diff --git a/macros/luatex/generic/luatexja/README b/macros/luatex/generic/luatexja/README index e0f26c370c..3a433c20d4 100644 --- a/macros/luatex/generic/luatexja/README +++ b/macros/luatex/generic/luatexja/README @@ -1,4 +1,4 @@ -The LuaTeX-ja Package 20210517.0 +The LuaTeX-ja Package 20210521.0 -------------------------------- Copyright (c) 2011--2021 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 20210517.0 in the Git repository by + or tagged as 20210521.0 in the Git repository by + ;a=snapshot;h=refs/tags/20210521.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: Mon May 17 11:57:27 2021 +0900 +Last commit date: Fri May 21 21:07:11 2021 +0900 diff --git a/macros/luatex/generic/luatexja/doc/luatexja-en.pdf b/macros/luatex/generic/luatexja/doc/luatexja-en.pdf index 12aada4965..4a31080cc1 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 8799ab20c8..ba8dad3586 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-inputbuf.lua b/macros/luatex/generic/luatexja/src/ltj-inputbuf.lua index 6423f8817a..e1623199e4 100644 --- a/macros/luatex/generic/luatexja/src/ltj-inputbuf.lua +++ b/macros/luatex/generic/luatexja/src/ltj-inputbuf.lua @@ -5,7 +5,6 @@ luatexja.load_module 'base'; local ltjb = luatexja.base luatexja.load_module 'charrange'; local ltjc = luatexja.charrange -require "unicode" local utflen = utf.len local utfbyte = utf.byte local utfchar = utf.char @@ -24,12 +23,11 @@ local start_time_measure, stop_time_measure local function add_comment(buffer) start_time_measure 'inputbuf' local i = utflen(buffer) - while (i>0) and (getcatcode(utfbyte(buffer, i))==1 - or getcatcode(utfbyte(buffer, i))==2) do - i=i-1 + local c = utfbyte(buffer, i) + while (i>0) and (getcatcode(c)==1 or getcatcode(c)==2) do + i=i-1; if (i>0) then c = utfbyte(buffer, i) end; end if i>0 then - local c = utfbyte(buffer, i) if c>=0x80 then local te = tex.endlinechar -- Is the catcode of endline character is 5 (end-of-line)? diff --git a/macros/luatex/generic/luatexja/src/luatexja-core.sty b/macros/luatex/generic/luatexja/src/luatexja-core.sty index 5f596574e2..fb58eaf31d 100644 --- a/macros/luatex/generic/luatexja/src/luatexja-core.sty +++ b/macros/luatex/generic/luatexja/src/luatexja-core.sty @@ -65,7 +65,7 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja-core}[2021-05-11 Core of LuaTeX-ja] + \ProvidesPackage{luatexja-core}[2021-05-21 Core of LuaTeX-ja] \fi % %% Load prerequisite packages. @@ -630,7 +630,7 @@ t[\the\ltj@@vadjust@dirhook@inner] = function () luatexja.direction.set_list_direction_hook('adj') end t[\the\ltj@@vadjust@check@dir@inner] - = luatexja.direction.check_adjust_direction() + = luatexja.direction.check_adjust_direction } \luadef\ltj@@vadjust@dirhook\ltj@@vadjust@dirhook@inner \protected\luadef\ltj@@vadjust@check@dir\ltj@@vadjust@check@dir@inner diff --git a/macros/luatex/generic/luatexja/src/luatexja.sty b/macros/luatex/generic/luatexja/src/luatexja.sty index 28b139d95e..0eec4c94c0 100644 --- a/macros/luatex/generic/luatexja/src/luatexja.sty +++ b/macros/luatex/generic/luatexja/src/luatexja.sty @@ -35,13 +35,13 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja}[2021-05-17 Japanese Typesetting with Lua(La)TeX] + \ProvidesPackage{luatexja}[2021-05-21 Japanese Typesetting with Lua(La)TeX] \DeclareOption{disablejfam}{\ltj@disablejfamtrue} \DeclareOption*{} \ProcessOptions\relax \fi % %%%% VERSION -\def\LuaTeXjaversion{20210517.0} +\def\LuaTeXjaversion{20210521.0} \directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs -- cgit v1.2.3