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:
3d508c0
)
sync lltjext.sty with platex/7c56cb02
author
Hironori Kitagawa
<h_kitagawa2001@yahoo.co.jp>
Thu, 24 Nov 2016 10:18:11 +0000
(19:18 +0900)
committer
Hironori Kitagawa
<h_kitagawa2001@yahoo.co.jp>
Thu, 24 Nov 2016 10:18:11 +0000
(19:18 +0900)
src/lltjext.sty
patch
|
blob
|
history
diff --git
a/src/lltjext.sty
b/src/lltjext.sty
index
79030f7
..
b2d5f96
100644
(file)
--- a/
src/lltjext.sty
+++ b/
src/lltjext.sty
@@
-23,7
+23,9
@@
{\p@tabarray}{\p@tabarray<Z>}}
\def\X@tabular{\@ifnextchar<%>
{\p@tabular}{\p@tabular<Z>}}
{\p@tabarray}{\p@tabarray<Z>}}
\def\X@tabular{\@ifnextchar<%>
{\p@tabular}{\p@tabular<Z>}}
-\def\@stabular<#1>#2{\def\@halignto{to#2}\p@tabular<#1>}
+\def\@stabular<#1>#2{%
+ \setlength\dimen@{#2}%
+ \edef\@halignto{to\the\dimen@}\p@tabular<#1>}
\def\p@tabular<#1>{\leavevmode \hbox \bgroup
\count@=\ltjgetparameter{direction}$\let\@acol\@tabacol
\let\@classz\@tabclassz
\def\p@tabular<#1>{\leavevmode \hbox \bgroup
\count@=\ltjgetparameter{direction}$\let\@acol\@tabacol
\let\@classz\@tabclassz
@@
-302,9
+304,9
@@
\def\minipage{\@ifnextchar<%>
{\X@minipage}{\X@minipage<Z>}}
\def\X@minipage<#1>{\@ifnextchar[%]
\def\minipage{\@ifnextchar<%>
{\X@minipage}{\X@minipage<Z>}}
\def\X@minipage<#1>{\@ifnextchar[%]
- {\@iminipage<#1>}{\@iiiminipage<#1>{c}\
@empty
[s]}}
+ {\@iminipage<#1>}{\@iiiminipage<#1>{c}\
relax
[s]}}
\def\@iminipage<#1>[#2]{\@ifnextchar[%]
\def\@iminipage<#1>[#2]{\@ifnextchar[%]
- {\@iiminipage<#1>{#2}}{\@iiiminipage<#1>{#2}\
@empty
[s]}}
+ {\@iiminipage<#1>{#2}}{\@iiiminipage<#1>{#2}\
relax
[s]}}
\def\@iiminipage<#1>#2[#3]{\@ifnextchar[%]
{\@iiiminipage<#1>{#2}{#3}}{\@iiiminipage<#1>{#2}{#3}[#2]}}
\def\@iiiminipage<#1>#2#3[#4]#5{%
\def\@iiminipage<#1>#2[#3]{\@ifnextchar[%]
{\@iiiminipage<#1>{#2}{#3}}{\@iiiminipage<#1>{#2}{#3}[#2]}}
\def\@iiiminipage<#1>#2#3[#4]#5{%
@@
-342,8
+344,7
@@
\let\@footnotetext\@mpfootnotetext
\let\@listdepth\@mplistdepth \@mplistdepth\z@
\@minipagerestore
\let\@footnotetext\@mpfootnotetext
\let\@listdepth\@mplistdepth \@mplistdepth\z@
\@minipagerestore
- \global\@minipagetrue %% \global added 24 May 89
- \everypar{\global\@minipagefalse\everypar{}}}
+ \@setminipage}
\def\endminipage{%
\par
\unskip
\def\endminipage{%
\par
\unskip
@@
-353,16
+354,16
@@
\footnoterule
\unvbox\@mpfootins
\fi
\footnoterule
\unvbox\@mpfootins
\fi
- \
global\
@minipagefalse %% added 24 May 89
+ \@minipagefalse %% added 24 May 89
\color@endgroup
\egroup
\expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}\egroup}
\def\parbox{\@ifnextchar<%>
{\X@parbox}{\X@parbox<Z>}}
\def\X@parbox<#1>{\@ifnextchar[%]
\color@endgroup
\egroup
\expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}\egroup}
\def\parbox{\@ifnextchar<%>
{\X@parbox}{\X@parbox<Z>}}
\def\X@parbox<#1>{\@ifnextchar[%]
- {\@iparbox<#1>}{\@iiiparbox<#1>{c}\
@empty
[s]}}
+ {\@iparbox<#1>}{\@iiiparbox<#1>{c}\
relax
[s]}}
\def\@iparbox<#1>[#2]{\@ifnextchar[%]
\def\@iparbox<#1>[#2]{\@ifnextchar[%]
- {\@iiparbox<#1>{#2}}{\@iiiparbox<#1>{#2}\
@empty
[s]}}
+ {\@iiparbox<#1>{#2}}{\@iiiparbox<#1>{#2}\
relax
[s]}}
\def\@iiparbox<#1>#2[#3]{\@ifnextchar[%]%
{\@iiiparbox<#1>{#2}{#3}}{\@iiiparbox<#1>{#2}{#3}[#2]}}
\long\def\@iiiparbox<#1>#2#3[#4]#5#6{%
\def\@iiparbox<#1>#2[#3]{\@ifnextchar[%]%
{\@iiiparbox<#1>{#2}{#3}}{\@iiiparbox<#1>{#2}{#3}[#2]}}
\long\def\@iiiparbox<#1>#2#3[#4]#5#6{%
@@
-370,10
+371,10
@@
\setlength\@tempdima{#5}%
\fork@parbox@option<#1>[#2]%
\@begin@tempboxa\vbox{\box@dir
\setlength\@tempdima{#5}%
\fork@parbox@option<#1>[#2]%
\@begin@tempboxa\vbox{\box@dir
- \hsize\@tempdima\@parboxrestore\adjustbaseline#6\
endgraf
}%
- \ifx\
@empty
#3\relax\else
+ \hsize\@tempdima\@parboxrestore\adjustbaseline#6\
@@par
}%
+ \ifx\
relax
#3\relax\else
\setlength\@tempdimb{#3}%
\setlength\@tempdimb{#3}%
- \
def\@parboxto{to
\@tempdimb}%
+ \
edef\@parboxto{to\the
\@tempdimb}%
\fi
\@begin@parbox\@parboxto{\box@dir\adjustbaseline
\let\hss\vss\let\unhbox\unvbox
\fi
\@begin@parbox\@parboxto{\box@dir\adjustbaseline
\let\hss\vss\let\unhbox\unvbox
@@
-609,10
+610,10
@@
\DeclareRobustCommand\rensuji{%
\@ifstar{\not@advancelinetrue\@rensuji}{\@rensuji}}
\def\@rensuji{\@ifnextchar[{\@@rensuji}{\@@rensuji[c]}}
\DeclareRobustCommand\rensuji{%
\@ifstar{\not@advancelinetrue\@rensuji}{\@rensuji}}
\def\@rensuji{\@ifnextchar[{\@@rensuji}{\@@rensuji[c]}}
-\def\@@rensuji[#1]#2{\ifnum\ltjgetparameter{direction}=4\relax%
- \hbox{#2}\else
- \hskip\rensujiskip
+\def\@@rensuji[#1]#2{%
\ifvmode\leavevmode\fi
\ifvmode\leavevmode\fi
+ \ifnum\ltjgetparameter{direction}=4\relax\hbox{#2}\else
+ \hskip\rensujiskip
\setbox\tw@\hbox{漢}% 「あ」では仮名書体使用時がまずそう
\@tempdimb\ltjgetht\tw@ \advance\@tempdimb\ltjgetdp\tw@
\ifnot@advanceline\not@advancelinefalse\else
\setbox\tw@\hbox{漢}% 「あ」では仮名書体使用時がまずそう
\@tempdimb\ltjgetht\tw@ \advance\@tempdimb\ltjgetdp\tw@
\ifnot@advanceline\not@advancelinefalse\else
@@
-762,5
+763,9
@@
\AtEndOfPackageFile{array}{\ltj@lltjext@patch@array}
}
\AtEndOfPackageFile{array}{\ltj@lltjext@patch@array}
}
+%%%%%%%%%%%%%%%% LuaTeX-ja original
+
+\define@key[ltj]{japaram}{autouprightnum}{% %COUNT
+ \ltj@@set@stack{AURN}{0}{10000}\z@#1 }
\endinput
\endinput