X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=doc%2Fluatexja.dtx;h=8187f42a3a1e31643f742fa4d9766156908aab8f;hb=79acad85e3b942cd4fe555c40886ad295b487fce;hp=35387e6b4fc080aa2c42d07d8354f20868452f96;hpb=6bdcab1c23b47915bb0a69771860ca05a61fec42;p=luatex-ja%2Fluatexja.git
diff --git a/doc/luatexja.dtx b/doc/luatexja.dtx
index 35387e6..8187f42 100644
--- a/doc/luatexja.dtx
+++ b/doc/luatexja.dtx
@@ -682,92 +682,63 @@ To install the \LuaTeX-ja\ package, you will need:
å®è£
\LuaTeX-jaä¹åï¼éè¦å¦ä¸ï¼
%
\begin{itemize}
-%<*en>
-\item \LuaTeX\ (version 0.65.0-beta or later) and its supporting packages.
+\item \LuaTeX\ beta-0.74.0 (or later)
+\item \Pkg{luaotfload} v2.2
+\item \Pkg{luatexbase} v0.6~(2013/05/04)
+\item \Pkg{xunicode} v0.981~(2011/09/09)
+\end{itemize}
-You might need to add the following lines to
-\texttt{lualatex.ini} (just before \verb+\dump+ in the last line),
-if you are using recent \LuaTeX\ whose Lua is 5.2.
-%
-%<*ja>
-\item \LuaTeXï¼ãã¼ã¸ã§ã³ 0.65.0-beta以éï¼ã¨ãã®æ¯æ´ããã±ã¼ã¸ï¼
+%<*!ja>
+\emph{From this version of \LuaTeX-ja, \TeX~Live~2012 (or older version) is
+no longer supported, since \LuaTeX\ binary and \Pkg{luaotfload} is updated in
+\TeX~Live~2013.}
+And conversely, older versions of \LuaTeX-ja (20130318.1 or earlier) don't work in
+\TeX~Live~2013.
-Lua 5.2ãç¨ãã\LuaTeXï¼ãã¼ã¸ã§ã³0.74.0-beta以éï¼ã§ã¯ï¼\texttt{lualatex.ini}\
-ã«æ¬¡ã®è¡ãå ããå¿
è¦ããããããããªãï¼\verb+\dump+ ã®åã«ï¼ï¼
-%
-%<*!zh>
-\begin{lstlisting}
-{\catcode`\#=12\catcode`\~=12%
-\global\everyjob\expandafter{\the\everyjob%
- \directlua{%
- if not table.maxn then
- table.maxn = function(t)
- local r = 0
- for i,_ in pairs(t) do
- if type(i)=='number' then
- if i>r then r=i end
- end
- end
- return r
- end
- end
- if not package.loaders then package.loaders=package.searchers end
- if not string.explode then
- string.explode = function (str, separator)
- if not separator then separator=" +" end
- local t, nexti, pos = { }, 1, 1
- while true do
- local st, sp = str:find (separator, pos)
- if not st then break end
- if pos ~= st then
- t [ nexti ] = str:sub ( pos , st - 1 )
- nexti = nexti + 1
- end
- pos = sp + 1
- end
- t [ nexti ] = str:sub ( pos )
- return t
- end
- end
- }%
-}}%
-\end{lstlisting}
-%!zh>
-%<*zh>
-\item \LuaTeXï¼çæ¬å·ä¸ºå¤§äº0.65ï¼åç¸å
³æ¯æå®å
ã
-%å¦æç¨æ·ä½¿ç¨çæ¯\TeX Live2011以åææ°çæ¬çW32\TeXï¼å¯ä¸èèæ¤é¡¹ã
-%
-%<*en>
-\item The source archive of \LuaTeX-ja, of course\texttt{:)}
-%
-%<*ja>
-\item \LuaTeX-jaã®ã½ã¼ã¹ã¢ã¼ã«ã¤ãï¼ãã¡ãã\texttt{:)}ï¼ï¼
-%
-%<*zh>
-\item \LuaTeX-jaçæºç ï¼å½ç¶å½\texttt{:)}ï¼ã
-%
-%<*en>
-\item The \Pkg{xunicode} package, which version is \emph{just v0.981 (2011/09/09)}.\\
-If you have the \Pkg{fontspec} package, this \Pkg{xunicode} package must be exist.
-But be careful about the version; other versions may not work correctly with \LuaTeX-ja.
-%
-%<*ja>
-\item \Pkg{xunicode}ããã±ã¼ã¸(\textbf{2011/09/09,~v0.981})ï¼\\
-\Pkg{fontspec}ããã±ã¼ã¸ãå°å
¥ããã¦ããã°ãã®ããã±ã¼ã¸ãå°å
¥ããã¦ããã¯ãã§ãããï¼
-ãã®v0.981以å¤ã®ãã¼ã¸ã§ã³ã§ã¯\LuaTeX-jaä¸ã§æ£ããåä½ããªãå±éºæ§ãããï¼
-%
-%<*zh>
-\Pkg{xunicode}å®å
ï¼å½åçæ¬å¿
须为\textit{v0.981(2011/09/09)}ã\\
-å¦æä½ ä½¿ç¨\Pkg{fontspec}å®å
ï¼\Pkg{xunicode}å°±å¿
é¡»åå¨ãä½æ¯è¯·æ³¨æ该å
ç
-çæ¬ï¼å
¶ä»çæ¬å¯è½ä¸ä¼æ£å¸¸å·¥ä½ã
-%
-\end{itemize}
+\medskip
-%<*en>
-The installation methods are as follows:
-%
+Now \LuaTeX-ja is available from the following archive and distributions:
+ \begin{itemize}
+ \item CTAN (in the \texttt{macros/luatex/generic/luatexja} directory)
+ \item MiK\TeX\ (in \texttt{luatexja.tar.lzma})
+ \item \TeX\ Live (in \texttt{texmf-dist/tex/luatex/luatexja})
+ \item W32\TeX\ (in \texttt{luatexja.tar.xz})
+ \end{itemize}
+
+If you are using \TeX~Live~2013, you can install \LuaTeX-ja
+from \TeX~Live manager (\texttt{tlmgr}):
+\begin{verbatim}
+$ tlmgr install luatexja
+\end{verbatim}
+
+\medskip
+
+%If you want to install manually, do the following instruvtions:
+%!ja>
%<*ja>
-ã¤ã³ã¹ãã¼ã«æ¹æ³ã¯ä»¥ä¸ã®ããã«ãªãï¼
+\textbf{æ¬ãã¼ã¸ã§ã³ä»¥éã®\LuaTeX-jaã¯\TeX~Live~2012以åã§ã¯åä½ããªãï¼}
+ããã¯ï¼\LuaTeX ã¨\Pkg{luaotfload}ã\TeX~Live~2013ã«ããã¦æ´æ°ããããã¨ã«ããï¼
+éã«ï¼20130318.1以åã®\LuaTeX-jaã¯\TeX~Live~2013ã§ã¯åä½ããªãï¼
+
+\medskip
+
+ç¾å¨ï¼\LuaTeX-jaã¯ä»¥ä¸ã®ã¢ã¼ã«ã¤ãï¼ããã³ãã£ã¹ããªãã¥ã¼ã·ã§ã³ã«åé²ããã¦ããï¼
+ \begin{itemize}
+ \item CTAN (\texttt{macros/luatex/generic/luatexja})
+ \item MiK\TeX\ (\texttt{luatexja.tar.lzma})
+ \item \TeX\ Live (\texttt{texmf-dist/tex/luatex/luatexja})
+ \item W32\TeX\ (\texttt{luatexja.tar.xz})
+ \end{itemize}
+
+ä¾ãã°\TeX~Live~2013ãå©ç¨ãã¦ãããªãï¼\LuaTeX-jaã¯\TeX~Live manager (\texttt{tlmgr})ã
+使ã£ã¦ã¤ã³ã¹ãã¼ã«ãããã¨ãã§ããï¼
+\begin{verbatim}
+$ tlmgr install luatexja
+\end{verbatim}
+
+\medskip
+
+æåã§ã¤ã³ã¹ãã¼ã«ããå ´åã®æ¹æ³ã¯ä»¥ä¸ã®ããã«ãªãï¼
%
%<*zh>
å®è£
æ¹æ³å¦ä¸ï¼
@@ -786,15 +757,7 @@ $ git clone git://git.sourceforge.jp/gitroot/luatex-ja/luatexja.git
\begin{flushleft}
\url{http://git.sourceforge.jp/view?p=luatex-ja/luatexja.git;a=snapshot;h=HEAD;sf=tgz}.
\end{flushleft}
-\item Now \LuaTeX-ja is available from the following archive and distributions:
- \begin{itemize}
- \item CTAN (in the \texttt{macros/luatex/generic/luatexja} directory)
- \item MiK\TeX\ (in \texttt{luatexja.tar.lzma})
- \item \TeX\ Live (in \texttt{texmf-dist/tex/luatex/luatexja})
- \item W32\TeX\ (in \texttt{luatexja.tar.xz})
- \end{itemize}
- These are based on the \texttt{master} branch.
-\end{itemize}
+\end{itemize}
Note that the \texttt{master} branch, and hence the archive in CTAN, are not updated frequently;
the forefront of development is not the \texttt{master} branch.
@@ -812,16 +775,7 @@ $ git clone git://git.sourceforge.jp/gitroot/luatex-ja/luatexja.git
\begin{flushleft}
\url{http://git.sourceforge.jp/view?p=luatex-ja/luatexja.git;a=snapshot;h=HEAD;sf=tgz}.
\end{flushleft}
-\item ä»ãï¼\LuaTeX-jaã¯ä»¥ä¸ã®ã¢ã¼ã«ã¤ãï¼ããã³ãã£ã¹ããªãã¥ã¼ã·ã§ã³ã«ãåé²ããã¦ããï¼
- \begin{itemize}
- \item CTAN (\texttt{macros/luatex/generic/luatexja})
- \item MiK\TeX\ (\texttt{luatexja.tar.lzma})
- \item \TeX\ Live (\texttt{texmf-dist/tex/luatex/luatexja})
- \item W32\TeX\ (\texttt{luatexja.tar.xz})
- \end{itemize}
- ãããã¯\texttt{master}ãã©ã³ãã®å
容ãå
ã«ãã¦ããï¼
\end{itemize}
-
\texttt{master}ãã©ã³ãï¼å¾ã£ã¦ï¼CTANå
ã®ã¢ã¼ã«ã¤ããï¼ã¯ãã¾ã«ããæ´æ°ãããªããã¨ã«æ³¨æï¼
主ãªéçºã¯\texttt{master}ã®å¤ã§è¡ããï¼æ¯è¼çã¾ã¨ã¾ã£ã¦ãããããã\texttt{master}ã«
åæ ããããã¨ã«ãã¦ããï¼
@@ -838,16 +792,7 @@ $ git clone git://git.sourceforge.jp/gitroot/luatex-ja/luatexja.git
\begin{flushleft}
\url{http://git.sourceforge.jp/view?p=luatex-ja/luatexja.git;a=snapshot;h=HEAD;sf=tgz}.
\end{flushleft}
-\item ç°å¨\LuaTeX-jaå¯ä»¥å¨ä¸åä»åºååè¡çä¸è·åï¼:
- \begin{itemize}
- \item CTAN (\texttt{macros/luatex/generic/luatexja}ï¼
- \item MiK\TeX\ (\texttt{luatexja.tar.lzma})
- \item \TeX\ Live ï¼\texttt{texmf-dist/tex/luatex/luatexja}ï¼
- \item W32\TeX\ ï¼\texttt{luatexja.tar.xz}ï¼
- \end{itemize}
- è¿äºçæ¬é½åºäº\texttt{master}åæ¯ã
\end{itemize}
-
注æ\texttt{master}åæ¯åCTANä»åºä¸ççæ¬ï¼å级并ä¸é¢ç¹ã
å段å¼å并æªå¨\texttt{master}åæ¯ã
%
@@ -873,7 +818,7 @@ But only the contents in \texttt{src/} are needed to work \LuaTeX-ja.
instead copying is also good.
%
%<*ja>
-\item \texttt{src/}ã®ä¸èº«ãèªåã®\texttt{TEXMF}ããªã¼ã«ã³ãã¼ããï¼
+\item \texttt{src}ã®ä¸èº«ãèªåã®\texttt{TEXMF}ããªã¼ã«ã³ãã¼ããï¼
å ´æã®ä¾ã¨ãã¦ã¯ï¼ä¾ãã°\texttt{TEXMF/tex/luatex/luatexja/}ãããï¼
ã·ã³ããªãã¯ãªã³ã¯ãå©ç¨ã§ããç°å¢ã§ï¼ãã¤ãªãã¸ããªãç´æ¥åå¾ããã®ã§ããã°ï¼
ï¼æ´æ°ã容æã«ããããã«ï¼ã³ãã¼ã§ã¯ãªããªã³ã¯ãè²¼ããã¨ãå§ããï¼
@@ -1522,16 +1467,16 @@ featureã\textbf{JAglue}ã¨è¡çªããããã§ããï¼\ref{para-kern}ç¯ã
å¦æ³¨æï¼åºæ ¼ç¹æ§å¨è¿7个å½ä»¤ä¸é»è®¤å
³éï¼å 为æ¤ç¹æ§ä¼ä¸\textbf{JAglue}å²çªï¼åè§\ref{para-kern}ï¼ã
%
-%\subsection{Preset}
+%\subsection{Preset}
%\subsection{ããªã»ããè¨å®}
\label{ssec-preset}
-%<*en>
+%<*!ja>
To use standard Japanese font settings easily, one can load \Pkg{luatexja-preset}
package with several options. This package provides functions in a part of
\Pkg{otf} package and a part of \Pkg{PXchfon} package by Takayuki Yato,
and loads \Pkg{luatexja-fontspec} internally.
-%
+%!ja>
%<*ja>
ãã使ããã¦ããåæãã©ã³ãè¨å®ãä¸è¡ã§æå®ã§ããããã«ããã®ã
\Pkg{luatexja-preset}ããã±ã¼ã¸ã§ããï¼ãã®ããã±ã¼ã¸ã¯ï¼
@@ -1539,11 +1484,11 @@ and loads \Pkg{luatexja-fontspec} internally.
åããããããªæ ¼å¥½ããã¦ããï¼å
é¨ã§\Pkg{luatexja-fontspec}ãèªã¿è¾¼ãã§ããï¼
%
-%\paragraph{General options}
+%\paragraph{General options}
%\paragraph{ä¸è¬çãªãªãã·ã§ã³}
\begin{list}{}{\def\makelabel{\ttfamily}\def\{{\char`\{}\def\}{\char`\}}\advance\leftmargin1\zw}
\item[deluxe]
-%<*en>
+%<*!ja>
Specifying this option enables us to use \textit{mincho} with two weights (medium~and~bold),
\textit{gothic} with three weights (medium,~bold and~heavy), and \textit{rounded gothic}%
\footnote{Provided by \texttt{\char92mgfamily},
@@ -1551,7 +1496,7 @@ because \textit{rounded gothic} is called \textit{maru gothic} (丸ã´ã·ãã¯)
The heavy weight of \textit{gothic} can be used by ``changing the family'' \verb+\gtebfamily+.
This is because \Pkg{fontspec} package can handle only medium (\verb+\mdseries+) and
bold (\verb+\bfseries+).
-%
+%!ja>
%<*ja>
ææä½2ã¦ã§ã¤ãã»ã´ã·ãã¯ä½3ã¦ã§ã¤ãã¨ï¼
丸ã´ã·ãã¯ä½ (\verb+\mgfamily+) ã使ç¨å¯è½ã¨ããï¼
@@ -1560,39 +1505,25 @@ bold (\verb+\bfseries+).
ãã®ãããªä¸éå端ãªå®è£
ã«ãªã£ã¦ããï¼
%
\item[expert]
-%<*en>
+%<*!ja>
Use horizontal kana alternates, and define a control sequence \verb+\rubyfamily+ to use kana
characters designed for ruby.
-%
-%<*ja>
-横çµå°ç¨ä»®åãç¨ããï¼ã¾ãï¼\verb+\rubyfamily+ ã§ã«ãç¨ä»®åã使ç¨å¯è½ã¨ãªãï¼
-%
+%!ja>
+%横çµå°ç¨ä»®åãç¨ããï¼ã¾ãï¼\verb+\rubyfamily+ ã§ã«ãç¨ä»®åã使ç¨å¯è½ã¨ãªãï¼
\item[bold]
-%<*en>
-Use bold gothic as bold mincho.
-%
-%<*ja>
-ææã®å¤ªåãã´ã·ãã¯ä½ã®å¤ªåã¨ããï¼
-%
+%Use bold gothic as bold mincho.
+%ææã®å¤ªåãã´ã·ãã¯ä½ã®å¤ªåã¨ããï¼
\item[90jis]
-%<*en>
-Use fonts with 90JIS glyphs if possible.
-%
-%<*ja>
-åºæ¥ãéã90JISã®åå½¢ãæ¡ç¨ãã¦ãããã©ã³ãã使ãï¼
-%
+%Use 90JIS glyph variants if possible.
+%åºæ¥ãéã90JISã®åå½¢ã使ãï¼
\item[jis2004]
-%<*en>
-Use fonts with JIS2004 glyphs if possible.
-%
-%<*ja>
-åºæ¥ãéãJIS2004ã®åå½¢ãæ¡ç¨ãã¦ãããã©ã³ãã使ãï¼
-%
+%Use JIS2004 glyph variants if possible.
+%åºæ¥ãéãJIS2004ã®åå½¢ã使ãï¼
\item[jis]
-%<*en>
+%<*!ja>
Use the JFM \texttt{jfm-jis.lua}, instead of \texttt{jfm-ujis.lua}, which is the default JFM of
\LuaTeX-ja.
-%
+%!ja>
%<*ja>
ç¨ããJFMãï¼JISãã©ã³ãã¡ããªãã¯é¡ä¼¼ã®ï¼\texttt{jfm-jis.lua}ã«ããï¼ãã®ãªãã·ã§ã³ããªãæã¯
\LuaTeX-jaæ¨æºã®\texttt{jfm-ujis.lua}ãç¨ããããï¼
@@ -1602,30 +1533,25 @@ Use the JFM \texttt{jfm-jis.lua}, instead of \texttt{jfm-ujis.lua}, which is the
%\paragraph{Kozuka fonts}
%\paragraph{å°å¡ãã©ã³ã}
%<*en>
-When using single weight, we adopt Kozuka~Gothic~M as \textit{gothic},
-because we think that Kozuka~Gothic~R looks thin.
There is not `Kozuka Maru Gothic', therefore Kozuka~Gothic~H is used
as a substitute for \textit{rounded gothic}.
%
%<*ja>
-ã¾ãï¼å°å¡ãã©ã³ããç¨ããè¨å®ãè¿°ã¹ãï¼
-åã¦ã§ã¤ãæã®ã´ã·ãã¯ä½ã¯å°å¡ã´ã·ãã¯Rã§ã¯ç´°ãããã«æããã®ã§ï¼
-å°å¡ã´ã·ãã¯Mã«å¤æ´ãã¦ããï¼
-ããã«ï¼ä¸¸ã´ã·ãã¯ä½ã¯ãªãã®ã§ä¾¿å®ä¸å°å¡ã´ã·ãã¯Hã§ä»£ç¨ãã¦ããï¼
+丸ã´ã·ãã¯ä½ã¯ãªãã®ã§ä¾¿å®ä¸å°å¡ã´ã·ãã¯Hã§ä»£ç¨ãã¦ããï¼
%
\begin{center}\small
\begin{tabular}{llll}
\toprule
-&\tt kozuka4&\tt kozuka6&\tt kozuka6n\\
+&\tt kozuka-pro&\tt kozuka-pr6&\tt kozuka-pr6n\\
\midrule
-%<*en>
+%<*!ja>
\bf mincho medium&Kozuka Mincho Pro R&Kozuka Mincho ProVI R&Kozuka Mincho Pr6N R\\
\bf mincho bold&Kozuka Mincho Pro B&Kozuka Mincho ProVI B&Kozuka Mincho Pr6N B\\
\midrule
\bf gothic medium\\
without \texttt{deluxe}
&Kozuka Gothic Pro M&Kozuka Gothic ProVI M&Kozuka Gothic Pr6N M\\
- multiple weights
+ with \texttt{deluxe}
&Kozuka Gothic Pro R&Kozuka Gothic ProVI R&Kozuka Gothic Pr6N R\\
\midrule
\bf gothic bold
@@ -1634,7 +1560,7 @@ as a substitute for \textit{rounded gothic}.
&Kozuka Gothic Pro H&Kozuka Gothic ProVI H&Kozuka Gothic Pr6N H\\
(rounded gothic)
&Kozuka Gothic Pro H&Kozuka Gothic ProVI H&Kozuka Gothic Pr6N H\\
-%
+%!ja>
%<*ja>
\gt ææä½ç´°å&å°å¡ææPro~R&å°å¡ææProVI~R&å°å¡ææPr6N~R\\
\gt ææä½å¤ªå&å°å¡ææPro~B&å°å¡ææProVI~B&å°å¡ææPr6N~B\\
@@ -1656,42 +1582,44 @@ as a substitute for \textit{rounded gothic}.
\end{tabular}
\end{center}
-%\paragraph{Hiragino and Morisawa}
-%\paragraph{ãã©ã®ãã»ã¢ãªãµã¯}
-%<*en>
-Settings for Hiragino fonts:
-%
-%<*ja>
-ã¾ããã©ã®ããã©ã³ãããï¼
-%
-% ãããã¯æã£ã¦ããããã§ã¯ãªãã®ã§ï¼ãã©ã³ãåã
-% ç°ãªã£ã¦ããããããã¾ããï¼ç¢ºèªãé¡ããã¾ãï¼
+%\paragraph{Hiragino and Morisawa}\
+%\paragraph{ãã©ã®ãã»ã¢ãªãµã¯}\
\begin{center}\small
\begin{tabular}{lll}
\toprule
-&\tt hiragino&\tt hiraginon\\
+&\tt hiragino-pro&\tt hiragino-pron\\
\midrule
-%<*en>
+%<*!ja>
\bf mincho medium&
Hiragino Mincho Pro W3&Hiragino Mincho Pr6N W3\\
\bf mincho bold&
Hiragino Mincho Pro W6&Hiragino Mincho Pr6N W6\\
-\bf gothic medium&
-Hiragino Kaku Gothic Pro W3&Hiragino Kaku Gothic ProN W3\\
+\midrule
+\bf gothic medium\\
+ without \texttt{deluxe}
+&Hiragino Kaku Gothic Pro W6&Hiragino Kaku Gothic ProN W6\\
+ with \texttt{deluxe}
+&Hiragino Kaku Gothic Pro W3&Hiragino Kaku Gothic ProN W3\\
+\midrule
\bf gothic bold&
Hiragino Kaku Gothic Pro W6&Hiragino Kaku Gothic ProN W6\\
\bf gothic heavy&
Hiragino Kaku Gothic Std W8&Hiragino Kaku Gothic StdN W8\\
\bf rounded gothic&
Hiragino Maru Gothic Pro W4&Hiragino Maru Gothic ProN W4\\
-%
+%!ja>
%<*ja>
\gt ææä½ç´°å&
ãã©ã®ãææä½Pro~W3&ãã©ã®ãææä½Pr6N~W3\\
\gt ææä½å¤ªå&
ãã©ã®ãææä½Pro~W6&ãã©ã®ãææä½Pr6N~W6\\
-\gt ã´ã·ãã¯ä½ç´°å&
-ãã©ã®ãè§ã´Pro~W3&ãã©ã®ãè§ã´ProN~W3\\
+\midrule
+\gt ã´ã·ãã¯ä½ç´°ç´°å\\
+ãåã¦ã§ã¤ãæ
+&ãã©ã®ãè§ã´Pro~W6&ãã©ã®ãè§ã´ProN~W6\\
+ãå¤ã¦ã§ã¤ãæ
+&ãã©ã®ãè§ã´Pro~W3&ãã©ã®ãè§ã´ProN~W3\\
+\midrule
\gt ã´ã·ãã¯ä½å¤ªå&
ãã©ã®ãè§ã´Pro~W6&ãã©ã®ãè§ã´ProN~W6\\
\gt ã´ã·ãã¯ä½æ¥µå¤ª&
@@ -1699,19 +1627,9 @@ Hiragino Maru Gothic Pro W4&Hiragino Maru Gothic ProN W4\\
\gt 丸ã´ã·ãã¯ä½&
ãã©ã®ã丸ã´Pro~W4&ãã©ã®ã丸ã´ProN~W4\\
%
-\bottomrule
-\end{tabular}
-\end{center}
-%<*en>
-Settings for Morisawa fonts:
-%
-%<*ja>
-次ã¯ã¢ãªãµã¯ãã©ã³ããç¨ããè¨å®ã§ããï¼
-%
-\begin{center}\small
-\begin{tabular}{lll}
-\toprule
-&\tt morisawa4&\tt morisawa6n\\
+\midrule
+\midrule
+&\tt morisawa-pro&\tt morisawa-pr6n\\
\midrule
%<*en>
\bf mincho medium&
@@ -1747,12 +1665,12 @@ Jun Pro 101&Jun Pr6N 101\\
%\paragraph{Settings for single weight}
%\paragraph{åã¦ã§ã¤ãç¨è¨å®}
-%<*en>
+%<*!ja>
Next, we describe settings for using only single weight.
In four settings below, we use same fonts for medium and bold (and heavy) weights.
(Hence \verb+\mcfamily\bfseries+ and \verb+\mcfamily\mdseries+ yields same Japanese fonts,
if \texttt{deluxe} option is also specified).
-%
+%!ja>
%<*ja>
次ã«ï¼åã¦ã§ã¤ãç¨ã®è¨å®ãè¿°ã¹ãï¼ãã®4è¨å®ã§ã¯ãç´°åãã太åãã®åºå¥ã¯ãªãï¼
ã¾ãï¼ä¸¸ã´ã·ãã¯ä½ã¯ã´ã·ãã¯ä½ã¨åããã©ã³ããç¨ããï¼
@@ -1762,12 +1680,12 @@ if \texttt{deluxe} option is also specified).
\toprule
&\tt noembed&\tt ipa&\tt ipaex&\tt ms\\
\midrule
-%<*en>
+%<*!ja>
\bf mincho&Ryumin-Light (non-embedded)
&IPAMincho&IPAexMincho&MS Mincho\\
\bf gothic&GothicBBB-Medium (non-embedded)
&IPAGothic&IPAexGothic&MS Gothic\\
-%
+%!ja>
%<*ja>
\gt ææä½&Ryumin-Lightï¼éåè¾¼ï¼
&IPAææ&IPAexææ&MSææ\\
@@ -1778,11 +1696,11 @@ if \texttt{deluxe} option is also specified).
\end{tabular}
\end{center}
-%\paragraph{Using HG fonts}
+%\paragraph{Using HG fonts}
%\paragraph{HGãã©ã³ãã®å©ç¨}
-%<*en>
+%<*!ja>
We can use HG~fonts bundled with Microsoft Office for realizing multiple weights in Japanese fonts.
-%
+%!ja>
%<*ja>
ããåã«æ¸ããåã¦ã§ã¤ãç¨è¨å®ãï¼Microsoft Officeçã«ä»å±ããHGãã©ã³ãã使ã£ã¦
å¤ã¦ã§ã¤ãåããè¨å®ãããï¼
@@ -1790,9 +1708,9 @@ We can use HG~fonts bundled with Microsoft Office for realizing multiple weights
\begin{center}\small
\begin{tabular}{llll}
\toprule
-&\tt ipa-dx&\tt ipaex-dx&\tt ms-dx\\
+&\tt ipa-hg&\tt ipaex-hg&\tt ms-hg\\
\midrule
-%<*en>
+%<*!ja>
\bf mincho medium
&IPAMincho&IPAexMincho&MS Mincho\\\midrule
\bf mincho bold&
@@ -1811,7 +1729,7 @@ We can use HG~fonts bundled with Microsoft Office for realizing multiple weights
\multicolumn{3}{c}{HG Soei Kaku Gothic UB}\\\midrule
\bf rounded gothic&
\multicolumn{3}{c}{HG Maru Gothic PRO}\\
-%
+%!ja>
%<*ja>
\gt ææä½ç´°å
&IPAææ&IPAexææ&MSææ\\\midrule
@@ -1835,7 +1753,7 @@ We can use HG~fonts bundled with Microsoft Office for realizing multiple weights
\bottomrule
\end{tabular}
\end{center}
-%<*en>
+%<*!ja>
Note that HG~Mincho~E, HG~Gothic~E, HG Soei Kaku Gothic UB and HG Maru Gothic PRO
are internally specified by:
\begin{description}
@@ -1843,7 +1761,7 @@ are internally specified by:
\item[{\tt 90jis}] by filename (\texttt{hgrme.ttc}, \texttt{hgrge.ttc}, \texttt{hgrsgu.ttc}, \texttt{hgrsmp.ttf}).
\item[{\tt jis2004}] by filename (\texttt{hgrme04.ttc}, \texttt{hgrge04.ttc}, \texttt{hgrsgu04.ttc}, \texttt{hgrsmp04.ttf}).
\end{description}
-%
+%!ja>
%<*ja>
ãªãï¼HGææEã»HGã´ã·ãã¯Eã»HGåµè±è§ã´ã·ãã¯UBã»HG丸ã´ã·ãã¯ä½PROã®4ã¤ã«ã¤ãã¦ã¯ï¼å
é¨ã§
\begin{description}
@@ -2979,8 +2897,9 @@ to specify a `name-only' Japanese font which
will not be embedded to PDF. Typical use of this prefix is to specify
the `standard' Japanese fonts, namely, `Ryumin-Light' and
`GothicBBB-Medium'.
-\emph{You should not specify any font features, such as `{\tt +jp90}',
-in the definition of `name-only' fonts using this `{\tt psft:}'\ prefix.}
+\emph{OpenType font features, such as `{\tt +jp90}',
+have no meaning in `name-only' fonts using this `{\tt psft:}'\ prefix.
+This is because we can't expect what fonts are actually used by the PDF reader.}
%
%<*ja>
\texttt{file:} 㨠\texttt{name:} ã®ããªãã£ãã¯ã¹ã«å ãã¦ï¼
@@ -2990,7 +2909,7 @@ in the definition of `name-only' fonts using this `{\tt psft:}'\ prefix.}
åæãã©ã³ããæå®ãããã¨ãã§ããï¼ãæ¨æºçãªãåæãã©ã³ãï¼
ã¤ã¾ã`Ryumin-Light'ã¨`GothicBBB-Medium'ã®æå®ã§ãã®ããªãã£ãã¯ã¹ã使ãããï¼
\textbf{éåè¾¼ãã©ã³ããPDFã«ä½¿ç¨ããã¨ï¼å®éã«ã©ã®ãããªãã©ã³ãã表示ã«ç¨ãããããäºæ¸¬ã§ããªãï¼
-ãã®ããï¼æ¬ããªãã£ãã¯ã¹æå®æã«ã¯ï¼\texttt{+jp90} ãªã©ã®font featureã¯æå®ãã¹ãã§ãªãï¼}
+æ¬ããªãã£ãã¯ã¹æå®æã«ã¯ï¼\texttt{+jp90} ãªã©ã®OpenType font featureã®å¹åã¯ãªãï¼}
%
%<*zh>
é¤ä½¿ç¨\texttt{file:}å\texttt{name:}å¤ï¼æ们è¿å¯ä»¥å¨\verb!\jfont!ï¼ä»¥å\verb!\font!ï¼
@@ -3075,6 +2994,40 @@ Please contact the LuaTeX-ja project team.
ã¨ããã¨ã©ã¼ãåºãï¼
%
+%<*ja>
+\paragraph{\texttt{extend}ã¨\texttt{slant}}
+OpenType font featureã¨è¦ããä¸åããããªå½¢å¼ã§æå®ã§ãããã®ã«ï¼
+\begin{description}
+\item[\texttt{extend=}] 横æ¹åã«åæ¡å¤§ããï¼
+\item[\texttt{slant=}] ã«æå®ãããå²åã ãå¾ããï¼
+\end{description}
+ã®2ã¤ãããï¼ãããã ãã¯\texttt{psft}ããªãã£ãã¯ã¹ã§ã使ç¨å¯è½ã«ãã¦ããï¼
+\texttt{extend}ã\texttt{slant}ãæå®ããå ´åã¯ï¼ããã«å¿ããJFMãæå®ãã¹ãã§ãã%
+\footnote{\LuaTeX-jaã§ã¯ï¼ãããã«å¯¾ããJFMãç¹ã«æä¾ãããã¨ã¯ããªãäºå®ã§ããï¼}ï¼
+ä¾ãã°ï¼æ¬¡ã®ä¾ã§ã¯ç¡çããé常ã®JFMã使ã£ã¦ããããã«ï¼æåééãã¤ã¿ãªãã¯è£æ£éã
+æ£ãããªãï¼
+%
+%<*!ja>
+\paragraph{\texttt{extend} and \texttt{slant}}
+The following setting can be specified as OpenType font features:
+\begin{description}
+\item[\texttt{extend=}] expand the font horizontally by .
+\item[\texttt{slant=}] slant the font.
+\end{description}
+These two settings are also supported with \texttt{psft} prefix.
+Note that \LuaTeX-ja doesn't adjust JFMs by these \texttt{extend} and \texttt{slant}
+settings; you have to write new JFMs on purpose.
+For example, the following example uses the standard JFM \texttt{jfm-ujis.lua}, hence
+letter-spacing and the width of italic correction are not correct:
+%!ja>
+\begin{LTXexample}[width=0.3\textwidth]
+\jfont\E=psft:Ryumin-Light:extend=1.5;jfm=ujis
+\E ããããã
+
+\jfont\S=psft:Ryumin-Light:slant=1;jfm=ujis
+\S ããã\/ABC
+\end{LTXexample}
+
%\subsection{Structure of JFM file}
%\subsection{JFMãã¡ã¤ã«ã®æ§é }
%\subsection{JFMç»æ}
@@ -4020,36 +3973,33 @@ character other than space~`\texttt{\char32}'~(U+0020) has the category code
%\subsection{åæ°ä¸è§}
\label{ssec-param}
-%<*en>
+%<*!ja>
The following is the list of parameters which can be specified by the
\verb+\ltjsetparameter+ command. [\verb+\cs+] indicates the counterpart
in \pTeX, and symbols beside each parameter has the following meaning:
-%
+%!ja>
%<*ja>
以ä¸ã¯ \verb+\ltjsetparameter+ ã«æå®ãããã¨ãã§ãããã©ã¡ã¼ã¿ã®ä¸è¦§ã§ããï¼
[\verb+\cs+]ã¯\pTeX ã«ããã対å¿ç©ã示ãï¼
ã¾ãï¼ããããã®ãã©ã¡ã¼ã¿ã®å³ä¸ã«ããè¨å·ã«ã¯æ¬¡ã®æå³ãããï¼
%
\begin{itemize}
-%<*zh>
-\item % avoiding from error ``Something's wrong--perhaps a missing \item.''.
-%
-%<*en>
+%<*!ja>
\item No mark: values at the end of the paragraph or the hbox are
adopted in the whole paragraph/hbox.
-%
+%!ja>
%<*ja>
\item è¨å·ãªãï¼æ®µè½ãæ°´å¹³ããã¯ã¹ã®çµç«¯ã§ã®å¤ããã®æ®µè½ï¼æ°´å¹³ããã¯ã¹å
¨ä½ã§ç¨ããããï¼
%
-%<*en>
+%<*!ja>
\item `\ast' : local parameters, which can change everywhere inside a paragraph/hbox.
-%
+%!ja>
%<*ja>
\item `\ast'ï¼ãã¼ã«ã«ãªãã©ã¡ã¼ã¿ã§ããï¼æ®µè½ï¼æ°´å¹³ããã¯ã¹å
ã®ã©ãã§ã§ãå¤ãå¤ãããã¨ãã§ããï¼
%
-%<*en>
+%<*!ja>
\item `\dagger': assignments are always global.
-%
+%!ja>
%<*ja>
\item `\dagger'ï¼æå®ã¯å¸¸ã«ã°ãã¼ãã«ã«ãªãï¼
%
@@ -4309,7 +4259,7 @@ With the help of this example, we remark the specification of \verb+\inhibitglue
%
\begin{itemize}
%<*zh>
-\item
+\item ...
%
%<*en>
\item The call of \verb+\inhibitglue+ in the (internal) vertical mode is
@@ -4981,15 +4931,15 @@ $i$ã¯7ããå°ããèªç¶æ°ï¼
%<*en>
Furthermore, \LuaTeX-ja uses several `user-defined' whatsit nodes for
inrernal processing. All those nodes store a natural number (hence the node's
-\texttt{type} is 100). The following \verb+user_id+s are used:
+\texttt{type} is 100).
%
%<*ja>
-ããã«ï¼\LuaTeX-jaã¯ããã¤ãã®ãã¦ã¼ã¶å®ç¾©ã®ãwhatsit ãã¼ããå
é¨å¦çã«ç¨ããï¼
+ããã«ï¼\LuaTeX-jaã¯ããã¤ãã®ãã¦ã¼ã¶å®ç¾©ã®ãwhatsitãã¼ããå
é¨å¦çã«ç¨ããï¼
ãããã®å
¨ã¦ã®ãã¼ãã¯èªç¶æ°ãæ ¼ç´ãã¦ããï¼ãããã£ã¦ãã¼ãã®\texttt{type}ã¯
-100ã§ããï¼ï¼æ¬¡ã® \verb+user_id+ ã使ç¨ãããï¼
+100ã§ããï¼ï¼
%
\begin{description}
-\item[30111]
+\item[\texttt{inhibitglue}]
%<*en>
Nodes for indicating that \verb+\inhibitglue+ is
specified. The \texttt{value} field of these nodes doesn't matter.
@@ -4999,7 +4949,7 @@ Nodes for indicating that \verb+\inhibitglue+ is
\texttt{value}ãã£ã¼ã«ãã¯æå³ãæããªãï¼
%
-\item[30112]
+\item[\texttt{stack\_marker}]
%<*en>
Nodes for \LuaTeX-ja's stack system (see the next
subsection). The \texttt{value} field of these nodes is
@@ -5010,7 +4960,7 @@ Nodes for \LuaTeX-ja's stack system (see the next
ãããã®ãã¼ãã®\texttt{value}ãã£ã¼ã«ãã¯ç¾å¨ã®ã°ã«ã¼ãã表ãï¼
%
-\item[30113]
+\item[\texttt{char\_by\_cid}]
%<*en>
Nodes for Japanese Characters which the callback process of
\Pkg{luaotfload} won't be applied, and the character code is
@@ -5027,7 +4977,7 @@ Nodes for Japanese Characters which the callback process of
\Pkg{luatexja-otf} ããã±ã¼ã¸ã§ã®ã¿ä½¿ç¨ãããï¼
%
-\item[30114]
+\item[\texttt{begin\_par}]
Nodes for indicating beginning of a paragraph.
A paragraph which is started by \verb+\item+ in list-like environments has a horizontal box
for its label before the actual contents. So \dots
@@ -6421,7 +6371,7 @@ listing environments.
ã¾ãï¼è¡é·ã¨èªç¶é·ã¨ã®å·®ã®çµ¶å¯¾å¤ãè¨ç®ãï¼ããã\textit{total}ã¨ããï¼
\subsection{è¡æ«æåã®ä½ç½®èª¿æ´}
-ã¾ãï¼è¡æ«ãæåã¯ã©ã¹$n$ã®\textbf{Jachar}ã§ãã£ãå ´åï¼
+ã¾ãï¼è¡æ«ãæåã¯ã©ã¹$n$ã®\textbf{JAchar}ã§ãã£ãå ´åï¼
ãããåãããã¨ã«ãã£ã¦ï¼\textbf{JAglue} ãè² æ
ãã調æ´éãå°ãªããããã¨ããï¼
ãã®è¡æ«æåã®å·¦å³ã®ç§»åå¯è½éã¯ï¼JFMä¸ã«ããæåã¯ã©ã¹$n$ã®å®ç¾©ã®
\texttt{end\_stretch},~\texttt{end\_shrink}ãã£ã¼ã«ãã«å
¨è§åä½ã®å¤ã¨ãã¦è¨è¿°ããã¦ããï¼