X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fluatexja-core.sty;h=b0233cc81c5f051866de06513a5d5172d2bfa05c;hb=23c26360244f7f15daca59158fcb2bd51d71ab7a;hp=c03c1f9598963a23aaadd5d4556143cb4474e757;hpb=32c8d5b4bbee2a59f9c4c85b4400d966e8e58e84;p=luatex-ja%2Fluatexja.git

diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty
index c03c1f9..b0233cc 100644
--- a/src/luatexja-core.sty
+++ b/src/luatexja-core.sty
@@ -129,37 +129,35 @@
 %! ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
 % LuaTeX-ja core TeX source
 
-%\catcode`\@=11
 \catcode"FFFFF=14 %"
 
-%\input luaotfload.sty
-%\input ltxcmds.sty
-%\input xkeyval.tex
-%\input infwarerr.sty
-%\ifdefined\ltj@loaded\endinput\fi
 \def\ltj@loaded{hoge}
 
 \newcount\ltj@tempcnta
 \newcount\ltj@tempcntb
 \newcount\ltj@tempcntc
 \newdimen\ltj@tempdima
+\newskip\ltj@tempskipa
+\newtoks\ltj@temptoks
 
-\newcount\ltj@autospc
-\newcount\ltj@autoxspc
-
-\newcount\jcharwidowpenalty
-\newskip\kanjiskip
-\newskip\xkanjiskip
-\newdimen\zw
-\newdimen\zh
+\newdimen\ltj@zw
+\newdimen\ltj@zh
 \newdimen\jQ \jQ=0.25mm
-\newdimen\jH \jH=0.25mm
+\let\jH=\jQ
+
+%%%%%%%% error message
+\def\ltj@defnum{0}
+\def\ltj@defdimen{0}
+
 
 %%%%%%%% Attributes for Japanese typesetting.
 \newluatexattribute\ltj@curjfnt   % index for ``current Japanese font''
+\newluatexattribute\jfam          % index for current jfam
 \newluatexattribute\ltj@charclass % 
 \newluatexattribute\ltj@yablshift % attribute for \yabaselineshift
 \newluatexattribute\ltj@ykblshift % attribute for \ykbaselineshift
+\newluatexattribute\ltj@autospc   % attribute for autospacing
+\newluatexattribute\ltj@autoxspc  % attribute for autoxspacing
 \newluatexattribute\ltj@icflag    % attribute for italic correction
 \newlanguage\ltj@japanese
 
@@ -173,13 +171,7 @@
     texio.write_nl("("..path..")")
     dofile(path)
   end
-  require('lualibs')
-  ltj.loadlua('luatexja-rmlgbm.lua') 
-    % For Ryumin-Light and GothicBBB-Medium.
-  ltj.loadlua('luatexja-jfont.lua')
   ltj.loadlua('luatexja-core.lua')
-  ltj.loadlua('luatexja-xkanji.lua')
-  ltj.loadlua('luatexja-core-aux.lua')
 }
 
 
@@ -192,25 +184,50 @@
   \advance\ltj@tempcnta by1
 \repeat
 
+
 %%%%%%%% \asluastring
 \def\asluastring#1{'\luaescapestring{\detokenize{#1}}'}
 
 %%%%%%%% Redefine \/
-%\let\ltj@ic=\/ \protected\def\/{{\ltj@icflag=1\ltj@ic}}
-\protected\def\/{\directlua{ltj.ext_append_italic()}}
+\protected\def\/{\relax\directlua{luatexja.jfont.append_italic()}}
 
 %%%%%%%% \jfont\CS={...:...;jfm=metric;...}, \globaljfont
-\protected\def\jfont{\afterassignment\ltj@@jfont\directlua{ltj.ext_jfontdefX(false)}}
+\protected\def\jfont{\afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(false)}}
 \protected\def\globaljfont{%
-  \afterassignment\ltj@@jfont\directlua{ltj.ext_jfontdefX(true)}}
-\def\ltj@@jfont{\directlua{ltj.ext_jfontdefY()}}
+  \afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(true)}}
+\def\ltj@@jfont{\directlua{luatexja.jfont.jfontdefY()}}
+
+%%%%%%%% \zw, \zh
+\def\zw{\directlua{luatexja.jfont.load_zw()}\ltj@zw}
+\def\zh{\directlua{luatexja.jfont.load_zh()}\ltj@zh}
+
 
 %%%%%%%% \inhibitglue
-\protected\def\inhibitglue{\directlua{ltj.ext_create_inhibitglue_node()}}
+\protected\def\ltj@reset@globaldefs{%
+  \directlua{ltj.global_temp = tex.globaldefs; tex.globaldefs = 0}}
+\protected\def\ltj@restore@globaldefs{\directlua{tex.globaldefs = ltj.global_temp}}
+\let\new@everypar=\everypar
+\protected\def\inhibitglue{\relax%
+  \ifvmode
+    \ltj@reset@globaldefs
+    \xdef\@@tempa{\the\everypar}%
+    \xdef\@@tempb{\everypar={\@@tempa}\@@tempa\noexpand\ltj@@ihb}%
+    \everypar\expandafter{\@@tempb}%
+    \ltj@restore@globaldefs
+  \else\ifhmode\ltj@@ihb\fi\fi}
+\def\ltj@@ihb{\directlua{luatexja.jfmglue.create_inhibitglue_node()}}
+
+%%%%%%%% \yoko, \tate, \ifydir, \iftdir
+%% At this moment, tategaki mode is not implemented; 
+%% there is only yokogaki mode now.
+\let\yoko\relax
+\let\tate\relax
+\newif\ifydir\ydirtrue
+\newif\iftdir\tdirfalse
 
 %%%%%%%% \ltjdefcharrange<name>{100-200,3000-,5000,...}
 \protected\def\ltjdefcharrange#1#2{%
-  \ltj@tempcntc=#1 \expandafter\ltj@@dcrange#2,,\ignorespaces}
+  {\ltj@tempcntc=#1 \expandafter\ltj@@dcrange#2,,}\ignorespaces}
 \def\ltj@@dcrange#1,{\def\ltj@temp{#1}%
   \ifx\ltj@temp\empty\let\@next=\relax\else
   \ltj@@dcrangeA{#1}\let\@next=\ltj@@dcrange\fi\@next}
@@ -220,11 +237,11 @@
     \ltj@tempcnta=#1 \ltj@tempcntb=\ltj@tempcnta
   \else
     \def\ltj@temp{#1}%
-    \ifx\ltj@temp\empty\ltj@tempcnta='200 \else\ltj@tempcnta=#1 \fi
+    \ifx\ltj@temp\empty\ltj@tempcnta='200\else\ltj@tempcnta=#1\fi\relax
     \def\ltj@temp{#2}%
-    \ifx\ltj@temp\empty\ltj@tempcntb="10FFFF \else\ltj@tempcntb=#2 \fi%"
+    \ifx\ltj@temp\empty\ltj@tempcntb="10FFFF\else\ltj@tempcntb=#2\fi\relax%"
   \fi
-  \directlua{ltj.ext_add_char_range(\the\ltj@tempcnta,\the\ltj@tempcntb,
+  \directlua{luatexja.charrange.add_char_range(\the\ltj@tempcnta,\the\ltj@tempcntb,
     \the\ltj@tempcntc)}%
   }
 
@@ -240,22 +257,41 @@
 \define@key[ltj]{japaram}{postbreakpenalty}{%
   \expandafter\ltj@@set@stack#1:{post}{-10000}{10000}}
 \def\ltj@@set@stack#1,#2:#3#4#5{%
-  \ltj@tempcnta=#1\relax \ltj@tempcntb=#2\relax
-  \directlua{ltj.ext_set_stack_table(ltj.isglobal, \asluastring{#3},
-    \the\ltj@tempcnta,tex.getcount('ltj@tempcntb'),#4,#5)}}
+  \directlua{luatexja.stack.set_stack_table(ltj.isglobal, \asluastring{#3},
+    \ltj@safe@num@or\ltj@defnum{#1},\ltj@safe@num@or\ltj@defnum{#2},#4,#5)}}
+
+% jatextfont = {<char_code>, <font_cs>}
+\define@key[ltj]{japaram}{jatextfont}{%
+  \expandafter\ltj@@set@stackfont#1:{mjtext}}
+\define@key[ltj]{japaram}{jascriptfont}{%
+  \expandafter\ltj@@set@stackfont#1:{mjscr}}
+\define@key[ltj]{japaram}{jascriptscriptfont}{%
+  \expandafter\ltj@@set@stackfont#1:{mjss}}
+\def\ltj@@set@stackfont#1,#2:#3{%
+  \ltj@reset@globaldefs
+  \ltj@tempcnta=\ltj@curjfnt\ltj@curjfnt=-1 #2%
+  \ifnum\ltj@curjfnt=-1
+    \@PackageError{luatexja-core}%
+    {\string#2 is not a control sequence that represents \MessageBreak
+     a Japanese font}{}%
+  \else
+    \directlua{luatexja.stack.set_stack_font(ltj.isglobal, \asluastring{#3},
+    \ltj@safe@num@or\ltj@defnum{#1}, \the\ltj@curjfnt)}%
+  \fi
+  \ltj@curjfnt=\ltj@tempcnta
+  \ltj@restore@globaldefs
+  }
 
 % yalbaselineshift = <dimen>
 % yjabaselineshift = <dimen>
 \define@key[ltj]{japaram}{yalbaselineshift}{%
-  \ltj@tempdima=#1\relax%
   \directlua{tex.setattribute(ltj.isglobal, 
     luatexbase.attributes['ltj@yablshift'],
-    tex.getdimen('ltj@tempdima'))}}
+    \ltj@safe@dimen@or\ltj@defdimen{#1})}}
 \define@key[ltj]{japaram}{yjabaselineshift}{%
-  \ltj@tempdima=#1\relax%
   \directlua{tex.setattribute(ltj.isglobal, 
     luatexbase.attributes['ltj@ykblshift'],
-    tex.getdimen('ltj@tempdima'))}}
+    \ltj@safe@dimen@or\ltj@defdimen{#1})}}
 
 % jaxspmode = {<char_code>, <mode>}
 % mode: inhibit, preonly, postonly, allow
@@ -268,9 +304,9 @@
   \def\ltj@tempa{preonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{2}\fi
   \def\ltj@tempa{postonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{1}\fi
   \def\ltj@tempa{allow}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{3}\fi
-  \ltj@tempcnta=#1\relax\ltj@tempcntb=\ltj@temp\relax
-  \directlua{ltj.ext_set_stack_table(ltj.isglobal, 'xsp', \the\ltj@tempcnta,
-    \the\ltj@tempcntb,0,3)}}
+  \directlua{luatexja.stack.set_stack_table(ltj.isglobal, 'xsp', 
+    \ltj@safe@num@or\ltj@defnum{#1},
+    \ltj@safe@num@or\ltj@defnum{\ltj@temp},0,3)}}
 
 % alxspmode = {<char_code>, <mode>}
 % mode: inhibit, preonly, postonly, allow
@@ -283,45 +319,48 @@
   \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
-  \ltj@tempcnta=#1\relax\ltj@tempcntb=\ltj@temp\relax
-  \directlua{ltj.ext_set_stack_table(ltj.isglobal, 'xsp', \the\ltj@tempcnta,
-    \the\ltj@tempcntb,0,3)}}
+  \directlua{luatexja.stack.set_stack_table(ltj.isglobal, 'xsp', 
+    \ltj@safe@num@or\ltj@defnum{#1},
+    \ltj@safe@num@or\ltj@defnum{\ltj@temp},0,3)}}
 
 % autospacing = <bool> (default: true)
 \define@boolkey[ltj]{japaram}{autospacing}[true]{%
   \ifltj@japaram@autospacing
-    \directlua{ltj.auto_spacing=true}%
+    \directlua{ltj.ext_print_global()}\ltj@autospc=1
   \else
-    \directlua{ltj.auto_spacing=false}%
-  \fi
-  }
+    \directlua{ltj.ext_print_global()}\ltj@autospc=0
+  \fi}
 
 % autoxspacing = <bool> (default: true)
 \define@boolkey[ltj]{japaram}{autoxspacing}[true]{%
   \ifltj@japaram@autoxspacing
-    \directlua{ltj.auto_xspacing=true}%
+    \directlua{ltj.ext_print_global()}\ltj@autoxspc=1
   \else
-    \directlua{ltj.auto_xspacing=false}%
-  \fi
-  }
+    \directlua{ltj.ext_print_global()}\ltj@autoxspc=0
+  \fi}
 
+% [x]]kanjiskip = <dimen>
 \define@key[ltj]{japaram}{kanjiskip}{%              % SKIP
-  \directlua{ltj.ext_print_global()}\kanjiskip=#1 }
+  \directlua{luatexja.stack.set_stack_skip(ltj.isglobal, 'kanjiskip', \ltj@safe@glue{#1})}}
 \define@key[ltj]{japaram}{xkanjiskip}{%             % SKIP
-  \directlua{ltj.ext_print_global()}\xkanjiskip=#1 }
+  \directlua{luatexja.stack.set_stack_skip(ltj.isglobal, 'xkanjiskip', \ltj@safe@glue{#1})}}
+
+% jcharwidowpenalty = <count>
 \define@key[ltj]{japaram}{jcharwidowpenalty}{%      %COUNT
-  \directlua{ltj.ext_print_global()}\jcharwidowpenalty=#1 }
+  \ltj@@set@stack0,#1:{jwp}{-10000}{10000}}
 
 % differentjfm = { large | small | average | both }
 \define@choicekey*+[ltj]{japaram}{differentjfm}[\ltj@temp\ltj@tempr]%
   {large,small,average,both}{%
   \ifcase\ltj@tempr
-    \directlua{ltj.calc_between_two_jchar_aux=ltj.calc_between_two_jchar_aux_large}\or
-    \directlua{ltj.calc_between_two_jchar_aux=ltj.calc_between_two_jchar_aux_small}\or
-    \directlua{ltj.calc_between_two_jchar_aux=ltj.calc_between_two_jchar_aux_average}\or
-    \directlua{ltj.calc_between_two_jchar_aux=ltj.calc_between_two_jchar_aux_both}%
+    \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_add}
   \fi
-}{\@PackageWarning{luatexja}{ignored invalid argument '#1' for 'differentjfm'}}
+}{\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
 
 
@@ -330,17 +369,19 @@
 \def\ltj@@scrange#1,{%
   \edef\ltj@temp{#1}%
   \ifx\ltj@temp\empty\let\next=\relax\else\let\next=\ltj@@scrange
-    \ltj@tempcnta=#1 \directlua{ltj.ext_toggle_char_range(%
-      ltj.is_global,\the\ltj@tempcnta)}%
+    \directlua{luatexja.charrange.toggle_char_range(%
+      ltj.is_global,\ltj@safe@num@or\ltj@defnum{#1})}%
   \fi\next
 }
 
-\protected\def\ltjsetparameter#1{\directlua{ltj.isglobal=''}%
+\protected\def\ltjsetparameter#1{%
+  \ifnum\globaldefs>0\directlua{ltj.isglobal='global'}\else\directlua{ltj.isglobal=''}\fi
   \setkeys[ltj]{japaram}{#1}\ignorespaces}
-\protected\def\ltjglobalsetparameter#1{\directlua{ltj.isglobal='global'}%
+\protected\def\ltjglobalsetparameter#1{%
+  \ifnum\globaldefs<0\directlua{ltj.isglobal=''}\else\directlua{ltj.isglobal='global'}\fi
   \setkeys[ltj]{japaram}{#1}\ignorespaces}
 
-%%%%%%%% 
+%%%%%%%% \ltjgetparameter
 \def\ltj@@decl@array@param#1{%
   \expandafter\let\csname ltj@@array@param/#1\endcsname=t%
 }
@@ -362,20 +403,35 @@
 }
 \def\ltj@@getparam@one#1{%
   \directlua{ltj.ext_get_parameter_unary('#1')}}%
-\def\ltj@@getparam@two#1#2{\ltj@tempcnta=#2
-  \directlua{ltj.ext_get_parameter_binary('#1', \the\ltj@tempcnta)}%
+\def\ltj@@getparam@two#1#2{%
+  \directlua{ltj.ext_get_parameter_binary('#1', \ltj@safe@num{#2})}%
 }
 
+%%%%%%%% \ltjalchar<number>, \ltjjachar<number>
+\let\ltj@@origchar=\char
+\protected\def\ltj@alljachar{\relax
+    \csname ltj@kcat0\endcsname=0
+    \csname ltj@kcat1\endcsname=0
+    \csname ltj@kcat2\endcsname=0
+    \csname ltj@kcat3\endcsname=0
+    \csname ltj@kcat4\endcsname=0
+    \csname ltj@kcat5\endcsname=0
+    \csname ltj@kcat6\endcsname=0 }
+\protected\def\ltj@allalchar{\relax
+    \csname ltj@kcat0\endcsname="7FFFFFFF %"
+    \csname ltj@kcat1\endcsname="7FFFFFFF %"
+    \csname ltj@kcat2\endcsname="7FFFFFFF %"
+    \csname ltj@kcat3\endcsname="7FFFFFFF %"
+    \csname ltj@kcat4\endcsname="7FFFFFFF %"
+    \csname ltj@kcat5\endcsname="7FFFFFFF %"
+    \csname ltj@kcat6\endcsname="7FFFFFFF }%"
+
+\protected\def\ltjjachar{\afterassignment\ltj@@kchar\ltj@tempcnta}
+\def\ltj@@kchar{{\directlua{tex.globaldefs = 0}\ltj@alljachar\ltj@@origchar\ltj@tempcnta}}
+\protected\def\ltjalchar{\afterassignment\ltj@@achar\ltj@tempcnta}
+\def\ltj@@achar{{\directlua{tex.globaldefs = 0}\ltj@allalchar\ltj@@origchar\ltj@tempcnta}}
 
 
-%\def\ltj@temp{plain}
-%\ifx\fmtname\ltj@temp
-%  \message{plain format: loading luatexja-plain.tex}
-%\fi
-%\input luatexja-plain.tex
-%\catcode`\@=12
-%\endinput
-%! ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑
 
 %%------------------ Load module for the format