OSDN Git Service
(root)
/
luatex-ja
/
luatexja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed several bugs caused by the previous commit
[luatex-ja/luatexja.git]
/
src
/
luatexja-core.sty
diff --git
a/src/luatexja-core.sty
b/src/luatexja-core.sty
index
651d991
..
853872e
100644
(file)
--- a/
src/luatexja-core.sty
+++ b/
src/luatexja-core.sty
@@
-132,17
+132,16
@@
\def\ltj@defdimen{0}
%%%%%%%% Attributes for Japanese typesetting.
\def\ltj@defdimen{0}
%%%%%%%% Attributes for Japanese typesetting.
+\newluatexattribute\ltj@icflag % attribute for italic correction
\newluatexattribute\ltj@curjfnt % index for ``current Japanese font''
\newluatexattribute\ltj@curjfnt % index for ``current Japanese font''
-\newluatexattribute\jfam % index for current jfam
-\newluatexattribute\ltj@uniqid % unique id of box/paragraph
-\newluatexattribute\ltj@charclass %
\newluatexattribute\ltj@origchar %
\newluatexattribute\ltj@origchar %
-\newluatexattribute\ltj@yablshift % attribute for \yabaselineshift
-\newluatexattribute\ltj@ykblshift % attribute for \ykbaselineshift
+\newluatexattribute\ltj@charclass %
\newluatexattribute\ltj@autospc % attribute for autospacing
\newluatexattribute\ltj@autoxspc % attribute for autoxspacing
\newluatexattribute\ltj@autospc % attribute for autospacing
\newluatexattribute\ltj@autoxspc % attribute for autoxspacing
-\newluatexattribute\ltj@icflag % attribute for italic correction
-\ltj@icflag=0 \ltj@uniqid=0
+\newluatexattribute\ltj@yablshift % attribute for \yabaselineshift
+\newluatexattribute\ltj@ykblshift % attribute for \ykbaselineshift
+\newluatexattribute\jfam % index for current jfam
+\ltj@icflag=0\ltj@origchar=0
%%%%%%%% Attributes for character ranges
\newcount\ltj@tempcnta
%%%%%%%% Attributes for character ranges
\newcount\ltj@tempcnta
@@
-185,7
+184,6
@@
\input ltj-base.sty %
\fi %</LaTeX>
\input ltj-base.sty %
\fi %</LaTeX>
-
%%%%%%%% \asluastring
\def\asluastring#1{'\luaescapestring{\detokenize{#1}}'}
%%%%%%%% \asluastring
\def\asluastring#1{'\luaescapestring{\detokenize{#1}}'}
@@
-207,9
+205,8
@@
\protected\def\ltj@reset@globaldefs{%
\directlua{luatexja.global_temp = tex.globaldefs; tex.globaldefs = 0}}
\protected\def\ltj@restore@globaldefs{\directlua{tex.globaldefs = luatexja.global_temp}}
\protected\def\ltj@reset@globaldefs{%
\directlua{luatexja.global_temp = tex.globaldefs; tex.globaldefs = 0}}
\protected\def\ltj@restore@globaldefs{\directlua{tex.globaldefs = luatexja.global_temp}}
-\let\new@everypar=\everypar
\protected\def\inhibitglue{\ifhmode\ltj@@ihb\fi}
\protected\def\inhibitglue{\ifhmode\ltj@@ihb\fi}
-\def\ltj@@ihb{\directlua{luatexja.jfmglue.create_inhibitglue_node()}}
+\def\ltj@@ihb{\
relax\
directlua{luatexja.jfmglue.create_inhibitglue_node()}}
%%%%%%%% \yoko, \tate, \ifydir, \iftdir
%% At this moment, tategaki mode is not implemented;
%%%%%%%% \yoko, \tate, \ifydir, \iftdir
%% At this moment, tategaki mode is not implemented;
@@
-243,25
+240,31
@@
\newcount\ltj@@stack \newcount\ltj@@group@level
\ltj@@group@level=0 \ltj@@stack=0
\newcount\ltj@@stack \newcount\ltj@@group@level
\ltj@@group@level=0 \ltj@@stack=0
+\setbox0\hbox{%
+ \directlua{% This value depends on the version of LuaTeX.
+ luatexja.stack.hmode = -tex.nest[tex.nest.ptr].mode
+ }
+}
+
% prebreakpenalty = {<char_code>, <penalty>}
\define@key[ltj]{japaram}{kcatcode}{%
% prebreakpenalty = {<char_code>, <penalty>}
\define@key[ltj]{japaram}{kcatcode}{%
- \expandafter\ltj@@set@stack#1:{
kcat
}{0}{0x7FFFFFFF}}
+ \expandafter\ltj@@set@stack#1:{
KCAT
}{0}{0x7FFFFFFF}}
\define@key[ltj]{japaram}{prebreakpenalty}{%
\define@key[ltj]{japaram}{prebreakpenalty}{%
- \expandafter\ltj@@set@stack#1:{
pre
}{-10000}{10000}}
+ \expandafter\ltj@@set@stack#1:{
PRE
}{-10000}{10000}}
\define@key[ltj]{japaram}{postbreakpenalty}{%
\define@key[ltj]{japaram}{postbreakpenalty}{%
- \expandafter\ltj@@set@stack#1:{
post
}{-10000}{10000}}
+ \expandafter\ltj@@set@stack#1:{
POST
}{-10000}{10000}}
\def\ltj@@set@stack#1,#2:#3#4#5{%
\def\ltj@@set@stack#1,#2:#3#4#5{%
- \directlua{luatexja.stack.set_stack_table(luatexja.isglobal,
\asluastring{#3}
,
+ \directlua{luatexja.stack.set_stack_table(luatexja.isglobal,
luatexja.stack_table_index.#3
,
\ltj@safe@num@or{nil}{#1},\ltj@safe@num@or{nil}{#2},#4,#5)}}
% jatextfont = {<char_code>, <font_cs>}
\define@key[ltj]{japaram}{jatextfont}{%
\ltj@safe@num@or{nil}{#1},\ltj@safe@num@or{nil}{#2},#4,#5)}}
% jatextfont = {<char_code>, <font_cs>}
\define@key[ltj]{japaram}{jatextfont}{%
- \expandafter\ltj@@set@stackfont#1:{
mjtext
}}
+ \expandafter\ltj@@set@stackfont#1:{
MJT
}}
\define@key[ltj]{japaram}{jascriptfont}{%
\define@key[ltj]{japaram}{jascriptfont}{%
- \expandafter\ltj@@set@stackfont#1:{
mjscr
}}
+ \expandafter\ltj@@set@stackfont#1:{
MJS
}}
\define@key[ltj]{japaram}{jascriptscriptfont}{%
\define@key[ltj]{japaram}{jascriptscriptfont}{%
- \expandafter\ltj@@set@stackfont#1:{
mjss
}}
-\def\ltj@@set@stackfont#1,#2:#3{%
+ \expandafter\ltj@@set@stackfont#1:{
MJSS
}}
+\
protected\
def\ltj@@set@stackfont#1,#2:#3{%
\ltj@reset@globaldefs
\ltj@tempcnta=\ltj@curjfnt\ltj@curjfnt=-1 #2%
\ifnum\ltj@curjfnt=-1
\ltj@reset@globaldefs
\ltj@tempcnta=\ltj@curjfnt\ltj@curjfnt=-1 #2%
\ifnum\ltj@curjfnt=-1
@@
-269,7
+272,7
@@
{\string#2 is not a control sequence that represents \MessageBreak
a Japanese font}{}%
\else
{\string#2 is not a control sequence that represents \MessageBreak
a Japanese font}{}%
\else
- \directlua{luatexja.stack.set_stack_font(luatexja.isglobal,
\asluastring{#3}
,
+ \directlua{luatexja.stack.set_stack_font(luatexja.isglobal,
luatexja.stack_table_index.#3
,
\ltj@safe@num@or{nil}{#1}, \the\ltj@curjfnt)}%
\fi
\ltj@curjfnt=\ltj@tempcnta
\ltj@safe@num@or{nil}{#1}, \the\ltj@curjfnt)}%
\fi
\ltj@curjfnt=\ltj@tempcnta
@@
-298,7
+301,8
@@
\def\ltj@tempa{preonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{1}\fi
\def\ltj@tempa{postonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{2}\fi
\def\ltj@tempa{allow}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{3}\fi
\def\ltj@tempa{preonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{1}\fi
\def\ltj@tempa{postonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{2}\fi
\def\ltj@tempa{allow}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{3}\fi
- \directlua{luatexja.stack.set_stack_table(luatexja.isglobal, 'xsp',
+ \directlua{luatexja.stack.set_stack_table(luatexja.isglobal,
+ luatexja.stack_table_index.XSP,
\ltj@safe@num@or{nil}{#1},
\ltj@safe@num@or{nil}{\ltj@temp},0,3)}}
\ltj@safe@num@or{nil}{#1},
\ltj@safe@num@or{nil}{\ltj@temp},0,3)}}
@@
-313,7
+317,8
@@
\def\ltj@tempa{preonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{1}\fi
\def\ltj@tempa{postonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{2}\fi
\def\ltj@tempa{allow}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{3}\fi
\def\ltj@tempa{preonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{1}\fi
\def\ltj@tempa{postonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{2}\fi
\def\ltj@tempa{allow}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{3}\fi
- \directlua{luatexja.stack.set_stack_table(luatexja.isglobal, 'xsp',
+ \directlua{luatexja.stack.set_stack_table(luatexja.isglobal,
+ luatexja.stack_table_index.XSP,
\ltj@safe@num@or{nil}{#1},
\ltj@safe@num@or{nil}{\ltj@temp},0,3)}}
\ltj@safe@num@or{nil}{#1},
\ltj@safe@num@or{nil}{\ltj@temp},0,3)}}
@@
-341,21
+346,24
@@
% jcharwidowpenalty = <count>
\define@key[ltj]{japaram}{jcharwidowpenalty}{% %COUNT
% jcharwidowpenalty = <count>
\define@key[ltj]{japaram}{jcharwidowpenalty}{% %COUNT
- \ltj@@set@stack0,#1:{
jwp
}{-10000}{10000}}
+ \ltj@@set@stack0,#1:{
JWP
}{-10000}{10000}}
-% differentjfm = { large | small | average |
both
}
+% differentjfm = { large | small | average |
pleft | pright | paverage | both
}
\define@choicekey*+[ltj]{japaram}{differentjfm}[\ltj@temp\ltj@tempr]%
\define@choicekey*+[ltj]{japaram}{differentjfm}[\ltj@temp\ltj@tempr]%
- {large,small,average,both}{%
+ {large,small,average,
pleft,pright,paverage,
both}{%
\ifcase\ltj@tempr
\directlua{luatexja.jfmglue.diffmet_rule = math.max}\or
\directlua{luatexja.jfmglue.diffmet_rule = math.min}\or
\directlua{luatexja.jfmglue.diffmet_rule = math.two_average}\or
\ifcase\ltj@tempr
\directlua{luatexja.jfmglue.diffmet_rule = math.max}\or
\directlua{luatexja.jfmglue.diffmet_rule = math.min}\or
\directlua{luatexja.jfmglue.diffmet_rule = math.two_average}\or
+ \directlua{luatexja.jfmglue.diffmet_rule = math.two_pleft}\or
+ \directlua{luatexja.jfmglue.diffmet_rule = math.two_pright}\or
+ \directlua{luatexja.jfmglue.diffmet_rule = math.two_paverage}\or
\directlua{luatexja.jfmglue.diffmet_rule = math.two_add}
\fi
}{\ltj@PackageError{luatexja}{invalid argument `#1' for `differentjfm'}{%
Argument for `differentjfm' must be one of `large', `small', `average',^^J%
\directlua{luatexja.jfmglue.diffmet_rule = math.two_add}
\fi
}{\ltj@PackageError{luatexja}{invalid argument `#1' for `differentjfm'}{%
Argument for `differentjfm' must be one of `large', `small', `average',^^J%
-
and
`both'. }}
- % large, small, average, both
+
`pleft', `pright', 'paverage' or
`both'. }}
+ % large, small, average,
pleft, pright, paverage,
both
% jacharrange = { +-<range_number> }
% jacharrange = { +-<range_number> }