luatexja (18may20)

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

7 files changed, 15 insertions, 8 deletions

diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README
index b87dcbdd980..33105c10072 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/README
+++ b/Master/texmf-dist/doc/luatex/luatexja/README
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20200517.0
+The LuaTeX-ja Package 20200518.0
 --------------------------------
 Copyright (c) 2011--2020 The LuaTeX-ja project
 License: modified BSD (see COPYING)
@@ -45,9 +45,9 @@ Installation
 2. If you must/want to install manually:
 
    a. Download the source archive from CTAN,
-      or tagged as 20200517.0 in the Git repository by
+      or tagged as 20200518.0 in the Git repository by
       <http://git.osdn.jp/view?p=luatex-ja/luatexja.git
-                              ;a=snapshot;h=refs/tags/20200517.0;sf=tgz>
+                              ;a=snapshot;h=refs/tags/20200518.0;sf=tgz>
 
    b. Extract the archive and process following three files by LuaLaTeX
       to generate classes for Japanese typesetting:
@@ -95,4 +95,4 @@ Notes
 
 * src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use.
 
-Last commit date: Sun May 17 10:43:32 2020 +0900
+Last commit date: Mon May 18 05:28:24 2020 +0900
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
index 4cb0c4d8d36..9bdf6dd8df4 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
index f336e82bfdc..6a6defdd29c 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua
index e97da057905..7dd0dee9061 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua
@@ -139,6 +139,7 @@ do
    local STCK = luatexja.userid_table.STCK
    local IHB = luatexja.userid_table.IHB
    local id_local = node.id('local_par')
+   local id_dir = node.id('dir')
 
    local function test_list(h, lv)
       if not h then
@@ -157,7 +158,7 @@ do
 		     flag = 0; break -- error
 		  end
 	       end
-	    elseif p.id~=id_local then
+	    elseif p.id~=id_local and p.id~=id_dir then
 	       flag = 0; break
 	    end
 	 end
@@ -220,6 +221,9 @@ do
 	    if lv==0 and not page_direction then
 	       page_direction = v -- for first call of \yoko (in luatexja-core.sty)
 	    else
+              if luatexja.debug then
+                luatexja.ext_show_node_list(node.direct.tonode(h),'>> ', texio.write_nl)
+              end
               ltjb.package_error(
                  'luatexja',
                  "Use `\\" .. tostring(name) .. "' at top of list",
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
index cecb8d66250..a15b7616bdd 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
@@ -188,7 +188,7 @@ do
    local function myround(a) return floor(a+0.5) end
    local mult_ignore_key = {
      round_threshold=true, kanjiskip_natural=true, kanjiskip_stretch=true, kanjiskip_shrink=true,
-     raio=true, priority=true
+     ratio=true, priority=true
    }
    local function mult_table(old,scale) -- modified from table.fastcopy
       if old then
@@ -226,7 +226,7 @@ do
                   kanjiskip_stretch = w.kanjiskip_stretch,
                   kanjiskip_shrink =  w.kanjiskip_shrink,
                   round_threshold = w.round_threshold,
-               }
+		  }
             end
             for k,w in pairs(v.kern) do
                local g = node_new(id_kern, 1)
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
index df1b57dfe68..1b3bd81612b 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
@@ -516,6 +516,9 @@ local function debug_show_node_X(p,print_fn, limit, inner_depth)
 	 s = s .. ' (for kinsoku)'
       end
       print_fn(s)
+   elseif pt == 'dir' then
+      s = base .. ' ' .. tostring(p.dir) .. ' (level ' .. tostring(p.level) .. ')'
+      print_fn(s)
    elseif pt == 'whatsit' then
       s = base
       if p.subtype==sid_user then
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
index 68b11f7d875..da8ecf7c89d 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
@@ -41,7 +41,7 @@
   \ProcessOptions\relax
 \fi                             %</LaTeX>
 %%%% VERSION
-\def\LuaTeXjaversion{20200517.0}
+\def\LuaTeXjaversion{20200518.0}
 
 \directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs