ソースコードの管理場所
リビジョン | e02c0d7ab9834738a2ecc82f470925f02852776a (tree) |
---|---|
日時 | 2013-05-08 20:52:44 |
作者 | Hironori Kitagawa <h_kitagawa2001@yaho...> |
コミッター | Hironori Kitagawa |
Use luatexbase.newuserwhatsit in luateja.lua. (and several small bugfixes)
@@ -1527,21 +1527,16 @@ Use the JFM \texttt{jfm-jis.lua}, instead of \texttt{jfm-ujis.lua}, which is the | ||
1527 | 1527 | %<en>\paragraph{Kozuka fonts} |
1528 | 1528 | %<ja>\paragraph{小塚フォント} |
1529 | 1529 | %<*en> |
1530 | -When using single weight, we adopt Kozuka~Gothic~M as \textit{gothic}, | |
1531 | -because we think that Kozuka~Gothic~R looks thin. | |
1532 | 1530 | There is not `Kozuka Maru Gothic', therefore Kozuka~Gothic~H is used |
1533 | 1531 | as a substitute for \textit{rounded gothic}. |
1534 | 1532 | %</en> |
1535 | 1533 | %<*ja> |
1536 | -まず,小塚フォントを用いる設定を述べる. | |
1537 | -単ウェイト時のゴシック体は小塚ゴシックRでは細いように感じるので, | |
1538 | -小塚ゴシックMに変更している. | |
1539 | -さらに,丸ゴシック体はないので便宜上小塚ゴシックHで代用している. | |
1534 | +丸ゴシック体はないので便宜上小塚ゴシックHで代用している. | |
1540 | 1535 | %</ja> |
1541 | 1536 | \begin{center}\small |
1542 | 1537 | \begin{tabular}{llll} |
1543 | 1538 | \toprule |
1544 | -&\tt kozuka4&\tt kozuka6&\tt kozuka6n\\ | |
1539 | +&\tt kozuka-pro&\tt kozuka-pr6&\tt kozuka-pr6n\\ | |
1545 | 1540 | \midrule |
1546 | 1541 | %<*en> |
1547 | 1542 | \bf mincho medium&Kozuka Mincho Pro R&Kozuka Mincho ProVI R&Kozuka Mincho Pr6N R\\ |
@@ -1550,7 +1545,7 @@ as a substitute for \textit{rounded gothic}. | ||
1550 | 1545 | \bf gothic medium\\ |
1551 | 1546 | without \texttt{deluxe} |
1552 | 1547 | &Kozuka Gothic Pro M&Kozuka Gothic ProVI M&Kozuka Gothic Pr6N M\\ |
1553 | - multiple weights | |
1548 | + with \texttt{deluxe} | |
1554 | 1549 | &Kozuka Gothic Pro R&Kozuka Gothic ProVI R&Kozuka Gothic Pr6N R\\ |
1555 | 1550 | \midrule |
1556 | 1551 | \bf gothic bold |
@@ -1581,28 +1576,25 @@ as a substitute for \textit{rounded gothic}. | ||
1581 | 1576 | \end{tabular} |
1582 | 1577 | \end{center} |
1583 | 1578 | |
1584 | -%<en>\paragraph{Hiragino and Morisawa} | |
1585 | -%<ja>\paragraph{ヒラギノ・モリサワ} | |
1586 | -%<*en> | |
1587 | -Settings for Hiragino fonts: | |
1588 | -%</en> | |
1589 | -%<*ja> | |
1590 | -まずヒラギノフォントから: | |
1591 | -%</ja> | |
1592 | -% これらは持っているわけではないので,フォント名が | |
1593 | -% 異なっているかもしれません.確認お願いします. | |
1579 | +%<en>\paragraph{Hiragino and Morisawa}\ | |
1580 | +%<ja>\paragraph{ヒラギノ・モリサワ}\ | |
1594 | 1581 | \begin{center}\small |
1595 | 1582 | \begin{tabular}{lll} |
1596 | 1583 | \toprule |
1597 | -&\tt hiragino&\tt hiraginon\\ | |
1584 | +&\tt hiragino-pro&\tt hiragino-pron\\ | |
1598 | 1585 | \midrule |
1599 | 1586 | %<*en> |
1600 | 1587 | \bf mincho medium& |
1601 | 1588 | Hiragino Mincho Pro W3&Hiragino Mincho Pr6N W3\\ |
1602 | 1589 | \bf mincho bold& |
1603 | 1590 | Hiragino Mincho Pro W6&Hiragino Mincho Pr6N W6\\ |
1604 | -\bf gothic medium& | |
1605 | -Hiragino Kaku Gothic Pro W3&Hiragino Kaku Gothic ProN W3\\ | |
1591 | +\midrule | |
1592 | +\bf gothic medium\\ | |
1593 | + without \texttt{deluxe} | |
1594 | +&Hiragino Kaku Gothic Pro W6&Hiragino Kaku Gothic ProN W6\\ | |
1595 | + with \texttt{deluxe} | |
1596 | +&Hiragino Kaku Gothic Pro W3&Hiragino Kaku Gothic ProN W3\\ | |
1597 | +\midrule | |
1606 | 1598 | \bf gothic bold& |
1607 | 1599 | Hiragino Kaku Gothic Pro W6&Hiragino Kaku Gothic ProN W6\\ |
1608 | 1600 | \bf gothic heavy& |
@@ -1615,8 +1607,13 @@ Hiragino Maru Gothic Pro W4&Hiragino Maru Gothic ProN W4\\ | ||
1615 | 1607 | ヒラギノ明朝体Pro~W3&ヒラギノ明朝体Pr6N~W3\\ |
1616 | 1608 | \gt 明朝体太字& |
1617 | 1609 | ヒラギノ明朝体Pro~W6&ヒラギノ明朝体Pr6N~W6\\ |
1618 | -\gt ゴシック体細字& | |
1619 | -ヒラギノ角ゴPro~W3&ヒラギノ角ゴProN~W3\\ | |
1610 | +\midrule | |
1611 | +\gt ゴシック体細細字\\ | |
1612 | + 単ウェイト時 | |
1613 | +&ヒラギノ角ゴPro~W6&ヒラギノ角ゴProN~W6\\ | |
1614 | + 多ウェイト時 | |
1615 | +&ヒラギノ角ゴPro~W3&ヒラギノ角ゴProN~W3\\ | |
1616 | +\midrule | |
1620 | 1617 | \gt ゴシック体太字& |
1621 | 1618 | ヒラギノ角ゴPro~W6&ヒラギノ角ゴProN~W6\\ |
1622 | 1619 | \gt ゴシック体極太& |
@@ -1624,19 +1621,9 @@ Hiragino Maru Gothic Pro W4&Hiragino Maru Gothic ProN W4\\ | ||
1624 | 1621 | \gt 丸ゴシック体& |
1625 | 1622 | ヒラギノ丸ゴPro~W4&ヒラギノ丸ゴProN~W4\\ |
1626 | 1623 | %</ja> |
1627 | -\bottomrule | |
1628 | -\end{tabular} | |
1629 | -\end{center} | |
1630 | -%<*en> | |
1631 | -Settings for Morisawa fonts: | |
1632 | -%</en> | |
1633 | -%<*ja> | |
1634 | -次はモリサワフォントを用いる設定である: | |
1635 | -%</ja> | |
1636 | -\begin{center}\small | |
1637 | -\begin{tabular}{lll} | |
1638 | -\toprule | |
1639 | -&\tt morisawa4&\tt morisawa6n\\ | |
1624 | +\midrule | |
1625 | +\midrule | |
1626 | +&\tt morisawa-pro&\tt morisawa-pr6n\\ | |
1640 | 1627 | \midrule |
1641 | 1628 | %<*en> |
1642 | 1629 | \bf mincho medium& |
@@ -1715,7 +1702,7 @@ We can use HG~fonts bundled with Microsoft Office for realizing multiple weights | ||
1715 | 1702 | \begin{center}\small |
1716 | 1703 | \begin{tabular}{llll} |
1717 | 1704 | \toprule |
1718 | -&\tt ipa-dx&\tt ipaex-dx&\tt ms-dx\\ | |
1705 | +&\tt ipa-hg&\tt ipaex-hg&\tt ms-hg\\ | |
1719 | 1706 | \midrule |
1720 | 1707 | %<*en> |
1721 | 1708 | \bf mincho medium |
@@ -4906,15 +4893,15 @@ $i$は7より小さい自然数. | ||
4906 | 4893 | %<*en> |
4907 | 4894 | Furthermore, \LuaTeX-ja uses several `user-defined' whatsit nodes for |
4908 | 4895 | inrernal processing. All those nodes store a natural number (hence the node's |
4909 | -\texttt{type} is 100). The following \verb+user_id+s are used: | |
4896 | +\texttt{type} is 100). | |
4910 | 4897 | %</en> |
4911 | 4898 | %<*ja> |
4912 | -さらに,\LuaTeX-jaはいくつかの「ユーザ定義の」whatsit ノードを内部処理に用いる. | |
4899 | +さらに,\LuaTeX-jaはいくつかの「ユーザ定義の」whatsitノードを内部処理に用いる. | |
4913 | 4900 | これらの全てのノードは自然数を格納している(したがってノードの\texttt{type}は |
4914 | -100である).次の \verb+user_id+ が使用される: | |
4901 | +100である). | |
4915 | 4902 | %</ja> |
4916 | 4903 | \begin{description} |
4917 | -\item[30111] | |
4904 | +\item[\texttt{inhibitglue}] | |
4918 | 4905 | %<*en> |
4919 | 4906 | Nodes for indicating that \verb+\inhibitglue+ is |
4920 | 4907 | specified. The \texttt{value} field of these nodes doesn't matter. |
@@ -4924,7 +4911,7 @@ Nodes for indicating that \verb+\inhibitglue+ is | ||
4924 | 4911 | \texttt{value}フィールドは意味を持たない. |
4925 | 4912 | %</ja> |
4926 | 4913 | |
4927 | -\item[30112] | |
4914 | +\item[\texttt{stack\_marker}] | |
4928 | 4915 | %<*en> |
4929 | 4916 | Nodes for \LuaTeX-ja's stack system (see the next |
4930 | 4917 | subsection). The \texttt{value} field of these nodes is |
@@ -4935,7 +4922,7 @@ Nodes for \LuaTeX-ja's stack system (see the next | ||
4935 | 4922 | これらのノードの\texttt{value}フィールドは現在のグループを表す. |
4936 | 4923 | %</ja> |
4937 | 4924 | |
4938 | -\item[30113] | |
4925 | +\item[\texttt{char\_by\_cid}] | |
4939 | 4926 | %<*en> |
4940 | 4927 | Nodes for Japanese Characters which the callback process of |
4941 | 4928 | \Pkg{luaotfload} won't be applied, and the character code is |
@@ -4952,7 +4939,7 @@ Nodes for Japanese Characters which the callback process of | ||
4952 | 4939 | \Pkg{luatexja-otf} パッケージでのみ使用される. |
4953 | 4940 | %</ja> |
4954 | 4941 | |
4955 | -\item[30114] | |
4942 | +\item[\texttt{begin\_par}] | |
4956 | 4943 | Nodes for indicating beginning of a paragraph. |
4957 | 4944 | A paragraph which is started by \verb+\item+ in list-like environments has a horizontal box |
4958 | 4945 | for its label before the actual contents. So \dots |
@@ -2,7 +2,8 @@ | ||
2 | 2 | -- luatexja/ltj-compat.lua |
3 | 3 | -- |
4 | 4 | |
5 | -luatexja.load_module('base'); local ltjb = luatexja.base | |
5 | +luatexja.load_module('base'); local ltjb = luatexja.base | |
6 | +luatexja.load_module('stack'); local ltjs = luatexja.stack | |
6 | 7 | |
7 | 8 | -- \kuten, \jis, \euc, \sjis, \ucs, \kansuji |
8 | 9 | local function to_kansuji(num) |
@@ -49,11 +49,10 @@ stack_table_index.KSJ = 0x400 -- 0--9 | ||
49 | 49 | |
50 | 50 | local userid_table = {} |
51 | 51 | luatexja.userid_table = userid_table |
52 | -userid_table.IHB = 30111 -- \inhibitglue | |
53 | -userid_table.STCK = 30112 -- スタック管理 | |
54 | -userid_table.OTF = 30113 -- luatexja-otf | |
55 | -userid_table.BPAR = 30114 -- 「段落始め」 | |
56 | - | |
52 | +userid_table.IHB = luatexbase.newuserwhatsit('inhibitglue', 'luatexja') -- \inhibitglue | |
53 | +userid_table.STCK = luatexbase.newuserwhatsit('stack_marker', 'luatexja') -- スタック管理 | |
54 | +userid_table.OTF = luatexbase.newuserwhatsit('char_by_cid', 'luatexja') -- luatexja-otf | |
55 | +userid_table.BPAR = luatexbase.newuserwhatsit('begin_par', 'luatexja') -- 「段落始め」 | |
57 | 56 | |
58 | 57 | --- 定義終わり |
59 | 58 |
@@ -181,11 +180,11 @@ function luatexja.ext_get_parameter_binary(k,c) | ||
181 | 180 | c=0 |
182 | 181 | end |
183 | 182 | if k == 'jacharrange' then |
184 | - if c>=7*ltjc.ATTR_RANGE then | |
183 | + if c>=31*ltjc.ATTR_RANGE then | |
185 | 184 | ltjb.package_error('luatexja', |
186 | 185 | 'invalid character range number (' .. c .. ')', |
187 | 186 | 'A character range number should be in the range 0..' |
188 | - .. 7+ATTR_RANGE-1 .. ",\n".. | |
187 | + .. 31*ltjc.ATTR_RANGE-1 .. ",\n".. | |
189 | 188 | 'So I changed this one to zero.') |
190 | 189 | c=0 |
191 | 190 | end |