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
優先度付き調整処理のテスト (test17-priority.tex)
[luatex-ja/luatexja.git]
/
src
/
luatexja-compat.sty
diff --git
a/src/luatexja-compat.sty
b/src/luatexja-compat.sty
index
e066ad3
..
bc29828
100644
(file)
--- a/
src/luatexja-compat.sty
+++ b/
src/luatexja-compat.sty
@@
-74,9
+74,9
@@
\ifx\ltj@@tempa\ltj@@tempb %<*pTeX>
\let\ltj@@compat@pTeX=t
\ifltj@in@latex %<*LaTeX>
\ifx\ltj@@tempa\ltj@@tempb %<*pTeX>
\let\ltj@@compat@pTeX=t
\ifltj@in@latex %<*LaTeX>
- \RequirePackage{l
uatexja-compat-ptex}[2011/04/0
1]
+ \RequirePackage{l
tj-compat-ptex}[2012/04/2
1]
\else %<*!LaTeX>
\else %<*!LaTeX>
- \input l
uatexja
-compat-ptex.sty %
+ \input l
tj
-compat-ptex.sty %
\fi %</LaTeX>
\ltj@compat@AtEnd
\expandafter\endinput\fi\relax %</pTeX>
\fi %</LaTeX>
\ltj@compat@AtEnd
\expandafter\endinput\fi\relax %</pTeX>
@@
-84,7
+84,7
@@
% Load core module if not yet.
\ifx\luatexjacoreLoaded\@undefined
\ifltj@in@latex %<*LaTeX>
% Load core module if not yet.
\ifx\luatexjacoreLoaded\@undefined
\ifltj@in@latex %<*LaTeX>
- \RequirePackage{luatexja-core}[201
1/04/01
]
+ \RequirePackage{luatexja-core}[201
2/04/20
]
\else %<*!LaTeX>
\input luatexja-core.sty %
\fi %</LaTeX>
\else %<*!LaTeX>
\input luatexja-core.sty %
\fi %</LaTeX>
@@
-104,9
+104,8
@@
% not yet implemented.
%%------------------
% not yet implemented.
%%------------------
-%! これ以降に LuaTeX 用の compat の内容を入れる.
-\RequireLuaModule{luatexja.jisx0208} %% JIS X 0208 => unicode のテーブル
-\RequireLuaModule{luatexja.compat}
+\RequireLuaTeXjaSubmodule{jisx0208}
+\RequireLuaTeXjaSubmodule{compat}
\def\euc{\ltj@code@conv{euc}}
\def\kuten{\ltj@code@conv{kuten}}
\def\euc{\ltj@code@conv{euc}}
\def\kuten{\ltj@code@conv{kuten}}
@@
-115,7
+114,7
@@
\def\ucs{\ltj@code@conv{ucs}}
\def\ltj@code@conv#1{%
\def\ucs{\ltj@code@conv{ucs}}
\def\ltj@code@conv#1{%
- \directlua{
luatexja._cc_next = luatexja.compat.from_#1 }%
+ \directlua{luatexja._cc_next = luatexja.compat.from_#1 }%
\ltj@code@convA
}
\def\ltj@code@convA{%
\ltj@code@convA
}
\def\ltj@code@convA{%
@@
-123,7
+122,7
@@
\ltj@code@convB\ltj@grab@num
}
\def\ltj@code@convB#1{%
\ltj@code@convB\ltj@grab@num
}
\def\ltj@code@convB#1{%
- \directlua{
luatexja._cc_next(\ltj@safe@num
{#1}) }%
+ \directlua{
luatexja._cc_next(\ltj@safe@num@or{nil}
{#1}) }%
}
\def\kansuji{%
}
\def\kansuji{%
@@
-131,7
+130,7
@@
\ltj@kansujiA\ltj@grab@num
}
\def\ltj@kansujiA#1{%
\ltj@kansujiA\ltj@grab@num
}
\def\ltj@kansujiA#1{%
- \directlua{
luatexja.compat.to_kansuji(\ltj@safe@num{#1}) }%
+ \directlua{luatexja.compat.to_kansuji(\ltj@safe@num{#1}) }%
}
\define@key[ltj]{japaram}{kansujichar}{%
\expandafter\ltj@@set@stack#1:{ksj}{0}{0x7FFFFFFF}}
}
\define@key[ltj]{japaram}{kansujichar}{%
\expandafter\ltj@@set@stack#1:{ksj}{0}{0x7FFFFFFF}}