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
Dnode -> node.direct (WIP)
[luatex-ja/luatexja.git]
/
src
/
ltj-latex.sty
diff --git
a/src/ltj-latex.sty
b/src/ltj-latex.sty
index
afc724b
..
eaa55d1
100644
(file)
--- a/
src/ltj-latex.sty
+++ b/
src/ltj-latex.sty
@@
-8,14
+8,19
@@
\edef\ltj@latex@AtEnd{%
\endlinechar=\the\endlinechar
\relax}
\edef\ltj@latex@AtEnd{%
\endlinechar=\the\endlinechar
\relax}
-\endlinechar
=-1
%
+\endlinechar
\m@ne
%
\def\luatexjalatexLoaded{\endinput}
\NeedsTeXFormat{LaTeX2e}
\def\luatexjalatexLoaded{\endinput}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ltj-latex}[2013/04/02 LuaLaTeX-ja]
+\ProvidesPackage{ltj-latex}[2015/09/21 LaTeX support of LuaTeX-ja]
+
+% cleanup at end of the document
+%\let\ltj@@orig@end=\@@end
+%\protected\def\@@end{%
+% \directlua{luatexja.ext_cleanup()}\ltj@@orig@end}
% Globally add to the head of a macro (cf. LaTeX2e's \g@addto@macro)
% Globally add to the head of a macro (cf. LaTeX2e's \g@addto@macro)
-\long\def\ltj@g@addto@macro#1#2{
+\long\def\ltj@g@addto@macro#1#2{
%
\begingroup
\def\ltj@tmpa{#2}
\toks@\expandafter\expandafter\expandafter{\expandafter\ltj@tmpa#1}
\begingroup
\def\ltj@tmpa{#2}
\toks@\expandafter\expandafter\expandafter{\expandafter\ltj@tmpa#1}
@@
-39,15
+44,14
@@
%%% default parameters
\directlua{
%%% default parameters
\directlua{
- luatexja.stack.charprop_stack_table[0]
- = dofile(assert(kpse.find_file('ltj-kinsoku.lua', 'tex'),
- "File `ltj-kinsoku.lua' not found"))
+ local s = kpse.find_file('ltj-kinsoku.lua', 'tex')
+ luatexja.stack.charprop_stack_table[0] = s and dofile(s) or {}
}
}
-\ltjsetparameter{kanjiskip=
0pt plus 0.4pt minus 0
.4pt,
+\ltjsetparameter{kanjiskip=
\z@ plus .4pt minus
.4pt,
xkanjiskip=.25\zw plus 1pt minus 1pt,
autospacing, autoxspacing, jacharrange={-1},
xkanjiskip=.25\zw plus 1pt minus 1pt,
autospacing, autoxspacing, jacharrange={-1},
- yalbaselineshift=
0pt, yjabaselineshift=0pt
,
+ yalbaselineshift=
\z@, yjabaselineshift=\z@
,
jcharwidowpenalty=500, differentjfm=paverage
}
jcharwidowpenalty=500, differentjfm=paverage
}
@@
-58,6
+62,12
@@
\ltj@pkgpatch{unicode-math}
\ltj@pkgpatch{xunicode}
\ltj@pkgpatch{fontspec}
\ltj@pkgpatch{unicode-math}
\ltj@pkgpatch{xunicode}
\ltj@pkgpatch{fontspec}
+\ltj@pkgpatch{stfloats}
+\ltj@pkgpatch{footmisc}
+\ltj@pkgpatch{tascmac}
+\ltj@AtBeginDocument{\@ifpackageloaded{ascmac}{\input{lltjp-tascmac.sty}}{}}% ascmac
+
+\RequirePackage{lltjp-geometry}
%%------------------ all done
%%------------------ all done