From 6ae83d3bdc0271cb972fd7e6c763c848e564635b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 31 Mar 2016 21:16:29 +0000 Subject: luatexja (31mar16) git-svn-id: svn://tug.org/texlive/trunk@40198 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/luatex/luatexja/ltj-inputbuf.lua | 12 +- .../texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua | 22 +- .../texmf-dist/tex/luatex/luatexja/ltj-jfont.lua | 43 +-- .../tex/luatex/luatexja/ltj-setwidth.lua | 6 +- .../texmf-dist/tex/luatex/luatexja/ltjsarticle.cls | 324 ++++++++++---------- Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls | 328 ++++++++++---------- .../texmf-dist/tex/luatex/luatexja/ltjskiyou.cls | 329 ++++++++++----------- Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls | 298 +++++++++---------- .../tex/luatex/luatexja/luatexja-core.sty | 8 +- Master/texmf-dist/tex/luatex/luatexja/luatexja.lua | 1 + Master/texmf-dist/tex/luatex/luatexja/luatexja.sty | 4 +- .../tex/luatex/luatexja/patches/lltjp-fontspec.sty | 44 ++- .../tex/luatex/luatexja/patches/lltjp-listings.sty | 15 +- .../tex/luatex/luatexja/patches/lltjp-xunicode.sty | 1 + 14 files changed, 700 insertions(+), 735 deletions(-) (limited to 'Master/texmf-dist/tex/luatex') diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua index cec74cfc232..f8a7b578629 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua @@ -8,18 +8,18 @@ luatexja.load_module('charrange'); local ltjc = luatexja.charrange require("unicode") local utflen = unicode.utf8.len local utfbyte = unicode.utf8.byte +local utfchar = unicode.utf8.char local node_new = node.new local node_free = node.free local id_glyph = node.id('glyph') -local getcatcode = tex.getcatcode +local getcatcode, getcount = tex.getcatcode, tex.getcount local ltjc_is_japanese_char_curlist = ltjc.is_japanese_char_curlist -local FFFFF = string.char(0xF3,0xBF,0xBF,0xBF) --- the following function is modified from jafontspec.lua (by K. Maeda). --- Instead of "%", we use U+FFFFF for suppressing spaces. --DEBUG require"socket" local time_line = 0 -local start_time_measure, stop_time_measure +local start_time_measure, stop_time_measure = ltjb.start_time_measure, ltjb.stop_time_measure local function add_comment(buffer) start_time_measure('inputbuf') @@ -33,12 +33,12 @@ local function add_comment(buffer) if c>=0x80 then local ct = getcatcode(c) local te = tex.endlinechar - local ctl = (te ~= -1) and (getcatcode(te)==5) and (getcatcode(0xFFFFF)==14) + local ctl = (te ~= -1) and (getcatcode(te)==5) and (getcatcode(getcount('ltjlineendcomment'))==14) -- Is the catcode of endline character is 5 (end-of-line)? - -- Is the catcode of U+FFFFF (new comment char) is 14 (comment)? + -- Is the catcode of \ltjlineendcomment (new comment char) is 14 (comment)? if ((ct==11) or (ct==12)) and ctl then if ltjc_is_japanese_char_curlist(c) then - buffer = buffer .. FFFFF -- U+FFFFF + buffer = buffer .. utfchar(getcount('ltjlineendcomment')) end end end diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua index a63c270e676..9a638e38928 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua @@ -3,7 +3,7 @@ -- luatexbase.provides_module({ name = 'luatexja.jfmglue', - date = '2015/05/03', + date = '2016/03/31', description = 'Insertion process of JFM glues and kanjiskip', }) module('luatexja.jfmglue', package.seeall) @@ -283,8 +283,8 @@ do local traverse = Dnode.traverse local function check_next_ickern(lp) - if lp and getid(lp) == id_kern and ITALIC == get_attr_icflag(lp) then - set_attr(lp, attr_icflag, IC_PROCESSED) + if lp and getid(lp) == id_kern and ( getsubtype(lp)==3 or ITALIC == get_attr_icflag(lp)) then + set_attr(lp, attr_icflag, IC_PROCESSED); Np.last = lp; return node_next(lp) else Np.last = Np.nuc; return lp @@ -318,6 +318,7 @@ end local ltjw_apply_ashift_math = ltjw.apply_ashift_math local ltjw_apply_ashift_disc = ltjw.apply_ashift_disc local min, max = math.min, math.max +local rule_subtype = (status.luatex_version>=85) and 3 or 0 local function calc_np_aux_glyph_common(lp) Np.nuc = lp Np.first= (Np.first or lp) @@ -366,7 +367,7 @@ local function calc_np_aux_glyph_common(lp) lx = node_next(node_next(lx)) elseif ls==0 then Np.last = lx - elseif (ls==1 and lai==ITALIC) then + elseif (ls==3) or (lai==ITALIC) then Np.last = lx; set_attr(lx, attr_icflag, IC_PROCESSED) else lp=lx; break @@ -378,7 +379,7 @@ local function calc_np_aux_glyph_common(lp) end local r if adj_depth>node_depth then - r = node_new(id_rule) + r = node_new(id_rule,rule_subtype) setfield(r, 'width', 0); setfield(r, 'height', 0) setfield(r, 'depth',adj_depth); setfield(r, 'dir', tex_dir) set_attr(r, attr_icflag, PROCESSED) @@ -519,7 +520,11 @@ local calc_np_auxtable = { end, } calc_np_auxtable[id_rule] = calc_np_auxtable.box_like -calc_np_auxtable[13] = calc_np_auxtable.box_like +if status.luatex_version>=85 then + calc_np_auxtable[15] = calc_np_auxtable.box_like +else + calc_np_auxtable[13] = calc_np_auxtable.box_like +end calc_np_auxtable[id_ins] = calc_np_auxtable.skip calc_np_auxtable[id_mark] = calc_np_auxtable.skip calc_np_auxtable[id_adjust] = calc_np_auxtable.skip @@ -541,7 +546,7 @@ function calc_np(last, lp) for k = 1,#Bp do Bp[k] = nil end while lp ~= last do local lpa = has_attr(lp, attr_icflag) or 0 - -- unbox 由来ノードの検出 + -- unbox 由来ノードの検出 if lpa>=PACKED then if lpa%PROCESSED_BEGIN_FLAG == BOXBDD then local lq = node_next(lp) @@ -1196,7 +1201,8 @@ function main(ahead, mode, dir) lp = calc_np(last, lp) if Np then handle_list_head(par_indented) - lp = calc_np(last,lp); while Np do + lp = calc_np(last,lp); + while Np do adjust_nq(); local pid, pm = Np.id, Np.met -- 挿入部 diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua index 3679ad11c7e..879d0b85b73 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua @@ -3,7 +3,7 @@ -- luatexbase.provides_module({ name = 'luatexja.jfont', - date = '2015/09/19', + date = '2016/03/31', description = 'Loader for Japanese fonts', }) module('luatexja.jfont', package.seeall) @@ -167,8 +167,8 @@ do for k,w in pairs(v.glue) do local h = node_new(id_glue_spec) v[k] = { - true, h, - ratio=w.ratio/sz, + true, h, + ratio=w.ratio/sz, priority=FROM_JFM + w.priority/sz, kanjiskip_natural = w.kanjiskip_natural and w.kanjiskip_natural/sz, kanjiskip_stretch = w.kanjiskip_stretch and w.kanjiskip_stretch/sz, @@ -260,7 +260,7 @@ do cstemp = csname:sub( (utf8.byte(csname,1,1) == tex.escapechar) and 2 or 1, -1) cstemp = cstemp:sub(1, ((cstemp:sub(-1,-1)==' ') and (cstemp:len()>=2)) and -2 or -1) global_flag = g and '\\global' or '' - tex.sprint(cat_lp, '\\expandafter\\font\\csname ', + tex.sprint(cat_lp, '\\expandafter\\font\\csname ', (cstemp==' ') and '\\space' or cstemp, '\\endcsname') end @@ -277,7 +277,7 @@ do "bad JFM `" .. jfm_file_name .. "'", 'The JFM file you specified is not valid JFM file.\n'.. 'So defining Japanese font is cancelled.') - tex.sprint(cat_lp, global_flag, '\\expandafter\\let\\csname ', + tex.sprint(cat_lp, global_flag, '\\expandafter\\let\\csname ', (cstemp==' ') and '\\space' or cstemp, '\\endcsname=\\relax') return @@ -286,7 +286,7 @@ do local ad = identifiers[fn].parameters local sz = metrics[j].size_cache[f.size] local fmtable = { jfm = j, size = f.size, var = jfm_var, - with_kanjiskip = jfm_ksp, + with_kanjiskip = jfm_ksp, zw = sz.zw, zh = sz.zh, ascent = ad.ascender, descent = ad.descender, @@ -420,9 +420,9 @@ do kfam_list[fam]=true end function search_kfam(fam, use_fd) - if kfam_list[fam] then + if kfam_list[fam] then tex.sprint(cat_lp, '\\let\\ifin@\\iftrue '); return - elseif Nkfam_list[fam] then + elseif Nkfam_list[fam] then tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return elseif use_fd then for i,_ in pairs(kyenc_list) do @@ -455,7 +455,7 @@ do tex.sprint(cat_lp, s) end function search_ffam_fd(fam) - if Nffam_list[fam] then + if Nffam_list[fam] then tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return else for i,_ in pairs(fenc_list) do @@ -765,7 +765,7 @@ do end if fl.subfonts then for _,v in pairs(fl.subfonts) do - dest = add_fl_table(dest, v, unicodes, + dest = add_fl_table(dest, v, unicodes, fl.ascent + fl.descent, fl.units_per_em) end end @@ -935,7 +935,7 @@ do return tfmdata end, - 'ltj.supply_tounicode', 1) + 'ltj.supply_tounicode', 1) end @@ -950,7 +950,17 @@ do local ensure_tex_attr = ltjb.ensure_tex_attr local node_write = Dnode.write local font = font - local ITALIC = luatexja.icflag_table.ITALIC + local new_ic_kern + if status.luatex_version>=89 then + new_ic_kern = function(g) return node_new(id_kern,3) end + else + local ITALIC = luatexja.icflag_table.ITALIC + new_ic_kern = function() + local g = node_new(id_kern) + setfield(g, 'subtype', 1); set_attr(g, attr_icflag, ITALIC) + return g + end + end -- EXT: italic correction function append_italic() local p = to_direct(tex.nest[tex.nest.ptr].tail) @@ -960,17 +970,15 @@ do local j = font_metric_table[ has_attr(p, (get_dir_count()==dir_tate) and attr_curtfnt or attr_curjfnt) ] - local g = node_new(id_kern) - setfield(g, 'subtype', 1); set_attr(g, attr_icflag, ITALIC) + local g = new_ic_kern() setfield(g, 'kern', j.char_type[find_char_class(getchar(p), j)].italic) node_write(g); ensure_tex_attr(attr_icflag, 0) else local f = getfont(p) local h = font_getfont(f) or font.fonts[f] if h then - local g = node_new(id_kern) - setfield(g, 'subtype', 1); set_attr(g, attr_icflag, ITALIC) - if h.characters[getchar(p)] and h.characters[getchar(p)].italic then + local g = new_ic_kern() + if h.characters[getchar(p)] and h.characters[getchar(p)].italic then setfield(g, 'kern', h.characters[getchar(p)].italic) node_write(g); ensure_tex_attr(attr_icflag, 0) end @@ -993,4 +1001,3 @@ vert_form_table = { [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-setwidth.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua index acbe7543ee1..e18e3a18aeb 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua @@ -74,6 +74,8 @@ local fshift = { down = 0, left = 0} local min, max = math.min, math.max +local rule_subtype = (status.luatex_version>=85) and 3 or 0 + -- 和文文字の位置補正(横) local function capsule_glyph_yoko(p, met, char_data, head, dir) if not char_data then return node_next(p), head, p end @@ -99,7 +101,7 @@ local function capsule_glyph_yoko(p, met, char_data, head, dir) setfield(p, 'yoffset', getfield(p, 'yoffset') - kbl - fshift.down) return node_next(p), head, p elseif ht_diff >= 0 and dp_diff >=0 then -- rule - local box = node_new(id_rule) + local box = node_new(id_rule,rule_subtype) setfield(p, 'yoffset', getfield(p, 'yoffset') - kbl - fshift.down) setfield(box, 'width', 0) setfield(box, 'height', fheight - kbl) @@ -251,7 +253,7 @@ do setfield(lp, 'yoffset', getfield(lp, 'yoffset') - y_adjust) end if adj_depth>node_depth then - local r = node_new(id_rule) + local r = node_new(id_rule,rule_subtype) setfield(r, 'width', 0); setfield(r, 'height', 0) setfield(r, 'depth', adj_depth); setfield(r, 'dir', tex_dir) set_attr(r, attr_icflag, PROCESSED) diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls index d71f55e4d77..7f73c95a582 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjsarticle} - [2016/01/30 ] + [2016/03/31 ltjsclasses ] \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -96,27 +96,32 @@ \DeclareOption{landscape}{\@landscapetrue} \newif\if@slide \@slidefalse -\newcommand{\@ptsize}{0} -\DeclareOption{slide}{\@slidetrue\renewcommand{\@ptsize}{26}\@landscapetrue\@titlepagetrue} -\DeclareOption{8pt}{\renewcommand{\@ptsize}{-2}} -\DeclareOption{9pt}{\renewcommand{\@ptsize}{-1}} -\DeclareOption{10pt}{\renewcommand{\@ptsize}{0}} -\DeclareOption{11pt}{\renewcommand{\@ptsize}{1}} -\DeclareOption{12pt}{\renewcommand{\@ptsize}{2}} -\DeclareOption{14pt}{\renewcommand{\@ptsize}{4}} -\DeclareOption{17pt}{\renewcommand{\@ptsize}{7}} -\DeclareOption{20pt}{\renewcommand{\@ptsize}{10}} -\DeclareOption{21pt}{\renewcommand{\@ptsize}{11}} -\DeclareOption{25pt}{\renewcommand{\@ptsize}{15}} -\DeclareOption{30pt}{\renewcommand{\@ptsize}{20}} -\DeclareOption{36pt}{\renewcommand{\@ptsize}{26}} -\DeclareOption{43pt}{\renewcommand{\@ptsize}{33}} -\DeclareOption{12Q}{\renewcommand{\@ptsize}{1200}} -\DeclareOption{14Q}{\renewcommand{\@ptsize}{1400}} -\DeclareOption{10ptj}{\renewcommand{\@ptsize}{1001}} -\DeclareOption{10.5ptj}{\renewcommand{\@ptsize}{1051}} -\DeclareOption{11ptj}{\renewcommand{\@ptsize}{1101}} -\DeclareOption{12ptj}{\renewcommand{\@ptsize}{1201}} +\def\ltjs@magscale{1} +\DeclareOption{slide}{\@slidetrue\def\ltjs@magscale{3.583}\@landscapetrue\@titlepagetrue} +\DeclareOption{8pt} {\def\ltjs@magscale{0.83}}% 1.2^(-1) +\DeclareOption{9pt} {\def\ltjs@magscale{0.913}}% 1.2^(-0.5} +\DeclareOption{10pt}{\def\ltjs@magscale{1}} +\DeclareOption{11pt}{\def\ltjs@magscale{1.095}}% 1.2^0.5 +\DeclareOption{12pt}{\def\ltjs@magscale{1.200}} +\DeclareOption{14pt}{\def\ltjs@magscale{1.440}} +\DeclareOption{17pt}{\def\ltjs@magscale{1.728}} +\DeclareOption{20pt}{\def\ltjs@magscale{2}} +\DeclareOption{21pt}{\def\ltjs@magscale{2.074}} +\DeclareOption{25pt}{\def\ltjs@magscale{2.488}} +\DeclareOption{30pt}{\def\ltjs@magscale{2.986}} +\DeclareOption{36pt}{\def\ltjs@magscale{3.583}} +\DeclareOption{43pt}{\def\ltjs@magscale{4.300}} +\DeclareOption{12Q} {\def\ltjs@magscale{0.923}}% 1pt*12Q/13Q +\DeclareOption{14Q} {\def\ltjs@magscale{1.077}}% 1pt*14Q/13Q +\DeclareOption{10ptj}{\def\ltjs@magscale{1.085}}% 1pt*10bp/13Q +\DeclareOption{10.5ptj}{\def\ltjs@magscale{1.139}} +\DeclareOption{11ptj}{\def\ltjs@magscale{1.194}} +\DeclareOption{12ptj}{\def\ltjs@magscale{1.302}} +\newif\if@ltjs@mag@xreal +\@ltjs@mag@xrealtrue +\DeclareOption{xreal}{\@ltjs@mag@xrealtrue} +\DeclareOption{noxreal}{\@ltjs@mag@xrealfalse} +\DeclareOption{real}{\@ltjs@mag@xrealfalse} \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax \minute\time \advance\minute-\@tempcnta @@ -201,9 +206,6 @@ \DeclareOption{mingoth}{\mingothtrue} \DeclareOption{ptexjis}{\ptexjistrue} \DeclareOption{jis}{\jisfonttrue} -\newif\ifpapersize -\papersizefalse -\DeclareOption{papersize}{\papersizetrue} \newif\if@english \@englishfalse \DeclareOption{english}{\@englishtrue} @@ -218,83 +220,55 @@ \setlength\paperwidth {\@tempdima} \fi \if@slide\def\n@baseline{13}\else\def\n@baseline{16}\fi -\def\inv@mag{1} -\ifnum\@ptsize=-2 - \mag 833 - \def\inv@mag{1.20048} - \def\n@baseline{15}% -\fi -\ifnum\@ptsize=-1 - \mag 913 % formerly 900 - \def\inv@mag{1.09529} +\newdimen\ltjs@mpt +\ltjs@mpt=\ltjs@magscale\p@ +\ifdim\ltjs@mpt<.92\p@ % 8pt, 9pt 指定時 \def\n@baseline{15}% \fi -\ifnum\@ptsize=1 - \mag 1095 % formerly 1100 - \def\inv@mag{0.913242} -\fi -\ifnum\@ptsize=2 - \mag 1200 - \def\inv@mag{0.833333} -\fi -\ifnum\@ptsize=4 - \mag 1440 - \def\inv@mag{0.694444} -\fi -\ifnum\@ptsize=7 - \mag 1728 - \def\inv@mag{0.578704} -\fi -\ifnum\@ptsize=10 - \mag 2000 - \def\inv@mag{0.5} -\fi -\ifnum\@ptsize=11 - \mag 2074 - \def\inv@mag{0.48216} -\fi -\ifnum\@ptsize=15 - \mag 2488 - \def\inv@mag{0.401929} -\fi -\ifnum\@ptsize=20 - \mag 2986 - \def\inv@mag{0.334896} -\fi -\ifnum\@ptsize=26 - \mag 3583 - \def\inv@mag{0.279096} -\fi -\ifnum\@ptsize=33 - \mag 4300 - \def\inv@mag{0.232558} -\fi -\ifnum\@ptsize=1200 - \mag 923 - \def\inv@mag{1.0834236} -\fi -\ifnum\@ptsize=1400 - \mag 1077 - \def\inv@mag{0.928505} -\fi -\ifnum\@ptsize=1001 - \mag 1085 - \def\inv@mag{0.921659} -\fi -\ifnum\@ptsize=1051 - \mag 1139 - \def\inv@mag{0.877963} -\fi -\ifnum\@ptsize=1101 - \mag 1194 - \def\inv@mag{0.837521} -\fi -\ifnum\@ptsize=1201 - \mag 1302 - \def\inv@mag{0.768049} -\fi -\setlength\paperwidth{\inv@mag\paperwidth}% -\setlength\paperheight{\inv@mag\paperheight}% +\newcommand{\@ptsize}{0} +\ifdim\ltjs@mpt=1.0954\p@ \renewcommand{\@ptsize}{1}\else +\ifdim\ltjs@mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else +\renewcommand{\@ptsize}{-20}\fi\fi +\if@ltjs@mag@xreal\RequirePackage{type1cm} +\ifdim\ltjs@mpt=\p@\else + \expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax + \expandafter\let\csname OMX/cmex/m/n/10\endcsname\relax + \newluafunction\ltjs@@magnify@font@calc + \begingroup\catcode`\%=12\relax + \directlua{ + local getdimen, mpt=tex.getdimen, tex.getdimen('ltjs@mpt')/65536 + local t = lua.get_functions_table() + t[\the\ltjs@@magnify@font@calc] = function() + tex.sprint(math.floor(0.5+mpt*getdimen('dimen@'))) + end + function luatexja.ltjs_unmagnify_fsize(a) + local s = luatexja.print_scaled(math.floor(0.5+a/mpt*65536)) + tex.sprint( (s:match('%.0$')) and s:sub(1,-3) or s ) + end + } + \endgroup + \def\ltjs@magnify@external@font#1 at#2 at#3\@nil{% + \def\@tempa{#1}\def\@tempb{#2}% + \ifx\@tempb\@empty + \edef\@tempb{ scaled\directlua{% + tex.sprint(math.floor(0.5+\ltjs@magscale*1000)) + }}% + \else + \dimen@\@tempb\relax + \edef\@tempb{ at\luafunction\ltjs@@magnify@font@calc sp}% + \fi + \edef\@tempa{\def\noexpand\external@font{\@tempa\@tempb}} + } + \let\ltjs@orig@get@external@font=\get@external@font + \def\get@external@font{% + \edef\f@size{\directlua{luatexja.ltjs_unmagnify_fsize(\f@size)}}% + \ltjs@orig@get@external@font + \begingroup + \edef\@tempa{\external@font\space at\space at}% + \expandafter\ltjs@magnify@external@font\@tempa\@nil + \expandafter\endgroup\@tempa + } +\fi\fi \setlength{\@tempdima}{\paperwidth} \setlength{\@tempdimb}{\paperheight} \iftombow @@ -310,19 +284,19 @@ \fi \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax \ifmingoth - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] \ltj@stdmcfont:jfm=min}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] \ltj@stdgtfont:jfm=min}{} + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=min}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=min}{} \else \ifptexjis - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] \ltj@stdmcfont:jfm=jis}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] \ltj@stdgtfont:jfm=jis}{} + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=jis}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=jis}{} \else - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] \ltj@stdmcfont:jfm=ujis}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] \ltj@stdgtfont:jfm=ujis}{} + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=ujis}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=ujis}{} \fi \fi -\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [0.924872] \ltj@stdmcfont:jfm=ujisv}{} -\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [0.924872] \ltj@stdgtfont:jfm=ujisv}{} +\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=ujisv}{} +\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=ujisv}{} \DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{} \DeclareFontShape{JY3}{gt}{bx}{n}{<->ssub*gt/m/n}{} \DeclareFontShape{JY3}{mc}{m}{it}{<->ssub*mc/m/n}{} @@ -368,9 +342,11 @@ \if@slide \ltjsetxkanjiskip .1em \else - \ltjsetxkanjiskip .25em plus .15em minus .06em + \ltjsetxkanjiskip .25em plus .15em minus .06em \fi \fi} +\def\ltjs@setfontsize#1#2#3{% + \@setfontsize#1{#2\ltjs@mpt}{#3\ltjs@mpt}} \emergencystretch 3\zw \newif\ifnarrowbaselines \if@english @@ -395,11 +371,11 @@ } \renewcommand{\normalsize}{% \ltj@@ifnarrowbaselines - {\@setfontsize\normalsize\@xpt\@xiipt}% - {\@setfontsize\normalsize\@xpt{\n@baseline}}% - \abovedisplayskip 11\p@ \@plus3\p@ \@minus4\p@ - \abovedisplayshortskip \z@ \@plus3\p@ - \belowdisplayskip 9\p@ \@plus3\p@ \@minus4\p@ + {\ltjs@setfontsize\normalsize\@xpt\@xiipt}% + {\ltjs@setfontsize\normalsize\@xpt{\n@baseline}}% + \abovedisplayskip 11\ltjs@mpt \@plus3\ltjs@mpt \@minus4\ltjs@mpt + \abovedisplayshortskip \z@ \@plus3\ltjs@mpt + \belowdisplayskip 9\ltjs@mpt \@plus3\ltjs@mpt \@minus4\ltjs@mpt \belowdisplayshortskip \belowdisplayskip \let\@listi\@listI} \mcfamily\selectfont\normalsize @@ -411,10 +387,10 @@ \setlength\Chs{\wd0} \newcommand{\small}{% \ltj@@ifnarrowbaselines - {\@setfontsize\small\@ixpt{11}}% - {\@setfontsize\small\@ixpt{13}}% - \abovedisplayskip 9\p@ \@plus3\p@ \@minus4\p@ - \abovedisplayshortskip \z@ \@plus3\p@ + {\ltjs@setfontsize\small\@ixpt{11}}% + {\ltjs@setfontsize\small\@ixpt{13}}% + \abovedisplayskip 9\ltjs@mpt \@plus3\ltjs@mpt \@minus4\ltjs@mpt + \abovedisplayshortskip \z@ \@plus3\ltjs@mpt \belowdisplayskip \abovedisplayskip \belowdisplayshortskip \belowdisplayskip \def\@listi{\leftmargin\leftmargini @@ -423,38 +399,38 @@ \itemsep \parsep}} \newcommand{\footnotesize}{% \ltj@@ifnarrowbaselines - {\@setfontsize\footnotesize\@viiipt{9.5}}% - {\@setfontsize\footnotesize\@viiipt{11}}% - \abovedisplayskip 6\p@ \@plus2\p@ \@minus3\p@ - \abovedisplayshortskip \z@ \@plus2\p@ + {\ltjs@setfontsize\footnotesize\@viiipt{9.5}}% + {\ltjs@setfontsize\footnotesize\@viiipt{11}}% + \abovedisplayskip 6\ltjs@mpt \@plus2\ltjs@mpt \@minus3\ltjs@mpt + \abovedisplayshortskip \z@ \@plus2\ltjs@mpt \belowdisplayskip \abovedisplayskip \belowdisplayshortskip \belowdisplayskip \def\@listi{\leftmargin\leftmargini \topsep \z@ \parsep \z@ \itemsep \parsep}} -\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt} -\newcommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt} +\newcommand{\scriptsize}{\ltjs@setfontsize\scriptsize\@viipt\@viiipt} +\newcommand{\tiny}{\ltjs@setfontsize\tiny\@vpt\@vipt} \if@twocolumn - \newcommand{\large}{\@setfontsize\large\@xiipt{\n@baseline}} + \newcommand{\large}{\ltjs@setfontsize\large\@xiipt{\n@baseline}} \else - \newcommand{\large}{\@setfontsize\large\@xiipt{17}} + \newcommand{\large}{\ltjs@setfontsize\large\@xiipt{17}} \fi -\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}} -\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}} -\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}} -\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}} -\newcommand{\HUGE}{\@setfontsize\HUGE{30}{40}} +\newcommand{\Large}{\ltjs@setfontsize\Large\@xivpt{21}} +\newcommand{\LARGE}{\ltjs@setfontsize\LARGE\@xviipt{25}} +\newcommand{\huge}{\ltjs@setfontsize\huge\@xxpt{28}} +\newcommand{\Huge}{\ltjs@setfontsize\Huge\@xxvpt{33}} +\newcommand{\HUGE}{\ltjs@setfontsize\HUGE{30}{40}} \everydisplay=\expandafter{\the\everydisplay \narrowbaselines} \newcommand{\headfont}{\gtfamily\sffamily} \setlength\columnsep{2\zw} -\setlength\columnseprule{0\p@} -\setlength\lineskip{1\p@} -\setlength\normallineskip{1\p@} -\setlength\lineskiplimit{1\p@} -\setlength\normallineskiplimit{1\p@} +\setlength\columnseprule{\z@} +\setlength\lineskip{1\ltjs@mpt} +\setlength\normallineskip{1\ltjs@mpt} +\setlength\lineskiplimit{1\ltjs@mpt} +\setlength\normallineskiplimit{1\ltjs@mpt} \renewcommand{\baselinestretch}{} -\setlength\parskip{0\p@} +\setlength\parskip{\z@} \if@slide \setlength\parindent{0\zw} \else @@ -463,14 +439,14 @@ \@lowpenalty 51 \@medpenalty 151 \@highpenalty 301 -\setlength\topskip{10\p@} +\setlength\topskip{10\ltjs@mpt} \if@slide - \setlength\headheight{0\p@} + \setlength\headheight{0\ltjs@mpt} \else \setlength\headheight{2\topskip} \fi \if@slide - \setlength\footskip{0pt} + \setlength\footskip{\z@} \else \setlength\footskip{0.03367\paperheight} \ifdim\footskip<\baselineskip @@ -478,7 +454,7 @@ \fi \fi \if@slide - \setlength\headsep{0\p@} + \setlength\headsep{0\ltjs@mpt} \else \setlength\headsep{\footskip} \addtolength\headsep{-\topskip} @@ -505,7 +481,7 @@ \divide\textheight\baselineskip \multiply\textheight\baselineskip \addtolength{\textheight}{\topskip} -\addtolength{\textheight}{0.1\p@} +\addtolength{\textheight}{0.1\ltjs@mpt} \setlength\marginparsep{\columnsep} \setlength\marginparpush{\baselineskip} \setlength{\oddsidemargin}{\paperwidth} @@ -539,7 +515,7 @@ \addtolength\topmargin{-1in} {\footnotesize\global\setlength\footnotesep{\baselineskip}} \setlength\footnotesep{0.7\footnotesep} -\setlength{\skip\footins}{16\p@ \@plus 5\p@ \@minus 2\p@} +\setlength{\skip\footins}{16\ltjs@mpt \@plus 5\ltjs@mpt \@minus 2\ltjs@mpt} \setcounter{topnumber}{9} \renewcommand{\topfraction}{.85} \setcounter{bottomnumber}{9} @@ -550,17 +526,17 @@ \setcounter{dbltopnumber}{9} \renewcommand{\dbltopfraction}{.8} \renewcommand{\dblfloatpagefraction}{.8} -\setlength\floatsep {12\p@ \@plus 2\p@ \@minus 2\p@} -\setlength\textfloatsep{20\p@ \@plus 2\p@ \@minus 4\p@} -\setlength\intextsep {12\p@ \@plus 2\p@ \@minus 2\p@} -\setlength\dblfloatsep {12\p@ \@plus 2\p@ \@minus 2\p@} -\setlength\dbltextfloatsep{20\p@ \@plus 2\p@ \@minus 4\p@} -\setlength\@fptop{0\p@ \@plus 1fil} -\setlength\@fpsep{8\p@ \@plus 2fil} -\setlength\@fpbot{0\p@ \@plus 1fil} -\setlength\@dblfptop{0\p@ \@plus 1fil} -\setlength\@dblfpsep{8\p@ \@plus 2fil} -\setlength\@dblfpbot{0\p@ \@plus 1fil} +\setlength\floatsep {12\ltjs@mpt \@plus 2\ltjs@mpt \@minus 2\ltjs@mpt} +\setlength\textfloatsep{20\ltjs@mpt \@plus 2\ltjs@mpt \@minus 4\ltjs@mpt} +\setlength\intextsep {12\ltjs@mpt \@plus 2\ltjs@mpt \@minus 2\ltjs@mpt} +\setlength\dblfloatsep {12\ltjs@mpt \@plus 2\ltjs@mpt \@minus 2\ltjs@mpt} +\setlength\dbltextfloatsep{20\ltjs@mpt \@plus 2\ltjs@mpt \@minus 4\ltjs@mpt} +\setlength\@fptop{0\ltjs@mpt \@plus 1fil} +\setlength\@fpsep{8\ltjs@mpt \@plus 2fil} +\setlength\@fpbot{0\ltjs@mpt \@plus 1fil} +\setlength\@dblfptop{0\ltjs@mpt \@plus 1fil} +\setlength\@dblfpsep{8\ltjs@mpt \@plus 2fil} +\setlength\@dblfpbot{0\ltjs@mpt \@plus 1fil} \def\ps@plainfoot{% \let\@mkboth\@gobbletwo \let\@oddhead\@empty @@ -640,16 +616,16 @@ \begin{center} \mbox{} \\[1\zw] \large - {\maybeblue\hrule height0pt depth2pt\relax}\par + {\maybeblue\hrule height0\ltjs@mpt depth2\ltjs@mpt\relax}\par \smallskip \@title \smallskip - {\maybeblue\hrule height0pt depth2pt\relax}\par + {\maybeblue\hrule height0\ltjs@mpt depth2\ltjs@mpt\relax}\par \vfill {\small \@author}% \end{center} \else - \vskip 60\p@ + \vskip 60\ltjs@mpt \begin{center}% {\LARGE \@title \par}% \vskip 3em% @@ -811,7 +787,7 @@ \@afterheading \fi \if@slide - {\vskip-6pt\maybeblue\hrule height0pt depth1pt\vskip7pt\relax}% + {\vskip-6\ltjs@mpt\maybeblue\hrule height0\ltjs@mpt depth1\ltjs@mpt\vskip7\ltjs@mpt\relax}% \fi \par % 2000-12-18 \ignorespaces} @@ -1092,14 +1068,14 @@ \gdef\postsectionname{}% \gdef\thesection{\presectionname\@Alph\c@section\postsectionname}% \gdef\thesubsection{\@Alph\c@section.\@arabic\c@subsection}} -\setlength\arraycolsep{5\p@} -\setlength\tabcolsep{6\p@} -\setlength\arrayrulewidth{.4\p@} -\setlength\doublerulesep{2\p@} +\setlength\arraycolsep{5\ltjs@mpt} +\setlength\tabcolsep{6\ltjs@mpt} +\setlength\arrayrulewidth{.4\ltjs@mpt} +\setlength\doublerulesep{2\ltjs@mpt} \setlength\tabbingsep{\labelsep} \skip\@mpfootins = \skip\footins -\setlength\fboxsep{3\p@} -\setlength\fboxrule{.4\p@} +\setlength\fboxsep{3\ltjs@mpt} +\setlength\fboxrule{.4\ltjs@mpt} \renewcommand \theequation {\@arabic\c@equation} \newcounter{figure} \renewcommand \thefigure {\@arabic\c@figure} @@ -1127,8 +1103,8 @@ {\end@dblfloat} \newlength\abovecaptionskip \newlength\belowcaptionskip -\setlength\abovecaptionskip{5\p@} % 元: 10\p@ -\setlength\belowcaptionskip{5\p@} % 元: 0\p@ +\setlength\abovecaptionskip{5\ltjs@mpt} % 元: 10\p@ +\setlength\belowcaptionskip{5\ltjs@mpt} % 元: 0\p@ \long\def\@makecaption#1#2{{\small \advance\leftskip .0628\linewidth \advance\rightskip .0628\linewidth @@ -1165,7 +1141,7 @@ \newcommand*{\l@part}[2]{% \ifnum \c@tocdepth >-2\relax \addpenalty\@secpenalty - \addvspace{2.25em \@plus\p@}% + \addvspace{2.25em \@plus\ltjs@mpt}% \begingroup \parindent \z@ \rightskip \@tocrmarg @@ -1180,7 +1156,7 @@ \newcommand*{\l@section}[2]{% \ifnum \c@tocdepth >\z@ \addpenalty{\@secpenalty}% - \addvspace{1.0em \@plus\p@}% + \addvspace{1.0em \@plus\ltjs@mpt}% \begingroup \parindent\z@ \rightskip\@tocrmarg @@ -1207,7 +1183,7 @@ \newdimen\@lnumwidth \def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} \def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else - \vskip \z@ \@plus.2\p@ + \vskip \z@ \@plus.2\ltjs@mpt {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip \parindent #2\relax\@afterindenttrue \interlinepenalty\@M @@ -1279,7 +1255,7 @@ \@mkboth{\indexname}{\indexname}% \plainifnotempty % \thispagestyle{plain} \parindent\z@ - \parskip\z@ \@plus .3\p@\relax + \parskip\z@ \@plus .3\ltjs@mpt\relax \let\item\@idxitem \raggedright \footnotesize\narrowbaselines @@ -1294,7 +1270,7 @@ \newcommand{\@idxitem}{\par\hangindent 4\zw} % 元 40pt \newcommand{\subitem}{\@idxitem \hspace*{2\zw}} % 元 20pt \newcommand{\subsubitem}{\@idxitem \hspace*{3\zw}} % 元 30pt -\newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax} +\newcommand{\indexspace}{\par \vskip 10\ltjs@mpt \@plus5\ltjs@mpt \@minus3\ltjs@mpt\relax} \newcommand\seename{\if@english see\else →\fi} \newcommand\alsoname{\if@english see also\else →\fi} \let\footnotes@ve=\footnote @@ -1306,9 +1282,9 @@ \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}} \def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi} \renewcommand{\footnoterule}{% - \kern-3\p@ - \hrule width .4\columnwidth - \kern 2.6\p@} + \kern-3\ltjs@mpt + \hrule width .4\columnwidth height .4\ltjs@mpt + \kern 2.6\ltjs@mpt} \long\def\@footnotetext{% \insert\footins\bgroup \normalfont\footnotesize diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls index 92c9822e45f..70042be7a4d 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjsbook} - [2016/01/30 ] + [2016/03/31 ltjsclasses ] \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -98,27 +98,32 @@ \DeclareOption{landscape}{\@landscapetrue} \newif\if@slide \@slidefalse -\newcommand{\@ptsize}{0} -\DeclareOption{slide}{\@slidetrue\renewcommand{\@ptsize}{26}\@landscapetrue\@titlepagetrue} -\DeclareOption{8pt}{\renewcommand{\@ptsize}{-2}} -\DeclareOption{9pt}{\renewcommand{\@ptsize}{-1}} -\DeclareOption{10pt}{\renewcommand{\@ptsize}{0}} -\DeclareOption{11pt}{\renewcommand{\@ptsize}{1}} -\DeclareOption{12pt}{\renewcommand{\@ptsize}{2}} -\DeclareOption{14pt}{\renewcommand{\@ptsize}{4}} -\DeclareOption{17pt}{\renewcommand{\@ptsize}{7}} -\DeclareOption{20pt}{\renewcommand{\@ptsize}{10}} -\DeclareOption{21pt}{\renewcommand{\@ptsize}{11}} -\DeclareOption{25pt}{\renewcommand{\@ptsize}{15}} -\DeclareOption{30pt}{\renewcommand{\@ptsize}{20}} -\DeclareOption{36pt}{\renewcommand{\@ptsize}{26}} -\DeclareOption{43pt}{\renewcommand{\@ptsize}{33}} -\DeclareOption{12Q}{\renewcommand{\@ptsize}{1200}} -\DeclareOption{14Q}{\renewcommand{\@ptsize}{1400}} -\DeclareOption{10ptj}{\renewcommand{\@ptsize}{1001}} -\DeclareOption{10.5ptj}{\renewcommand{\@ptsize}{1051}} -\DeclareOption{11ptj}{\renewcommand{\@ptsize}{1101}} -\DeclareOption{12ptj}{\renewcommand{\@ptsize}{1201}} +\def\ltjs@magscale{1} +\DeclareOption{slide}{\@slidetrue\def\ltjs@magscale{3.583}\@landscapetrue\@titlepagetrue} +\DeclareOption{8pt} {\def\ltjs@magscale{0.83}}% 1.2^(-1) +\DeclareOption{9pt} {\def\ltjs@magscale{0.913}}% 1.2^(-0.5} +\DeclareOption{10pt}{\def\ltjs@magscale{1}} +\DeclareOption{11pt}{\def\ltjs@magscale{1.095}}% 1.2^0.5 +\DeclareOption{12pt}{\def\ltjs@magscale{1.200}} +\DeclareOption{14pt}{\def\ltjs@magscale{1.440}} +\DeclareOption{17pt}{\def\ltjs@magscale{1.728}} +\DeclareOption{20pt}{\def\ltjs@magscale{2}} +\DeclareOption{21pt}{\def\ltjs@magscale{2.074}} +\DeclareOption{25pt}{\def\ltjs@magscale{2.488}} +\DeclareOption{30pt}{\def\ltjs@magscale{2.986}} +\DeclareOption{36pt}{\def\ltjs@magscale{3.583}} +\DeclareOption{43pt}{\def\ltjs@magscale{4.300}} +\DeclareOption{12Q} {\def\ltjs@magscale{0.923}}% 1pt*12Q/13Q +\DeclareOption{14Q} {\def\ltjs@magscale{1.077}}% 1pt*14Q/13Q +\DeclareOption{10ptj}{\def\ltjs@magscale{1.085}}% 1pt*10bp/13Q +\DeclareOption{10.5ptj}{\def\ltjs@magscale{1.139}} +\DeclareOption{11ptj}{\def\ltjs@magscale{1.194}} +\DeclareOption{12ptj}{\def\ltjs@magscale{1.302}} +\newif\if@ltjs@mag@xreal +\@ltjs@mag@xrealtrue +\DeclareOption{xreal}{\@ltjs@mag@xrealtrue} +\DeclareOption{noxreal}{\@ltjs@mag@xrealfalse} +\DeclareOption{real}{\@ltjs@mag@xrealfalse} \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax \minute\time \advance\minute-\@tempcnta @@ -205,9 +210,6 @@ \DeclareOption{mingoth}{\mingothtrue} \DeclareOption{ptexjis}{\ptexjistrue} \DeclareOption{jis}{\jisfonttrue} -\newif\ifpapersize -\papersizefalse -\DeclareOption{papersize}{\papersizetrue} \newif\if@english \@englishfalse \DeclareOption{english}{\@englishtrue} @@ -225,83 +227,55 @@ \setlength\paperwidth {\@tempdima} \fi \if@slide\def\n@baseline{13}\else\def\n@baseline{16}\fi -\def\inv@mag{1} -\ifnum\@ptsize=-2 - \mag 833 - \def\inv@mag{1.20048} - \def\n@baseline{15}% -\fi -\ifnum\@ptsize=-1 - \mag 913 % formerly 900 - \def\inv@mag{1.09529} +\newdimen\ltjs@mpt +\ltjs@mpt=\ltjs@magscale\p@ +\ifdim\ltjs@mpt<.92\p@ % 8pt, 9pt 指定時 \def\n@baseline{15}% \fi -\ifnum\@ptsize=1 - \mag 1095 % formerly 1100 - \def\inv@mag{0.913242} -\fi -\ifnum\@ptsize=2 - \mag 1200 - \def\inv@mag{0.833333} -\fi -\ifnum\@ptsize=4 - \mag 1440 - \def\inv@mag{0.694444} -\fi -\ifnum\@ptsize=7 - \mag 1728 - \def\inv@mag{0.578704} -\fi -\ifnum\@ptsize=10 - \mag 2000 - \def\inv@mag{0.5} -\fi -\ifnum\@ptsize=11 - \mag 2074 - \def\inv@mag{0.48216} -\fi -\ifnum\@ptsize=15 - \mag 2488 - \def\inv@mag{0.401929} -\fi -\ifnum\@ptsize=20 - \mag 2986 - \def\inv@mag{0.334896} -\fi -\ifnum\@ptsize=26 - \mag 3583 - \def\inv@mag{0.279096} -\fi -\ifnum\@ptsize=33 - \mag 4300 - \def\inv@mag{0.232558} -\fi -\ifnum\@ptsize=1200 - \mag 923 - \def\inv@mag{1.0834236} -\fi -\ifnum\@ptsize=1400 - \mag 1077 - \def\inv@mag{0.928505} -\fi -\ifnum\@ptsize=1001 - \mag 1085 - \def\inv@mag{0.921659} -\fi -\ifnum\@ptsize=1051 - \mag 1139 - \def\inv@mag{0.877963} -\fi -\ifnum\@ptsize=1101 - \mag 1194 - \def\inv@mag{0.837521} -\fi -\ifnum\@ptsize=1201 - \mag 1302 - \def\inv@mag{0.768049} -\fi -\setlength\paperwidth{\inv@mag\paperwidth}% -\setlength\paperheight{\inv@mag\paperheight}% +\newcommand{\@ptsize}{0} +\ifdim\ltjs@mpt=1.0954\p@ \renewcommand{\@ptsize}{1}\else +\ifdim\ltjs@mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else +\renewcommand{\@ptsize}{-20}\fi\fi +\if@ltjs@mag@xreal\RequirePackage{type1cm} +\ifdim\ltjs@mpt=\p@\else + \expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax + \expandafter\let\csname OMX/cmex/m/n/10\endcsname\relax + \newluafunction\ltjs@@magnify@font@calc + \begingroup\catcode`\%=12\relax + \directlua{ + local getdimen, mpt=tex.getdimen, tex.getdimen('ltjs@mpt')/65536 + local t = lua.get_functions_table() + t[\the\ltjs@@magnify@font@calc] = function() + tex.sprint(math.floor(0.5+mpt*getdimen('dimen@'))) + end + function luatexja.ltjs_unmagnify_fsize(a) + local s = luatexja.print_scaled(math.floor(0.5+a/mpt*65536)) + tex.sprint( (s:match('%.0$')) and s:sub(1,-3) or s ) + end + } + \endgroup + \def\ltjs@magnify@external@font#1 at#2 at#3\@nil{% + \def\@tempa{#1}\def\@tempb{#2}% + \ifx\@tempb\@empty + \edef\@tempb{ scaled\directlua{% + tex.sprint(math.floor(0.5+\ltjs@magscale*1000)) + }}% + \else + \dimen@\@tempb\relax + \edef\@tempb{ at\luafunction\ltjs@@magnify@font@calc sp}% + \fi + \edef\@tempa{\def\noexpand\external@font{\@tempa\@tempb}} + } + \let\ltjs@orig@get@external@font=\get@external@font + \def\get@external@font{% + \edef\f@size{\directlua{luatexja.ltjs_unmagnify_fsize(\f@size)}}% + \ltjs@orig@get@external@font + \begingroup + \edef\@tempa{\external@font\space at\space at}% + \expandafter\ltjs@magnify@external@font\@tempa\@nil + \expandafter\endgroup\@tempa + } +\fi\fi \setlength{\@tempdima}{\paperwidth} \setlength{\@tempdimb}{\paperheight} \iftombow @@ -317,19 +291,19 @@ \fi \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax \ifmingoth - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] \ltj@stdmcfont:jfm=min}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] \ltj@stdgtfont:jfm=min}{} + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=min}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=min}{} \else \ifptexjis - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] \ltj@stdmcfont:jfm=jis}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] \ltj@stdgtfont:jfm=jis}{} + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=jis}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=jis}{} \else - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] \ltj@stdmcfont:jfm=ujis}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] \ltj@stdgtfont:jfm=ujis}{} + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=ujis}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=ujis}{} \fi \fi -\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [0.924872] \ltj@stdmcfont:jfm=ujisv}{} -\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [0.924872] \ltj@stdgtfont:jfm=ujisv}{} +\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=ujisv}{} +\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=ujisv}{} \DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{} \DeclareFontShape{JY3}{gt}{bx}{n}{<->ssub*gt/m/n}{} \DeclareFontShape{JY3}{mc}{m}{it}{<->ssub*mc/m/n}{} @@ -375,9 +349,11 @@ \if@slide \ltjsetxkanjiskip .1em \else - \ltjsetxkanjiskip .25em plus .15em minus .06em + \ltjsetxkanjiskip .25em plus .15em minus .06em \fi \fi} +\def\ltjs@setfontsize#1#2#3{% + \@setfontsize#1{#2\ltjs@mpt}{#3\ltjs@mpt}} \emergencystretch 3\zw \newif\ifnarrowbaselines \if@english @@ -402,11 +378,11 @@ } \renewcommand{\normalsize}{% \ltj@@ifnarrowbaselines - {\@setfontsize\normalsize\@xpt\@xiipt}% - {\@setfontsize\normalsize\@xpt{\n@baseline}}% - \abovedisplayskip 11\p@ \@plus3\p@ \@minus4\p@ - \abovedisplayshortskip \z@ \@plus3\p@ - \belowdisplayskip 9\p@ \@plus3\p@ \@minus4\p@ + {\ltjs@setfontsize\normalsize\@xpt\@xiipt}% + {\ltjs@setfontsize\normalsize\@xpt{\n@baseline}}% + \abovedisplayskip 11\ltjs@mpt \@plus3\ltjs@mpt \@minus4\ltjs@mpt + \abovedisplayshortskip \z@ \@plus3\ltjs@mpt + \belowdisplayskip 9\ltjs@mpt \@plus3\ltjs@mpt \@minus4\ltjs@mpt \belowdisplayshortskip \belowdisplayskip \let\@listi\@listI} \mcfamily\selectfont\normalsize @@ -418,10 +394,10 @@ \setlength\Chs{\wd0} \newcommand{\small}{% \ltj@@ifnarrowbaselines - {\@setfontsize\small\@ixpt{11}}% - {\@setfontsize\small\@ixpt{13}}% - \abovedisplayskip 9\p@ \@plus3\p@ \@minus4\p@ - \abovedisplayshortskip \z@ \@plus3\p@ + {\ltjs@setfontsize\small\@ixpt{11}}% + {\ltjs@setfontsize\small\@ixpt{13}}% + \abovedisplayskip 9\ltjs@mpt \@plus3\ltjs@mpt \@minus4\ltjs@mpt + \abovedisplayshortskip \z@ \@plus3\ltjs@mpt \belowdisplayskip \abovedisplayskip \belowdisplayshortskip \belowdisplayskip \def\@listi{\leftmargin\leftmargini @@ -430,38 +406,38 @@ \itemsep \parsep}} \newcommand{\footnotesize}{% \ltj@@ifnarrowbaselines - {\@setfontsize\footnotesize\@viiipt{9.5}}% - {\@setfontsize\footnotesize\@viiipt{11}}% - \abovedisplayskip 6\p@ \@plus2\p@ \@minus3\p@ - \abovedisplayshortskip \z@ \@plus2\p@ + {\ltjs@setfontsize\footnotesize\@viiipt{9.5}}% + {\ltjs@setfontsize\footnotesize\@viiipt{11}}% + \abovedisplayskip 6\ltjs@mpt \@plus2\ltjs@mpt \@minus3\ltjs@mpt + \abovedisplayshortskip \z@ \@plus2\ltjs@mpt \belowdisplayskip \abovedisplayskip \belowdisplayshortskip \belowdisplayskip \def\@listi{\leftmargin\leftmargini \topsep \z@ \parsep \z@ \itemsep \parsep}} -\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt} -\newcommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt} +\newcommand{\scriptsize}{\ltjs@setfontsize\scriptsize\@viipt\@viiipt} +\newcommand{\tiny}{\ltjs@setfontsize\tiny\@vpt\@vipt} \if@twocolumn - \newcommand{\large}{\@setfontsize\large\@xiipt{\n@baseline}} + \newcommand{\large}{\ltjs@setfontsize\large\@xiipt{\n@baseline}} \else - \newcommand{\large}{\@setfontsize\large\@xiipt{17}} + \newcommand{\large}{\ltjs@setfontsize\large\@xiipt{17}} \fi -\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}} -\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}} -\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}} -\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}} -\newcommand{\HUGE}{\@setfontsize\HUGE{30}{40}} +\newcommand{\Large}{\ltjs@setfontsize\Large\@xivpt{21}} +\newcommand{\LARGE}{\ltjs@setfontsize\LARGE\@xviipt{25}} +\newcommand{\huge}{\ltjs@setfontsize\huge\@xxpt{28}} +\newcommand{\Huge}{\ltjs@setfontsize\Huge\@xxvpt{33}} +\newcommand{\HUGE}{\ltjs@setfontsize\HUGE{30}{40}} \everydisplay=\expandafter{\the\everydisplay \narrowbaselines} \newcommand{\headfont}{\gtfamily\sffamily} \setlength\columnsep{2\zw} -\setlength\columnseprule{0\p@} -\setlength\lineskip{1\p@} -\setlength\normallineskip{1\p@} -\setlength\lineskiplimit{1\p@} -\setlength\normallineskiplimit{1\p@} +\setlength\columnseprule{\z@} +\setlength\lineskip{1\ltjs@mpt} +\setlength\normallineskip{1\ltjs@mpt} +\setlength\lineskiplimit{1\ltjs@mpt} +\setlength\normallineskiplimit{1\ltjs@mpt} \renewcommand{\baselinestretch}{} -\setlength\parskip{0\p@} +\setlength\parskip{\z@} \if@slide \setlength\parindent{0\zw} \else @@ -470,9 +446,9 @@ \@lowpenalty 51 \@medpenalty 151 \@highpenalty 301 -\setlength\topskip{10\p@} +\setlength\topskip{10\ltjs@mpt} \if@slide - \setlength\headheight{0\p@} + \setlength\headheight{0\ltjs@mpt} \else \setlength\headheight{2\topskip} \fi @@ -482,7 +458,7 @@ \setlength\footskip{\baselineskip} \fi \else - \setlength\footskip{0pt} + \setlength\footskip{\z@} \fi \if@report \setlength\headsep{\footskip} @@ -520,7 +496,7 @@ \divide\textheight\baselineskip \multiply\textheight\baselineskip \addtolength{\textheight}{\topskip} -\addtolength{\textheight}{0.1\p@} +\addtolength{\textheight}{0.1\ltjs@mpt} \setlength\marginparsep{\columnsep} \setlength\marginparpush{\baselineskip} \setlength{\oddsidemargin}{\paperwidth} @@ -554,7 +530,7 @@ \addtolength\topmargin{-1in} {\footnotesize\global\setlength\footnotesep{\baselineskip}} \setlength\footnotesep{0.7\footnotesep} -\setlength{\skip\footins}{16\p@ \@plus 5\p@ \@minus 2\p@} +\setlength{\skip\footins}{16\ltjs@mpt \@plus 5\ltjs@mpt \@minus 2\ltjs@mpt} \setcounter{topnumber}{9} \renewcommand{\topfraction}{.85} \setcounter{bottomnumber}{9} @@ -565,17 +541,17 @@ \setcounter{dbltopnumber}{9} \renewcommand{\dbltopfraction}{.8} \renewcommand{\dblfloatpagefraction}{.8} -\setlength\floatsep {12\p@ \@plus 2\p@ \@minus 2\p@} -\setlength\textfloatsep{20\p@ \@plus 2\p@ \@minus 4\p@} -\setlength\intextsep {12\p@ \@plus 2\p@ \@minus 2\p@} -\setlength\dblfloatsep {12\p@ \@plus 2\p@ \@minus 2\p@} -\setlength\dbltextfloatsep{20\p@ \@plus 2\p@ \@minus 4\p@} -\setlength\@fptop{0\p@ \@plus 1fil} -\setlength\@fpsep{8\p@ \@plus 2fil} -\setlength\@fpbot{0\p@ \@plus 1fil} -\setlength\@dblfptop{0\p@ \@plus 1fil} -\setlength\@dblfpsep{8\p@ \@plus 2fil} -\setlength\@dblfpbot{0\p@ \@plus 1fil} +\setlength\floatsep {12\ltjs@mpt \@plus 2\ltjs@mpt \@minus 2\ltjs@mpt} +\setlength\textfloatsep{20\ltjs@mpt \@plus 2\ltjs@mpt \@minus 4\ltjs@mpt} +\setlength\intextsep {12\ltjs@mpt \@plus 2\ltjs@mpt \@minus 2\ltjs@mpt} +\setlength\dblfloatsep {12\ltjs@mpt \@plus 2\ltjs@mpt \@minus 2\ltjs@mpt} +\setlength\dbltextfloatsep{20\ltjs@mpt \@plus 2\ltjs@mpt \@minus 4\ltjs@mpt} +\setlength\@fptop{0\ltjs@mpt \@plus 1fil} +\setlength\@fpsep{8\ltjs@mpt \@plus 2fil} +\setlength\@fpbot{0\ltjs@mpt \@plus 1fil} +\setlength\@dblfptop{0\ltjs@mpt \@plus 1fil} +\setlength\@dblfpsep{8\ltjs@mpt \@plus 2fil} +\setlength\@dblfpbot{0\ltjs@mpt \@plus 1fil} \def\ps@plainfoot{% \let\@mkboth\@gobbletwo \let\@oddhead\@empty @@ -650,16 +626,16 @@ \begin{center} \mbox{} \\[1\zw] \large - {\maybeblue\hrule height0pt depth2pt\relax}\par + {\maybeblue\hrule height0\ltjs@mpt depth2\ltjs@mpt\relax}\par \smallskip \@title \smallskip - {\maybeblue\hrule height0pt depth2pt\relax}\par + {\maybeblue\hrule height0\ltjs@mpt depth2\ltjs@mpt\relax}\par \vfill {\small \@author}% \end{center} \else - \vskip 60\p@ + \vskip 60\ltjs@mpt \begin{center}% {\LARGE \@title \par}% \vskip 3em% @@ -820,7 +796,7 @@ \@afterheading \fi \if@slide - {\vskip-6pt\maybeblue\hrule height0pt depth1pt\vskip7pt\relax}% + {\vskip-6\ltjs@mpt\maybeblue\hrule height0\ltjs@mpt depth1\ltjs@mpt\vskip7\ltjs@mpt\relax}% \fi \par % 2000-12-18 \ignorespaces} @@ -905,7 +881,7 @@ \normalfont \ifnum \c@secnumdepth >-2\relax \huge\headfont \prepartname\thepart\postpartname - \par\vskip20\p@ + \par\vskip20\ltjs@mpt \fi \Huge \headfont #2\par}% \@endpart} @@ -947,8 +923,8 @@ \addcontentsline{toc}{chapter}{#1}% \fi \chaptermark{#1}% - \addtocontents{lof}{\protect\addvspace{10\p@}}% - \addtocontents{lot}{\protect\addvspace{10\p@}}% + \addtocontents{lof}{\protect\addvspace{10\ltjs@mpt}}% + \addtocontents{lot}{\protect\addvspace{10\ltjs@mpt}}% \if@twocolumn \@topnewpage[\@makechapterhead{#2}]% \else @@ -1151,14 +1127,14 @@ \gdef\@chapapp{\appendixname}% \gdef\@chappos{}% \gdef\thechapter{\@Alph\c@chapter}} -\setlength\arraycolsep{5\p@} -\setlength\tabcolsep{6\p@} -\setlength\arrayrulewidth{.4\p@} -\setlength\doublerulesep{2\p@} +\setlength\arraycolsep{5\ltjs@mpt} +\setlength\tabcolsep{6\ltjs@mpt} +\setlength\arrayrulewidth{.4\ltjs@mpt} +\setlength\doublerulesep{2\ltjs@mpt} \setlength\tabbingsep{\labelsep} \skip\@mpfootins = \skip\footins -\setlength\fboxsep{3\p@} -\setlength\fboxrule{.4\p@} +\setlength\fboxsep{3\ltjs@mpt} +\setlength\fboxrule{.4\ltjs@mpt} \@addtoreset{equation}{chapter} \renewcommand\theequation {\ifnum \c@chapter>\z@ \thechapter.\fi \@arabic\c@equation} @@ -1190,8 +1166,8 @@ {\end@dblfloat} \newlength\abovecaptionskip \newlength\belowcaptionskip -\setlength\abovecaptionskip{5\p@} % 元: 10\p@ -\setlength\belowcaptionskip{5\p@} % 元: 0\p@ +\setlength\abovecaptionskip{5\ltjs@mpt} % 元: 10\p@ +\setlength\belowcaptionskip{5\ltjs@mpt} % 元: 0\p@ \long\def\@makecaption#1#2{{\small \advance\leftskip .0628\linewidth \advance\rightskip .0628\linewidth @@ -1234,7 +1210,7 @@ \newcommand*{\l@part}[2]{% \ifnum \c@tocdepth >-2\relax \addpenalty{-\@highpenalty}% - \addvspace{2.25em \@plus\p@}% + \addvspace{2.25em \@plus\ltjs@mpt}% \begingroup \parindent \z@ \rightskip \@tocrmarg @@ -1251,7 +1227,7 @@ \newcommand*{\l@chapter}[2]{% \ifnum \c@tocdepth >\m@ne \addpenalty{-\@highpenalty}% - \addvspace{1.0em \@plus\p@} + \addvspace{1.0em \@plus\ltjs@mpt} \begingroup \parindent\z@ \rightskip\@tocrmarg @@ -1283,7 +1259,7 @@ \newdimen\@lnumwidth \def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} \def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else - \vskip \z@ \@plus.2\p@ + \vskip \z@ \@plus.2\ltjs@mpt {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip \parindent #2\relax\@afterindenttrue \interlinepenalty\@M @@ -1362,7 +1338,7 @@ \@mkboth{\indexname}{}% \plainifnotempty % \thispagestyle{plain} \parindent\z@ - \parskip\z@ \@plus .3\p@\relax + \parskip\z@ \@plus .3\ltjs@mpt\relax \let\item\@idxitem \raggedright \footnotesize\narrowbaselines @@ -1377,7 +1353,7 @@ \newcommand{\@idxitem}{\par\hangindent 4\zw} % 元 40pt \newcommand{\subitem}{\@idxitem \hspace*{2\zw}} % 元 20pt \newcommand{\subsubitem}{\@idxitem \hspace*{3\zw}} % 元 30pt -\newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax} +\newcommand{\indexspace}{\par \vskip 10\ltjs@mpt \@plus5\ltjs@mpt \@minus3\ltjs@mpt\relax} \newcommand\seename{\if@english see\else →\fi} \newcommand\alsoname{\if@english see also\else →\fi} \let\footnotes@ve=\footnote @@ -1389,9 +1365,9 @@ \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}} \def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi} \renewcommand{\footnoterule}{% - \kern-3\p@ - \hrule width .4\columnwidth - \kern 2.6\p@} + \kern-3\ltjs@mpt + \hrule width .4\columnwidth height .4\ltjs@mpt + \kern 2.6\ltjs@mpt} \@addtoreset{footnote}{chapter} \long\def\@footnotetext{% \insert\footins\bgroup diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls index 6279b5096d6..4781e3cd5dc 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjskiyou} - [2016/01/30 ] + [2016/03/31 ltjsclasses ] \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -96,27 +96,32 @@ \DeclareOption{landscape}{\@landscapetrue} \newif\if@slide \@slidefalse -\newcommand{\@ptsize}{0} -\DeclareOption{slide}{\@slidetrue\renewcommand{\@ptsize}{26}\@landscapetrue\@titlepagetrue} -\DeclareOption{8pt}{\renewcommand{\@ptsize}{-2}} -\DeclareOption{9pt}{\renewcommand{\@ptsize}{-1}} -\DeclareOption{10pt}{\renewcommand{\@ptsize}{0}} -\DeclareOption{11pt}{\renewcommand{\@ptsize}{1}} -\DeclareOption{12pt}{\renewcommand{\@ptsize}{2}} -\DeclareOption{14pt}{\renewcommand{\@ptsize}{4}} -\DeclareOption{17pt}{\renewcommand{\@ptsize}{7}} -\DeclareOption{20pt}{\renewcommand{\@ptsize}{10}} -\DeclareOption{21pt}{\renewcommand{\@ptsize}{11}} -\DeclareOption{25pt}{\renewcommand{\@ptsize}{15}} -\DeclareOption{30pt}{\renewcommand{\@ptsize}{20}} -\DeclareOption{36pt}{\renewcommand{\@ptsize}{26}} -\DeclareOption{43pt}{\renewcommand{\@ptsize}{33}} -\DeclareOption{12Q}{\renewcommand{\@ptsize}{1200}} -\DeclareOption{14Q}{\renewcommand{\@ptsize}{1400}} -\DeclareOption{10ptj}{\renewcommand{\@ptsize}{1001}} -\DeclareOption{10.5ptj}{\renewcommand{\@ptsize}{1051}} -\DeclareOption{11ptj}{\renewcommand{\@ptsize}{1101}} -\DeclareOption{12ptj}{\renewcommand{\@ptsize}{1201}} +\def\ltjs@magscale{1} +\DeclareOption{slide}{\@slidetrue\def\ltjs@magscale{3.583}\@landscapetrue\@titlepagetrue} +\DeclareOption{8pt} {\def\ltjs@magscale{0.83}}% 1.2^(-1) +\DeclareOption{9pt} {\def\ltjs@magscale{0.913}}% 1.2^(-0.5} +\DeclareOption{10pt}{\def\ltjs@magscale{1}} +\DeclareOption{11pt}{\def\ltjs@magscale{1.095}}% 1.2^0.5 +\DeclareOption{12pt}{\def\ltjs@magscale{1.200}} +\DeclareOption{14pt}{\def\ltjs@magscale{1.440}} +\DeclareOption{17pt}{\def\ltjs@magscale{1.728}} +\DeclareOption{20pt}{\def\ltjs@magscale{2}} +\DeclareOption{21pt}{\def\ltjs@magscale{2.074}} +\DeclareOption{25pt}{\def\ltjs@magscale{2.488}} +\DeclareOption{30pt}{\def\ltjs@magscale{2.986}} +\DeclareOption{36pt}{\def\ltjs@magscale{3.583}} +\DeclareOption{43pt}{\def\ltjs@magscale{4.300}} +\DeclareOption{12Q} {\def\ltjs@magscale{0.923}}% 1pt*12Q/13Q +\DeclareOption{14Q} {\def\ltjs@magscale{1.077}}% 1pt*14Q/13Q +\DeclareOption{10ptj}{\def\ltjs@magscale{1.085}}% 1pt*10bp/13Q +\DeclareOption{10.5ptj}{\def\ltjs@magscale{1.139}} +\DeclareOption{11ptj}{\def\ltjs@magscale{1.194}} +\DeclareOption{12ptj}{\def\ltjs@magscale{1.302}} +\newif\if@ltjs@mag@xreal +\@ltjs@mag@xrealtrue +\DeclareOption{xreal}{\@ltjs@mag@xrealtrue} +\DeclareOption{noxreal}{\@ltjs@mag@xrealfalse} +\DeclareOption{real}{\@ltjs@mag@xrealfalse} \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax \minute\time \advance\minute-\@tempcnta @@ -201,9 +206,6 @@ \DeclareOption{mingoth}{\mingothtrue} \DeclareOption{ptexjis}{\ptexjistrue} \DeclareOption{jis}{\jisfonttrue} -\newif\ifpapersize -\papersizefalse -\DeclareOption{papersize}{\papersizetrue} \newif\if@english \@englishfalse \DeclareOption{english}{\@englishtrue} @@ -218,85 +220,56 @@ \setlength\paperwidth {\@tempdima} \fi \def\n@baseline{14.897} -\def\inv@mag{1} -\ifnum\@ptsize=-2 - \mag 833 - \def\inv@mag{1.20048} - \def\n@baseline{15}% -\fi -\ifnum\@ptsize=-1 - \mag 913 % formerly 900 - \def\inv@mag{1.09529} +\def\ltjs@magscale{0.977} +\newdimen\ltjs@mpt +\ltjs@mpt=\ltjs@magscale\p@ +\ifdim\ltjs@mpt<.92\p@ % 8pt, 9pt 指定時 \def\n@baseline{15}% \fi -\ifnum\@ptsize=1 - \mag 1095 % formerly 1100 - \def\inv@mag{0.913242} -\fi -\ifnum\@ptsize=2 - \mag 1200 - \def\inv@mag{0.833333} -\fi -\ifnum\@ptsize=4 - \mag 1440 - \def\inv@mag{0.694444} -\fi -\ifnum\@ptsize=7 - \mag 1728 - \def\inv@mag{0.578704} -\fi -\ifnum\@ptsize=10 - \mag 2000 - \def\inv@mag{0.5} -\fi -\ifnum\@ptsize=11 - \mag 2074 - \def\inv@mag{0.48216} -\fi -\ifnum\@ptsize=15 - \mag 2488 - \def\inv@mag{0.401929} -\fi -\ifnum\@ptsize=20 - \mag 2986 - \def\inv@mag{0.334896} -\fi -\ifnum\@ptsize=26 - \mag 3583 - \def\inv@mag{0.279096} -\fi -\ifnum\@ptsize=33 - \mag 4300 - \def\inv@mag{0.232558} -\fi -\ifnum\@ptsize=1200 - \mag 923 - \def\inv@mag{1.0834236} -\fi -\ifnum\@ptsize=1400 - \mag 1077 - \def\inv@mag{0.928505} -\fi -\ifnum\@ptsize=1001 - \mag 1085 - \def\inv@mag{0.921659} -\fi -\ifnum\@ptsize=1051 - \mag 1139 - \def\inv@mag{0.877963} -\fi -\ifnum\@ptsize=1101 - \mag 1194 - \def\inv@mag{0.837521} -\fi -\ifnum\@ptsize=1201 - \mag 1302 - \def\inv@mag{0.768049} -\fi -\mag 977 -\def\inv@mag{1.02354} -\setlength\paperwidth{\inv@mag\paperwidth}% -\setlength\paperheight{\inv@mag\paperheight}% +\newcommand{\@ptsize}{0} +\ifdim\ltjs@mpt=1.0954\p@ \renewcommand{\@ptsize}{1}\else +\ifdim\ltjs@mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else +\renewcommand{\@ptsize}{-20}\fi\fi +\if@ltjs@mag@xreal\RequirePackage{type1cm} +\ifdim\ltjs@mpt=\p@\else + \expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax + \expandafter\let\csname OMX/cmex/m/n/10\endcsname\relax + \newluafunction\ltjs@@magnify@font@calc + \begingroup\catcode`\%=12\relax + \directlua{ + local getdimen, mpt=tex.getdimen, tex.getdimen('ltjs@mpt')/65536 + local t = lua.get_functions_table() + t[\the\ltjs@@magnify@font@calc] = function() + tex.sprint(math.floor(0.5+mpt*getdimen('dimen@'))) + end + function luatexja.ltjs_unmagnify_fsize(a) + local s = luatexja.print_scaled(math.floor(0.5+a/mpt*65536)) + tex.sprint( (s:match('%.0$')) and s:sub(1,-3) or s ) + end + } + \endgroup + \def\ltjs@magnify@external@font#1 at#2 at#3\@nil{% + \def\@tempa{#1}\def\@tempb{#2}% + \ifx\@tempb\@empty + \edef\@tempb{ scaled\directlua{% + tex.sprint(math.floor(0.5+\ltjs@magscale*1000)) + }}% + \else + \dimen@\@tempb\relax + \edef\@tempb{ at\luafunction\ltjs@@magnify@font@calc sp}% + \fi + \edef\@tempa{\def\noexpand\external@font{\@tempa\@tempb}} + } + \let\ltjs@orig@get@external@font=\get@external@font + \def\get@external@font{% + \edef\f@size{\directlua{luatexja.ltjs_unmagnify_fsize(\f@size)}}% + \ltjs@orig@get@external@font + \begingroup + \edef\@tempa{\external@font\space at\space at}% + \expandafter\ltjs@magnify@external@font\@tempa\@nil + \expandafter\endgroup\@tempa + } +\fi\fi \setlength{\@tempdima}{\paperwidth} \setlength{\@tempdimb}{\paperheight} \iftombow @@ -312,19 +285,19 @@ \fi \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax \ifmingoth - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] \ltj@stdmcfont:jfm=min}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] \ltj@stdgtfont:jfm=min}{} + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=min}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=min}{} \else \ifptexjis - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] \ltj@stdmcfont:jfm=jis}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] \ltj@stdgtfont:jfm=jis}{} + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=jis}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=jis}{} \else - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] \ltj@stdmcfont:jfm=ujis}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] \ltj@stdgtfont:jfm=ujis}{} + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=ujis}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=ujis}{} \fi \fi -\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [0.924872] \ltj@stdmcfont:jfm=ujisv}{} -\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [0.924872] \ltj@stdgtfont:jfm=ujisv}{} +\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=ujisv}{} +\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=ujisv}{} \DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{} \DeclareFontShape{JY3}{gt}{bx}{n}{<->ssub*gt/m/n}{} \DeclareFontShape{JY3}{mc}{m}{it}{<->ssub*mc/m/n}{} @@ -370,9 +343,11 @@ \if@slide \ltjsetxkanjiskip .1em \else - \ltjsetxkanjiskip .25em plus .15em minus .06em + \ltjsetxkanjiskip .25em plus .15em minus .06em \fi \fi} +\def\ltjs@setfontsize#1#2#3{% + \@setfontsize#1{#2\ltjs@mpt}{#3\ltjs@mpt}} \emergencystretch 3\zw \newif\ifnarrowbaselines \if@english @@ -397,11 +372,11 @@ } \renewcommand{\normalsize}{% \ltj@@ifnarrowbaselines - {\@setfontsize\normalsize\@xpt\@xiipt}% - {\@setfontsize\normalsize\@xpt{\n@baseline}}% - \abovedisplayskip 11\p@ \@plus3\p@ \@minus4\p@ - \abovedisplayshortskip \z@ \@plus3\p@ - \belowdisplayskip 9\p@ \@plus3\p@ \@minus4\p@ + {\ltjs@setfontsize\normalsize\@xpt\@xiipt}% + {\ltjs@setfontsize\normalsize\@xpt{\n@baseline}}% + \abovedisplayskip 11\ltjs@mpt \@plus3\ltjs@mpt \@minus4\ltjs@mpt + \abovedisplayshortskip \z@ \@plus3\ltjs@mpt + \belowdisplayskip 9\ltjs@mpt \@plus3\ltjs@mpt \@minus4\ltjs@mpt \belowdisplayshortskip \belowdisplayskip \let\@listi\@listI} \mcfamily\selectfont\normalsize @@ -413,10 +388,10 @@ \setlength\Chs{\wd0} \newcommand{\small}{% \ltj@@ifnarrowbaselines - {\@setfontsize\small{8.8888}{11}}% - {\@setfontsize\small{8.8888}{13.2418}}% - \abovedisplayskip 9\p@ \@plus3\p@ \@minus4\p@ - \abovedisplayshortskip \z@ \@plus3\p@ + {\ltjs@setfontsize\small{8.8888}{11}}% + {\ltjs@setfontsize\small{8.8888}{13.2418}}% + \abovedisplayskip 9\ltjs@mpt \@plus3\ltjs@mpt \@minus4\ltjs@mpt + \abovedisplayshortskip \z@ \@plus3\ltjs@mpt \belowdisplayskip \abovedisplayskip \belowdisplayshortskip \belowdisplayskip \def\@listi{\leftmargin\leftmargini @@ -425,38 +400,38 @@ \itemsep \parsep}} \newcommand{\footnotesize}{% \ltj@@ifnarrowbaselines - {\@setfontsize\footnotesize{8.8888}{11}}% - {\@setfontsize\footnotesize{8.8888}{13.2418}}% - \abovedisplayskip 6\p@ \@plus2\p@ \@minus3\p@ - \abovedisplayshortskip \z@ \@plus2\p@ + {\ltjs@setfontsize\footnotesize{8.8888}{11}}% + {\ltjs@setfontsize\footnotesize{8.8888}{13.2418}}% + \abovedisplayskip 6\ltjs@mpt \@plus2\ltjs@mpt \@minus3\ltjs@mpt + \abovedisplayshortskip \z@ \@plus2\ltjs@mpt \belowdisplayskip \abovedisplayskip \belowdisplayshortskip \belowdisplayskip \def\@listi{\leftmargin\leftmargini \topsep \z@ \parsep \z@ \itemsep \parsep}} -\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt} -\newcommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt} +\newcommand{\scriptsize}{\ltjs@setfontsize\scriptsize\@viipt\@viiipt} +\newcommand{\tiny}{\ltjs@setfontsize\tiny\@vpt\@vipt} \if@twocolumn - \newcommand{\large}{\@setfontsize\large{11.111}{\n@baseline}} + \newcommand{\large}{\ltjs@setfontsize\large{11.111}{\n@baseline}} \else - \newcommand{\large}{\@setfontsize\large{11.111}{17}} + \newcommand{\large}{\ltjs@setfontsize\large{11.111}{17}} \fi -\newcommand{\Large}{\@setfontsize\Large{12.222}{21}} -\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}} -\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}} -\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}} -\newcommand{\HUGE}{\@setfontsize\HUGE{30}{40}} +\newcommand{\Large}{\ltjs@setfontsize\Large{12.222}{21}} +\newcommand{\LARGE}{\ltjs@setfontsize\LARGE\@xviipt{25}} +\newcommand{\huge}{\ltjs@setfontsize\huge\@xxpt{28}} +\newcommand{\Huge}{\ltjs@setfontsize\Huge\@xxvpt{33}} +\newcommand{\HUGE}{\ltjs@setfontsize\HUGE{30}{40}} \everydisplay=\expandafter{\the\everydisplay \narrowbaselines} \newcommand{\headfont}{\gtfamily\sffamily} \setlength\columnsep{28truebp} -\setlength\columnseprule{0\p@} -\setlength\lineskip{1\p@} -\setlength\normallineskip{1\p@} -\setlength\lineskiplimit{1\p@} -\setlength\normallineskiplimit{1\p@} +\setlength\columnseprule{\z@} +\setlength\lineskip{1\ltjs@mpt} +\setlength\normallineskip{1\ltjs@mpt} +\setlength\lineskiplimit{1\ltjs@mpt} +\setlength\normallineskiplimit{1\ltjs@mpt} \renewcommand{\baselinestretch}{} -\setlength\parskip{0\p@} +\setlength\parskip{\z@} \if@slide \setlength\parindent{0\zw} \else @@ -465,22 +440,22 @@ \@lowpenalty 51 \@medpenalty 151 \@highpenalty 301 -\setlength\topskip{10\p@} +\setlength\topskip{10\ltjs@mpt} \if@slide - \setlength\headheight{0\p@} + \setlength\headheight{0\ltjs@mpt} \else \setlength\headheight{2\topskip} \fi \if@slide - \setlength\footskip{0pt} + \setlength\footskip{\z@} \else \setlength\footskip{0.03367\paperheight} \ifdim\footskip<\baselineskip \setlength\footskip{\baselineskip} \fi \fi -\setlength\headheight{0\p@} -\setlength\headsep{0\p@} +\setlength\headheight{0\ltjs@mpt} +\setlength\headsep{0\ltjs@mpt} \setlength\maxdepth{.5\topskip} \newdimen\fullwidth \setlength\fullwidth{48\zw} @@ -488,7 +463,7 @@ \setlength\textwidth{\fullwidth} \setlength{\textheight}{47\baselineskip} \addtolength{\textheight}{\topskip} -\addtolength{\textheight}{0.1\p@} +\addtolength{\textheight}{0.1\ltjs@mpt} \setlength\marginparsep{\columnsep} \setlength\marginparpush{\baselineskip} \setlength{\oddsidemargin}{\paperwidth} @@ -523,7 +498,7 @@ \addtolength\topmargin{-1in} {\footnotesize\global\setlength\footnotesep{\baselineskip}} \setlength\footnotesep{0.7\footnotesep} -\setlength{\skip\footins}{16\p@ \@plus 5\p@ \@minus 2\p@} +\setlength{\skip\footins}{16\ltjs@mpt \@plus 5\ltjs@mpt \@minus 2\ltjs@mpt} \setcounter{topnumber}{9} \renewcommand{\topfraction}{.85} \setcounter{bottomnumber}{9} @@ -534,17 +509,17 @@ \setcounter{dbltopnumber}{9} \renewcommand{\dbltopfraction}{.8} \renewcommand{\dblfloatpagefraction}{.8} -\setlength\floatsep {12\p@ \@plus 2\p@ \@minus 2\p@} -\setlength\textfloatsep{20\p@ \@plus 2\p@ \@minus 4\p@} -\setlength\intextsep {12\p@ \@plus 2\p@ \@minus 2\p@} -\setlength\dblfloatsep {12\p@ \@plus 2\p@ \@minus 2\p@} -\setlength\dbltextfloatsep{20\p@ \@plus 2\p@ \@minus 4\p@} -\setlength\@fptop{0\p@ \@plus 1fil} -\setlength\@fpsep{8\p@ \@plus 2fil} -\setlength\@fpbot{0\p@ \@plus 1fil} -\setlength\@dblfptop{0\p@ \@plus 1fil} -\setlength\@dblfpsep{8\p@ \@plus 2fil} -\setlength\@dblfpbot{0\p@ \@plus 1fil} +\setlength\floatsep {12\ltjs@mpt \@plus 2\ltjs@mpt \@minus 2\ltjs@mpt} +\setlength\textfloatsep{20\ltjs@mpt \@plus 2\ltjs@mpt \@minus 4\ltjs@mpt} +\setlength\intextsep {12\ltjs@mpt \@plus 2\ltjs@mpt \@minus 2\ltjs@mpt} +\setlength\dblfloatsep {12\ltjs@mpt \@plus 2\ltjs@mpt \@minus 2\ltjs@mpt} +\setlength\dbltextfloatsep{20\ltjs@mpt \@plus 2\ltjs@mpt \@minus 4\ltjs@mpt} +\setlength\@fptop{0\ltjs@mpt \@plus 1fil} +\setlength\@fpsep{8\ltjs@mpt \@plus 2fil} +\setlength\@fpbot{0\ltjs@mpt \@plus 1fil} +\setlength\@dblfptop{0\ltjs@mpt \@plus 1fil} +\setlength\@dblfpsep{8\ltjs@mpt \@plus 2fil} +\setlength\@dblfpbot{0\ltjs@mpt \@plus 1fil} \def\ps@plainfoot{% \let\@mkboth\@gobbletwo \let\@oddhead\@empty @@ -624,16 +599,16 @@ \begin{center} \mbox{} \\[1\zw] \large - {\maybeblue\hrule height0pt depth2pt\relax}\par + {\maybeblue\hrule height0\ltjs@mpt depth2\ltjs@mpt\relax}\par \smallskip \@title \smallskip - {\maybeblue\hrule height0pt depth2pt\relax}\par + {\maybeblue\hrule height0\ltjs@mpt depth2\ltjs@mpt\relax}\par \vfill {\small \@author}% \end{center} \else - \vskip 60\p@ + \vskip 60\ltjs@mpt \begin{center}% {\LARGE \@title \par}% \vskip 3em% @@ -795,7 +770,7 @@ \@afterheading \fi \if@slide - {\vskip-6pt\maybeblue\hrule height0pt depth1pt\vskip7pt\relax}% + {\vskip-6\ltjs@mpt\maybeblue\hrule height0\ltjs@mpt depth1\ltjs@mpt\vskip7\ltjs@mpt\relax}% \fi \par % 2000-12-18 \ignorespaces} @@ -1076,14 +1051,14 @@ \gdef\postsectionname{}% \gdef\thesection{\presectionname\@Alph\c@section\postsectionname}% \gdef\thesubsection{\@Alph\c@section.\@arabic\c@subsection}} -\setlength\arraycolsep{5\p@} -\setlength\tabcolsep{6\p@} -\setlength\arrayrulewidth{.4\p@} -\setlength\doublerulesep{2\p@} +\setlength\arraycolsep{5\ltjs@mpt} +\setlength\tabcolsep{6\ltjs@mpt} +\setlength\arrayrulewidth{.4\ltjs@mpt} +\setlength\doublerulesep{2\ltjs@mpt} \setlength\tabbingsep{\labelsep} \skip\@mpfootins = \skip\footins -\setlength\fboxsep{3\p@} -\setlength\fboxrule{.4\p@} +\setlength\fboxsep{3\ltjs@mpt} +\setlength\fboxrule{.4\ltjs@mpt} \renewcommand \theequation {\@arabic\c@equation} \newcounter{figure} \renewcommand \thefigure {\@arabic\c@figure} @@ -1111,8 +1086,8 @@ {\end@dblfloat} \newlength\abovecaptionskip \newlength\belowcaptionskip -\setlength\abovecaptionskip{5\p@} % 元: 10\p@ -\setlength\belowcaptionskip{5\p@} % 元: 0\p@ +\setlength\abovecaptionskip{5\ltjs@mpt} % 元: 10\p@ +\setlength\belowcaptionskip{5\ltjs@mpt} % 元: 0\p@ \long\def\@makecaption#1#2{{\small \advance\leftskip .0628\linewidth \advance\rightskip .0628\linewidth @@ -1149,7 +1124,7 @@ \newcommand*{\l@part}[2]{% \ifnum \c@tocdepth >-2\relax \addpenalty\@secpenalty - \addvspace{2.25em \@plus\p@}% + \addvspace{2.25em \@plus\ltjs@mpt}% \begingroup \parindent \z@ \rightskip \@tocrmarg @@ -1164,7 +1139,7 @@ \newcommand*{\l@section}[2]{% \ifnum \c@tocdepth >\z@ \addpenalty{\@secpenalty}% - \addvspace{1.0em \@plus\p@}% + \addvspace{1.0em \@plus\ltjs@mpt}% \begingroup \parindent\z@ \rightskip\@tocrmarg @@ -1191,7 +1166,7 @@ \newdimen\@lnumwidth \def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} \def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else - \vskip \z@ \@plus.2\p@ + \vskip \z@ \@plus.2\ltjs@mpt {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip \parindent #2\relax\@afterindenttrue \interlinepenalty\@M @@ -1266,7 +1241,7 @@ \@mkboth{\indexname}{\indexname}% \plainifnotempty % \thispagestyle{plain} \parindent\z@ - \parskip\z@ \@plus .3\p@\relax + \parskip\z@ \@plus .3\ltjs@mpt\relax \let\item\@idxitem \raggedright \footnotesize\narrowbaselines @@ -1281,7 +1256,7 @@ \newcommand{\@idxitem}{\par\hangindent 4\zw} % 元 40pt \newcommand{\subitem}{\@idxitem \hspace*{2\zw}} % 元 20pt \newcommand{\subsubitem}{\@idxitem \hspace*{3\zw}} % 元 30pt -\newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax} +\newcommand{\indexspace}{\par \vskip 10\ltjs@mpt \@plus5\ltjs@mpt \@minus3\ltjs@mpt\relax} \newcommand\seename{\if@english see\else →\fi} \newcommand\alsoname{\if@english see also\else →\fi} \let\footnotes@ve=\footnote @@ -1293,9 +1268,9 @@ \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}} \def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi} \renewcommand{\footnoterule}{% - \kern-3\p@ - \hrule width .4\columnwidth - \kern 2.6\p@} + \kern-3\ltjs@mpt + \hrule width .4\columnwidth height .4\ltjs@mpt + \kern 2.6\ltjs@mpt} \long\def\@footnotetext{% \insert\footins\bgroup \normalfont\footnotesize diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls index 00efa99d5be..1a153c41978 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjspf} - [2016/01/30 ] + [2016/03/31 ltjsclasses ] \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -96,27 +96,32 @@ \DeclareOption{landscape}{\@landscapetrue} \newif\if@slide \@slidefalse -\newcommand{\@ptsize}{0} -\DeclareOption{slide}{\@slidetrue\renewcommand{\@ptsize}{26}\@landscapetrue\@titlepagetrue} -\DeclareOption{8pt}{\renewcommand{\@ptsize}{-2}} -\DeclareOption{9pt}{\renewcommand{\@ptsize}{-1}} -\DeclareOption{10pt}{\renewcommand{\@ptsize}{0}} -\DeclareOption{11pt}{\renewcommand{\@ptsize}{1}} -\DeclareOption{12pt}{\renewcommand{\@ptsize}{2}} -\DeclareOption{14pt}{\renewcommand{\@ptsize}{4}} -\DeclareOption{17pt}{\renewcommand{\@ptsize}{7}} -\DeclareOption{20pt}{\renewcommand{\@ptsize}{10}} -\DeclareOption{21pt}{\renewcommand{\@ptsize}{11}} -\DeclareOption{25pt}{\renewcommand{\@ptsize}{15}} -\DeclareOption{30pt}{\renewcommand{\@ptsize}{20}} -\DeclareOption{36pt}{\renewcommand{\@ptsize}{26}} -\DeclareOption{43pt}{\renewcommand{\@ptsize}{33}} -\DeclareOption{12Q}{\renewcommand{\@ptsize}{1200}} -\DeclareOption{14Q}{\renewcommand{\@ptsize}{1400}} -\DeclareOption{10ptj}{\renewcommand{\@ptsize}{1001}} -\DeclareOption{10.5ptj}{\renewcommand{\@ptsize}{1051}} -\DeclareOption{11ptj}{\renewcommand{\@ptsize}{1101}} -\DeclareOption{12ptj}{\renewcommand{\@ptsize}{1201}} +\def\ltjs@magscale{1} +\DeclareOption{slide}{\@slidetrue\def\ltjs@magscale{3.583}\@landscapetrue\@titlepagetrue} +\DeclareOption{8pt} {\def\ltjs@magscale{0.83}}% 1.2^(-1) +\DeclareOption{9pt} {\def\ltjs@magscale{0.913}}% 1.2^(-0.5} +\DeclareOption{10pt}{\def\ltjs@magscale{1}} +\DeclareOption{11pt}{\def\ltjs@magscale{1.095}}% 1.2^0.5 +\DeclareOption{12pt}{\def\ltjs@magscale{1.200}} +\DeclareOption{14pt}{\def\ltjs@magscale{1.440}} +\DeclareOption{17pt}{\def\ltjs@magscale{1.728}} +\DeclareOption{20pt}{\def\ltjs@magscale{2}} +\DeclareOption{21pt}{\def\ltjs@magscale{2.074}} +\DeclareOption{25pt}{\def\ltjs@magscale{2.488}} +\DeclareOption{30pt}{\def\ltjs@magscale{2.986}} +\DeclareOption{36pt}{\def\ltjs@magscale{3.583}} +\DeclareOption{43pt}{\def\ltjs@magscale{4.300}} +\DeclareOption{12Q} {\def\ltjs@magscale{0.923}}% 1pt*12Q/13Q +\DeclareOption{14Q} {\def\ltjs@magscale{1.077}}% 1pt*14Q/13Q +\DeclareOption{10ptj}{\def\ltjs@magscale{1.085}}% 1pt*10bp/13Q +\DeclareOption{10.5ptj}{\def\ltjs@magscale{1.139}} +\DeclareOption{11ptj}{\def\ltjs@magscale{1.194}} +\DeclareOption{12ptj}{\def\ltjs@magscale{1.302}} +\newif\if@ltjs@mag@xreal +\@ltjs@mag@xrealtrue +\DeclareOption{xreal}{\@ltjs@mag@xrealtrue} +\DeclareOption{noxreal}{\@ltjs@mag@xrealfalse} +\DeclareOption{real}{\@ltjs@mag@xrealfalse} \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax \minute\time \advance\minute-\@tempcnta @@ -201,9 +206,6 @@ \DeclareOption{mingoth}{\mingothtrue} \DeclareOption{ptexjis}{\ptexjistrue} \DeclareOption{jis}{\jisfonttrue} -\newif\ifpapersize -\papersizefalse -\DeclareOption{papersize}{\papersizetrue} \newif\if@english \@englishfalse \DeclareOption{english}{\@englishtrue} @@ -218,83 +220,55 @@ \setlength\paperwidth {\@tempdima} \fi \def\n@baseline{14.554375} -\def\inv@mag{1} -\ifnum\@ptsize=-2 - \mag 833 - \def\inv@mag{1.20048} - \def\n@baseline{15}% -\fi -\ifnum\@ptsize=-1 - \mag 913 % formerly 900 - \def\inv@mag{1.09529} +\newdimen\ltjs@mpt +\ltjs@mpt=\ltjs@magscale\p@ +\ifdim\ltjs@mpt<.92\p@ % 8pt, 9pt 指定時 \def\n@baseline{15}% \fi -\ifnum\@ptsize=1 - \mag 1095 % formerly 1100 - \def\inv@mag{0.913242} -\fi -\ifnum\@ptsize=2 - \mag 1200 - \def\inv@mag{0.833333} -\fi -\ifnum\@ptsize=4 - \mag 1440 - \def\inv@mag{0.694444} -\fi -\ifnum\@ptsize=7 - \mag 1728 - \def\inv@mag{0.578704} -\fi -\ifnum\@ptsize=10 - \mag 2000 - \def\inv@mag{0.5} -\fi -\ifnum\@ptsize=11 - \mag 2074 - \def\inv@mag{0.48216} -\fi -\ifnum\@ptsize=15 - \mag 2488 - \def\inv@mag{0.401929} -\fi -\ifnum\@ptsize=20 - \mag 2986 - \def\inv@mag{0.334896} -\fi -\ifnum\@ptsize=26 - \mag 3583 - \def\inv@mag{0.279096} -\fi -\ifnum\@ptsize=33 - \mag 4300 - \def\inv@mag{0.232558} -\fi -\ifnum\@ptsize=1200 - \mag 923 - \def\inv@mag{1.0834236} -\fi -\ifnum\@ptsize=1400 - \mag 1077 - \def\inv@mag{0.928505} -\fi -\ifnum\@ptsize=1001 - \mag 1085 - \def\inv@mag{0.921659} -\fi -\ifnum\@ptsize=1051 - \mag 1139 - \def\inv@mag{0.877963} -\fi -\ifnum\@ptsize=1101 - \mag 1194 - \def\inv@mag{0.837521} -\fi -\ifnum\@ptsize=1201 - \mag 1302 - \def\inv@mag{0.768049} -\fi -\setlength\paperwidth{\inv@mag\paperwidth}% -\setlength\paperheight{\inv@mag\paperheight}% +\newcommand{\@ptsize}{0} +\ifdim\ltjs@mpt=1.0954\p@ \renewcommand{\@ptsize}{1}\else +\ifdim\ltjs@mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else +\renewcommand{\@ptsize}{-20}\fi\fi +\if@ltjs@mag@xreal\RequirePackage{type1cm} +\ifdim\ltjs@mpt=\p@\else + \expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax + \expandafter\let\csname OMX/cmex/m/n/10\endcsname\relax + \newluafunction\ltjs@@magnify@font@calc + \begingroup\catcode`\%=12\relax + \directlua{ + local getdimen, mpt=tex.getdimen, tex.getdimen('ltjs@mpt')/65536 + local t = lua.get_functions_table() + t[\the\ltjs@@magnify@font@calc] = function() + tex.sprint(math.floor(0.5+mpt*getdimen('dimen@'))) + end + function luatexja.ltjs_unmagnify_fsize(a) + local s = luatexja.print_scaled(math.floor(0.5+a/mpt*65536)) + tex.sprint( (s:match('%.0$')) and s:sub(1,-3) or s ) + end + } + \endgroup + \def\ltjs@magnify@external@font#1 at#2 at#3\@nil{% + \def\@tempa{#1}\def\@tempb{#2}% + \ifx\@tempb\@empty + \edef\@tempb{ scaled\directlua{% + tex.sprint(math.floor(0.5+\ltjs@magscale*1000)) + }}% + \else + \dimen@\@tempb\relax + \edef\@tempb{ at\luafunction\ltjs@@magnify@font@calc sp}% + \fi + \edef\@tempa{\def\noexpand\external@font{\@tempa\@tempb}} + } + \let\ltjs@orig@get@external@font=\get@external@font + \def\get@external@font{% + \edef\f@size{\directlua{luatexja.ltjs_unmagnify_fsize(\f@size)}}% + \ltjs@orig@get@external@font + \begingroup + \edef\@tempa{\external@font\space at\space at}% + \expandafter\ltjs@magnify@external@font\@tempa\@nil + \expandafter\endgroup\@tempa + } +\fi\fi \setlength{\@tempdima}{\paperwidth} \setlength{\@tempdimb}{\paperheight} \iftombow @@ -368,9 +342,11 @@ \if@slide \ltjsetxkanjiskip .1em \else - \ltjsetxkanjiskip .25em plus .15em minus .06em + \ltjsetxkanjiskip .25em plus .15em minus .06em \fi \fi} +\def\ltjs@setfontsize#1#2#3{% + \@setfontsize#1{#2\ltjs@mpt}{#3\ltjs@mpt}} \emergencystretch 3\zw \newif\ifnarrowbaselines \if@english @@ -395,11 +371,11 @@ } \renewcommand{\normalsize}{% \ltj@@ifnarrowbaselines - {\@setfontsize\normalsize\@xpt\@xiipt}% - {\@setfontsize\normalsize\@xpt{\n@baseline}}% - \abovedisplayskip 11\p@ \@plus3\p@ \@minus4\p@ - \abovedisplayshortskip \z@ \@plus3\p@ - \belowdisplayskip 9\p@ \@plus3\p@ \@minus4\p@ + {\ltjs@setfontsize\normalsize\@xpt\@xiipt}% + {\ltjs@setfontsize\normalsize\@xpt{\n@baseline}}% + \abovedisplayskip 11\ltjs@mpt \@plus3\ltjs@mpt \@minus4\ltjs@mpt + \abovedisplayshortskip \z@ \@plus3\ltjs@mpt + \belowdisplayskip 9\ltjs@mpt \@plus3\ltjs@mpt \@minus4\ltjs@mpt \belowdisplayshortskip \belowdisplayskip \let\@listi\@listI} \mcfamily\selectfont\normalsize @@ -411,10 +387,10 @@ \setlength\Chs{\wd0} \newcommand{\small}{% \ltj@@ifnarrowbaselines - {\@setfontsize\small\@ixpt{11}}% - {\@setfontsize\small\@ixpt{13}}% - \abovedisplayskip 9\p@ \@plus3\p@ \@minus4\p@ - \abovedisplayshortskip \z@ \@plus3\p@ + {\ltjs@setfontsize\small\@ixpt{11}}% + {\ltjs@setfontsize\small\@ixpt{13}}% + \abovedisplayskip 9\ltjs@mpt \@plus3\ltjs@mpt \@minus4\ltjs@mpt + \abovedisplayshortskip \z@ \@plus3\ltjs@mpt \belowdisplayskip \abovedisplayskip \belowdisplayshortskip \belowdisplayskip \def\@listi{\leftmargin\leftmargini @@ -423,38 +399,38 @@ \itemsep \parsep}} \newcommand{\footnotesize}{% \ltj@@ifnarrowbaselines - {\@setfontsize\footnotesize\@viiipt{9.5}}% - {\@setfontsize\footnotesize\@viiipt{11}}% - \abovedisplayskip 6\p@ \@plus2\p@ \@minus3\p@ - \abovedisplayshortskip \z@ \@plus2\p@ + {\ltjs@setfontsize\footnotesize\@viiipt{9.5}}% + {\ltjs@setfontsize\footnotesize\@viiipt{11}}% + \abovedisplayskip 6\ltjs@mpt \@plus2\ltjs@mpt \@minus3\ltjs@mpt + \abovedisplayshortskip \z@ \@plus2\ltjs@mpt \belowdisplayskip \abovedisplayskip \belowdisplayshortskip \belowdisplayskip \def\@listi{\leftmargin\leftmargini \topsep \z@ \parsep \z@ \itemsep \parsep}} -\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt} -\newcommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt} +\newcommand{\scriptsize}{\ltjs@setfontsize\scriptsize\@viipt\@viiipt} +\newcommand{\tiny}{\ltjs@setfontsize\tiny\@vpt\@vipt} \if@twocolumn - \newcommand{\large}{\@setfontsize\large\@xiipt{\n@baseline}} + \newcommand{\large}{\ltjs@setfontsize\large\@xiipt{\n@baseline}} \else - \newcommand{\large}{\@setfontsize\large\@xiipt{17}} + \newcommand{\large}{\ltjs@setfontsize\large\@xiipt{17}} \fi -\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}} -\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}} -\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}} -\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}} -\newcommand{\HUGE}{\@setfontsize\HUGE{30}{40}} +\newcommand{\Large}{\ltjs@setfontsize\Large\@xivpt{21}} +\newcommand{\LARGE}{\ltjs@setfontsize\LARGE\@xviipt{25}} +\newcommand{\huge}{\ltjs@setfontsize\huge\@xxpt{28}} +\newcommand{\Huge}{\ltjs@setfontsize\Huge\@xxvpt{33}} +\newcommand{\HUGE}{\ltjs@setfontsize\HUGE{30}{40}} \everydisplay=\expandafter{\the\everydisplay \narrowbaselines} \newcommand{\headfont}{\gtfamily\sffamily} \setlength\columnsep{2\zw} -\setlength\columnseprule{0\p@} -\setlength\lineskip{1\p@} -\setlength\normallineskip{1\p@} -\setlength\lineskiplimit{1\p@} -\setlength\normallineskiplimit{1\p@} +\setlength\columnseprule{\z@} +\setlength\lineskip{1\ltjs@mpt} +\setlength\normallineskip{1\ltjs@mpt} +\setlength\lineskiplimit{1\ltjs@mpt} +\setlength\normallineskiplimit{1\ltjs@mpt} \renewcommand{\baselinestretch}{} -\setlength\parskip{0\p@} +\setlength\parskip{\z@} \if@slide \setlength\parindent{0\zw} \else @@ -463,9 +439,9 @@ \@lowpenalty 51 \@medpenalty 151 \@highpenalty 301 -\setlength\topskip{10\p@} +\setlength\topskip{10\ltjs@mpt} \if@slide - \setlength\headheight{0\p@} + \setlength\headheight{0\ltjs@mpt} \else \setlength\headheight{2\topskip} \fi @@ -479,7 +455,7 @@ \setlength\textwidth{\fullwidth} \setlength{\textheight}{51\baselineskip} \addtolength{\textheight}{\topskip} -\addtolength{\textheight}{0.1\p@} +\addtolength{\textheight}{0.1\ltjs@mpt} \setlength{\mathindent}{10mm} \setlength\marginparsep{\columnsep} \setlength\marginparpush{\baselineskip} @@ -514,7 +490,7 @@ \addtolength\topmargin{-1in} {\footnotesize\global\setlength\footnotesep{\baselineskip}} \setlength\footnotesep{0.7\footnotesep} -\setlength{\skip\footins}{16\p@ \@plus 5\p@ \@minus 2\p@} +\setlength{\skip\footins}{16\ltjs@mpt \@plus 5\ltjs@mpt \@minus 2\ltjs@mpt} \setcounter{topnumber}{9} \renewcommand{\topfraction}{.85} \setcounter{bottomnumber}{9} @@ -525,17 +501,17 @@ \setcounter{dbltopnumber}{9} \renewcommand{\dbltopfraction}{.8} \renewcommand{\dblfloatpagefraction}{.8} -\setlength\floatsep {12\p@ \@plus 2\p@ \@minus 2\p@} -\setlength\textfloatsep{20\p@ \@plus 2\p@ \@minus 4\p@} -\setlength\intextsep {12\p@ \@plus 2\p@ \@minus 2\p@} -\setlength\dblfloatsep {12\p@ \@plus 2\p@ \@minus 2\p@} -\setlength\dbltextfloatsep{20\p@ \@plus 2\p@ \@minus 4\p@} -\setlength\@fptop{0\p@ \@plus 1fil} -\setlength\@fpsep{8\p@ \@plus 2fil} -\setlength\@fpbot{0\p@ \@plus 1fil} -\setlength\@dblfptop{0\p@ \@plus 1fil} -\setlength\@dblfpsep{8\p@ \@plus 2fil} -\setlength\@dblfpbot{0\p@ \@plus 1fil} +\setlength\floatsep {12\ltjs@mpt \@plus 2\ltjs@mpt \@minus 2\ltjs@mpt} +\setlength\textfloatsep{20\ltjs@mpt \@plus 2\ltjs@mpt \@minus 4\ltjs@mpt} +\setlength\intextsep {12\ltjs@mpt \@plus 2\ltjs@mpt \@minus 2\ltjs@mpt} +\setlength\dblfloatsep {12\ltjs@mpt \@plus 2\ltjs@mpt \@minus 2\ltjs@mpt} +\setlength\dbltextfloatsep{20\ltjs@mpt \@plus 2\ltjs@mpt \@minus 4\ltjs@mpt} +\setlength\@fptop{0\ltjs@mpt \@plus 1fil} +\setlength\@fpsep{8\ltjs@mpt \@plus 2fil} +\setlength\@fpbot{0\ltjs@mpt \@plus 1fil} +\setlength\@dblfptop{0\ltjs@mpt \@plus 1fil} +\setlength\@dblfpsep{8\ltjs@mpt \@plus 2fil} +\setlength\@dblfpbot{0\ltjs@mpt \@plus 1fil} \def\ps@plainfoot{% \let\@mkboth\@gobbletwo \let\@oddhead\@empty @@ -724,7 +700,7 @@ \@afterheading \fi \if@slide - {\vskip-6pt\maybeblue\hrule height0pt depth1pt\vskip7pt\relax}% + {\vskip-6\ltjs@mpt\maybeblue\hrule height0\ltjs@mpt depth1\ltjs@mpt\vskip7\ltjs@mpt\relax}% \fi \par % 2000-12-18 \ignorespaces} @@ -965,14 +941,14 @@ \gdef\postsectionname{}% \gdef\thesection{\presectionname\@Alph\c@section\postsectionname}% \gdef\thesubsection{\@Alph\c@section.\@arabic\c@subsection}} -\setlength\arraycolsep{5\p@} -\setlength\tabcolsep{6\p@} -\setlength\arrayrulewidth{.4\p@} -\setlength\doublerulesep{2\p@} +\setlength\arraycolsep{5\ltjs@mpt} +\setlength\tabcolsep{6\ltjs@mpt} +\setlength\arrayrulewidth{.4\ltjs@mpt} +\setlength\doublerulesep{2\ltjs@mpt} \setlength\tabbingsep{\labelsep} \skip\@mpfootins = \skip\footins -\setlength\fboxsep{3\p@} -\setlength\fboxrule{.4\p@} +\setlength\fboxsep{3\ltjs@mpt} +\setlength\fboxrule{.4\ltjs@mpt} \renewcommand \theequation {\@arabic\c@equation} \newcounter{figure} \renewcommand \thefigure {\@arabic\c@figure} @@ -1000,8 +976,8 @@ {\end@dblfloat} \newlength\abovecaptionskip \newlength\belowcaptionskip -\setlength\abovecaptionskip{5\p@} % 元: 10\p@ -\setlength\belowcaptionskip{5\p@} % 元: 0\p@ +\setlength\abovecaptionskip{5\ltjs@mpt} % 元: 10\p@ +\setlength\belowcaptionskip{5\ltjs@mpt} % 元: 0\p@ \long\def\@makecaption#1#2{% \vskip\abovecaptionskip \sbox\@tempboxa{\small\sffamily #1\quad #2}% @@ -1048,7 +1024,7 @@ \newcommand*{\l@part}[2]{% \ifnum \c@tocdepth >-2\relax \addpenalty\@secpenalty - \addvspace{2.25em \@plus\p@}% + \addvspace{2.25em \@plus\ltjs@mpt}% \begingroup \parindent \z@ \rightskip \@tocrmarg @@ -1063,7 +1039,7 @@ \newcommand*{\l@section}[2]{% \ifnum \c@tocdepth >\z@ \addpenalty{\@secpenalty}% - \addvspace{1.0em \@plus\p@}% + \addvspace{1.0em \@plus\ltjs@mpt}% \begingroup \parindent\z@ \rightskip\@tocrmarg @@ -1090,7 +1066,7 @@ \newdimen\@lnumwidth \def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} \def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else - \vskip \z@ \@plus.2\p@ + \vskip \z@ \@plus.2\ltjs@mpt {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip \parindent #2\relax\@afterindenttrue \interlinepenalty\@M @@ -1162,7 +1138,7 @@ \@mkboth{\indexname}{\indexname}% \plainifnotempty % \thispagestyle{plain} \parindent\z@ - \parskip\z@ \@plus .3\p@\relax + \parskip\z@ \@plus .3\ltjs@mpt\relax \let\item\@idxitem \raggedright \footnotesize\narrowbaselines @@ -1177,7 +1153,7 @@ \newcommand{\@idxitem}{\par\hangindent 4\zw} % 元 40pt \newcommand{\subitem}{\@idxitem \hspace*{2\zw}} % 元 20pt \newcommand{\subsubitem}{\@idxitem \hspace*{3\zw}} % 元 30pt -\newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax} +\newcommand{\indexspace}{\par \vskip 10\ltjs@mpt \@plus5\ltjs@mpt \@minus3\ltjs@mpt\relax} \newcommand\seename{\if@english see\else →\fi} \newcommand\alsoname{\if@english see also\else →\fi} \let\footnotes@ve=\footnote @@ -1189,9 +1165,9 @@ \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}} \def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi} \renewcommand{\footnoterule}{% - \kern-3\p@ - \hrule width .4\columnwidth - \kern 2.6\p@} + \kern-3\ltjs@mpt + \hrule width .4\columnwidth height .4\ltjs@mpt + \kern 2.6\ltjs@mpt} \long\def\@footnotetext{% \insert\footins\bgroup \normalfont\footnotesize diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty index c8815703b05..5784b1b3c6e 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}[2015/12/11 Core of LuaTeX-ja] + \ProvidesPackage{luatexja-core}[2016/03/31 Core of LuaTeX-ja] \fi % %% Load prerequisite packages. @@ -120,7 +120,9 @@ %! ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ % LuaTeX-ja core TeX source -\catcode"FFFFF=14 %" +\newcount\ltjlineendcomment +\ltjlineendcomment="FFFFF +\catcode\ltjlineendcomment=14 %" \def\ltj@loaded{hoge} @@ -771,7 +773,7 @@ \newcatcodetable\ltj@temp@cctb \def\ltj@overwrite@catcodetable#1{% \setluatexcatcodetable\ltj@temp@cctb{\luatexcatcodetable#1}% - \setluatexcatcodetable#1{\luatexcatcodetable\ltj@temp@cctb\catcode"FFFFF=14}%" + \setluatexcatcodetable#1{\luatexcatcodetable\ltj@temp@cctb\catcode\ltjlineendcomment=14}%" } \ltj@overwrite@catcodetable\CatcodeTableLaTeX \ltj@overwrite@catcodetable\CatcodeTableLaTeXAtLetter diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua index 7b0cd155341..9f3bd36a383 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua @@ -131,6 +131,7 @@ local function print_scaled(s) until s<=delta return out end +luatexja.print_scaled = print_scaled local function print_glue(d,order) local out=print_scaled(d) diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty index 4d239659cb1..93ebd9a16f3 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}[2015/11/03 Japanese Typesetting with Lua(La)TeX] + \ProvidesPackage{luatexja}[2016/03/31 Japanese Typesetting with Lua(La)TeX] \fi % \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} [2015/11/03] + \RequirePackage{luatexja-core} [2016/03/31] \RequirePackage{luatexja-compat}[2013/05/14] \else %<*!LaTeX> \input luatexja-core.sty % 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} -- cgit v1.2.3