X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fluatexja-core.sty;h=ea54c3e5e9e232d5bc9fbeb81f3cd9b42b4c99c0;hb=3f482453d2d2ec36d0457a6f647172c055de9000;hp=dcc3fb4354879e005808c3286c33c9bf611aac12;hpb=a15809ed77d030114ba89caff38e71b36e53cbcf;p=luatex-ja%2Fluatexja.git

diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty
index dcc3fb4..ea54c3e 100644
--- 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}[2011/04/01 v0.1]
+  \ProvidesPackage{luatexja-core}[2012/04/20 v0.2]
 \fi                             %</LaTeX>
 
 %% Load prerequisite packages.
@@ -113,17 +113,6 @@
 \let\LuaTeXjaAvailable=t %
 
 %%------------------
-
-%% Load all sub-packages.
-\ifltj@in@latex                 %<*LaTeX>
-  \RequirePackage{luatexja-cctbreg}[2011/04/01]
-  \RequirePackage{luatexja-base}[2011/04/01]
-\else                           %<*!LaTeX>
-  \input luatexja-cctbreg.sty %
-  \input luatexja-base.sty %
-\fi                             %</LaTeX>
-
-%%------------------
 \endlinechar=13
 %! この中に master の luatexja-core.sty の内容を挿入する
 %! ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
@@ -133,13 +122,6 @@
 
 \def\ltj@loaded{hoge}
 
-\newcount\ltj@tempcnta
-\newcount\ltj@tempcntb
-\newcount\ltj@tempcntc
-\newdimen\ltj@tempdima
-\newskip\ltj@tempskipa
-\newtoks\ltj@temptoks
-
 \newdimen\ltj@zw
 \newdimen\ltj@zh
 \newdimen\jQ \jQ=0.25mm
@@ -149,33 +131,20 @@
 \def\ltj@defnum{0}
 \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@origchar % 
 \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
-
-%%%%%%%% Loading lua files
-\directlua{%
-  utf = unicode.utf8
-  ltj = {}
-  function ltj.loadlua(file)
-    local path = assert(kpse.find_file(file, 'tex'),
-      "File '"..file.."' not found")
-    texio.write_nl("("..path..")")
-    dofile(path)
-  end
-  ltj.loadlua('luatexja-core.lua')
-}
-
+\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%
@@ -185,6 +154,37 @@
 \repeat
 
 
+%%%%%%%% Loading luatexja.lua
+%% Quark tokens needed in ltj-base
+\protected\def\ltj@@q@escape{\ltj@@q@escape@}
+\protected\def\ltj@@q@escapenum{\ltj@@q@escapenum@}
+
+\directlua{%
+  luatexja = {}
+  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{ltj-cctbreg}[2012/04/21]
+  \RequirePackage{ltj-base}[2012/04/21]
+\else                           %<*!LaTeX>
+  \input ltj-cctbreg.sty %
+  \input ltj-base.sty %
+\fi                             %</LaTeX>
+
+
 %%%%%%%% \asluastring
 \def\asluastring#1{'\luaescapestring{\detokenize{#1}}'}
 
@@ -198,24 +198,16 @@
 \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{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()}}
