diff options
author | Karl Berry <karl@freefriends.org> | 2018-06-16 21:28:44 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-06-16 21:28:44 +0000 |
commit | b0a0f8c8c055e03575e7026041431b1fb5183300 (patch) | |
tree | 9e9585386c84a7b7e5bb630d5ab4198920b1042d /Master/texmf-dist/tex/luatex/luatexja/patches | |
parent | dd5ac5fd8d23e602e90804dcc41a7c2da9ad92b6 (diff) |
luatexja (16jun18)
git-svn-id: svn://tug.org/texlive/trunk@48031 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/patches')
3 files changed, 72 insertions, 22 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty index a4559a67665..2c975eea395 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjcore}[2018/03/25 Patch to LaTeX2e Kernel for LuaTeX-ja] +\ProvidesPackage{lltjcore}[2018/06/15 Patch to LaTeX2e Kernel for LuaTeX-ja] \RequirePackage{etoolbox} \def\cleardoublepage{\clearpage\if@twoside @@ -35,39 +35,39 @@ \@bannertoken{} \def\maketombowbox{% \setbox\@TL\hbox to\z@{\yoko\hss - \vrule width13mm height\@tombowwidth depth\z@ + \vrule width\dimexpr 10mm+\@tombowbleed\relax height\@tombowwidth depth\z@ \vrule height10mm width\@tombowwidth depth\z@ \iftombowdate \raise4pt\hbox to\z@{\hskip5mm\@bannerfont\the\@bannertoken\hss}% \fi}% \setbox\@Tl\hbox to\z@{\yoko\hss \vrule width10mm height\@tombowwidth depth\z@ - \vrule height13mm width\@tombowwidth depth\z@}% + \vrule height\dimexpr 10mm+\@tombowbleed\relax width\@tombowwidth depth\z@}% \setbox\@TC\hbox{\yoko \vrule width10mm height\@tombowwidth depth\z@ \vrule height10mm width\@tombowwidth depth\z@ \vrule width10mm height\@tombowwidth depth\z@}% \setbox\@TR\hbox to\z@{\yoko \vrule height10mm width\@tombowwidth depth\z@ - \vrule width13mm height\@tombowwidth depth\z@\hss}% + \vrule width\dimexpr 10mm+\@tombowbleed\relax height\@tombowwidth depth\z@\hss}% \setbox\@Tr\hbox to\z@{\yoko - \vrule height13mm width\@tombowwidth depth\z@ + \vrule height\dimexpr 10mm+\@tombowbleed\relax width\@tombowwidth depth\z@ \vrule width10mm height\@tombowwidth depth\z@\hss}% \setbox\@BL\hbox to\z@{\yoko\hss - \vrule width13mm depth\@tombowwidth height\z@ + \vrule width\dimexpr 10mm+\@tombowbleed\relax depth\@tombowwidth height\z@ \vrule depth10mm width\@tombowwidth height\z@}% \setbox\@Bl\hbox to\z@{\yoko\hss \vrule width10mm depth\@tombowwidth height\z@ - \vrule depth13mm width\@tombowwidth height\z@}% + \vrule depth\dimexpr 10mm+\@tombowbleed\relax width\@tombowwidth height\z@}% \setbox\@BC\hbox{\yoko \vrule width10mm depth\@tombowwidth height\z@ \vrule depth10mm width\@tombowwidth height\z@ \vrule width10mm depth\@tombowwidth height\z@}% \setbox\@BR\hbox to\z@{\yoko \vrule depth10mm width\@tombowwidth height\z@ - \vrule width13mm depth\@tombowwidth height\z@\hss}% + \vrule width\dimexpr 10mm+\@tombowbleed\relax depth\@tombowwidth height\z@\hss}% \setbox\@Br\hbox to\z@{\yoko - \vrule depth13mm width\@tombowwidth height\z@ + \vrule depth\dimexpr 10mm+\@tombowbleed\relax width\@tombowwidth height\z@ \vrule width10mm depth\@tombowwidth height\z@\hss}% \setbox\@CL\hbox to\z@{\yoko\hss \vrule width10mm height.5\@tombowwidth depth.5\@tombowwidth @@ -78,11 +78,13 @@ } \def\@outputtombow{% \iftombow - \vbox to\z@{\kern-13mm\relax + \vbox to\z@{\kern-\dimexpr 10mm+\@tombowbleed\relax \boxmaxdepth\maxdimen - \moveleft3mm\vbox to\@@paperheight{% - \hbox to\@@paperwidth{\hskip3mm\relax - \copy\@TL\hfill\copy\@TC\hfill\copy\@TR\hskip3mm}% + \moveleft\@tombowbleed\vbox to\@@paperheight{% + \color@begingroup + \@tombowcolor + \hbox to\@@paperwidth{\hskip\@tombowbleed\relax + \copy\@TL\hfill\copy\@TC\hfill\copy\@TR\hskip\@tombowbleed}% \kern-10mm \hbox to\@@paperwidth{\copy\@Tl\hfill\copy\@Tr}% \vfill @@ -90,12 +92,25 @@ \vfill \hbox to\@@paperwidth{\copy\@Bl\hfill\copy\@Br}% \kern-10mm - \hbox to\@@paperwidth{\hskip3mm\relax - \copy\@BL\hfill\copy\@BC\hfill\copy\@BR\hskip3mm}% + \hbox to\@@paperwidth{\hskip\@tombowbleed\relax + \copy\@BL\hfill\copy\@BC\hfill\copy\@BR\hskip\@tombowbleed}% + \color@endgroup }\vss }% \fi } +\def\@tombowcolor{\normalcolor} +\def\@tombowbleed{3mm} +\def\@tombowreset@@paper{% + \@@topmargin\topmargin + \iftombow + \@@paperwidth\paperwidth + \advance\@@paperwidth 2\dimexpr\@tombowbleed\relax + \@@paperheight\paperheight\advance\@@paperheight 10mm\relax + \advance\@@paperheight 2\dimexpr\@tombowbleed\relax + \advance\@@topmargin 1in\relax \advance\@themargin 1in\relax + \fi +} \newdimen\@@paperheight \newdimen\@@paperwidth \newdimen\@@topmargin @@ -126,12 +141,7 @@ \ifnum\ltjgetparameter{direction}=3 \let\@themargin\oddsidemargin \else\let\@themargin\evensidemargin\fi \fi\fi - \@@topmargin\topmargin - \iftombow - \@@paperwidth\paperwidth \advance\@@paperwidth 6mm\relax - \@@paperheight\paperheight \advance\@@paperheight 16mm\relax - \advance\@@topmargin 1in\relax \advance\@themargin 1in\relax - \fi + \@tombowreset@@paper \reset@font \normalsize \normalsfcodes diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty index 8a7ac6b4104..0c4cfb5f7e6 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}[2017/12/31 Default font settings of LuaTeX-ja] +\ProvidesPackage{lltjdefs}[2018/06/15 Default font settings of LuaTeX-ja] \def\ltj@stdmcfont{IPAExMincho} \def\ltj@stdgtfont{IPAExGothic} @@ -34,6 +34,8 @@ \DeclareFontShape{JY3}{gt}{m}{n}{<-> s*[0.962216] \ltj@stdgtfont:jfm=ujis}{} \DeclareFontShape{JY3}{mc}{bx}{n}{<-> ssub*gt/m/n}{} \DeclareFontShape{JY3}{gt}{bx}{n}{<-> ssub*gt/m/n}{} +\DeclareFontShape{JY3}{mc}{b}{n}{<-> ssub*mc/bx/n}{} +\DeclareFontShape{JY3}{gt}{b}{n}{<-> ssub*gt/bx/n}{} \DeclareKanjiFamily{JT3}{mc}{} \DeclareFontShape{JT3}{mc}{m}{n}{<-> s*[0.962216] \ltj@stdmcfont:jfm=ujisv}{} @@ -41,14 +43,18 @@ \DeclareFontShape{JT3}{gt}{m}{n}{<-> s*[0.962216] \ltj@stdgtfont:jfm=ujisv}{} \DeclareFontShape{JT3}{mc}{bx}{n}{<-> ssub*gt/m/n}{} \DeclareFontShape{JT3}{gt}{bx}{n}{<-> ssub*gt/m/n}{} +\DeclareFontShape{JT3}{mc}{b}{n}{<-> ssub*mc/bx/n}{} +\DeclareFontShape{JT3}{gt}{b}{n}{<-> ssub*gt/bx/n}{} \KanjiEncodingPair{JY3}{JT3} \DeclareRelationFont{JY3}{gt}{m}{}{TU}{lmr}{bx}{} \DeclareRelationFont{JY3}{mc}{m}{}{TU}{lmr}{m}{} \DeclareRelationFont{JY3}{mc}{bx}{}{TU}{lmr}{bx}{} +\DeclareRelationFont{JY3}{mc}{b}{}{TU}{lmr}{b}{} \DeclareRelationFont{JT3}{gt}{m}{}{TU}{lmr}{bx}{} \DeclareRelationFont{JT3}{mc}{m}{}{TU}{lmr}{m}{} \DeclareRelationFont{JT3}{mc}{bx}{}{TU}{lmr}{bx}{} +\DeclareRelationFont{JT3}{mc}{b}{}{TU}{lmr}{b}{} \kanjiencoding{JY3}\selectfont\adjustbaseline diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty new file mode 100644 index 00000000000..738760c1bba --- /dev/null +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty @@ -0,0 +1,34 @@ +% +% lltjp-siunitx.sty +% + +\NeedsTeXFormat{LaTeX2e} + +\RequirePackage{luatexja} +\ExplSyntaxOn +\cs_generate_variant:Nn \tl_if_in:NnT { coT } +\cs_new:Nn \__ltj_siunix_patch_inner:n { + \cs_if_exist:cT { #1_tl } { + \tl_if_in:coT { #1_tl } { \tex_char:D } { + \tl_replace_all:cnn { #1_tl } { \tex_char:D } { \ltjalchar } + } + } +} +\cs_new:Nn \__ltj_siunix_patch_inner_math:n { + \__ltj_siunix_patch_inner:n { l__siunitx_#1_math } + \__ltj_siunix_patch_inner:n { l__siunitx_#1_text } +} +\cs_new:Nn \__ltj_siunitx_patch: { + \AtBeginDocument { + \__ltj_siunix_patch_inner:n { c__siunitx_minus } + \__ltj_siunix_patch_inner:n { c__siunitx_mu } + \__ltj_siunix_patch_inner_math:n { angstrom } + \__ltj_siunix_patch_inner_math:n { arcminute } + \__ltj_siunix_patch_inner_math:n { arcsecond } + \__ltj_siunix_patch_inner_math:n { ohm } + } +} +\ifdefined\ltj@patch@siunitx@executed\__ltj_siunitx_patch:\fi + +\ExplSyntaxOff +\endinput |