X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=doc%2Fluatexja.dtx;h=7b73c3f3b1cbeb9e085b5bf404e4364e30b09ee3;hb=cd6c052eda6cf9534e1919ce5be10c90ed31b8b5;hp=54ad48eba30370687189b5a6aad67a6935738e8a;hpb=7de5d31cac745f86ebecdf6be7ae8e66ba4f04e8;p=luatex-ja%2Fluatexja.git
diff --git a/doc/luatexja.dtx b/doc/luatexja.dtx
index 54ad48e..7b73c3f 100644
--- a/doc/luatexja.dtx
+++ b/doc/luatexja.dtx
@@ -32,6 +32,10 @@
\usepackage[margin=25mm,footskip=6mm]{geometry}
\usepackage{luatexja-adjust}\ltjdisableadjust
\parskip=\smallskipamount
+\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
+ {3.25ex \@plus1ex \@minus.2ex}%
+ {-1em}%
+ {\normalfont\normalsize\bfseries\raisebox{.2ex}{$\mdlgblksquare\mkern1mu$}}}
%
%<*ja>
\usepackage[textwidth=45\zw, lines=45, footskip=6mm]{geometry}
@@ -85,7 +89,7 @@
%%%%%%%% fonts
\usepackage{luatexja-otf}
-\usepackage[kozuka-pr6n,jis2004]{luatexja-preset}
+\usepackage[kozuka-pr6n]{luatexja-preset}
%\usepackage{amssymb}
%<*en>
\usepackage{unicode-math}
@@ -668,11 +672,11 @@ But only the contents in \texttt{src/} are needed to work \LuaTeX-ja.
%
\begin{itemize}
%<*en>
-\item It is widely accepted that the font `Ryumin-Light' and
+\item It is widely accepted that fonts `Ryumin-Light' and
`GothicBBB-Medium' aren't embedded into PDF files, and a PDF reader
substitute them by some external Japanese fonts (\textit{e.g.},
- Kozuka Mincho is used for Ryumin-Light in Adobe Reader). We adopt this custom to
- the default setting.
+ Ryumin-Light is substituted with Kozuka Mincho in Adobe Reader).
+ We adopt this custom to the default setting.
%
%<*ja>
\item `Ryumin-Light'ã¨`GothicBBB-Medium'ã¯PDFãã¡ã¤ã«ã«åãè¾¼ã¾ãã«
@@ -748,22 +752,46 @@ When vertical typesetting is supported by \LuaTeX-ja in the future, \texttt{JT3}
%
%<*en>
-\item Two font families \texttt{mc} and \texttt{gt} are defined:
+\item Traditionally, Japanese documents use two typeface category: \emph{mincho}~(ææä½) and
+ \emph{gothic}~(\textgt{ã´ã·ãã¯ä½}). \emph{mincho} is used in the main text, while \emph{gothic}
+ is used in the headings or for emphasis.
+\begin{center}\small
+\begin{tabular}{lllc}
+\toprule
+\textbf{classification}&&&\textbf{family name}\\\midrule
+\emph{mincho} (ææä½)&\verb+\textmc{...}+&\verb+{\mcfamily ...}+&\verb+\mcdefault+\\
+\emph{gothic} (\textgt{ã´ã·ãã¯ä½})&\verb+\textgt{...}+&\verb+{\gtfamily ...}+&\verb+\gtdefault+\\
+\bottomrule
+\end{tabular}
+\end{center}
+\item
+By default, the following fonts are used for \emph{mincho} and \emph{gothic}:
\begin{center}\small
\begin{tabular}{ccccc}
\toprule
-\textbf{classification}&\textbf{family}&\verb+\mdseries+&\verb+\bfseries+&\textbf{scale}\\\midrule
-\emph{mincho}&\tt mc&Ryumin-Light &GothicBBB-Medium&0.962216\\
-\emph{gothic}&\tt gt&GothicBBB-Medium&GothicBBB-Medium&0.962216\\
+\textbf{classification}&\textbf{family name}&\verb+\mdseries+&\verb+\bfseries+&\textbf{scale}\\\midrule
+\emph{mincho} (ææä½)&\tt mc&Ryumin-Light &GothicBBB-Medium&0.962216\\
+\emph{gothic} (\textgt{ã´ã·ãã¯ä½})&\tt gt&GothicBBB-Medium&GothicBBB-Medium&0.962216\\
\bottomrule
\end{tabular}
\end{center}
-Remark that the bold series in both family are same as the medium series of \emph{gothic} family.
-This is a convention in \pLaTeX. This is a trace that there were only 2~fonts (these are Ryumin-Light
-and GothicBBB-Medium) in early years of DTP.
+Note that the bold series in both family are same as the medium series of \emph{gothic} family.
+This is a convention in \pLaTeX. This is trace that there were only 2~fonts (these are Ryumin-Light
+and GothicBBB-Medium) in early years of DTP. There is no italic nor slanted shape for
+ these \texttt{mc}~and~\texttt{gt}.
%
%<*ja>
-\item 2ã¤ã®ãã©ã³ããã¡ããª\texttt{mc}ã¨\texttt{gt}ãå®ç¾©ããã¦ããï¼
+\item \pLaTeX ã¨åæ§ã«ï¼æ¨æºã§ã¯ãææä½ããã´ã·ãã¯ä½ãã®2種é¡ãç¨ããï¼
+\begin{center}\small
+\begin{tabular}{cllc}
+\toprule
+\textbf{åä½}&&&\textbf{ãã¡ããªå}\\\midrule
+ææä½&\verb+\textmc{...}+&\verb+{\mcfamily ...}+&\verb+\mcdefault+\\
+\textgt{ã´ã·ãã¯ä½}&\verb+\textgt{...}+&\verb+{\gtfamily ...}+&\verb+\gtdefault+\\
+\bottomrule
+\end{tabular}
+\end{center}
+\item æ¨æºã§ã¯ï¼æ¬¡ã®ãã©ã³ããã¡ããªãç¨ããããï¼
\begin{center}\small
\begin{tabular}{ccccc}
\toprule
@@ -773,14 +801,16 @@ and GothicBBB-Medium) in early years of DTP.
\bottomrule
\end{tabular}
\end{center}
-ã©ã¡ãã®ãã¡ããªã«ããã¦ãï¼ãã®boldã·ãªã¼ãºã¯ã´ã·ãã¯ä½ã®mediumã·ãªã¼ãºã§
-ãããã¨ã«æ³¨æï¼ããã¯åæã®DTPã«ããã¦åæãã©ã³ãã2ã¤ï¼ãããã¡ããã©\
+ã©ã¡ãã®ãã¡ããªã«ããã¦ãï¼ãã®boldã·ãªã¼ãºã§ä½¿ããããã©ã³ãã¯
+ã´ã·ãã¯ä½ã®mediumã·ãªã¼ãºã§ä½¿ããããã©ã³ãã¨åããããã¨ã«æ³¨æï¼
+ããã¯åæã®DTPã«ããã¦åæãã©ã³ãã2ã¤ï¼ãããã¡ããã©\
Ryumin-Light, GothicBBB-Mediumã ã£ãï¼ããå©ç¨ã§ããªãã£ãæã®åæ®ã§ããï¼\pLaTeX{}
ã§ã®æ¨æºè¨å®ã¨ãåãã§ããï¼
%
+
%\item Japanese characters in math mode are typeset by the font family \texttt{mc}.
-%\item æ°å¼ã¢ã¼ãä¸ã®åææåã¯\texttt{mc}ãã¡ããªã§åºåãããï¼
+%\item æ°å¼ã¢ã¼ãä¸ã®åææåã¯ææä½(\texttt{mc})ã§åºåãããï¼
\end{itemize}
%<*en>
@@ -826,17 +856,6 @@ For \LaTeXe, \LuaTeX-ja adopted most of the font selection system of \pLaTeXe\ (
%
\begin{itemize}
%<*en>
-\item Two control sequences \verb+\mcdefault+ and \verb+\gtdefault+ are
- used to specify the default font families for \emph{mincho} and
- \emph{gothic}, respectively. Default values: \texttt{mc} for
- \verb+\mcdefault+ and \texttt{gt} for \verb+\gtdefault+.
-%
-%<*ja>
-\item 2ã¤ã®ã³ã³ããã¼ã«ã·ã¼ã±ã³ã¹ \verb+\mcdefault+ 㨠\verb+\gtdefault+ ãããã
- ãææä½ã¨ã´ã·ãã¯ä½ã®ããã©ã«ãã®ãã©ã³ããã¡ããªãæå®ããããã«ç¨ããããï¼
- åæå¤ï¼\verb+\mcdefault+ ã¯\texttt{mc}ï¼\verb+\gtdefault+ ã¯\texttt{gt}ï¼
-%
-%<*en>
\item Commands \verb+\fontfamily+, \verb+\fontseries+,
\verb+\fontshape+ and \verb+\selectfont+ can be used to change
attributes of Japanese fonts.
@@ -1035,12 +1054,12 @@ alphabetic fonts
\end{tabular}
\end{center}
%
-\begin{LTXexample}
+\begin{LTXexample}[width=0.4\textwidth]
\fontspec[Numbers=OldStyle]{LMSans10-Regular}
\jfontspec{IPAexMincho}
JIS~X~0213:2004âè¾»
-\addjfontfeatures{CJKShape=JIS1990}
+\jfontspec[CJKShape=JIS1990]{IPAexMincho}
JIS~X~0208:1990âè¾»
\end{LTXexample}
@@ -1078,14 +1097,27 @@ and loads \Pkg{luatexja-fontspec} internally.
%\paragraph{General options}
%\paragraph{ä¸è¬çãªãªãã·ã§ã³}
\begin{list}{}{\def\makelabel{\ttfamily}\def\{{\char`\{}\def\}{\char`\}}\advance\leftmargin1\zw}
+\item[nodeluxe]
+%<*en>
+Use one-weighted \textit{mincho} and \textit{gothic} font families.
+This means that \verb+\mcfamily\bfseries+, \verb+\gtfamily\bfseries+ and
+\verb+\gtfamily\mdseries+ use the same font.
+\emph{This option is enabled by default.}
+%
+%<*ja>
+\LaTeXe ç°å¢ä¸ã§ã®æ¨æºè¨å®ã®ããã«ï¼ææä½ã»ã´ã·ãã¯ä½ãå1ã¦ã§ã¤ãã§ä½¿ç¨ããï¼
+ããå
·ä½çã«è¨ãã¨ï¼ãã®è¨å®ã®ä¸ã§ã¯
+\verb+\mcfamily\bfseries+, \verb+\gtfamily\bfseries+, \verb+\gtfamily\mdseries+ã¯
+ã¿ãªåããã©ã³ãã¨ãªãï¼\emph{ãã®ãªãã·ã§ã³ã¯æ¨æºã§æå¹ã«ãªã£ã¦ããï¼}
+%
\item[deluxe]
%<*en>
-Specifying this option enables us to use \textit{mincho} with two weights (medium~and~bold),
+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},
because \textit{rounded gothic} is called \textit{maru gothic} (丸ã´ã·ãã¯) in Japanese.}.
-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
+The heavy weight of \textit{gothic} can be used by ``changing the family'' \verb+\gtebfamily+,
+because \Pkg{fontspec} package can handle only medium (\verb+\mdseries+) and
bold (\verb+\bfseries+).
%
%<*ja>
@@ -1120,6 +1152,16 @@ Use the JFM \texttt{jfm-jis.lua}, instead of \texttt{jfm-ujis.lua}, which is the
\LuaTeX-jaæ¨æºã®\texttt{jfm-ujis.lua}ãç¨ããããï¼
%
\end{list}
+%<*en>
+Note that \texttt{90jis} and \texttt{jis2004} only affect with \textit{mincho},
+\textit{gothic} (and possibly \textit{rounded gothic}) defined by this package.
+We didn't taken accound of when both \texttt{90jis} and \texttt{jis2004} are specified.
+%
+%<*ja>
+\texttt{90jis}ã¨\texttt{jis2004}ã«ã¤ãã¦ã¯æ¬ããã±ã¼ã¸ã§å®ç¾©ããã
+ææä½ã»ã´ã·ãã¯ä½ï¼ã»ä¸¸ã´ã·ãã¯ä½ï¼ã«ã®ã¿æå¹ã§ããï¼ä¸¡ãªãã·ã§ã³ã
+åæã«æå®ãããå ´åã«åä½ã«ã¤ãã¦ã¯å
¨ãèæ
®ãã¦ããªãï¼
+%
%\paragraph{Kozuka fonts}
%\paragraph{å°å¡ãã©ã³ã}
@@ -1260,7 +1302,7 @@ Jun Pro 101&Jun Pr6N 101\\
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).
+even if \texttt{deluxe} option is also specified).
%
%<*ja>
次ã«ï¼åã¦ã§ã¤ãç¨ã®è¨å®ãè¿°ã¹ãï¼ãã®4è¨å®ã§ã¯ãç´°åãã太åãã®åºå¥ã¯ãªãï¼
@@ -1647,8 +1689,8 @@ This range consist of the following Unicode ranges, \emph{except characters in t
\begin{lstlisting}
\ltjdefcharrange{4}{%
"500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF,
- "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A82F, "A840-"ABFF, "FB50-"FE0F,
- "FE20-"FE2F, "FE70-"FEFF, "FB00-"FB4F, "10000-"1FFFF, "E000-"F8FF} % non-Japanese
+ "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A82F, "A840-"ABFF, "FB00-"FE0F,
+ "FE20-"FE2F, "FE70-"FEFF, "10000-"1FFFF, "E000-"F8FF} % non-Japanese
\end{lstlisting}
%\item[Range~5${}^{\text{A}}$] Surrogates and Supplementary Private Use Areas.
%\item[ç¯å²5${}^{\text{A}}$] 代ç¨ç¬¦å·ã¨è£å©ç§ç¨é åï¼