X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=doc%2Fluatexja.dtx;h=420f35a187aad9eb30e6e3c8dc91db26c6ca5d43;hb=1c4914cffa7e61e692eb09dfa6bcdb5038ee29b5;hp=f00243bc8115e9cec46510605ccf8a545a8d45de;hpb=33e53db5ea8280792f186b791d19afbae2a246aa;p=luatex-ja%2Fluatexja.git
diff --git a/doc/luatexja.dtx b/doc/luatexja.dtx
index f00243b..420f35a 100644
--- a/doc/luatexja.dtx
+++ b/doc/luatexja.dtx
@@ -196,6 +196,15 @@
\def\cs#1{\texttt{\upshape
\texorpdfstring{\textbackslash\hbox{\ltjsetparameter{autoxspacing=false}#1}}{\textbackslash#1}}}
\ltjsetparameter{alxspmode={`\\,allow}}
+\def\text@#1{%
+ \ifnum\mathstyle<\scriptstyle
+ \mbox{#1}
+ \else\ifnum\mathstyle<\scriptscriptstyle
+ \mbox{\let\f@size\sf@size\selectfont#1}
+ \else
+ \mbox{\let\f@size\ssf@size\selectfont#1}
+ \fi\fi
+}
%%%%%%%%
\makeatother
%%%%%%%%
@@ -883,7 +892,7 @@ and finally delete the temporary directory.
%<*en>
\item The following 12~Japanese fonts are preloaded:
\begin{center}\small
-\begin{tabular}{cccccc}
+\begin{tabular}{llllll}
\toprule
\textbf{direction}&
\textbf{classification}&\textbf{font name}&\bfseries ``10\,pt''&\bfseries ``7\,pt''&\bfseries ``5\,pt''\\\midrule
@@ -901,28 +910,30 @@ and finally delete the temporary directory.
%<*ja>
\item 以ä¸ã®12åã®åæãã©ã³ããå®ç¾©ãããï¼
\begin{center}\small
-\begin{tabular}{cccccc}
+\begin{tabular}{llllll}
\toprule
\emph{çµæ¹å}&\emph{åä½}&\emph{ãã©ã³ãå}&\bfseries``10\,pt''&\bfseries``7\,pt''&\bfseries``5\,pt''\\\midrule
-\smash{\raisebox{-1ex}{横çµ}}&
+\smash{\raisebox{-0.7\zh}{横çµ}}&
ææä½&IPAexææ&\cs{tenmin}&\cs{sevenmin}&\cs{fivemin}\\
-&ã´ã·ãã¯ä½&IPAexã´ã·ãã¯&\cs{tengt} &\cs{sevengt} &\cs{fivegt}\\
+&\textgt{ã´ã·ãã¯ä½}&IPAexã´ã·ãã¯&\cs{tengt} &\cs{sevengt} &\cs{fivegt}\\
\midrule
-\smash{\raisebox{-1ex}{縦çµ}}&
+\smash{\raisebox{-0.7\zh}{縦çµ}}&
ææä½&IPAexææ&\cs{tentmin}&\cs{seventmin}&\cs{fivetmin}\\
-&ã´ã·ãã¯ä½&IPAexã´ã·ãã¯&\cs{tentgt} &\cs{seventgt} &\cs{fivetgt}\\
+&\textgt{ã´ã·ãã¯ä½}&IPAexã´ã·ãã¯&\cs{tentgt} &\cs{seventgt} &\cs{fivetgt}\\
\bottomrule
\end{tabular}
\end{center}
%
\begin{itemize}
%<*en>
-\item With \texttt{luatexja.cfg}, one can use other fonts
-as ``default'' Japanese fonts (Subsection~\ref{ssec:cfg}).
+\item The ``default'' Japanese fonts (and~JFMs for them) can be
+ modified by defining \cs{ltj@stdmcfont} etc.\ \emph{before}
+ one inputs \texttt{luatexja.sty} (Subsection~\ref{ssec:cfg}).
%
%<*ja>
-\item \texttt{luatexja.cfg} ãç¨ãããã¨ã«ãã£ã¦ï¼æ¨æºåæãã©ã³ãã
-IPAexãã©ã³ãããå¥ã®ãã©ã³ãã«ç½®ãæãããã¨ãã§ããï¼\ref{ssec:cfg}ç¯ãåç
§ï¼
+\item æ¨æºåæãã©ã³ããJFMãIPAexãã©ã³ãããå¥ã®ãã®ã«ç½®ãæããã«ã¯ï¼
+ \cs{ltj@stdmcfont}çã\texttt{luatexja.sty}èªã¿è¾¼ã¿\emph{å}ã«å®ç¾©ããã°ããï¼
+ \ref{ssec:cfg}ç¯ãåç
§ï¼
%
%<*en>
@@ -1003,7 +1014,7 @@ plfonts.dtx} and \texttt{pldefs.ltx}).
\item
By default, the following fonts are used for these two families.
\begin{center}\small
-\begin{tabular}{ccccc}
+\begin{tabular}{lllll}
\toprule
\textbf{classification}&\textbf{family}&\cs{mdseries}&\cs{bfseries}&\textbf{scale}\\\midrule
\emph{mincho} (ææä½)&\tt mc&IPAex Mincho&IPAex Gothic&0.962216\\
@@ -1018,7 +1029,7 @@ By default, the following fonts are used for these two families.
%<*ja>
\item \pLaTeX ã¨åæ§ã«ï¼æ¨æºã§ã¯ãææä½ããã´ã·ãã¯ä½ãã®2種é¡ãç¨ããï¼
\begin{center}\small
-\begin{tabular}{cllc}
+\begin{tabular}{llll}
\toprule
\emph{åä½}&&&\emph{ãã¡ããªå}\\\midrule
ææä½&\verb+\textmc{...}+&\verb+{\mcfamily ...}+&\cs{mcdefault}\\
@@ -1029,11 +1040,11 @@ By default, the following fonts are used for these two families.
\newpage
\item æ¨æºã§ã¯ï¼æ¬¡ã®ãã©ã³ããç¨ããããï¼
\begin{center}\small
-\begin{tabular}{ccccc}
+\begin{tabular}{lllll}
\toprule
\emph{åä½}&\emph{ãã¡ããª}&\cs{mdseries}&\cs{bfseries}&\emph{ã¹ã±ã¼ã«}\\\midrule
ææä½&\tt mc&IPAexææ&IPAexã´ã·ãã¯&0.962216\\
-ã´ã·ãã¯ä½&\tt gt&IPAexã´ã·ãã¯&IPAexã´ã·ãã¯&0.962216\\
+\textgt{ã´ã·ãã¯ä½}&\tt gt&IPAexã´ã·ãã¯&IPAexã´ã·ãã¯&0.962216\\
\bottomrule
\end{tabular}
\end{center}
@@ -1269,7 +1280,7 @@ For \LaTeXe, \LuaTeX-ja adopted most of the font selection system of \pLaTeXe\ (
%<*en>
\begin{center}\small
-\begin{tabular}{cccccc}
+\begin{tabular}{llllll}
\toprule
&\textbf{encoding}&\textbf{family}&\textbf{series}&\textbf{shape}&\textbf{selection}\\\midrule
alphabetic fonts
@@ -1286,17 +1297,17 @@ auto select&\cs{fontencoding}&\cs{fontfamily}&---&---&\cs{usefont}\\
%
%<*ja>
\begin{center}\small
-\begin{tabular}{cccccc}
+\begin{tabular}{llllll}
\toprule
&\emph{ã¨ã³ã³ã¼ãã£ã³ã°}&\emph{ãã¡ããª}&\emph{ã·ãªã¼ãº}&\emph{ã·ã§ã¼ã}&\emph{é¸æ}\\\midrule
-欧æ
+\emph{欧æ}
&\cs{romanencoding}&\cs{romanfamily}&\cs{romanseries}&\cs{romanshape}
&\cs{useroman}\\
-åæ
+\emph{åæ}
&\cs{kanjiencoding}&\cs{kanjifamily}&\cs{kanjiseries}&\cs{kanjishape}
&\cs{usekanji}\\
-両æ¹&---&--&\cs{fontseries}&\cs{fontshape}&---\\
-èªåé¸æ&\cs{fontencoding}&\cs{fontfamily}&---&---&\cs{usefont}\\
+\emph{両æ¹}&---&--&\cs{fontseries}&\cs{fontshape}&---\\
+\emph{èªåé¸æ}&\cs{fontencoding}&\cs{fontfamily}&---&---&\cs{usefont}\\
\bottomrule
\end{tabular}
\end{center}
@@ -1503,21 +1514,21 @@ alphabetic fonts
\caption{\Pkg{luatexja-fontspec}ã§å®ç¾©ãããå½ä»¤}\label{tab:ltj_fntspc}
\medskip
{\centering\small
-\begin{tabular}{cllll}
+\begin{tabular}{lllll}
\toprule
-åæ
+\emph{åæ}
&\cs{jfontspec}&\cs{setmainjfont}&\cs{setsansjfont}&\cs{setmonojfont}$^*$\\
-欧æ
+\emph{欧æ}
&\cs{fontspec}&\cs{setmainfont}&\cs{setsansfont}&\cs{setmonofont}\\
\midrule
-åæ
+\emph{åæ}
&\cs{newjfontfamily}&\cs{renewjfontfamily}$^{**}$&\cs{setjfontfamily}$^{**}$\\
-欧æ
+\emph{欧æ}
&\cs{newfontfamily}&\cs{renewfontfamily}$^{**}$&\cs{setfontfamily}$^{**}$\\
\midrule
-åæ
+\emph{åæ}
&\cs{newjfontface}&\cs{defaultjfontfeatures}&\cs{addjfontfeatures}\\
-欧æ
+\emph{欧æ}
&\cs{newfontface}&\cs{defaultfontfeatures}&\cs{addfontfeatures}\\
\bottomrule
\end{tabular}\par}
@@ -1645,7 +1656,7 @@ The following presets are defined:
\hyphenchar\font=-1 \exhyphenchar=-1
hiragino-pro, hiragino-pron, ipa, ipa-hg, ipaex, ipaex-hg,
kozuka-pr6, kozuka-pr6n, kozuka-pro, moga-mobo, moga-mobo-ex,
- morisawa-pr6n, morisawa-pro, ms, ms-hg, noembed, noto-otc, noto-otf,
+ bizud, morisawa-pr6n, morisawa-pro, ms, ms-hg, noembed, noto-otc, noto-otf,
sourcehan, sourcehan-jp, ume, yu-osx, yu-win, yu-win10
\end{quote}
@@ -1703,60 +1714,6 @@ as an external package \Pkg{luatexja-otf}.
\ref{ssec:fontspec}ç¯ (\Pkg{fontspec}) ã®æ¹æ³ã§æåã§æå®ããå¿
è¦ãããï¼
%
-%\subsection{Changing default Japanese fonts}
-%\subsection{æ¨æºåæãã©ã³ãã®å¤æ´}
-\label{ssec:cfg}
-%<*en>
-If \texttt{luatexja.cfg} can be seen from \LuaTeX, \LuaTeX-ja automatically reads it.
-The main use of \texttt{luatexja.cfg} is for changing default Japanese fonts,
-when IPAex fonts cannot be installed in \TeX~system.
-One should not overuse this \texttt{luatexja.cfg}; fonts which will be used in
-a document should be specified in its source.
-
-For example,
-\begin{lstlisting}
-\def\ltj@stdmcfont{IPAMincho}
-\def\ltj@stdgtfont{IPAGothic}
-\end{lstlisting}
-makes that IPA~Mincho and IPA~Gothic will be used as default Japanese fonts, instead of
-IPAex~Mincho and IPAex~Gothic.
-
-For another example, the following two lines makes that
-non-embedded fonts Ryumin-Light~and~GothicBBB-Medium as default Japanese fonts
-(as the earlier version of \LuaTeX-ja):
-\begin{lstlisting}
-\def\ltj@stdmcfont{psft:Ryumin-Light}
-\def\ltj@stdgtfont{psft:GothicBBB-Medium}
-\end{lstlisting}
-%
-%<*ja>
-\LuaTeX ããè¦ããä½ç½®ã« \texttt{luatexja.cfg} ãããã°ï¼\LuaTeX-jaã¯ãããèªã¿è¾¼ãï¼
-ãã®ãã¡ã¤ã«ãç¨ããã¨plain~\TeX, \LaTeXe ã«ãããæ¨æºåæãã©ã³ãã
-IPAexææã»IPAexã´ã·ãã¯ããå¤æ´ãããã¨ãã§ããï¼
-ãããï¼åºæ¬çã«ã¯\emph{æç« ä¸ã§ç¨ãããã©ã³ãã¯ï¼ä¾ãã° \Pkg{luatexja-preset} ãªã©ã§ï¼
-ææ¸ã½ã¼ã¹å
ã§æå®ããã¹ã}ã§ããï¼ãã® \texttt{luatexja.cfg} ã¯ï¼
-ãIPAexãã©ã³ããã¤ã³ã¹ãã¼ã«ã§ããªãããªã©ï¼IPAexãã©ã³ãã使ç¨ã§ããªãå ´åã«ã®ã¿
-å¿æ¥å¦ç½®çã«ç¨ããã¹ãã§ããï¼
-
-ä¾ãã°
-\begin{lstlisting}
-\def\ltj@stdmcfont{IPAMincho}
-\def\ltj@stdgtfont{IPAGothic}
-\end{lstlisting}
-ã¨è¨è¿°ãã¦ããã°ï¼æ¨æºåæãã©ã³ããIPAææã»IPAã´ã·ãã¯ã¸ã¨å¤
-æ´ãããï¼
-
-
-ãªãï¼20140906.0以åã®ãã¼ã¸ã§ã³ã®ããã«ï¼
-Ryumin-Light, GothicBBB-Mediumã¨ããååã®éåè¾¼ãã©ã³ããç¨ããå ´åã¯
-\begin{lstlisting}
-\def\ltj@stdmcfont{psft:Ryumin-Light}
-\def\ltj@stdgtfont{psft:GothicBBB-Medium}
-\end{lstlisting}
-ã¨è¨è¿°ããã°ããï¼
-%
-
-
%\section{Changing Internal Parameters}
%\section{ãã©ã¡ã¼ã¿ã®å¤æ´}
@@ -1861,8 +1818,8 @@ determined from the following data:
ãããã¯ä»¥ä¸ã®ãã¼ã¿ã«åºã¥ãã¦æ±ºå®ãã¦ããï¼
%
\begin{itemize}
-%\item Blocks in Unicode~6.0.
-%\item Unicode~6.0ã®ãããã¯ï¼
+%\item Blocks in Unicode~11.0.
+%\item Unicode~11.0ã®ãããã¯ï¼
%\item The \texttt{Adobe-Japan1-UCS2} mapping between a CID Adobe-Japan1-6 and Unicode.
%\item Adobe-Japan1-6ã®CIDã¨Unicodeã®éã®å¯¾å¿è¡¨\texttt{Adobe-Japan1-UCS2}ï¼
%\item The \Pkg{PXbase} bundle for \upTeX\ by Takayuki Yato.
@@ -1962,7 +1919,7 @@ This range consists of the following Unicode ranges, \emph{except characters in
%\caption{æåç¯å²3ã«æå®ããã¦ããUnicodeãããã¯ï¼}
\label{tab:rng3}
\catcode`\"=13\def"#1#2#3#4{\texttt{U+#1#2#3#4}}%"
-\centering\small
+\centering\footnotesize
\begin{tabular}{llll}
"2000--"206F&General Punctuation&
"2070--"209F&Superscripts and Subscripts\\
@@ -1980,8 +1937,8 @@ This range consists of the following Unicode ranges, \emph{except characters in
"2600--"26FF&Miscellaneous Symbols\\
"2700--"27BF&Dingbats&
"2900--"297F&Supplemental Arrows-B\\
-"2980--"29FF&Misc.\ Mathematical Symbols-B&
-"2B00--"2BFF&Miscellaneous Symbols and Arrows
+"2980--"29FF&Misc.\ Math Symbols-B&
+"2B00--"2BFF&Misc.\ Symbols and Arrows
\end{tabular}
\end{table}
%<*en>
@@ -1999,8 +1956,10 @@ This range consists of the following Unicode ranges, \emph{except characters in
\begin{lstlisting}
\ltjdefcharrange{4}{%
"500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF,
- "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A82F, "A840-"ABFF, "FB00-"FE0F,
- "FE20-"FE2F, "FE70-"FEFF, "10000-"1FFFF, "E000-"F8FF} % non-Japanese
+ "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A95F, "A980-"ABFF, "E000-"F8FF,
+ "FB00-"FE0F, "FE20-"FE2F, "FE70-"FEFF, "10000-"1AFFF, "1B170-"1F0FF,
+ "1F300-"1FFFF
+} % non-Japanese
\end{lstlisting}
%\item[Range~5${}^{\text{A}}$] Surrogates and Supplementary Private Use Areas.
%\item[ç¯å²5${}^{\text{A}}$] 代ç¨ç¬¦å·ã¨è£å©ç§ç¨é åï¼
@@ -2011,7 +1970,7 @@ This range consists of the following Unicode ranges, \emph{except characters in
%\caption{æåç¯å²6ã«æå®ããã¦ããUnicodeãããã¯ï¼}
\label{tab:rng6}
\catcode`\"=13\def"#1#2#3#4{\texttt{U+#1#2#3#4}}%"
-\centering\small
+\centering\footnotesize
\begin{tabular}{llll}
"2460--"24FF&Enclosed Alphanumerics&
"2E80--"2EFF&CJK Radicals Supplement\\
@@ -2022,14 +1981,20 @@ This range consists of the following Unicode ranges, \emph{except characters in
"31F0--"31FF&Katakana Phonetic Extensions&
"3200--"32FF&Enclosed CJK Letters and Months\\
"3300--"33FF&CJK Compatibility&
-"3400--"4DBF&CJK Unified Ideographs Extension A\\
+"3400--"4DBF&CJK Unified Ideographs Ext-A\\
"4E00--"9FFF&CJK Unified Ideographs&
"F900--"FAFF&CJK Compatibility Ideographs\\
"FE10--"FE1F&Vertical Forms&
"FE30--"FE4F&CJK Compatibility Forms\\
"FE50--"FE6F&Small Form Variants&
-"{20}000--"{2F}FFF&(Supplementary Ideographic Plane)\\
-"{E0}100--"{E0}1EF&Variation Selectors Supplement
+"FF00--"FFEF&Halfwidth and Fullwidth Forms\\
+"{1B}000--"{1B}0FF&Kana Supplement&
+"{1B}100--"{1B}12F&Kana Extended-A\\
+%"{1B}130--"{1B}16F&Small Kana Extension
+"{1F}100--"{1F}1FF&Enclosed Alphanumeric Supp.&
+"{1F}200--"{1F}2FF&Enclosed Ideographic Supp.\\
+"{20}000--"{2F}FFF&(Supp. Ideographic Plane)&
+"{E0}100--"{E0}1EF&Variation Selectors Supp.
\end{tabular}
\end{table}
%<*en>
@@ -2057,7 +2022,7 @@ The block list is indicated in \autoref{tab:rng7}.
"31C0--"31EF&CJK Strokes&
"A000--"A48F&Yi Syllables\\
"A490--"A4CF&Yi Radicals&
-"A830--"A83F&Common Indic Number Forms\\
+"A960--"A97F&Hangul Jamo Extended-A\\
"AC00--"D7AF&Hangul Syllables&
"D7B0--"D7FF&Hangul Jamo Extended-B
\end{tabular}
@@ -2502,7 +2467,7 @@ For the detail, see \autoref{tab:kcat}.
%\medskip
\noindent\hfill
-\begin{tabular}{ccccc}
+\begin{tabular}{llccc}
\toprule
\bfseries \cs{kcatcode}&
%<*en>
@@ -2666,8 +2631,8 @@ for \LuaTeX, \emph{to match the \cs{catcode} setting with that of \XeTeX.}
{\large\char"#1#2#3#4}}\ (\texttt{U+#1#2#3#4})} %"
\leavevmode\hbox to 0pt{\hss\begin{tabular}{cccccc}
\toprule
-%&\bf row&\bf col.&\bf \pTeX&\bf \upTeX&\bf\LuaTeX-ja\\
-%&\bf åº&\bf ç¹&\bf \pTeX&\bf \upTeX&\fontseries{b}\selectfont\LuaTeX-ja\\
+%&\textbf{row}&\textbf{col.}&\textbf{\pTeX}&\textbf{\upTeX}&\textbf{\LuaTeX-ja}\\
+%&\emph{åº}&\emph{ç¹}&\emph{\pTeX}&\emph{\upTeX}&\emph{\LuaTeX-ja}\\
\midrule
%\D 3000&1&1&N&N&Y\\
\D 30FB&1&6&N&Y&N\\
@@ -2693,8 +2658,8 @@ for \LuaTeX, \emph{to match the \cs{catcode} setting with that of \XeTeX.}
\end{tabular}\qquad
\begin{tabular}{cccccc}
\toprule
-%&\bf row&\bf col.&\bf \pTeX&\bf \upTeX&\bf\LuaTeX-ja\\
-%&\bf åº&\bf ç¹&\bf \pTeX&\bf \upTeX&\fontseries{b}\selectfont\LuaTeX-ja\\
+%&\textbf{row}&\textbf{col.}&\textbf{\pTeX}&\textbf{\upTeX}&\textbf{\LuaTeX-ja}\\
+%&\emph{åº}&\emph{ç¹}&\emph{\pTeX}&\emph{\upTeX}&\emph{\LuaTeX-ja}\\
\midrule
\D FF5C&1&35&N&N&Y\\
\D FF0B&1&60&N&N&Y\\
@@ -3815,6 +3780,77 @@ A font defined by~\cs{tfont} differs the following points from that by~\cs{jfont
ãã»ç¸¦çµç¨åæãã©ã³ãã®å®ç¾©ãå¯è½ã§ãã£ããï¼\LuaTeX-jaã§ã¯ããã§ãªãã®ã§æ³¨æï¼
%
+%\subsection{Default Japanese fonts and JFMs}
+%\subsection{æ¨æºåæãã©ã³ãã»JFMã®å¤æ´}
+\label{ssec:cfg}
+%<*en>
+If following commands are defined at loading \LuaTeX-ja package, these change
+default Japanese fonts and JFMs for them:
+%
+%<*ja>
+\LuaTeX-jaãèªã¿è¾¼ã¾ããåã«ä»¥ä¸ã®å½ä»¤ãå®ç¾©ããã¦ããå ´åã¯ï¼
+ããããæ¨æºåæãã©ã³ãããããã«ç¨ããJFMã¨ãã¦ä½¿ãããï¼
+%
+
+\begin{cslist}[style=standard]
+ \item[\cs{ltj@stdmcfont}]
+%The default Japanese font for the mincho family.
+%ææä½ã¨ãã¦ç¨ãããã©ã³ãï¼
+ \item[\cs{ltj@stdgtfont}]
+%The default Japanese font for the gothic family.
+%ã´ã·ãã¯ä½ã¨ãã¦ç¨ãããã©ã³ãï¼
+ \item[\cs{ltj@stdyokojfm}]
+%The default JFM for horizontal direction.
+%æ¨æºã§ç¨ãã横çµç¨JFMï¼
+ \item[\cs{ltj@stdyokojfm}]
+%The default JFM for vertical direction.
+%æ¨æºã§ç¨ãã縦çµç¨JFMï¼
+\end{cslist}
+
+%<*en>
+For example,
+\begin{lstlisting}
+\def\ltj@stdmcfont{IPAMincho}
+\def\ltj@stdgtfont{IPAGothic}
+\end{lstlisting}
+makes that IPA~Mincho and IPA~Gothic will be used as default Japanese fonts, instead of
+IPAex~Mincho and IPAex~Gothic.
+
+This feature is intended for classes which use special JFMs
+\footnote{This is because commands has \texttt{@} in their names.}.
+It is recommended to use \cs{luatexja-preset}~or~\cs{luatexja-fontspec} package
+to select standard fonts in ordinary \LaTeX\ sources.
+%
+%<*ja>
+ä¾ãã°
+\begin{lstlisting}
+\def\ltj@stdmcfont{IPAMincho}
+\def\ltj@stdgtfont{IPAGothic}
+\end{lstlisting}
+ã¨è¨è¿°ãã¦ããã°ï¼æ¨æºåæãã©ã³ããIPAææã»IPAã´ã·ãã¯ã¸ã¨å¤
+æ´ãããï¼
+
+ãã®æ©è½ã¯ï¼ç¹å¥ã®JFMãç¨ããã¯ã©ã¹
+\footnote{ä¾ãã°é¿é¨ç´è¡æ°ã«ããjlreqãããã«ãããï¼}%
+ãªã©ã§ã®ä½¿ç¨ãæå³ãã¦ããï¼å½ä»¤åã«\texttt{@}ãå«ã¾ãããã¨ãã
+é常ã®\TeX/\LaTeX ææ¸ã§ã®ä½¿ç¨ã¯æå³ãã¦ããªãï¼
+é常ã®\LaTeX ææ¸ã§ã¯\Pkg{luatexja-preset}ã\Pkg{luatexja-fontspec}ãªã©ã§
+使ç¨ãã©ã³ããé¸æãããã¨ãæ¨å¥¨ããï¼
+%
+
+%<*en>
+For compatibility with earlier versions,
+\LuaTeX-ja reads \texttt{luatexja.cfg} automatically if it is found by \LuaTeX.
+One should not overuse this \texttt{luatexja.cfg}; it will overwrite
+the definition of \cs{ltj@stdmcfont} and others.
+%
+%<*ja>
+æ§ãã¼ã¸ã§ã³ã¨ã®äºææ§ã®ããï¼
+\LuaTeX ããè¦ããä½ç½®ã«\texttt{luatexja.cfg}ãããã°ï¼\LuaTeX-jaã¯ãããèªã¿è¾¼ãï¼
+ãããï¼\texttt{luatexja.cfg}å
ã§\cs{ltj@stdmcfont}çãå®ç¾©ããã¦ããå ´åã¯ãã¡ãã
+åªå
ãããã®ã§ï¼ãã¯ã\texttt{luatexja.cfg}ã¯ä½¿ããªãã»ããè¯ãã ããï¼
+%
+
%\subsection{Prefix \texttt{psft}}
%\subsection{\texttt{psft}ããªãã£ãã¯ã¹}
\label{ssec:psft}
@@ -3858,22 +3894,22 @@ Identity-Hã¨ãªãï¼PDFã®æ¨æºè¦æ ¼ISO32000-1:2008~(\cite{pdfstd})ã«éæº
%<*en>
The default font defined by using \texttt{psft:} prefix is for Japanese typesetting;
-it is Adobe-Japan1-6 CID-keyed font.
+it is Adobe-Japan1-7 CID-keyed font.
One can specify \texttt{cid} key to use other CID-keyed non-embedded fonts
for Chinese or Korean typesetting.
%
%<*ja>
æ¨æºã§\texttt{psft:}ããªãã£ãã¯ã¹ã§å®ç¾©ããããã©ã³ãã¯æ¥æ¬èªç¨ã®ãã®ã§
-ããï¼Adobe-Japan1-6ã®CIDã«å¯¾å¿ãããã®ã¨ãªãï¼ãããï¼\LuaTeX-jaã¯ä¸å½èª
+ããï¼Adobe-Japan1-7ã®CIDã«å¯¾å¿ãããã®ã¨ãªãï¼ãããï¼\LuaTeX-jaã¯ä¸å½èª
ã®çµçã«ãå¨åãçºæ®ãããã¨ãåããï¼æ¥æ¬èªãã©ã³ãã§ãªãéåè¾¼ãã©ã³ã
ã®å¯¾å¿ãå¿
è¦ã¨ãªã£ãï¼ãã®ããã«è¿½å ãããã®ã\texttt{cid}ãã¼ã§ããï¼
\texttt{cid}ãã¼ã«å¤ãæå®ããã¨ï¼ãã®CIDãæã£ãéåè¾¼ãã©ã³ããå®ç¾©ãããã¨ãã§ããï¼
%
\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-6;jfm=jis} % Traditional Chinese
+\jfont\testJ={psft:Ryumin-Light:cid=Adobe-Japan1-7;jfm=jis} % Japanese
+\jfont\testD={psft:Ryumin-Light:jfm=jis} % default value is Adobe-Japan1-7
+\jfont\testC={psft:AdobeMingStd-Light:cid=Adobe-CNS1-7;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}
@@ -5060,8 +5096,6 @@ Then, the position of glyphs is shifted up by
\]
\end{description}
-
-
%\section{Parameters}
%\section{ãã©ã¡ã¼ã¿}
\subsection{\cs{ltjsetparameter}}
@@ -6834,13 +6868,14 @@ commands:
\item[\cs{CID}\{\}]
%<*en>
Typeset a glyph whose CID number is .
-If the Japanese font is neither Adobe-Japan1,~Adobe-GB1, Adobe-CNS1,~nor~Adobe-Korea1 CID-keyed font,
+If the Japanese font is neither Adobe-Japan1,~Adobe-GB1, Adobe-CNS1,
+Adobe-Korea1,~nor~Adobe-KR CID-keyed font,
\LuaTeX-ja treats that is a CID number of Adobe-Japan1 character collection,
and tries to typeset a ``most suitable glyph''.
%
%<*ja>
CIDçªå·ãã®æåãåºåããï¼
-ããç¾å¨ã®åæãã©ã³ããAdobe-Japan1,~Adobe-GB1, Adobe-CNS1,~Adobe-Korea1ã®
+ããç¾å¨ã®åæãã©ã³ããAdobe-Japan1,~Adobe-GB1, Adobe-CNS1, Adobe-Korea1,~Adobe-KRã®
ãããã®CID-keyed fontã§ããªãå ´åï¼ã¯Adobe-Japan1ã®CIDçªå·ã§ããã¨è§£éã
ãé©åãªã°ãªãã\footnote{%
ä¾ãã°ãã©ã³ãã«IVDã³ã¬ã¯ã·ã§ã³Adobe-Japan1ãå«ã¾ãã¦ããã°ï¼ãã®æ
å ±ãç¨ãã¦
@@ -7770,13 +7805,13 @@ We didn't taken account of when more than one options among them are specified.
\label{sssec:ltjpreset-multi}
%<*en>
-Besides \texttt{morisawa-pro}~and~\texttt{morisawa-pr6n} presets,
+Besides \texttt{bizud}, \texttt{morisawa-pro},~and~\texttt{morisawa-pr6n} presets,
fonts are specified by font name, not by file name.
In following tables, starred fonts (e.g.~KozGo\dots-Regular) are used for medium series of \textit{gothic},
\emph{if and only if \texttt{deluxe} option is specified}.
%
%<*ja>
-\texttt{morisawa-pro}, \texttt{morisawa-pr6n}以å¤ã¯ãã©ã³ãã®æå®ã¯
+\texttt{bizud}, \texttt{morisawa-pro}, \texttt{morisawa-pr6n}以å¤ã¯ãã©ã³ãã®æå®ã¯
ï¼ãã¡ã¤ã«åã§ãªãï¼ãã©ã³ãåã§è¡ãããï¼
以ä¸ã®è¡¨ã«ããã¦ï¼*\,ã¤ãã®ãã©ã³ã(e.g.,~KozGo\dots-Regular)ã¯ï¼\emph{\texttt{deluxe}ãªãã·ã§ã³æå®æã«}
ã´ã·ãã¯ä½ä¸åã¨ãã¦ç¨ãããããã®ã示ãã¦ããï¼
@@ -7823,7 +7858,6 @@ There is not rounded gothic family in Kozuka fonts.
\end{tabular}
\end{center}
-%\newpage
\item[hiragino-pro] Hiragino Pro (Adobe-Japan1-5) fonts.
% \\*[-\dimexpr\medskipamount+\baselineskip\relax]
\item[hiragino-pron] Hiragino ProN (Adobe-Japan1-5, JIS04-savvy) fonts.
@@ -7870,6 +7904,34 @@ Std/StdNãã©ã³ãã§ããï¼ãã®ä»ã¯Adobe-Japan1-5対å¿ã§ããï¼
\end{tabular}
\end{center}
+%\newpage
+\item[bizud] BIZ UD fonts (by Morisawa Inc.) bundled with
+ Windows~10 October 2018 Update.
+\begin{center}\small
+\begin{tabular}{ll>{\ttfamily}l}
+\toprule
+\textbf{family}&\textbf{series}\\
+\midrule
+%\textit{mincho}
+%\textgt{ææ}%
+ &&BIZ-UDMinchoM.ttc\\
+\midrule
+ &medium&BIZ-UDGothicR.ttc\\
+\cmidrule(l){2-3}
+%\textit{gothic}%
+%\gt ã´ã·ãã¯
+ &bold&BIZ-UDGothicB.ttc\\
+ &extra bold&BIZ-UDGothicB.ttc\\
+\midrule
+%\textit{rounded gothic}
+%\gt 丸ã´ã·ãã¯
+&&BIZ-UDGothicB.ttc\\
+\bottomrule
+\end{tabular}
+\end{center}
+
+%\newpage
+
\item[morisawa-pro] Morisawa Pro (Adobe-Japan1-4) fonts.
% \\*[-\dimexpr\medskipamount+\baselineskip\relax]
\item[morisawa-pr6n] Morisawa Pr6N (Adobe-Japan1-6, JIS04-savvy) fonts.
@@ -7988,6 +8050,7 @@ Std/StdNãã©ã³ãã§ããï¼ãã®ä»ã¯Adobe-Japan1-5対å¿ã§ããï¼
\end{tabular}
\end{center}
+%\newpage
\item[sourcehan] Source Han Serif and Source Han Sans fonts (Language-specific OTF \textit{or} OTC)
% \\*[-\dimexpr\medskipamount+\baselineskip\relax]
\item[sourcehan-jp] Source Han Serif JP and Source Han Sans JP fonts (Region-specific Subset OTF)
@@ -10274,19 +10337,37 @@ For illustration, we introduce following classes of characters:
ç´åãåææåã§ãããã示ããã©ã° \verb+\lst@ifkanji+ ãæ°ãã«å°å
¥ããï¼
以éï¼èª¬æã®ããã«ä»¥ä¸ã®ããã«æåãåé¡ããï¼
%
+%<*ja>
\begin{center}
\small
-\begin{tabular}{lccccc}
+\begin{tabular}{llllll}
\toprule
-&Letter&Other&Kanji&Open&Close\\\midrule
+&\emph{Letter}&\emph{Other}&\emph{Kanji}&\emph{Open}&\emph{Close}\\\midrule
\verb+\lst@ifletter+&T&F&T&F&T\\
\verb+\lst@ifkanji+&F&F&T&T&F\\
-%Meaning&char in an identifier&other alphabet&%
-%most of Japanese char&opening brackets&closing brackets\\
-%æå³&èå¥åä¸ã®æå&ãã®ä»æ¬§ææå&æ®ã©ã®åææå&éãæ¬å¼§é¡&éãæ¬å¼§é¡\\
+\emph{æå³}&èå¥åä¸ã®æå&ãã®ä»æ¬§ææå&æ®ã©ã®åææå&éãæ¬å¼§é¡&éãæ¬å¼§é¡\\
\bottomrule
\end{tabular}
\end{center}
+%
+%<*en>
+\begin{center}
+\small
+\begin{tabular}{llll}
+\toprule
+&\textbf{Letter}&\textbf{Other}&\\\midrule
+\verb+\lst@ifletter+&T&F&\\
+\verb+\lst@ifkanji+&F&F&\\
+\textbf{Meaning}&char in an identifier&other alphabet&\\
+ \midrule
+&\textbf{Kanji}&\textbf{Open}&\textbf{Close}\\\midrule
+\verb+\lst@ifletter+&T&F&T\\
+\verb+\lst@ifkanji+&T&T&F\\
+\textbf{Meaning}&most of Japanese char&opening brackets&closing brackets\\
+\bottomrule
+\end{tabular}
+\end{center}
+%
%<*en>
Note that \textit{digits} in the \Pkg{listings} package can be Letter or
Other according to circumstances.
@@ -10318,27 +10399,27 @@ The following table summarizes $5\times 5=25$ cases:
%
\begin{center}
\small
-\begin{tabular}{llccccc}
+\begin{tabular}{lllllll}
\toprule
%<*en>
-&&\multicolumn{4}{c}{Next}\\\cmidrule(lr){3-7}
-&&\hbox to 4em{\hss Letter\hss}&\hbox to 4em{\hss Other\hss}
-&\hbox to 4em{\hss Kanji\hss}&\hbox to 4em{\hss Open\hss}&Close\\\midrule
+&&\multicolumn{4}{c}{\textbf{Next}}\\\cmidrule(lr){3-7}
+&&\hbox to 4em{Letter\hss}&\hbox to 4em{Other\hss}
+&\hbox to 4em{Kanji\hss}&\hbox to 4em{Open\hss}&Close\\\midrule
&Letter&collects&\multicolumn{3}{c}{\hrulefill \ outputs\ \hrulefill}&collects\\
&Other&outputs&collects&\multicolumn{2}{c}{\hrulefill \ outputs\ \hrulefill}&collects\\
-Prev&Kanji&\multicolumn{4}{c}{\hrulefill \ outputs\ \hrulefill}&collects\\
+\textbf{Prev}&Kanji&\multicolumn{4}{c}{\hrulefill \ outputs\ \hrulefill}&collects\\
&Open&\multicolumn{5}{c}{\hrulefill \ collects\ \hrulefill}\\
&Close&\multicolumn{4}{c}{\hrulefill \ outputs\ \hrulefill}&collects\\
%
%<*ja>
-&&\multicolumn{4}{c}{å¾ãå´ã®æå}\\\cmidrule(lr){3-7}
-&&\hbox to 4em{\hss Letter\hss}&\hbox to 4em{\hss Other\hss}
-&\hbox to 4em{\hss Kanji\hss}&\hbox to 4em{\hss Open\hss}&Close\\\midrule
-ç´&Letter&åé&\multicolumn{3}{c}{\hrulefill \ åºå\ \hrulefill}&åé\\
-å&Other&åºå&åé&\multicolumn{2}{c}{\hrulefill \ åºå\ \hrulefill}&åé\\
-æ&Kanji&\multicolumn{4}{c}{\hrulefill \ åºå\ \hrulefill}&åé\\
-å&Open&\multicolumn{5}{c}{\hrulefill \ åé\ \hrulefill}\\
-種&Close&\multicolumn{4}{c}{\hrulefill \ åºå\ \hrulefill}&åé\\
+&&\multicolumn{4}{c}{\textbf{å¾å´æå種}}\\\cmidrule(lr){3-7}
+&&\hbox to 4em{Letter\hss}&\hbox to 4em{Other\hss}
+&\hbox to 4em{Kanji\hss}&\hbox to 4em{Open\hss}&Close\\\midrule
+\emph{ç´}&Letter&åé&\multicolumn{3}{c}{\hrulefill \ åºå\ \hrulefill}&åé\\
+\emph{å}&Other&åºå&åé&\multicolumn{2}{c}{\hrulefill \ åºå\ \hrulefill}&åé\\
+\emph{æ}&Kanji&\multicolumn{4}{c}{\hrulefill \ åºå\ \hrulefill}&åé\\
+\emph{å}&Open&\multicolumn{5}{c}{\hrulefill \ åé\ \hrulefill}\\
+\emph{種}&Close&\multicolumn{4}{c}{\hrulefill \ åºå\ \hrulefill}&åé\\
%
\bottomrule
\end{tabular}
@@ -10736,6 +10817,7 @@ The following is the structure of the that table.
\midrule
Adobe-Japan1-*<j-cid-auto-adobe-japan1.lua&UniJIS2004-UTF32-*&Adobe-Japan1-UCS2\\
Adobe-Korea1-*<j-cid-auto-adobe-korea1.lua&UniKS-UTF32-*&Adobe-Korea1-UCS2\\
+Adobe-KR-*<j-cid-auto-adobe-kr.lua&UniAKR-UTF32-*&Adobe-KR-UCS2\\
Adobe-GB1-*<j-cid-auto-adobe-gb1.lua&UniGB-UTF32-*&Adobe-GB1-UCS2\\
Adobe-CNS1-*<j-cid-auto-adobe-cns1.lua&UniCNS-UTF32-*&Adobe-CNS1-UCS2\\
\bottomrule