partially revert 6de0644ec (revert tex side only)

diff --git a/src/lltjext.sty b/src/lltjext.sty
index a6ad8ad..a83c930 100644 (file)
--- a/src/lltjext.sty
+++ b/src/lltjext.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjext}[2022-08-18 v1.2k-ltj-14 Macros for vertical writing]
+\ProvidesPackage{lltjext}[2022-08-24 v1.2k-ltj-14 Macros for vertical writing]
 \RequirePackage{luatexja}
 \newcount\ltj@ext@dir
 \let\ltj@lltjext@orig@tabular=\tabular
@@ -509,8 +509,10 @@
    {\@@picture<#1>(#2,#3)}{\@@picture<#1>(#2,#3)(0,0)}}
 \newdimen\@picwd
 \def\ltj@@pic@reset@blshift{%
-  \unsetattribute\ltj@yablshift\unsetattribute\ltj@ykblshift
-  \unsetattribute\ltj@tablshift\unsetattribute\ltj@tkblshift
+  \ltj@yablshift\z@\ltj@ykblshift\z@
+  \ltj@tablshift\z@\ltj@tkblshift\z@
+  %\unsetattribute\ltj@yablshift\unsetattribute\ltj@ykblshift
+  %\unsetattribute\ltj@tablshift\unsetattribute\ltj@tkblshift
 }%
 \def\@@picture<#1>(#2,#3)(#4,#5){%
   \edef\ltj@@pic@save@blshift{%

diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty
index cb14e9e..c1f8c2c 100644 (file)
--- a/src/luatexja-core.sty
+++ b/src/luatexja-core.sty
@@ -65,7 +65,7 @@
   \expandafter\let\csname ifltj@in@latex\expandafter\endcsname
     \csname iftrue\endcsname
   \NeedsTeXFormat{LaTeX2e}
-  \ProvidesPackage{luatexja-core}[2022-08-20 Core of LuaTeX-ja]
+  \ProvidesPackage{luatexja-core}[2022-08-24 Core of LuaTeX-ja]
 \fi                             %</LaTeX>
 
 %% Load prerequisite packages.
@@ -146,6 +146,10 @@
 \ltj@icflag\z@
 \ltj@curjfnt\m@ne
 \ltj@curtfnt\m@ne
+\ltj@yablshift\z@
+\ltj@ykblshift\z@
+\ltj@tablshift\z@
+\ltj@tkblshift\z@
 
 \newcount\ltj@tempcnta\newdimen\ltj@tempdima
 \newcount\ltj@@stack \newcount\ltj@@group@level
@@ -348,7 +352,8 @@
 \def\ltj@set@blshift@#1{\directlua{%
   local n = token.scan_dimen()
   tex.setattribute(luatexja.isglobal,
-    luatexbase.attributes['#1'], (n==0) and -0x7FFFFFFF or n)%
+    luatexbase.attributes['#1'], (n==0) and 0 or n)
+  %次期バージョンで ... and -0x7FFFFFFF or ... に変える
 }}
 \define@key[ltj]{japaram}{yalbaselineshift}{\ltj@set@blshift@{ltj@yablshift}#1\relax}
 \define@key[ltj]{japaram}{yjabaselineshift}{\ltj@set@blshift@{ltj@ykblshift}#1\relax}

diff --git a/src/patches/lltjp-tascmac.sty b/src/patches/lltjp-tascmac.sty
index ab02250..af27cae 100644 (file)
--- a/src/patches/lltjp-tascmac.sty
+++ b/src/patches/lltjp-tascmac.sty
@@ -3,7 +3,7 @@
 %  based on tascmac.sty [2016/04/15 v2.0b (community edition)]
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-tascmac}[2022-08-18 Patch to (t)ascmac for LuaTeX-ja]
+\ProvidesPackage{lltjp-tascmac}[2022-08-24 Patch to (t)ascmac for LuaTeX-ja]
 
 \RequirePackage{tascmac}
 
@@ -26,8 +26,10 @@
 }
 
 %% boxnote environment
-\def\ltj@backup@attr#1#2{\ifnum#1=-"7FFFFFFF #2\z@\else #2=#1sp\fi\unsetattribute#1}
-\def\ltj@restore@attr#1#2{\ifdim#2=\z@ \unsetattribute#1\else #1#2\fi}
+\def\ltj@backup@attr#1#2{\ifnum#1=-"7FFFFFFF #2\z@\else #2=#1sp\fi#1=0 }
+\def\ltj@restore@attr#1#2{#1#2}
+%\def\ltj@backup@attr#1#2{\ifnum#1=-"7FFFFFFF #2\z@\else #2=#1sp\fi\unsetattribute#1}
+%\def\ltj@restore@attr#1#2{\ifdim#2=\z@ \unsetattribute#1\else #1#2\fi}
 \def\boxnote{\par\vspace{.3\baselineskip}%
   \ltj@backup@attr\ltj@yablshift\@saveybaselineshift
   \ltj@backup@attr\ltj@tablshift\@savetbaselineshift
@@ -78,7 +80,8 @@
 
 %% \keytop
 \def\@keytop[#1]#2{%
-  {\setbox0=\hbox{\shortstack{#2}}\unsetattribute\ltj@yablshift\unsetattribute\ltj@tablshift%
+  {\setbox0=\hbox{\shortstack{#2}}\ltj@yablshift\z@\ltj@tablshift\z@%
+  %\unsetattribute\ltj@yablshift\unsetattribute\ltj@tablshift%
   \dimen0=\wd0\advance\dimen0 5pt\dimen1=\dp0\advance\dimen1 2.5pt%
   \setbox\scscb@x=\hbox to\dimen0{%
   \@scw\wd0\hfil\vtop{\offinterlineskip
@@ -93,7 +96,8 @@
 
 %% \mask
 \def\mask#1#2{{\setbox\@bwsp=\hbox{#1}%
-  \setbox0=\hbox{\unsetattribute\ltj@yablshift\unsetattribute\ltj@tablshift \@ascgrp#2}%
+%  \setbox0=\hbox{\unsetattribute\ltj@yablshift\unsetattribute\ltj@tablshift \@ascgrp#2}%
+  \setbox0=\hbox{\ltj@yablshift\z@\ltj@tablshift\z@ \@ascgrp#2}%
   \dimen0=\wd\@bwsp\dimen1=\ht\@bwsp\advance\dimen1\dp\@bwsp\dimen2=-\dimen1
   \setdim@{\dimen0}{\wd0}\setdim@{\dimen1}{\ht0}%
   \setbox\@@bwsp=\hbox to\dimen0{\leaders
@@ -105,7 +109,8 @@
 
 %% \maskbox
 \def\Maskbox#1#2#3#4#5#6{{%
-  \setbox0=\hbox{\unsetattribute\ltj@yablshift\unsetattribute\ltj@tablshift \@ascgrp#3}%
+%  \setbox0=\hbox{\unsetattribute\ltj@yablshift\unsetattribute\ltj@tablshift \@ascgrp#3}%
+  \setbox0=\hbox{\ltj@yablshift\z@\ltj@tablshift\z@ \@ascgrp#3}%
   \dimen0=#1\@setdim{\dimen0}{\wd0}\dimen1=#2\@setdim{\dimen1}{\ht0}%
   \ifx#4c\skip0=0pt plus1fil\skip1=\skip0\fi
   \ifx#4r\skip0=0pt plus1fil\skip1=0pt\fi