| Revision | a02274810ecc6253ecbb37dd4ccb322416fa98f9 (tree) |
|---|---|
| Time | 2017-07-26 08:53:55 |
| Author | Hironori Kitagawa <h_kitagawa2001@yaho...> |
| Commiter | Hironori Kitagawa |
lltjext.sty: baselineshift of JAchar may be not zero
src/lltjext.sty (diff)
src/luatexja.lua (diff)| @@ -3,7 +3,7 @@ | ||
| 3 | 3 | % |
| 4 | 4 | |
| 5 | 5 | \NeedsTeXFormat{LaTeX2e} |
| 6 | -\ProvidesPackage{lltjext}[2017/07/17 v1.2g-ltj-6 Macros for vertical writing] | |
| 6 | +\ProvidesPackage{lltjext}[2017/07/26 v1.2g-ltj-7 Macros for vertical writing] | |
| 7 | 7 | \RequirePackage{luatexja} |
| 8 | 8 | \newcount\ltj@ext@dir |
| 9 | 9 | {\catcode`\*=11 |
| @@ -389,12 +389,15 @@ | ||
| 389 | 389 | \def\@end@parbox{\m@th$\null}% |
| 390 | 390 | \fi |
| 391 | 391 | \fi\fi} |
| 392 | +\def\lltjext@getjablshift{% | |
| 393 | + \ifnum\ltj@ext@dir=3 \ltjgetparameter{tjabaselineshift}\else | |
| 394 | + \ltjgetparameter{yjabaselineshift}\fi} | |
| 392 | 395 | \def\fork@parbox@option@@B#1{% |
| 393 | 396 | \if #1t\relax |
| 394 | - \def\@begin@parbox{\raise\cht\vtop\bgroup\kern\z@\vbox}% | |
| 397 | + \def\@begin@parbox{\raise\dimexpr\cht-\lltjext@getjablshift\vtop\bgroup\kern\z@\vbox}% | |
| 395 | 398 | \let\@end@parbox\egroup |
| 396 | 399 | \else\if #1b\relax |
| 397 | - \def\@begin@parbox{\lower\cdp\vbox\bgroup\vbox}% | |
| 400 | + \def\@begin@parbox{\lower\dimexpr\cdp+\lltjext@getjablshift\vbox\bgroup\vbox}% | |
| 398 | 401 | \def\@end@parbox{\kern\z@\egroup}% |
| 399 | 402 | \else |
| 400 | 403 | \ifmmode |
| @@ -720,7 +723,7 @@ | ||
| 720 | 723 | |
| 721 | 724 | %%%%%%%%%%%%%%%% LuaTeX-ja original |
| 722 | 725 | |
| 723 | -\define@key[ltj]{japaram}{autouprightnum}{% %COUNT | |
| 724 | - \ltj@@set@stack{AURN}{0}{10000}\z@#1 } | |
| 726 | +%%\define@key[ltj]{japaram}{autouprightnum}{% %COUNT | |
| 727 | +%% \ltj@@set@stack{AURN}{0}{10000}\z@#1 } | |
| 725 | 728 | |
| 726 | 729 | \endinput |
| @@ -177,18 +177,23 @@ end | ||
| 177 | 177 | |
| 178 | 178 | -- EXT: print parameters that don't need arguments |
| 179 | 179 | do |
| 180 | + local tex_getattr = tex.getattribute | |
| 181 | + local function getattr(a) | |
| 182 | + local r = tex.getattribute(a) | |
| 183 | + return (r==-0x7FFFFFFF) and 0 or r | |
| 184 | + end | |
| 180 | 185 | luatexja.unary_pars = { |
| 181 | 186 | yalbaselineshift = function(t) |
| 182 | - return print_scaled(tex.getattribute('ltj@yablshift'))..'pt' | |
| 187 | + return print_scaled(getattr('ltj@yablshift'))..'pt' | |
| 183 | 188 | end, |
| 184 | 189 | yjabaselineshift = function(t) |
| 185 | - return print_scaled(tex.getattribute('ltj@ykblshift'))..'pt' | |
| 190 | + return print_scaled(getattr('ltj@ykblshift'))..'pt' | |
| 186 | 191 | end, |
| 187 | 192 | talbaselineshift = function(t) |
| 188 | - return print_scaled(tex.getattribute('ltj@tablshift'))..'pt' | |
| 193 | + return print_scaled(getattr('ltj@tablshift'))..'pt' | |
| 189 | 194 | end, |
| 190 | 195 | tjabaselineshift = function(t) |
| 191 | - return print_scaled(tex.getattribute('ltj@tkblshift'))..'pt' | |
| 196 | + return print_scaled(getattr('ltj@tkblshift'))..'pt' | |
| 192 | 197 | end, |
| 193 | 198 | kanjiskip = function(t) |
| 194 | 199 | return print_spec(ltjs.get_stack_skip(stack_table_index.KSK, t)) |
| @@ -200,10 +205,10 @@ do | ||
| 200 | 205 | return ltjs.get_stack_table(stack_table_index.JWP, 0, t) |
| 201 | 206 | end, |
| 202 | 207 | autospacing = function(t) |
| 203 | - return tex.getattribute('ltj@autospc') | |
| 208 | + return getattr('ltj@autospc') | |
| 204 | 209 | end, |
| 205 | 210 | autoxspacing = function(t) |
| 206 | - return tex.getattribute('ltj@autoxspc') | |
| 211 | + return getattr('ltj@autoxspc') | |
| 207 | 212 | end, |
| 208 | 213 | differentjfm = function(t) |
| 209 | 214 | local f, r = luatexja.jfmglue.diffmet_rule, '???' |
Fork