diff options
author | Karl Berry <karl@freefriends.org> | 2018-01-21 22:34:29 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-01-21 22:34:29 +0000 |
commit | d09ad8b89dbedfbe939605baf5380584077e4584 (patch) | |
tree | 43fa343e175662ff442d3c068767d18a9a5ec07f /Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty | |
parent | 12752728bebf1cd785fc968fffcc83e8da4989c4 (diff) |
luatexja (21jan18)
git-svn-id: svn://tug.org/texlive/trunk@46405 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty index 14e46b3bd67..678556e55ef 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty @@ -3,14 +3,25 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjp-geometry}[2017/05/05 Patch to geometry for LuaTeX-ja with vertical writing mode] -\RequirePackage{ifluatex} - +\ProvidesPackage{lltjp-geometry}[2018/01/19 Patch to geometry for LuaTeX-ja with vertical writing mode] \ifdefined\if@ltj@@geometry@tate\expandafter\endinput\fi \newif\if@ltj@@geometry@tate +\newif\if@ltj@@geometry@forceoff \@ltj@@geometry@tatefalse -\ifluatex\else % pTeX - \@ltj@@geometry@tatetrue +\@ltj@@geometry@forceofffalse +\DeclareOption{force}{\@ltj@@geometry@tatetrue} +\DeclareOption{disable}{\@ltj@@geometry@forceofftrue} + +\ProcessOptions\relax + +\RequirePackage{ifluatex} +\ifluatex + \ifdefined\luatexjaLoaded\else + \PackageError{lltjp-geometry}{% + lltjp-geometry does not work without luatexja. + }{} +\fi +\else % pTeX \def \AtBeginDvi #1{% \global \setbox \@begindvibox \vbox{\yoko\unvbox \@begindvibox #1}% @@ -30,9 +41,16 @@ \edef\Gm@ltj@footskip{\the\footskip} \ifluatex \ifnum\ltjgetparameter{direction}=3 \@ltj@@geometry@tatetrue\fi +\else + \@gobble\iftrue\csname iftdir\endcsname\@ltj@@geometry@tatetrue\fi \fi +\patchcmd\@begindocumenthook{\tate}{\tate}{\@ltj@@geometry@tatetrue}{}% \if@ltj@@geometry@tate - \let\PackageWarningNoLine\@gobbletwo% 警告抑止 + \if@ltj@@geometry@forceoff + \@ltj@@geometry@tatefalse + \else + \let\PackageWarningNoLine\@gobbletwo% 警告抑止 + \fi \fi } \AtEndOfPackageFile{geometry}{% |