summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty21
1 files changed, 16 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
index fe0e69bf318..9fc3f307441 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
@@ -8,14 +8,19 @@
\edef\ltj@latex@AtEnd{%
\endlinechar=\the\endlinechar
\relax}
-\endlinechar=-1 %
+\endlinechar\m@ne%
\def\luatexjalatexLoaded{\endinput}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ltj-latex}[2013/05/14 LaTeX support of LuaTeX-ja]
+\ProvidesPackage{ltj-latex}[2015/02/22 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)
-\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}
@@ -43,10 +48,10 @@
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},
- yalbaselineshift=0pt, yjabaselineshift=0pt,
+ yalbaselineshift=\z@, yjabaselineshift=\z@,
jcharwidowpenalty=500, differentjfm=paverage
}
@@ -57,6 +62,12 @@
\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