diff options
author | Karl Berry <karl@freefriends.org> | 2016-03-31 21:16:29 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-03-31 21:16:29 +0000 |
commit | 6ae83d3bdc0271cb972fd7e6c763c848e564635b (patch) | |
tree | 79f742e15cf1d655b4725e20bb753d4d344a20c9 /Master/texmf-dist/tex/luatex/luatexja/patches | |
parent | d8dd2c6b804770d2b5c55edc1bfb2d5786e95386 (diff) |
luatexja (31mar16)
git-svn-id: svn://tug.org/texlive/trunk@40198 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/patches')
3 files changed, 52 insertions, 8 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 4ba873ba675..d1e894e3716 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}[2013/05/14 Patch to fontspec for LuaTeX-ja] +\ProvidesPackage{lltjp-fontspec}[2016/03/31 Patch to fontspec for LuaTeX-ja] \RequirePackage{fontspec,luatexja} \ExplSyntaxOn @@ -23,5 +23,47 @@ \@ifstar\__fontspecsverb\@verb } + +\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: + } \ExplSyntaxOff \endinput 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 987cd691c52..9a5d9d2cbbc 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjp-listings}[2016/02/07 Patch to listings for LuaTeX-ja] +\ProvidesPackage{lltjp-listings}[2016/03/31 Patch to listings for LuaTeX-ja] \RequirePackage{listings,luatexbase-cctb} %%%%%%%%%%%%%%%% Japanese support @@ -173,7 +173,7 @@ \newluatexcatcodetable\CatcodeTableLTJlistings \setluatexcatcodetable\CatcodeTableLTJlistings{% \luatexcatcodetable\CatcodeTableLaTeXAtLetter - \catcode"FFFFF=13%" + \catcode\ltjlineendcomment=13%" \SetCatcodeRange{"FF61}{"FF9F}{13}% 半角カナ \SetCatcodeRange{"E0100}{"E01EF}{13}% 漢字用異体字セレクタ \SetCatcodeRange{"FE00}{"FE0F}{13}% Variation Selector @@ -215,6 +215,7 @@ }} \directlua{ + local utfchar, getcount = unicode.utf8.char, tex.getcount luatexja.listings.insert_cb = function() if not luatexja.listings.patched then luatexja.listings.patched = 1 @@ -225,7 +226,7 @@ local c = utf.sub(buf, i, i) local cu = utf.byte(c) if cu >= 0x80 and tex.getcatcode(cu) \string~= 13 then - ret = ret .. utf.char(1048575) % U+FFFFF + ret = ret .. utfchar(getcount('ltjlineendcomment')) end ret = ret .. c end @@ -244,7 +245,7 @@ % hook! \lst@AddToHook{Init}{% \luatexcatcodetable\CatcodeTableLTJlistings\ltj@@listing@jpcmd - \lccode`\~="FFFFF\lowercase{\def~{\ltj@lst@ProcessJALetter}}%" + \lccode`\~=\ltjlineendcomment\lowercase{\def~{\ltj@lst@ProcessJALetter}}%" \directlua{luatexja.listings.insert_cb()}% \if@ltj@lst@double \let\ltj@lst@hss@normal=\ltj@lst@hss@double @@ -263,7 +264,7 @@ \begingroup \catcode`\^^A=12 \catcode`\^^@=\active -\lccode`\$="FFFFF \catcode`\$=13 %" +\lccode`\$=\ltjlineendcomment \catcode`\$=13 %" \lowercase{% \gdef\ltj@lst@MakeActive@#1{\let\lst@next\relax% \ifx#1\relax @@ -364,7 +365,7 @@ {}% \fi% \ltj@lst@escape@setup#2% - #3\catcode"FFFFF=9\lst@escapebegin\expandafter\lst@next%" + #3\catcode\ltjlineendcomment=9\lst@escapebegin\expandafter\lst@next%" \fi}% {}} \def\ltj@lst@escape@setup#1{% @@ -376,7 +377,7 @@ }\endgroup } \begingroup - \lccode`\|="FFFFF \lowercase{%" + \lccode`\|=\ltjlineendcomment \lowercase{%" \gdef\ltj@lst@remove@jacmd#1{% \expandafter\ltj@lst@remove@jacmd@\detokenize{#1}|\@nil|} \gdef\ltj@lst@remove@jacmd@#1|{% 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 21ce7c9ac8d..bff08c3670c 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty @@ -79,6 +79,7 @@ % Therefore temporarily set \hbar=\relax. \let\ltj@tmpa\hbar \let\hbar\relax + \let\ltj@tmpb\iftipaonetoken \let\iftipaonetoken\relax \typeout{UTFencname: \UTFencname} |