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:
8202895
)
ltj[s]classes: \stockwidth, \stockheight
author
Hironori Kitagawa
<h_kitagawa2001@yahoo.co.jp>
Sun, 11 Sep 2022 23:02:28 +0000
(08:02 +0900)
committer
Hironori Kitagawa
<h_kitagawa2001@yahoo.co.jp>
Sun, 11 Sep 2022 23:03:42 +0000
(08:03 +0900)
25 files changed:
src/ltjarticle.cls
patch
|
blob
|
history
src/ltjbk10.clo
patch
|
blob
|
history
src/ltjbk11.clo
patch
|
blob
|
history
src/ltjbk12.clo
patch
|
blob
|
history
src/ltjbook.cls
patch
|
blob
|
history
src/ltjclasses.dtx
patch
|
blob
|
history
src/ltjreport.cls
patch
|
blob
|
history
src/ltjsarticle.cls
patch
|
blob
|
history
src/ltjsbook.cls
patch
|
blob
|
history
src/ltjsclasses.dtx
patch
|
blob
|
history
src/ltjsize10.clo
patch
|
blob
|
history
src/ltjsize11.clo
patch
|
blob
|
history
src/ltjsize12.clo
patch
|
blob
|
history
src/ltjskiyou.cls
patch
|
blob
|
history
src/ltjspf.cls
patch
|
blob
|
history
src/ltjsreport.cls
patch
|
blob
|
history
src/ltjtarticle.cls
patch
|
blob
|
history
src/ltjtbk10.clo
patch
|
blob
|
history
src/ltjtbk11.clo
patch
|
blob
|
history
src/ltjtbk12.clo
patch
|
blob
|
history
src/ltjtbook.cls
patch
|
blob
|
history
src/ltjtreport.cls
patch
|
blob
|
history
src/ltjtsize10.clo
patch
|
blob
|
history
src/ltjtsize11.clo
patch
|
blob
|
history
src/ltjtsize12.clo
patch
|
blob
|
history
diff --git
a/src/ltjarticle.cls
b/src/ltjarticle.cls
index
fe5479e
..
0f7b19d
100644
(file)
--- a/
src/ltjarticle.cls
+++ b/
src/ltjarticle.cls
@@
-23,7
+23,7
@@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjarticle}
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjarticle}
- [2022-0
4-11 v1.8f-ltj-22
+ [2022-0
9-12 v1.8f-ltj-23
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@
-152,8
+152,8
@@
\fi
\setlength\columnseprule{0\p@}
\iftombow
\fi
\setlength\columnseprule{0\p@}
\iftombow
- \
newlength{\stockwidth}
- \
newlength{\stockheight}
+ \
ifdefined\stockwidth\else\newlength{\stockwidth}\fi
+ \
ifdefined\stockheight\else\newlength{\stockheight}\fi
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
diff --git
a/src/ltjbk10.clo
b/src/ltjbk10.clo
index
efa8ef2
..
f991153
100644
(file)
--- a/
src/ltjbk10.clo
+++ b/
src/ltjbk10.clo
@@
-23,7
+23,7
@@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk10.clo}
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk10.clo}
- [2022-0
4-11 v1.8f-ltj-22
+ [2022-0
9-12 v1.8f-ltj-23
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
diff --git
a/src/ltjbk11.clo
b/src/ltjbk11.clo
index
43d476b
..
ec5d954
100644
(file)
--- a/
src/ltjbk11.clo
+++ b/
src/ltjbk11.clo
@@
-23,7
+23,7
@@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk11.clo}
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk11.clo}
- [2022-0
4-11 v1.8f-ltj-22
+ [2022-0
9-12 v1.8f-ltj-23
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
diff --git
a/src/ltjbk12.clo
b/src/ltjbk12.clo
index
b6ca4c9
..
12f9562
100644
(file)
--- a/
src/ltjbk12.clo
+++ b/
src/ltjbk12.clo
@@
-23,7
+23,7
@@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk12.clo}
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk12.clo}
- [2022-0
4-11 v1.8f-ltj-22
+ [2022-0
9-12 v1.8f-ltj-23
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
diff --git
a/src/ltjbook.cls
b/src/ltjbook.cls
index
57a12a9
..
492f002
100644
(file)
--- a/
src/ltjbook.cls
+++ b/
src/ltjbook.cls
@@
-23,7
+23,7
@@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjbook}
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjbook}
- [2022-0
4-11 v1.8f-ltj-22
+ [2022-0
9-12 v1.8f-ltj-23
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@
-162,8
+162,8
@@
\fi
\setlength\columnseprule{0\p@}
\iftombow
\fi
\setlength\columnseprule{0\p@}
\iftombow
- \
newlength{\stockwidth}
- \
newlength{\stockheight}
+ \
ifdefined\stockwidth\else\newlength{\stockwidth}\fi
+ \
ifdefined\stockheight\else\newlength{\stockheight}\fi
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
diff --git
a/src/ltjclasses.dtx
b/src/ltjclasses.dtx
index
e2d4dd9
..
39c5a37
100644
(file)
--- a/
src/ltjclasses.dtx
+++ b/
src/ltjclasses.dtx
@@
-139,6
+139,7
@@
% (sync with ltsect.dtx 2020/07/27 v1.1e)}
% \changes{v1.8f-ltj-21}{2021-12-22}{余計なコメントの削除.}
% \changes{v1.8f-ltj-22}{2022-04-11}{kern featureが有効になっていたのを修正.}
% (sync with ltsect.dtx 2020/07/27 v1.1e)}
% \changes{v1.8f-ltj-21}{2021-12-22}{余計なコメントの削除.}
% \changes{v1.8f-ltj-22}{2022-04-11}{kern featureが有効になっていたのを修正.}
+% \changes{v1.8f-ltj-23}{2022-09-12}{|\stockwidth|がカーネルで定義される可能性に対応.}
% \fi
%
% \iffalse
% \fi
%
% \iffalse
@@
-168,7
+169,7
@@
%<11pt&bk>\ProvidesFile{ltjtbk11.clo}
%<12pt&bk>\ProvidesFile{ltjtbk12.clo}
%</tate>
%<11pt&bk>\ProvidesFile{ltjtbk11.clo}
%<12pt&bk>\ProvidesFile{ltjtbk12.clo}
%</tate>
- [2022-0
4-11 v1.8f-ltj-22
+ [2022-0
9-12 v1.8f-ltj-23
%<article|report|book> Standard LuaLaTeX-ja class]
%<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)]
%<*driver>
%<article|report|book> Standard LuaLaTeX-ja class]
%<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)]
%<*driver>
@@
-977,10
+978,13
@@
% [2017-01-17 LTJ] [lt]jsclassesに合わせ、トンボオプションが指定されているとき「だけ」|\stockwidth|、
% |\stockheight|を定義するようにしました。aminophenさん、ありがとうございます。
%
% [2017-01-17 LTJ] [lt]jsclassesに合わせ、トンボオプションが指定されているとき「だけ」|\stockwidth|、
% |\stockheight|を定義するようにしました。aminophenさん、ありがとうございます。
%
+% [2022-09-12 LTJ] \LaTeXeカーネルに|\stockwidth|、|\stockheight|が追加されるようですので、
+% クラスファイル側では未定義のときのみこれらの長さ変数を定義します。h20y6mさん、ありがとうございます。
+%
% \begin{macrocode}
\iftombow
% \begin{macrocode}
\iftombow
- \
newlength{\stockwidth}
- \
newlength{\stockheight}
+ \
ifdefined\stockwidth\else\newlength{\stockwidth}\fi
+ \
ifdefined\stockheight\else\newlength{\stockheight}\fi
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
diff --git
a/src/ltjreport.cls
b/src/ltjreport.cls
index
4fcb494
..
7015898
100644
(file)
--- a/
src/ltjreport.cls
+++ b/
src/ltjreport.cls
@@
-23,7
+23,7
@@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjreport}
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjreport}
- [2022-0
4-11 v1.8f-ltj-22
+ [2022-0
9-12 v1.8f-ltj-23
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@
-160,8
+160,8
@@
\fi
\setlength\columnseprule{0\p@}
\iftombow
\fi
\setlength\columnseprule{0\p@}
\iftombow
- \
newlength{\stockwidth}
- \
newlength{\stockheight}
+ \
ifdefined\stockwidth\else\newlength{\stockwidth}\fi
+ \
ifdefined\stockheight\else\newlength{\stockheight}\fi
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
diff --git
a/src/ltjsarticle.cls
b/src/ltjsarticle.cls
index
ea6dc8c
..
5de7ff1
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}
- [2022/0
4/11
ltjsclasses ]
+ [2022/0
9/12
ltjsclasses ]
\def\jsc@clsname{ltjsarticle}
\def\Cjascale{0.924715}
\RequirePackage{luatexja}
\def\jsc@clsname{ltjsarticle}
\def\Cjascale{0.924715}
\RequirePackage{luatexja}
@@
-249,13
+249,15
@@
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\begingroup\catcode`\%=12\relax
\directlua{
local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536
\begingroup\catcode`\%=12\relax
\directlua{
local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536
+ local floor, cnt_dimen_at = math.floor, luatexbase.registernumber 'dimen@'
+ local print_scaled, sprint = luatexja.print_scaled, tex.sprint
local t = lua.get_functions_table()
t[\the\ltjs@@magnify@font@calc] = function()
local t = lua.get_functions_table()
t[\the\ltjs@@magnify@font@calc] = function()
-
tex.sprint(-2,math.floor(0.5+mpt*getdimen('dimen@'
)))
+
sprint(-2,floor(0.5+mpt*getdimen(cnt_dimen_at
)))
end
function luatexja.ltjs_unmagnify_fsize(a)
end
function luatexja.ltjs_unmagnify_fsize(a)
- local s =
luatexja.print_scaled(math.
floor(0.5+a/mpt*65536))
-
tex.
sprint(-2, (s:match('%.0$')) and s:sub(1,-3) or s )
+ local s =
print_scaled(
floor(0.5+a/mpt*65536))
+ sprint(-2, (s:match('%.0$')) and s:sub(1,-3) or s )
end
}
\endgroup
end
}
\endgroup
@@
-285,8
+287,8
@@
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\newskip\jsc@smallskipamount
\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt
\iftombow
\newskip\jsc@smallskipamount
\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt
\iftombow
- \
newlength{\stockwidth}
- \
newlength{\stockheight}
+ \
ifdefined\stockwidth\else\newlength{\stockwidth}\fi
+ \
ifdefined\stockheight\else\newlength{\stockheight}\fi
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
diff --git
a/src/ltjsbook.cls
b/src/ltjsbook.cls
index
43bedbc
..
9948023
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}
- [2022/0
4/11
ltjsclasses ]
+ [2022/0
9/12
ltjsclasses ]
\def\jsc@clsname{ltjsbook}
\def\Cjascale{0.924715}
\RequirePackage{luatexja}
\def\jsc@clsname{ltjsbook}
\def\Cjascale{0.924715}
\RequirePackage{luatexja}
@@
-257,13
+257,15
@@
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\begingroup\catcode`\%=12\relax
\directlua{
local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536
\begingroup\catcode`\%=12\relax
\directlua{
local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536
+ local floor, cnt_dimen_at = math.floor, luatexbase.registernumber 'dimen@'
+ local print_scaled, sprint = luatexja.print_scaled, tex.sprint
local t = lua.get_functions_table()
t[\the\ltjs@@magnify@font@calc] = function()
local t = lua.get_functions_table()
t[\the\ltjs@@magnify@font@calc] = function()
-
tex.sprint(-2,math.floor(0.5+mpt*getdimen('dimen@'
)))
+
sprint(-2,floor(0.5+mpt*getdimen(cnt_dimen_at
)))
end
function luatexja.ltjs_unmagnify_fsize(a)
end
function luatexja.ltjs_unmagnify_fsize(a)
- local s =
luatexja.print_scaled(math.
floor(0.5+a/mpt*65536))
-
tex.
sprint(-2, (s:match('%.0$')) and s:sub(1,-3) or s )
+ local s =
print_scaled(
floor(0.5+a/mpt*65536))
+ sprint(-2, (s:match('%.0$')) and s:sub(1,-3) or s )
end
}
\endgroup
end
}
\endgroup
@@
-293,8
+295,8
@@
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\newskip\jsc@smallskipamount
\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt
\iftombow
\newskip\jsc@smallskipamount
\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt
\iftombow
- \
newlength{\stockwidth}
- \
newlength{\stockheight}
+ \
ifdefined\stockwidth\else\newlength{\stockwidth}\fi
+ \
ifdefined\stockheight\else\newlength{\stockheight}\fi
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
diff --git
a/src/ltjsclasses.dtx
b/src/ltjsclasses.dtx
index
e190617
..
5d2a15c
100644
(file)
--- a/
src/ltjsclasses.dtx
+++ b/
src/ltjsclasses.dtx
@@
-44,7
+44,7
@@
%<*driver>
\ProvidesFile{ltjsclasses.dtx}
%</driver>
%<*driver>
\ProvidesFile{ltjsclasses.dtx}
%</driver>
- [2022/0
4/11
ltjsclasses ]
+ [2022/0
9/12
ltjsclasses ]
%<*driver>
\IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{}
\documentclass[disablejfam]{ltjsarticle}
%<*driver>
\IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{}
\documentclass[disablejfam]{ltjsarticle}
@@
-808,13
+808,15
@@
\begingroup\catcode`\%=12\relax
\directlua{
local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536
\begingroup\catcode`\%=12\relax
\directlua{
local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536
+ local floor, cnt_dimen_at = math.floor, luatexbase.registernumber 'dimen@'
+ local print_scaled, sprint = luatexja.print_scaled, tex.sprint
local t = lua.get_functions_table()
t[\the\ltjs@@magnify@font@calc] = function()
local t = lua.get_functions_table()
t[\the\ltjs@@magnify@font@calc] = function()
-
tex.sprint(-2,math.floor(0.5+mpt*getdimen('dimen@'
)))
+
sprint(-2,floor(0.5+mpt*getdimen(cnt_dimen_at
)))
end
function luatexja.ltjs_unmagnify_fsize(a)
end
function luatexja.ltjs_unmagnify_fsize(a)
- local s =
luatexja.print_scaled(math.
floor(0.5+a/mpt*65536))
-
tex.
sprint(-2, (s:match('%.0$')) and s:sub(1,-3) or s )
+ local s =
print_scaled(
floor(0.5+a/mpt*65536))
+ sprint(-2, (s:match('%.0$')) and s:sub(1,-3) or s )
end
}
\endgroup
end
}
\endgroup
@@
-892,10
+894,13
@@
% [2017-01-11] トンボオプションが指定されているとき「だけ」|\stockwidth|,
% |\stockheight|を定義するようにしました。
%
% [2017-01-11] トンボオプションが指定されているとき「だけ」|\stockwidth|,
% |\stockheight|を定義するようにしました。
%
+% [2022-09-12 LTJ] \LaTeXeカーネルに|\stockwidth|、|\stockheight|が追加されるようですので、
+% クラスファイル側では未定義のときのみこれらの長さ変数を定義します。h20y6mさん、ありがとうございます。
+%
% \begin{macrocode}
\iftombow
% \begin{macrocode}
\iftombow
- \
newlength{\stockwidth}
- \
newlength{\stockheight}
+ \
ifdefined\stockwidth\else\newlength{\stockwidth}\fi
+ \
ifdefined\stockheight\else\newlength{\stockheight}\fi
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
diff --git
a/src/ltjsize10.clo
b/src/ltjsize10.clo
index
86dec80
..
1a7730f
100644
(file)
--- a/
src/ltjsize10.clo
+++ b/
src/ltjsize10.clo
@@
-23,7
+23,7
@@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize10.clo}
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize10.clo}
- [2022-0
4-11 v1.8f-ltj-22
+ [2022-0
9-12 v1.8f-ltj-23
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
diff --git
a/src/ltjsize11.clo
b/src/ltjsize11.clo
index
09fdbba
..
8d54bfb
100644
(file)
--- a/
src/ltjsize11.clo
+++ b/
src/ltjsize11.clo
@@
-23,7
+23,7
@@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize11.clo}
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize11.clo}
- [2022-0
4-11 v1.8f-ltj-22
+ [2022-0
9-12 v1.8f-ltj-23
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
diff --git
a/src/ltjsize12.clo
b/src/ltjsize12.clo
index
a14fe5b
..
7bb389a
100644
(file)
--- a/
src/ltjsize12.clo
+++ b/
src/ltjsize12.clo
@@
-23,7
+23,7
@@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize12.clo}
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize12.clo}
- [2022-0
4-11 v1.8f-ltj-22
+ [2022-0
9-12 v1.8f-ltj-23
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
diff --git
a/src/ltjskiyou.cls
b/src/ltjskiyou.cls
index
be94fcc
..
231be8b
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}
- [2022/0
4/11
ltjsclasses ]
+ [2022/0
9/12
ltjsclasses ]
\def\jsc@clsname{ltjskiyou}
\def\Cjascale{0.924715}
\RequirePackage{luatexja}
\def\jsc@clsname{ltjskiyou}
\def\Cjascale{0.924715}
\RequirePackage{luatexja}
@@
-248,13
+248,15
@@
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\begingroup\catcode`\%=12\relax
\directlua{
local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536
\begingroup\catcode`\%=12\relax
\directlua{
local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536
+ local floor, cnt_dimen_at = math.floor, luatexbase.registernumber 'dimen@'
+ local print_scaled, sprint = luatexja.print_scaled, tex.sprint
local t = lua.get_functions_table()
t[\the\ltjs@@magnify@font@calc] = function()
local t = lua.get_functions_table()
t[\the\ltjs@@magnify@font@calc] = function()
-
tex.sprint(-2,math.floor(0.5+mpt*getdimen('dimen@'
)))
+
sprint(-2,floor(0.5+mpt*getdimen(cnt_dimen_at
)))
end
function luatexja.ltjs_unmagnify_fsize(a)
end
function luatexja.ltjs_unmagnify_fsize(a)
- local s =
luatexja.print_scaled(math.
floor(0.5+a/mpt*65536))
-
tex.
sprint(-2, (s:match('%.0$')) and s:sub(1,-3) or s )
+ local s =
print_scaled(
floor(0.5+a/mpt*65536))
+ sprint(-2, (s:match('%.0$')) and s:sub(1,-3) or s )
end
}
\endgroup
end
}
\endgroup
@@
-284,8
+286,8
@@
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\newskip\jsc@smallskipamount
\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt
\iftombow
\newskip\jsc@smallskipamount
\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt
\iftombow
- \
newlength{\stockwidth}
- \
newlength{\stockheight}
+ \
ifdefined\stockwidth\else\newlength{\stockwidth}\fi
+ \
ifdefined\stockheight\else\newlength{\stockheight}\fi
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
diff --git
a/src/ltjspf.cls
b/src/ltjspf.cls
index
f4f11d0
..
2723db7
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}
- [2022/0
4/11
ltjsclasses ]
+ [2022/0
9/12
ltjsclasses ]
\def\jsc@clsname{ltjspf}
\def\Cjascale{0.903375}
\RequirePackage{luatexja}
\def\jsc@clsname{ltjspf}
\def\Cjascale{0.903375}
\RequirePackage{luatexja}
@@
-247,13
+247,15
@@
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\begingroup\catcode`\%=12\relax
\directlua{
local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536
\begingroup\catcode`\%=12\relax
\directlua{
local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536
+ local floor, cnt_dimen_at = math.floor, luatexbase.registernumber 'dimen@'
+ local print_scaled, sprint = luatexja.print_scaled, tex.sprint
local t = lua.get_functions_table()
t[\the\ltjs@@magnify@font@calc] = function()
local t = lua.get_functions_table()
t[\the\ltjs@@magnify@font@calc] = function()
-
tex.sprint(-2,math.floor(0.5+mpt*getdimen('dimen@'
)))
+
sprint(-2,floor(0.5+mpt*getdimen(cnt_dimen_at
)))
end
function luatexja.ltjs_unmagnify_fsize(a)
end
function luatexja.ltjs_unmagnify_fsize(a)
- local s =
luatexja.print_scaled(math.
floor(0.5+a/mpt*65536))
-
tex.
sprint(-2, (s:match('%.0$')) and s:sub(1,-3) or s )
+ local s =
print_scaled(
floor(0.5+a/mpt*65536))
+ sprint(-2, (s:match('%.0$')) and s:sub(1,-3) or s )
end
}
\endgroup
end
}
\endgroup
@@
-283,8
+285,8
@@
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\newskip\jsc@smallskipamount
\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt
\iftombow
\newskip\jsc@smallskipamount
\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt
\iftombow
- \
newlength{\stockwidth}
- \
newlength{\stockheight}
+ \
ifdefined\stockwidth\else\newlength{\stockwidth}\fi
+ \
ifdefined\stockheight\else\newlength{\stockheight}\fi
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
diff --git
a/src/ltjsreport.cls
b/src/ltjsreport.cls
index
6f5a71a
..
5fb4691
100644
(file)
--- a/
src/ltjsreport.cls
+++ b/
src/ltjsreport.cls
@@
-38,7
+38,7
@@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsreport}
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsreport}
- [2022/0
4/11
ltjsclasses ]
+ [2022/0
9/12
ltjsclasses ]
\def\jsc@clsname{ltjsreport}
\def\Cjascale{0.924715}
\RequirePackage{luatexja}
\def\jsc@clsname{ltjsreport}
\def\Cjascale{0.924715}
\RequirePackage{luatexja}
@@
-253,13
+253,15
@@
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\begingroup\catcode`\%=12\relax
\directlua{
local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536
\begingroup\catcode`\%=12\relax
\directlua{
local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536
+ local floor, cnt_dimen_at = math.floor, luatexbase.registernumber 'dimen@'
+ local print_scaled, sprint = luatexja.print_scaled, tex.sprint
local t = lua.get_functions_table()
t[\the\ltjs@@magnify@font@calc] = function()
local t = lua.get_functions_table()
t[\the\ltjs@@magnify@font@calc] = function()
-
tex.sprint(-2,math.floor(0.5+mpt*getdimen('dimen@'
)))
+
sprint(-2,floor(0.5+mpt*getdimen(cnt_dimen_at
)))
end
function luatexja.ltjs_unmagnify_fsize(a)
end
function luatexja.ltjs_unmagnify_fsize(a)
- local s =
luatexja.print_scaled(math.
floor(0.5+a/mpt*65536))
-
tex.
sprint(-2, (s:match('%.0$')) and s:sub(1,-3) or s )
+ local s =
print_scaled(
floor(0.5+a/mpt*65536))
+ sprint(-2, (s:match('%.0$')) and s:sub(1,-3) or s )
end
}
\endgroup
end
}
\endgroup
@@
-289,8
+291,8
@@
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\newskip\jsc@smallskipamount
\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt
\iftombow
\newskip\jsc@smallskipamount
\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt
\iftombow
- \
newlength{\stockwidth}
- \
newlength{\stockheight}
+ \
ifdefined\stockwidth\else\newlength{\stockwidth}\fi
+ \
ifdefined\stockheight\else\newlength{\stockheight}\fi
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
diff --git
a/src/ltjtarticle.cls
b/src/ltjtarticle.cls
index
dda265d
..
21a647a
100644
(file)
--- a/
src/ltjtarticle.cls
+++ b/
src/ltjtarticle.cls
@@
-23,7
+23,7
@@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtarticle}
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtarticle}
- [2022-0
4-11 v1.8f-ltj-22
+ [2022-0
9-12 v1.8f-ltj-23
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@
-153,8
+153,8
@@
\fi
\setlength\columnseprule{0\p@}
\iftombow
\fi
\setlength\columnseprule{0\p@}
\iftombow
- \
newlength{\stockwidth}
- \
newlength{\stockheight}
+ \
ifdefined\stockwidth\else\newlength{\stockwidth}\fi
+ \
ifdefined\stockheight\else\newlength{\stockheight}\fi
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
diff --git
a/src/ltjtbk10.clo
b/src/ltjtbk10.clo
index
c054ab7
..
1d637ab
100644
(file)
--- a/
src/ltjtbk10.clo
+++ b/
src/ltjtbk10.clo
@@
-23,7
+23,7
@@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk10.clo}
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk10.clo}
- [2022-0
4-11 v1.8f-ltj-22
+ [2022-0
9-12 v1.8f-ltj-23
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
diff --git
a/src/ltjtbk11.clo
b/src/ltjtbk11.clo
index
1a17e33
..
3c0c1e5
100644
(file)
--- a/
src/ltjtbk11.clo
+++ b/
src/ltjtbk11.clo
@@
-23,7
+23,7
@@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk11.clo}
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk11.clo}
- [2022-0
4-11 v1.8f-ltj-22
+ [2022-0
9-12 v1.8f-ltj-23
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
diff --git
a/src/ltjtbk12.clo
b/src/ltjtbk12.clo
index
8490cc9
..
48d7a64
100644
(file)
--- a/
src/ltjtbk12.clo
+++ b/
src/ltjtbk12.clo
@@
-23,7
+23,7
@@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk12.clo}
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk12.clo}
- [2022-0
4-11 v1.8f-ltj-22
+ [2022-0
9-12 v1.8f-ltj-23
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
diff --git
a/src/ltjtbook.cls
b/src/ltjtbook.cls
index
ab69121
..
4243dcf
100644
(file)
--- a/
src/ltjtbook.cls
+++ b/
src/ltjtbook.cls
@@
-23,7
+23,7
@@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtbook}
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtbook}
- [2022-0
4-11 v1.8f-ltj-22
+ [2022-0
9-12 v1.8f-ltj-23
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@
-163,8
+163,8
@@
\fi
\setlength\columnseprule{0\p@}
\iftombow
\fi
\setlength\columnseprule{0\p@}
\iftombow
- \
newlength{\stockwidth}
- \
newlength{\stockheight}
+ \
ifdefined\stockwidth\else\newlength{\stockwidth}\fi
+ \
ifdefined\stockheight\else\newlength{\stockheight}\fi
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
diff --git
a/src/ltjtreport.cls
b/src/ltjtreport.cls
index
7042c0a
..
05847ad
100644
(file)
--- a/
src/ltjtreport.cls
+++ b/
src/ltjtreport.cls
@@
-23,7
+23,7
@@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtreport}
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtreport}
- [2022-0
4-11 v1.8f-ltj-22
+ [2022-0
9-12 v1.8f-ltj-23
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@
-161,8
+161,8
@@
\fi
\setlength\columnseprule{0\p@}
\iftombow
\fi
\setlength\columnseprule{0\p@}
\iftombow
- \
newlength{\stockwidth}
- \
newlength{\stockheight}
+ \
ifdefined\stockwidth\else\newlength{\stockwidth}\fi
+ \
ifdefined\stockheight\else\newlength{\stockheight}\fi
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
\setlength{\stockwidth}{\paperwidth}
\setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
diff --git
a/src/ltjtsize10.clo
b/src/ltjtsize10.clo
index
c0d9d81
..
5df2dc3
100644
(file)
--- a/
src/ltjtsize10.clo
+++ b/
src/ltjtsize10.clo
@@
-23,7
+23,7
@@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize10.clo}
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize10.clo}
- [2022-0
4-11 v1.8f-ltj-22
+ [2022-0
9-12 v1.8f-ltj-23
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
diff --git
a/src/ltjtsize11.clo
b/src/ltjtsize11.clo
index
2df513b
..
d6bfbd0
100644
(file)
--- a/
src/ltjtsize11.clo
+++ b/
src/ltjtsize11.clo
@@
-23,7
+23,7
@@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize11.clo}
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize11.clo}
- [2022-0
4-11 v1.8f-ltj-22
+ [2022-0
9-12 v1.8f-ltj-23
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
diff --git
a/src/ltjtsize12.clo
b/src/ltjtsize12.clo
index
69079d5
..
a3fb5a9
100644
(file)
--- a/
src/ltjtsize12.clo
+++ b/
src/ltjtsize12.clo
@@
-23,7
+23,7
@@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize12.clo}
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize12.clo}
- [2022-0
4-11 v1.8f-ltj-22
+ [2022-0
9-12 v1.8f-ltj-23
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%