Merge branch 'kitagawa_test'

[luatex-ja/luatexja.git] / doc / luatexja.dtx

diff --git a/doc/luatexja.dtx b/doc/luatexja.dtx
index 9582158..b2b9b68 100644 (file)
--- a/doc/luatexja.dtx
+++ b/doc/luatexja.dtx
@@ -3166,13 +3166,16 @@ the following fields:
 %<*en>
 This field is a list of characters which are in this character
             type~$i$. This field is optional if $i=0$, since all
-            \textbf{JAchar} which are not in any character class other
+            \textbf{JAchar} which do not belong  any character classes other
             than 0 are in the character class 0
              (hence, the character class~0 contains most of
-            \textbf{JAchar}s). In the list, a character can be
-            specified by its code number, or by the character itself
-            (as a string of length~1). Moreover, there are `imaginary
-            characters' which can be specified in the list. We will describe these later.
+            \textbf{JAchar}s). In the list, character(s) can be specified in the following form:
+\begin{itemize}
+\item a Unicode code point
+\item the character itself (as a Lua string, like \verb+'あ'+)
+\item a string like \verb+'あ*'+ (the character followed by an asterisk)
+\item several ``imaginary'' characters (We will describe these later.)
+\end{itemize}
 %</en>
 %<*ja>
 このフィールドは文字クラス$i$に属する文字のリストである．このフィールドは$i=0$の
@@ -3704,7 +3707,19 @@ You may assume that \verb+jfont_info+ has the following fields:
 \item \texttt{dir} フィールドはこのテーブルにはない．
 \end{itemize}
 %</ja>
-%<!ja> ...
+%<*en>
+A table which contains the information of a JFM, and \emph{this table must not be changed}.
+The contents of this table are similar to that which is written is the JFM file, but 
+the following differ:
+\begin{itemize}
+\item There is a \texttt{chars} table, \dots
+\item The value in \texttt{zw},~\texttt{zh}, \texttt{kanjiskip},~\texttt{xkanjiskip} fields are
+now scaled by real font size, and in scaled-pont unit.
+\item ...
+\item There is no \texttt{dir} field in this table.
+\end{itemize}
+%</en>
+%<zh> ...
 
 \item[\tt var]
 %<en>The value specified in \texttt{jfmvar=...} at a call of \verb+\jfont+.
@@ -4137,7 +4152,8 @@ JFM（もしくはサイズ）が異なる2つの\textbf{JAchar}の間にグル
 %<zh>\subsection{基本语句兼容性}
 
 %<*en>
-The following primitives are implemented for compatibility with \pTeX:
+The following primitives are implemented for compatibility with \pTeX.
+Note that these primitives don't support JIS~X~0213, but only JIS~X~0208.
 %</en>
 %<*ja>
 以下のプリミティブは\pTeX との互換性のために実装されている：
@@ -5904,7 +5920,6 @@ $\mathit{Nq}.\mathit{tail}$は無意味なので，
 
 \section{psft}
 
-
 %<*ja>
 \section{\Pkg{listings} パッケージへの対応}
 \Pkg{listings} パッケージが，そのままでは日本語をまともに出力できないこと
@@ -6004,7 +6019,10 @@ $\mathit{Nq}.\mathit{tail}$は無意味なので，
 これらの設定をユーザが\TeX ソースで変更させる仕組みはまだ作成していない．
 
 %</ja>
-
+%<*en>
+\section{Patch for the \Pkg{listings} package}
+\dots
+%</en>
 
 \begin{thebibliography}{99}
   \addcontentsline{toc}{section}{\refname}
@@ -6400,7 +6418,7 @@ This document was typeset using the following packages:
 %%
 %% config file for showexpl.sty
 %%
-%% Copyright The LuaTeX-ja project team, 2005
+%% Copyright The LuaTeX-ja project team, 2012
 %%
 \ProvidesFile{showexpl.cfg}
   [2012/05/20 v0.01 Definitions for the showexpl package (luatexja)]