diff options
Diffstat (limited to 'Master/texmf-dist/tex/luatex')
12 files changed, 1085 insertions, 106 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty index 0e10c457799..c14c52e93ca 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty @@ -64,13 +64,13 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja-adjust}[2016/04/03] + \ProvidesPackage{luatexja-adjust}[2016/05/15] \fi %</LaTeX> % Load core module if not yet. \ifx\luatexjacoreLoaded\@undefined \ifltj@in@latex %<*LaTeX> - \RequirePackage{luatexja}[2013/05/14] + \RequirePackage{luatexja}[2016/05/15] \else %<*!LaTeX> \input luatexja.sty % \fi %</LaTeX> diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty index c2e42fbbef6..defef8e1cef 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty @@ -64,13 +64,13 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja-otf}[2013/05/14] + \ProvidesPackage{luatexja-otf}[2016/05/15] \fi %</LaTeX> % Load core module if not yet. \ifx\luatexjacoreLoaded\@undefined \ifltj@in@latex %<*LaTeX> - \RequirePackage{luatexja}[2013/05/14] + \RequirePackage{luatexja}[2016/05/15] \else %<*!LaTeX> \input luatexja.sty % \fi %</LaTeX> @@ -94,7 +94,7 @@ %% Load ajmacros \ifltj@in@latex %<*LaTeX> - \RequirePackage{luatexja-ajmacros}[2013/05/14] + \RequirePackage{luatexja-ajmacros}[2014/07/02] \else %<*!LaTeX> \input luatexja-ajmacros.sty % \fi %</LaTeX> diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-base.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-base.sty index 1dc744450f0..918e7979026 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-base.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-base.sty @@ -13,7 +13,7 @@ \ifltj@in@latex %<*LaTeX> \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{ltj-base}[2014/07/18] + \ProvidesPackage{ltj-base}[2016/05/15] \fi %</LaTeX> %%------------------ Tiny helpers diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-compat-ptex.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-compat-ptex.sty deleted file mode 100644 index 956a0e95bc1..00000000000 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-compat-ptex.sty +++ /dev/null @@ -1,66 +0,0 @@ -% -% ltj-compat-ptex.sty -% - -%! これは外から読まれない -%% Avoid multiple loading. -\csname luatexjacompatptexLoaded\endcsname -\edef\ltj@compat@ptex@AtEnd{% -\catcode64=\the\catcode64% -\endlinechar=\the\endlinechar -\relax} -\catcode64=11 %<@> -\endlinechar=-1 % -\def\luatexjacompatptexLoaded{\endinput} - -%% Check if LaTeX is used. -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname RequirePackage\endcsname\relax %<*!LaTeX> - \expandafter\let\csname ifltj@in@latex\expandafter\endcsname - \csname iffalse\endcsname -\else %<*LaTeX> - \expandafter\let\csname ifltj@in@latex\expandafter\endcsname - \csname iftrue\endcsname - \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{ltj-compat-ptex}[2013/05/14] -\fi %</LaTeX> - -%% Load prerequisite packages. -\endlinechar=13 % -\ifltj@in@latex %<*LaTeX> - \RequirePackage{infwarerr} [2010/04/08] % v1.3 - \RequirePackage{ltxcmds} [2011/11/09] % v1.22 - \RequirePackage{xkeyval} [2012/10/14] % v2.6b -\else %<*!LaTeX> - \input infwarerr.sty - \input ltxcmds.sty - \input xkeyval -\fi %</LaTeX> -\endlinechar=-1 % - -\ifx\luatexjacompatLoaded\@undefined - \@PackageError{luatexja} - {This file must be loaded through 'luatexja-compat'} - {\InfWarErr@ehc} -\fi - -%%------------------ - -\endlinechar=13 -%! ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ -\def\getprebreakpenalty#1{\prebreakpenalty#1 } -\def\getpostbreakpenalty#1{\postbreakpenalty#1 } -\def\setprebreakpenalty#1#2{\prebreakpenalty#1=#2 } -\def\setpostbreakpenalty#1#2{\postbreakpenalty#1=#2 } -\def\getinhibitxspcode#1{\inhibitxspcode#1 } -\def\setinhibitxspcode#1#2{\inhibitxspcode#1=#2 } -\def\getxspcode#1{\xspcode#1 } -\def\setxspcode#1#2{\xspcode#1=#2 } - -%\endinput -%! ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑ - -%%------------------ all done -\ltj@compat@ptex@AtEnd -\endinput -%% EOF diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua index 87635b95aae..207d0e0058f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua @@ -269,6 +269,7 @@ do '\\endcsname=\\relax') return end + if not f then return end update_jfm_cache(j, f.size) local ad = identifiers[fn].parameters local sz = metrics[j].size_cache[f.size] @@ -659,6 +660,18 @@ do end ------------------------------------------------------------------------ +-- VERT VARIANT TABLE +------------------------------------------------------------------------ +local vert_form_table = { + [0x2013]=0xFE32, [0x2014]=0xFE31, [0x2025]=0xFE30, + [0xFF08]=0xFE35, [0xFF09]=0xFE36, [0xFF5B]=0xFE37, [0xFF5D]=0xFE38, + [0x3014]=0xFE39, [0x3015]=0xFE3A, [0x3010]=0xFE3B, [0x3011]=0xFE3C, + [0x300A]=0xFE3D, [0x300B]=0xFE3E, [0x3008]=0xFE3F, [0x3009]=0xFE40, + [0x300C]=0xFE41, [0x300D]=0xFE42, [0x300E]=0xFE43, [0x300F]=0xFE44, + [0xFF3B]=0xFE47, [0xFF3D]=0xFE48, [0xFF3F]=0xFE33, +} + +------------------------------------------------------------------------ -- 追加のフォント情報 ------------------------------------------------------------------------ font_extra_info = {} @@ -682,7 +695,7 @@ do end local sort = table.sort - local function add_fl_table(dest, glyphs, unitable, asc_des, units) + local function add_fl_table(dest, glyphs, unitable, asc_des, units, id) local glyphmin, glyphmax = glyphs.glyphmin, glyphs.glyphmax if glyphmax < 0 then return dest end local tg = glyphs.glyphs @@ -707,9 +720,20 @@ do end end end + -- vertical form + local gi = unitable[gv.name] + if gi then + if unitable[gv.name .. '.vert'] then + dest = dest or {}; dest[gi] = dest[gi] or {}; + dest[gi].vform = unitable[gv.name .. '.vert'] + elseif id.characters[gi] and vert_form_table[gi] then + dest = dest or {}; dest[gi] = dest[gi] or {}; + dest[gi].vform = vert_form_table[gi] + end + end -- vertical metric local vw, tsb, vk = glyph_vmetric(gv) - local gi = unitable[i] + local gi = unitable[gv.name] if gi and vw and vw~=asc_des then -- We do not use tsidebearing, since (1) fontloader does not read VORG table -- and (2) 'tsidebearing' doea not appear in the returned table by fontloader.fields. @@ -757,7 +781,7 @@ do end end dest = add_fl_table(dest, fl, unicodes, - fl.ascent + fl.descent, fl.units_per_em) + fl.ascent + fl.descent, fl.units_per_em, id) end if fl.subfonts then for _,v in pairs(fl.subfonts) do @@ -770,7 +794,7 @@ do end for _,v in pairs(fl.subfonts) do dest = add_fl_table(dest, v, unicodes, - fl.ascent + fl.descent, fl.units_per_em) + fl.ascent + fl.descent, fl.units_per_em, id) end end if dest then dest.unicodes = unicodes end @@ -796,7 +820,7 @@ end -- do - local cache_ver = 9 + local cache_ver = 11 local checksum = file.checksum local function prepare_extra_data_base(id) @@ -994,15 +1018,3 @@ do end end ------------------------------------------------------------------------- --- VERT VARIANT TABLE ------------------------------------------------------------------------- -vert_form_table = { - [0x2013]=0xFE32, [0x2014]=0xFE31, [0x2025]=0xFE30, - [0xFF08]=0xFE35, [0xFF09]=0xFE36, [0xFF5B]=0xFE37, [0xFF5D]=0xFE38, - [0x3014]=0xFE39, [0x3015]=0xFE3A, [0x3010]=0xFE3B, [0x3011]=0xFE3C, - [0x300A]=0xFE3D, [0x300B]=0xFE3E, [0x3008]=0xFE3F, [0x3009]=0xFE40, - [0x300C]=0xFE41, [0x300D]=0xFE42, [0x300E]=0xFE43, [0x300F]=0xFE44, - [0xFF3B]=0xFE47, [0xFF3D]=0xFE48, [0xFF3F]=0xFE33, -} -setmetatable(vert_form_table, {__index=function(t,k) return k end}); diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua new file mode 100644 index 00000000000..7204c11c820 --- /dev/null +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua @@ -0,0 +1,1033 @@ +return { + [0]=500, + { + ["shrink"]=26214, + ["shrink_order"]=0, + ["stretch"]=26214, + ["stretch_order"]=0, + ["width"]=0, + }, + { + ["shrink"]=65536, + ["shrink_order"]=0, + ["stretch"]=65536, + ["stretch_order"]=0, + ["width"]=157649, + }, + [256]=51, + [512]=52, + [768]=53, + [1024]=12295, + [1025]=19968, + [1026]=20108, + [1027]=19977, + [1028]=22235, + [1029]=20116, + [1030]=20845, + [1031]=19971, + [1032]=20843, + [1033]=20061, + [2097185]=10000, + [2097186]=10000, + [2097191]=10000, + [2097193]=10000, + [2097194]=500, + [2097195]=500, + [2097197]=10000, + [2097198]=10000, + [2097199]=500, + [2097210]=10000, + [2097211]=10000, + [2097215]=10000, + [2097245]=10000, + [2097322]=10000, + [2097330]=10000, + [2097331]=10000, + [2097332]=10000, + [2097337]=10000, + [2097338]=10000, + [2097339]=10000, + [2097872]=10000, + [2105369]=10000, + [2105373]=10000, + [2105381]=250, + [2105382]=250, + [2105404]=10000, + [2105415]=10000, + [2105416]=10000, + [2105417]=10000, + [2105634]=10000, + [2105874]=200, + [2107782]=10000, + [2109441]=10000, + [2109442]=10000, + [2109445]=10000, + [2109449]=10000, + [2109451]=10000, + [2109453]=10000, + [2109455]=10000, + [2109457]=10000, + [2109461]=10000, + [2109463]=10000, + [2109465]=10000, + [2109471]=10000, + [2109491]=10000, + [2109492]=10000, + [2109493]=10000, + [2109499]=10000, + [2109505]=150, + [2109507]=150, + [2109509]=150, + [2109511]=150, + [2109513]=150, + [2109539]=150, + [2109571]=150, + [2109573]=150, + [2109575]=150, + [2109582]=150, + [2109589]=150, + [2109590]=150, + [2109595]=10000, + [2109596]=10000, + [2109597]=10000, + [2109598]=10000, + [2109601]=150, + [2109603]=150, + [2109605]=150, + [2109607]=150, + [2109609]=150, + [2109635]=150, + [2109667]=150, + [2109669]=150, + [2109671]=150, + [2109678]=150, + [2109685]=150, + [2109686]=150, + [2109691]=10000, + [2109692]=10000, + [2109693]=10000, + [2109694]=10000, + [2109936]=150, + [2109937]=150, + [2109938]=150, + [2109939]=150, + [2109940]=150, + [2109941]=150, + [2109942]=150, + [2109943]=150, + [2109944]=150, + [2109945]=150, + [2109946]=150, + [2109947]=150, + [2109948]=150, + [2109949]=150, + [2109950]=150, + [2109951]=150, + [2162433]=10000, + [2162441]=10000, + [2162443]=200, + [2162444]=10000, + [2162445]=200, + [2162446]=10000, + [2162458]=10000, + [2162459]=10000, + [2162461]=200, + [2162463]=10000, + [2162493]=10000, + [2162525]=10000, + [2162528]=10000, + [2162529]=10000, + [2162531]=10000, + [2162532]=10000, + [2162590]=10000, + [2162591]=10000, + [4194339]=500, + [4194340]=500, + [4194341]=500, + [4194342]=500, + [4194344]=10000, + [4194395]=10000, + [4194400]=10000, + [4194465]=10000, + [4194475]=10000, + [4194495]=10000, + [4202520]=10000, + [4202524]=10000, + [4202668]=10000, + [4204933]=10000, + [4206600]=10000, + [4206602]=10000, + [4206604]=10000, + [4206606]=10000, + [4206608]=10000, + [4206612]=10000, + [4206614]=10000, + [4206616]=10000, + [4206621]=10000, + [4259587]=200, + [4259588]=200, + [4259589]=200, + [4259590]=200, + [4259592]=10000, + [4259643]=10000, + [4259648]=10000, + [4259675]=10000, + [4259679]=10000, + [4259682]=10000, + [6299648]=1, + [6299649]=1, + [6299650]=1, + [6299651]=1, + [6299652]=1, + [6299653]=1, + [6299654]=1, + [6299655]=1, + [6299656]=1, + [6299657]=1, + [6299658]=1, + [6299659]=1, + [6299660]=1, + [6299661]=1, + [6299662]=1, + [6299663]=1, + [6299664]=1, + [6299665]=1, + [6299666]=1, + [6299667]=1, + [6299668]=1, + [6299669]=1, + [6299670]=1, + [6299671]=1, + [6299672]=1, + [6299673]=1, + [6299674]=1, + [6299675]=1, + [6299676]=1, + [6299677]=1, + [6299678]=1, + [6299679]=1, + [6299680]=1, + [6299681]=1, + [6299682]=1, + [6299683]=1, + [6299684]=1, + [6299685]=1, + [6299686]=1, + [6299687]=1, + [6299688]=1, + [6299689]=1, + [6299690]=1, + [6299691]=1, + [6299692]=1, + [6299693]=1, + [6299694]=1, + [6299695]=1, + [6299696]=1, + [6299697]=1, + [6299698]=1, + [6299699]=1, + [6299700]=1, + [6299701]=1, + [6299702]=1, + [6299703]=1, + [6299704]=1, + [6299705]=1, + [6299706]=1, + [6299707]=1, + [6299708]=1, + [6299709]=1, + [6299710]=1, + [6299711]=1, + [6299712]=1, + [6299713]=1, + [6299714]=1, + [6299715]=1, + [6299716]=1, + [6299717]=1, + [6299718]=1, + [6299719]=1, + [6299720]=1, + [6299721]=1, + [6299722]=1, + [6299723]=1, + [6299724]=1, + [6299725]=1, + [6299726]=1, + [6299727]=1, + [6299728]=1, + [6299729]=1, + [6299730]=1, + [6299731]=1, + [6299732]=1, + [6299733]=1, + [6299734]=1, + [6299735]=1, + [6299736]=1, + [6299737]=1, + [6299738]=1, + [6299739]=1, + [6299740]=1, + [6299741]=1, + [6299742]=1, + [6299743]=1, + [6299744]=1, + [6299745]=1, + [6299746]=1, + [6299747]=1, + [6299748]=1, + [6299749]=1, + [6299750]=1, + [6299751]=1, + [6299752]=1, + [6299753]=1, + [6299754]=1, + [6299755]=1, + [6299756]=1, + [6299757]=1, + [6299758]=1, + [6299759]=1, + [6303744]=1, + [6303745]=1, + [6303746]=1, + [6303747]=1, + [6303748]=1, + [6303749]=1, + [6303750]=1, + [6303751]=1, + [6303752]=1, + [6303753]=1, + [6303754]=1, + [6303755]=1, + [6303756]=1, + [6303757]=1, + [6303758]=1, + [6303759]=1, + [6303760]=1, + [6303761]=1, + [6303762]=1, + [6303763]=1, + [6303764]=1, + [6303765]=1, + [6303766]=1, + [6303767]=1, + [6303768]=1, + [6303769]=1, + [6303770]=1, + [6303771]=1, + [6303772]=1, + [6303773]=1, + [6303774]=1, + [6303775]=1, + [6303776]=1, + [6303777]=1, + [6303778]=1, + [6303779]=1, + [6303780]=1, + [6303781]=1, + [6303782]=1, + [6303783]=1, + [6303784]=1, + [6303785]=1, + [6303786]=1, + [6303787]=1, + [6303788]=1, + [6303789]=1, + [6303790]=1, + [6303791]=1, + [6303792]=1, + [6303793]=1, + [6303794]=1, + [6303795]=1, + [6303796]=1, + [6303797]=1, + [6303798]=1, + [6303799]=1, + [6303800]=1, + [6303801]=1, + [6303802]=1, + [6303803]=1, + [6303804]=1, + [6303805]=1, + [6303806]=1, + [6303807]=1, + [6356736]=1, + [6356737]=1, + [6356738]=1, + [6356739]=1, + [6356740]=1, + [6356741]=1, + [6356742]=1, + [6356743]=1, + [6356744]=1, + [6356745]=1, + [6356746]=1, + [6356747]=1, + [6356748]=1, + [6356749]=1, + [6356750]=1, + [6356751]=1, + [6356752]=1, + [6356753]=1, + [6356754]=1, + [6356755]=1, + [6356756]=1, + [6356757]=1, + [6356758]=1, + [6356759]=1, + [6356760]=1, + [6356761]=1, + [6356762]=1, + [6356763]=1, + [6356764]=1, + [6356765]=1, + [6356766]=1, + [6356767]=1, + [6356768]=1, + [6356769]=1, + [6356770]=1, + [6356771]=1, + [6356772]=1, + [6356773]=1, + [6356774]=1, + [6356775]=1, + [6356776]=1, + [6356777]=1, + [6356778]=1, + [6356779]=1, + [6356780]=1, + [6356781]=1, + [6356782]=1, + [6356783]=1, + [6356784]=1, + [6356785]=1, + [6356786]=1, + [6356787]=1, + [6356788]=1, + [6356789]=1, + [6356790]=1, + [6356791]=1, + [6356792]=1, + [6356793]=1, + [6356794]=1, + [6356795]=1, + [6356796]=1, + [6356797]=1, + [6356798]=1, + [6356799]=1, + [6356800]=1, + [6356801]=1, + [6356802]=1, + [6356803]=1, + [6356804]=1, + [6356805]=1, + [6356806]=1, + [6356807]=1, + [6356808]=1, + [6356809]=1, + [6356810]=1, + [6356811]=1, + [6356812]=1, + [6356813]=1, + [6356814]=1, + [6356815]=1, + [6356816]=1, + [6356817]=1, + [6356818]=1, + [6356819]=1, + [6356820]=1, + [6356821]=1, + [6356822]=1, + [6356823]=1, + [6356824]=1, + [6356825]=1, + [6356826]=1, + [6356827]=1, + [6356828]=1, + [6356829]=1, + [6356830]=1, + [6356831]=1, + [6356832]=1, + [6356833]=1, + [6356834]=1, + [6356835]=1, + [6356836]=1, + [6356837]=1, + [6356838]=1, + [6356839]=1, + [6356840]=1, + [6356841]=1, + [6356842]=1, + [6356843]=1, + [6356844]=1, + [6356845]=1, + [6356846]=1, + [6356847]=1, + [6356848]=1, + [6356849]=1, + [6356850]=1, + [6356851]=1, + [6356852]=1, + [6356853]=1, + [6356854]=1, + [6356855]=1, + [6356856]=1, + [6356857]=1, + [6356858]=1, + [6356859]=1, + [6356860]=1, + [6356861]=1, + [6356862]=1, + [6356863]=1, + [6356864]=1, + [6356865]=1, + [6356866]=1, + [6356867]=1, + [6356868]=1, + [6356869]=1, + [6356870]=1, + [6356871]=1, + [6356872]=1, + [6356873]=1, + [6356874]=1, + [6356875]=1, + [6356876]=1, + [6356877]=1, + [6356878]=1, + [6356879]=1, + [6356880]=1, + [6356881]=1, + [6356882]=1, + [6356883]=1, + [6356884]=1, + [6356885]=1, + [6356886]=1, + [6356887]=1, + [6356888]=1, + [6356889]=1, + [6356890]=1, + [6356891]=1, + [6356892]=1, + [6356893]=1, + [6356894]=1, + [6356895]=1, + [6356896]=1, + [6356897]=1, + [6356898]=1, + [6356899]=1, + [6356900]=1, + [6356901]=1, + [6356902]=1, + [6356903]=1, + [6356904]=1, + [6356905]=1, + [6356906]=1, + [6356907]=1, + [6356908]=1, + [6356909]=1, + [6356910]=1, + [6356911]=1, + [6356912]=1, + [6356913]=1, + [6356914]=1, + [6356915]=1, + [6356916]=1, + [6356917]=1, + [6356918]=1, + [6356919]=1, + [6356920]=1, + [6356921]=1, + [6356922]=1, + [6356923]=1, + [6356924]=1, + [6356925]=1, + [6356926]=1, + [6356927]=1, + [6356928]=1, + [6356929]=1, + [6356930]=1, + [6356931]=1, + [6356932]=1, + [6356933]=1, + [6356934]=1, + [6356935]=1, + [6356936]=1, + [6356937]=1, + [6356938]=1, + [6356939]=1, + [6356940]=1, + [6356941]=1, + [6356942]=1, + [6356943]=1, + [6356944]=1, + [6356945]=1, + [6356946]=1, + [6356947]=1, + [6356948]=1, + [6356949]=1, + [6356950]=1, + [6356951]=1, + [6356952]=1, + [6356953]=1, + [6356954]=1, + [6356955]=1, + [6356956]=1, + [6356957]=1, + [6356958]=1, + [6356959]=1, + [6356960]=1, + [6356961]=1, + [6356962]=1, + [6356963]=1, + [6356964]=1, + [6356965]=1, + [6356966]=1, + [6356967]=1, + [6356968]=1, + [6356969]=1, + [6356970]=1, + [6356971]=1, + [6356972]=1, + [6356973]=1, + [6356974]=1, + [6356975]=1, + [8388608]=0, + [8388609]=0, + [8388610]=0, + [8388611]=0, + [8388612]=0, + [8388613]=0, + [8388614]=0, + [8388615]=0, + [8388616]=0, + [8388617]=0, + [8388618]=0, + [8388619]=0, + [8388620]=0, + [8388621]=0, + [8388622]=0, + [8388623]=0, + [8388624]=0, + [8388625]=0, + [8388626]=0, + [8388627]=0, + [8388628]=0, + [8388629]=0, + [8388630]=0, + [8388631]=0, + [8388632]=0, + [8388633]=0, + [8388634]=0, + [8388635]=0, + [8388636]=0, + [8388637]=0, + [8388638]=0, + [8388639]=0, + [8388640]=0, + [8388641]=0, + [8388642]=0, + [8388643]=0, + [8388644]=0, + [8388645]=0, + [8388646]=0, + [8388647]=2, + [8388648]=1, + [8388649]=2, + [8388650]=0, + [8388651]=0, + [8388652]=2, + [8388653]=0, + [8388654]=2, + [8388655]=0, + [8388656]=3, + [8388657]=3, + [8388658]=3, + [8388659]=3, + [8388660]=3, + [8388661]=3, + [8388662]=3, + [8388663]=3, + [8388664]=3, + [8388665]=3, + [8388666]=0, + [8388667]=2, + [8388668]=0, + [8388669]=0, + [8388670]=0, + [8388671]=0, + [8388672]=0, + [8388673]=3, + [8388674]=3, + [8388675]=3, + [8388676]=3, + [8388677]=3, + [8388678]=3, + [8388679]=3, + [8388680]=3, + [8388681]=3, + [8388682]=3, + [8388683]=3, + [8388684]=3, + [8388685]=3, + [8388686]=3, + [8388687]=3, + [8388688]=3, + [8388689]=3, + [8388690]=3, + [8388691]=3, + [8388692]=3, + [8388693]=3, + [8388694]=3, + [8388695]=3, + [8388696]=3, + [8388697]=3, + [8388698]=3, + [8388699]=1, + [8388700]=0, + [8388701]=2, + [8388702]=0, + [8388703]=0, + [8388704]=1, + [8388705]=3, + [8388706]=3, + [8388707]=3, + [8388708]=3, + [8388709]=3, + [8388710]=3, + [8388711]=3, + [8388712]=3, + [8388713]=3, + [8388714]=3, + [8388715]=3, + [8388716]=3, + [8388717]=3, + [8388718]=3, + [8388719]=3, + [8388720]=3, + [8388721]=3, + [8388722]=3, + [8388723]=3, + [8388724]=3, + [8388725]=3, + [8388726]=3, + [8388727]=3, + [8388728]=3, + [8388729]=3, + [8388730]=3, + [8388731]=0, + [8388732]=0, + [8388733]=0, + [8388734]=0, + [8388735]=0, + [8388736]=3, + [8388737]=3, + [8388738]=3, + [8388739]=3, + [8388740]=3, + [8388741]=3, + [8388742]=3, + [8388743]=3, + [8388744]=3, + [8388745]=3, + [8388746]=3, + [8388747]=3, + [8388748]=3, + [8388749]=3, + [8388750]=3, + [8388751]=3, + [8388752]=3, + [8388753]=3, + [8388754]=3, + [8388755]=3, + [8388756]=3, + [8388757]=3, + [8388758]=3, + [8388759]=3, + [8388760]=3, + [8388761]=3, + [8388762]=3, + [8388763]=3, + [8388764]=3, + [8388765]=3, + [8388766]=3, + [8388767]=3, + [8388768]=3, + [8388769]=1, + [8388770]=3, + [8388771]=3, + [8388772]=3, + [8388773]=0, + [8388774]=3, + [8388775]=3, + [8388776]=3, + [8388777]=3, + [8388778]=2, + [8388779]=1, + [8388780]=3, + [8388781]=3, + [8388782]=3, + [8388783]=3, + [8388784]=2, + [8388785]=3, + [8388786]=2, + [8388787]=2, + [8388788]=3, + [8388789]=3, + [8388790]=3, + [8388791]=3, + [8388792]=3, + [8388793]=2, + [8388794]=2, + [8388795]=2, + [8388796]=3, + [8388797]=3, + [8388798]=3, + [8388799]=1, + [8388800]=3, + [8388801]=3, + [8388802]=3, + [8388803]=3, + [8388804]=3, + [8388805]=3, + [8388806]=3, + [8388807]=3, + [8388808]=3, + [8388809]=3, + [8388810]=3, + [8388811]=3, + [8388812]=3, + [8388813]=3, + [8388814]=3, + [8388815]=3, + [8388816]=3, + [8388817]=3, + [8388818]=3, + [8388819]=3, + [8388820]=3, + [8388821]=3, + [8388822]=3, + [8388823]=3, + [8388824]=3, + [8388825]=3, + [8388826]=3, + [8388827]=3, + [8388828]=3, + [8388829]=3, + [8388830]=3, + [8388831]=3, + [8388832]=3, + [8388833]=3, + [8388834]=3, + [8388835]=3, + [8388836]=3, + [8388837]=3, + [8388838]=3, + [8388839]=3, + [8388840]=3, + [8388841]=3, + [8388842]=3, + [8388843]=3, + [8388844]=3, + [8388845]=3, + [8388846]=3, + [8388847]=3, + [8388848]=3, + [8388849]=3, + [8388850]=3, + [8388851]=3, + [8388852]=3, + [8388853]=3, + [8388854]=3, + [8388855]=3, + [8388856]=3, + [8388857]=3, + [8388858]=3, + [8388859]=3, + [8388860]=3, + [8388861]=3, + [8388862]=3, + [8388863]=3, + [8396820]=0, + [8396821]=0, + [8396824]=1, + [8396825]=2, + [8396828]=1, + [8396829]=2, + [8396838]=0, + [8396850]=2, + [8396851]=2, + [8396860]=2, + [8396871]=2, + [8396872]=2, + [8396873]=2, + [8396972]=1, + [8397090]=2, + [8398080]=0, + [8398081]=0, + [8398082]=0, + [8398083]=0, + [8398084]=0, + [8398085]=0, + [8398086]=0, + [8398087]=0, + [8398088]=0, + [8398089]=0, + [8398090]=0, + [8398091]=0, + [8398092]=0, + [8398093]=0, + [8398094]=0, + [8398095]=0, + [8398096]=0, + [8398097]=0, + [8398098]=0, + [8398099]=0, + [8398100]=0, + [8398101]=0, + [8398102]=0, + [8398103]=0, + [8398104]=0, + [8398105]=0, + [8398106]=0, + [8398107]=0, + [8398108]=0, + [8398109]=0, + [8398110]=0, + [8398111]=0, + [8398112]=0, + [8398113]=0, + [8398114]=0, + [8398115]=0, + [8398116]=0, + [8398117]=0, + [8398118]=0, + [8398119]=0, + [8398120]=0, + [8398121]=0, + [8398122]=0, + [8398123]=0, + [8398124]=0, + [8398125]=0, + [8398126]=0, + [8398127]=0, + [8398128]=0, + [8398129]=0, + [8398130]=0, + [8398131]=0, + [8398132]=0, + [8398133]=0, + [8398134]=0, + [8398135]=0, + [8398136]=0, + [8398137]=0, + [8398138]=0, + [8398139]=0, + [8398140]=0, + [8398141]=0, + [8398142]=0, + [8398143]=0, + [8398144]=0, + [8398145]=0, + [8398146]=0, + [8398147]=0, + [8398148]=0, + [8398149]=0, + [8398150]=0, + [8398151]=0, + [8398152]=0, + [8398153]=0, + [8398154]=0, + [8398155]=0, + [8398156]=0, + [8398157]=0, + [8398158]=0, + [8398159]=0, + [8398160]=0, + [8398161]=0, + [8398162]=0, + [8398163]=0, + [8398164]=0, + [8398165]=0, + [8398166]=0, + [8398167]=0, + [8398168]=0, + [8398169]=0, + [8398170]=0, + [8398171]=0, + [8398172]=0, + [8398173]=0, + [8398174]=0, + [8398175]=0, + [8398176]=0, + [8398177]=0, + [8398178]=0, + [8398179]=0, + [8398180]=0, + [8398181]=0, + [8398182]=0, + [8398183]=0, + [8398184]=0, + [8398185]=0, + [8398186]=0, + [8398187]=0, + [8398188]=0, + [8398189]=0, + [8398190]=0, + [8398191]=0, + [8398192]=0, + [8398193]=0, + [8398194]=0, + [8398195]=0, + [8398196]=0, + [8398197]=0, + [8398198]=0, + [8398199]=0, + [8398200]=0, + [8398201]=0, + [8398202]=0, + [8398203]=0, + [8398204]=0, + [8398205]=0, + [8398206]=0, + [8398207]=0, + [8399237]=1, + [8399238]=2, + [8400897]=2, + [8400898]=2, + [8400904]=1, + [8400905]=2, + [8400906]=1, + [8400907]=2, + [8400908]=1, + [8400909]=2, + [8400910]=1, + [8400911]=2, + [8400912]=1, + [8400913]=2, + [8400916]=1, + [8400917]=2, + [8400918]=1, + [8400919]=2, + [8400920]=1, + [8400921]=2, + [8400924]=0, + [8400925]=1, + [8400927]=2, + [8453896]=1, + [8453897]=2, + [8453900]=2, + [8453902]=2, + [8453915]=2, + [8453919]=2, + [8453947]=1, + [8453949]=2, + [8453979]=1, + [8453981]=2, + [8453982]=0, + [8453983]=1, + [8453984]=2, + [8453985]=2, + [8453986]=1, + [8453987]=2, + [8453988]=2, + [8454117]=0, +} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty index eaa55d1fd34..9a9c837411f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty @@ -12,7 +12,7 @@ \def\luatexjalatexLoaded{\endinput} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ltj-latex}[2015/09/21 LaTeX support of LuaTeX-ja] +\ProvidesPackage{ltj-latex}[2016/05/15 LaTeX support of LuaTeX-ja] % cleanup at end of the document %\let\ltj@@orig@end=\@@end diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty index a4f8fad8337..95b225c7020 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty @@ -14,7 +14,7 @@ \ifltj@in@latex %<*LaTeX> \NeedsTeXFormat{LaTeX2e} \PackageWarning{ltj-plain}{Don't load this package directly; load luatexja.sty instead.} - \ProvidesPackage{ltj-plain}[2015/09/21] + \ProvidesPackage{ltj-plain}[2016/05/15] \fi %</LaTeX> %%------------------ diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua index 8712f570ffb..99b8d60f686 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua @@ -42,6 +42,7 @@ local attr_icflag = luatexbase.attributes['ltj@icflag'] local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct local ltjs_orig_char_table = ltjs.orig_char_table local ltjf_replace_altfont = ltjf.replace_altfont +local ltjf_font_extra_info = ltjf.font_extra_info local attr_orig_char = luatexbase.attributes['ltj@origchar'] local STCK = luatexja.userid_table.STCK local DIR = luatexja.userid_table.DIR @@ -121,7 +122,6 @@ end -- mode: true iff this function is called from hpack_filter local ltjs_report_stack_level = ltjs.report_stack_level -local ltjf_vert_form_table = ltjf.vert_form_table local ltjf_font_metric_table = ltjf.font_metric_table local font_getfont = font.getfont local function set_box_stack_level(head, mode) @@ -140,8 +140,9 @@ local function set_box_stack_level(head, mode) local nf = ltjf_replace_altfont( has_attr(p, attr_curtfnt) or getfont(p) , pc) setfield(p, 'font', nf) if ltjf_font_metric_table[nf].vert_activated then - pc = ltjf_vert_form_table [getchar(p)] - if font_getfont(nf).characters[pc] then setfield(p, 'char', pc) end + local pc = getchar(p) + pc = (ltjf_font_extra_info[nf] and ltjf_font_extra_info[nf][pc] and ltjf_font_extra_info[nf][pc].vform) + if pc and font_getfont(nf).characters[pc] then setfield(p, 'char', pc) end end end end diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty index 71d14ce8b0f..f6d0e86711d 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty @@ -65,7 +65,7 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja-core}[2016/03/31 Core of LuaTeX-ja] + \ProvidesPackage{luatexja-core}[2016/05/15 Core of LuaTeX-ja] \fi %</LaTeX> %% Load prerequisite packages. @@ -74,7 +74,7 @@ %! 外部パッケージは普通の \endlinechar で読まないと危険. \ifltj@in@latex %<*LaTeX> \RequirePackage{luatexbase} - \RequirePackage{luaotfload} [2013/12/31] % v2.3 + \RequirePackage{luaotfload} \RequirePackage{ltxcmds} [2011/11/09] % v1.22 \RequirePackage{pdftexcmds} [2011/11/29] % v0.20 \RequirePackage{xkeyval} [2012/10/14] % v2.6b @@ -112,7 +112,7 @@ %%------------------ \endlinechar=13 -%! この中に master の luatexja-core.sty の内容を挿入する + %! ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ % LuaTeX-ja core TeX source @@ -189,7 +189,7 @@ %%%%%%%% Load all sub-packages. \ifltj@in@latex %<*LaTeX> - \RequirePackage{ltj-base} [2013/05/14] + \RequirePackage{ltj-base} [2016/05/15] \else %<*!LaTeX> \input ltj-base.sty % \fi %</LaTeX> @@ -761,7 +761,7 @@ %%------------------ Load module for the format \ifltj@in@latex %<*LaTeX> - \RequirePackage{ltj-latex}[2013/05/14] + \RequirePackage{ltj-latex}[2016/05/15] \else\ifltj@in@plain %<*plain> \input ltj-plain.sty % \fi\fi %</LaTeX|plain> diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty index 93ebd9a16f3..fe5cf235f5a 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty @@ -34,7 +34,7 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja}[2016/03/31 Japanese Typesetting with Lua(La)TeX] + \ProvidesPackage{luatexja}[2016/05/12 Japanese Typesetting with Lua(La)TeX] \fi %</LaTeX> \directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs @@ -42,7 +42,7 @@ %% Load all sub-packages. \ifltj@in@latex %<*LaTeX> %% \RequirePackage{expl3} needed if the version of l3kernel is v6111 - \RequirePackage{luatexja-core} [2016/03/31] + \RequirePackage{luatexja-core} [2016/05/15] \RequirePackage{luatexja-compat}[2013/05/14] \else %<*!LaTeX> \input luatexja-core.sty % diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty index 2d577fc687a..67d292381af 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty @@ -171,11 +171,6 @@ \unless\ifnum\ltjgetparameter{direction}=3 \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 - \else\hbox to\z@{\hskip-.25\zw\raise.9\zh\@makefnmark\hss}\fi - \ifhmode\spacefactor\@x@sf\fi\relax} \begingroup \@ifpackageloaded{hyperref} {\def\ltj@setrefprefix{real}} @@ -202,6 +197,10 @@ \newcount\minute %%% etoolbox is loaded by everyhook \ifltj@everyhook@avail + \patchcmd{\@footnotemark}{\@makefnmark}{% + \unless\ifnum\ltjgetparameter{direction}=3 \@makefnmark% + \else\hbox to\z@{\hskip-.25\zw\raise.9\zh\@makefnmark\hss}\fi% + }{}{} \patchcmd{\@tabular}{\leavevmode}{\leavevmode\null}{}{} \apptocmd{\endtabular}{\null}{}{} \expandafter \let \csname endtabular*\endcsname = \endtabular |