From 7d792d75bcbca9fc8310de945404489ea7885c64 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 8 Feb 2016 22:40:55 +0000 Subject: luatexja (8feb16) git-svn-id: svn://tug.org/texlive/trunk@39629 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/luatex/luatexja/README | 8 ++-- .../texmf-dist/doc/luatex/luatexja/ltjclasses.pdf | Bin 830143 -> 782538 bytes .../texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf | Bin 815329 -> 767547 bytes .../texmf-dist/doc/luatex/luatexja/luatexja-en.pdf | Bin 453390 -> 453095 bytes .../texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf | Bin 830437 -> 828820 bytes Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx | 32 ++++++------- .../source/luatex/luatexja/ltjclasses.dtx | 25 +++------- .../source/luatex/luatexja/ltjsclasses.dtx | 18 +++----- Master/texmf-dist/tex/luatex/luatexja/ltj-base.lua | 27 +++++++++++ .../tex/luatex/luatexja/ltj-direction.lua | 10 ++-- .../texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua | 7 ++- Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua | 25 ++++------ .../tex/luatex/luatexja/ltj-pretreat.lua | 9 ++-- .../texmf-dist/tex/luatex/luatexja/ltjarticle.cls | 14 ++---- Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo | 2 +- Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo | 2 +- Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo | 2 +- Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls | 14 ++---- .../texmf-dist/tex/luatex/luatexja/ltjreport.cls | 14 ++---- .../texmf-dist/tex/luatex/luatexja/ltjsarticle.cls | 16 +++---- Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls | 16 +++---- .../texmf-dist/tex/luatex/luatexja/ltjsize10.clo | 2 +- .../texmf-dist/tex/luatex/luatexja/ltjsize11.clo | 2 +- .../texmf-dist/tex/luatex/luatexja/ltjsize12.clo | 2 +- .../texmf-dist/tex/luatex/luatexja/ltjskiyou.cls | 16 +++---- Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls | 16 +++---- .../texmf-dist/tex/luatex/luatexja/ltjtarticle.cls | 14 ++---- Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo | 2 +- Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo | 2 +- Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo | 2 +- Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls | 14 ++---- .../texmf-dist/tex/luatex/luatexja/ltjtreport.cls | 14 ++---- .../texmf-dist/tex/luatex/luatexja/ltjtsize10.clo | 2 +- .../texmf-dist/tex/luatex/luatexja/ltjtsize11.clo | 2 +- .../texmf-dist/tex/luatex/luatexja/ltjtsize12.clo | 2 +- Master/texmf-dist/tex/luatex/luatexja/luatexja.lua | 14 +++--- Master/texmf-dist/tex/luatex/luatexja/luatexja.sty | 2 +- .../tex/luatex/luatexja/patches/lltjfont.sty | 51 ++++++++++++++++++--- .../tex/luatex/luatexja/patches/lltjp-listings.sty | 6 +-- 39 files changed, 207 insertions(+), 199 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README index 5d0238c94cf..4909ab1c554 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/README +++ b/Master/texmf-dist/doc/luatex/luatexja/README @@ -1,4 +1,4 @@ -The LuaTeX-ja Package 20160131.0 +The LuaTeX-ja Package 20160208.0 -------------------------------- Copyright (c) 2011--2016 The LuaTeX-ja project License: modified BSD (see COPYING) @@ -34,9 +34,9 @@ Installation 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20160131.0 in the Git repository by + or tagged as 20160208.0 in the Git repository by + ;a=snapshot;h=refs/tags/20160208.0;sf=tgz> b. Extract the archive and process following three files by LuaLaTeX to generate classes for Japanese typesetting: @@ -81,4 +81,4 @@ Notes * src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use. -Last commit date: Sun Jan 31 16:29:43 2016 +0900 +Last commit date: Mon Feb 8 09:30:44 2016 +0900 diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf index 792607997f6..144c9071c9b 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf and b/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf index 07b02b87fe7..f0b3b386f61 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf and b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf index 38e26c1b49c..365bc6442b2 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf and b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf index 31de0306e5b..a39757ff287 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf and b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx index 8b199dfa679..964cb60f682 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx @@ -24,6 +24,7 @@ %%%%%%%% fonts \usepackage{luatexja-otf} +\directlua{luatexja.otf.enable_ivs()} \usepackage[no-math]{fontspec} \setmainfont[Ligatures=TeX]{Linux Libertine O} \setmonofont[Scale=MatchLowercase, ItalicFont=lmmono10-italic.otf, @@ -5240,11 +5241,11 @@ in \pTeX, and symbols beside each parameter has the following meaning: % \begin{itemize} %<*en> -\item ``\ast'' : values at the end of a paragraph or a hbox are +\item ``$\ast$'' : values at the end of a paragraph or a hbox are adopted in the whole paragraph or the whole hbox. % %<*ja> -\item ``\ast'':段落やhboxの終端での値がその段落/hbox全体で用いられる. +\item ``$\ast$'':段落やhboxの終端での値がその段落/hbox全体で用いられる. % %<*en> \item ``\dagger'': assignments are always global. @@ -6159,8 +6160,10 @@ to match the vertical center of ``M'' and that of ``あ'' in vertical typesetti + d_{\text{あ}} - d_{\text{M}}, \] where $h_{a}$~and~$d_{a}$ denote the height of ``$a$'' and the depth, respectively. -In \LuaTeX-ja, this \cs{adjustbaseline} does same task, namely setting the +In \LuaTeX-ja, this \cs{adjustbaseline} does similar task, namely setting the \Param{talbaselineshift} parameter. +If the \LaTeX\ is 2015/10/01 release or later, \LuaTeX-ja use a Japanese +character whose character class is zero, instead of `あ'. % %<*ja> \pLaTeXe では,\cs{adjustbaseline} は縦組時に「M」と「あ」の中心線を一致させるために, @@ -6174,8 +6177,12 @@ In \LuaTeX-ja, this \cs{adjustbaseline} does same task, namely setting the \LuaTeX-jaにおいても\cs{adjustbaseline} は同様に\Param{talbaselineshift}パラメータの調整処 理を行っている. -同時に,これも\pLaTeXe の \cs{adjustbaseline} で行われていたが, -「漢」の寸法を元に,(本節の最初に述べた,小文字で始まる)\cs{cht}, \cs{cwd} といった長さ変数を設定する. +同時に,これも\pLaTeXe の \cs{adjustbaseline} で同様の処理が行われていたが, +「漢」の寸法を元に(本節の最初に述べた,小文字で始まる)\cs{cht}, \cs{cwd} +といった長さ変数を設定する. + +なお,\LaTeX が2015/10/01 版以降の場合は,「あ」「漢」の代わりに +「文字クラス0の和文文字」を用いる. % \item[\cs{fontfamily}\{\}] @@ -6774,16 +6781,13 @@ JFMの\texttt{chars}テーブルのエントリとして \verb+'AJ1-xxx'+ の形 正しく半角幅で組むために利用されている. % -\directlua{luatexja.otf.enable_ivs()} %<*en> \paragraph{IVS support} Recent fonts support Ideographic Variation Selector (IVS). It seems that \Pkg{luaotfload} and \Pkg{fontspec} packages do not support IVS, so we implemented IVS support in \Pkg{luatexja-otf}. \emph{IVS support by the \Pkg{luatexja-otf} package is experimental. -If this feature is enabled with current \LuaTeX\ (not with LuaJIT\TeX), -we cannot use any OpenType feature, including {\tt vert}~and~{\tt vrt2}, -in vertical writing mode. If you want to enable IVS support nevertheless, load +If you want to enable IVS support, load \Pkg{luatexja-otf} and execute the following:} % %<*ja> @@ -6798,14 +6802,10 @@ IVSに対応してはいないようである.これらのパッケージで \medskip -\emph{\Pkg{luatexja-otf}によるIVS対応は試験的なものである.現行の\LuaTeX -でIVS対応を一旦有効にすると,縦組時に句読点などが横組用字形のままで組版されたり, -\Pkg{luaotfload}によるOpenType -featureが(\texttt{vert},~\texttt{vrt2}を含め)一切効かないといった -不具合がある\footnote{なぜかLuaJIT\TeX では大丈夫である.}.} -そのような不具合を知りながら有効にするには, +\emph{\Pkg{luatexja-otf}によるIVS対応は試験的なものである. +有効にするには, \Pkg{luatexja-otf}パッケージを読み込んだ上で以下の命令を実行する% -\footnote{この命令を2回以上実行しても意味がない.}: +\footnote{この命令を2回以上実行しても意味がない.}:} % \begin{lstlisting} \directlua{luatexja.otf.enable_ivs()} diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx index a5e7d417541..2d3d1c986e8 100644 --- a/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx +++ b/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx @@ -10,7 +10,7 @@ % % \fi % -% \CheckSum{4515} +% \CheckSum{4509} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -85,7 +85,6 @@ % \changes{v1.6-ltj-8}{2014/11/22}{縦組時のgeometry.styへの対応を別ファイル(lltjp-geometry.sty)に分離.それに伴いv1.6-ltj-3での変更を削除.} % \changes{v1.6-ltj-9}{2015/01/01}{縦組クラスの日付出力でエラーになることなどを修正.} % \changes{v1.6-ltj-10}{2015/10/18}{Lua\TeX\ 0.81.0に伴うプリミティブ名の変更に対応.} -% \changes{v1.6-ltj-11}{2016/01/31}{2015-10-18の変更が不完全であったことの修正}. % \fi % % \iffalse @@ -115,20 +114,13 @@ %<11pt&bk>\ProvidesFile{ltjtbk11.clo} %<12pt&bk>\ProvidesFile{ltjtbk12.clo} % - [2016/01/31 v1.6-ltj-11 + [2015/10/18 v1.6-ltj-10 % Standard LuaLaTeX-ja class] %<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)] %<*driver> ] \documentclass{ltjltxdoc} \GetFileInfo{ltjclasses.dtx} -\ifdefined\pagewidth - \let\pagewidth=\pdfpagewidth - \let\pageheight=\pdfpageheight -\else - \let\pdfpagewidth=\pagewidth - \let\pdfpageheight=\pageheight -\fi \usepackage[ipaex,nfssonly]{luatexja-preset} \usepackage[unicode]{hyperref} \title{Lua\LaTeX-ja用\texttt{jclasses}互換クラス} @@ -830,20 +822,15 @@ % [2015-10-18 LTJ] Lua\TeX\ 0.81.0ではプリミティブの名称変更がされたので, % それに合わせておきます. % -% [2016-01-31 LTJ] [2015-10-18]の処理は不完全でした. % \begin{macrocode} +\iftombow + \advance \@tempdima 2in + \advance \@tempdimb 2in +\fi \ifdefined\pdfpagewidth - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in - \fi \setlength{\pdfpagewidth}{\@tempdima} \setlength{\pdfpageheight}{\@tempdimb} \else - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in - \fi \setlength{\pagewidth}{\@tempdima} \setlength{\pageheight}{\@tempdimb} \fi diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx index 3199fc98a2e..400d9db8b77 100644 --- a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx +++ b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx @@ -50,7 +50,7 @@ %<*driver> \ProvidesFile{ltjsclasses.dtx} % - [2016/01/31 ] + [2016/01/30 ] %<*driver> \documentclass{ltjsarticle} \usepackage{doc} @@ -720,21 +720,17 @@ % % [2015-10-18 LTJ] Lua\TeX\ 0.81.0ではプリミティブの名称変更がされたので, % それに合わせておきます. -% -% [2016-01-31 LTJ] [2015-10-18]の処理は不完全でした. % \begin{macrocode} +\setlength{\@tempdima}{\paperwidth} +\setlength{\@tempdimb}{\paperheight} +\iftombow + \advance \@tempdima 2in + \advance \@tempdimb 2in +\fi \ifdefined\pdfpagewidth - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in - \fi \setlength{\pdfpagewidth}{\@tempdima} \setlength{\pdfpageheight}{\@tempdimb} \else - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in - \fi \setlength{\pagewidth}{\@tempdima} \setlength{\pageheight}{\@tempdimb} \fi diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-base.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-base.lua index f48c2ab14ed..e66a196aee6 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-base.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-base.lua @@ -400,6 +400,33 @@ ltjb.generic_info_no_line = generic_info_no_line ltjb.ltj_warning_no_line = ltj_warning_no_line ltjb.ltj_error = ltj_error +---- deterministic version of luatexbase.add_to_callback +function ltjb.add_to_callback(name,fun,description,priority) + local priority= priority + if priority==nil then + priority=#luatexbase.callback_descriptions(name)+1 + end + if(luatexbase.callbacktypes[name] == 3 and + priority == 1 and + #luatexbase.callback_descriptions(name)==1) then + luatexbase.module_warning("luatexbase", + "resetting exclusive callback: " .. name) + luatexbase.reset_callback(name) + end + local saved_callback={},ff,dd + for k,v in ipairs(luatexbase.callback_descriptions(name)) do + if k >= priority then + ff,dd= luatexbase.remove_from_callback(name, v) + saved_callback[#saved_callback+1]={ff,dd} + end + end + luatexbase.base_add_to_callback(name,fun,description) + for _,v in ipairs(saved_callback) do + luatexbase.base_add_to_callback(name,v[1],v[2]) + end + return +end + -------------------- mock of debug logger if not ltjb.out_debug then local function no_op() end diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua index a46fdeb99d2..b5f267c4bb1 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua @@ -275,7 +275,7 @@ do end end - luatexbase.add_to_callback('hpack_filter', + ltjb.add_to_callback('hpack_filter', create_dir_whatsit_hpack, 'ltj.create_dir_whatsit', 10000) end @@ -290,7 +290,7 @@ do ensure_tex_attr(attr_dir, 0) return h end - luatexbase.add_to_callback('post_linebreak_filter', + ltjb.add_to_callback('post_linebreak_filter', create_dir_whatsit_parbox, 'ltj.create_dir_whatsit', 10000) end @@ -987,7 +987,7 @@ do stop_time_measure('direction_vpack') return to_node(hd) end - luatexbase.add_to_callback('vpack_filter', + ltjb.add_to_callback('vpack_filter', dir_adjust_vpack, 'ltj.direction', 10000) end @@ -997,7 +997,7 @@ do local function dir_adjust_pre_output(h, gc) return to_node(create_dir_whatsit_vbox(to_direct(h), gc)) end - luatexbase.add_to_callback('pre_output_filter', + ltjb.add_to_callback('pre_output_filter', dir_adjust_pre_output, 'ltj.direction', 10000) @@ -1026,7 +1026,7 @@ do end end end - luatexbase.add_to_callback('buildpage_filter', + ltjb.add_to_callback('buildpage_filter', dir_adjust_buildpage, 'ltj.direction', 10000) end diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua index 12f350a84a4..a63c270e676 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua @@ -1101,6 +1101,7 @@ end -- return value: (the initial cursor lp), (last node) local init_var do + local id_local = node.id('local_par') local KANJI_SKIP = luatexja.icflag_table.KANJI_SKIP local XKANJI_SKIP = luatexja.icflag_table.XKANJI_SKIP local KSK = luatexja.stack_table_index.KSK @@ -1151,8 +1152,10 @@ do -- the current list is to be line-breaked: -- hbox from \parindent is skipped. local lp, par_indented, lpi, lps = head, 'boxbdd', getid(head), getsubtype(head) - while lp and ((lpi==id_whatsit and lps~=sid_user) - or ((lpi==id_hlist) and (lps==3))) do + while lp and + ((lpi==id_whatsit and lps~=sid_user) + or ((lpi==id_hlist) and (lps==3)) + or (lpi==id_local)) do if (lpi==id_hlist) and (lps==3) then Np.char, par_indented = 'parbdd', 'parbdd' Np.width = getfield(lp, 'width') diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua index ed1a1975320..75494d6428f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua @@ -158,15 +158,10 @@ local function extract(head) return to_node(head) end -luatexbase.add_to_callback('hpack_filter', extract, - 'ltj.otf', - luatexbase.priority_in_callback('pre_linebreak_filter', - 'ltj.main')) -luatexbase.add_to_callback('pre_linebreak_filter', extract, - 'ltj.otf', - luatexbase.priority_in_callback('pre_linebreak_filter', - 'ltj.main')) - +ltjb.add_to_callback('hpack_filter', extract,'ltj.otf', + luatexbase.priority_in_callback('hpack_filter', 'ltj.main')) +ltjb.add_to_callback('pre_linebreak_filter', extract,'ltj.otf', + luatexbase.priority_in_callback('pre_linebreak_filter', 'ltj.main')) -- additional callbacks -- 以下は,LuaTeX-ja に用意された callback のサンプルになっている. -- JFM の文字クラスの指定の所で,"AJ1-xxx" 形式での指定を可能とした. @@ -273,14 +268,10 @@ do ltjb.package_warning('luatexja-otf', 'luatexja.otf.enable_ivs() was already called, so this call is ignored', '') else - luatexbase.add_to_callback('hpack_filter', - do_ivs_repr, 'ltj.do_ivs', - luatexbase.priority_in_callback('hpack_filter', - 'ltj.set_stack_level')+1) - luatexbase.add_to_callback('pre_linebreak_filter', - do_ivs_repr, 'ltj.do_ivs', - luatexbase.priority_in_callback('pre_linebreak_filter', - 'ltj.set_stack_level')+1) + ltjb.add_to_callback('hpack_filter', do_ivs_repr, 'ltj.do_ivs', + luatexbase.priority_in_callback('hpack_filter', 'luaotfload.node_processor')) + ltjb.add_to_callback('pre_linebreak_filter', do_ivs_repr, 'ltj.do_ivs', + luatexbase.priority_in_callback('pre_linebreak_filter', 'luaotfload.node_processor')) is_ivs_enabled = true end end diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua index 9b2bc0708c0..f95ae5f61fa 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua @@ -116,7 +116,7 @@ do return h end - luatexbase.add_to_callback('hyphenate', + ltjb.add_to_callback('hyphenate', function (head,tail) return suppress_hyphenate_ja(head) end,'ltj.hyphenate') @@ -139,9 +139,8 @@ local function set_box_stack_level(head, mode) if ltjs.list_dir == dir_tate then for p in Dnode.traverse_id(id_glyph,to_direct(head)) do if (has_attr(p, attr_icflag) or 0)<=0 and getfield(p, 'lang')==lang_ja then - local pfn = has_attr(p, attr_curtfnt) or getfont(p) local pc = ltjs_orig_char_table[p] - local nf = ltjf_replace_altfont(pfn, pc) + 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)] @@ -154,11 +153,11 @@ local function set_box_stack_level(head, mode) end -- CALLBACKS -luatexbase.add_to_callback('hpack_filter', +ltjb.add_to_callback('hpack_filter', function (head) return set_box_stack_level(head, true) end,'ltj.set_stack_level',1) -luatexbase.add_to_callback('pre_linebreak_filter', +ltjb.add_to_callback('pre_linebreak_filter', function (head) return set_box_stack_level(head, false) end,'ltj.set_stack_level',1) diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls index 65b87c3c7c8..a90b1e2d89f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjarticle} - [2016/01/31 v1.6-ltj-11 + [2015/10/18 v1.6-ltj-10 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -164,18 +164,14 @@ \setlength\columnseprule{0\p@} \setlength{\@tempdima}{\paperwidth} \setlength{\@tempdimb}{\paperheight} +\iftombow + \advance \@tempdima 2in + \advance \@tempdimb 2in +\fi \ifdefined\pdfpagewidth - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in - \fi \setlength{\pdfpagewidth}{\@tempdima} \setlength{\pdfpageheight}{\@tempdimb} \else - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in - \fi \setlength{\pagewidth}{\@tempdima} \setlength{\pageheight}{\@tempdimb} \fi diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo index 289f7cb0805..eb605cc8bfd 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk10.clo} - [2016/01/31 v1.6-ltj-11 + [2015/10/18 v1.6-ltj-10 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo index 9642641ada8..bdd9b97faec 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk11.clo} - [2016/01/31 v1.6-ltj-11 + [2015/10/18 v1.6-ltj-10 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo index db1eaffb7c6..e9ec2762030 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk12.clo} - [2016/01/31 v1.6-ltj-11 + [2015/10/18 v1.6-ltj-10 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls index 34b4ed353ae..8a474c34dfc 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjbook} - [2016/01/31 v1.6-ltj-11 + [2015/10/18 v1.6-ltj-10 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -172,18 +172,14 @@ \setlength\columnseprule{0\p@} \setlength{\@tempdima}{\paperwidth} \setlength{\@tempdimb}{\paperheight} +\iftombow + \advance \@tempdima 2in + \advance \@tempdimb 2in +\fi \ifdefined\pdfpagewidth - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in - \fi \setlength{\pdfpagewidth}{\@tempdima} \setlength{\pdfpageheight}{\@tempdimb} \else - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in - \fi \setlength{\pagewidth}{\@tempdima} \setlength{\pageheight}{\@tempdimb} \fi diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls index 03686aa9815..aa9a1de288c 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjreport} - [2016/01/31 v1.6-ltj-11 + [2015/10/18 v1.6-ltj-10 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -170,18 +170,14 @@ \setlength\columnseprule{0\p@} \setlength{\@tempdima}{\paperwidth} \setlength{\@tempdimb}{\paperheight} +\iftombow + \advance \@tempdima 2in + \advance \@tempdimb 2in +\fi \ifdefined\pdfpagewidth - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in - \fi \setlength{\pdfpagewidth}{\@tempdima} \setlength{\pdfpageheight}{\@tempdimb} \else - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in - \fi \setlength{\pagewidth}{\@tempdima} \setlength{\pageheight}{\@tempdimb} \fi diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls index 2f93ffc393d..d71f55e4d77 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/31 ] + [2016/01/30 ] \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -295,18 +295,16 @@ \fi \setlength\paperwidth{\inv@mag\paperwidth}% \setlength\paperheight{\inv@mag\paperheight}% +\setlength{\@tempdima}{\paperwidth} +\setlength{\@tempdimb}{\paperheight} +\iftombow + \advance \@tempdima 2in + \advance \@tempdimb 2in +\fi \ifdefined\pdfpagewidth - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in - \fi \setlength{\pdfpagewidth}{\@tempdima} \setlength{\pdfpageheight}{\@tempdimb} \else - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in - \fi \setlength{\pagewidth}{\@tempdima} \setlength{\pageheight}{\@tempdimb} \fi diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls index 01c5cc2572b..92c9822e45f 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/31 ] + [2016/01/30 ] \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -302,18 +302,16 @@ \fi \setlength\paperwidth{\inv@mag\paperwidth}% \setlength\paperheight{\inv@mag\paperheight}% +\setlength{\@tempdima}{\paperwidth} +\setlength{\@tempdimb}{\paperheight} +\iftombow + \advance \@tempdima 2in + \advance \@tempdimb 2in +\fi \ifdefined\pdfpagewidth - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in - \fi \setlength{\pdfpagewidth}{\@tempdima} \setlength{\pdfpageheight}{\@tempdimb} \else - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in - \fi \setlength{\pagewidth}{\@tempdima} \setlength{\pageheight}{\@tempdimb} \fi diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo index 456da14fbe1..0598ed74cb4 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize10.clo} - [2016/01/31 v1.6-ltj-11 + [2015/10/18 v1.6-ltj-10 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo index 0482f88fc5c..23e9b5cef21 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize11.clo} - [2016/01/31 v1.6-ltj-11 + [2015/10/18 v1.6-ltj-10 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo index 6a958894e2c..15ea37b7b38 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize12.clo} - [2016/01/31 v1.6-ltj-11 + [2015/10/18 v1.6-ltj-10 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls index 9fd08453c93..6279b5096d6 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/31 ] + [2016/01/30 ] \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -297,18 +297,16 @@ \def\inv@mag{1.02354} \setlength\paperwidth{\inv@mag\paperwidth}% \setlength\paperheight{\inv@mag\paperheight}% +\setlength{\@tempdima}{\paperwidth} +\setlength{\@tempdimb}{\paperheight} +\iftombow + \advance \@tempdima 2in + \advance \@tempdimb 2in +\fi \ifdefined\pdfpagewidth - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in - \fi \setlength{\pdfpagewidth}{\@tempdima} \setlength{\pdfpageheight}{\@tempdimb} \else - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in - \fi \setlength{\pagewidth}{\@tempdima} \setlength{\pageheight}{\@tempdimb} \fi diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls index c82c2c37284..00efa99d5be 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/31 ] + [2016/01/30 ] \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -295,18 +295,16 @@ \fi \setlength\paperwidth{\inv@mag\paperwidth}% \setlength\paperheight{\inv@mag\paperheight}% +\setlength{\@tempdima}{\paperwidth} +\setlength{\@tempdimb}{\paperheight} +\iftombow + \advance \@tempdima 2in + \advance \@tempdimb 2in +\fi \ifdefined\pdfpagewidth - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in - \fi \setlength{\pdfpagewidth}{\@tempdima} \setlength{\pdfpageheight}{\@tempdimb} \else - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in - \fi \setlength{\pagewidth}{\@tempdima} \setlength{\pageheight}{\@tempdimb} \fi diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls index a94a06932bb..228d6d330c3 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtarticle} - [2016/01/31 v1.6-ltj-11 + [2015/10/18 v1.6-ltj-10 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -176,18 +176,14 @@ \setlength\columnseprule{0\p@} \setlength{\@tempdima}{\paperwidth} \setlength{\@tempdimb}{\paperheight} +\iftombow + \advance \@tempdima 2in + \advance \@tempdimb 2in +\fi \ifdefined\pdfpagewidth - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in - \fi \setlength{\pdfpagewidth}{\@tempdima} \setlength{\pdfpageheight}{\@tempdimb} \else - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in - \fi \setlength{\pagewidth}{\@tempdima} \setlength{\pageheight}{\@tempdimb} \fi diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo index 6cc2f933bcf..4565ea46ae7 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk10.clo} - [2016/01/31 v1.6-ltj-11 + [2015/10/18 v1.6-ltj-10 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo index d339d297dbd..65c4594c033 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk11.clo} - [2016/01/31 v1.6-ltj-11 + [2015/10/18 v1.6-ltj-10 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo index 2f1e1c9efe9..b5c89c433a8 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk12.clo} - [2016/01/31 v1.6-ltj-11 + [2015/10/18 v1.6-ltj-10 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls index 52f38c1a0c2..36d9a46d476 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtbook} - [2016/01/31 v1.6-ltj-11 + [2015/10/18 v1.6-ltj-10 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -184,18 +184,14 @@ \setlength\columnseprule{0\p@} \setlength{\@tempdima}{\paperwidth} \setlength{\@tempdimb}{\paperheight} +\iftombow + \advance \@tempdima 2in + \advance \@tempdimb 2in +\fi \ifdefined\pdfpagewidth - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in - \fi \setlength{\pdfpagewidth}{\@tempdima} \setlength{\pdfpageheight}{\@tempdimb} \else - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in - \fi \setlength{\pagewidth}{\@tempdima} \setlength{\pageheight}{\@tempdimb} \fi diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls index 70ce3c8c423..312af11a1cb 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtreport} - [2016/01/31 v1.6-ltj-11 + [2015/10/18 v1.6-ltj-10 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -182,18 +182,14 @@ \setlength\columnseprule{0\p@} \setlength{\@tempdima}{\paperwidth} \setlength{\@tempdimb}{\paperheight} +\iftombow + \advance \@tempdima 2in + \advance \@tempdimb 2in +\fi \ifdefined\pdfpagewidth - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in - \fi \setlength{\pdfpagewidth}{\@tempdima} \setlength{\pdfpageheight}{\@tempdimb} \else - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in - \fi \setlength{\pagewidth}{\@tempdima} \setlength{\pageheight}{\@tempdimb} \fi diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo index eb4ad055201..5eb5897a84b 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize10.clo} - [2016/01/31 v1.6-ltj-11 + [2015/10/18 v1.6-ltj-10 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo index d240f119431..706e5c66af1 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize11.clo} - [2016/01/31 v1.6-ltj-11 + [2015/10/18 v1.6-ltj-10 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo index 8c8f6081976..e999c9e0569 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize12.clo} - [2016/01/31 v1.6-ltj-11 + [2015/10/18 v1.6-ltj-10 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua index 491454c5071..7b0cd155341 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua @@ -318,22 +318,20 @@ do end -- callbacks - luatexbase.add_to_callback( + ltjb.add_to_callback( 'pre_linebreak_filter', function (head,groupcode) return main_process(head, true, tex.textdir, groupcode) end,'ltj.main', - luatexbase.priority_in_callback('pre_linebreak_filter', - 'luaotfload.node_processor')+1) - luatexbase.add_to_callback( + luatexbase.priority_in_callback('pre_linebreak_filter', 'luaotfload.node_processor')+1) + ltjb.add_to_callback( 'hpack_filter', function (head,groupcode,size,packtype, dir) return main_process(head, false, dir, groupcode) end,'ltj.main', - luatexbase.priority_in_callback('hpack_filter', - 'luaotfload.node_processor') + 1) - luatexbase.add_to_callback('pre_linebreak_filter', adjust_icflag, 'ltj.adjust_icflag', 1) - luatexbase.add_to_callback('hpack_filter', adjust_icflag, 'ltj.adjust_icflag', 1) + luatexbase.priority_in_callback('hpack_filter', 'luaotfload.node_processor')+1) + ltjb.add_to_callback('pre_linebreak_filter', adjust_icflag, 'ltj.adjust_icflag', 1) + ltjb.add_to_callback('hpack_filter', adjust_icflag, 'ltj.adjust_icflag', 1) end diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty index 2e55d5c22eb..4d239659cb1 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}[2015/11/03 Japanese Typesetting with Lua(La)TeX] \fi % \directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty index 4855f503306..08f9b7ff027 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjfont}[2015/08/28 Patch to NFSS2 for LuaTeX-ja] +\ProvidesPackage{lltjfont}[2016/02/07 Patch to NFSS2 for LuaTeX-ja] \let\k@encoding\@empty \let\ck@encoding\@empty @@ -365,10 +365,47 @@ \vrule\@width\z@ \@height.7\baselineskip \@depth.3\baselineskip}% \let\size@update\relax}} -\newbox\adjust@box -\newbox\adjust@box@aux -\newdimen\adjust@dimen -\def\adjustbaseline{% + +\ifdefined\newluafunction + \newluafunction\ltj@@adjust@baseline@inner + \begingroup\catcode`\~=12 + \directlua{% + local nulltable = {} + local t = lua.get_functions_table() + local getfont, dir_tate = font.getfont, luatexja.dir_table.dir_tate + local fmt, get_attr = luatexja.jfont.font_metric_table, tex.getattribute + local setdimen, set_attr = tex.setdimen, tex.setattribute + local dir = luatexja.unary_pars.direction + t[\the\ltj@@adjust@baseline@inner] = function() + local ft = fmt[get_attr('ltj@curtfnt')] or nulltable + ft = ft and ft.char_type or nulltable + local fk = ft and ft[0] or nulltable + local ht, dp, wd = fk.height or 0, fk.depth or 0, + fk.width or ft.zw or 0 + local fm + = ((getfont(font.current()) or nulltable) + .characters or nulltable)[77] or nulltable %% 'M' + set_attr('ltj@tablshift', + 0.5*((fm.height or 0)- (fm.depth or 0) - ht+ dp)) + if dir() ~= dir_tate then + ft = fmt[get_attr('ltj@curjfnt')] or nulltable + ft = ft and ft.char_type or nulltable + fk = ft and ft[0] or nulltable + ht, dp, wd = fk.height or 0, fk.depth or 0, + fk.width or ft.zw or 0 + end + setdimen('cht', ht); setdimen('cdp', dp) + setdimen('cwd', wd); setdimen('chs', wd) + setdimen('cHT', ht+dp) + end + }\endgroup + \def\adjustbaseline{\luafunction\ltj@@adjust@baseline@inner + \cvs\normalbaselineskip} +\else + \newbox\adjust@box + \newbox\adjust@box@aux + \newdimen\adjust@dimen + \def\adjustbaseline{% \setbox\adjust@box\hbox{% \ltj@ykblshift\z@\ltj@tkblshift\z@ 漢}% \cht\ht\adjust@box @@ -385,7 +422,9 @@ \divide\adjust@dimen\tw@ \advance\adjust@dimen0.5\dp\adjust@box@aux \advance\adjust@dimen-\dp\adjust@box - \ltj@tablshift=\adjust@dimen} + \ltj@tablshift=\adjust@dimen + } +\fi \DeclareRobustCommand\romanencoding[1]{% \expandafter\ifx\csname T@#1\endcsname\relax \@latex@error{Encoding scheme `#1' unknown}\@eha 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 c1f1b9f81bb..987cd691c52 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}[2015/12/11 Patch to listings for LuaTeX-ja] +\ProvidesPackage{lltjp-listings}[2016/02/07 Patch to listings for LuaTeX-ja] \RequirePackage{listings,luatexbase-cctb} %%%%%%%%%%%%%%%% Japanese support @@ -286,7 +286,7 @@ \else \lst@lExtend\lst@arg{\lst@temp~}% \expandafter\lst@InsideConvert@ - \fi #2} + \fi#2} }\endgroup \lst@AddToHook{ExitVars}{% @@ -344,7 +344,7 @@ %%%%%%%%%%%%%%%% escape to \LaTeX \lstloadaspects{escape} -\gdef\lst@Escape#1#2#3#4{ +\gdef\lst@Escape#1#2#3#4{% \lst@CArgX #1\relax\lst@CDefX {}% {\lst@ifdropinput\else -- cgit v1.2.3