From: Hironori Kitagawa Date: Wed, 13 Aug 2014 07:38:18 +0000 (+0900) Subject: Moved some Lua codes to avoid circular dependencies X-Git-Tag: 20150420.0~148 X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=9316152a70d8504ac5dc81b92fe913cf0474fdab;p=luatex-ja%2Fluatexja.git Moved some Lua codes to avoid circular dependencies --- diff --git a/doc/luatexja.dtx b/doc/luatexja.dtx index 7af6e10..4df2fb4 100644 --- a/doc/luatexja.dtx +++ b/doc/luatexja.dtx @@ -74,6 +74,19 @@ % Suppress output from showexpl to stdout. \let\SX@Info\relax +%%%%%%%% colors +%% modified from http://jfly.iam.u-tokyo.ac.jp/colorset/ +\usepackage{transparent} +\definecolor{red}{rgb}{1, 0.16, 0} +\definecolor{blue}{rgb}{0, 0.25, 1} +\definecolor{gray}{rgb}{.50, .53, .56} +\definecolor{green}{rgb}{.21, .63, .42} +\definecolor{cyan}{rgb}{0.40, .80, 1} +\definecolor{b_gray}{rgb}{0.78, 0.78, 0.80} +\definecolor{b_pink}{rgb}{1, 0.82, 0.82} +\definecolor{b_green}{rgb}{.53, .91, .69} +\definecolor{b_cyan}{rgb}{0.70, .92, 98} + %%%%%%%% hyperref \usepackage{hyperref,bookmark} %<*en> @@ -2987,9 +3000,8 @@ These commands set the dimension of \cs{box}. Unlike \cs{ltjgetwd}, one doe \end{verbatim} 設定値は「横組」「縦組及び \cs{utod} 方向」「\cs{dtou} 方向」 -の3種ごとに独立して記録される．……のときにどのようにボックスが配置されるか -は，Gitリポジトリ内の \verb+test/test55-boxdim_diffdir.{tex,pdf}+ を -参照してほしい． +の3種ごとに独立して記録される．参考として，Gitリポジトリ内の + \verb+test/test55-boxdim_diffdir.{tex,pdf}+ を挙げておく． \end{cslist} % @@ -3153,42 +3165,54 @@ which JFM will be used for this font by the following keys: \begin{table}[t] -%\caption{Differences between JFMs shipped with \LuaTeX-ja} -%\caption{\LuaTeX-ja に同梱されている JFM の違い} +%\caption{Differences between horizontal JFMs shipped with \LuaTeX-ja} +%\caption{\LuaTeX-ja に同梱されている横組用JFMの違い} %\medskip \label{tab-difjfm} \ltjsetparameter{jacharrange={+3}} \centering\small -\def\r#1{{\jfont\g=file:KozMinPr6N-Regular.otf:jfm=#1 at 14.43324pt \g -\setbox0=\vtop{\hsize=7\zw\noindent ◆◆◆◆◆◆◆ -ある日モモちゃんがお使いで迷子になって泣きました．}\copy0 -\vrule height 0pt depth \dp0}} -\def\s#1{{\jfont\g=file:KozMinPr6N-Regular.otf:jfm=#1 at 14.43324pt \g -\setbox0=\vtop{\hsize=7\zw\noindent ちょっと！何}\copy0}} -\def\t#1{{\jfont\g=file:KozMinPr6N-Regular.otf:jfm=#1 at 19.24432pt \g -\setbox0=\hbox{漢}% -\vrule width 0.4pt height\ht0 depth\dp0\kern-.2pt\copy0 -\kern-\wd0\vrule width\wd0height .2pt depth .2pt -\kern-\wd0\raise\ht0\hbox{\vrule width\wd0height .2pt depth .2pt}% -\kern-\wd0\lower\dp0\hbox{\vrule width\wd0height .2pt depth .2pt}% -\kern-.2pt\vrule width 0.4pt height\ht0 depth \dp0}} -\begin{tabular}{rccc} -\toprule -&\tt jfm-ujis.lua&\tt jfm-jis.lua&\tt jfm-min.lua\\ -\midrule -%Example~1~\cite{min10} -%例1~\cite{min10} -&\r{ujis}&\r{jis}&\r{min}\\ -%Example~2 -%例2 -&\s{ujis}&\s{jis}&\s{min}\\ -Bounding Box&\t{ujis}&\t{jis}&\t{min}\\ -\bottomrule -\end{tabular} +\def\r#1#2{% + \hbox{\Large\vrule + \parbox[b]{7\zw}{% + \addjfontfeatures{YokoFeatures={Opacity=0.5, Color=#2, JFM=#1}}\noindent + ◆◆◆◆◆◆◆ + ある日モモちゃんがお使いで迷子になって泣きました． + }\vrule}} +\def\s#1#2{% + \Large + \parbox[b]{7\zw}{% + \addjfontfeatures{YokoFeatures={Opacity=0.5, Color=#2, JFM=#1}}\noindent + ちょっと！何 + }} +\def\t#1#2#3{\hbox to 0pt{\hss% + \setbox0=\hbox{\addjfontfeatures{YokoFeatures={JFM=#1}}\huge #3}% + \textcolor{#2}{\transparent{0.5}\vrule width 0.4pt height\ht0 depth\dp0}\kern-.2pt\copy0 + \textcolor{#2}{\transparent{0.5}\kern-\wd0\vrule width\wd0height .2pt depth .2pt + \kern-\wd0\raise\ht0\hbox{\vrule width\wd0height .2pt depth .2pt}% + \kern-\wd0\lower\dp0\hbox{\vrule width\wd0height .2pt depth .2pt}% + \kern-.2pt\vrule width 0.4pt height\ht0 depth \dp0}\hss}} +{\Large\tabcolsep0pt +\begin{tabular}{m{8\zw}m{8\zw}m{8\zw}} +\leavevmode\hbox to 0pt{\r{ujis}{blue}\hss}\r{jis}{black}& +\leavevmode\hbox to 0pt{\r{jis}{black}\hss}\r{min}{red}& +\leavevmode\hbox to 0pt{\r{ujis}{blue}\hss}\r{min}{red}\\ +\leavevmode\hbox to 0pt{\s{ujis}{blue}\hss}\s{jis}{black}& +\leavevmode\hbox to 0pt{\s{jis}{black}\hss}\s{min}{red}& +\leavevmode\hbox to 0pt{\s{ujis}{blue}\hss}\s{min}{red}\\ +\leavevmode\qquad\t{ujis}{blue}{漢}\t{jis}{black}{漢}\qquad + \t{ujis}{blue}{っ}\t{jis}{black}{っ}& +\leavevmode\qquad\t{jis}{black}{漢}\t{min}{red}{漢}\qquad + \t{jis}{black}{っ}\t{min}{red}{っ}& +\leavevmode\qquad\t{ujis}{blue}{漢}\t{min}{red}{漢}\qquad + \t{ujis}{blue}{っ}\t{min}{red}{っ}\\ +\end{tabular}\par} + +(\textcolor{blue}{Blue: \texttt{jfm-ujis.lua}}, +\textcolor{black}{Black: \texttt{jfm-jis.lua}}, +\textcolor{red}{Red: \texttt{jfm-min.lua}}) \ltjsetparameter{jacharrange={-3}} \end{table} - \begin{cslist} \item[jfm=] %<*en> @@ -3372,12 +3396,57 @@ letter-spacing and the width of italic correction are not correct: %\subsection{\cs{tfont}} %\subsection{\cs{tfont} 命令} + +\begin{table}[t] +%\caption{Differences between vertical JFMs shipped with \LuaTeX-ja} +%\caption{\LuaTeX-ja に同梱されている縦組用 JFM の違い} +%\medskip +\label{tab-difjfm-tate} +\catcode`\<=12\catcode`\>=12 +\ltjsetparameter{jacharrange={+3}} +\small + +\def\r#1#2{% + \hbox{\tate\Large\vrule + \parbox{7\zw}{% + \addjfontfeatures{TateFeatures={Opacity=0.5, Color=#2, JFM=#1}}\noindent + ◆◆◆◆◆◆◆ + ある日モモちゃんがお使いで迷子になって泣きました． + }\vrule}} +\def\s#1#2{% + \hbox{\tate\Large + \parbox{7\zw}{% + \addjfontfeatures{TateFeatures={Opacity=0.5, Color=#2, JFM=#1}}\noindent + ちょっと！何 + }}} +\def\t#1#2#3{\hbox to 0pt{\hss% + \setbox0=\hbox{\addjfontfeatures{TateFeatures={JFM=#1}}\huge #3}% + \textcolor{#2}{\transparent{0.5}\vrule width 0.4pt height\ht0 depth\dp0}\kern-.2pt\copy0 + \textcolor{#2}{\transparent{0.5}\kern-\wd0\vrule width\wd0height .2pt depth .2pt + \kern-\wd0\raise\ht0\hbox{\vrule width\wd0height .2pt depth .2pt}% + \kern-\wd0\lower\dp0\hbox{\vrule width\wd0height .2pt depth .2pt}% + \kern-.2pt\vrule width 0.4pt height\ht0 depth \dp0}\hss}} + +\begin{minipage}{.7\textwidth} +\centering +\leavevmode\hbox to 0pt{\r{ujisv}{blue}\hss}\r{tmin}{red}\quad +\leavevmode\hbox to 0pt{\s{ujisv}{blue}\hss}\s{tmin}{red}\quad +\raise4\zw\hbox{\tate\Large\t{ujisv}{black}{漢}\t{tmin}{red}{漢}\qquad + \t{ujisv}{black}{っ}\t{tmin}{red}{っ}} +\end{minipage}% +\begin{minipage}{.3\textwidth} +\textcolor{blue}{Blue: \texttt{jfm-ujisv.lua}}\\ +\textcolor{red}{Red: \texttt{jfm-tmin.lua}} +\end{minipage} +\ltjsetparameter{jacharrange={-3}} +\end{table} + %<*en> ... % %<*ja> \cs{tfont} はフォントを縦組用の和文フォントとして読み込む命令であり， -\cs{jfont} の文法は \cs{jfont} と同じである． +\cs{tfont} の文法は \cs{jfont} と同じである． \cs{tfont} で定義された縦組用和文フォントは， 以下の点が \cs{jfont} による横組用和文フォントとは異なる： \begin{itemize} @@ -3388,9 +3457,19 @@ letter-spacing and the width of italic correction are not correct: \tfont\S=file:KozMinPr6N-Regular.otf:jfm=ujis % OK \end{verbatim} \item \ref{ssec-math}節で述べる，数式中の和文フォントには縦組用和文フォントは指定できない． - \item \texttt{jfm=}\ の部分には縦組用JFMを指定する．現在同梱されているのは， -OTFパッケージの \verb+upnmlminr-v.tfm+ を元にした\texttt{jfm-ujisv.lua}\ のみである． + \item \texttt{jfm=}\ の部分には縦組用JFMを指定する． +以下の縦組用JFMが\LuaTeX-jaには同梱されており，違いを表\ref{tab-difjfm-tate}に示した． +\begin{description} +\item[\tt jfm-ujis.lua] \LuaTeX-jaの標準縦組用JFMである．このJFMは\upTeX で + 用いられるUTF/OTFパッケージ用の和文用TFMである \verb+upnmlminr-v.tfm+ を + 元にしている． +\item[\tt jfm-min.lua] \pTeX に同梱されているデフォルトの和文用縦組TFM + である \verb+tmin10.tfm+ に相当する． +\end{description} \end{itemize} + +なお，\pTeX では，\cs{font},~\cs{jfont},~\cs{tfont}のどれでも欧文フォント・横組用和文フォン +ト・縦組用和文フォントの定義が可能であったが，\LuaTeX-jaではそうでないので注意． % %\subsection{Prefix \texttt{psft}} @@ -3687,10 +3766,10 @@ when the current character class is the class for opening delimiters'. \begin{minipage}{0.4\textwidth}% \begin{center}\unitlength=10pt\small \begin{picture}(15,12)(-1,-4) -\color{black!10!white}% jfm +\color{b_gray}% jfm \put(0,0){\vrule width 12\unitlength height 8\unitlength depth 3\unitlength} -\color{red!20!white}% step1 +\color{b_pink}% step1 \put(-1,-1.5){\vrule width 6\unitlength height 7\unitlength depth 2.5\unitlength} \color{red}% real glyph @@ -3700,7 +3779,7 @@ when the current character class is the class for opening delimiters'. \put(-1,5.5){\line(1,0){6}} \put(-1,-4){\line(1,0){6}} -\color{green!20!white}% real glyph +\color{b_green}% real glyph \put(3,0){\vrule width 6\unitlength height 7\unitlength depth 2.5\unitlength} \color{black}% jfm @@ -3713,7 +3792,7 @@ when the current character class is the class for opening delimiters'. \put(12.2,-1.5){\makebox(0,0)[l]{\texttt{depth}}} \put(6,0.2){\makebox(0,0)[b]{\texttt{width}}} -\color{green!50!black}% step1 +\color{green}% step1 \thicklines \put(3,0){\vector(0,1){7}\vector(0,-1){2.5}\vector(1,0){6}} \put(9,0){\line(0,1){7}\line(0,-1){2.5}} @@ -3789,10 +3868,10 @@ Furthermore, the glyph is shifted according to values of fields \begin{minipage}{0.4\textwidth}% \begin{center}\unitlength=10pt\small \begin{picture}(15,12)(-6,0) -\color{black!10!white}% jfm +\color{b_gray}% jfm \put(-6,0){\vrule width 12\unitlength height 11\unitlength} -\color{red!20!white}% real glyph +\color{b_pink}% real glyph \put(-6.5,5.5){\vrule width 8\unitlength height 6\unitlength depth 3\unitlength} \color{red}% real glyph @@ -3802,7 +3881,7 @@ Furthermore, the glyph is shifted according to values of fields \put(-6.5,11.5){\line(1,0){8}} \put(-6.5,2.5){\line(1,0){8}} -\color{green!20!white}% step1 +\color{b_green}% step1 \put(-4,3){\vrule width 8\unitlength height 6\unitlength depth 3\unitlength} \color{black}% jfm @@ -3815,7 +3894,7 @@ Furthermore, the glyph is shifted according to values of fields \put(-3,10.8){\makebox(0,0)[t]{\texttt{depth}}} \put(0.2,5.5){\makebox(0,0)[l]{\texttt{width}}} -\color{green!50!black}% step1 +\color{green}% step1 \thicklines \put(-4,3){\vector(0,1){6}\vector(0,-1){3}\vector(1,0){8}} \put( 4,3){\line(0,1){6}\line(0,-1){3}} @@ -5498,6 +5577,7 @@ will not be embedded in the output PDF file. See Subsection~\ref{ssec-psft}. できる．\ref{ssec-psft}節を参照． % +{\catcode`\<=12\catcode`\>=12 \begin{figure}[!tb] \begin{LTXexample} \jfontspec[ @@ -5512,6 +5592,7 @@ will not be embedded in the output PDF file. See Subsection~\ref{ssec-psft}. %\caption{An example of \texttt{TateFeatures} etc.} \label{fig:yokotate-fontspec} \end{figure} +} \item[TateFeatures=\{\}\textrm{, }TateFont=] % ... @@ -5819,7 +5900,7 @@ Lua・\TeX コードが参考になるだろう． \def\outbox#1{{\Large% \ltjsetparameter{kanjiskip=0pt plus .2\zw minus .2\zw}% \setbox\gridbox=\hbox to 20\zw{\sq\sq\sq\sq\sb\sq\sq\sq\sq\sb\sq\sq\sq\sq\sb\sq\sq\sq\sq\sb}% - \hbox{\textcolor{cyan!50!white}{\copy\gridbox}\hskip-20\zw% + \hbox{\textcolor{cyan}{\copy\gridbox}\hskip-20\zw% \vbox{\hsize=20\zw\noindent\leftskip0pt\rightskip0pt\parfillskip0pt#1}\vrule}% }} @@ -6885,11 +6966,11 @@ after ``beginning/ending of a group'' characters. ->, auto, shorten >=1pt ] \node [shape=rectangle, font=\scriptsize] (init) at (2,7) {start}; -\node [shape=circle,draw, fill=blue!20] (newline) at (4,7) {$N$}; -\node [shape=circle,draw, fill=blue!20] (midline) at (4,4) {$M$}; -\node [shape=circle,draw, fill=blue!20] (skipspc) at (8,7) {$S$}; -\node [shape=circle,draw, fill=red!20] (kanji) at (8,4) {$K$}; -\node [shape=rectangle,draw, fill=green!20] (scanacs) at (6,8) {scan a c.s.}; +\node [shape=circle,draw, fill=b_cyan] (newline) at (4,7) {$N$}; +\node [shape=circle,draw, fill=b_cyan] (midline) at (4,4) {$M$}; +\node [shape=circle,draw, fill=b_cyan] (skipspc) at (8,7) {$S$}; +\node [shape=circle,draw, fill=b_pink] (kanji) at (8,4) {$K$}; +\node [shape=rectangle,draw, fill=b_green] (scanacs) at (6,8) {scan a c.s.}; \node (endk) at (8,2.5) {} ; \node (endm) at (4,2.5) {} ; \node (ends) at (8,8.5) {} ; diff --git a/src/ltj-adjust.lua b/src/ltj-adjust.lua index bec3435..1a89408 100644 --- a/src/ltj-adjust.lua +++ b/src/ltj-adjust.lua @@ -11,6 +11,7 @@ module('luatexja.adjust', package.seeall) luatexja.load_module('jfont'); local ltjf = luatexja.jfont luatexja.load_module('jfmglue'); local ltjj = luatexja.jfmglue luatexja.load_module('stack'); local ltjs = luatexja.stack +luatexja.load_module('direction'); local ltjd = luatexja.direction local Dnode = node.direct or node @@ -169,6 +170,7 @@ local function set_stretch(p, after, before, ic, name) end -- step 1: 行末に kern を挿入（句読点，中点用） +local ltjd_glyph_from_packed = ltjd.glyph_from_packed local function aw_step1(p, res, total) local x = node_tail(getlist(p)); if not x then return false end -- x: \rightskip @@ -189,7 +191,7 @@ local function aw_step1(p, res, total) xc = x elseif xi == id_hlist and get_attr_icflag(x) == PACKED then -- packed JAchar - xc = getlist(x) + xc = ltjd_glyph_from_packed(x) while getid(xc) == id_whatsit do xc = node_next(xc) end else return false-- それ以外は対象外． diff --git a/src/ltj-direction.lua b/src/ltj-direction.lua index c05bc35..259f51c 100644 --- a/src/ltj-direction.lua +++ b/src/ltj-direction.lua @@ -4,7 +4,6 @@ luatexja.load_module('base'); local ltjb = luatexja.base luatexja.load_module('stack'); local ltjs = luatexja.stack -luatexja.load_module('rmlgbm'); local ltjr = luatexja.rmlgbm luatexja.direction = {} local attr_dir = luatexbase.attributes['ltj@dir'] @@ -844,63 +843,6 @@ do end end --- 縦書き用字形への変換テーブル -local font_vert_table = {} -- key: fontnumber -do - local font_vert_basename = {} -- key: basename - local function add_feature_table(tname, src, dest) - for i,v in pairs(src) do - if type(v.slookups)=='table' then - local s = v.slookups[tname] - if s and not dest[i] then - dest[i] = s - end - end - end - end - - local function prepare_vert_data(n, id) - -- test if already loaded - if type(id)=='number' then -- sometimes id is an integer - font_vert_table[n] = font_vert_table[id]; return - elseif (not id) or font_vert_table[n] then return - end - local fname = id.filename - local bname = file.basename(fname) - if not fname then - font_vert_table[n] = {}; return - elseif font_vert_basename[bname] then - font_vert_table[n] = font_vert_basename[bname]; return - end - local vtable = {} - local a = id.resources.sequences - if a then - local s = id.shared.rawdata.descriptions - for i,v in pairs(a) do - if v.features.vert or v.features.vrt2 then - add_feature_table(v.subtables[1], s, vtable) - end - end - end - font_vert_basename[bname] = vtable - font_vert_table[n] = vtable - end - -- 縦書き用字形への変換 - function luatexja.direction.get_vert_glyph(n, chr) - local fn = font_vert_table[n] - return fn and fn[chr] or chr - end - luatexbase.add_to_callback('luatexja.define_font', - function (res, name, size, id) - prepare_vert_data(id, res) - end, - 'prepare_vert_data', 1) - - local function a (n, dat) font_vert_table[n] = dat end - luatexja.rmlgbm.vert_addfunc = a - -end - -- PACKED の hbox から文字を取り出す -- luatexja.jfmglue.check_box などで使用 do diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua index f99a9aa..ccff2ee 100644 --- a/src/ltj-jfont.lua +++ b/src/ltj-jfont.lua @@ -3,13 +3,15 @@ -- luatexbase.provides_module({ name = 'luatexja.jfont', - date = '2014/02/01', + date = '2014/08/12', description = 'Loader for Japanese fonts', }) module('luatexja.jfont', package.seeall) luatexja.load_module('base'); local ltjb = luatexja.base luatexja.load_module('charrange'); local ltjc = luatexja.charrange +luatexja.load_module('rmlgbm'); local ltjr = luatexja.rmlgbm +luatexja.load_module('direction'); local ltjd = luatexja.direction local Dnode = node.direct or node @@ -278,13 +280,18 @@ do end do + local get_dir_count = ltjd.get_dir_count + local dir_tate = luatexja.dir_table.dir_tate + local tex_get_attr = tex.getattribute -- PUBLIC function function get_zw() - local a = font_metric_table[tex.attribute[attr_curjfnt]] + local a = font_metric_table[ + tex_get_attr((get_dir_count()==dir_tate) and attr_curtfnt or attr_curjfnt)] return a and a.zw or 0 end function get_zh() - local a = font_metric_table[tex.attribute[attr_curjfnt]] + local a = font_metric_table[ + tex_get_attr((get_dir_count()==dir_tate) and attr_curtfnt or attr_curjfnt)] return a and a.zw or 0 end end @@ -333,7 +340,18 @@ do end return name end - luatexja.jfont.extract_metric = extract_metric + + -- define_font callback + local otfl_fdr = fonts.definers.read + local ltjr_font_callback = ltjr.font_callback + function luatexja.font_callback(name, size, id) + local new_name = extract_metric(name) + local res = ltjr_font_callback(new_name, size, id, otfl_fdr) + luatexbase.call_callback('luatexja.define_font', res, new_name, size, id) + return res + end + luatexbase.create_callback('luatexja.define_font', 'simple', function (n) return n end) + luatexbase.add_to_callback('define_font',luatexja.font_callback,"luatexja.font_callback", 1) end ------------------------------------------------------------------------ @@ -571,32 +589,93 @@ end ------------------------------------------------------------------------ --- MISC +-- 縦書き用字形への変換テーブル ------------------------------------------------------------------------ +local font_vert_table = {} -- key: fontnumber +do + local font_vert_basename = {} -- key: basename + local function add_feature_table(tname, src, dest) + for i,v in pairs(src) do + if type(v.slookups)=='table' then + local s = v.slookups[tname] + if s and not dest[i] then + dest[i] = s + end + end + end + end -local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct --- EXT: italic correction -function append_italic() - local p = to_direct(tex.nest[tex.nest.ptr].tail) - if p and getid(p)==id_glyph then - local f = getfont(p) - local g = node_new(id_kern) - setfield(g, 'subtype', 1) - set_attr(g, attr_icflag, ITALIC) - if is_ucs_in_japanese_char(p) then - f = has_attr(p, attr_curjfnt) - local j = font_metric_table[f] - setfield(g, 'kern', j.char_type[find_char_class(getchar(p), j)].italic) - else - local h = font_getfont(f) - if h then - setfield(g, 'kern', h.characters[getchar(p)].italic) + local function prepare_vert_data(n, id) + -- test if already loaded + if type(id)=='number' then -- sometimes id is an integer + font_vert_table[n] = font_vert_table[id]; return + elseif (not id) or font_vert_table[n] then return + end + local fname = id.filename + local bname = file.basename(fname) + if not fname then + font_vert_table[n] = {}; return + elseif font_vert_basename[bname] then + font_vert_table[n] = font_vert_basename[bname]; return + end + local vtable = {} + local a = id.resources.sequences + if a then + local s = id.shared.rawdata.descriptions + for i,v in pairs(a) do + if v.features.vert or v.features.vrt2 then + add_feature_table(v.subtables[1], s, vtable) + end + end + end + font_vert_basename[bname] = vtable + font_vert_table[n] = vtable + end + -- 縦書き用字形への変換 + function get_vert_glyph(n, chr) + local fn = font_vert_table[n] + return fn and fn[chr] or chr + end + luatexbase.add_to_callback('luatexja.define_font', + function (res, name, size, id) + prepare_vert_data(id, res) + end, + 'prepare_vert_data', 1) + + local function a (n, dat) font_vert_table[n] = dat end + ltjr.vert_addfunc = a + +end + +------------------------------------------------------------------------ +-- MISC +------------------------------------------------------------------------ +do + local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct + local tex_set_attr = tex.setattribute + -- EXT: italic correction + function append_italic() + local p = to_direct(tex.nest[tex.nest.ptr].tail) + if p and getid(p)==id_glyph then + local f = getfont(p) + local g = node_new(id_kern) + setfield(g, 'subtype', 1) + set_attr(g, attr_icflag, ITALIC) + if is_ucs_in_japanese_char(p) then + f = has_attr(p, attr_curjfnt) + local j = font_metric_table[f] + setfield(g, 'kern', j.char_type[find_char_class(getchar(p), j)].italic) else - tex.attribute[attr_icflag] = 0 - return node_free(g) + local h = font_getfont(f) + if h then + setfield(g, 'kern', h.characters[getchar(p)].italic) + else + tex_set_attr(attr_icflag, 0) + return node_free(g) + end end + node_write(g) + tex_set_attr(attr_icflag, 0) end - node_write(g) - tex.attribute[attr_icflag] = 0 end end diff --git a/src/ltj-pretreat.lua b/src/ltj-pretreat.lua index 8cf30a2..598c804 100644 --- a/src/ltj-pretreat.lua +++ b/src/ltj-pretreat.lua @@ -44,7 +44,7 @@ local attr_curtfnt = luatexbase.attributes['ltj@curtfnt'] local attr_icflag = luatexbase.attributes['ltj@icflag'] local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct -local ltjd_get_vert_glyph = ltjd.get_vert_glyph +local ltjf_get_vert_glyph = ltjf.get_vert_glyph local ltjf_replace_altfont = ltjf.replace_altfont local attr_orig_char = luatexbase.attributes['ltj@origchar'] local STCK = luatexja.userid_table.STCK @@ -58,6 +58,7 @@ local dir_tate = luatexja.dir_table.dir_tate ------------------------------------------------------------------------ local wt, wtd = {}, {} do + local ltjd_get_dir_count = ltjd.get_dir_count local start_time_measure, stop_time_measure = ltjb.start_time_measure, ltjb.stop_time_measure local head, real_head @@ -98,7 +99,7 @@ do local p = head for i = 1,#wt do wt[i]=nil end for i = 1,#wtd do wtd[i]=nil end - ltjs.list_dir=ltjd.get_dir_count() + ltjs.list_dir=ltjd_get_dir_count() while p do local flag local pfunc = suppress_hyphenate_ja_aux[getid(p)] @@ -135,7 +136,7 @@ local function set_box_stack_level(head, mode) local pc = getchar(p) local pf = ltjf_replace_altfont(pfn, pc) set_attr(p, attr_dir, pc) - pc = ltjd_get_vert_glyph(pf, pc) or pc + pc = ltjf_get_vert_glyph(pf, pc) or pc setfield(p, 'char', pc); set_attr(p, attr_orig_char, pc) setfield(p, 'font', pf); set_attr(p, attr_curjfnt, pf) end diff --git a/src/ltj-ruby.lua b/src/ltj-ruby.lua index 84c31d7..e21c95a 100644 --- a/src/ltj-ruby.lua +++ b/src/ltj-ruby.lua @@ -557,7 +557,7 @@ local post_lown do local function write_aux(wv, num) local id = has_attr(wv, attr_ruby_id) - if id>0 then + if false and id>0 then tex.sprint(cat_lp, '\\write\\@mainaux{\\string\\directlua{luatexja.ruby.old_break_info[' .. tostring(id) .. ']=' .. num diff --git a/src/ltj-setwidth.lua b/src/ltj-setwidth.lua index d56125c..04d11db 100644 --- a/src/ltj-setwidth.lua +++ b/src/ltj-setwidth.lua @@ -49,6 +49,7 @@ local attr_tkblshift = luatexbase.attributes['ltj@tkblshift'] local attr_icflag = luatexbase.attributes['ltj@icflag'] local ltjf_font_metric_table = ltjf.font_metric_table +local ltjf_get_vert_glyph = ltjf.get_vert_glyph local PACKED = luatexja.icflag_table.PACKED local PROCESSED = luatexja.icflag_table.PROCESSED @@ -120,7 +121,7 @@ local function capsule_glyph_tate(p, met, class) fshift = call_callback("luatexja.set_width", fshift, met, class) local fheight, fdepth = char_data.height, char_data.depth - setfield(p, 'char', ltjd.get_vert_glyph(getfont(p), getchar(p))) + setfield(p, 'char', ltjf_get_vert_glyph(getfont(p), getchar(p))) local y_shift = - getfield(p, 'yoffset') + (has_attr(p,attr_tkblshift) or 0) diff --git a/src/luatexja.lua b/src/luatexja.lua index b4b83f4..a0425d7 100644 --- a/src/luatexja.lua +++ b/src/luatexja.lua @@ -119,32 +119,15 @@ load_module('rmlgbm'); local ltjr = luatexja.rmlgbm -- must be 1st if luatexja_debug then load_module('debug') end load_module('charrange'); local ltjc = luatexja.charrange +load_module('stack'); local ltjs = luatexja.stack +load_module('direction'); local ltjd = luatexja.direction load_module('jfont'); local ltjf = luatexja.jfont - --- define_font -do - local otfl_fdr = fonts.definers.read - local ltjr_font_callback = ltjr.font_callback - local ltjf_extract_metric = ltjf.extract_metric - function luatexja.font_callback(name, size, id) - local new_name = ltjf_extract_metric(name) - local res = ltjr_font_callback(new_name, size, id, otfl_fdr) - luatexbase.call_callback('luatexja.define_font', res, new_name, size, id) - return res - end - luatexbase.create_callback('luatexja.define_font', 'simple', function (n) return n end) - luatexbase.add_to_callback('define_font',luatexja.font_callback,"luatexja.font_callback", 1) -end - - load_module('inputbuf'); local ltji = luatexja.inputbuf -load_module('stack'); local ltjs = luatexja.stack load_module('pretreat'); local ltjp = luatexja.pretreat load_module('jfmglue'); local ltjj = luatexja.jfmglue load_module('setwidth'); local ltjw = luatexja.setwidth load_module('math'); local ltjm = luatexja.math load_module('tangle'); local ltjb = luatexja.base -load_module('direction'); local ltjd = luatexja.direction local attr_jchar_class = luatexbase.attributes['ltj@charclass'] local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']