From 8779f2a9791f2e10d634667a4fa44972a29c1b1e Mon Sep 17 00:00:00 2001 From: Hironori Kitagawa Date: Sun, 28 Aug 2011 17:04:20 +0900 Subject: [PATCH] Fixed lltjfont.sty and luatexja-core.sty for uninvited spaces --- src/lltjfont.sty | 20 ++++++++++---------- src/luatexja-core.sty | 4 ++-- test/test07-math.pdf | Bin 19558 -> 19464 bytes test/test07-math.tex | 3 +-- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/lltjfont.sty b/src/lltjfont.sty index a4ad74c..1d36965 100644 --- a/src/lltjfont.sty +++ b/src/lltjfont.sty @@ -44,11 +44,12 @@ \newbox\tstrutbox \newbox\zstrutbox \def\strut{\relax - \ifydir +% \ifydir \ifmmode\copy\strutbox\else\unhcopy\strutbox\fi - \else - \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi - \fi} +% \else +% \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi +% \fi} +} \def\tstrut{\relax\hbox{\tate \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}} \def\zstrut{\relax\hbox{\tate @@ -641,27 +642,26 @@ \let\ltj@@al@getanddefine@fonts=\getanddefine@fonts \def\ltj@@ja@getanddefine@fonts#1#2{% \xdef\font@name{\csname \string#2/\tf@size\endcsname}% - \pickup@jfont \let\textfont@name\font@name + \pickup@jfont\let\textfont@name\font@name \xdef\font@name{\csname \string#2/\sf@size\endcsname}% - \pickup@jfont \let\scriptfont@name\font@name + \pickup@jfont\let\scriptfont@name\font@name \xdef\font@name{\csname \string#2/\ssf@size\endcsname}% \pickup@jfont \edef\math@fonts{\math@fonts\ltjsetparameter{% jatextfont={#1,\textfont@name},% jascriptfont={#1,\scriptfont@name},% - jascriptscriptfont={#1,\font@name}}} + jascriptscriptfont={#1,\font@name}}}% } \def\getanddefine@fonts#1#2{% \ltj@tempcnta=#1 \ltj@@IsFontJapanese{\string#2}% \ifin@\ltj@@ja@getanddefine@fonts{#1}{#2}% - \else \ltj@@al@getanddefine@fonts{#1}{#2}% - \fi + \else \ltj@@al@getanddefine@fonts{#1}{#2}\fi } \def\use@mathgroup#1#2{\relax\ifmmode \math@bgroup \expandafter\ifx\csname M@\f@encoding\endcsname#1\else - #1\fi \ltj@tempcnta=#2 \expandafter\ltj@@mathJapaneseFonts\string#1\relax% + #1\fi\ltj@tempcnta=#2 \expandafter\ltj@@mathJapaneseFonts\string#1\relax% \ifin@\jfam#2\relax\else\mathgroup#2\relax\fi \expandafter\math@egroup\fi}% diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty index 21bfe8a..81926ea 100644 --- a/src/luatexja-core.sty +++ b/src/luatexja-core.sty @@ -245,12 +245,12 @@ {\ltj@tempcntb=\ltj@curjfnt\ltj@curjfnt=-1 #2% \global\ltj@tempcnta=\ltj@curjfnt\global\ltj@curjfnt=\ltj@tempcntb}% \ifnum\ltj@tempcnta=-1 - \@PackageError{luatexja-core} + \@PackageError{luatexja-core}% {\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@tempcnta)} + \ltj@safe@num@or\ltj@defnum{#1}, \the\ltj@tempcnta)}% \fi} % yalbaselineshift = diff --git a/test/test07-math.pdf b/test/test07-math.pdf index 6190d1a72b7c29791c164c1573b3b7c78eddab6a..0ccf43fdd6e5c65d4da7d08bb707776b2b888ee5 100644 GIT binary patch delta 3682 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 ArvLx| delta 3779 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