From 999d009f24141c1562b4712c69bd57cb7fd7ad3f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 24 Jan 2017 21:39:24 +0000 Subject: luatexja (24jan17) git-svn-id: svn://tug.org/texlive/trunk@43045 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/luatex/luatexja/patches/lltjdefs.sty | 2 -- .../tex/luatex/luatexja/patches/lltjp-fontspec.sty | 21 ++++++++---- .../tex/luatex/luatexja/patches/lltjp-footmisc.sty | 6 ++-- .../tex/luatex/luatexja/patches/lltjp-stfloats.sty | 39 +++------------------- .../tex/luatex/luatexja/patches/lltjp-xunicode.sty | 4 +-- 5 files changed, 25 insertions(+), 47 deletions(-) (limited to 'Master/texmf-dist/tex/luatex/luatexja/patches') diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty index 2db07c820c8..f9629cc82b1 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty @@ -138,8 +138,6 @@ MIDDLE % 87 "2980-"29FF num = 4 name = Miscellaneous Mathematical Symbols-B % 89 "2B00-"2BFF num = 3 name = Miscellaneous Symbols and Arrows -NEGATIVE - \ltjdefcharrange{4}{% "500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF, "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A82F, "A840-"ABFF, "FB00-"FE0F, 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 2aaa9d6eed8..bf95b6e5fb2 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty @@ -8,12 +8,21 @@ \RequirePackage{fontspec,luatexja} \ExplSyntaxOn -\cs_set:Nn \fontspec_visible_space: - { - \font_glyph_if_exist:NnTF \font {"2423} - { \ltjalchar"2423\scan_stop: } - { \fontspec_visible_space_fallback: } - } +\@ifpackagelater{fontspec}{2017/01/01}{ + \cs_set:Nn \fontspec_visible_space: + { + \__fontspec_primitive_font_glyph_if_exist:NnTF \font {"2423} + { \ltjalchar"2423\scan_stop: } + { \fontspec_visible_space_fallback: } + } +}{ + \cs_set:Nn \fontspec_visible_space: + { + \font_glyph_if_exist:NnTF \font {"2423} + { \ltjalchar"2423\scan_stop: } + { \fontspec_visible_space_fallback: } + } +} \def\verb { \relax\ifmmode\hbox\else\leavevmode\fi % same as lltjcore diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-footmisc.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-footmisc.sty index d7125541a05..00143c1927e 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-footmisc.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-footmisc.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjp-footmisc}[2014/11/23 Patch to footmisc for LuaTeX-ja] +\ProvidesPackage{lltjp-footmisc}[2017/01/19 Patch to footmisc for LuaTeX-ja] \RequirePackage{footmisc} \let \if@tempswa \ifFN@bottom @@ -47,7 +47,7 @@ \setbox\@outputbox \vbox to\@colht{% \@texttop \dimen@\dp\@outputbox \unvbox\@outputbox - \ifnum\ltjgetparameter{direction}=3 \hskip\z@\fi %%% LuaTeX-ja + \ifnum\ltjgetparameter{direction}=3 \vbox{\hskip\z@}\fi %%% LuaTeX-ja \vskip -\dimen@\@textbottom }% \fi @@ -55,4 +55,4 @@ } \edef\@makecol{\the\toks@} \fi -\endinput \ No newline at end of file +\endinput diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty index e90cef4955f..794db15cd77 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty @@ -3,45 +3,16 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjp-stfloats}[2014/11/23 Patch to stfloats for LuaTeX-ja] +\ProvidesPackage{lltjp-stfloats}[2017/01/19 Patch to stfloats for LuaTeX-ja] \RequirePackage{stfloats,luatexja} +\RequirePackage{etoolbox} \let\ltj@fn@makecol=\fn@makecol -\gdef\fn@makecol{% - \setbox\@outputbox \box\@cclv - \let\@elt\relax - \xdef\@freelist{\@freelist\@midlist}% - \global \let \@midlist \@empty - \@combinefloats - \ifvoid\footins - \else - \setbox\@outputbox \vbox {% - \boxmaxdepth \@maxdepth - \unvbox \@outputbox - \vskip \skip\footins - \color@begingroup - \normalcolor - \footnoterule - \unvbox \footins - \color@endgroup - }% - \fi - \ifvbox\@kludgeins - \@makespecialcolbox - \else - \setbox\@outputbox \vbox to\@colht {% - \@texttop - \dimen@ \ltjgetdp\@outputbox - \unvbox \@outputbox - \ifnum\ltjgetparameter{direction}=3 \hskip\z@\fi %%% LuaTeX-ja - \vskip -\dimen@ - \@textbottom - }% - \fi - \global \maxdepth \@maxdepth - } +\patchcmd\fn@makecol{\vskip -\dimen@}% + {\ifnum\ltjgetparameter{direction}=4\else\vbox{\hskip\z@}\fi %%% LuaTeX-ja + \vskip -\dimen@}{}{} \ifx\@makecol\ltj@fn@makecol \global\let\@makecol\fn@makecol diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty index bff08c3670c..1803cad8a9b 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjp-xunicode}[2013/05/14 Patch to xunicode for LuaTeX-ja] +\ProvidesPackage{lltjp-xunicode}[2017/01/19 Patch to xunicode for LuaTeX-ja] \def\XeTeXpicfile{} \RequirePackage{xunicode,luatexja} @@ -82,7 +82,7 @@ \let\ltj@tmpb\iftipaonetoken \let\iftipaonetoken\relax -\typeout{UTFencname: \UTFencname} +%\typeout{UTFencname: \UTFencname} \let\ltj@temp=\@temp \edef\@temp{\noexpand\ReloadXunicode{\UTFencname}}\@temp \makeatletter -- cgit v1.2.3