X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fluatexja-core.sty;h=9571965d57266e762f673a405a9e96fa984d1d9d;hb=98422627a07d001d44b8a73e8db63db668987fd5;hp=fc450d059c3e58d5f6e221dc79a4e01182fe7d09;hpb=c12bb8fc84f0606732d9fe7d51a0b4a090b533c1;p=luatex-ja%2Fluatexja.git

diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty
index fc450d0..9571965 100644
--- a/src/luatexja-core.sty
+++ b/src/luatexja-core.sty
@@ -1,90 +1,384 @@
-\catcode`\@=11
+%
+% luatexja-core.sty
+%
+
+%! 外から読まれるので仰々しくなってます
+%% Avoid multiple loading.
+\csname\if11luatexjacoreLoaded\fi\endcsname
+\edef\x{%
+\catcode32=\the\catcode32%
+\catcode33=\the\catcode33%
+\catcode35=\the\catcode35%
+\catcode40=\the\catcode40%
+\catcode41=\the\catcode41%
+\catcode42=\the\catcode42%
+\catcode43=\the\catcode43%
+\catcode44=\the\catcode44%
+\catcode45=\the\catcode45%
+\catcode46=\the\catcode46%
+\catcode58=\the\catcode58%
+\catcode59=\the\catcode59%
+\catcode60=\the\catcode60%
+\catcode61=\the\catcode61%
+\catcode62=\the\catcode62%
+\catcode64=\the\catcode64%
+\catcode91=\the\catcode91%
+\catcode93=\the\catcode93%
+\catcode94=\the\catcode94%
+\catcode95=\the\catcode95%
+\catcode126=\the\catcode126%
+\endlinechar=\the\endlinechar
+\relax}
+\catcode32=10 %< >
+\catcode33=12 %<">
+\catcode35=6  %<#>
+\catcode40=12 %<(>
+\catcode41=12 %<)>
+\catcode42=12 %<*>
+\catcode43=12 %<+>
+\catcode44=12 %<,>
+\catcode45=12 %<->
+\catcode46=12 %<.>
+\catcode58=12 %<:>
+\catcode59=12 %<;>
+\catcode60=12 %<<>
+\catcode61=12 %<=>
+\catcode62=12 %<>>
+\catcode64=11 %<@>
+\catcode91=12 %<[>
+\catcode93=12 %<]>
+\catcode94=7  %<^>
+\catcode95=8  %<_>
+\catcode126=13 %<~>
+\endlinechar=-1 %
+%! なお, 上のcatcode設定はcoreとcompatで同一にしておく.
+\edef\ltj@core@AtEnd{\x
+  \noexpand\let\noexpand\ltj@core@AtEnd\relax}
+\def\luatexjacoreLoaded{\endinput}
+
+%% Check if LaTeX is used.
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname RequirePackage\endcsname\relax %<*!LaTeX>
+  \expandafter\let\csname ifltj@in@latex\expandafter\endcsname
+    \csname iffalse\endcsname
+\else                           %<*LaTeX>
+  \expandafter\let\csname ifltj@in@latex\expandafter\endcsname
+    \csname iftrue\endcsname
+  \NeedsTeXFormat{LaTeX2e}
+  \ProvidesPackage{luatexja-core}[2011/04/01 v0.1]
+\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{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
+\else                           %<*!LaTeX>
+  \input luaotfload.sty
+  \input infwarerr.sty
+  \input ltxcmds.sty
+  \input pdftexcmds.sty
+  \input xkeyval
+\fi                             %</LaTeX>
+\endlinechar=-1 %
+
+%% Check if LuaTeX is used
+\ltx@LocalExpandAfter\ifx\csname directlua\endcsname\relax
+  % Loading is silently aborted, since the notice of the wrong
+  % engine is aldready shown in otfluaload.
+  \ltj@core@AtEnd
+\expandafter\endinput\fi\relax
+
+%% Check LuaTeX version.
+\ifnum\luatexversion<65
+  \@PackageError{luatexja-core}
+    {This LuaTeX engine is too old for this package;\MessageBreak
+     at least v0.65 is needed}
+    {Package loading is aborted now.\MessageBreak}
+\expandafter\endinput\fi\relax
+
+%! なお、luatexbase-compat の説明に従うと、LuaTeX 拡張プリミティブは
+%! plain/LaTeX の両方で \luatex 付の名前（\directlua はそのまま)
+%! で使えると考えてよい。
+
+%% \LuaTeXjaAvailable
+%! 環境検査にパスした時に定義される.
+\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 の内容を挿入する
+%! ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
+% LuaTeX-ja core TeX source
+
 \catcode"FFFFF=14 %"
 
-\input luaotfload.sty
-\ifdefined\luatexja@loaded\endinput\fi
-\def\luatexja@loaded{hoge}
+\def\ltj@loaded{hoge}
+
+\newcount\ltj@tempcnta
+\newcount\ltj@tempcntb
+\newcount\ltj@tempcntc
+\newdimen\ltj@tempdima
+\newskip\ltj@tempskipa
 
-\newcount\luatexja@tempcnta
-\newdimen\luatexja@tempdima
-%\newcount\jcharwidowpenalty
-\newskip\kanjiskip\kanjiskip=0pt minus.4pt
-\newskip\xkanjiskip
 \newdimen\zw
 \newdimen\zh
 \newdimen\jQ \jQ=0.25mm
 \newdimen\jH \jH=0.25mm
-\newcount\luatexja@autospc
-\newcount\luatexja@autoxspc
 
+%%%%%%%% error message
+\def\ltj@defnum{0}
+\def\ltj@defdimen{0}
+
+
+%%%%%%%% Attributes for Japanese typesetting.
+\newluatexattribute\ltj@curjfnt   % index for ``current Japanese font''
+\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.."' no found")
+      "File '"..file.."' not found")
     texio.write_nl("("..path..")")
     dofile(path)
   end
- ltj.loadlua('luatexja-rmlgbm.lua') 
-    % This file must be read before luatexja-jfont.lua. For Ryumin-Light and GothicBBB-Medium.
-  ltj.loadlua('luatexja-core.lua')
+  require('lualibs')
+  ltj.loadlua('luatexja-rmlgbm.lua') 
+    % For Ryumin-Light and GothicBBB-Medium.
   ltj.loadlua('luatexja-jfont.lua')
-  ltj.loadlua('luatexja-core-aux.lua')
+  ltj.loadlua('luatexja-core.lua')
+  ltj.loadlua('luatexja-jfmglue.lua')
+  ltj.loadlua('luatexja-xkanji.lua')
 }
 
-% Attributes for Japanese typesetting.
-\newluatexattribute\luatexja@curjfnt   % index for ``current Japanese font''
-\newluatexattribute\luatexja@charclass % 
-\newluatexattribute\luatexja@yablshift % attribute for \yabaselineshift
-\newluatexattribute\luatexja@ykblshift % attribute for \ykbaselineshift
 
-% for italic correction
-\newluatexattribute\luatexja@icflag
-\let\luatexja@ic=\/
-\protected\def\/{{\luatexja@icflag=1\luatexja@ic}}
+%%%%%%%% 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}}'}
+
+%%%%%%%% Redefine \/
+%\let\ltj@ic=\/ \protected\def\/{{\ltj@icflag=1\ltj@ic}}
+\protected\def\/{\directlua{ltj.ext_append_italic()}}
+
+%%%%%%%% \jfont\CS={...:...;jfm=metric;...}, \globaljfont
+\protected\def\jfont{\afterassignment\ltj@@jfont\directlua{ltj.ext_jfontdefX(false)}}
+\protected\def\globaljfont{%
+  \afterassignment\ltj@@jfont\directlua{ltj.ext_jfontdefX(true)}}
+\def\ltj@@jfont{\directlua{ltj.ext_jfontdefY()}}
 
-% for hyphenation
-\newlanguage\luatexja@japanese
-\directlua{ltj.ja_lang_number=\the\luatexja@japanese}
+%%%%%%%% \inhibitglue
+\protected\def\inhibitglue{\directlua{ltj.ext_create_inhibitglue_node()}}
 
+%%%%%%%% \ltjdefcharrange<name>{100-200,3000-,5000,...}
+\protected\def\ltjdefcharrange#1#2{%
+  \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}
+\def\ltj@@dcrangeA#1{\ltj@@dcrangeB#1--\@nil}
+\def\ltj@@dcrangeB#1-#2-#3\@nil{\def\ltj@temp{#3}%
+  \ifx\ltj@temp\empty
+    \ltj@tempcnta=#1 \ltj@tempcntb=\ltj@tempcnta
+  \else
+    \def\ltj@temp{#1}%
+    \ifx\ltj@temp\empty\ltj@tempcnta='200 \else\ltj@tempcnta=#1 \fi
+    \def\ltj@temp{#2}%
+    \ifx\ltj@temp\empty\ltj@tempcntb="10FFFF \else\ltj@tempcntb=#2 \fi%"
+  \fi
+  \directlua{luatexja.charrange.add_char_range(\the\ltj@tempcnta,\the\ltj@tempcntb,
+    \the\ltj@tempcntc)}%
+  }
 
-% \jfont\CS={...:...;jfm=metric;...}
-\def\jfont{\afterassignment\@jfont\directlua{ltj.jfontdefX(true)}}
-\def\@jfont{\directlua{ltj.jfontdefY()}}
+%%%%%%%% \ltjsetparameter
+\newcount\ltj@@stack \newcount\ltj@@group@level
+\ltj@@group@level=0 \ltj@@stack=0
 
-% \loadjfontmetric<metric name><filename> : 
-% load <filename> which contains a font metric for a Japanese font.
-\def\loadjfontmetric#1#2{% #1: key, #2: file name
-\directlua{
-  jfm.name='#1'; jfm.char_type={}; jfm.glue={}; jfm.kern={}
-  ltj.loadlua('luatj-#2.lua'); ltj.loadjfontmetric()}
+% prebreakpenalty = {<char_code>, <penalty>}
+\define@key[ltj]{japaram}{kcatcode}{%
+  \expandafter\ltj@@set@stack#1:{kcat}{0}{0x7FFFFFFF}}
+\define@key[ltj]{japaram}{prebreakpenalty}{%
+  \expandafter\ltj@@set@stack#1:{pre}{-10000}{10000}}
+\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)}}
+
+% yalbaselineshift = <dimen>
+% yjabaselineshift = <dimen>
+\define@key[ltj]{japaram}{yalbaselineshift}{%
+  \directlua{tex.setattribute(ltj.isglobal, 
+    luatexbase.attributes['ltj@yablshift'],
+    \ltj@safe@dimen@or\ltj@defdimen{#1})}}
+\define@key[ltj]{japaram}{yjabaselineshift}{%
+  \directlua{tex.setattribute(ltj.isglobal, 
+    luatexbase.attributes['ltj@ykblshift'],
+    \ltj@safe@dimen@or\ltj@defdimen{#1})}}
+
+% jaxspmode = {<char_code>, <mode>}
+% mode: inhibit, preonly, postonly, allow
+%    or       0        2         1      3
+\define@key[ltj]{japaram}{jaxspmode}{%        \inhibitxspcode
+  \expandafter\ltj@set@jaxspmode#1:\relax}
+\def\ltj@set@jaxspmode#1,#2:{%
+  \lowercase{\edef\ltj@temp{#2}}%
+  \def\ltj@tempa{inhibit}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{0}\fi
+  \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
+  \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
+%    or       0        1         2      3
+\define@key[ltj]{japaram}{alxspmode}{%        \inhibitxspcode
+  \expandafter\ltj@set@alxspmode#1:\relax}
+\def\ltj@set@alxspmode#1,#2:{%
+  \lowercase{\edef\ltj@temp{#2}}%
+  \def\ltj@tempa{inhibit}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{0}\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(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.ext_print_global()}\ltj@autospc=1
+  \else
+    \directlua{ltj.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
+  \else
+    \directlua{ltj.ext_print_global()}\ltj@autoxspc=0
+  \fi}
+
+\define@key[ltj]{japaram}{kanjiskip}{%              % SKIP
+  \directlua{luatexja.stack.set_stack_skip(ltj.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})}}
+\define@key[ltj]{japaram}{jcharwidowpenalty}{%      %COUNT
+  \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.ja_diffmet_rule = math.max}\or
+    \directlua{ltj.ja_diffmet_rule = math.min}\or
+    \directlua{ltj.ja_diffmet_rule = math.two_average}\or
+    \directlua{ltj.ja_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
+
+
+% jacharrange = { +-<range_number> }
+\define@key[ltj]{japaram}{jacharrange}{\expandafter\ltj@@scrange#1,,}
+\def\ltj@@scrange#1,{%
+  \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})}%
+  \fi\next
 }
 
-% ybaselineshift
-\let\yabaselineshift=\luatexja@yablshift % 欧文文字
-\let\ykbaselineshift=\luatexja@ykblshift % 和文文字
-\luatexja@yablshift=0 \luatexja@ykblshift=0
-
-% \inhibitxspcode, \xspcode
-\def\setinhibitxspcode#1#2{\directlua{ltj.set_inhibit_xsp_table(#1,#2)}}
-\def\getinhibitxspcode#1{\directlua{ltj.get_inhibit_xsp_table(#1)}}
-\let\setxspcode=\setinhibitxspcode
-\let\getxspcode=\getinhibitxspcode
-% \prebreakpenalty, \postbreakpenalty
-\def\setprebreakpenalty#1#2{\directlua{ltj.set_penalty_table('pre',#1,#2)}}
-\def\setpostbreakpenalty#1#2{\directlua{ltj.set_penalty_table('post',#1,#2)}}
-\def\getprebreakpenalty#1{\directlua{ltj.get_penalty_table('pre',#1)}}
-\def\getpostbreakpenalty#1{\directlua{ltj.get_penalty_table('post',#1)}}
-
-\def\autospacing{\luatexja@autospc=0 }
-\def\noautospacing{\luatexja@autospc=1 }
-\def\autoxspacing{\luatexja@autoxspc=0 }
-\def\noautoxspacing{\luatexja@autoxspc=1 }
-\autospacing\autoxspacing
-% \inhibitglue
-\def\inhibitglue{\directlua{ltj.create_ihb_node()}}
-
-\input luatexja-kinsoku.tex
-\catcode`\@=12
+\protected\def\ltjsetparameter#1{\directlua{ltj.isglobal=''}%
+  \setkeys[ltj]{japaram}{#1}\ignorespaces}
+\protected\def\ltjglobalsetparameter#1{\directlua{ltj.isglobal='global'}%
+  \setkeys[ltj]{japaram}{#1}\ignorespaces}
+
+%%%%%%%% 
+\def\ltj@@decl@array@param#1{%
+  \expandafter\let\csname ltj@@array@param/#1\endcsname=t%
+}
+\ltj@@decl@array@param{prebreakpenalty}
+\ltj@@decl@array@param{postbreakpenalty}
+\ltj@@decl@array@param{jaxspmode}
+\ltj@@decl@array@param{alxspmode}
+\ltj@@decl@array@param{kcatcode}
+\ltj@@decl@array@param{jacharrange}
+\ltj@@decl@array@param{chartorange}
+\def\ltjgetparameter#1{%
+  \ifcsname ltj@@array@param/#1\endcsname
+    \expandafter\ltx@firstoftwo
+  \else
+    \expandafter\ltx@secondoftwo
+  \fi
+  {\ltj@@getparam@two{#1}}%
+  {\ltj@@getparam@one{#1}}%
+}
+\def\ltj@@getparam@one#1{%
+  \directlua{ltj.ext_get_parameter_unary('#1')}}%
+\def\ltj@@getparam@two#1#2{%
+  \directlua{ltj.ext_get_parameter_binary('#1', \ltj@safe@num{#2})}%
+}
+
+
+
+%\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
+
+\ifltj@in@latex                 %<*LaTeX>
+  \RequirePackage{luatexja-latex}[2011/04/01]
+\else\ifltj@in@plain            %<*plain>
+  \input luatexja-plain.sty %
+\fi\fi                          %</LaTeX|plain>
+
+%%------------------ all done
+\ltj@core@AtEnd
 \endinput
+%% EOF