X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=doc%2Fluatexja.dtx;h=8d6dbb2c983a15b2e5c00ecd44b3d06889188be1;hb=6e672f2c6c4c966166ec272a021b0f3afa93bee0;hp=3fd84e1ae0a177acf342ac3244e72d2eb11f587b;hpb=880636d81e9819b31dec8a5f897bbfaf1732d18b;p=luatex-ja%2Fluatexja.git
diff --git a/doc/luatexja.dtx b/doc/luatexja.dtx
index 3fd84e1..8d6dbb2 100644
--- a/doc/luatexja.dtx
+++ b/doc/luatexja.dtx
@@ -133,7 +133,7 @@ ASCII \pTeX ãããã®æ¡å¼µç©ãç¨ãããããã¨ãä¸è¬çã§ãã£
ã®ã¨ã³ã¸ã³æ¡å¼µã§ããï¼ï¼å°ã
ä»æ§ä¸ä¸ä¾¿ãªç¹ã¯ãããã®ã®ï¼åæ¥å°å·ã®åéã«
ãç¨ããããã»ã©ã®é«å質ãªæ¥æ¬èªçµçãå¯è½ã¨ãã¦ããï¼ã ãï¼ããã¯å¼±ç¹ã«
ããªã£ã¦ãã¾ã£ãï¼\pTeX ã¨ããï¼çµççã«ï¼æºè¶³ãªãã®ããã£ãããï¼æµ·å¤ã§
-è¡ããã¦ããæ°ã
ã®\TeX ã®æ¡å¼µââä¾ãã°\eTeX ã\pdfTeX ââãï¼TrueType,
+è¡ããã¦ããæ°ã
ã®\TeX ã®æ¡å¼µââä¾ãã°\eTeX ã\pdfTeX ââãï¼TrueType,
OpenType, Unicodeã¨ãã£ãè¨ç®æ©ã§æ¥æ¬èªãæ±ãéã®ç¶æ³ã®å¤åã«è¿½å¾ãããã¨
ãæ ã£ã¦ãã¾ã£ãã®ã ï¼
%
@@ -499,6 +499,7 @@ $ git clone git://git.sourceforge.jp/gitroot/luatex-ja/luatexja.git
\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}
@@ -524,6 +525,7 @@ $ git clone git://git.sourceforge.jp/gitroot/luatex-ja/luatexja.git
\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}
@@ -1920,9 +1922,26 @@ the `standard' Japanese fonts, namely, `Ryumin-Light' and
ã¤ã¾ã`Ryumin-Light'ã¨`GothicBBB-Medium'ã®æå®ã§ãã®ããªãã£ãã¯ã¹ã使ãããï¼
%
-\paragraph{\texttt{cid} key}
+%\paragraph{\texttt{cid} key}
+%\paragraph{\texttt{cid}ãã¼}
\label{para-cid}
+%<*en>
+The default font defined by using \texttt{psft:} prefix is for Japanese typesetting;
+it is Adobe-Japan1-6 CID-keyed font.
+One can specify \texttt{cid} key to use other CID-keyed non-embedded fonts
+for Chinese or Korean typesetting.
+\begin{lstlisting}[numbers=left]
+\jfont\testJ={psft:Ryumin-Light:cid=Adobe-Japan1-6;jfm=jis} % Japanese
+\jfont\testD={psft:Ryumin-Light:jfm=jis} % default value is Adobe-Japan1-6
+\jfont\testC={psft:AdobeMingStd-Light:cid=Adobe-CNS1-5;jfm=jis} % Traditional Chinese
+\jfont\testG={psft:SimSun:cid=Adobe-GB1-5;jfm=jis} % Simplified Chinese
+\jfont\testK={psft:Batang:cid=Adobe-Korea1-2;jfm=jis} % Korean
+\end{lstlisting}
+Note that the code above specifies \texttt{jfm-jis.lua}, which is for Japanese fonts,
+as JFM for Chinese and Korean fonts.
+%
+%<*ja>
æ¨æºã§\texttt{psft:}ããªãã£ãã¯ã¹ã§å®ç¾©ããããã©ã³ãã¯æ¥æ¬èªç¨ã®ãã®ã§
ããï¼Adobe-Japan1-6ã®CIDã«å¯¾å¿ãããã®ã¨ãªãï¼ãããï¼\LuaTeX-jaã¯ä¸å½èª
ã®çµçã«ãå¨åãçºæ®ãããã¨ãåããï¼æ¥æ¬èªãã©ã³ãã§ãªãéåè¾¼ãã©ã³ã
@@ -1937,29 +1956,43 @@ the `standard' Japanese fonts, namely, `Ryumin-Light' and
\jfont\testK={psft:Batang:cid=Adobe-Korea1-2;jfm=jis} % éå½èª
\end{lstlisting}
ä¸ã®ã³ã¼ãã§ã¯ä¸å½èªã»éå½èªç¨ãã©ã³ãã«å¯¾ãã¦ãJFMã«
-æ¥æ¬èªç¨ã® \texttt{jfm-jis.lua} ãæå®ãã¦ããã®ã§æ³¨æããããï¼
+æ¥æ¬èªç¨ã®\texttt{jfm-jis.lua}ãæå®ãã¦ããã®ã§æ³¨æããããï¼
+%
+%<*en>
+At present, \LuaTeX-ja supports only 4 values written in the sample code above.
+Specifying other values, e.g.,
+%
+%<*ja>
ä»ã®ã¨ããï¼\LuaTeX-jaã¯ä¸ã®ãµã³ãã«ã³ã¼ãä¸ã«æ¸ãã4ã¤ã®å¤ãããµãã¼ããã¦ããªãï¼
+%
\begin{lstlisting}
\jfont\test={psft:Ryumin-Light:cid=Adobe-Japan2;jfm=jis}
\end{lstlisting}
+%<*en>
+occurs the following error:
+%
+%<*ja>
ã®ããã«ããã以å¤ã®å¤ãæå®ããã¨ï¼
+%
\begin{lstlisting}[numbers=left]
! Package luatexja Error: bad cid key `Adobe-Japan2'.
See the luatexja package documentation for explanation.
Type H for immediate help.
-
- \par
-l.78
-
+
+ \par
+l.78
+
? h
I couldn't find any non-embedded font information for the CID
`Adobe-Japan2'. For now, I'll use `Adobe-Japan1-6'.
Please contact the LuaTeX-ja project team.
-?
+?
\end{lstlisting}
+%<*ja>
ã¨ããã¨ã©ã¼ãåºãï¼
+%
%\subsection{Structure of JFM file}
%\subsection{JFMãã¡ã¤ã«ã®æ§é }
@@ -2629,7 +2662,7 @@ of \LuaTeX, see Section~\ref{sec-para}.
å
ã«è¿°ã¹ãããã«ï¼\verb+\ltjsetparameter+ 㨠\verb+\ltjgetparameter+ ã¯
\LuaTeX-jaã®ã»ã¨ãã©ã®ãã©ã¡ã¼ã¿ã«ã¢ã¯ã»ã¹ããããã®ããªããã£ãã§ããï¼
\LuaTeX-jaã\pTeX ã®ãããªææ³ï¼ä¾ãã°ï¼\verb+\prebreakpenalty`ï¼=10000+ï¼ã
-æ¡ç¨ããªãçç±ã®ä¸ã¤ã¯ï¼\LuaTeX ã®ã½ã¼ã¹ã«ããã \verb+\hpack_filter+
+æ¡ç¨ããªãçç±ã®ä¸ã¤ã¯ï¼\LuaTeX ã®ã½ã¼ã¹ã«ããã \verb+hpack_filter+
ã³ã¼ã«ããã¯ã®ä½ç½®ã«ããï¼\ref{sec-para}ç¯ãåç
§ï¼
%
@@ -3177,41 +3210,33 @@ the commands of Japanese version:
\begin{list}{}{\def\makelabel{\ttfamily}\def\{{\char`\{}\def\}{\char`\}}\advance\leftmargin1\zw}
+\item[CID=]
\item[JFM=]
-\item[JFM-var=]
+\item[JFM-var=] \
%<*en>
-These 2 font features correspond to \texttt{jfm} and \texttt{jfmvar} keys for
-\verb+\jfont+ primitive, respectively. See Subsection~\ref{ssec-jfont}.
+These 3 font features correspond to \texttt{cid}, \texttt{jfm} and
+\texttt{jfmvar} keys for \verb+\jfont+ primitive, respectively.
+\texttt{CID} is effective only when with \texttt{NoEmbed}
+described below.
+See Subsections~\ref{ssec-jfont} and \ref{ssec-psft} for details.
%
%<*ja>
-ããã2ã¤ã®ãã¼ã¯ãããã \verb+\jfont+ ããªããã£ãã«å¯¾ãã
-\texttt{jfm}, \texttt{jfmvar}ãã¼ã¨ãããã対å¿ããï¼
-\ref{ssec-jfont}ç¯ãåç
§ï¼
+ããã3ã¤ã®ãã¼ã¯ãããã \verb+\jfont+ ããªããã£ãã«å¯¾ãã
+\texttt{cid}, \texttt{jfm}, \texttt{jfmvar}ãã¼ã¨ãããã対å¿ããï¼
+\texttt{CID} ã¯ä¸ã® \texttt{NoEmbed} ã¨åããã¦ç¨ããããã¨ãã®ã¿æå¹ã§ããï¼
+詳細ã¯\ref{ssec-jfont}ç¯ã¨\ref{ssec-psft}ç¯ãåç
§ï¼
%
\item[NoEmbed]
%<*en>
-By specifying this font feature, you can use `name-only' Japanese font which
+By specifying this font feature, one can use `name-only' Japanese font which
will not be embedded in the output PDF file. See Subsection~\ref{ssec-psft}.
%
%<*ja>
ãããæå®ãããã¨ã§ï¼PDFã«åãè¾¼ã¾ããªããååã ããã®ãã©ã³ããæå®ãããã¨ã
ã§ããï¼\ref{ssec-psft}ç¯ãåç
§ï¼
%
-
-\item[CID=]
-%<*en>
-This feature is effective only when with NoEmbed feature.
-You can use the non-embedded CID-keyed font whose glyphs are addressed according
-to the specified character collection defined by Adobe Inc.
-The default value is Adobe-Japan1. See also Subsection~\ref{ssec-psft}.
-%
-%<*ja>
-NoEmbed ãã¼ã¨åããã¦ç¨ããï¼
-éåãè¾¼ã¿ã® CID-keyed ãã©ã³ããã©ã®æåã³ã¬ã¯ã·ã§ã³ã«åºã¥ããã®ããæå®ããï¼
-ããã©ã«ã㯠Adobe-Japan1 ã§ããï¼\ref{ssec-psft}ç¯ãåç
§ï¼
-%
\end{list}
\subsection{\texttt{luatexja-otf.sty}}
@@ -3557,7 +3582,7 @@ Nodes for Japanese Characters which the callback process of
%
\item[30114]
-Nodes for indicating beginning of a paragraph.
+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
\end{description}
@@ -3857,10 +3882,11 @@ Considering these situations, handling of an end-of-line in \LuaTeX-ja are as fo
\begin{quote}
A character U+FFFFF (its category code is set to 14~(comment) by
\LuaTeX-ja) is appended to an input line, \emph{before \LuaTeX\ actually
-process it}, if and only if the following two conditions are satisfied:
+process it}, if and only if the following three conditions are satisfied:
\begin{enumerate}
\item The category code of the character $\langle${return}$\rangle$
(whose character code is 13) is 5~(end-of-line).
+\item The category code of U+FFFFF itself is 14~(comment).
\item The input line matches the following `regular expression':
\[
(\text{any char})^*(\textbf{JAchar})
@@ -3902,11 +3928,12 @@ u
\begin{quote}
åå
¥åè¡ã«å¯¾ãï¼\textbf{ãã®å
¥åè¡ãèªã¾ããåã®å
é¨ç¶æ
ã§}
-以ä¸ã®2æ¡ä»¶ãæºãããã¦ããå ´åï¼\LuaTeX-jaã¯U+FFFFFçªã®æå
+以ä¸ã®3æ¡ä»¶ãæºãããã¦ããå ´åï¼\LuaTeX-jaã¯U+FFFFFçªã®æå
\footnote{ãã®æåã¯ã³ã¡ã³ãæåã¨ãã¦æ±ãããããã«\LuaTeX-jaå
é¨ã§è¨å®ããã¦ããï¼}
ãæ«å°¾ã«è¿½å ããï¼ãã£ã¦ï¼ãã®å ´åã«æ¹è¡ã¯ç©ºç½ã¨ã¯è¦åãããªããã¨ã¨ãªãï¼
\begin{enumerate}
\item æ¹è¡æåï¼æåã³ã¼ã13çªï¼ã®ã«ãã´ãªã¼ã³ã¼ãã5~(end-of-line)ã§ããï¼
+\item U+FFFFFã®ã«ãã´ãªã¼ã³ã¼ãã14~(comment)ã§ããï¼
\item å
¥åè¡ã¯æ¬¡ã®ãæ£è¦è¡¨ç¾ãã«ããããã¦ããï¼
\[
(\text{any char})^*(\textbf{JAchar})