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:
36e4d78
)
ltj_jfmglue: local_par is no longer whatsit
author
Hironori Kitagawa
<h_kitagawa2001@yahoo.co.jp>
Wed, 3 Feb 2016 21:08:59 +0000
(06:08 +0900)
committer
Hironori Kitagawa
<h_kitagawa2001@yahoo.co.jp>
Wed, 3 Feb 2016 21:08:59 +0000
(06:08 +0900)
doc/ltjsclasses.pdf
patch
|
blob
|
history
src/ltj-jfmglue.lua
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
diff --git
a/doc/ltjsclasses.pdf
b/doc/ltjsclasses.pdf
index
07b02b8
..
cf063a9
100644
(file)
Binary files a/doc/ltjsclasses.pdf and b/doc/ltjsclasses.pdf differ
diff --git
a/src/ltj-jfmglue.lua
b/src/ltj-jfmglue.lua
index
12f350a
..
a63c270
100644
(file)
--- a/
src/ltj-jfmglue.lua
+++ b/
src/ltj-jfmglue.lua
@@
-1101,6
+1101,7
@@
end
-- return value: (the initial cursor lp), (last node)
local init_var
do
-- return value: (the initial cursor lp), (last node)
local init_var
do
+ local id_local = node.id('local_par')
local KANJI_SKIP = luatexja.icflag_table.KANJI_SKIP
local XKANJI_SKIP = luatexja.icflag_table.XKANJI_SKIP
local KSK = luatexja.stack_table_index.KSK
local KANJI_SKIP = luatexja.icflag_table.KANJI_SKIP
local XKANJI_SKIP = luatexja.icflag_table.XKANJI_SKIP
local KSK = luatexja.stack_table_index.KSK
@@
-1151,8
+1152,10
@@
do
-- the current list is to be line-breaked:
-- hbox from \parindent is skipped.
local lp, par_indented, lpi, lps = head, 'boxbdd', getid(head), getsubtype(head)
-- the current list is to be line-breaked:
-- hbox from \parindent is skipped.
local lp, par_indented, lpi, lps = head, 'boxbdd', getid(head), getsubtype(head)
- while lp and ((lpi==id_whatsit and lps~=sid_user)
- or ((lpi==id_hlist) and (lps==3))) do
+ while lp and
+ ((lpi==id_whatsit and lps~=sid_user)
+ or ((lpi==id_hlist) and (lps==3))
+ or (lpi==id_local)) do
if (lpi==id_hlist) and (lps==3) then
Np.char, par_indented = 'parbdd', 'parbdd'
Np.width = getfield(lp, 'width')
if (lpi==id_hlist) and (lps==3) then
Np.char, par_indented = 'parbdd', 'parbdd'
Np.width = getfield(lp, 'width')
diff --git
a/src/ltjsarticle.cls
b/src/ltjsarticle.cls
index
2f93ffc
..
081136e
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}
- [201
6/01/31
]
+ [201
5/10/18
]
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
@@
-295,18
+295,16
@@
\fi
\setlength\paperwidth{\inv@mag\paperwidth}%
\setlength\paperheight{\inv@mag\paperheight}%
\fi
\setlength\paperwidth{\inv@mag\paperwidth}%
\setlength\paperheight{\inv@mag\paperheight}%
+\setlength{\@tempdima}{\paperwidth}
+\setlength{\@tempdimb}{\paperheight}
+\iftombow
+ \advance \@tempdima 2in
+ \advance \@tempdimb 2in
+\fi
\ifdefined\pdfpagewidth
\ifdefined\pdfpagewidth
- \iftombow
- \advance \@tempdima 2in
- \advance \@tempdimb 2in
- \fi
\setlength{\pdfpagewidth}{\@tempdima}
\setlength{\pdfpageheight}{\@tempdimb}
\else
\setlength{\pdfpagewidth}{\@tempdima}
\setlength{\pdfpageheight}{\@tempdimb}
\else
- \iftombow
- \advance \@tempdima 2in
- \advance \@tempdimb 2in
- \fi
\setlength{\pagewidth}{\@tempdima}
\setlength{\pageheight}{\@tempdimb}
\fi
\setlength{\pagewidth}{\@tempdima}
\setlength{\pageheight}{\@tempdimb}
\fi
diff --git
a/src/ltjsbook.cls
b/src/ltjsbook.cls
index
01c5cc2
..
8cbba92
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}
- [201
6/01/31
]
+ [201
5/10/18
]
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
@@
-302,18
+302,16
@@
\fi
\setlength\paperwidth{\inv@mag\paperwidth}%
\setlength\paperheight{\inv@mag\paperheight}%
\fi
\setlength\paperwidth{\inv@mag\paperwidth}%
\setlength\paperheight{\inv@mag\paperheight}%
+\setlength{\@tempdima}{\paperwidth}
+\setlength{\@tempdimb}{\paperheight}
+\iftombow
+ \advance \@tempdima 2in
+ \advance \@tempdimb 2in
+\fi
\ifdefined\pdfpagewidth
\ifdefined\pdfpagewidth
- \iftombow
- \advance \@tempdima 2in
- \advance \@tempdimb 2in
- \fi
\setlength{\pdfpagewidth}{\@tempdima}
\setlength{\pdfpageheight}{\@tempdimb}
\else
\setlength{\pdfpagewidth}{\@tempdima}
\setlength{\pdfpageheight}{\@tempdimb}
\else
- \iftombow
- \advance \@tempdima 2in
- \advance \@tempdimb 2in
- \fi
\setlength{\pagewidth}{\@tempdima}
\setlength{\pageheight}{\@tempdimb}
\fi
\setlength{\pagewidth}{\@tempdima}
\setlength{\pageheight}{\@tempdimb}
\fi
diff --git
a/src/ltjsclasses.dtx
b/src/ltjsclasses.dtx
index
3199fc9
..
a3a3c6e
100644
(file)
--- a/
src/ltjsclasses.dtx
+++ b/
src/ltjsclasses.dtx
@@
-50,7
+50,7
@@
%<*driver>
\ProvidesFile{ltjsclasses.dtx}
%</driver>
%<*driver>
\ProvidesFile{ltjsclasses.dtx}
%</driver>
- [201
6/01/31
]
+ [201
5/10/18
]
%<*driver>
\documentclass{ltjsarticle}
\usepackage{doc}
%<*driver>
\documentclass{ltjsarticle}
\usepackage{doc}
@@
-720,21
+720,17
@@
%
% [2015-10-18 LTJ] Lua\TeX\ 0.81.0ではプリミティブの名称変更がされたので,
% それに合わせておきます.
%
% [2015-10-18 LTJ] Lua\TeX\ 0.81.0ではプリミティブの名称変更がされたので,
% それに合わせておきます.
-%
-% [2016-01-31 LTJ] [2015-10-18]の処理は不完全でした.
% \begin{macrocode}
% \begin{macrocode}
+\setlength{\@tempdima}{\paperwidth}
+\setlength{\@tempdimb}{\paperheight}
+\iftombow
+ \advance \@tempdima 2in
+ \advance \@tempdimb 2in
+\fi
\ifdefined\pdfpagewidth
\ifdefined\pdfpagewidth
- \iftombow
- \advance \@tempdima 2in
- \advance \@tempdimb 2in
- \fi
\setlength{\pdfpagewidth}{\@tempdima}
\setlength{\pdfpageheight}{\@tempdimb}
\else
\setlength{\pdfpagewidth}{\@tempdima}
\setlength{\pdfpageheight}{\@tempdimb}
\else
- \iftombow
- \advance \@tempdima 2in
- \advance \@tempdimb 2in
- \fi
\setlength{\pagewidth}{\@tempdima}
\setlength{\pageheight}{\@tempdimb}
\fi
\setlength{\pagewidth}{\@tempdima}
\setlength{\pageheight}{\@tempdimb}
\fi
diff --git
a/src/ltjskiyou.cls
b/src/ltjskiyou.cls
index
9fd0845
..
93db07e
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}
- [201
6/01/31
]
+ [201
5/10/18
]
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
@@
-297,18
+297,16
@@
\def\inv@mag{1.02354}
\setlength\paperwidth{\inv@mag\paperwidth}%
\setlength\paperheight{\inv@mag\paperheight}%
\def\inv@mag{1.02354}
\setlength\paperwidth{\inv@mag\paperwidth}%
\setlength\paperheight{\inv@mag\paperheight}%
+\setlength{\@tempdima}{\paperwidth}
+\setlength{\@tempdimb}{\paperheight}
+\iftombow
+ \advance \@tempdima 2in
+ \advance \@tempdimb 2in
+\fi
\ifdefined\pdfpagewidth
\ifdefined\pdfpagewidth
- \iftombow
- \advance \@tempdima 2in
- \advance \@tempdimb 2in
- \fi
\setlength{\pdfpagewidth}{\@tempdima}
\setlength{\pdfpageheight}{\@tempdimb}
\else
\setlength{\pdfpagewidth}{\@tempdima}
\setlength{\pdfpageheight}{\@tempdimb}
\else
- \iftombow
- \advance \@tempdima 2in
- \advance \@tempdimb 2in
- \fi
\setlength{\pagewidth}{\@tempdima}
\setlength{\pageheight}{\@tempdimb}
\fi
\setlength{\pagewidth}{\@tempdima}
\setlength{\pageheight}{\@tempdimb}
\fi
diff --git
a/src/ltjspf.cls
b/src/ltjspf.cls
index
c82c2c3
..
638ee8f
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}
- [201
6/01/31
]
+ [201
5/10/18
]
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
@@
-295,18
+295,16
@@
\fi
\setlength\paperwidth{\inv@mag\paperwidth}%
\setlength\paperheight{\inv@mag\paperheight}%
\fi
\setlength\paperwidth{\inv@mag\paperwidth}%
\setlength\paperheight{\inv@mag\paperheight}%
+\setlength{\@tempdima}{\paperwidth}
+\setlength{\@tempdimb}{\paperheight}
+\iftombow
+ \advance \@tempdima 2in
+ \advance \@tempdimb 2in
+\fi
\ifdefined\pdfpagewidth
\ifdefined\pdfpagewidth
- \iftombow
- \advance \@tempdima 2in
- \advance \@tempdimb 2in
- \fi
\setlength{\pdfpagewidth}{\@tempdima}
\setlength{\pdfpageheight}{\@tempdimb}
\else
\setlength{\pdfpagewidth}{\@tempdima}
\setlength{\pdfpageheight}{\@tempdimb}
\else
- \iftombow
- \advance \@tempdima 2in
- \advance \@tempdimb 2in
- \fi
\setlength{\pagewidth}{\@tempdima}
\setlength{\pageheight}{\@tempdimb}
\fi
\setlength{\pagewidth}{\@tempdima}
\setlength{\pageheight}{\@tempdimb}
\fi