diff options
author | Karl Berry <karl@freefriends.org> | 2016-05-05 22:19:33 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-05-05 22:19:33 +0000 |
commit | 166ecf8f4ada7e344bb8d198de16259aed65f7ee (patch) | |
tree | aea5501297dcb4af6e36eda6db597171cede4fbb /Master/texmf-dist/tex/luatex/luatexja/patches | |
parent | 4a55f10229652978387f3ed0ff6e1de158644a22 (diff) |
luatexja (5may2016)
git-svn-id: svn://tug.org/texlive/trunk@40904 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/patches')
4 files changed, 126 insertions, 67 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty index f3587288721..2d577fc687a 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty @@ -1,10 +1,10 @@ % % lltjcore.sty: derived from plcore.dtx in pLaTeX. % This file does not include the code relating to "tategaki". -% +% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjcore}[2016/04/01 Patch to LaTeX2e Kernel for LuaTeX-ja] +\ProvidesPackage{lltjcore}[2016/05/05 Patch to LaTeX2e Kernel for LuaTeX-ja] \def\cleardoublepage{\clearpage\if@twoside \ifodd\c@page @@ -165,10 +165,12 @@ \stepcounter{page}% \let\firstmark\botmark } -\renewcommand\@makefnmark{\hbox{% + +%%% Remove extra xkanjiskip +\renewcommand\@makefnmark{% \unless\ifnum\ltjgetparameter{direction}=3 - \@textsuperscript{\normalfont\@thefnmark}% - \else\hbox{\yoko \@textsuperscript{\normalfont\@thefnmark}}\fi}} + \hbox{}\hbox{\@textsuperscript{\normalfont\@thefnmark}}\hbox{}% + \else\hbox{\yoko \@textsuperscript{\normalfont\@thefnmark}}\fi} \def\@footnotemark{\leavevmode \ifhmode\edef\@x@sf{\the\spacefactor}\nobreak\fi \unless\ifnum\ltjgetparameter{direction}=3 \@makefnmark @@ -198,6 +200,35 @@ \gdef\@stopfield{\null\color@endgroup\egroup} \newcount\hour \newcount\minute +%%% etoolbox is loaded by everyhook +\ifltj@everyhook@avail + \patchcmd{\@tabular}{\leavevmode}{\leavevmode\null}{}{} + \apptocmd{\endtabular}{\null}{}{} + \expandafter \let \csname endtabular*\endcsname = \endtabular +\fi +\let\@parboxto\@empty +\long\def\@iiiparbox#1#2[#3]#4#5{% + \leavevmode + \@pboxswfalse + \setlength\@tempdima{#4}% + \@begin@tempboxa\vbox{\hsize\@tempdima\@parboxrestore#5\@@par}% + \ifx\relax#2\else + \setlength\@tempdimb{#2}% + \edef\@parboxto{to\the\@tempdimb}% + \fi + \if#1b\vbox + \else\if #1t\vtop + \else\ifmmode\vcenter + \else\@pboxswtrue\null$\vcenter% !!! + \fi\fi\fi + \@parboxto{\let\hss\vss\let\unhbox\unvbox + \csname bm@#3\endcsname}% + \if@pboxsw \m@th$\null\fi% !!! + \@end@tempboxa} +\def\underline#1{% + \relax + \ifmmode\@@underline{#1}% + \else \leavevmode\null$\@@underline{\hbox{#1}}\m@th$\null\relax\fi} %%% AtBeginDvi \def \AtBeginDvi #1{% diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty index 466e9c7666b..3f39654b7ed 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjdefs}[2016/01/30 Default font settings of LuaTeX-ja] +\ProvidesPackage{lltjdefs}[2016/05/05 Default font settings of LuaTeX-ja] \def\ltj@stdmcfont{IPAExMincho} \def\ltj@stdgtfont{IPAExGothic} @@ -69,6 +69,11 @@ {\not@math@alphabet\ttfamily\mathtt \romanfamily\ttdefault \if@ltj@match@family\kanjifamily\jttdefault\fi\selectfont} +%%% \eminnershape +\DeclareRobustCommand\em + {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ + \eminnershape \else \gtfamily \itshape \fi} +\def\eminnershape{\mcfamily \upshape} \ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF} \ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF} 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 d1e894e3716..b679d5a436e 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty @@ -65,5 +65,10 @@ \ltj_orig_fontspec_setup_maths: \group_end: } + +%%%%%%%% shapes in \em +\cs_set:Npn \emshape { \gtfamily \itshape } +\cs_set:Npn \eminnershape { \mcfamily \upshape } + \ExplSyntaxOff \endinput diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-tascmac.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-tascmac.sty index 4f03d1ff751..abe7d23c29f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-tascmac.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-tascmac.sty @@ -1,97 +1,115 @@ % % lltjp-tascmac.sty +% based on tascmac.sty [2016/04/15 v2.0b (community edition)] % \tbaselineshift=\z@ ==> \ltj@tablshift=\z@ +% \ybaselineshift=\z@ ==> \ltj@yablshift=\z@ % \dimen...=\tbaselineshift ==> \dimen...=\ltj@tablshift sp +% \dimen...=\ybaselineshift ==> \dimen...=\ltj@yablshift sp \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjp-tascmac}[2014/12/18 Patch to (t)ascmac for LuaTeX-ja] +\ProvidesPackage{lltjp-tascmac}[2016/05/05 Patch to (t)ascmac for LuaTeX-ja] \RequirePackage{tascmac,luatexja} %% use Type1 font for ascgrp -\ifdefined\pdfmapline - \pdfmapline{+ascgrp <ascgrp.pfb} -\fi +\pdfextension mapline{+ascgrp <ascgrp.pfb} %% boxnote environment -\def\boxnote{\par\vspace{\baselineskip} -\@savetbaselineshift\ltj@tablshift sp\ltj@tablshift\z@ -\setbox\@nbox=\hbox{\@ascgrp\vrule width1.08pt depth35pt b\hss a\hss b} -\@whiledim \wd\@nbox<\hsize \do{ -\setbox\@nbox=\hbox{\@ascgrp\unhbox\@nbox \hss a\hss b}} -\setbox\@nbox=\hbox to\hsize{\@ascgrp\unhbox\@nbox \hss a\hss b% -\vrule width1.08pt depth35pt} -\@bw=\wd\@nbox\advance\@bw -40pt -\begin{lrbox}{\@nbody}\begin{minipage}{\@bw}% (KN:1998/02/27) - \ltj@tablshift\@savetbaselineshift}% +\def\boxnote{\par\vspace{.3\baselineskip}% + \@saveybaselineshift\ltj@yablshift sp\ltj@yablshift\z@ + \@savetbaselineshift\ltj@tablshift sp\ltj@tablshift\z@ + \setbox\@nbox=\hbox{\@ascgrp\vrule width1.08pt depth35pt b\hss a\hss b} + \@whiledim \wd\@nbox<\hsize \do{ + \setbox\@nbox=\hbox{\@ascgrp\unhbox\@nbox \hss a\hss b}} + \setbox\@nbox=\hbox to\hsize{\@ascgrp\unhbox\@nbox \hss a\hss b% + \vrule width1.08pt depth35pt} + \@bw=\wd\@nbox\advance\@bw -40pt + \begin{lrbox}{\@nbody}\begin{minipage}{\@bw}% (KN:1998/02/27) + \ltj@yablshift\@saveybaselineshift \ltj@tablshift\@savetbaselineshift}% %% screen environment \def\screen{% -\@savetbaselineshift\ltj@tablshift sp\ltj@tablshift\z@ -\@ifnextchar[{\@screen}{\@screen[0]}} + \@saveybaselineshift\ltj@yablshift sp\ltj@yablshift\z@ + \@savetbaselineshift\ltj@tablshift sp\ltj@tablshift\z@ + \@ifnextchar[{\@screen}{\@screen[0]}} \def\@screen[#1]{\ifcase#1\def\@r{20}\def\@s{9.8pt}\def\@sx{10pt}\or -\def\@r{18}\def\@s{8.8pt}\def\@sx{9pt}\or -\def\@r{16}\def\@s{7.8pt}\def\@sx{8pt}\or -\def\@r{14}\def\@s{6.8pt}\def\@sx{7pt}\or -\def\@r{12}\def\@s{5.8pt}\def\@sx{6pt}\or -\def\@r{10}\def\@s{4.8pt}\def\@sx{5pt}\or -\def\@r{8}\def\@s{3.8pt}\def\@sx{4pt}\or -\def\@r{6}\def\@s{2.8pt}\def\@sx{3pt}\else -\def\@r{4}\def\@s{1.8pt}\def\@sx{2pt}\fi -\par\vspace{.3\baselineskip}\@scw\linewidth \advance\@scw -\@r pt -\setbox\scb@x=\hbox to\@scw\bgroup\begin{minipage}{\@scw}% (KN:1998/02/27) - \ltj@tablshift\@savetbaselineshift}% + \def\@r{18}\def\@s{8.8pt}\def\@sx{9pt}\or + \def\@r{16}\def\@s{7.8pt}\def\@sx{8pt}\or + \def\@r{14}\def\@s{6.8pt}\def\@sx{7pt}\or + \def\@r{12}\def\@s{5.8pt}\def\@sx{6pt}\or + \def\@r{10}\def\@s{4.8pt}\def\@sx{5pt}\or + \def\@r{8}\def\@s{3.8pt}\def\@sx{4pt}\or + \def\@r{6}\def\@s{2.8pt}\def\@sx{3pt}\else + \def\@r{4}\def\@s{1.8pt}\def\@sx{2pt}\fi + \par\vspace{.3\baselineskip}\@scw\linewidth \advance\@scw -\@r pt + \setbox\scb@x=\hbox to\@scw\bgroup\begin{minipage}{\@scw}% (KN:1998/02/27) + \ltj@yablshift\@saveybaselineshift \ltj@tablshift\@savetbaselineshift}% %% itembox environment \def\@itembox[#1]#2{% - \par\vspace{.3\baselineskip}% - \setbox\@iboxstr=\hbox{#2}% + \@saveybaselineshift\ltj@yablshift sp\ltj@yablshift\z@ \@savetbaselineshift\ltj@tablshift sp\ltj@tablshift\z@ + \par\vspace{.3\baselineskip}% + \setbox\@iboxstr=\hbox{% + \ltj@yablshift\@saveybaselineshift \ltj@tablshift\@savetbaselineshift #2}% \@itemh\ht\@iboxstr\advance\@itemh\dp\@iboxstr \vspace{.5\@itemh}\bgroup\@scw\linewidth \advance\@scw-20pt\@iboxpos={#1}% \setbox\scb@x=\hbox to\@scw\bgroup\begin{minipage}{\@scw}% + \ltj@yablshift\@saveybaselineshift \ltj@tablshift\@savetbaselineshift \vspace*{.5\@itemh}}% %% \keytop \def\@keytop[#1]#2{% -{\setbox0=\hbox{\shortstack{#2}}\ltj@tablshift\z@% -\dimen0=\wd0\advance\dimen0 5pt\dimen1=\dp0\advance\dimen1 2.5pt% -\setbox\scscb@x=\hbox to\dimen0{% -\@scw\wd0\hfil\vtop{\offinterlineskip -\thinlines\setlength{\unitlength}{1pt}\hrule\kern2.3pt\@hobox{tl}{tr}5% -\kern-2.4pt\box0\@hobox{bl}{br}5\kern-.25pt\hrule}\hfil}\dimen0=\dp\scscb@x% -\setbox0=\vbox{\hbox{\hbox to0pt{\hss\vtop to\dimen0{\@vrf@{2.5pt}{.4pt}}}% -\box\scscb@x\hbox to.2pt{\hss\vtop to\dimen0{\@vrf@{2.5pt}{.4pt}}}}}% -\if #1c $\vcenter{\box0}$ \else \if #1t\else\if #1b\boxmaxdepth=0pt\else -\boxmaxdepth=\dimen1\fi\fi \mbox{}\vbox{\box0}\fi}} + {\setbox0=\hbox{\shortstack{#2}}\ltj@yablshift\z@\ltj@tablshift\z@% + \dimen0=\wd0\advance\dimen0 5pt\dimen1=\dp0\advance\dimen1 2.5pt% + \setbox\scscb@x=\hbox to\dimen0{% + \@scw\wd0\hfil\vtop{\offinterlineskip + \thinlines\setlength{\unitlength}{1pt}\hrule\kern2.3pt\@hobox{tl}{tr}5% + \kern-2.4pt\box0\@hobox{bl}{br}5\kern-.4pt\hrule}\hfil}% + \dimen0=\dp\scscb@x\advance\dimen0 -.4pt + \setbox0=\vbox{\hbox{\hbox to.2pt{\vtop to\dimen0{\@vrf@{2.3pt}{.4pt}}\hss}% + \box\scscb@x\hbox to.2pt{\hss\vtop to\dimen0{\@vrf@{2.3pt}{.4pt}}}}}% + \if #1c\mbox{}$\vcenter{\box0}$\mbox{}\else + \if #1t\else\if #1b\boxmaxdepth=0pt\else + \boxmaxdepth=\dimen1\fi\fi \mbox{}\vbox{\box0}\fi}} %% \mask -\def\mask#1#2{% -{\setbox\@bwsp=\hbox{#1}\ltj@tablshift\z@\setbox0=\hbox{\@ascgrp#2}% -\dimen0=\wd\@bwsp\dimen1=\ht\@bwsp\advance\dimen1\dp\@bwsp\dimen2=-\dimen1 -\setdim@{\dimen0}{\wd0}\setdim@{\dimen1}{\ht0}% -\setbox\@@bwsp=\hbox to\dimen0{\leaders -\vtop to\dimen1{\leaders\hbox{\@ascgrp#2}\vfil}\hfil}% -\advance\dimen2\dp\@@bwsp\divide\dimen2 2 -\advance\dimen2\dp\@bwsp\boxmaxdepth=\dimen2 -\setbox\@@bwsp=\vbox{\box\@@bwsp}% -\mbox{}\hbox to\wd\@@bwsp{\hbox to0pt{\box\@@bwsp\hss}\hss\unhbox\@bwsp\hss}}} +\def\mask#1#2{{\setbox\@bwsp=\hbox{#1}% + \setbox0=\hbox{\ltj@yablshift\z@\ltj@tablshift\z@ \@ascgrp#2}% + \dimen0=\wd\@bwsp\dimen1=\ht\@bwsp\advance\dimen1\dp\@bwsp\dimen2=-\dimen1 + \setdim@{\dimen0}{\wd0}\setdim@{\dimen1}{\ht0}% + \setbox\@@bwsp=\hbox to\dimen0{\leaders + \vtop to\dimen1{\leaders\box0\vfil}\hfil}% + \advance\dimen2\dp\@@bwsp\divide\dimen2 2 + \advance\dimen2\dp\@bwsp\boxmaxdepth=\dimen2 + \setbox\@@bwsp=\vbox{\box\@@bwsp}% + \mbox{}\hbox to\wd\@@bwsp{\hbox to0pt{\box\@@bwsp\hss}\hss\unhbox\@bwsp\hss}}} %% \maskbox -\def\Maskbox#1#2#3#4#5#6{{\setbox2=\hbox{#6}\ltj@tablshift\z@ -\setbox0=\hbox{\@ascgrp#3}% -\dimen0=#1\@setdim{\dimen0}{\wd0}\dimen1=#2\@setdim{\dimen1}{\ht0}% -\ifx#4c\skip0=0pt plus1fil\skip1=\skip0\fi -\ifx#4r\skip0=0pt plus1fil\skip1=0pt\fi -\ifx#4l\skip1=0pt plus1fil\skip0=0pt\fi -\hbox{\hbox to0pt{\hbox to\dimen0{\leaders\vbox to\dimen1{\leaders -\hbox{\@ascgrp#3}\vfil}\hfil}\hss}% -\vrule width#5\vbox to\dimen1{\hrule height#5\vfil -\dimen3=#5\advance\dimen0-2\dimen3\advance\dimen0 .15pt -\hbox to\dimen0{\hskip\skip0\box2\hskip\skip1}% -\vfil\hrule height#5}\vrule width#5}}} +\def\Maskbox#1#2#3#4#5#6{{% + \setbox0=\hbox{\ltj@yablshift\z@\ltj@tablshift\z@ \@ascgrp#3}% + \dimen0=#1\@setdim{\dimen0}{\wd0}\dimen1=#2\@setdim{\dimen1}{\ht0}% + \ifx#4c\skip0=0pt plus1fil\skip1=\skip0\fi + \ifx#4r\skip0=0pt plus1fil\skip1=0pt\fi + \ifx#4l\skip1=0pt plus1fil\skip0=0pt\fi + \leavevmode + \hbox{\hbox to0pt{\hbox to\dimen0{\leaders\vbox to\dimen1{\leaders + \box0\vfil}\hfil}\hss}% + \vrule width#5\vbox to\dimen1{\hrule height#5\vfil + \dimen3=#5\advance\dimen0-2\dimen3\advance\dimen0 .15pt + \hbox to\dimen0{\hskip\skip0\relax#6\hskip\skip1}% + \vfil\hrule height#5}\vrule width#5}}} + +%% shadebox environment +\def\shadebox{\par\vspace{.3\baselineskip}% + \@saveybaselineshift\ltj@yablshift sp\ltj@yablshift\z@ + \@savetbaselineshift\ltj@tablshift sp\ltj@tablshift\z@ + \dimen0\linewidth \advance\dimen0-20pt + \advance\dimen0-2\fboxrule \advance\dimen0-\shaderule + \setbox\@tempboxa=\hbox\bgroup\minipage{\dimen0}% + \ltj@yablshift\@saveybaselineshift \ltj@tablshift\@savetbaselineshift} %% \yen % |