OSDN Git Service
(root)
/
luatex-ja
/
luatexja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2530f35
)
ltjsclasses: \@setfontsize should not set xkanjiskip if xkanjiskip<=0
author
Hironori Kitagawa
<h_kitagawa2001@yahoo.co.jp>
Wed, 24 Dec 2014 12:54:57 +0000
(21:54 +0900)
committer
Hironori Kitagawa
<h_kitagawa2001@yahoo.co.jp>
Wed, 24 Dec 2014 12:54:57 +0000
(21:54 +0900)
doc/ltjsclasses.pdf
patch
|
blob
|
history
src/ltjsarticle.cls
patch
|
blob
|
history
src/ltjsbook.cls
patch
|
blob
|
history
src/ltjsclasses.dtx
patch
|
blob
|
history
src/ltjskiyou.cls
patch
|
blob
|
history
src/ltjspf.cls
patch
|
blob
|
history
src/patches/lltjfont.sty
patch
|
blob
|
history
diff --git
a/doc/ltjsclasses.pdf
b/doc/ltjsclasses.pdf
index
856968d
..
36760a3
100644
(file)
Binary files a/doc/ltjsclasses.pdf and b/doc/ltjsclasses.pdf differ
diff --git
a/src/ltjsarticle.cls
b/src/ltjsarticle.cls
index
f52b222
..
d626a66
100644
(file)
--- a/
src/ltjsarticle.cls
+++ b/
src/ltjsarticle.cls
@@
-38,7
+38,7
@@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsarticle}
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsarticle}
- [2014/
07/02
]
+ [2014/
12/24
]
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
@@
-366,11
+366,14
@@
\fi
\fi
\ltj@setpar@global
\fi
\fi
\ltj@setpar@global
- \ltjsetkanjiskip{0pt plus .1\zw minus .01\zw}
- \if@slide
- \ltjsetxkanjiskip{0.1em}
- \else
- \ltjsetxkanjiskip{0.25em plus 0.15em minus 0.06em}
+ \ltjsetkanjiskip{\z@ plus .1\zw minus .01\zw}
+ \@tempskipa=\ltjgetparameter{xkanjiskip}
+ \ifdim\@tempskipa>\z@
+ \if@slide
+ \ltjsetxkanjiskip{0.1em}
+ \else
+ \ltjsetxkanjiskip{0.25em plus 0.15em minus 0.06em}
+ \fi
\fi}
\emergencystretch 3\zw
\newif\ifnarrowbaselines
\fi}
\emergencystretch 3\zw
\newif\ifnarrowbaselines
diff --git
a/src/ltjsbook.cls
b/src/ltjsbook.cls
index
c7395e9
..
fe18478
100644
(file)
--- a/
src/ltjsbook.cls
+++ b/
src/ltjsbook.cls
@@
-38,7
+38,7
@@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsbook}
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsbook}
- [2014/
07/02
]
+ [2014/
12/24
]
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
@@
-373,11
+373,14
@@
\fi
\fi
\ltj@setpar@global
\fi
\fi
\ltj@setpar@global
- \ltjsetkanjiskip{0pt plus .1\zw minus .01\zw}
- \if@slide
- \ltjsetxkanjiskip{0.1em}
- \else
- \ltjsetxkanjiskip{0.25em plus 0.15em minus 0.06em}
+ \ltjsetkanjiskip{\z@ plus .1\zw minus .01\zw}
+ \@tempskipa=\ltjgetparameter{xkanjiskip}
+ \ifdim\@tempskipa>\z@
+ \if@slide
+ \ltjsetxkanjiskip{0.1em}
+ \else
+ \ltjsetxkanjiskip{0.25em plus 0.15em minus 0.06em}
+ \fi
\fi}
\emergencystretch 3\zw
\newif\ifnarrowbaselines
\fi}
\emergencystretch 3\zw
\newif\ifnarrowbaselines
diff --git
a/src/ltjsclasses.dtx
b/src/ltjsclasses.dtx
index
5c2cccb
..
9c36f50
100644
(file)
--- a/
src/ltjsclasses.dtx
+++ b/
src/ltjsclasses.dtx
@@
-22,7
+22,7
@@
% -----------------------------------------
%
% \fi
% -----------------------------------------
%
% \fi
-% \CheckSum{52
13
}
+% \CheckSum{52
20
}
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@
-50,7
+50,7
@@
%<*driver>
\ProvidesFile{ltjsclasses.dtx}
%</driver>
%<*driver>
\ProvidesFile{ltjsclasses.dtx}
%</driver>
- [2014/
07/02
]
+ [2014/
12/24
]
%<*driver>
\documentclass{ltjsarticle}
\usepackage{doc}
%<*driver>
\documentclass{ltjsarticle}
\usepackage{doc}
@@
-131,8
+131,11
@@
% \end{itemize}
%
% [2014-02-07 LTJ] jsclasses 2014-02-07 ベースにしました.
% \end{itemize}
%
% [2014-02-07 LTJ] jsclasses 2014-02-07 ベースにしました.
+%
% [2014-07-26 LTJ] 縦組用和文フォントの設定を加えました.
%
% [2014-07-26 LTJ] 縦組用和文フォントの設定を加えました.
%
+% [2014-12-24 LTJ] |\@setfontsize| 中の和欧文間空白の設定で if 文が抜けていたのを直しました.
+%
% \StopEventually{}
%
% 以下では実際のコードに即して説明します。
% \StopEventually{}
%
% 以下では実際のコードに即して説明します。
@@
-967,6
+970,10
@@
% |\ltjsetkanjiskip| と |\ltjsetxkanjiskip|(両者とも,
% 実行前には |\ltj@setpar@global| の実行が必要)にしました.
%
% |\ltjsetkanjiskip| と |\ltjsetxkanjiskip|(両者とも,
% 実行前には |\ltj@setpar@global| の実行が必要)にしました.
%
+% [2014-12-24 LTJ] |jsclasses| では,|\@setfontsize| 中で |xkanjiskip| を
+% 設定するのは現在の和欧文間空白の自然長が正の場合だけでした.
+% |ltjsclasses| では最初からこの判定が抜けてしまっていたので,復活させます.
+%
% \begin{macrocode}
\def\@setfontsize#1#2#3{%
% \@nomath#1%
% \begin{macrocode}
\def\@setfontsize#1#2#3{%
% \@nomath#1%
@@
-982,11
+989,14
@@
\fi
\fi
\ltj@setpar@global
\fi
\fi
\ltj@setpar@global
- \ltjsetkanjiskip{0pt plus .1\zw minus .01\zw}
- \if@slide
- \ltjsetxkanjiskip{0.1em}
- \else
- \ltjsetxkanjiskip{0.25em plus 0.15em minus 0.06em}
+ \ltjsetkanjiskip{\z@ plus .1\zw minus .01\zw}
+ \@tempskipa=\ltjgetparameter{xkanjiskip}
+ \ifdim\@tempskipa>\z@
+ \if@slide
+ \ltjsetxkanjiskip{0.1em}
+ \else
+ \ltjsetxkanjiskip{0.25em plus 0.15em minus 0.06em}
+ \fi
\fi}
% \end{macrocode}
% \end{macro}
\fi}
% \end{macrocode}
% \end{macro}
diff --git
a/src/ltjskiyou.cls
b/src/ltjskiyou.cls
index
bf93dbe
..
260c5f4
100644
(file)
--- a/
src/ltjskiyou.cls
+++ b/
src/ltjskiyou.cls
@@
-38,7
+38,7
@@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjskiyou}
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjskiyou}
- [2014/
07/02
]
+ [2014/
12/24
]
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
@@
-368,11
+368,14
@@
\fi
\fi
\ltj@setpar@global
\fi
\fi
\ltj@setpar@global
- \ltjsetkanjiskip{0pt plus .1\zw minus .01\zw}
- \if@slide
- \ltjsetxkanjiskip{0.1em}
- \else
- \ltjsetxkanjiskip{0.25em plus 0.15em minus 0.06em}
+ \ltjsetkanjiskip{\z@ plus .1\zw minus .01\zw}
+ \@tempskipa=\ltjgetparameter{xkanjiskip}
+ \ifdim\@tempskipa>\z@
+ \if@slide
+ \ltjsetxkanjiskip{0.1em}
+ \else
+ \ltjsetxkanjiskip{0.25em plus 0.15em minus 0.06em}
+ \fi
\fi}
\emergencystretch 3\zw
\newif\ifnarrowbaselines
\fi}
\emergencystretch 3\zw
\newif\ifnarrowbaselines
diff --git
a/src/ltjspf.cls
b/src/ltjspf.cls
index
8e33ed9
..
b890fcb
100644
(file)
--- a/
src/ltjspf.cls
+++ b/
src/ltjspf.cls
@@
-38,7
+38,7
@@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjspf}
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjspf}
- [2014/
07/02
]
+ [2014/
12/24
]
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
@@
-366,11
+366,14
@@
\fi
\fi
\ltj@setpar@global
\fi
\fi
\ltj@setpar@global
- \ltjsetkanjiskip{0pt plus .1\zw minus .01\zw}
- \if@slide
- \ltjsetxkanjiskip{0.1em}
- \else
- \ltjsetxkanjiskip{0.25em plus 0.15em minus 0.06em}
+ \ltjsetkanjiskip{\z@ plus .1\zw minus .01\zw}
+ \@tempskipa=\ltjgetparameter{xkanjiskip}
+ \ifdim\@tempskipa>\z@
+ \if@slide
+ \ltjsetxkanjiskip{0.1em}
+ \else
+ \ltjsetxkanjiskip{0.25em plus 0.15em minus 0.06em}
+ \fi
\fi}
\emergencystretch 3\zw
\newif\ifnarrowbaselines
\fi}
\emergencystretch 3\zw
\newif\ifnarrowbaselines
diff --git
a/src/patches/lltjfont.sty
b/src/patches/lltjfont.sty
index
ec1d456
..
e53384d
100644
(file)
--- a/
src/patches/lltjfont.sty
+++ b/
src/patches/lltjfont.sty
@@
-361,15
+361,15
@@
\newdimen\adjust@dimen
\def\adjustbaseline{%
\setbox\adjust@box\hbox{%
\newdimen\adjust@dimen
\def\adjustbaseline{%
\setbox\adjust@box\hbox{%
- \ltj@ykblshift
=0 \ltj@tkblshift=0
漢}%
+ \ltj@ykblshift
\z@\ltj@tkblshift\z@
漢}%
\cht\ht\adjust@box
\cdp\dp\adjust@box
\cwd\wd\adjust@box
\cvs\normalbaselineskip
\chs\cwd
\cHT\cht \advance\cHT\cdp
\cht\ht\adjust@box
\cdp\dp\adjust@box
\cwd\wd\adjust@box
\cvs\normalbaselineskip
\chs\cwd
\cHT\cht \advance\cHT\cdp
- \setbox\adjust@box@aux\hbox{\tate\ltj@tkblshift
=0
漢}%
- \setbox\adjust@box\hbox{\tate\ltj@tablshift
=0
M}%
+ \setbox\adjust@box@aux\hbox{\tate\ltj@tkblshift
\z@
漢}%
+ \setbox\adjust@box\hbox{\tate\ltj@tablshift
\z@
M}%
\adjust@dimen\ht\adjust@box
\advance\adjust@dimen\dp\adjust@box
\advance\adjust@dimen-\ht\adjust@box@aux
\adjust@dimen\ht\adjust@box
\advance\adjust@dimen\dp\adjust@box
\advance\adjust@dimen-\ht\adjust@box@aux