X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fluatexja-core.sty;h=d4487af2d7fa72b4b14bce6836fa2b5d9322d279;hb=63555b6d07ff19d6453d0870751a65253305ef24;hp=18936df3695f23b2107b2d7d94c48de11be0cbab;hpb=2388b858f1f2cb1c58cb2fcd79b165fb7f513183;p=luatex-ja%2Fluatexja.git

diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty
index 18936df..d4487af 100644
--- a/src/luatexja-core.sty
+++ b/src/luatexja-core.sty
@@ -65,21 +65,18 @@
   \expandafter\let\csname ifltj@in@latex\expandafter\endcsname
     \csname iftrue\endcsname
   \NeedsTeXFormat{LaTeX2e}
-  \ProvidesPackage{luatexja-core}[2012/04/20 v0.2]
+  \ProvidesPackage{luatexja-core}[2013/05/14 Core of LuaTeX-ja]
 \fi                             %</LaTeX>
 
 %% Load prerequisite packages.
-%! 参考： W32TeX の LuaTeX 
-%!     2010/11/27 v0.65.0 r3988 (LuaTeX-ja の最低要件)
-%!     2010/07/10 v0.60.2 r3735 (TL2010 とほぼ同じ)
 \endlinechar=13 %
 %! 外部パッケージは普通の \endlinechar で読まないと危険.
 \ifltj@in@latex                 %<*LaTeX>
-  \RequirePackage{luaotfload} [2010/11/11] % v1.21
+  \RequirePackage{luaotfload} [2013/05/10] % v2.2
   \RequirePackage{infwarerr}  [2010/04/08] % v1.3
-  \RequirePackage{ltxcmds}    [2010/04/26] % v1.7
-  \RequirePackage{pdftexcmds} [2010/04/01] % v0.9
-  \RequirePackage{xkeyval}    [2008/08/13] % v2.6a
+  \RequirePackage{ltxcmds}    [2011/11/09] % v1.22
+  \RequirePackage{pdftexcmds} [2011/11/29] % v0.20
+  \RequirePackage{xkeyval}    [2012/10/14] % v2.6b
 \else                           %<*!LaTeX>
   \input luaotfload.sty
   \input infwarerr.sty
@@ -97,10 +94,10 @@
 \expandafter\endinput\fi\relax
 
 %% Check LuaTeX version.
-\ifnum\luatexversion<65
+\ifnum\luatexversion<74
   \@PackageError{luatexja-core}
     {This LuaTeX engine is too old for this package;\MessageBreak
-     at least v0.65 is needed}
+     at least beta-0.74.0 is needed}
     {Package loading is aborted now.\MessageBreak}
 \expandafter\endinput\fi\relax
 
@@ -132,15 +129,27 @@
 \def\ltj@defdimen{0}
 
 %%%%%%%% Attributes for Japanese typesetting.
+\newluatexattribute\ltj@icflag    % attribute for italic correction
 \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@yablshift % attribute for \yabaselineshift
-\newluatexattribute\ltj@ykblshift % attribute for \ykbaselineshift
+\newluatexattribute\ltj@origchar %
+\newluatexattribute\ltj@charclass %
 \newluatexattribute\ltj@autospc   % attribute for autospacing
 \newluatexattribute\ltj@autoxspc  % attribute for autoxspacing
-\newluatexattribute\ltj@icflag    % attribute for italic correction
+\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
+\ltj@tempcnta=0
+\loop\ifnum\ltj@tempcnta<7
+  \expandafter\newluatexattribute%
+    \csname ltj@kcat\the\ltj@tempcnta\endcsname
+  \csname ltj@kcat\the\ltj@tempcnta\endcsname=0
+  \advance\ltj@tempcnta by1
+\repeat
+
 
 %%%%%%%% Loading luatexja.lua
 %% Quark tokens needed in ltj-base
@@ -149,44 +158,27 @@
 
 \directlua{%
   luatexja = {}
-  function luatexja.error(s,t)
-    tex.error('LuaTeX-ja error: ' .. s ,t) 
-  end
-  function luatexja.load_module(name)
-     local fn = 'ltj-' .. name .. '.lua'
-     local found = kpse.find_file(fn, 'tex')
-     if not found then
-        luatexja.error("File `" .. fn .. "' not found", 
-	      {'This file ' .. fn .. ' is required for LuaTeX-ja.', 'Please check your installation.'})
-     else 
-        texio.write('(' .. found .. ')')
-        require(found)
-     end
-  end
-  local path = assert(kpse.find_file('luatexja.lua', 'tex'),
-      "File `luatexja.lua' not found")
-  dofile(path)
+  dofile(assert(kpse.find_file('luatexja.lua', 'tex'),
+      "File `luatexja.lua' not found"))
 }
 
