diff options
| -rw-r--r-- | Master/texmf-dist/doc/luatex/luatexja/README | 8 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf | bin | 469986 -> 471996 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf | bin | 854139 -> 854904 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx | 142 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty | 122 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua | 21 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua | 18 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua | 8 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty | 21 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltj-unicode-ccfix.lua | 49 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/luatexja.sty | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty | 45 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty | 15 |
13 files changed, 293 insertions, 158 deletions
diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README index 720756d0793..1ff6d7be542 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/README +++ b/Master/texmf-dist/doc/luatex/luatexja/README @@ -1,4 +1,4 @@ -The LuaTeX-ja Package 20190128.0 +The LuaTeX-ja Package 20190225.0 -------------------------------- Copyright (c) 2011--2019 The LuaTeX-ja project License: modified BSD (see COPYING) @@ -40,9 +40,9 @@ Installation 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20190128.0 in the Git repository by + or tagged as 20190225.0 in the Git repository by <http://git.osdn.jp/view?p=luatex-ja/luatexja.git - ;a=snapshot;h=refs/tags/20190128.0;sf=tgz> + ;a=snapshot;h=refs/tags/20190225.0;sf=tgz> b. Extract the archive and process following three files by LuaLaTeX to generate classes for Japanese typesetting: @@ -87,4 +87,4 @@ Notes * src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use. -Last commit date: Mon Jan 28 17:51:48 2019 +0900 +Last commit date: Mon Feb 25 19:41:42 2019 +0900 diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf Binary files differindex 6563638364f..94327a49edf 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf Binary files differindex d41522d100d..fa703cbe715 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx index 1d7748dbb7a..f32190fedc8 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx @@ -892,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 @@ -910,16 +910,16 @@ 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} @@ -1014,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\\ @@ -1029,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}\\ @@ -1040,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} @@ -1280,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 @@ -1297,17 +1297,17 @@ auto select&\cs{fontencoding}&\cs{fontfamily}&---&---&\cs{usefont}\\ %</en> %<*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} @@ -1514,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} @@ -1818,8 +1818,8 @@ determined from the following data: これらは以下のデータに基づいて決定している． %</ja> \begin{itemize} -%<en>\item Blocks in Unicode~6.0. -%<ja>\item Unicode~6.0のブロック． +%<en>\item Blocks in Unicode~11.0. +%<ja>\item Unicode~11.0のブロック． %<en>\item The \texttt{Adobe-Japan1-UCS2} mapping between a CID Adobe-Japan1-6 and Unicode. %<ja>\item Adobe-Japan1-6のCIDとUnicodeの間の対応表\texttt{Adobe-Japan1-UCS2}． %<en>\item The \Pkg{PXbase} bundle for \upTeX\ by Takayuki Yato. @@ -1919,7 +1919,7 @@ This range consists of the following Unicode ranges, \emph{except characters in %<ja>\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\\ @@ -1937,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> @@ -1956,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} %<en>\item[Range~5${}^{\text{A}}$] Surrogates and Supplementary Private Use Areas. %<ja>\item[範囲5${}^{\text{A}}$] 代用符号と補助私用領域． @@ -1968,7 +1970,7 @@ This range consists of the following Unicode ranges, \emph{except characters in %<ja>\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\\ @@ -1979,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> @@ -2014,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} @@ -2459,7 +2467,7 @@ For the detail, see \autoref{tab:kcat}. %<en>\medskip \noindent\hfill -\begin{tabular}{ccccc} +\begin{tabular}{llccc} \toprule \bfseries \cs{kcatcode}& %<*en> @@ -2623,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 -%<en>&\bf row&\bf col.&\bf \pTeX&\bf \upTeX&\bf\LuaTeX-ja\\ -%<ja>&\bf 区&\bf 点&\bf \pTeX&\bf \upTeX&\fontseries{b}\selectfont\LuaTeX-ja\\ +%<en>&\textbf{row}&\textbf{col.}&\textbf{\pTeX}&\textbf{\upTeX}&\textbf{\LuaTeX-ja}\\ +%<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\\ @@ -2650,8 +2658,8 @@ for \LuaTeX, \emph{to match the \cs{catcode} setting with that of \XeTeX.} \end{tabular}\qquad \begin{tabular}{cccccc} \toprule -%<en>&\bf row&\bf col.&\bf \pTeX&\bf \upTeX&\bf\LuaTeX-ja\\ -%<ja>&\bf 区&\bf 点&\bf \pTeX&\bf \upTeX&\fontseries{b}\selectfont\LuaTeX-ja\\ +%<en>&\textbf{row}&\textbf{col.}&\textbf{\pTeX}&\textbf{\upTeX}&\textbf{\LuaTeX-ja}\\ +%<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\\ @@ -10300,19 +10308,37 @@ For illustration, we introduce following classes of characters: 直前が和文文字であるかを示すフラグ \verb+\lst@ifkanji+ を新たに導入した． 以降，説明のために以下のように文字を分類する： %</ja> +%<*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\\ -%<en>Meaning&char in an identifier&other alphabet&% -%<en>most of Japanese char&opening brackets&closing brackets\\ -%<ja>意図&識別子中の文字&その他欧文文字&殆どの和文文字&開き括弧類&閉じ括弧類\\ +\emph{意図}&識別子中の文字&その他欧文文字&殆どの和文文字&開き括弧類&閉じ括弧類\\ \bottomrule \end{tabular} \end{center} +%</ja> +%<*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> %<*en> Note that \textit{digits} in the \Pkg{listings} package can be Letter or Other according to circumstances. @@ -10344,27 +10370,27 @@ The following table summarizes $5\times 5=25$ cases: %</ja> \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\\ %</en> %<*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}&収集\\ %</ja> \bottomrule \end{tabular} diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty index e3054d3e504..4b81aed1bd3 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty @@ -1,5 +1,5 @@ % luatexja-preset.sty -\ProvidesPackage{luatexja-preset}[2019/01/28 Japanese font presets] +\ProvidesPackage{luatexja-preset}[2019/02/25 Japanese font presets] \RequirePackage{expl3,l3keys2e} \RequirePackage{luatexja} @@ -112,21 +112,20 @@ gt .groups:n = { preset }, gt .value_required:n = true, gt-m .groups:n = { preset }, gt-m .value_required:n = true, } -\cs_set:Nn \g__ltjpreset_tmp_cs:n { +\cs_set:Nn \ltjpreset_define_preset_prop:n { \keys_define:nn { luatexja-preset } { #1 .code:n = \prop_put:Non \g__ltjpreset_font_prop { #1 } { ##1 }, #1 .groups:n = { preset }, #1 .value_required:n = true, } } -\g__ltjpreset_tmp_cs:n { mc-l } -\g__ltjpreset_tmp_cs:n { mc-m } -\g__ltjpreset_tmp_cs:n { mc-bx } -\g__ltjpreset_tmp_cs:n { gt-u } -\g__ltjpreset_tmp_cs:n { gt-d } -\g__ltjpreset_tmp_cs:n { gt-bx } -\g__ltjpreset_tmp_cs:n { gt-eb} -\g__ltjpreset_tmp_cs:n { mg-m } -\cs_undefine:N \g__ltjpreset_tmp_cs:n +\ltjpreset_define_preset_prop:n { mc-l } +\ltjpreset_define_preset_prop:n { mc-m } +\ltjpreset_define_preset_prop:n { mc-bx } +\ltjpreset_define_preset_prop:n { gt-u } +\ltjpreset_define_preset_prop:n { gt-d } +\ltjpreset_define_preset_prop:n { gt-bx } +\ltjpreset_define_preset_prop:n { gt-eb} +\ltjpreset_define_preset_prop:n { mg-m } \cs_new:Nn \__ltjpreset_set_uni:nn { mc = #1, gt = #2, mc-bx = #2, mg-m = #2, @@ -464,28 +463,35 @@ \msg_warning:nnx { luatexja-preset }{ scale }{ \Cjascale } - \cs_new:Nn \ltj_preset_declare_font_shape:nnnnnn { - \DeclareFontShape{#1}{#2}{#3}{#4}{ <-> s*[\Cjascale] - { \bool_if:NT \g__ltjpreset_noembed_bool {psft:} #5 - ;-kern \tl_use:N \l__ltjpreset_kanji_shape_tl; #6 } } {} + % {1: encoding}{2: family}{3: series}{4: shape}{5: fontname}{6: feature}{7: scale} + \cs_new:Nn \__ltjpreset_declare_font_shape:nnnnnnn { + \DeclareFontShape{#1}{#2}{#3}{#4}{ <-> s*[#7] + \bool_if:NT \g__ltjpreset_noembed_bool {psft:} #5 + ;-kern \tl_use:N \l__ltjpreset_kanji_shape_tl; #6 } {} } - \cs_new:Nn \ltj_preset_define_family:nnn { - \ltj_preset_declare_font_shape:nnnnnn { JY3 } - { #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { n } + \cs_new:Nn \__ltjpreset_define_family:nnn { + \__ltjpreset_declare_font_shape:nnnnnnn { JY3 } + { ltjp #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { n } { "#3" : jfm=\tl_use:N \__ltjpreset_use_jfm_yoko_tl } { script=hani \bool_if:NT \g__ltjpreset_expert_bool { ;+hkna } } - \ltj_preset_declare_font_shape:nnnnnn { JT3 } - { #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { n } + { \Cjascale } + \__ltjpreset_declare_font_shape:nnnnnnn { JT3 } + { ltjp #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { n } { "#3" : jfm=\tl_use:N \__ltjpreset_use_jfm_tate_tl } { script=hani \bool_if:NT \g__ltjpreset_expert_bool { ;+vkna } } + { \Cjascale } \bool_if:NT \g__ltjpreset_expert_bool { - \ltj_preset_declare_font_shape:nnnnnn { JY3 } - { #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { rb } + \__ltjpreset_declare_font_shape:nnnnnnn { JY3 } + { ltjp #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { rb } { "#3" : jfm=\tl_use:N \__ltjpreset_use_jfm_yoko_tl } { script=kana; +ruby } - \ltj_preset_declare_font_shape:nnnnnn { JT3 } - { #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { rb } + { \Cjascale } + \__ltjpreset_declare_font_shape:nnnnnnn { JT3 } + { ltjp #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { rb } { "#3" : jfm=\tl_use:N \__ltjpreset_use_jfm_tate_tl } { script=kana; +ruby } + { \Cjascale } } + \cs_if_exist:NT \ltjpreset_define_family_hook_nfssonly:nnn + { \ltjpreset_define_family_hook_nfssonly:nnn { #1 } { #2 } { #3 } } } \bool_if:NT \g__ltjpreset_deluxe_bool { \let\mgfamily\undefined @@ -501,8 +507,8 @@ % \cs_new:Nn \__ltjpreset_do_fontset: { \group_begin: % ====== - \xdef\mcdefault{ltjpm \int_to_arabic:n { \g__ltjpreset_applycount_int }} - \xdef\gtdefault{ltjpg \int_to_arabic:n { \g__ltjpreset_applycount_int }} + \xdef\mcdefault{ltjpmc \int_to_arabic:n { \g__ltjpreset_applycount_int }} + \xdef\gtdefault{ltjpgt \int_to_arabic:n { \g__ltjpreset_applycount_int }} \DeclareKanjiFamily{JY3}{\mcdefault}{} \DeclareKanjiFamily{JT3}{\mcdefault}{} \DeclareKanjiFamily{JY3}{\gtdefault}{} @@ -525,17 +531,17 @@ \tl_if_eq:NNT \l__ltjpreset_kanji_shape_tl \l_tmpa_tl { \tl_set:Nx \l__ltjpreset_kanji_shape_tl { ;+jp04 } } - \ltj_preset_define_family:nnn {ltjpm} {m} {\__ltjpreset_font_mc_m:} - \ltj_preset_define_family:nnn {ltjpm} {bx} {\__ltjpreset_font_mc_bx:} - \ltj_preset_define_family:nnn {ltjpm} {b} {\__ltjpreset_font_mc_bx:} - \ltj_preset_define_family:nnn {ltjpg} {m} {\__ltjpreset_font_gt_m:} - \ltj_preset_define_family:nnn {ltjpg} {bx} {\__ltjpreset_font_gt_bx:} - \ltj_preset_define_family:nnn {ltjpg} {b} {\__ltjpreset_font_gt_bx:} + \__ltjpreset_define_family:nnn {mc} {m} {\__ltjpreset_font_mc_m:} + \__ltjpreset_define_family:nnn {mc} {bx} {\__ltjpreset_font_mc_bx:} + \__ltjpreset_define_family:nnn {mc} {b} {\__ltjpreset_font_mc_bx:} + \__ltjpreset_define_family:nnn {gt} {m} {\__ltjpreset_font_gt_m:} + \__ltjpreset_define_family:nnn {gt} {bx} {\__ltjpreset_font_gt_bx:} + \__ltjpreset_define_family:nnn {gt} {b} {\__ltjpreset_font_gt_bx:} \normalfont \bool_if:NT \g__ltjpreset_deluxe_bool { - \ltj_preset_define_family:nnn {ltjpm} {l} {\__ltjpreset_font_mc_l:} - \ltj_preset_define_family:nnn {ltjpg} {eb} {\__ltjpreset_font_gt_eb:} - \ltj_preset_define_family:nnn {ltjpmg} {m} {\__ltjpreset_font_mg_m:} + \__ltjpreset_define_family:nnn {mc} {l} {\__ltjpreset_font_mc_l:} + \__ltjpreset_define_family:nnn {gt} {eb} {\__ltjpreset_font_gt_eb:} + \__ltjpreset_define_family:nnn {mg} {m} {\__ltjpreset_font_mg_m:} } \group_end: } @@ -568,22 +574,56 @@ } } \setmainjfont [ - \bool_if:NT \g__ltjpreset_deluxe_bool { FontFace={l}{n}{\__ltjpreset_font_mc_l:}, } - BoldFont = \__ltjpreset_font_mc_bx: \tl_use:N \l__ltjpreset_add_features_tl + \bool_if:NT \g__ltjpreset_deluxe_bool { + FontFace={l}{n}{ Font = \__ltjpreset_font_mc_l:, + \cs_if_exist:NT \ltjpreset_define_family_hook_fontspec:nnn { + \ltjpreset_define_family_hook_fontspec:nnn + { mc } { l } { \__ltjpreset_font_mc_l: } + } + }, + } + BoldFont = \__ltjpreset_font_mc_bx: \tl_use:N \l__ltjpreset_add_features_tl, + \cs_if_exist:NT \ltjpreset_define_family_hook_fontspec:nnn { + UprightFeatures = { \ltjpreset_define_family_hook_fontspec:nnn + { mc } { m } { \__ltjpreset_font_mc_m: } }, + BoldFeatures = { \ltjpreset_define_family_hook_fontspec:nnn + { mc } { bx } { \__ltjpreset_font_mc_bx: } }, + } ] { \__ltjpreset_font_mc_m: } \setsansjfont [ - \bool_if:NT \g__ltjpreset_deluxe_bool { FontFace={eb}{n}{\__ltjpreset_font_gt_eb:}, } - BoldFont = \__ltjpreset_font_gt_bx: \tl_use:N \l__ltjpreset_add_features_tl + \bool_if:NT \g__ltjpreset_deluxe_bool { + FontFace={eb}{n}{ Font = \__ltjpreset_font_gt_eb:, + \cs_if_exist:NT \ltjpreset_define_family_hook_fontspec:nnn { + \ltjpreset_define_family_hook_fontspec:nnn + { gt } { eb } { \__ltjpreset_font_gt_eb: } + } + }, + } + BoldFont = \__ltjpreset_font_gt_bx: \tl_use:N \l__ltjpreset_add_features_tl, + \cs_if_exist:NT \ltjpreset_define_family_hook_fontspec:nnn { + UprightFeatures = { \ltjpreset_define_family_hook_fontspec:nnn + { gt } { m } { \__ltjpreset_font_gt_m: } }, + BoldFeatures = { \ltjpreset_define_family_hook_fontspec:nnn + { gt } { bx } { \__ltjpreset_font_gt_bx: } }, + } ] { \__ltjpreset_font_gt_m: } \bool_if:NT \g__ltjpreset_deluxe_bool { %% mg \bool_if_exist:NTF \setfontfamily { \setjfontfamily \mgfamily [ - BoldFont = \__ltjpreset_font_mg_m: \tl_use:N \l__ltjpreset_add_features_tl + BoldFont = \__ltjpreset_font_mg_m: \tl_use:N \l__ltjpreset_add_features_tl, + \cs_if_exist:NT \ltjpreset_define_family_hook_fontspec:nnn { + \ltjpreset_define_family_hook_fontspec:nnn + { mg } { m } { \__ltjpreset_font_mg_m: }, + } ] { \__ltjpreset_font_mg_m: } } { \newjfontfamily \mgfamily [ - BoldFont = \__ltjpreset_font_mg_m: \tl_use:N \l__ltjpreset_add_features_tl + BoldFont = \__ltjpreset_font_mg_m: \tl_use:N \l__ltjpreset_add_features_tl, + \cs_if_exist:NT \ltjpreset_define_family_hook_fontspec:nnn { + \ltjpreset_define_family_hook_fontspec:nnn + { mg } { m } { \__ltjpreset_font_mg_m: }, + } ] { \__ltjpreset_font_mg_m: } } \DeclareTextFontCommand{\textmg}{\mgfamily} diff --git a/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua b/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua index 405aa316ac7..10b44d8103d 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua @@ -26,7 +26,8 @@ local t = { [107] = { 0, 0, 0, kanjiskip_shrink=1 }, [207] = { 0, 0, 0, kanjiskip_shrink=1 }, [8] = { 0, 0, 0, kanjiskip_shrink=1 }, - } + }, + kern = { [307] = 0 }, }, [1] = { -- 開き括弧類 @@ -193,7 +194,8 @@ local t = { [4] = { 0, 0, 0, kanjiskip_shrink=1 }, [6] = { 0, 0, 0, kanjiskip_shrink=1 }, [8] = { 0, 0, 0, kanjiskip_shrink=1 }, - } + }, + kern = { [307] = 0 }, }, [107] = { -- 1/3 角 @@ -226,6 +228,21 @@ local t = { } }, + [307] = { -- 1/4 角 + chars = { 0x3099, 0x309A }, + align = 'right', left = 0.0, down = 0.0, + width = 0, height = 0.88, depth = 0.12, italic=0.0, + glue = { + [1] = { 0.5 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 }, + [2] = { 0, 0, 0, kanjiskip_shrink=1 }, + [3] = { 0.25, 0.0, 0.25, priority=1, ratio=1 }, + [4] = { 0, 0, 0, kanjiskip_shrink=1 }, + [6] = { 0, 0, 0, kanjiskip_shrink=1 }, + [207] = { 0, 0, 0, kanjiskip_shrink=1 }, + [8] = { 0, 0, 0, kanjiskip_shrink=1 }, + } + }, + [8] = { -- 罫線類． chars = { '─', '━', '│', '┃', '┄', '┅', '┆', '┇', diff --git a/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua b/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua index 9e643c8b815..2a7e5a69892 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua @@ -26,7 +26,8 @@ local t = { [107] = { 0, 0, 0, kanjiskip_shrink=1 }, [207] = { 0, 0, 0, kanjiskip_shrink=1 }, [8] = { 0, 0, 0, kanjiskip_shrink=1 }, - } + }, + kern = { [307] = 0 }, }, [1] = { -- 開き括弧類 @@ -221,10 +222,23 @@ local t = { [3] = { 0.25, 0.0, 0.25, priority=1, ratio=1 }, [4] = { 0, 0, 0, kanjiskip_shrink=1 }, [6] = { 0, 0, 0, kanjiskip_shrink=1 }, - [107] = { 0, 0, 0, kanjiskip_shrink=1 }, + [207] = { 0, 0, 0, kanjiskip_shrink=1 }, [8] = { 0, 0, 0, kanjiskip_shrink=1 }, } }, + [307] = { -- 合成用濁点・半濁点 + chars = { 0x3099, 0x309A }, + align = 'right', left = 0.0, down = 0.0, + width = 0, height = 0.5, depth = 0.5, italic=0.0, + glue = { + [1] = { 0.5 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 }, + [2] = { 0, 0, 0, kanjiskip_shrink=1 }, + [3] = { 0.25, 0.0, 0.25, priority=1, ratio=1 }, + [4] = { 0, 0, 0, kanjiskip_shrink=1 }, + [6] = { 0, 0, 0, kanjiskip_shrink=1 }, + [8] = { 0, 0, 0, kanjiskip_shrink=1 }, + } + }, [8] = { -- 罫線類． chars = { diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua index e6f5bfe627e..dabed15d5e0 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua @@ -3,7 +3,7 @@ -- luatexbase.provides_module({ name = 'luatexja.jfont', - date = '2019/01/28', + date = '2019/02/11', description = 'Loader for Japanese fonts', }) @@ -661,7 +661,7 @@ do end -- EXT function luatexja.jfont.print_aftl_address() - tex.sprint(cat_lp, ';ltjaltfont' .. tostring(aftl_base):sub(8)) + return ';ltjaltfont' .. tostring(aftl_base):sub(8) end -- EXT @@ -756,9 +756,9 @@ local font_extra_basename = {} -- key: basename local list_rotate_glyphs do -- output of function_uax50.lua - -- UAX#50 for Unicode 10.0.0 + -- UAX#50 for Unicode 11.0.0 -- t[0] = true - local t={ 0, 167, 168, 169, 170, 174, 175, 177, 178, 188, 191, 215, 216, 247, 248, 746, 748, 888, 890, 896, 900, 907, 908, 909, 910, 930, 931, 1328, 1329, 1367, 1369, 1376, 1377, 1416, 1417, 1419, 1421, 1424, 1425, 1480, 1488, 1515, 1520, 1525, 1536, 1565, 1566, 1806, 1807, 1867, 1869, 1970, 1984, 2043, 2048, 2094, 2096, 2111, 2112, 2140, 2142, 2143, 2144, 2155, 2208, 2229, 2230, 2238, 2260, 2436, 2437, 2445, 2447, 2449, 2451, 2473, 2474, 2481, 2482, 2483, 2486, 2490, 2492, 2501, 2503, 2505, 2507, 2511, 2519, 2520, 2524, 2526, 2527, 2532, 2534, 2558, 2561, 2564, 2565, 2571, 2575, 2577, 2579, 2601, 2602, 2609, 2610, 2612, 2613, 2615, 2616, 2618, 2620, 2621, 2622, 2627, 2631, 2633, 2635, 2638, 2641, 2642, 2649, 2653, 2654, 2655, 2662, 2678, 2689, 2692, 2693, 2702, 2703, 2706, 2707, 2729, 2730, 2737, 2738, 2740, 2741, 2746, 2748, 2758, 2759, 2762, 2763, 2766, 2768, 2769, 2784, 2788, 2790, 2802, 2809, 2816, 2817, 2820, 2821, 2829, 2831, 2833, 2835, 2857, 2858, 2865, 2866, 2868, 2869, 2874, 2876, 2885, 2887, 2889, 2891, 2894, 2902, 2904, 2908, 2910, 2911, 2916, 2918, 2936, 2946, 2948, 2949, 2955, 2958, 2961, 2962, 2966, 2969, 2971, 2972, 2973, 2974, 2976, 2979, 2981, 2984, 2987, 2990, 3002, 3006, 3011, 3014, 3017, 3018, 3022, 3024, 3025, 3031, 3032, 3046, 3067, 3072, 3076, 3077, 3085, 3086, 3089, 3090, 3113, 3114, 3130, 3133, 3141, 3142, 3145, 3146, 3150, 3157, 3159, 3160, 3163, 3168, 3172, 3174, 3184, 3192, 3204, 3205, 3213, 3214, 3217, 3218, 3241, 3242, 3252, 3253, 3258, 3260, 3269, 3270, 3273, 3274, 3278, 3285, 3287, 3294, 3295, 3296, 3300, 3302, 3312, 3313, 3315, 3328, 3332, 3333, 3341, 3342, 3345, 3346, 3397, 3398, 3401, 3402, 3408, 3412, 3428, 3430, 3456, 3458, 3460, 3461, 3479, 3482, 3506, 3507, 3516, 3517, 3518, 3520, 3527, 3530, 3531, 3535, 3541, 3542, 3543, 3544, 3552, 3558, 3568, 3570, 3573, 3585, 3643, 3647, 3676, 3713, 3715, 3716, 3717, 3719, 3721, 3722, 3723, 3725, 3726, 3732, 3736, 3737, 3744, 3745, 3748, 3749, 3750, 3751, 3752, 3754, 3756, 3757, 3770, 3771, 3774, 3776, 3781, 3782, 3783, 3784, 3790, 3792, 3802, 3804, 3808, 3840, 3912, 3913, 3949, 3953, 3992, 3993, 4029, 4030, 4045, 4046, 4059, 4096, 4294, 4295, 4296, 4301, 4302, 4304, 4352, 4608, 4681, 4682, 4686, 4688, 4695, 4696, 4697, 4698, 4702, 4704, 4745, 4746, 4750, 4752, 4785, 4786, 4790, 4792, 4799, 4800, 4801, 4802, 4806, 4808, 4823, 4824, 4881, 4882, 4886, 4888, 4955, 4957, 4989, 4992, 5018, 5024, 5110, 5112, 5118, 5120, 5121, 5760, 5789, 5792, 5881, 5888, 5901, 5902, 5909, 5920, 5943, 5952, 5972, 5984, 5997, 5998, 6001, 6002, 6004, 6016, 6110, 6112, 6122, 6128, 6138, 6144, 6159, 6160, 6170, 6176, 6264, 6272, 6315, 6400, 6431, 6432, 6444, 6448, 6460, 6464, 6465, 6468, 6510, 6512, 6517, 6528, 6572, 6576, 6602, 6608, 6619, 6622, 6684, 6686, 6751, 6752, 6781, 6783, 6794, 6800, 6810, 6816, 6830, 6832, 6847, 6912, 6988, 6992, 7037, 7040, 7156, 7164, 7224, 7227, 7242, 7245, 7305, 7360, 7368, 7376, 7418, 7424, 7674, 7675, 7958, 7960, 7966, 7968, 8006, 8008, 8014, 8016, 8024, 8025, 8026, 8027, 8028, 8029, 8030, 8031, 8062, 8064, 8117, 8118, 8133, 8134, 8148, 8150, 8156, 8157, 8176, 8178, 8181, 8182, 8191, 8192, 8214, 8215, 8224, 8226, 8240, 8242, 8251, 8253, 8258, 8259, 8263, 8266, 8273, 8274, 8293, 8294, 8306, 8308, 8335, 8336, 8349, 8352, 8384, 8400, 8413, 8417, 8418, 8421, 8433, 8450, 8451, 8458, 8463, 8464, 8467, 8469, 8470, 8472, 8478, 8484, 8485, 8486, 8487, 8488, 8489, 8490, 8494, 8495, 8501, 8512, 8517, 8523, 8524, 8526, 8527, 8586, 8588, 8592, 8734, 8735, 8756, 8758, 8960, 8968, 8972, 8992, 8996, 9001, 9003, 9004, 9085, 9115, 9150, 9166, 9167, 9168, 9169, 9180, 9186, 9251, 9252, 9472, 9632, 9754, 9760, 10088, 10102, 10132, 11026, 11056, 11088, 11098, 11124, 11126, 11158, 11160, 11192, 11218, 11219, 11244, 11248, 11264, 11311, 11312, 11359, 11360, 11508, 11513, 11558, 11559, 11560, 11565, 11566, 11568, 11624, 11631, 11633, 11647, 11671, 11680, 11687, 11688, 11695, 11696, 11703, 11704, 11711, 11712, 11719, 11720, 11727, 11728, 11735, 11736, 11743, 11744, 11850, 12296, 12306, 12308, 12320, 12336, 12337, 12448, 12449, 12540, 12541, 42192, 42540, 42560, 42744, 42752, 42927, 42928, 42936, 42999, 43052, 43056, 43066, 43072, 43128, 43136, 43206, 43214, 43226, 43232, 43262, 43264, 43348, 43359, 43360, 43392, 43470, 43471, 43482, 43486, 43519, 43520, 43575, 43584, 43598, 43600, 43610, 43612, 43715, 43739, 43767, 43777, 43783, 43785, 43791, 43793, 43799, 43808, 43815, 43816, 43823, 43824, 43878, 43888, 44014, 44016, 44026, 55296, 57344, 64256, 64263, 64275, 64280, 64285, 64311, 64312, 64317, 64318, 64319, 64320, 64322, 64323, 64325, 64326, 64450, 64467, 64832, 64848, 64912, 64914, 64968, 65008, 65022, 65024, 65040, 65056, 65072, 65097, 65104, 65112, 65119, 65123, 65127, 65136, 65141, 65142, 65277, 65279, 65280, 65288, 65290, 65293, 65294, 65306, 65311, 65339, 65340, 65341, 65342, 65343, 65344, 65371, 65471, 65474, 65480, 65482, 65488, 65490, 65496, 65498, 65501, 65507, 65508, 65512, 65519, 65529, 65532, 65536, 65548, 65549, 65575, 65576, 65595, 65596, 65598, 65599, 65614, 65616, 65630, 65664, 65787, 65792, 65795, 65799, 65844, 65847, 65935, 65936, 65948, 65952, 65953, 66000, 66046, 66176, 66205, 66208, 66257, 66272, 66300, 66304, 66340, 66349, 66379, 66384, 66427, 66432, 66462, 66463, 66500, 66504, 66518, 66560, 66718, 66720, 66730, 66736, 66772, 66776, 66812, 66816, 66856, 66864, 66916, 66927, 66928, 67072, 67383, 67392, 67414, 67424, 67432, 67584, 67590, 67592, 67593, 67594, 67638, 67639, 67641, 67644, 67645, 67647, 67670, 67671, 67743, 67751, 67760, 67808, 67827, 67828, 67830, 67835, 67868, 67871, 67898, 67903, 67904, 68000, 68024, 68028, 68048, 68050, 68100, 68101, 68103, 68108, 68116, 68117, 68120, 68121, 68148, 68152, 68155, 68159, 68168, 68176, 68185, 68192, 68256, 68288, 68327, 68331, 68343, 68352, 68406, 68409, 68438, 68440, 68467, 68472, 68498, 68505, 68509, 68521, 68528, 68608, 68681, 68736, 68787, 68800, 68851, 68858, 68864, 69216, 69247, 69632, 69710, 69714, 69744, 69759, 69826, 69840, 69865, 69872, 69882, 69888, 69941, 69942, 69956, 69968, 70007, 70016, 70094, 70096, 70112, 70113, 70133, 70144, 70162, 70163, 70207, 70272, 70279, 70280, 70281, 70282, 70286, 70287, 70302, 70303, 70314, 70320, 70379, 70384, 70394, 70400, 70404, 70405, 70413, 70415, 70417, 70419, 70441, 70442, 70449, 70450, 70452, 70453, 70458, 70460, 70469, 70471, 70473, 70475, 70478, 70480, 70481, 70487, 70488, 70493, 70500, 70502, 70509, 70512, 70517, 70656, 70746, 70747, 70748, 70749, 70750, 70784, 70856, 70864, 70874, 71168, 71237, 71248, 71258, 71264, 71277, 71296, 71352, 71360, 71370, 71424, 71450, 71453, 71468, 71472, 71488, 71840, 71923, 71935, 71936, 72384, 72441, 72704, 72713, 72714, 72759, 72760, 72774, 72784, 72813, 72816, 72848, 72850, 72872, 72873, 72887, 72960, 72967, 72968, 72970, 72971, 73015, 73018, 73019, 73020, 73022, 73023, 73032, 73040, 73050, 73728, 74650, 74752, 74863, 74864, 74869, 74880, 75076, 92160, 92729, 92736, 92767, 92768, 92778, 92782, 92784, 92880, 92910, 92912, 92918, 92928, 92998, 93008, 93018, 93019, 93026, 93027, 93048, 93053, 93072, 93952, 94021, 94032, 94079, 94095, 94112, 113664, 113771, 113776, 113789, 113792, 113801, 113808, 113818, 113820, 113828, 119296, 119366, 119808, 119893, 119894, 119965, 119966, 119968, 119970, 119971, 119973, 119975, 119977, 119981, 119982, 119994, 119995, 119996, 119997, 120004, 120005, 120070, 120071, 120075, 120077, 120085, 120086, 120093, 120094, 120122, 120123, 120127, 120128, 120133, 120134, 120135, 120138, 120145, 120146, 120486, 120488, 120780, 120782, 120832, 122880, 122887, 122888, 122905, 122907, 122914, 122915, 122917, 122918, 122923, 124928, 125125, 125127, 125143, 125184, 125259, 125264, 125274, 125278, 125280, 126464, 126468, 126469, 126496, 126497, 126499, 126500, 126501, 126503, 126504, 126505, 126515, 126516, 126520, 126521, 126522, 126523, 126524, 126530, 126531, 126535, 126536, 126537, 126538, 126539, 126540, 126541, 126544, 126545, 126547, 126548, 126549, 126551, 126552, 126553, 126554, 126555, 126556, 126557, 126558, 126559, 126560, 126561, 126563, 126564, 126565, 126567, 126571, 126572, 126579, 126580, 126584, 126585, 126589, 126590, 126591, 126592, 126602, 126603, 126620, 126625, 126628, 126629, 126634, 126635, 126652, 126704, 126706, 129024, 129036, 129040, 129096, 129104, 129114, 129120, 129160, 129168, 129198, 917505, 917506, 917536, 917632, 917760, 918000 } + local t={ 0, 167, 168, 169, 170, 174, 175, 177, 178, 188, 191, 215, 216, 247, 248, 746, 748, 888, 890, 896, 900, 907, 908, 909, 910, 930, 931, 1328, 1329, 1367, 1369, 1419, 1421, 1424, 1425, 1480, 1488, 1515, 1519, 1525, 1536, 1565, 1566, 1806, 1807, 1867, 1869, 1970, 1984, 2043, 2045, 2094, 2096, 2111, 2112, 2140, 2142, 2143, 2144, 2155, 2208, 2229, 2230, 2238, 2259, 2436, 2437, 2445, 2447, 2449, 2451, 2473, 2474, 2481, 2482, 2483, 2486, 2490, 2492, 2501, 2503, 2505, 2507, 2511, 2519, 2520, 2524, 2526, 2527, 2532, 2534, 2559, 2561, 2564, 2565, 2571, 2575, 2577, 2579, 2601, 2602, 2609, 2610, 2612, 2613, 2615, 2616, 2618, 2620, 2621, 2622, 2627, 2631, 2633, 2635, 2638, 2641, 2642, 2649, 2653, 2654, 2655, 2662, 2679, 2689, 2692, 2693, 2702, 2703, 2706, 2707, 2729, 2730, 2737, 2738, 2740, 2741, 2746, 2748, 2758, 2759, 2762, 2763, 2766, 2768, 2769, 2784, 2788, 2790, 2802, 2809, 2816, 2817, 2820, 2821, 2829, 2831, 2833, 2835, 2857, 2858, 2865, 2866, 2868, 2869, 2874, 2876, 2885, 2887, 2889, 2891, 2894, 2902, 2904, 2908, 2910, 2911, 2916, 2918, 2936, 2946, 2948, 2949, 2955, 2958, 2961, 2962, 2966, 2969, 2971, 2972, 2973, 2974, 2976, 2979, 2981, 2984, 2987, 2990, 3002, 3006, 3011, 3014, 3017, 3018, 3022, 3024, 3025, 3031, 3032, 3046, 3067, 3072, 3085, 3086, 3089, 3090, 3113, 3114, 3130, 3133, 3141, 3142, 3145, 3146, 3150, 3157, 3159, 3160, 3163, 3168, 3172, 3174, 3184, 3192, 3213, 3214, 3217, 3218, 3241, 3242, 3252, 3253, 3258, 3260, 3269, 3270, 3273, 3274, 3278, 3285, 3287, 3294, 3295, 3296, 3300, 3302, 3312, 3313, 3315, 3328, 3332, 3333, 3341, 3342, 3345, 3346, 3397, 3398, 3401, 3402, 3408, 3412, 3428, 3430, 3456, 3458, 3460, 3461, 3479, 3482, 3506, 3507, 3516, 3517, 3518, 3520, 3527, 3530, 3531, 3535, 3541, 3542, 3543, 3544, 3552, 3558, 3568, 3570, 3573, 3585, 3643, 3647, 3676, 3713, 3715, 3716, 3717, 3719, 3721, 3722, 3723, 3725, 3726, 3732, 3736, 3737, 3744, 3745, 3748, 3749, 3750, 3751, 3752, 3754, 3756, 3757, 3770, 3771, 3774, 3776, 3781, 3782, 3783, 3784, 3790, 3792, 3802, 3804, 3808, 3840, 3912, 3913, 3949, 3953, 3992, 3993, 4029, 4030, 4045, 4046, 4059, 4096, 4294, 4295, 4296, 4301, 4302, 4304, 4352, 4608, 4681, 4682, 4686, 4688, 4695, 4696, 4697, 4698, 4702, 4704, 4745, 4746, 4750, 4752, 4785, 4786, 4790, 4792, 4799, 4800, 4801, 4802, 4806, 4808, 4823, 4824, 4881, 4882, 4886, 4888, 4955, 4957, 4989, 4992, 5018, 5024, 5110, 5112, 5118, 5120, 5121, 5760, 5789, 5792, 5881, 5888, 5901, 5902, 5909, 5920, 5943, 5952, 5972, 5984, 5997, 5998, 6001, 6002, 6004, 6016, 6110, 6112, 6122, 6128, 6138, 6144, 6159, 6160, 6170, 6176, 6265, 6272, 6315, 6400, 6431, 6432, 6444, 6448, 6460, 6464, 6465, 6468, 6510, 6512, 6517, 6528, 6572, 6576, 6602, 6608, 6619, 6622, 6684, 6686, 6751, 6752, 6781, 6783, 6794, 6800, 6810, 6816, 6830, 6832, 6847, 6912, 6988, 6992, 7037, 7040, 7156, 7164, 7224, 7227, 7242, 7245, 7305, 7312, 7355, 7357, 7368, 7376, 7418, 7424, 7674, 7675, 7958, 7960, 7966, 7968, 8006, 8008, 8014, 8016, 8024, 8025, 8026, 8027, 8028, 8029, 8030, 8031, 8062, 8064, 8117, 8118, 8133, 8134, 8148, 8150, 8156, 8157, 8176, 8178, 8181, 8182, 8191, 8192, 8214, 8215, 8224, 8226, 8240, 8242, 8251, 8253, 8258, 8259, 8263, 8266, 8273, 8274, 8293, 8294, 8306, 8308, 8335, 8336, 8349, 8352, 8384, 8400, 8413, 8417, 8418, 8421, 8433, 8450, 8451, 8458, 8463, 8464, 8467, 8469, 8470, 8472, 8478, 8484, 8485, 8486, 8487, 8488, 8489, 8490, 8494, 8495, 8501, 8512, 8517, 8523, 8524, 8526, 8527, 8586, 8588, 8592, 8734, 8735, 8756, 8758, 8960, 8968, 8972, 8992, 8996, 9001, 9003, 9004, 9085, 9115, 9150, 9166, 9167, 9168, 9169, 9180, 9186, 9251, 9252, 9472, 9632, 9754, 9760, 10088, 10102, 10132, 11026, 11056, 11088, 11098, 11124, 11126, 11158, 11160, 11192, 11218, 11219, 11244, 11248, 11264, 11311, 11312, 11359, 11360, 11508, 11513, 11558, 11559, 11560, 11565, 11566, 11568, 11624, 11631, 11633, 11647, 11671, 11680, 11687, 11688, 11695, 11696, 11703, 11704, 11711, 11712, 11719, 11720, 11727, 11728, 11735, 11736, 11743, 11744, 11855, 12296, 12306, 12308, 12320, 12336, 12337, 12448, 12449, 12540, 12541, 42192, 42540, 42560, 42744, 42752, 42938, 42999, 43052, 43056, 43066, 43072, 43128, 43136, 43206, 43214, 43226, 43232, 43348, 43359, 43360, 43392, 43470, 43471, 43482, 43486, 43519, 43520, 43575, 43584, 43598, 43600, 43610, 43612, 43715, 43739, 43767, 43777, 43783, 43785, 43791, 43793, 43799, 43808, 43815, 43816, 43823, 43824, 43878, 43888, 44014, 44016, 44026, 55296, 57344, 64256, 64263, 64275, 64280, 64285, 64311, 64312, 64317, 64318, 64319, 64320, 64322, 64323, 64325, 64326, 64450, 64467, 64832, 64848, 64912, 64914, 64968, 65008, 65022, 65024, 65040, 65056, 65072, 65097, 65104, 65112, 65119, 65123, 65127, 65136, 65141, 65142, 65277, 65279, 65280, 65288, 65290, 65293, 65294, 65306, 65311, 65339, 65340, 65341, 65342, 65343, 65344, 65371, 65471, 65474, 65480, 65482, 65488, 65490, 65496, 65498, 65501, 65507, 65508, 65512, 65519, 65529, 65532, 65536, 65548, 65549, 65575, 65576, 65595, 65596, 65598, 65599, 65614, 65616, 65630, 65664, 65787, 65792, 65795, 65799, 65844, 65847, 65935, 65936, 65948, 65952, 65953, 66000, 66046, 66176, 66205, 66208, 66257, 66272, 66300, 66304, 66340, 66349, 66379, 66384, 66427, 66432, 66462, 66463, 66500, 66504, 66518, 66560, 66718, 66720, 66730, 66736, 66772, 66776, 66812, 66816, 66856, 66864, 66916, 66927, 66928, 67072, 67383, 67392, 67414, 67424, 67432, 67584, 67590, 67592, 67593, 67594, 67638, 67639, 67641, 67644, 67645, 67647, 67670, 67671, 67743, 67751, 67760, 67808, 67827, 67828, 67830, 67835, 67868, 67871, 67898, 67903, 67904, 68000, 68024, 68028, 68048, 68050, 68100, 68101, 68103, 68108, 68116, 68117, 68120, 68121, 68150, 68152, 68155, 68159, 68169, 68176, 68185, 68192, 68256, 68288, 68327, 68331, 68343, 68352, 68406, 68409, 68438, 68440, 68467, 68472, 68498, 68505, 68509, 68521, 68528, 68608, 68681, 68736, 68787, 68800, 68851, 68858, 68904, 68912, 68922, 69216, 69247, 69376, 69416, 69424, 69466, 69632, 69710, 69714, 69744, 69759, 69826, 69837, 69838, 69840, 69865, 69872, 69882, 69888, 69941, 69942, 69959, 69968, 70007, 70016, 70094, 70096, 70112, 70113, 70133, 70144, 70162, 70163, 70207, 70272, 70279, 70280, 70281, 70282, 70286, 70287, 70302, 70303, 70314, 70320, 70379, 70384, 70394, 70400, 70404, 70405, 70413, 70415, 70417, 70419, 70441, 70442, 70449, 70450, 70452, 70453, 70458, 70459, 70469, 70471, 70473, 70475, 70478, 70480, 70481, 70487, 70488, 70493, 70500, 70502, 70509, 70512, 70517, 70656, 70746, 70747, 70748, 70749, 70751, 70784, 70856, 70864, 70874, 71168, 71237, 71248, 71258, 71264, 71277, 71296, 71352, 71360, 71370, 71424, 71451, 71453, 71468, 71472, 71488, 71680, 71740, 71840, 71923, 71935, 71936, 72384, 72441, 72704, 72713, 72714, 72759, 72760, 72774, 72784, 72813, 72816, 72848, 72850, 72872, 72873, 72887, 72960, 72967, 72968, 72970, 72971, 73015, 73018, 73019, 73020, 73022, 73023, 73032, 73040, 73050, 73056, 73062, 73063, 73065, 73066, 73103, 73104, 73106, 73107, 73113, 73120, 73130, 73440, 73465, 73728, 74650, 74752, 74863, 74864, 74869, 74880, 75076, 92160, 92729, 92736, 92767, 92768, 92778, 92782, 92784, 92880, 92910, 92912, 92918, 92928, 92998, 93008, 93018, 93019, 93026, 93027, 93048, 93053, 93072, 93760, 93851, 93952, 94021, 94032, 94079, 94095, 94112, 113664, 113771, 113776, 113789, 113792, 113801, 113808, 113818, 113820, 113828, 119296, 119366, 119808, 119893, 119894, 119965, 119966, 119968, 119970, 119971, 119973, 119975, 119977, 119981, 119982, 119994, 119995, 119996, 119997, 120004, 120005, 120070, 120071, 120075, 120077, 120085, 120086, 120093, 120094, 120122, 120123, 120127, 120128, 120133, 120134, 120135, 120138, 120145, 120146, 120486, 120488, 120780, 120782, 120832, 122880, 122887, 122888, 122905, 122907, 122914, 122915, 122917, 122918, 122923, 124928, 125125, 125127, 125143, 125184, 125259, 125264, 125274, 125278, 125280, 126065, 126133, 126464, 126468, 126469, 126496, 126497, 126499, 126500, 126501, 126503, 126504, 126505, 126515, 126516, 126520, 126521, 126522, 126523, 126524, 126530, 126531, 126535, 126536, 126537, 126538, 126539, 126540, 126541, 126544, 126545, 126547, 126548, 126549, 126551, 126552, 126553, 126554, 126555, 126556, 126557, 126558, 126559, 126560, 126561, 126563, 126564, 126565, 126567, 126571, 126572, 126579, 126580, 126584, 126585, 126589, 126590, 126591, 126592, 126602, 126603, 126620, 126625, 126628, 126629, 126634, 126635, 126652, 126704, 126706, 129024, 129036, 129040, 129096, 129104, 129114, 129120, 129160, 129168, 129198, 917505, 917506, 917536, 917632, 917760, 918000 } local function rotate_in_uax50(i) local lo, hi = 1, #t while lo < hi do diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty index fa8d6f8f853..1409c354d85 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty @@ -14,7 +14,7 @@ \ifltj@in@latex %<*LaTeX> \NeedsTeXFormat{LaTeX2e} \PackageWarning{ltj-plain}{Don't load this package directly; load luatexja.sty instead.} - \ProvidesPackage{ltj-plain}[2017/05/05] + \ProvidesPackage{ltj-plain}[2019/02/11] \fi %</LaTeX> %%------------------ @@ -78,16 +78,21 @@ "2000-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF} \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 \ltjdefcharrange{5}{"D800-"DFFF, "E0000-"E00FF, "E01F0-"10FFFF} \ltjdefcharrange{6}{% "2460-"24FF, "2E80-"2EFF, "3000-"30FF, "3190-"319F, "31F0-"4DBF, - "4E00-"9FFF, "F900-"FAFF, "FE10-"FE6F, "20000-"2FFFF,"E0100-"E01EF} -\ltjdefcharrange{7}{ - "1100-"11FF, "2F00-"2FFF, "3100-"31EF, "A000-"A4CF, "A830-"A83F, - "AC00-"D7FF} -\ltjdefcharrange{8}{"B4, "A8, "B1, "D7, "F7, "B0, "A7, "B6} + "4E00-"9FFF, "F900-"FAFF, "FE10-"FE1F, "FE30-"FE6F, "FF00-"FFEF, + "1B000-"1B16F, "1F100-"1F2FF, "20000-"2FFFF, "E0100-"E01EF +} +\ltjdefcharrange{7}{% + "1100-"11FF, "2F00-"2FFF, "3100-"318F, "31A0-"31EF, "A000-"A4CF, + "A960-"A97F, "AC00-"D7FF +} +\ltjdefcharrange{8}{"A7, "A8, "B0, "B1, "B4, "B6, "D7, "F7} \ltjsetparameter{jacharrange={-1, +2, +3, -4, -5, +6, +7, -8}} \directlua{for x=128,255 do luatexja.math.is_math_letters[x] = true end} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-unicode-ccfix.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-unicode-ccfix.lua index 3b3b5e1f634..8750e7dbbab 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-unicode-ccfix.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-unicode-ccfix.lua @@ -1,5 +1,5 @@ -- Do not edit this file! --- Created from LineBreak.txt by ltj-unicode-ccfix_make.pl on 2018年 3月 25日 日曜日 12:00:25 JST. +-- Created from LineBreak.txt by ltj-unicode-ccfix_make.pl on 2019年 2月 11日 月曜日 06:40:10 JST. -- In case of errors, fix the Perl script instead. local tex_catcode = tex.setcatcode local tex_getcc = tex.getcatcode @@ -73,7 +73,7 @@ set_letter(0x30E8,0x30ED) set_letter(0x30EF,0x30F4) set_letter(0x30F7,0x30FA) set_letter(0x30FF,0x30FF) -set_letter(0x3105,0x312E) +set_letter(0x3105,0x312F) set_letter(0x3131,0x318E) set_letter(0x3190,0x3191) set_letter(0x3192,0x3195) @@ -93,8 +93,8 @@ set_letter(0x32C0,0x32FE) set_letter(0x3300,0x33FF) set_letter(0x3400,0x4DB5) set_letter(0x4DB6,0x4DBF) -set_letter(0x4E00,0x9FEA) -set_letter(0x9FEB,0x9FFF) +set_letter(0x4E00,0x9FEF) +set_letter(0x9FF0,0x9FFF) set_letter(0xA000,0xA014) set_letter(0xA016,0xA48C) set_letter(0xA490,0xA4C6) @@ -143,7 +143,7 @@ set_letter(0xFFDA,0xFFDC) set_letter(0xFFE2,0xFFE2) set_letter(0xFFE3,0xFFE3) set_letter(0xFFE4,0xFFE4) -set_letter(0x17000,0x187EC) +set_letter(0x17000,0x187F1) set_letter(0x18800,0x18AF2) set_letter(0x1B000,0x1B0FF) set_letter(0x1B100,0x1B11E) @@ -161,7 +161,6 @@ set_letter(0x1F0D0,0x1F0D0) set_letter(0x1F0D1,0x1F0F5) set_letter(0x1F0F6,0x1F0FF) set_letter(0x1F10D,0x1F10F) -set_letter(0x1F12F,0x1F12F) set_letter(0x1F16C,0x1F16F) set_letter(0x1F1AD,0x1F1E5) set_letter(0x1F200,0x1F202) @@ -216,10 +215,11 @@ set_letter(0x1F6CD,0x1F6D4) set_letter(0x1F6D5,0x1F6DF) set_letter(0x1F6E0,0x1F6EC) set_letter(0x1F6ED,0x1F6EF) -set_letter(0x1F6F0,0x1F6F8) -set_letter(0x1F6F9,0x1F6FF) +set_letter(0x1F6F0,0x1F6F9) +set_letter(0x1F6FA,0x1F6FF) set_letter(0x1F774,0x1F77F) -set_letter(0x1F7D5,0x1F7FF) +set_letter(0x1F7D5,0x1F7D8) +set_letter(0x1F7D9,0x1F7FF) set_letter(0x1F80C,0x1F80F) set_letter(0x1F848,0x1F84F) set_letter(0x1F85A,0x1F85F) @@ -232,17 +232,25 @@ set_letter(0x1F920,0x1F925) set_letter(0x1F927,0x1F92F) set_letter(0x1F93A,0x1F93C) set_letter(0x1F93F,0x1F93F) -set_letter(0x1F940,0x1F94C) -set_letter(0x1F94D,0x1F94F) -set_letter(0x1F950,0x1F96B) -set_letter(0x1F96C,0x1F97F) -set_letter(0x1F980,0x1F997) -set_letter(0x1F998,0x1F9BF) -set_letter(0x1F9C0,0x1F9C0) -set_letter(0x1F9C1,0x1F9CF) +set_letter(0x1F940,0x1F970) +set_letter(0x1F971,0x1F972) +set_letter(0x1F973,0x1F976) +set_letter(0x1F977,0x1F979) +set_letter(0x1F97A,0x1F97A) +set_letter(0x1F97B,0x1F97B) +set_letter(0x1F97C,0x1F9A2) +set_letter(0x1F9A3,0x1F9AF) +set_letter(0x1F9B0,0x1F9B4) +set_letter(0x1F9B7,0x1F9B7) +set_letter(0x1F9BA,0x1F9BF) +set_letter(0x1F9C0,0x1F9C2) +set_letter(0x1F9C3,0x1F9CF) set_letter(0x1F9D0,0x1F9D0) -set_letter(0x1F9DE,0x1F9E6) -set_letter(0x1F9E7,0x1FFFD) +set_letter(0x1F9DE,0x1F9FF) +set_letter(0x1FA00,0x1FA5F) +set_letter(0x1FA60,0x1FA6D) +set_letter(0x1FA6E,0x1FA6F) +set_letter(0x1FA70,0x1FFFD) set_letter(0x20000,0x2A6D6) set_letter(0x2A6D7,0x2A6FF) set_letter(0x2A700,0x2B734) @@ -254,5 +262,6 @@ set_letter(0x2CEA2,0x2CEAF) set_letter(0x2CEB0,0x2EBE0) set_letter(0x2EBE1,0x2F7FF) set_letter(0x2F800,0x2FA1D) -set_letter(0x2FA1E,0x2FFFD) +set_letter(0x2FA1E,0x2FA1F) +set_letter(0x2FA20,0x2FFFD) set_letter(0x30000,0x3FFFD) diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty index a854a02d234..02be45ee1b3 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty @@ -41,7 +41,7 @@ \ProcessOptions\relax \fi %</LaTeX> %%%% VERSION -\def\LuaTeXjaversion{20190128.0} +\def\LuaTeXjaversion{20190225.0} \directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty index 02dceafd11e..21f6c4ce2ec 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjdefs}[2018/10/08 Default font settings of LuaTeX-ja] +\ProvidesPackage{lltjdefs}[2019/02/11 Default font settings of LuaTeX-ja] \ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{IPAExMincho}\fi \ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{IPAExGothic}\fi @@ -100,15 +100,20 @@ "2000-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF} \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 \ltjdefcharrange{5}{"D800-"DFFF, "E0000-"E00FF, "E01F0-"10FFFF} \ltjdefcharrange{6}{% "2460-"24FF, "2E80-"2EFF, "3000-"30FF, "3190-"319F, "31F0-"4DBF, - "4E00-"9FFF, "F900-"FAFF, "FE10-"FE6F, "20000-"2FFFF, "E0100-"E01EF} -\ltjdefcharrange{7}{ - "1100-"11FF, "2F00-"2FFF, "3100-"31EF, "A000-"A4CF, "A830-"A83F, - "AC00-"D7FF} + "4E00-"9FFF, "F900-"FAFF, "FE10-"FE1F, "FE30-"FE6F, "FF00-"FFEF, + "1B000-"1B16F, "1F100-"1F2FF, "20000-"2FFFF, "E0100-"E01EF +} +\ltjdefcharrange{7}{% + "1100-"11FF, "2F00-"2FFF, "3100-"318F, "31A0-"31EF, "A000-"A4CF, + "A960-"A97F, "AC00-"D7FF +} \ltjdefcharrange{8}{"A7, "A8, "B0, "B1, "B4, "B6, "D7, "F7} \ltjsetparameter{jacharrange={-1, +2, +3, -4, -5, +6, +7, -8}} @@ -157,8 +162,9 @@ MIDDLE \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} + "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A95F, "A980-"ABFF, "E000-"F8FF, + "FB00-"FE0F, "FE20-"FE2F, "FE70-"FEFF, "10000-"1AFFF, "1B170-"1F0FF, + "1F300-"1FFFF } % non-Japanese \ltjdefcharrange{5}{"D800-"DFFF, "E0000-"E00FF, "E01F0-"10FFFF} @@ -171,7 +177,9 @@ POSITIVE % Japanese \ltjdefcharrange{6}{% "2460-"24FF, "2E80-"2EFF, "3000-"30FF, "3190-"319F, "31F0-"4DBF, - "4E00-"9FFF, "F900-"FAFF, "FE10-"FE6F, "20000-"2FFFF, "E0100-"E01EF} + "4E00-"9FFF, "F900-"FAFF, "FE10-"FE1F, "FE30-"FE6F, "FF00-"FFEF, + "1B000-"1B16F, "1F100-"1F2FF, "20000-"2FFFF, "E0100-"E01EF +} % 77 "2460-"24FF num = 150/160 name = Enclosed Alphanumerics % 98 "2E80-"2EFF num = 21 name = CJK Radicals Supplement % 101 "3000-"303F num = 144 name = CJK Symbols and Punctuation @@ -187,12 +195,19 @@ POSITIVE % 147 "FE10-"FE1F num = 0/16 name = Vertical Forms % 149 "FE30-"FE4F num = 8/32 name = CJK Compatibility Forms % 150 "FE50-"FE6F num = 0/32 name = Small Form Variants +% "FF00-"FFEF name = Halfwidth and Fullwidth Forms +% "1B000-"1B0FF name = Kana Supplement +% "1B100-"1B12F name = Kana Extended-A +% "1B130-"1B16F name = Small Kana Extension +% "1F100-"1F1FF name = Enclosed Alphanumeric Supplement +% "1F200-"1F2FF name = Enclosed Ideographic Supplement % SIP -% "E0000-"E01EF Variation Selectors Supplement +% "E0000-"E01EF name = Variation Selectors Supplement -\ltjdefcharrange{7}{ - "1100-"11FF, "2F00-"2FFF, "3100-"31EF, "A000-"A4CF, "A830-"A83F, - "AC00-"D7FF} +\ltjdefcharrange{7}{% + "1100-"11FF, "2F00-"2FFF, "3100-"318F, "31A0-"31EF, "A000-"A4CF, + "A960-"A97F, "AC00-"D7FF +} % 35 "1100-"11FF num = 1 name = Hangul Jamo % 99 "2F00-"2FDF num = 0/224 name = Kangxi Radicals % 100 "2FF0-"2FFF num = 0/16 name = Ideographic Description Characters @@ -202,6 +217,6 @@ POSITIVE % 108 "31C0-"31EF num = 0/48 name = CJK Strokes % 115 "A000-"A48F num = 0/1168 name = Yi Syllables % 116 "A490-"A4CF num = 0/64 name = Yi Radicals - % 124 "A830-"A83F num = 0/16 name = Common Indic Number Forms + % "A960-"A97F name = Hangul Jamo Extended-A % 137 "AC00-"D7AF num = 0/11184 name = Hangul Syllables % 138 "D7B0-"D7FF num = 0/80 name = Hangul Jamo Extended-B diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty index 515f7dfdbfb..1b4a4a50948 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjfont}[2018/12/15 Patch to NFSS2 for LuaTeX-ja] +\ProvidesPackage{lltjfont}[2019/01/29 Patch to NFSS2 for LuaTeX-ja] \def\ltj@chardef@text@cmd#1{% \let\@ifdefinable\@@ifdefinable% @@ -675,12 +675,21 @@ % 異なる和文 enc/fam/ser/shape からは異なるフォント番号が振られるように % わざと「ゴミをつける」 \def\ltj@@patch@external@font#1 at{% - #1\directlua{luatexja.jfont.print_aftl_address()}\space at% + \directlua{ + local s = '\luatexluaescapestring{#1}' + local is_braced, is_quoted + if s:sub(1,1)=='{' and s:sub(-1)=='}' then is_braced=true; s=s:sub(2,-2) end + if s:sub(1,1)=='"' and s:sub(-1)=='"' then is_quoted=true; s=s:sub(2,-2) end + s=s..luatexja.jfont.print_aftl_address() + if is_braced then s='{'..s..'}' elseif is_quoted then s='"'..s..'"' end + %print(s, is_quoted, is_braced) + tex.sprint(-2, s)}% + \space at% } \def\extract@jfont{% \get@external@font \ltj@@does@alt@set{\f@encoding/\f@family/\f@series/\f@shape}{% - \edef\external@font{\expandafter\ltj@@patch@external@font\external@font}% + \edef\external@font{\expandafter\ltj@@patch@external@font\romannumeral-`0\external@font}% }% \expandafter\globaljfont\font@name\external@font\relax\font@name% ここで時間がかかる \csname \f@encoding+\f@family\endcsname |