diff options
author | Karl Berry <karl@freefriends.org> | 2016-10-17 21:25:44 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-10-17 21:25:44 +0000 |
commit | fd53574128b6dde54f5f7cbf551d5a1cd1703e48 (patch) | |
tree | ab000103c2da0fecb7d0e46eab49473294902535 /Master/texmf-dist/tex/luatex/luatexja/patches | |
parent | 0ef9e5e0733974cb6927cb3512c75165998e0b59 (diff) |
luatexja (17oct16)
git-svn-id: svn://tug.org/texlive/trunk@42295 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/patches')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty | 44 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty | 23 |
2 files changed, 17 insertions, 50 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty index b679d5a436e..2aaa9d6eed8 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjp-fontspec}[2016/03/31 Patch to fontspec for LuaTeX-ja] +\ProvidesPackage{lltjp-fontspec}[2016/10/12 Patch to fontspec for LuaTeX-ja] \RequirePackage{fontspec,luatexja} \ExplSyntaxOn @@ -24,48 +24,6 @@ } -\cs_set_eq:NN \ltj_orig_fontspec_setup_maths: \fontspec_setup_maths: -\cs_set:Nn \fontspec_setup_maths: - { - \group_begin: - \cs_set:Npn \DeclareMathSymbol##1##2##3##4{% - \expandafter\in@\csname sym##3\expandafter\endcsname - \expandafter{\group@list}% - \ifin@ - \begingroup - \count\z@=##4\relax - \count\tw@\count\z@ - \divide\count\z@\sixt@@n - \count@\count\z@ - \multiply\count@\sixt@@n - \advance\count\tw@-\count@ - \if\relax\noexpand##1% is command? - \edef\reserved@a{\noexpand\in@{\string\mathchar}{\meaning##1}}% - \reserved@a - \ifin@ - \expandafter\set@mathsymbol - \csname sym##3\endcsname##1##2% - {\hexnumber@{\count\z@}\hexnumber@{\count\tw@}}% - \@font@info{Redeclaring math symbol \string##1}% - \else - \expandafter\set@mathsymbol - \csname sym##3\endcsname##1##2% - {\hexnumber@{\count\z@}\hexnumber@{\count\tw@}}% - \fi - \else - \expandafter\set@mathchar - \csname sym##3\endcsname##1##2 - {\hexnumber@{\count\z@}\hexnumber@{\count\tw@}}% - \fi - \endgroup - \else - \@latex@error{Symbol font `##3' is not defined}\@eha - \fi - } - \ltj_orig_fontspec_setup_maths: - \group_end: - } - %%%%%%%% shapes in \em \cs_set:Npn \emshape { \gtfamily \itshape } \cs_set:Npn \eminnershape { \mcfamily \upshape } 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 76c983a9e7b..9ebda8a4e4f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjp-geometry}[2015/01/04 Patch to geometry for LuaTeX-ja with vertical writing mode] +\ProvidesPackage{lltjp-geometry}[2016/10/06 Patch to geometry for LuaTeX-ja with vertical writing mode] \RequirePackage{ifluatex} \ifdefined\if@ltj@@geometry@tate\expandafter\endinput\fi @@ -18,6 +18,7 @@ \fi \RequirePackage{filehook} +\RequirePackage{etoolbox} \newif\ifGm@ltj@layoutswitch \let\orig@PackageWarningNoLine=\PackageWarningNoLine % define ifGm@swap@papersize if it is undefined @@ -74,6 +75,14 @@ \define@key{Gm}{noheadfoot}[true]{\Gm@doifelse{noheadfoot}{#1}% {\Gm@setlength\headheight\z@\Gm@defbylen{ltj@headsep}\z@ \Gm@defbylen{ltj@footskip}\z@}{}}% +\define@key{Gm}{layoutwidth}{\Gm@layouttrue\Gm@setlength\Gm@layoutheight{#1}}% +\define@key{Gm}{layoutheight}{\Gm@layouttrue\Gm@setlength\Gm@layoutwidth{#1}}% +\define@key{Gm}{layoutsize}{\Gm@branch{#1}{layoutwidth}{layoutheight}}% +\define@key{Gm}{layout}{\Gm@layouttrue\@nameuse{Gm@#1}{Gm@layout}% + \Gm@setlength\@tempdima{\Gm@layoutheight}% + \Gm@setlength\Gm@layoutheight{\Gm@layoutwidth}% + \Gm@setlength\Gm@layoutwidth{\@tempdima}% +}% % \@mparswitch は傍注の出力位置を左右ページで変えるスイッチだが, % geometry.sty はこれを左右ページのレイアウトを変えるか否かの判定にも使っている. @@ -141,11 +150,11 @@ \ifGm@showcrop \vb@xt@\z@{\vskip-1\Gm@truedimen in\vskip\Gm@layoutvoffset% \hb@xt@\z@{\hskip-1\Gm@truedimen in\hskip\Gm@layouthoffset% - \vb@xt@\Gm@layoutheight{% + \vb@xt@\Gm@layoutwidth{% \let\protect\relax - \hb@xt@\Gm@layoutwidth{\Gm@cropmark(-1,1,-3,3)\hfil\Gm@cropmark(1,1,3,3)}% + \hb@xt@\Gm@layoutheight{\Gm@cropmark(-1,1,-3,3)\hfil\Gm@cropmark(1,1,3,3)}% \vfil - \hb@xt@\Gm@layoutwidth{\Gm@cropmark(-1,-1,-3,-3)\hfil\Gm@cropmark(1,-1,3,-3)}}% + \hb@xt@\Gm@layoutheight{\Gm@cropmark(-1,-1,-3,-3)\hfil\Gm@cropmark(1,-1,3,-3)}}% \hss}% \vss}% \fi% @@ -412,9 +421,9 @@ \addtolength\@tempdimb{\topskip}% \textheight\@tempdimb \fi - \advance\oddsidemargin\Gm@layoutvoffset% - \advance\evensidemargin\Gm@layoutvoffset% - \advance\topmargin\Gm@layouthoffset% + \advance\oddsidemargin\Gm@layouthoffset% + \advance\evensidemargin\Gm@layouthoffset% + \advance\topmargin\Gm@layoutvoffset% \addtolength\Gm@layoutheight{\Gm@bindingoffset}% }% end of \Gm@@process % log |