diff options
author | Karl Berry <karl@freefriends.org> | 2016-01-31 23:45:28 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-01-31 23:45:28 +0000 |
commit | 326c162a7ec8088d104101b4739c727d824ae5f7 (patch) | |
tree | b361de0cef7c47e209b56e053f1ec957a38526fb /Master/texmf-dist/tex/luatex/luatexja/patches | |
parent | a05d0c546c309991c96cf6aed49902bf5d60f66c (diff) |
luatexja (31jan16)
git-svn-id: svn://tug.org/texlive/trunk@39527 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/patches')
5 files changed, 40 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty index 63ba2336175..f8af0aa2d9f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty @@ -193,7 +193,11 @@ \unless\ifnum\ltjgetparameter{direction}=3 \@makefnmark \else\hbox to\z@{\hskip-.25\zw\raise.9\zh\@makefnmark\hss}\fi \ifhmode\spacefactor\@x@sf\fi\relax} -\def\@setref#1#2#3{% +\begingroup +\@ifpackageloaded{hyperref} + {\def\ltj@setrefprefix{real}} + {\def\ltj@setrefprefix{}} +\expandafter\gdef\csname \ltj@setrefprefix @setref\endcsname#1#2#3{% \ifx#1\relax \protect\G@refundefinedtrue \nfss@text{\reset@font\bfseries ??}% @@ -202,6 +206,7 @@ \else \expandafter#2#1\relax% change \null to \relax \fi} +\endgroup \if@compatibility\else \def\verb{\relax\ifmmode\hbox\else\leavevmode\fi \bgroup diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty index dac8b4eff92..466e9c7666b 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}[2015/08/29 Default font settings of LuaTeX-ja] +\ProvidesPackage{lltjdefs}[2016/01/30 Default font settings of LuaTeX-ja] \def\ltj@stdmcfont{IPAExMincho} \def\ltj@stdgtfont{IPAExGothic} @@ -20,7 +20,7 @@ \newcommand\mcdefault{mc} \newcommand\gtdefault{gt} -\newcommand\jttdefault{\gtdefault} +\newcommand\jttdefault{\mcdefault} \newcommand\kanjiencodingdefault{JY3} \newcommand\kanjifamilydefault{\mcdefault} \newcommand\kanjiseriesdefault{\mddefault} @@ -54,6 +54,22 @@ \DeclareSymbolFontAlphabet{\mathmc}{mincho} \DeclareMathAlphabet{\mathgt}{JY3}{gt}{m}{n} +\newif\if@ltj@match@family +\@ltj@match@familyfalse +\def\verbatim@font{\normalfont\ttfamily\kanjifamily\jttdefault\selectfont} +\DeclareRobustCommand\rmfamily + {\not@math@alphabet\rmfamily\mathrm + \romanfamily\rmdefault + \if@ltj@match@family\kanjifamily\mcdefault\fi\selectfont} +\DeclareRobustCommand\sffamily + {\not@math@alphabet\sffamily\mathsf + \romanfamily\sfdefault + \if@ltj@match@family\kanjifamily\gtdefault\fi\selectfont} +\DeclareRobustCommand\ttfamily + {\not@math@alphabet\ttfamily\mathtt + \romanfamily\ttdefault + \if@ltj@match@family\kanjifamily\jttdefault\fi\selectfont} + \ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF} \ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF} \ltjdefcharrange{3}{% diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty index 40c71c83a7b..c1f1b9f81bb 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty @@ -270,7 +270,7 @@ \else\let\lst@next\ltj@lst@MakeActive@ \ifnum`#1>127 \lccode`\^^A=`#1 - \lowercase{\lst@lAddTo\lst@temp{$^^A}}% + \lowercase{\lst@lAddTo\lst@temp{$^^A}}%$ \else \lccode`\^^@=`#1 \lowercase{\lst@lAddTo\lst@temp{^^@}}% @@ -317,7 +317,7 @@ %%%% ここから \@tempdima\z@ \ifdim\ht\strutbox<\cht\@tempdima=\dimexpr\cht-\ht\strutbox\relax\fi - \ifdim\dp\strutbox<\cdp\advance\@tempdima=\dimexpr\cdp-\dp\strutbox\relax\fi + \ifdim\dp\strutbox<\cdp\@tempdima=\dimexpr\cdp-\dp\strutbox\relax\fi \ltj@lst@frame@lslimit=-\@tempdima \def\lst@framelr{% \ifltj@lst@frame@top\ltj@lst@frame@topfalse\else\lineskiplimit\ltj@lst@frame@lslimit\fi @@ -417,8 +417,12 @@ \gdef\lst@breakProcessOther#1{\lst@ProcessOther#1} % ソースコード目次における文字と番号の空き \let \l@lstlisting = \l@figure + +%%%% % キャプションとソースコード目次に対する日本語対応 -\def\lstlistingname{ソースコード} -\def\lstlistlistingname{ソースコード目次} +%\def\lstlistingname{ソースコード} +%\def\lstlistlistingname{ソースコード目次} % \end{修正事項} +%%%% + \endinput diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty index db9361abd1b..b6d17a6031f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty @@ -38,14 +38,14 @@ } \cs_gset:cpn { \tl_use:N \l_tmpa_tl } #1 = "#2 \q_nil {%" \group_begin: - %\typeout {um: \string#1, \int_from_hexadecimal:n {#2}, #2}% <- for debug + %\typeout {um: \string#1, \int_from_hex:n {#2}, #2}% <- for debug \char_set_lccode:nn { `! } { "#2 }%" \tex_lowercase:D { \tl_set:Nn \l_tmpa_tl { \relax \ifmmode!\else{\directlua{tex.globaldefs = 0}\ltj@allalchar!}\fi} \cs_gset_eq:NN #1 \l_tmpa_tl } - \ltjsetmathletter{ \int_from_hexadecimal:n {#2} } + \ltjsetmathletter{ \int_from_hex:n {#2} } \group_end: } } 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 da4d1a78880..21ce7c9ac8d 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty @@ -5,7 +5,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{lltjp-xunicode}[2013/05/14 Patch to xunicode for LuaTeX-ja] -\def\UTFencname{EU2}\def\XeTeXpicfile{} +\def\XeTeXpicfile{} \RequirePackage{xunicode,luatexja} {\catcode`\"=12 \gdef\check@hexcom@digits@#1#2#3#4#5@!@#6#7#8{% @@ -81,15 +81,18 @@ \let\hbar\relax \let\ltj@tmpb\iftipaonetoken \let\iftipaonetoken\relax -\ReloadXunicode{EU2} +\typeout{UTFencname: \UTFencname} +\let\ltj@temp=\@temp +\edef\@temp{\noexpand\ReloadXunicode{\UTFencname}}\@temp \makeatletter +\let\@temp=\ltj@temp\let\ltj@temp\relax \let\hbar\ltj@tmpa \let\iftipaonetoken\ltj@tmpb \let\ltj@tmpb\relax % no more an if-token %% ticket 30501 {\catcode`\!0\catcode`\\11!catcode`!2 11!catcode`!?11!catcode`!-11 - !gdef!EU2\nobreakspace{!?-\nobreakspace}% + !expandafter!gdef!csname!UTFencname \nobreakspace!endcsname{!?-\nobreakspace}% } \endinput |