+%% \RequireLuaTeXjaSubmodule{name}[date]
+% A TeX version of luatexja.load_module(name)
+% The second optional argument [date] is simply ignored.
+\def\RequireLuaTeXjaSubmodule#1{%
+  \@ifnextchar[{\ltj@requirelua@submod{#1}}{\ltj@requirelua@submod{#1}[]}}
+\def\ltj@requirelua@submod#1[#2]{%
+  \directlua{luatexja.load_module(
+    "\luatexluaescapestring{#1}")}}
+
+
 %%%%%%%% Load all sub-packages.
 \ifltj@in@latex                 %<*LaTeX>
-  \RequirePackage{luatexja-cctbreg}[2011/04/01]
-  \RequirePackage{luatexja-base}[2011/04/20]
+  \RequirePackage{ltj-base}   [2013/05/14]
 \else                           %<*!LaTeX>
-  \input luatexja-cctbreg.sty %
-  \input luatexja-base.sty %
+  \input ltj-base.sty %
 \fi                             %</LaTeX>
 
-
-%%%%%%%% Attributes for character ranges
-\ltj@tempcnta=0
-\loop\ifnum\ltj@tempcnta<7
-  \expandafter\newluatexattribute%
-    \csname ltj@kcat\the\ltj@tempcnta\endcsname
-  \csname ltj@kcat\the\ltj@tempcnta\endcsname=0
-  \advance\ltj@tempcnta by1
-\repeat
-
 %%%%%%%% \asluastring
 \def\asluastring#1{'\luaescapestring{\detokenize{#1}}'}
 
@@ -200,27 +192,19 @@
 \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}
+\protected\def\zw{\directlua{luatexja.jfont.load_zw()}\ltj@zw}
+\protected\def\zh{\directlua{luatexja.jfont.load_zh()}\ltj@zh}
 
 
 %%%%%%%% \inhibitglue
 \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{\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()}}
+\protected\def\inhibitglue{\ifhmode\ltj@@ihb\fi}
+\def\ltj@@ihb{\relax\directlua{luatexja.jfmglue.create_inhibitglue_node()}}
 
 %%%%%%%% \yoko, \tate, \ifydir, \iftdir
-%% At this moment, tategaki mode is not implemented; 
+%% At this moment, tategaki mode is not implemented;
 %% there is only yokogaki mode now.
 \let\yoko\relax
 \let\tate\relax