+  \directlua{luatexja.global_temp = tex.globaldefs; tex.globaldefs = 0}}
+\protected\def\ltj@restore@globaldefs{\directlua{tex.globaldefs = luatexja.global_temp}}
+\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; 
@@ -257,8 +249,8 @@
 \define@key[ltj]{japaram}{postbreakpenalty}{%
   \expandafter\ltj@@set@stack#1:{post}{-10000}{10000}}
 \def\ltj@@set@stack#1,#2:#3#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)}}
+  \directlua{luatexja.stack.set_stack_table(luatexja.isglobal, \asluastring{#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}{%
@@ -267,7 +259,7 @@
   \expandafter\ltj@@set@stackfont#1:{mjscr}}
 \define@key[ltj]{japaram}{jascriptscriptfont}{%
   \expandafter\ltj@@set@stackfont#1:{mjss}}
-\def\ltj@@set@stackfont#1,#2:#3{%
+\protected\def\ltj@@set@stackfont#1,#2:#3{%
   \ltj@reset@globaldefs
   \ltj@tempcnta=\ltj@curjfnt\ltj@curjfnt=-1 #2%
   \ifnum\ltj@curjfnt=-1
@@ -275,8 +267,8 @@
     {\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)}%
+    \directlua{luatexja.stack.set_stack_font(luatexja.isglobal, \asluastring{#3},
+    \ltj@safe@num@or{nil}{#1}, \the\ltj@curjfnt)}%
   \fi
   \ltj@curjfnt=\ltj@tempcnta
   \ltj@restore@globaldefs
@@ -285,11 +277,11 @@
 % yalbaselineshift = <dimen>
 % yjabaselineshift = <dimen>
 \define@key[ltj]{japaram}{yalbaselineshift}{%
-  \directlua{tex.setattribute(ltj.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(ltj.isglobal, 
+  \directlua{tex.setattribute(luatexja.isglobal, 
     luatexbase.attributes['ltj@ykblshift'],
     \ltj@safe@dimen@or\ltj@defdimen{#1})}}
 
@@ -304,9 +296,9 @@
   \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(ltj.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, '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
@@ -319,49 +311,52 @@
   \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(ltj.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, '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]{%
   \ifltj@japaram@autospacing
-    \directlua{ltj.ext_print_global()}\ltj@autospc=1
+    \directlua{luatexja.ext_print_global()}\ltj@autospc=1
   \else
-    \directlua{ltj.ext_print_global()}\ltj@autospc=0
+    \directlua{luatexja.ext_print_global()}\ltj@autospc=0
   \fi}
 
 % autoxspacing = <bool> (default: true)
 \define@boolkey[ltj]{japaram}{autoxspacing}[true]{%
   \ifltj@japaram@autoxspacing
-    \directlua{ltj.ext_print_global()}\ltj@autoxspc=1
+    \directlua{luatexja.ext_print_global()}\ltj@autoxspc=1
   \else
-    \directlua{ltj.ext_print_global()}\ltj@autoxspc=0
+    \directlua{luatexja.ext_print_global()}\ltj@autoxspc=0
   \fi}
 
 % [x]]kanjiskip = <dimen>
 \define@key[ltj]{japaram}{kanjiskip}{%              % SKIP
-  \directlua{luatexja.stack.set_stack_skip(ltj.isglobal, 'kanjiskip', \ltj@safe@glue{#1})}}
+  \directlua{luatexja.stack.set_stack_skip(luatexja.isglobal, 'kanjiskip', \ltj@safe@glue{#1})}}
 \define@key[ltj]{japaram}{xkanjiskip}{%             % SKIP
-  \directlua{luatexja.stack.set_stack_skip(ltj.isglobal, 'xkanjiskip', \ltj@safe@glue{#1})}}
+  \directlua{luatexja.stack.set_stack_skip(luatexja.isglobal, 'xkanjiskip', \ltj@safe@glue{#1})}}
 
 % jcharwidowpenalty = <count>
 \define@key[ltj]{japaram}{jcharwidowpenalty}{%      %COUNT
   \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> }
@@ -370,15 +365,17 @@
   \edef\ltj@temp{#1}%
   \ifx\ltj@temp\empty\let\next=\relax\else\let\next=\ltj@@scrange
     \directlua{luatexja.charrange.toggle_char_range(%
-      ltj.is_global,\ltj@safe@num@or\ltj@defnum{#1})}%
+      luatexja.is_global,\ltj@safe@num@or{nil}{#1})}%
   \fi\next
 }
 
+\protected\def\ltj@setpar@global{%
+  \ifnum\globaldefs>0\directlua{luatexja.isglobal='global'}\else\directlua{luatexja.isglobal=''}\fi
+}
 \protected\def\ltjsetparameter#1{%
-  \ifnum\globaldefs>0\directlua{ltj.isglobal='global'}\else\directlua{ltj.isglobal=''}\fi
-  \setkeys[ltj]{japaram}{#1}\ignorespaces}
+  \ltj@setpar@global\setkeys[ltj]{japaram}{#1}\ignorespaces}
 \protected\def\ltjglobalsetparameter#1{%
-  \ifnum\globaldefs<0\directlua{ltj.isglobal=''}\else\directlua{ltj.isglobal='global'}\fi
+  \ifnum\globaldefs<0\directlua{luatexja.isglobal=''}\else\directlua{luatexja.isglobal='global'}\fi
   \setkeys[ltj]{japaram}{#1}\ignorespaces}
 
 %%%%%%%% \ltjgetparameter
@@ -402,9 +399,9 @@
   {\ltj@@getparam@one{#1}}%
 }
 \def\ltj@@getparam@one#1{%
-  \directlua{ltj.ext_get_parameter_unary('#1')}}%
+  \directlua{luatexja.ext_get_parameter_unary('#1')}}%
 \def\ltj@@getparam@two#1#2{%
-  \directlua{ltj.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>
@@ -432,17 +429,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}[2012/04/21]
 \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