X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=doc%2Fluatexja.dtx;h=6ee3177963724dd0abf7f123944629c35b4576e1;hb=87b89782a97fd43447fca40383ba1b967d1c611e;hp=1994d0a200dfcfaa41debf46456facf557de2e8e;hpb=8fe88c6a2f97286b70c87d3e570f67ffa27a68fb;p=luatex-ja%2Fluatexja.git
diff --git a/doc/luatexja.dtx b/doc/luatexja.dtx
index 1994d0a..6ee3177 100644
--- a/doc/luatexja.dtx
+++ b/doc/luatexja.dtx
@@ -8,6 +8,7 @@
%%%%% section ==> ç«
%%%%% subsection => ç¯
+\IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{}
%\documentclass[a4paper,titlepage]{article}
%\documentclass[a4paper,titlepage]{ltjsarticle}
@@ -15,6 +16,7 @@
%%%%%%%%
\makeatletter
%%%%%%%%
+\def\pgfsysdriver{pgfsys-pdftex.def}
\directlua{if jit then jit.on() end}
\usepackage{metalogo,amsmath,array,tikz,pict2e,multienum,float}
\usepackage{booktabs,multicol,luatexja-ruby}
@@ -24,16 +26,17 @@
%%%%%%%% fonts
\usepackage{luatexja-otf}
\directlua{luatexja.otf.enable_ivs()}
-\usepackage[match]{luatexja-fontspec}
-\usepackage[kozuka-pr6n]{luatexja-preset}
-\usepackage{unicode-math}
+\usepackage[no-math]{fontspec}
\setmainfont[Ligatures=TeX]{Linux Libertine O}
\setmonofont[Scale=MatchLowercase, ItalicFont=lmmono10-italic.otf,
BoldFont=lmmonolt10-bold.otf, BoldItalicFont=lmmonolt10-boldoblique.otf
]{lmmono10-regular.otf}
+\setsansfont[Scale=MatchLowercase,Ligatures=TeX]{Linux Biolinum O}
+\usepackage[match]{luatexja-fontspec}
+\usepackage[kozuka-pr6n]{luatexja-preset}
+\usepackage{unicode-math}
\setmonojfont{KozGoPr6N-Regular.otf}
\setmathfont[Scale=MatchLowercase]{xits-math.otf}
-\setsansfont[Scale=MatchLowercase,Ligatures=TeX]{Linux Biolinum O}
\setLaTeXa{\scshape a}
%<*ja>
@@ -451,7 +454,7 @@ Japanese characters in discretionary break (\cs{discretionary}) is not supported
%<*en>
\paragraph{Greek and Cyrillic letters, and ISO~8859-1 symbols}
By default, \LuaTeX-ja uses Japanese fonts to typeset Greek and Cyrillic letters,
- To change this behavior,
+ To change this behavior,
put \verb!\ltjsetparameter{jacharrange={-2,-3}}! in the preamble.
For the detailed description, see Subsection~\ref{ssec-setrange}.
@@ -600,17 +603,17 @@ and \emph{Japanese fonts} for fonts used in \textbf{JAchar}.
%The following packages are needed for the \LuaTeX-ja\ package.
%\LuaTeX-jaããã±ã¼ã¸ã®åä½ã«ã¯æ¬¡ã®ããã±ã¼ã¸é¡ãå¿
è¦ã§ããï¼
\begin{itemize}
-\item \LuaTeX\ beta-0.80.0 (or later)
-\item \Pkg{luaotfload} v2.5 (or later)
+\item \LuaTeX\ beta-0.85.0 (or later)
+\item \Pkg{luaotfload} v2.6 (or later)
\item \Pkg{adobemapping} (Adobe cmap and pdfmapping files)
\item \Pkg{everysel} (if you want to use \LuaTeX-ja with \LaTeXe)
\item \Pkg{fontspec} v2.4
%\item \emph{IPAex fonts} (\url{http://ipafont.ipa.go.jp/})
%\item \emph{IPAexãã©ã³ã(\url{http://ipafont.ipa.go.jp/})}
\end{itemize}
-%In summary, this version of \LuaTeX-ja no longer supports \TeX~Live~2014 (or older version).
+%In summary, this version of \LuaTeX-ja no longer supports \TeX~Live~2015 (or older version).
%<*ja>
-è¦ç´ããã¨ï¼æ¬ãã¼ã¸ã§ã³ã®\LuaTeX-jaã¯\TeX~Live~2014以åã§ã¯åä½ããªã\footnote{%
+è¦ç´ããã¨ï¼æ¬ãã¼ã¸ã§ã³ã®\LuaTeX-jaã¯\TeX~Live~2015以åã§ã¯åä½ããªã\footnote{%
ãã£ã¨ãï¼èªåã§\LuaTeX ã®ãã¤ããªãSubversionãªãã¸ããªãããã«ããã¦ããã°è©±ã¯å¥ã§ããï¼
}ï¼
%
@@ -814,7 +817,7 @@ bad argument #1 to 'open' (string expected, got nil)
If so, please execute a batch file which is written on
\href{https://osdn.jp/projects/luatex-ja/wiki/FrontPage%28en%29}{ the Project Wiki (English)}.
This batch file creates a temporary directory, copy CMaps in it,
-run a test file which loads \LuaTeX-ja in this directory,
+run a test file which loads \LuaTeX-ja in this directory,
and finally delete the temporary directory.
%
%<*ja>
@@ -1003,6 +1006,28 @@ Note that the bold series in both family are same as the medium series of \emph{
%\item Japanese characters in math mode are typeset by the font family \texttt{mc}.
%\item æ°å¼ã¢ã¼ãä¸ã®åææåã¯ææä½(\texttt{mc})ã§åºåãããï¼
+%<*en>
+ \item \cs{jttdefault}%
+ \footnote{%
+ When \Pkg{ltjsclasses} classes are used, or
+ \Pkg{luatexja-fontspec} (or \Pkg{luatexja-preset}) is loaded with \texttt{match} option,
+ \cs{ttfamily} changes the current Japanese font amily to \cs{jttdefault}.
+ These classes and packages also redefine \cs{jttdefault} to
+ \cs{gtdefault} (\emph{gothic}~family).
+ } specifies the Japanese font family in \cs{verb}~or~\texttt{verbatim} environment.
+ The default value of \cs{jttdefault} is \cs{mcdefault}, so \emph{mincho} family is used.
+%
+%<*ja>
+ \item \cs{verb} ã \texttt{verbatim} ç°å¢ä¸ã®åææåã«ä½¿ãããåæãã©ã³ããã¡ããªã¯
+ \ \cs{jttdefault} ã§æå®ãã%
+ \footnote{%
+ \Pkg{ltjsclasses}ã使ç¨ãããï¼ããã㯠\texttt{match} ãªãã·ã§ã³ãæå®ãã¦\Pkg{luatexja-fontspec}%
+ ã\Pkg{luatexja-preset}ããã±ã¼ã¸ãèªã¿è¾¼ãã ã¨ãã¯ï¼åãªã \cs{ttfamily} ã«ãã£ã¦ãåæãã©ã³ãã
+ \ \cs{jttdefault}\ ã«å¤æ´ãããï¼ã¾ãï¼ãããã®ã¯ã©ã¹ãã¡ã¤ã«ãããã±ã¼ã¸ã¯
+ \ \cs{jttdefault}\ ã \cs{gtdefault}ï¼ã´ã·ãã¯ä½ï¼ã«åå®ç¾©ããï¼
+ }ï¼æ¨æºå¤ã¯ \cs{mcdefault}ï¼ã¤ã¾ãææä½ã¨ãã¦ç¨ããã®ã¨
+ åããã©ã³ããã¡ããªã§ããï¼
+%
%<*en>
\item If you use the \Pkg{beamer} class with the default font theme (which uses sans serif
@@ -1034,6 +1059,12 @@ Okumura), namely, \Pkg{ltjclasses}\footnote{%
The latter \texttt{ltjt*.cls} are for vertically writtened Japanese documents.
} and \Pkg{ltjsclasses}\footnote{%
\texttt{ltjsarticle.cls},~\texttt{ltjsbook.cls},~\texttt{ltjskiyou.cls}.}.
+
+Original \Pkg{jsclasses} use \cs{mag}~primitive to set the main document font size.
+However, \LuaTeX\ beta-0.87.0~or~later does not support \cs{mag} in PDF~output,
+so \Pkg{ltjsclasses} use different method%
+\footnote{Similar to \texttt{magstyle=xreal} in the \Pkg{BXjscls} classes (by Takayuki Yato).}
+to set the main document font size.
%
%<*ja>
ããããªããï¼ä¸è¨ã®è¨å®ã¯æ¥æ¬èªã®ææ¸ã«ã¨ã£ã¦ååã¨ã¯è¨ããªãï¼
@@ -1048,6 +1079,12 @@ Okumura), namely, \Pkg{ltjclasses}\footnote{%
\Pkg{ltjsclasses}\footnote{%
\texttt{ltjsarticle.cls},~\texttt{ltjsbook.cls},~\texttt{ltjskiyou.cls}.}%
ãããããç¨æããã¦ããï¼
+
+å
ã
ã®\Pkg{ltjsclasses}ã§ã¯ãã©ã³ããµã¤ãºãæå®ããã®ã«\cs{mag}ããªããã£ãã使ããã¦ãããï¼
+\LuaTeX~beta-0.87.0以éã§ã¯PDFåºåæã®\cs{mag}ã®ãµãã¼ããå»æ¢ãããï¼
+ãã®ããï¼\Pkg{ltjsclasses}ã§ã¯å¥ã®æ¹æ³
+\footnote{å
«ç»å´ä¹æ°ã«ãã\Pkg{BXjscls}ã¯ã©ã¹ã«ããã\texttt{magstyle=xreal}æå®æã¨é¡ä¼¼ãã¦ããï¼}ã§
+ãã©ã³ããµã¤ãºãæå®ãããã¨ã«ãã¦ããï¼
%
%<*ja>
@@ -1189,7 +1226,7 @@ auto select&\cs{fontencoding}&\cs{fontfamily}&---&---&\cs{usefont}\\
%<*en>
\item For defining a Japanese font family, use
\cs{DeclareKanjiFamily} instead of
- \cs{DeclareFontFamily}. (In previous version of \LuaTeX-ja,
+ \cs{DeclareFontFamily}. (In previous version of \LuaTeX-ja,
using \cs{DeclareFontFamily} didn't cause any problem. But this no longer applies
the current version.)
\item Defining a Japanese font shape can be done by usual \cs{DeclareFontShape}:
@@ -1276,7 +1313,7 @@ this chapter. For the method, please see Subsection~\ref{ssec-math}.
%\subsection{\Pkg{luatexja-fontspec}ããã±ã¼ã¸}
\label{ssec-fontspec}
%<*en>
-To use the functionality of the \Pkg{fontspec} package to Japanese fonts,
+To use the functionality of the \Pkg{fontspec} package to Japanese fonts,
it is needed to load the \Pkg{luatexja-fontspec} package in the preamble, as follows:
\begin{quote}
\ttfamily \textbackslash usepackage[]\{luatexja-fontspec\}
@@ -1435,7 +1472,7 @@ JIS~X~0208:1990âè¾»
%<*en>
One can load the \Pkg{luatexja-preset}
-package to use several ``presets'' of Japanese fonts.
+package to use several ``presets'' of Japanese fonts.
This package provides functions in a part of
\Pkg{japanese-otf} package and a part of \Pkg{PXchfon} package by Takayuki Yato.
@@ -1466,13 +1503,14 @@ For example, the line~5 in below example is eqivalent to lines 1--3.
%\paragraph{General options}
%\paragraph{ä¸è¬çãªãªãã·ã§ã³}
\begin{cslist}[before*=]
-
-\item[fontspec]
+\item[fontspec%
+%\textrm{~(enabled by default)}
+%\emph{\gtfamily ï¼æ¢å®ï¼}
+]
%<*en>
With this option, Japanese fonts are selected using functionality of
the \Pkg{luatexja-fontspec} package. This means that the \Pkg{fontspec} package is
automatically loaded by this package.
-\emph{This option is enabled by default.}
If you need to pass some options to \Pkg{fontspec}, you can load \Pkg{fontspec} manually
before \Pkg{luatexja-preset}:
@@ -1480,7 +1518,6 @@ before \Pkg{luatexja-preset}:
%<*ja>
\Pkg{luatexja-fontspec}ããã±ã¼ã¸ã®æ©è½ãç¨ãã¦åæãã©ã³ããé¸æããï¼
ããã¯ï¼\Pkg{fontspec}ããã±ã¼ã¸ãèªåã§èªã¿è¾¼ã¾ãããã¨ãæå³ããï¼
-\emph{ãã®ãªãã·ã§ã³ã¯æ¨æºã§æå¹ã«ãªã£ã¦ããï¼}
ãã\Pkg{fontspec}ããã±ã¼ã¸ã«ä½ããã®ãªãã·ã§ã³ã渡ãå¿
è¦ããã
\footnote{ä¾ãã°ï¼æ°å¼ãã©ã³ãã¾ã§ç½®æããã¦ãã¾ãï¼\cs{mathit}ã«ãã£ã¦ã®ãªã·ã£æåã®
@@ -1500,7 +1537,7 @@ With this option, selecting Japanese fonts won't be performed using the function
This option is ignored when \Pkg{luatexja-fontspec} package is loaded.
When this option is specified, \Pkg{fontspec}~and~\Pkg{luatexja-fontspec} are
-\emph{not} loaded by default. Nevertheless,
+\emph{not} loaded by default. Nevertheless,
the package\Pkg{fontspec} can coexist with the option, as the following:
\begin{lstlisting}
\usepackage{fontspec}
@@ -1527,19 +1564,39 @@ In this case, one can use \cs{setmainfont} etc.\ to select \emph{alphabetic} fon
ããå ´å㯠\texttt{nfssonly} ãªãã·ã§ã³ã¯ç¡è¦ãããï¼
%
-\item[nodeluxe]
+\item[match]
+%<*en>
+If this option is specified, usual family-changing commands such as
+\cs{rmfamily},~\cs{textrm}, \cs{sffamily},~\dots\ also change Japanese font family.
+This option is passed to \Pkg{luatexja-fontspec}, if \texttt{fontspec}
+option is specifed.
+%
+
+%<*ja>
+ãã®ãªãã·ã§ã³ãæå®ãããã¨ï¼ã\pLaTeXe æ°ããã¥ã¡ã³ãã¯ã©ã¹ãã®ããã«\
+\cs{rmfamily}, \verb+\textrm{...}+, \cs{sffamily} çã
+欧æãã©ã³ãã ãã§ãªãåæãã©ã³ããå¤æ´ããããã«ãªãï¼
+\ \texttt{fontspec}\
+ãªãã·ã§ã³ãæå¹ã«ãªã£ã¦ããå ´åã¯ï¼ãã®ãªãã·ã§ã³ã¯ \Pkg{luatexja-fontspec} ããã±ã¼ã¸ã¸ã¨æ¸¡ãããï¼
+%
+
+
+\item[nodeluxe%
+%\textrm{~(enabled by default)}
+%\emph{\gtfamily ï¼æ¢å®ï¼}
+]
%<*en>
+The nagation of \texttt{deluxe} option.
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>
+\texttt{deluxe}ãªãã·ã§ã³ã®å¦å®ï¼
\LaTeXe ç°å¢ä¸ã®æ¨æºè¨å®ã®ããã«ï¼ææä½ã»ã´ã·ãã¯ä½ãå1ã¦ã§ã¤ãã§ä½¿ç¨ããï¼
ããå
·ä½çã«è¨ãã¨ï¼ãã®è¨å®ã®ä¸ã§ã¯
\ \verb+\mcfamily\bfseries+, \verb+\gtfamily\bfseries+,
\verb+\gtfamily\mdseries+ã¯ã¿ãªåããã©ã³ãã¨ãªãï¼
-\emph{ãã®ãªãã·ã§ã³ã¯æ¨æºã§æå¹ã«ãªã£ã¦ããï¼}
%
\item[deluxe]
%<*en>
@@ -1576,8 +1633,17 @@ characters designed for ruby.
}ï¼
%
\item[bold]
-%Substitute bold series of \textit{gothic} for bold series of \textit{mincho}.
-%ãææã®å¤ªåããã´ã·ãã¯ä½ã®å¤ªåã«ãã£ã¦ä»£æ¿ããï¼
+%<*en>
+Substitute bold series of \textit{gothic} for bold series of \textit{mincho}.
+If \texttt{nodeluxe} option is enabled, medium series of \textit{gothic} is also changed,
+since we use same font for both series of \textit{gothic}.
+%
+%<*ja>
+ãææã®å¤ªåããã´ã·ãã¯ä½ã®å¤ªåã«ãã£ã¦ä»£æ¿ããï¼
+ãã\texttt{nodeluxe}ãªãã·ã§ã³ãæå®ããã¦ããå ´åã¯ï¼ã´ã·ãã¯ä½ã¯1ã¦ã§ã¤ããã使ç¨ãããª
+ ãããï¼
+ãã´ã·ãã¯ä½ã®ä¸åããåæã«å¤æ´ããããã¨ã«ãªãï¼
+%
\item[90jis]
%Use 90JIS glyph variants if possible.
%åºæ¥ãéã90JISã®åå½¢ã使ãï¼
@@ -1593,6 +1659,7 @@ Use the JFM \texttt{jfm-jis.lua}, instead of \texttt{jfm-ujis.lua}, which is the
ç¨ããJFMãï¼JISãã©ã³ãã¡ããªãã¯é¡ä¼¼ã®ï¼\texttt{jfm-jis.lua}ã«ããï¼ãã®ãªãã·ã§ã³ããªãæã¯
\LuaTeX-jaæ¨æºã®\texttt{jfm-ujis.lua}ãç¨ããããï¼
%
+
\end{cslist}
%<*en>
Note that \texttt{90jis} and \texttt{jis2004} only affect with \textit{mincho},
@@ -1601,8 +1668,8 @@ We didn't taken account of when both \texttt{90jis} and \texttt{jis2004} are sp
%
%<*ja>
\texttt{90jis}ã¨\texttt{jis2004}ã«ã¤ãã¦ã¯æ¬ããã±ã¼ã¸ã§å®ç¾©ããã
-ææä½ã»ã´ã·ãã¯ä½ï¼ã»ä¸¸ã´ã·ãã¯ä½ï¼ã«ã®ã¿æå¹ã§ããï¼ä¸¡ãªãã·ã§ã³ã
-åæã«æå®ãããå ´åã®åä½ã«ã¤ãã¦ã¯å
¨ãèæ
®ãã¦ããªãï¼
+ææä½ã»ã´ã·ãã¯ä½ï¼ã»ä¸¸ã´ã·ãã¯ä½ï¼ã«ã®ã¿æå¹ã§ããï¼
+両ãªãã·ã§ã³ãåæã«æå®ãããå ´åã®åä½ã«ã¤ãã¦ã¯å
¨ãèæ
®ãã¦ããªãï¼
%
%\paragraph{Presets for multi weight}
@@ -1701,7 +1768,7 @@ Std/StdNãã©ã³ãã§ããï¼ãã®ä»ã¯Adobe-Japan1-5対å¿ã§ããï¼
\end{tabular}
\end{center}
-%\medskip
+%\newpage
\item[morisawa-pro] Morisawa Pro (Adobe-Japan1-4) fonts.
% \\*[-\dimexpr\medskipamount+\baselineskip\relax]
@@ -1761,7 +1828,8 @@ Std/StdNãã©ã³ãã§ããï¼ãã®ä»ã¯Adobe-Japan1-5対å¿ã§ããï¼
\end{tabular}
\end{center}
- \item[moga-mobo] MogaMincho, MogaGothic, and MoboGothic.
+%\newpage
+\item[moga-mobo] MogaMincho, MogaGothic, and MoboGothic.
%These fonts can be downloaded from\\\hfill \url{http://yozvox.web.fc2.com/}.
%ãããã®ãã©ã³ã㯠\url{http://yozvox.web.fc2.com/} ãããã¦ã³ãã¼ãã§ããï¼
@@ -1775,9 +1843,9 @@ Std/StdNãã©ã³ãã§ããï¼ãã®ä»ã¯Adobe-Japan1-5対å¿ã§ããï¼
%\smash{\raisebox{1.5ex}{\gt ææ}}%
&bold&Moga90Mincho Bold&MogaMincho Bold\\
\midrule
- &&Moga90Gothic&MogaGothic\\
+ &&Moga90Gothic*&MogaGothic*\\
&\smash{\raisebox{1.5ex}{medium}}
- &Moga90Gothic&MogaGothic\\
+ &Moga90Gothic Bold&MogaGothic Bold\\
\cmidrule(l){2-4}
%\textit{gothic}%
%\gt ã´ã·ãã¯
@@ -2172,7 +2240,7 @@ This range consists of the following Unicode ranges, \emph{except characters in
\item \texttt{U+0180}--\texttt{U+024F}: Latin Extended-B
\item \texttt{U+0250}--\texttt{U+02AF}: IPA Extensions
\item \texttt{U+02B0}--\texttt{U+02FF}: Spacing Modifier Letters
-%\par\
+%\par\
\item \texttt{U+0300}--\texttt{U+036F}: \\*\null\hfill Combining Diacritical Marks
\item \texttt{U+1E00}--\texttt{U+1EFF}: \\*\null\hfill Latin Extended Additional
%\par\
@@ -2311,7 +2379,7 @@ The block list is indicated in Table~\ref{table-rng7}.
%<*en>
\paragraph{Notes on \texttt{U+0080}--\texttt{U+00FF}}
-You should treat characters in \\texttt{U+0080}--\texttt{U+00FF} as \textbf{ALchar},
+You should treat characters in \\texttt{U+0080}--\texttt{U+00FF} as \textbf{ALchar},
when you use traditional 8-bit fonts, such as the \Pkg{textcomp} package or the
\Pkg{marvosym} package.
@@ -2320,7 +2388,7 @@ package is 182. This codepoint corresponds \P\ (\text{U+00B6}) in Unicode.
Similarly, \cs{Frowny} which is provided by the \Pkg{marvosym} package has
the same codepoint as \S\ (\text{U+00A7}).
Hence, as previous versions of \LuaTeX-ja, if these characters are treated as
-\text{JAchar}s, then \cs{textparagraph} produces ``ltjjachar`¶'' (in a Japanese font),
+\text{JAchar}s, then \cs{textparagraph} produces ``ltjjachar`¶'' (in a Japanese font),
and \cs{Frowny} produces ``\ltjjachar`§'' (in a Japanese font).
To avoid such situations, the default setting of \LuaTeX-ja is changed in this release
@@ -2629,7 +2697,7 @@ becuse a \emph{JAchar} is encapsulated by a horizontal box if needed.
æ°å¼ä¸ã®æåã¯ç°ãªã£ã¦ããã®ã§æ³¨æãå¿
è¦ã§ããï¼
ä¾ãã°ï¼è¡¨\ref{tab:math_bsa}ã®ããã«ï¼æ°å¼ä¸ã«æ示çã«ç¾ãã \cs{hbox} ã¯ï¼
\begin{itemize}
- \item \pTeX ã§ã¯ï¼ããã¯ã¹å
¨ä½ã \cs{ybaselineshift} ã ã¨ã·ãããããã®ã§ï¼
+ \item 2015年以åã®\pTeX ã§ã¯ï¼ããã¯ã¹å
¨ä½ã \cs{ybaselineshift} ã ã¨ã·ãããããã®ã§ï¼
表\ref{tab:math_bsa}ä¸ã®``ã''ã®ããã«ï¼ããã¯ã¹ä¸ã®åææåã¯
\ \cs{ybaselineshift} ã ãã·ããããï¼ä¸æ¹ï¼``for all''ã®ããã«ï¼
ããã¯ã¹å
ã®æ¬§ææåã¯2éã«ã·ããããããã¨ã«ãªãï¼
@@ -2637,6 +2705,10 @@ becuse a \emph{JAchar} is encapsulated by a horizontal box if needed.
æ°å¼ä¸ã«æ示çã«ç¾ãã \cs{hbox} ã¯ã·ããããªãï¼ãã®ããï¼
表\ref{tab:math_bsa}ä¸ã®``ã''ã``for all''ãï¼ããããæ¬æä¸ã«
æ¸ãããã¨ãã¨åãä¸ä¸ä½ç½®ã«çµã¾ããï¼
+
+ ãªãï¼\TeX~Live~2016以éã®\pTeX ã§ã¯æ¹ä¿®ããªããï¼\LuaTeX-jaã¨
+ è¿ãæåã«ãªãããã«ãã¦ãããï¼æ°å¼ä¸ã«ç´ã«æ¸ããã``ã''ã®ãã¼ã¹ã©ã¤ã³ã«ã¤ãã¦ã¯
+ ã¾ã éããè¦ãããï¼
\end{itemize}
\begin{table}
\small\centering
@@ -2653,12 +2725,16 @@ $\Phi\vdash F(x)\ \hbox{for all}\ x\in A$
\end{lstlisting}\\
\noalign{\vskip-\origbaselineskip}
\midrule
-\emph{\pTeX}&
+\emph{\pTeX~(--2015)}&
{\ltjsetparameter{yalbaselineshift=10pt}%
-æ°å¼abc: $ãa\lower10pt\hbox{ã}$, $\int_0^x t\,dt=x^2/2$,
+æ°å¼abc: $\lower10pt\hbox{ã}a\lower10pt\hbox{ã}$, $\int_0^x t\,dt=x^2/2$,
$\Phi\vdash F(x)\ \lower10pt\hbox{for all}\ x\in A$
-\par}\\
-\midrule
+\par}\\\noalign{\vskip-\origbaselineskip}\midrule
+\emph{\pTeX~(2016--)}&
+{\ltjsetparameter{yalbaselineshift=10pt}%
+æ°å¼abc: $\lower10pt\hbox{ã}a\hbox{ã}$, $\int_0^x t\,dt=x^2/2$,
+$\Phi\vdash F(x)\ \hbox{for all}\ x\in A$
+\par}\\\noalign{\vskip-\origbaselineskip}\midrule
\emph{\LuaTeX-ja}&
{\ltjsetparameter{yalbaselineshift=10pt}%
æ°å¼abc: $ãa\hbox{ã}$, $\int_0^x t\,dt=x^2/2$,
@@ -2749,13 +2825,13 @@ For the detail, see Table~\ref{table-kcat}.
%<*en>
\bfseries meaning&
\bfseries control word&
-\bfseries widow penalty\hbox{}$^*$&
+\bfseries widow penalty&
\bfseries linebreak\\
%
%<*ja>
\bfseries æå³&
\bfseries å¶å¾¡ç¶´ä¸ã«ä½¿ç¨&
-\bfseries æåã¦ã£ãã¦å¦ç\hbox{}$^*$&
+\bfseries æåã¦ã£ãã¦å¦ç&
\bfseries ç´å¾ã§ã®æ¹è¡\\
%
\midrule
@@ -2770,7 +2846,7 @@ For the detail, see Table~\ref{table-kcat}.
\medskip
%<*ja>
-æåã¦ã£ãã¦å¦ç\hbox{}$^*$: ãæ¼¢åãä¸æåã ã次ã®è¡ã«è¡ãã®ãé²ãã\
+æåã¦ã£ãã¦å¦çï¼ãæ¼¢åãä¸æåã ã次ã®è¡ã«è¡ãã®ãé²ãã
\cs{jcharwidowpenalty} ãï¼
ãã®æåã®ç´åã«æ¿å
¥ãããããå¦ãï¼ã示ãï¼
%
@@ -2842,17 +2918,22 @@ between \XeTeX\ and \LuaTeX, by the following reasons:
\begin{itemize}
\item (plain format) \texttt{luatex-unicode-letters.tex} is based on old \texttt{unicode-letters.tex}.
\item The latter half of \texttt{unicode-letters.tex}~and~\texttt{unicode-letters.def}
-sets\cs{catcode} of Kanji and kana characters to 11, via setting \cs{XeTeXcharclass}.
-
-However, this latter half does not exist (plain case), or not executed (\LaTeX~case) in \LuaTeX, hence
-\cs{catcode} of Kanji and kana characters remains 12 in \LuaTeX.
+sets\cs{catcode} of several characters to 11, via setting \cs{XeTeXcharclass}.
+However, this latter half does not exist (plain case), or not executed (\LaTeX~case) in \LuaTeX.
\end{itemize}
-In other words, Kanji nor kana characters cannot be used in
-a control word, in the default setting of \LuaTeX.
+In other words,
+\begin{description}
+\item[plain \LuaTeX]
+Kanji nor kana characters cannot be used in
+a control word, in the default setting of plain \LuaTeX.
+\item[\LuaLaTeX]
+In recent (2015-10-01 or later) \LuaLaTeX, Kanji and kana characters in a control word is supported (these catcode are 11),
+but not fullwidth alphanumerics and several other characters.
+\end{description}
This would be inconvenient for \pTeX~users to shifting to \LuaTeX-ja,
-since several control words containing Kanji, such as \verb+\西æ¦+,
-are used in \pTeX.
+since several control words containing Kanji or other fullwidth characters, such as
+\verb+\西æ¦+~or~\verb+\ï¼å¹´ç®è¥¿æ¦+ are used in \pTeX.
Hence, \LuaTeX-ja have a counterpart of \texttt{unicode-letters.tex}
for \LuaTeX, \emph{to match the \cs{catcode} setting with that of \XeTeX.}
%
@@ -2865,7 +2946,6 @@ for \LuaTeX, \emph{to match the \cs{catcode} setting with that of \XeTeX.}
\LaTeX ã§ã¯ \cs{catcode} ã®è¨å®ã¯ã«ã¼ãã«ã« \texttt{unicode-letters.def} ã¨ãã¦çµ±åããï¼
ãã®ãã¡ã¤ã«ã\XeLaTeX, \LuaLaTeX ã®ä¸¡æ¹ãç¨ãã¦ããï¼
-
ã ãï¼\XeTeX ã«ããã \cs{catcode} ã®åæè¨å®ã¨
\LuaTeX ã«ãããããã¯ä¸è´ãã¦ããªãï¼
\begin{itemize}
@@ -2873,16 +2953,20 @@ for \LuaTeX, \emph{to match the \cs{catcode} setting with that of \XeTeX.}
\texttt{unicode-letters.tex} ãå¤ã
\item \texttt{unicode-letters.tex} å¾åé¨ã \texttt{unicode-letters.def} å¾åé¨ã§ã¯
\cs{XeTeXcharclass} ã®è¨å®ãè¡ãªã£ã¦ããï¼
-ããã«ãã£ã¦æ¼¢åãä»®åã® \cs{catcode} ã11ã«è¨å®ããã¦ããï¼
-
+ããã«ãã£ã¦æ¼¢åãä»®åï¼ããã³å
¨è§è±æ°åã® \cs{catcode} ã11ã«è¨å®ããã¦ããï¼
ãããï¼\texttt{luatex-unicode-letters.tex} ã§ã¯ãã®ãå¾åé¨ãã
ã¾ããã¨çç¥ããã¦ããï¼ã¾ã\LuaLaTeX ã§ã \texttt{unicode-letters.def} å¾åé¨ã¯å®è¡ãããª
- ãï¼å¾ã£ã¦æ¼¢åãä»®åã® \cs{catcode} ã¯12ã®ã¾ã¾ã«ãªã£ã¦ããï¼
+ ãï¼
\end{itemize}
-è¨ãæããã¨ï¼\LuaTeX ã®åæç¶æ
ã§ã¯æ¼¢åãä»®åãå¶å¾¡ç¶´å
ã«
+è¨ãæããã¨ï¼
+\begin{description}
+ \item[plain \LuaTeX] æ¼¢åãä»®åãå¶å¾¡ç¶´å
ã«
使ç¨ãããã¨ã¯ã§ããªãï¼
-
-ããã§ã¯ \pTeX ã§ä½¿ç¨ã§ãã \verb+\西æ¦+ ãªã©ã使ããªããã¨ã¨ãªãï¼
+ \item[\LuaLaTeX] æè¿ã®ï¼2015-10-01以éã®ï¼
+\LuaLaTeX ã§ã¯æ¼¢åãä»®åãå¶å¾¡ç¶´å
ã«
+使ç¨ãããã¨ãå¯è½ã«ãªã£ããï¼å
¨è§è±æ°åã¯ç¸å¤ããã使ç¨ã§ããªãï¼
+\end{description}
+ããã§ã¯ \pTeX ã§ä½¿ç¨ã§ãã \verb+\ï¼å¹´ç®è¥¿æ¦+\footnote{ç§ç è²»\LaTeX ã§ä½¿ç¨ããã¦ããããã§ãï¼}ãªã©ã使ããªããã¨ã¨ãªãï¼
\LuaTeX-jaã¸ã®ç§»è¡ã§æéãçããï¼ãã®ããï¼\LuaTeX-jaã§ã¯
\texttt{unicode-letters.tex} ã®å¾åé¨ã«ãããå
容ãèªåã§ããããï¼
çµæã¨ãã¦\textbf{\XeTeX ã«ãããåæè¨å®ã¨åãã«ãªãããã«ãã¦ããï¼}
@@ -3856,7 +3940,7 @@ letter-spacing and the width of italic correction are not correct:
\paragraph{\texttt{ltjksp} æå®}
\label{pg:ltjksp}
\LuaTeX-jaæ¨æºã§ã¯ï¼
-JFMä¸ã«ããã \texttt{kanjiskip\_natural}, \texttt{kanjiskip\_stretch},\
+JFMä¸ã«ããã \texttt{kanjiskip\_natural}, \texttt{kanjiskip\_stretch},\
\texttt{kanjiskip\_shrink}ãã¼ï¼\pageref{pg:ksp_nat}ãã¼ã¸ï¼ã®ä½¿ç¨ã«ãã£ã¦ï¼
ãJFMç±æ¥ã®ã°ã«ã¼ã®ä»ã«ï¼\Param{kanjiskip}ã®èªç¶é·/伸ã³é/縮ã¿éã®ä¸é¨ã
åãå ´æã«æ¿å
¥ããããã¨ããç¶æ³ãèµ·ããããï¼
@@ -3894,13 +3978,12 @@ JFMä¸ã«ããã \texttt{kanjiskip\_natural}, \texttt{kanjiskip\_stretch},\
\catcode`\<=12\catcode`\>=12
\ltjsetparameter{jacharrange={+3}}
\small
-
\def\r#1#2{%
\hbox{\tate\Large\vrule
\parbox{7\zw}{%
\addjfontfeatures{TateFeatures={Opacity=0.5, Color=#2, JFM=#1}}\noindent
âââââââ
- ããæ¥ã¢ã¢ã¡ãããã使ãã§è¿·åã«ãªã£ã¦æ³£ãã¾ããï¼
+ ããæ¥ã¢ã¢ã¡ããããã使ããã§è¿·åã«ãªã£ã¦æ³£ãã¾ããã
}\vrule}}
\def\s#1#2{%
\hbox{\tate\Large
@@ -4090,6 +4173,17 @@ floating-point numbers in design-size unit.
\begin{cslist}[style=standard]
+\item[version=$1\mathrel{\textrm{or}}2$]
+%(optional, default value is~1)
+%ï¼ä»»æï¼æ¢å®å¤ã¯1ï¼
+
+%<*en>
+The version JFM. Currently 1~and~2 are supported
+%
+%<*ja>
+JFMã®ãã¼ã¸ã§ã³ï¼1ã¾ãã¯2ããµãã¼ããããï¼
+%
+
\item[dir=]
%(required)
%ï¼å¿
é ï¼
@@ -4211,20 +4305,48 @@ This field is a list of characters which are in this character
%ï¼å¿
é ï¼
%<*en>
+\begin{table}[t]
+ \centering
+\begin{tabular}{llr}
+\toprule
+Direction of JFM&\textbf{\texttt{'yoko'} (horizontal)}&\multicolumn{1}{l}{\textbf{\texttt{'tate'} (vertical)}}\\
+\midrule
+\texttt{width} field&the width of the ``real'' glyph&1.0~(full-width)\\
+\texttt{height} field&the height of the ``real'' glyph&0.5~(half-width)\\
+\texttt{depth} field&the depth of the ``real'' glyph&0.5~(half-width)\\
+\midrule
+\texttt{italic} field&\multicolumn{2}{c}{0.0}\\
+\bottomrule
+\end{tabular}
+\caption{Default values of \texttt{width} field and other fields}
+\label{tab-wid}
+\end{table}
Specify the width of characters in character class~$i$, the height, the depth and
the amount of italic correction. All characters in character class~$i$ are regarded that its width, height, and depth are
-as values of these fields.
-
-But there is one exception: \texttt{width} field can be \texttt{'prop'}.
-This means that width of a character becomes that of its ``real'' glyph.
+as values of these fields. The default values are shown in Table~\ref{tab-wid}.
%
%<*ja>
+\begin{table}[t]
+ \centering
+\begin{tabular}{llr}
+\toprule
+JFMæ¸åæ¹å&\emph{\texttt{'yoko'}ï¼æ¨ªçµï¼}&\multicolumn{1}{l}{\emph{\texttt{'tate'}ï¼ç¸¦çµï¼}}\\
+\midrule
+\texttt{width}&ãå®éã®ã°ãªããã®å¹
&1.0ï¼å
¨è§ï¼\\
+\texttt{height}&ãå®éã®ã°ãªããã®é«ã&0.5ï¼äºåï¼\\
+\texttt{depth}&ãå®éã®ã°ãªããã®æ·±ã&0.5ï¼äºåï¼\\
+\midrule
+\texttt{italic}&\multicolumn{2}{c}{0.0}\\
+\bottomrule
+\end{tabular}
+\caption{\texttt{width} ãã£ã¼ã«ãçã®æ¨æºå¤}
+\label{tab-wid}
+\end{table}
æåã¯ã©ã¹$i$ã«å±ããæåã®å¹
ï¼é«ãï¼æ·±ãï¼ã¤ã¿ãªãã¯è£æ£ã®éãæå®ããï¼
æåã¯ã©ã¹$i$ã«å±ããå
¨ã¦ã®æåã¯ï¼ãã®å¹
ï¼é«ãï¼æ·±ãããã®ãã£ã¼ã«ãã§æå®ãã
-å¤ã§ãããã®ã¨ãã¦æ±ãããï¼
-
-ä¾å¤ã¨ãã¦ï¼\emph{\texttt{width} ãã£ã¼ã«ãã«ã¯æ°å¤ä»¥å¤ã« \texttt{'prop'} ãæå®å¯è½ã§ãã}ï¼
-ãã®å ´åï¼æåã®å¹
ã¯ãã®ãå®éã®ãã°ãªãã®å¹
ã¨ãªãï¼OpenTypeã® \texttt{prop} featureã¨ä½µç¨
+å¤ã§ãããã®ã¨ãã¦æ±ãããï¼çç¥æãï¼æ°ã§ãªãå¤ãæå®ããæã«ã¯è¡¨\nobreak\ref{tab-wid}ã«
+ 示ããã¦ããå¤ãç¨ããï¼ä¾ãã°ï¼æ¨ªçµç¨JFM㧠\texttt{width} ãã£ã¼ã«ãã«ã¯æ°å¤ä»¥å¤ã®å¤ãæ
+ å®ããå ´åï¼æåã®å¹
ã¯ãã®ãå®éã®ãã°ãªãã®å¹
ã¨ãªãï¼OpenTypeã® \texttt{prop} featureã¨ä½µç¨
ããã°ï¼ããã«ãã£ã¦ãããã¼ã·ã§ãã«çµãè¡ããã¨ãã§ããï¼
%
@@ -4537,7 +4659,7 @@ and is also easy to shrink.
kanjiskip\_stretch=\textrm{, }kanjiskip\_shrink=]\leavevmode
These keys specifies the amount of the natural width of \Param{kanjiskip}
-(the stretch/shrink part, respectively) which will be inserted
+(the stretch/shrink part, respectively) which will be inserted
in addition to the original JFM glue. Default values of them are all 0.
As an example, in \texttt{jfm-ujis.lua}, the standard JFM in horizontal writing, we have
@@ -4548,7 +4670,7 @@ a glue whose natural part and shrink part are both half-width, while its stretch
as much as the stretch part of \Param{kanjiskip} times the value of
\texttt{kanjiskip\_stretch} key (1 in this case).
\item Between an ideographic closeing brackets (the ideographic comma ``ï¼''
- is included) and an ordinal letter, we have the same glue.
+ is included) and an ordinal letter, we have the same glue.
Again, this glue also can be stretched
as much as the stretch part of \Param{kanjiskip} times the value of
\texttt{kanjiskip\_stretch} key (1 in this case).
@@ -4567,12 +4689,37 @@ Hence we have the following result:
\item[end\_stretch=, end\_shrink=]
%<*ja>
-ï¼ä»»æï¼
+ï¼ä»»æï¼ãã¼ã¸ã§ã³1ã®ã¿ï¼
åªå
é ä½ä»ãè¡é·èª¿æ´ãæå¹ã§ããï¼ãã¤ç¾å¨ã®æåã¯ã©ã¹ã®æåãè¡
æ«ã«æ¥ãæã«ï¼è¡é·ãè©°ãã調æ´ã»ä¼¸ã°ã調æ´ã®ã
ãã«ãã®æåã¨è¡æ«ã®éã«æ¿å
¥å¯è½ãªã«ã¼ã³ã®å¤§ãããæå®ããï¼
%
+%<*en>
+(optional, version~1 only)
+%
+
+ \item[end\_adjust=\{, , ...\}]
+%<*ja>
+ï¼ä»»æï¼ãã¼ã¸ã§ã³2ã®ã¿ï¼
+
+åªå
é ä½ä»ãè¡é·èª¿æ´ãæå¹ã§ããï¼ãã¤ç¾å¨ã®æåã¯ã©ã¹ã®æåã
+ è¡æ«ã«æ¥ãæã«ï¼ãã®æåã¨è¡æ«ã®éã«ã¯æå®ãããå¤ã®ããããã®å¤§ããã®ã«ã¼ã³ã
+ æ¿å
¥ãããï¼\autoref{ssec-adj}åç
§ï¼ï¼
+
+ãã¼ã¸ã§ã³1ã«ããã
+\begin{lstlisting}[escapechar=\$]
+ end_stretch = $a$, end_shrink = $b$
+\end{lstlisting}
+ã¨ããæå®ã¯ï¼ãã¼ã¸ã§ã³2ã§ã¯æ¬¡ã®æå®ã¨åãã«ãªãï¼
+\begin{lstlisting}[escapechar=\$]
+ end_adjust = {$-b$, 0.0, $a$}
+\end{lstlisting}
+ããçãä¸ã® \texttt{0.0} ããªãå ´åã¯ï¼$a$ã$-b$ãããããã®ã«ã¼ã³ã常ã«è¡æ«ã«è¿½å ãããï¼
+%
+%<*en>
+(optional, version~2 only)
+%
\end{cslist}
@@ -5051,7 +5198,7 @@ This callback is called when \LuaTeX-ja is trying to encapsule a
ãã®\textit{glyph\_node}ãã«ãã»ã«åãããã¨ããéã«å¼ã³åºãããï¼
%
\begin{lstlisting}[numbers=left]
-function (
shift_info, jfont_info, char_class)
+function ( shift_info, jfont_info, char_type)
return new_shift_info
end
\end{lstlisting}
@@ -5090,7 +5237,7 @@ Then, the position of glyphs is shifted up by
ï¼åæOpenTypeãã©ã³ãã®æ¨æºå¤ï¼
\item å®ãã©ã³ãå´ã®æ°å¤ï¼$(\hbox{é«ã})=28y$, $(\hbox{æ·±ã})=5y$ï¼åæTrueTypeãã©ã³ãã®æ¨æºå¤ï¼
\end{itemize}
-ã¨ãªã£ã¦ããã¨ããï¼ããã¨ï¼å®éã®æåã®åºåä½ç½®ã¯ï¼ä»¥ä¸ã®éã ãä¸ã«ããããããã¨ã¨ãªãï¼
+ã¨ãªã£ã¦ããã¨ããï¼ããã¨ï¼å®éã®æåã®åºåä½ç½®ã¯ï¼ä»¥ä¸ã®éã ãä¸ã«ããããããã¨ã¨ãªãï¼
%
\[
\frac{88x}{88x+12x} (28y+5y) - 28y = \frac{26}{25}y= 1.04y.
@@ -5151,11 +5298,11 @@ in \pTeX, and symbols beside each parameter has the following meaning:
%
\begin{itemize}
%<*en>
-\item ``\ast'' : values at the end of a paragraph or a hbox are
+\item ``$\ast$'' : values at the end of a paragraph or a hbox are
adopted in the whole paragraph or the whole hbox.
%
%<*ja>
-\item ``\ast''ï¼æ®µè½ãhboxã®çµç«¯ã§ã®å¤ããã®æ®µè½ï¼hboxå
¨ä½ã§ç¨ããããï¼
+\item ``$\ast$''ï¼æ®µè½ãhboxã®çµç«¯ã§ã®å¤ããã®æ®µè½ï¼hboxå
¨ä½ã§ç¨ããããï¼
%
%<*en>
\item ``\dagger'': assignments are always global.
@@ -5716,7 +5863,7 @@ The last \cs{kansuji} converts an integer into its Chinese numerals.
\pTeX ã¨åãããã«JIS~X~0208ã®ç¯å²ãããµãã¼ããã¦ããªãï¼
%
\begin{center}
-\cs{kuten}, \cs{jis}, \cs{euc}, \cs{sjis}, \cs{jis}, \cs{kansuji}
+\cs{kuten}, \cs{jis}, \cs{euc}, \cs{sjis}, \cs{ucs}, \cs{kansuji}
\end{center}
%<*en>
These six commands takes an internal integer, and returns a \emph{string}.
@@ -6070,8 +6217,10 @@ to match the vertical center of ``M'' and that of ``ã'' in vertical typesetti
+ d_{\text{ã}} - d_{\text{M}},
\]
where $h_{a}$~and~$d_{a}$ denote the height of ``$a$'' and the depth, respectively.
-In \LuaTeX-ja, this \cs{adjustbaseline} does same task, namely setting the
+In \LuaTeX-ja, this \cs{adjustbaseline} does similar task, namely setting the
\Param{talbaselineshift} parameter.
+If the \LaTeX\ is 2015/10/01 release or later, \LuaTeX-ja use a Japanese
+character whose character class is zero, instead of `ã'.
%
%<*ja>
\pLaTeXe ã§ã¯ï¼\cs{adjustbaseline} ã¯ç¸¦çµæã«ãMãã¨ãããã®ä¸å¿ç·ãä¸è´ãããããã«ï¼
@@ -6085,8 +6234,12 @@ In \LuaTeX-ja, this \cs{adjustbaseline} does same task, namely setting the
\LuaTeX-jaã«ããã¦ã\cs{adjustbaseline} ã¯åæ§ã«\Param{talbaselineshift}ãã©ã¡ã¼ã¿ã®èª¿æ´å¦
çãè¡ã£ã¦ããï¼
-åæã«ï¼ããã\pLaTeXe ã® \cs{adjustbaseline} ã§è¡ããã¦ãããï¼
-ãæ¼¢ãã®å¯¸æ³ãå
ã«ï¼ï¼æ¬ç¯ã®æåã«è¿°ã¹ãï¼å°æåã§å§ã¾ãï¼\cs{cht}, \cs{cwd} ã¨ãã£ãé·ãå¤æ°ãè¨å®ããï¼
+åæã«ï¼ããã\pLaTeXe ã® \cs{adjustbaseline} ã§åæ§ã®å¦çãè¡ããã¦ãããï¼
+ãæ¼¢ãã®å¯¸æ³ãå
ã«ï¼æ¬ç¯ã®æåã«è¿°ã¹ãï¼å°æåã§å§ã¾ãï¼\cs{cht}, \cs{cwd}
+ã¨ãã£ãé·ãå¤æ°ãè¨å®ããï¼
+
+ãªãï¼\LaTeX ã2015/10/01 ç以éã®å ´åã¯ï¼ããããæ¼¢ãã®ä»£ããã«
+ãæåã¯ã©ã¹0ã®åææåããç¨ããï¼
%
\item[\cs{fontfamily}\{\}]
@@ -6224,11 +6377,11 @@ We use an auxiliary list~$N_{\mathrm{J}}$.
\item If the \Pkg{luatexja-fontspec} package is loaded, we stop here, and is not
recognized as a Japanese font family.
- If the \Pkg{luatexja-fontspec} package is \emph{not} loaded,
+ If the \Pkg{luatexja-fontspec} package is \emph{not} loaded,
now \LuaTeX-ja looks whether there exists a Japanese font encoding~ such that
a font definition named \texttt{.fd} (the file name is
- all lowercase) exists. If so, is recognized as a Japanese font family (the font definition file won't be loaded here).
- If not, is not a Japanese font family, and
+ all lowercase) exists. If so, is recognized as a Japanese font family (the font definition file won't be loaded here).
+ If not, is not a Japanese font family, and
is appended to the list~$N_{\mathrm{J}}$.
%
%<*ja>
@@ -6248,7 +6401,7 @@ now \LuaTeX-ja looks whether there exists a Japanese font encoding~ such th
%<*en>
\paragraph{Recognition as alphabetic font family}
Next, whether alphabetic font family will be changed is determined in following order.
-We use auxiliary lists $F_{\mathrm{A}}$~and~$N_{\mathrm{A}}$,
+We use auxiliary lists $F_{\mathrm{A}}$~and~$N_{\mathrm{A}}$,
%
%<*ja>
\paragraph{欧æãã©ã³ããã¡ããªã¨ãã¦ã®èªè}
@@ -6259,7 +6412,7 @@ We use auxiliary lists $F_{\mathrm{A}}$~and~$N_{\mathrm{A}}$,
\begin{enumerate}
%<*en>
-\item If the family~ has been listed in a list~$F_{\mathrm{A}}$,
+\item If the family~ has been listed in a list~$F_{\mathrm{A}}$,
is recognized as an alphabetic font family.
%
%<*ja>
@@ -6287,7 +6440,7 @@ We use auxiliary lists $F_{\mathrm{A}}$~and~$N_{\mathrm{A}}$,
\item Now \LuaTeX-ja looks whether there exists an alphabetic font encoding~ such that
a font definition named \texttt{.fd} (the file name is
all lowercase) exists. If so, current alphabetic font family will be changed to
- ~(the font definition file won't be loaded here).
+ ~(the font definition file won't be loaded here).
If not, current alphabetic font family won't be changed, and
is appended to the list~$N_{\mathrm{A}}$.
%
@@ -6312,7 +6465,7 @@ the second argument (family) is appended to the list~$F_{\mathrm{A}}$.
%<*en>
The above order is very similar to \cs{fontfamily} in \pLaTeXe, but more complicated (clause~3.).
-This is because \pLaTeXe\ is a \emph{format} however \LuaTeX-ja is not,
+This is because \pLaTeXe\ is a \emph{format} however \LuaTeX-ja is not,
hence \LuaTeX-ja does not know calls of \cs{DeclareFontFamily} \emph{before} itself is
loaded.
%
@@ -6429,7 +6582,7 @@ will not be embedded in the output PDF file. See Subsection~\ref{ssec-psft}.
%<*ja>
\pageref{pg:ltjksp}ãã¼ã¸ã§èª¬æãã \verb+\jfont+ ä¸ã§ã® \texttt{ltjksp} æå®ã¨
åä¸ã®å¹åãæã¡ï¼
-JFMä¸ã«ããã \texttt{kanjiskip\_natural}, \texttt{kanjiskip\_stretch},\
+JFMä¸ã«ããã \texttt{kanjiskip\_natural}, \texttt{kanjiskip\_stretch},\
\texttt{kanjiskip\_shrink}ãã¼ï¼\pageref{pg:ksp_nat}ãã¼ã¸ï¼ã®æå¹/ç¡å¹ãåãæ¿ããï¼
æ¨æºå¤ã¯ \texttt{true} ã§ããï¼
%
@@ -6688,10 +6841,14 @@ JFMã®\texttt{chars}ãã¼ãã«ã®ã¨ã³ããªã¨ã㦠\verb+'AJ1-xxx'+ ã®å½¢
%<*en>
\paragraph{IVS support}
Recent fonts support Ideographic Variation Selector (IVS).
-It seems that \Pkg{luaotfload} and \Pkg{fontspec} packages do not support
-IVS, so we implemented IVS support in \Pkg{luatexja-otf}.
-\emph{IVS support is experimental; if you want to enable this, load
-\Pkg{luatexja-otf} and execute the following:}
+\Pkg{luaotfload} and \Pkg{fontspec} packages used to be not supported IVS,
+so we implemented experimental IVS support in \Pkg{luatexja-otf},
+which is activated by
+\begin{lstlisting}
+\directlua{luatexja.otf.enable_ivs()}
+\end{lstlisting}
+However, recent \Pkg{luaotfload} and \Pkg{fontspec} packages seem to support IVS,
+so we don't execute above command anymore.
%
%<*ja>
\paragraph{IVSãµãã¼ã}
@@ -6700,67 +6857,15 @@ IVS, so we implemented IVS support in \Pkg{luatexja-otf}.
ï¼æ¼¢åç¨ç°ä½åã»ã¬ã¯ã¿ï¼ãå¾ç½®ãããã¨ã«ãã£ã¦
åå½¢ãæå®ããä»çµã¿(IVS)ãå«ã¾ãã¦ããï¼
å·çæç¹ã®2013å¹´12æã§ã¯ï¼\Pkg{luaotfload}ã\Pkg{fontspec}ããã±ã¼ã¸é¡ã¯
-IVSã«å¯¾å¿ãã¦ã¯ããªãããã§ããï¼ãããã®ããã±ã¼ã¸ã§å¯¾å¿ãã¦ãããã®ãçæ³çã ãï¼
-ããã¾ã§ã®ã¤ãªãã¨ãã¦ï¼\Pkg{luatexja-otf}ããã±ã¼ã¸å
ã«IVS対å¿ãä»è¾¼ãã§ãããï¼
-
-\medskip
-
-\emph{IVS対å¿ã¯è©¦é¨çãªãã®ã§ããï¼
-æå¹ã«ããã«ã¯ï¼\Pkg{luatexja-otf}ããã±ã¼ã¸ãèªã¿è¾¼ãã ä¸ã§ä»¥ä¸ã®å½ä»¤ãå®è¡ãã%
-\footnote{ãã®å½ä»¤ã2å以ä¸å®è¡ãã¦ãæå³ããªãï¼}ï¼}
-%
+IVSã«å¯¾å¿ãã¦ã¯ããªãããã§ãã£ãããï¼
+\Pkg{luatexja-otf}ããã±ã¼ã¸å
ã«è©¦é¨çãªIVS対å¿ãå®è£
ããï¼ããã¯ä»¥ä¸ã®å½ä»¤ã®å®è¡ã§æå¹ã«ãªãï¼
\begin{lstlisting}
\directlua{luatexja.otf.enable_ivs()}
\end{lstlisting}
-% ããã¨ï¼ä¸ã®å½ä»¤ãå®è¡ããç®æ以éã§ã¯ï¼ä»¥ä¸ã®ããã«IVSã«ããåå½¢æå®ãæå¹ã¨ãªãï¼
-% After executing the command above, you can use IVS like the following:
-\begin{LTXexample}
-\Large
-\jfontspec{KozMinPr6N-Regular}
-å¥è¯çèó åå¸ã¨ï¼æ±äº¬é½èó 飾åºï¼\\
-ããã«ã¡ã¯ï¼æ¸¡
-éó éó éó éó éó
-éó
éó éó éó éó
-éó éó éó éó éó
-ããï¼
-\end{LTXexample}
-%<*ja>
-å·¦ä¸å´ã®å
¥åã«ããã¦ã¯ï¼æ¼¢åç¨ç°ä½åã»ã¬ã¯ã¿ãæ示ããããï¼
-ä¾ãã°Variation~Selector~18 (\texttt{U+E0101})ã\IVSB{18}ã®ããã«è¡¨è¨ãã¦ããï¼
-%
-\medskip
-
-%<*en>
-Specifying glyph variants by IVS precedes glyph replacement by font features.
-For example, only ``è'' in ``è西'' is changed by font features
-\texttt{jp78}~or~\texttt{jp90}, which does not followed by any variation selector.
-%
-%<*ja>
-ã¾ãï¼IVSã«ããåå½¢æå®ã¯ï¼OpenTypeæ©è½ã«ããããã«åªå
ããããã¨ã¨ããï¼
-ä¸ã®ä¾ã«ããã¦ï¼\texttt{jp78}, \texttt{jp90} æå®ã§åå½¢ãå¤åããæåã¯
-ç°ä½åã»ã¬ã¯ã¿ãç¶ãã¦ããªããè西ãä¸ã®ãèãã®ã¿ã§ããï¼
-%
-\begin{LTXexample}
- \def\TEST#1{%
- {\jfontspec[#1]{KozMinPr6N-Regular}%
- èó åå¸ï¼èó 飾åºï¼è西}\\}
- æå®ãªãï¼\TEST{}
- \texttt{jp78}ï¼\TEST{CJKShape=JIS1978}
- \texttt{jp90}ï¼\TEST{CJKShape=JIS1990}
-\end{LTXexample}
-
-%<*ja>
-ç¾ç¶ã§ã¯ï¼\TeX å´ã®ã¤ã³ã¿ã¼ãã§ã¼ã¹ã¨ãªã \Pkg{luatexja-otf.sty} ã¯ä¸åå¤æ´ãã¦ããªã
-ã®ã§ï¼ZRããã«ãã\Pkg{PXipamjm}ããã±ã¼ã¸%
-\footnote{\url{https://github.com/zr-tex8r/PXipamjm}. 説æã¯å½¼ã®ããã°è¨äº
-ãpxipamjm ããã±ã¼ã¸ã®èª¬ææ¸ã®ãããªä½ã(\url{http://d.hatena.ne.jp/zrbabbler/20131221})ã
-ã«ããï¼}
-ã«ãããããªæ°ã®å©ããå½ä»¤ã¯ã¾ã ãªãï¼
-ç°ä½åã®ä¸è¦§è¡¨ç¤ºãè¡ãããå ´åã¯ï¼gitãªãã¸ããªå
ã® \texttt{test/test19-ivs.tex} ä¸ã«ãã
-Luaã»\TeX ã³ã¼ããåèã«ãªãã ããï¼
+ãããï¼ç¾å¨ã®\Pkg{luaotfload}ã\Pkg{fontspec}ããã±ã¼ã¸ã¯
+IVSã«å¯¾å¿ãã¦ããããã§ããã®ã§ï¼ãã¯ãä¸ã®å½ä»¤ãå®è¡ããå¿
è¦ã¯ãªãï¼
%
-
\subsection{\Pkg{luatexja-adjust}}
\label{ssec-adj}
\begin{figure}[t]
@@ -6826,7 +6931,7 @@ for making the difference obvious.
\end{itemize}
-\Pkg{luatexja-adjust} ã¯ï¼ä»¥ä¸ã®å½ä»¤ãæä¾ããï¼ãããã¯ãã¹ã¦ã°ãã¼ãã«ã«å¹åãçºæ®ããï¼
+\Pkg{luatexja-adjust}ã¯ï¼ä»¥ä¸ã®å½ä»¤ãæä¾ããï¼ãããã¯ãã¹ã¦ã°ãã¼ãã«ã«å¹åãçºæ®ããï¼
\begin{cslist}
\item[\cs{ltjdisableadjust}]
@@ -7305,6 +7410,18 @@ $i$ã¯7ããå°ããèªç¶æ°ï¼
\end{description}
% \TeX å´ããè¦ããå¤ï¼ã¤ã¾ã \verb+\the\ltj@dir+ ã®å¤ã¯å¸¸ã«0ã§ããï¼
+\cnt{ltjlineendcomment}
+%<*ja>
+ \LuaTeX-jaã¯\textbf{JAchar}ã§å
¥åè¡ãçµäºããå ´åï¼ãã®ç´å¾ã«ã³ã¡ã³ãæåã
+ ãããã¨ã§ä½è¨ãªç©ºç½ãæ¿å
¥ããããã¨ãé²ãã§ããï¼
+ \cs{ltjlineendcomment}ã¯ãã®éã®ã³ã¡ã³ãæåã®Unicodeã«ããã符å·ä½ç½®ãæå®ãã
+ ï¼è©³ç´°ã¯\ref{ssec:lineend}ç¯ãåç
§ï¼ï¼
+
+ \LuaTeX-jaã«ãããæ¢å®å¤ã¯$\texttt{"FFFFF}=1048575$ã§ããï¼
+ ã¦ã¼ã¶ã¯å
é¨åä½ãçç¥ãã¦ããªãéããã®ã«ã¦ã³ã¿ã®å¤ãå¤æ´ãã¦ã¯ãªããªãï¼
+ \cs{ltjlineendcomment}ã®å¤ãUnicodeã®ç¯å²å¤ï¼è² ãï¼$\texttt{"10FFFF}=1114111$ãè¶
ããå ´åï¼
+ ã«ãããã¨ã¯æ³å®ããã¦ããªãï¼
+%
\end{list}
%<*en>
@@ -7911,6 +8028,7 @@ to State~$M$ (middle of line) sometimes.
%\subsection{Behavior in \LuaTeX-ja}
%\subsection{\LuaTeX-jaã®åä½}
+ \label{ssec:lineend}
%<*en>
States in the input processor of \LuaTeX\ is the same as that of \TeX,
and they can't be customized by any callbacks. Hence, we can only use
@@ -7925,14 +8043,16 @@ space must be done \emph{just before} an input line is read.
Considering these situations, handling of an end-of-line in \LuaTeX-ja are as follows:
\begin{quote}
-A character \texttt{U+FFFFF} (its category code is set to 14~(\textit{comment}) by
-\LuaTeX-ja) is appended to an input line, \emph{before \LuaTeX\ actually
+A character whose character code is \cs{ltjlineendcomment}%
+\footnote{Its default value is \texttt{"FFFFF}, so \texttt{U+FFFFF} is used.
+The category code of \texttt{U+FFFFF} is set to 14~(\textit{comment}) by
+\LuaTeX-ja.} is appended to an input line, \emph{before \LuaTeX\ actually
process it}, if and only if the following three conditions are satisfied:
\begin{enumerate}
\item The category code of \cs{endlinechar}%
\footnote{Usually, it is $\langle$\textit{return}$\rangle$
(whose character code is 13).} is 5~(\textit{end-of-line}).
-\item The category code of \texttt{U+FFFFF} itself is 14~(\textit{comment}).
+\item The category code of \cs{ltjlineendcomment} itself is 14~(\textit{comment}).
\item The input line matches the following ``regular expression'':
\[
(\text{any char})^*(\textbf{JAchar})
@@ -7960,7 +8080,7 @@ there is a space before ``u''. This follows from following reasons:
\item When line~3 is processed by \texttt{process\_input\_buffer} callback,
``ã'' is considered as an \textbf{JAchar}.
Since line~3 ends with an \textbf{JAchar},
-the comment character \texttt{U+FFFFF} is appended to this line,
+the comment character (whose character code is \cs{ltjlineendcomment}) is appended to this line,
and hence the linebreak immediately after this line is ignored.
\item When line~4 is processed by \texttt{process\_input\_buffer} callback,
``ã'' is considered as an \textbf{ALchar}.
@@ -7985,13 +8105,15 @@ emits a space.
\begin{quote}
åå
¥åè¡ã«å¯¾ãï¼\emph{ãã®å
¥åè¡ãèªã¾ããåã®å
é¨ç¶æ
ã§}
-以ä¸ã®3æ¡ä»¶ãæºãããã¦ããå ´åï¼\LuaTeX-jaã¯\texttt{U+FFFFF}ã®æå
-\footnote{ãã®æåã¯ã³ã¡ã³ãæåã¨ãã¦æ±ãããããã«\LuaTeX-jaå
é¨ã§è¨å®ããã¦ããï¼}
+以ä¸ã®3æ¡ä»¶ãæºãããã¦ããå ´åï¼\LuaTeX-jaã¯\cs{ltjlineendcomment}çªã®æå
+\footnote{\cs{ltjlineendcomment}ã®æ¢å®å¤ã¯\texttt{"FFFFF}ã§ããã®ã§ï¼
+ æ¢å®ã§ã¯\texttt{U+FFFFF}ã使ããããã¨ã«ãªãï¼ãã®æåã¯ã³ã¡ã³ãæåã¨ãã¦æ±ãããããã«
+ \LuaTeX-jaå
é¨ã§è¨å®ããã¦ããï¼}%
ãæ«å°¾ã«è¿½å ããï¼ãã£ã¦ï¼ãã®å ´åã«æ¹è¡ã¯ç©ºç½ã¨ã¯è¦åãããªããã¨ã¨ãªãï¼
\begin{enumerate}
\item \cs{endlinechar}ã®æå\footnote{æ®éã¯ï¼æ¹è¡æåï¼æåã³ã¼ã13çªï¼ã§ããï¼}
ã®ã«ãã´ãªã¼ã³ã¼ãã5~(\textit{end-of-line})ã§ããï¼
-\item \texttt{U+FFFFF}ã®ã«ãã´ãªã¼ã³ã¼ãã14~(\textit{comment})ã§ããï¼
+\item \cs{ltjlineendcomment}ã®ã«ãã´ãªã¼ã³ã¼ãã14~(\textit{comment})ã§ããï¼
\item å
¥åè¡ã¯æ¬¡ã®ãæ£è¦è¡¨ç¾ãã«ããããã¦ããï¼
\[
(\text{any char})^*(\textbf{JAchar})
@@ -8021,7 +8143,7 @@ u
\begin{itemize}
\item 3è¡ç®ã \texttt{process\_input\_buffer} ã§å¦çããæç¹ã§ã¯ï¼
ãããã¯\textbf{JAchar}ï¼åææ±ãï¼ã§ããï¼ãã£ã¦3è¡ç®ã¯\textbf{JAchar}ã§çµãããã¨ã«ãªãï¼
- ã³ã¡ã³ãæå \texttt{U+FFFFF} ã追å ãããï¼
+ \cs{ltjlineendcomment}çªã®ã³ã¡ã³ãæåã追å ãããï¼
ãã£ã¦ï¼ç´å¾ã®æ¹è¡æåã¯ç¡è¦ããããã¨ã«ãªãï¼ç©ºç½ã¯å
¥ããªãï¼
\item 4è¡ç®ã \texttt{process\_input\_buffer} ã§å¦çããæç¹ã§ã¯ï¼
ãããã¯\textbf{ALchar}ã§ããï¼ãã£ã¦4è¡ç®ã¯\textbf{ALchar}ã§çµãããã¨ã«ãªãï¼
@@ -8794,7 +8916,7 @@ a patch \Pkg{jlisting.sty}~(\cite{jlisting}) resolves the problem forcibly.
%<*en>
In \LuaTeX-ja, the problem is resolved by using the \verb+process_input_buffer+ callback.
-The callback function inserts the output command (active character \texttt{U+FFFFF})
+The callback function inserts the output command (active character \cs{ltjlineendcomment})
before each letter above \texttt{U+0080}.
This method can omits the process to make all Japanese characters active
(most of the activated characters are not used in many cases).
@@ -8802,7 +8924,7 @@ This method can omits the process to make all Japanese characters active
%<*ja>
\LuaTeX-jaã§ã¯ï¼\verb+process_input_buffer+ ã³ã¼ã«ããã¯ãå©ç¨ãããã¨ã§ï¼
ãåè¡ã«åºç¾ãã\texttt{U+0080}以éã®æåã«å¯¾ãã¦ï¼ãããã®åºåå½ä»¤ãåç½®ããã
-ã¨ããæ¹æ³ãã¨ã£ã¦ããï¼åºåå½ä»¤ã¨ãã¦ã¯ï¼ã¢ã¯ãã£ãæååãã \texttt{U+FFFFF} ãç¨ãã¦ããï¼
+ã¨ããæ¹æ³ãã¨ã£ã¦ããï¼åºåå½ä»¤ã¨ãã¦ã¯ï¼ã¢ã¯ãã£ãæååãã\cs{ltjlineendcomment}ãç¨ãã¦ããï¼
ããã«ããï¼ï¼å
¥åã«ã¯ä½¿ç¨ããã¦ããªããããããªãï¼åææåãããã¹ã¦ã¢ã¯ãã£ãåããæéããªãï¼
è¦éããè¯ãå®è£
ã«ãªã£ã¦ããï¼
%
@@ -8821,45 +8943,45 @@ then the patch \Pkg{lltjp-listings} is loaded automatically at \verb+\begin{docu
%\subsection{Notes and additional keys}
%\subsection{注æ}
-%<*en>
-\paragraph{Escaping to \LaTeX}
-We used the \verb+process_input_buffer+ callback to output \textbf{JAchar}s.
-But it has a drawback; any commands whose name contains a \textbf{JAchar}
-cannot be used in any ``escape to \LaTeX''.
+% %<*en>
+% \paragraph{Escaping to \LaTeX}
+% We used the \verb+process_input_buffer+ callback to output \textbf{JAchar}s.
+% But it has a drawback; any commands whose name contains a \textbf{JAchar}
+% cannot be used in any ``escape to \LaTeX''.
-Consider the following input:
-%
-%<*ja>
-\paragraph{\LaTeX ã¸ã®ã¨ã¹ã±ã¼ã}
-æ¥æ¬èªå¯¾å¿ãè¡ãããã« \verb+process_input_buffer+ ã使ç¨ãããã¨ã§ï¼
-\texttt{texcl},~\texttt{escapeinside}ã¨ãã£ã\emph{ã\LaTeX ã¸ã®ã¨ã¹ã±ã¼ããä¸ã§ã¯ï¼
-\textbf{JAchar}ãå称ã®ä¸é¨ã«å«ãå¶å¾¡ç¶´ã¯ä½¿ç¨ä¸å¯è½}ã§ããï¼
-ä¾ãã°æ¬¡ã®ãããªå
¥åãèãããï¼
-%
-\begin{verbatim*}
-\begin{lstlisting}[escapechar=\#]
-#\ã»ã xã´ã#
-\end{lstlisting}
-\end{verbatim*}
-%The line~2 is transformed by the callback to
-%ããã§ï¼2è¡ç®ã¯ \verb+process_input_buffer+ ã®ä½ç¨ã«ããï¼
-\begin{lstlisting}[showspaces, escapechar=\!]
-#\!\IVSA FFFFF!ã»!\IVSA FFFFF!ã x!\IVSA FFFFF!ã´!\IVSA FFFFF!ã#
-\end{lstlisting}
-%<*en>
-before the line is actually processed.
-In the escape (between the character ``\verb+#+''),
-the category code of \texttt{U+FFFFF} is set to 9~(\emph{ignored}).
-Hence the control symbol ``\cs{}\IVSA FFFFF'' will be executed,
-instead of ``\verb+\ã»ã+''.
-%
-%<*ja>
-ã¨å¤æããã¦ããï¼å®éã®å¦çã«åãããï¼
-ã\verb+#+ãã§æã¾ããã\LaTeX ã¸ã®ã¨ã¹ã±ã¼ããä¸ã§ã¯\
-\texttt{U+FFFFF} ã®ã«ãã´ãªã¼ã³ã¼ãã¯9~(\textit{ignored})ã¨ãªãã®ã§ï¼
-çµå±ã\verb+\ã»ã+ãã®ä»£ããã«
-ã\cs{}\IVSA FFFFFãã¨ããcontrol symbolãå®è¡ããããã¨ã«ãªãï¼
-%
+% Consider the following input:
+% %
+% %<*ja>
+% \paragraph{\LaTeX ã¸ã®ã¨ã¹ã±ã¼ã}
+% æ¥æ¬èªå¯¾å¿ãè¡ãããã« \verb+process_input_buffer+ ã使ç¨ãããã¨ã§ï¼
+% \texttt{texcl},~\texttt{escapeinside}ã¨ãã£ã\emph{ã\LaTeX ã¸ã®ã¨ã¹ã±ã¼ããä¸ã§ã¯ï¼
+% \textbf{JAchar}ãå称ã®ä¸é¨ã«å«ãå¶å¾¡ç¶´ã¯ä½¿ç¨ä¸å¯è½}ã§ããï¼
+% ä¾ãã°æ¬¡ã®ãããªå
¥åãèãããï¼
+% %
+% \begin{verbatim*}
+% \begin{lstlisting}[escapechar=\#]
+% #\ã»ã xã´ã#
+% \end{lstlisting}
+% \end{verbatim*}
+% %The line~2 is transformed by the callback to
+% %ããã§ï¼2è¡ç®ã¯ \verb+process_input_buffer+ ã®ä½ç¨ã«ããï¼
+% \begin{lstlisting}[showspaces, escapechar=\!]
+% #\!\IVSA FFFFF!ã»!\IVSA FFFFF!ã x!\IVSA FFFFF!ã´!\IVSA FFFFF!ã#
+% \end{lstlisting}
+% %<*en>
+% before the line is actually processed.
+% In the escape (between the character ``\verb+#+''),
+% the category code of \texttt{U+FFFFF} is set to 9~(\emph{ignored}).
+% Hence the control symbol ``\cs{}\IVSA FFFFF'' will be executed,
+% instead of ``\verb+\ã»ã+''.
+% %
+% %<*ja>
+% ã¨å¤æããã¦ããï¼å®éã®å¦çã«åãããï¼
+% ã\verb+#+ãã§æã¾ããã\LaTeX ã¸ã®ã¨ã¹ã±ã¼ããä¸ã§ã¯\
+% \texttt{U+FFFFF} ã®ã«ãã´ãªã¼ã³ã¼ãã¯9~(\textit{ignored})ã¨ãªãã®ã§ï¼
+% çµå±ã\verb+\ã»ã+ãã®ä»£ããã«
+% ã\cs{}\IVSA FFFFFãã¨ããcontrol symbolãå®è¡ããããã¨ã«ãªãï¼
+% %
%<*en>
\paragraph{Variation selectors}
@@ -9105,7 +9227,7 @@ Letter, Other, Kanji, Open, Closeã®ã©ãã«å±ãããã¯æ¬¡ã«ãã£ã¦æ±º
%
\begin{itemize}
%\item \textbf{ALchar}s above or equal to~\texttt{U+0080} are classified as Letter.
-%\item ï¼\texttt{U+0080}以éã®ï¼\textbf{ALchar}ã¯ï¼ãã¹ã¦Letteræ±ãã§ããï¼
+%\item \<ï¼\texttt{U+0080}以éã®ï¼\textbf{ALchar}ã¯ï¼ãã¹ã¦Letteræ±ãã§ããï¼
%\item \textbf{JAchar}s are classified in the order as follows:
%\item \textbf{JAchar}ã«ã¤ãã¦ã¯ï¼ä»¥ä¸ã®é åºã«å¾ã£ã¦æå種ã決ããï¼
@@ -9142,7 +9264,7 @@ the \texttt{lstlisting} environment or other environments/commands.
%<*ja>
\section{åæã®è¡é·è£æ£æ¹æ³}
\label{sec-adjspec}
-\Pkg{luatexja-adjust} ã§æä¾ãããåªå
é ä½ä»ãã®è¡é·èª¿æ´ã®è©³ç´°ãè¿°
+\Pkg{luatexja-adjust}ã§æä¾ãããåªå
é ä½ä»ãã®è¡é·èª¿æ´ã®è©³ç´°ãè¿°
ã¹ãï¼å¤§ã¾ãã«è¿°ã¹ãã¨ï¼æ¬¡ã®ããã«ãªãï¼
\begin{itemize}
\item é常ã®\TeX ã®è¡åå²æ¹æ³ã«å¾ã£ã¦ï¼æ®µè½ãè¡åå²ããï¼ãã®æ®µéã§ã¯ï¼è¡
@@ -9163,13 +9285,9 @@ the \texttt{lstlisting} environment or other environments/commands.
\paragraph{æºåï¼åè¨ä¼¸ç¸®éã®è¨ç®}
ã°ã«ã¼ã®ä¼¸ç¸®åº¦ï¼\texttt{plus} ã \texttt{minus} ã§æå®ããã¦ããå¤ï¼ã«ã¯ï¼
æéå¤ã®ä»ã«ï¼\texttt{fi}ï¼\texttt{fil}ï¼\texttt{fill}ï¼\texttt{filll}ã¨
-ãã4ã¤ã®ç¡é大ã¬ãã«ï¼å¾ãã®æ¹ã»ã©å¤§ããï¼ãããï¼è¡ã®èª¿æ´ã«
-\texttt{fi} ãªã©ã®\emph{ç¡é大ã¬ãã«ã®ä¼¸ç¸®åº¦ãç¨ãããã¦ããå ´åã¯ï¼ã
-ã®è¡ã«å¯¾ãã¦ã®å¦çãä¸æ¢}ããï¼
-
-ãã£ã¦ï¼ä»¥éï¼åé¡ã«ãã¦ããè¡ã®è¡é·èª¿æ´ã¯ä¼¸ç¸®åº¦ãæéé·ã®ã°ã«ã¼ãç¨ãã¦
-è¡ããã¦ããã¨ãã¦è¯ãï¼ããã«ï¼ç°¡åã®ããï¼ãã®è¡ã¯ã°ã«ã¼ãåºãããã¦ãã
-ï¼èªç¶é·ã§çµãã¨æã¾ããè¡é·ããã®çãï¼å ´åããæ±ããªãï¼
+ãã4ã¤ã®ç¡é大ã¬ãã«ï¼å¾ãã®æ¹ã»ã©å¤§ããï¼ãããï¼è¡ã®èª¿æ´ã«
+\texttt{fi} ãªã©ã®\emph{ç¡é大ã¬ãã«ã®ä¼¸ç¸®åº¦ãç¨ãããã¦ããè¡ã§ã¯ï¼
+ãè¡æ«æåã®ä½ç½®èª¿æ´ãã®ã¿è¡ãï¼ãã°ã«ã¼ã®èª¿æ´ãã¯è¡ããªãï¼}
ã¾ãï¼æ®µè½ä¸ã®è¡ä¸ã®ã°ã«ã¼ã
\begin{itemize}
@@ -9181,42 +9299,53 @@ the \texttt{lstlisting} environment or other environments/commands.
\item å欧æé空ç½(\Param{xkanjiskip})
\item åæé空ç½(\Param{kanjiskip})
\end{itemize}
-ã®$1+1+5+1=8$ã¤ã«é¡å¥ãï¼ããããã®ç¨®å¥ãã¨ã«
-許容ããã¦ãã伸ã³éï¼\texttt{stretch}ã®å¤ï¼ã®åè¨ãè¨ç®ããï¼
-ã¾ãï¼è¡é·ã¨èªç¶é·ã¨ã®å·®ã\textit{total}ã¨ããï¼
-
+ã®$1+1+5+1=8$ã¤ã«é¡å¥ããï¼
+ããã¦è¨±å®¹ããã¦ãã伸ã³éï¼\texttt{stretch}ã®å¤ï¼ã®åè¨ã
+ç¡éã®ã¬ãã«ãã¨ã«
+\begin{align*}
+ T^{+}_{l}&:= \sum_{\text{$\texttt{stretch\_order}(p) = l$}} \texttt{stretch}(p),&
+ l\in \{\text{(finite)}, \texttt{fi}, \texttt{fil}, \texttt{fill}, \texttt{filll}\}
+\end{align*}
+ã¨è¨ç®ããï¼ããã«ï¼
+\begin{align*}
+T^{+}&:=T^{+}_{L^+},&L^{+} = \max \{l\in
+ \{\text{(finite)}, \texttt{fi}, \texttt{fil}, \texttt{fill}, \texttt{filll}\}:
+ T^{+}_l\neq 0\}
+\end{align*}
+ã¨ããï¼æéã®ä¼¸ã³éã«ã¤ãã¦ã¯ï¼ä¸è¨ã®8種é¡ã®é¡å¥ãã¨ã«ãåè¨ãè¨ç®ããï¼
+ããã«ç¸®ã¿éï¼\texttt{shrink}ã®å¤ï¼ã«ã¤ãã¦ãåæ§ã®å¦çãè¡ãï¼$T^{-}$ãè¨ç®ããï¼
+
+ã¾ãï¼è¡é·ããèªç¶é·ãå¼ããå¤ã\textit{total}ã¨ããï¼
\subsection{è¡æ«æåã®ä½ç½®èª¿æ´}
è¡æ«ãæåã¯ã©ã¹$n$ã®\textbf{JAchar}ã§ãã£ãå ´åï¼
-ãããåãããã¨ã«ãã£ã¦ï¼\textit{total}ã®ãã¡
-\textbf{JAglue}ãè² æ
ããåãå°ãªããããã¨ããï¼
-ãã®è¡æ«æåã®å·¦å³ã®ç§»åå¯è½éã¯ï¼
-JFMä¸ã«ããæåã¯ã©ã¹$n$ã®å®ç¾©ã®
-\texttt{end\_stretch},~\texttt{end\_shrink}ãã£ã¼ã«ãã«
-å
¨è§åä½ã®å¤ã¨ãã¦è¨è¿°ããã¦ããï¼
-
-ä¾ãã°ï¼è¡æ«æåãå¥ç¹ãããã§ããï¼ããã§ç¨ãããã¦ããJFMä¸ã«
-\begin{lstlisting}
- [2] = {
- chars = { 'ã', ... }, width = 0.5, ...,
- end_stretch = 0.5, end_shrink = 0.5,
- },
-\end{lstlisting}
-ã¨ããæå®ããã£ãå ´åï¼ãã®è¡æ«ã®å¥ç¹ã¯
-\begin{itemize}
-\item é常ã®\TeX ã®è¡åå²å¦çã§ãåè§ä»¥ä¸ã®è©°ãããè¡ããã¦ããå ´åï¼
-ãã®è¡ä¸ã®\textbf{JAglue}ã®è² æ
ã軽æ¸ããããï¼
-è¡æ«ã®å¥ç¹ãåè§ã ãå³ã«ç§»åããï¼ã¶ãä¸ãçµãè¡ãï¼ï¼
-\item é常ã®\TeX ã®è¡åå²å¦çã§ãåè§ä»¥ä¸ã®ç©ºãããè¡ããã¦ããå ´åï¼
-éã«è¡æ«å¥ç¹ãåè§å·¦ã«ç§»åãããï¼è¦ãç®çã«å
¨è§åãã¨ãªãï¼ï¼
-\item 以ä¸ã®ã©ã¡ãã§ããªãå ´åï¼è¡æ«å¥ç¹ã®ä½ç½®èª¿æ´ã¯è¡ããªãï¼
-\end{itemize}
-ã¨ãªãï¼
+\texttt{end\_adjust} ã®å¤ã®ããããã ããã®æåã®ä½ç½®ã移åãããï¼
-è¡æ«æåã移åããå ´åï¼ãã®åã ã\textit{total}ã®å¤ãå¼ãã¦ããï¼
+\begin{quote}
+ \texttt{end\_adjust = \{$a_{1}$, $a_{2}$, ..., $a_{n}$\}}
+\end{quote}
+ã§ãã£ãã¨ããï¼å$1\leq i\leq n$ã«å¯¾ãã¦ï¼
+ãè¡æ«ã«$a_{i}$å
¨è§ã ãã®ã«ã¼ã³ã追å ããæã®ï¼\textit{glue\_set}ã®å¤ãã
+$b_{i}$ã¨ããï¼å¼ã§æ¸ãã¨ï¼
+\[
+\catcode`\<=12
+b_{i} = \begin{cases}
+ |\textit{total}-a_{i}\cdot \text{\cs{zw}}|/T^{+}
+ &(\textit{total}-a_{i}\text{\cs{zw}}\geq 0)\\
+ |\textit{total}-a_{i}\cdot \text{\cs{zw}}|/T^{-}
+ &(\textit{total}-a_{i}\text{\cs{zw}}<0)
+\end{cases}.
+\]
+$b_{i}$éã®æå°å¤ãä¸ãããããª$i$ã$j$ã¨ããã¨ã\footnote{%
+ ãã®ãããª$i$ã2ã¤ä»¥ä¸ããã¨ãã¯ï¼$|\textit{total}-a_{i}\cdot \text{\cs{zw}}|$,
+ $|a_{i}|$, $a_i$ã®é ã§æ¯è¼ãã¦ä¸çªå°ãããªããã®ãé¸ã°ããï¼
+}ï¼
+è¡æ«ã«å¤§ãã$a_{j}$ã®ã«ã¼ã³ã追å ããï¼
+\textit{total}ãã$a_{j}$å
¨è§ã®å¤§ããã ãå¼ãã¦ããï¼
\subsection{ã°ã«ã¼ã®èª¿æ´}
-\textit{total}ã®åã ããï¼è¡ä¸ã®ã°ã«ã¼ã®ä¼¸ã³éã«å¿ãã¦è² æ
ããããã¨ã«ãªãï¼
+$|\textit{total}|$ã®åã ããï¼è¡ä¸ã®ã°ã«ã¼ã®ä¼¸ã³éã«å¿ãã¦è² æ
ããããã¨ã«ãªãï¼
+以ä¸ï¼$\textit{total}\geq 0$ã§ããã¨ä»®å®ãã¦è©±ãé²ãããï¼è² ã®ã¨ããåæ§ã§ããï¼
è² æ
ããã°ã«ã¼ã®åªå
度ã¯ä»¥ä¸ã®é ã§ããï¼
ã§ããã ã\Param{kanjiskip}ãèªç¶é·ã®ã¾ã¾ã«ãããã¨ã
試ã¿ã¦ããï¼
@@ -9440,12 +9569,16 @@ return {
[0]=37001, -- <9089 E0100>
991049, -- <9089 E0101>
...
- ["vert"]=995025, -- vertical variant
+ ["vform"]=995025, -- vertical variant
},
...
+ ["unicodes"]={
+ ["aj102.pe.vert"]=984163, -- glyph name to unicode
+ ...
+ }
},
["chksum"]="FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", -- checksum of the fontfile
- ["version"]=2, -- version of the cache
+ ["version"]=11, -- version of the cache
}
\end{lstlisting}
%<*ja>