luatexja (11mar22) (branch)

git-svn-id: svn://tug.org/texlive/branches/branch2021.final@62637 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 14 insertions, 7 deletions

diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README
index a7b65cee775..9789b3ab84a 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 20220211.0
+The LuaTeX-ja Package 20220311.0
 --------------------------------
 Copyright (c) 2011--2022 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 20220211.0 in the Git repository by
+      or tagged as 20220311.0 in the Git repository by
       <http://git.osdn.jp/view?p=luatex-ja/luatexja.git
-                              ;a=snapshot;h=refs/tags/20220211.0;sf=tgz>
+                              ;a=snapshot;h=refs/tags/20220311.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: Fri Feb 11 07:50:08 2022 +0900
+Last commit date: Fri Mar 11 19:03:05 2022 +0900
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
index 5ebcaab7e39..9b4b7e16adc 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 0014d5e0f2a..0ecc2456f6a 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/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
index 26ebad2832a..f8c20af6620 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
@@ -27,7 +27,7 @@
 \newif\ifltj@disablejfam
 
 %%%% VERSION
-\def\LuaTeXjaversion{20220211.0}
+\def\LuaTeXjaversion{20220311.0}
 
 %% Check if LaTeX is used.
 \begingroup\expandafter\expandafter\expandafter\endgroup
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-footmisc.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-footmisc.sty
index b838fd92fe2..edde267d3c7 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-footmisc.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-footmisc.sty
@@ -3,9 +3,16 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-footmisc}[2021-03-25 Patch to footmisc for LuaTeX-ja]
-\RequirePackage{footmisc}
+\ProvidesPackage{lltjp-footmisc}[2022-02-19 Patch to footmisc for LuaTeX-ja]
 
+\@ifpackagelater{footmisc}{2022-02-10}{%% v6.0a or later
+  \patchcmd{\@makenormalcolbox}{\vskip -\@outputbox@depth\@textbottom}%
+    {\pltx@adjust@wd@outputbox\vskip -\@outputbox@depth\@textbottom}{}{}%
+  \let\ltj@next\endinput
+}{\let\ltj@next\relax}
+\ltj@next
+
+% old (v5.5)
 \let  \if@tempswa  \ifFN@bottom
 \ifFN@para    \@tempswatrue \fi
 \if@tempswa