@@ -251,25 +235,31 @@
 \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}{%
-  \expandafter\ltj@@set@stack#1:{kcat}{0}{0x7FFFFFFF}}
+  \expandafter\ltj@@set@stack#1:{KCAT}{0}{0x7FFFFFFF}}
 \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}{%
-  \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{%
-  \directlua{luatexja.stack.set_stack_table(luatexja.isglobal, \asluastring{#3},
-    \ltj@safe@num@or\ltj@defnum{#1},\ltj@safe@num@or\ltj@defnum{#2},#4,#5)}}
+  \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}{%
-  \expandafter\ltj@@set@stackfont#1:{mjtext}}
+  \expandafter\ltj@@set@stackfont#1:{MJT}}
 \define@key[ltj]{japaram}{jascriptfont}{%
-  \expandafter\ltj@@set@stackfont#1:{mjscr}}
+  \expandafter\ltj@@set@stackfont#1:{MJS}}
 \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
@@ -277,8 +267,9 @@
     {\string#2 is not a control sequence that represents \MessageBreak
      a Japanese font}{}%
   \else
-    \directlua{luatexja.stack.set_stack_font(luatexja.isglobal, \asluastring{#3},
-    \ltj@safe@num@or\ltj@defnum{#1}, \the\ltj@curjfnt)}%
+    \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@restore@globaldefs
@@ -287,11 +278,11 @@
 % yalbaselineshift = <dimen>
 % yjabaselineshift = <dimen>
 \define@key[ltj]{japaram}{yalbaselineshift}{%
-  \directlua{tex.setattribute(luatexja.isglobal, 
+  \directlua{tex.setattribute(luatexja.isglobal,
     luatexbase.attributes['ltj@yablshift'],
     \ltj@safe@dimen@or\ltj@defdimen{#1})}}
 \define@key[ltj]{japaram}{yjabaselineshift}{%
-  \directlua{tex.setattribute(luatexja.isglobal, 
+  \directlua{tex.setattribute(luatexja.isglobal,
     luatexbase.attributes['ltj@ykblshift'],
     \ltj@safe@dimen@or\ltj@defdimen{#1})}}
 
@@ -306,9 +297,10 @@
   \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', 
-    \ltj@safe@num@or\ltj@defnum{#1},
-    \ltj@safe@num@or\ltj@defnum{\ltj@temp},0,3)}}
+  \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)}}
 
 % alxspmode = {<char_code>, <mode>}
 % mode: inhibit, preonly, postonly, allow
@@ -321,9 +313,10 @@
   \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', 
-    \ltj@safe@num@or\ltj@defnum{#1},
-    \ltj@safe@num@or\ltj@defnum{\ltj@temp},0,3)}}
+  \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)}}
 
 % autospacing = <bool> (default: true)
 \define@boolkey[ltj]{japaram}{autospacing}[true]{%
@@ -349,21 +342,24 @@
 
 % 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]%
-  {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
+    \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%
-  and `both'. }}
-  % large, small, average, both
+  `pleft', `pright', 'paverage' or `both'. }}
+  % large, small, average, pleft, pright, paverage, both
 
 
 % jacharrange = { +-<range_number> }
@@ -372,13 +368,15 @@
   \edef\ltj@temp{#1}%
   \ifx\ltj@temp\empty\let\next=\relax\else\let\next=\ltj@@scrange
     \directlua{luatexja.charrange.toggle_char_range(%
-      luatexja.is_global,\ltj@safe@num@or\ltj@defnum{#1})}%
+      luatexja.is_global,\ltj@safe@num@or{nil}{#1})}%
   \fi\next
 }
 
-\protected\def\ltjsetparameter#1{%
+\protected\def\ltj@setpar@global{%
   \ifnum\globaldefs>0\directlua{luatexja.isglobal='global'}\else\directlua{luatexja.isglobal=''}\fi
-  \setkeys[ltj]{japaram}{#1}\ignorespaces}
+}
+\protected\def\ltjsetparameter#1{%
+  \ltj@setpar@global\setkeys[ltj]{japaram}{#1}\ignorespaces}
 \protected\def\ltjglobalsetparameter#1{%
   \ifnum\globaldefs<0\directlua{luatexja.isglobal=''}\else\directlua{luatexja.isglobal='global'}\fi
   \setkeys[ltj]{japaram}{#1}\ignorespaces}
@@ -406,7 +404,7 @@
 \def\ltj@@getparam@one#1{%
   \directlua{luatexja.ext_get_parameter_unary('#1')}}%
 \def\ltj@@getparam@two#1#2{%
-  \directlua{luatexja.ext_get_parameter_binary('#1', \ltj@safe@num{#2})}%
+  \directlua{luatexja.ext_get_parameter_binary('#1', \ltj@safe@num@or{nil}{#2})}%
 }
 
 %%%%%%%% \ltjalchar<number>, \ltjjachar<number>
@@ -434,17 +432,26 @@
 \def\ltj@@alchar{{\directlua{tex.globaldefs = 0}\ltj@allalchar\ltj@@origchar\ltj@tempcnta}}
 
 %%%%%%%% \ltjsetmathletter<number>, \ltjunsetmathletter<number>
-\def\ltjsetmathletter#1{\directlua{luatexja.math.is_math_letters[#1]=true}}
-\def\ltjunsetmathletter#1{\directlua{luatexja.math.is_math_letters[#1]=false}}
+\protected\def\ltjsetmathletter#1{\directlua{luatexja.math.is_math_letters[#1]=true}}
+\protected\def\ltjunsetmathletter#1{\directlua{luatexja.math.is_math_letters[#1]=false}}
 
 %%------------------ Load module for the format
 
 \ifltj@in@latex                 %<*LaTeX>
-  \RequirePackage{luatexja-latex}[2011/04/01]
+  \RequirePackage{ltj-latex}[2013/05/14]
 \else\ifltj@in@plain            %<*plain>
-  \input luatexja-plain.sty %
+  \input ltj-plain.sty %
 \fi\fi                          %</LaTeX|plain>
 
+\newluatexcatcodetable\ltj@temp@cctb
+\def\ltj@overwrite@catcodetable#1{%
+  \setluatexcatcodetable\ltj@temp@cctb{\luatexcatcodetable#1}%
+  \setluatexcatcodetable#1{\luatexcatcodetable\ltj@temp@cctb\catcode"FFFFF=14}%
+}
+\ltj@overwrite@catcodetable\CatcodeTableLaTeX
+\ltj@overwrite@catcodetable\CatcodeTableLaTeXAtLetter
+\ltj@overwrite@catcodetable\CatcodeTableExpl
+
 %%------------------ all done
 \ltj@core@AtEnd
 \endinput