luatexja (14jan14)

git-svn-id: svn://tug.org/texlive/trunk@32678 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 495 insertions, 328 deletions

diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx
index 74f1c33959c..cbd2dde3608 100644
--- a/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx
+++ b/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx
@@ -76,7 +76,7 @@
 %   (ありがとうございます、鈴木た＠MILNさん)}
 % \changes{v1.6}{2006/06/27}{フォントコマンドを修正。ありがとう、ymtさん。}
 % \changes{v1.6-ltj}{2011/09/27}{jclasses.dtx v1.6 をベースにLua\LaTeX-ja用に修正。}
-% \changes{v1.6-ltj-2}{2011/09/27}{jclasses.dtx luatexja.cfgに対応．}
+% \changes{v1.6-ltj-2}{2013/06/06}{jclasses.dtx luatexja.cfgに対応．}
 % \fi
 %
 % \iffalse
@@ -113,6 +113,9 @@
 ]
 \documentclass{ltjltxdoc}
 \GetFileInfo{ltjclasses.dtx}
+\usepackage[kozuka-pr6n]{luatexja-preset}
+\usepackage{unicode-math}
+\setmathfont{Latin Modern Math}
 \usepackage[unicode]{hyperref}
 \title{Lua\LaTeX-ja用\texttt{jclasses}互換クラス}
 \author{Lua\TeX-jaプロジェクト}
diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjltxdoc.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjltxdoc.dtx
index 8ce79977cf1..8eed22cd5cd 100644
--- a/Master/texmf-dist/source/luatex/luatexja/ltjltxdoc.dtx
+++ b/Master/texmf-dist/source/luatex/luatexja/ltjltxdoc.dtx
@@ -45,6 +45,9 @@
 %<*driver>
 \documentclass{ltjltxdoc}
 \GetFileInfo{ltjltxdoc.cls}
+\usepackage[kozuka-pr6n]{luatexja-preset}
+\usepackage{unicode-math}
+\setmathfont{Latin Modern Math}
 \title{Lua\LaTeX-jaドキュメント記述用クラス}
 \author{Lua\TeX-jaプロジェクト}
 \date{\filedate}
diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
index b955ee2118f..ed6ef86ee64 100644
--- a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
+++ b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
@@ -16,13 +16,13 @@
 %
 %  Copyright 1993 1994 1995 1996 1997 1998 1999
 %  The LaTeX3 Project and any individual authors listed elsewhere
-%  in this file.
+%  in this file. 
 %
 %  Copyright 1995-1999 ASCII Corporation.
 %  -----------------------------------------
 %
 % \fi
-% \CheckSum{4988}
+% \CheckSum{5163}
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -50,10 +50,13 @@
 %<*driver>
 \ProvidesFile{ltjsclasses.dtx}
 %</driver>
-  [2013/06/06 ]
+  [2014/01/13 ]
 %<*driver>
 \documentclass{ltjsarticle}
 \usepackage{doc}
+\usepackage[kozuka-pr6n]{luatexja-preset}
+\usepackage{unicode-math}
+\setmathfont{Latin Modern Math}
 \usepackage[unicode]{hyperref}
 \addtolength{\textwidth}{-1in}
 \addtolength{\evensidemargin}{1in}
@@ -108,7 +111,7 @@
 %
 % \subsection{\texttt{jsclasses.dtx}からの主な変更点}
 % 全ての変更点を知りたい場合は，|jsclasses.dtx| と |ltjsclasses.dtx| で |diff| を
-% とって下さい。
+% とって下さい。zw, zh は全て |\zw|, |\zh| に置き換えられています。
 % \begin{itemize}
 % \item フォントメトリック関係のオプション |winjis |は単に無視されます。
 % \item 標準では |jfm-ujis.lua|（Lua\TeX-ja標準のメトリック，OTFパッケージのものがベース）を使用します。
@@ -127,7 +130,9 @@
 %   これがあると |grfext.sty| を読み込んだ際にエラーを引き起こすので削除しました。
 % \end{itemize}
 %
-% \StopEventually
+% [2014-01-13] jsclasses 2014-01-02 ベースにしました．
+%
+% \StopEventually{}
 %
 % 以下では実際のコードに即して説明します。
 % \section{Lua\TeX-jaの読み込み}
@@ -143,7 +148,7 @@
 % あるいは |\documentclass[オプション]{ltjsarticle}|
 % のように呼び出します。
 %
-% 最初に，オプションに関連するいくつかのコマンドやスイッチ（論理変数）を定
+% まず，オプションに関連するいくつかのコマンドやスイッチ（論理変数）を定
 % 義します。
 %
 % \begin{macro}{\if@restonecol}
@@ -186,7 +191,7 @@
 %
 % \begin{macro}{\if@enablejfam}
 %
-% 和文フォントを数式フォントとして登録するかどうかを示すスイッチです。
+% 和文フォントを数式フォントとして登録するかどうかを示すスイッチですが，
 % 実際には用いられません。
 %
 %    \begin{macrocode}
@@ -198,20 +203,20 @@
 %
 % \paragraph{用紙サイズ}
 %
-% JISやISOのA0判は面積$1\,\mathrm{m}^2$，縦横比$1:\sqrt{2}$
-% の長方形の辺の長さをmm単位に切り捨てたものです。
-% これを基準として順に半截してはmm単位に切り捨てたものがA1，A2，…です。
+% JISやISOのA0判は面積 $1\,\mathrm{m}^2$，縦横比 $1:\sqrt{2}$
+% の長方形の辺の長さを mm 単位に切り捨てたものです。
+% これを基準として順に半截しては mm 単位に切り捨てたものがA1，A2，…です。
 %
 % B判はJISとISOで定義が異なります。
-% JISではB0判の面積が$1.5\,\mathrm{m}^2$ですが，
+% JISではB0判の面積が $1.5\,\mathrm{m}^2$ ですが，
 % ISOではB1判の辺の長さがA0判とA1判の辺の長さの幾何平均です。
-% したがってISOのB0判は$1000\,\mathrm{mm} \times 1414\,\mathrm{mm}$です。
-% このため，\LaTeXe の\texttt{b5paper}
-% は$250\,\mathrm{mm} \times 176\,\mathrm{mm}$ですが，
-% \pLaTeXe の\texttt{b5paper}
-% は$257\,\mathrm{mm} \times 182\,\mathrm{mm}$になっています。
+% したがってISOのB0判は $1000\,\mathrm{mm} \times 1414\,\mathrm{mm}$ です。
+% このため，\LaTeXe の \texttt{b5paper}
+% は $250\,\mathrm{mm} \times 176\,\mathrm{mm}$ ですが，
+% \pLaTeXe の \texttt{b5paper}
+% は $257\,\mathrm{mm} \times 182\,\mathrm{mm}$ になっています。
 % ここでは\pLaTeXe にならってJISに従いました。
-%
+% 
 % デフォルトは \texttt{a4paper} です。
 %
 % \texttt{b5var}（B5変形，182mm×230mm），
@@ -280,7 +285,7 @@
 %
 % \paragraph{slide}
 %
-% オプション\texttt{slide}を新設しました。
+% オプション \texttt{slide} を新設しました。
 %
 %    \begin{macrocode}
 \newif\if@slide
@@ -289,8 +294,8 @@
 %
 % \paragraph{サイズオプション}
 %
-% 10pt，11pt，12ptのほかに，8pt，9pt，14pt，17pt，21pt，25pt，30pt，36pt，43ptを追加しました。
-% これは等比数列になるように選んだものです（従来の20ptも残しました）。
+% 10pt，11pt，12pt のほかに，8pt，9pt，14pt，17pt，21pt，25pt，30pt，36pt，43pt を追加しました。
+% これは等比数列になるように選んだものです（従来の 20pt も残しました）。
 % |\@ptsize| の定義が変だったのでご迷惑をおかけしましたが，
 % 標準的なドキュメントクラスと同様にポイント数から10を引いたものに直しました。
 %
@@ -320,10 +325,10 @@
 %
 % \paragraph{トンボオプション}
 %
-% トンボ(crop marks)を出力します。
+% トンボ（crop marks）を出力します。
 % 実際の処理は |lltjcore.sty| で行います。
-% オプション\texttt{tombow}で日付付きのトンボ，
-% オプション\texttt{tombo}で日付なしのトンボを出力します。
+% オプション \texttt{tombow} で日付付きのトンボ，
+% オプション \texttt{tombo} で日付なしのトンボを出力します。
 % これらはアスキー版のままです。
 % カウンタ |\hour|，|\minute| は |luatexja-compat.sty| で宣言されています。
 %
@@ -346,7 +351,7 @@
 %
 % \paragraph{面付け}
 %
-% オプション\texttt{mentuke}で幅ゼロのトンボを出力します。
+% オプション \texttt{mentuke} で幅ゼロのトンボを出力します。
 % 面付けに便利です。これもアスキー版のままです。
 %
 %    \begin{macrocode}
@@ -358,9 +363,9 @@
 %
 % \paragraph{両面，片面オプション}
 %
-% \texttt{twoside}で奇数ページ・偶数ページのレイアウトが変わります。
+% \texttt{twoside} で奇数ページ・偶数ページのレイアウトが変わります。
 %
-% [2003-04-29] \texttt{vartwoside}でどちらのページも傍注が右側になります。
+% [2003-04-29] \texttt{vartwoside} でどちらのページも傍注が右側になります。
 %
 %    \begin{macrocode}
 \DeclareOption{oneside}{\@twosidefalse \@mparswitchfalse}
@@ -370,7 +375,7 @@
 %
 % \paragraph{二段組}
 %
-% \texttt{twocolumn}で二段組になります。
+% \texttt{twocolumn} で二段組になります。
 %
 %    \begin{macrocode}
 \DeclareOption{onecolumn}{\@twocolumnfalse}
@@ -379,7 +384,7 @@
 %
 % \paragraph{表題ページ}
 %
-% \texttt{titlepage}で表題・概要を独立したページに出力します。
+% \texttt{titlepage} で表題・概要を独立したページに出力します。
 %
 %    \begin{macrocode}
 \DeclareOption{titlepage}{\@titlepagetrue}
@@ -389,7 +394,7 @@
 % \paragraph{右左起こし}
 %
 % 書籍では章は通常は奇数ページ起こしになりますが，
-% \texttt{openany}で偶数ページからでも始まるようになります。
+% \texttt{openany} で偶数ページからでも始まるようになります。
 %
 %    \begin{macrocode}
 %<book>\DeclareOption{openright}{\@openrighttrue}
@@ -425,8 +430,8 @@
 %    \end{macrocode}
 % \end{environment}
 %
-% \texttt{leqno}で数式番号が左側になります。
-% \texttt{fleqn}で数式が本文左端から一定距離のところに出力されます。
+% \texttt{leqno} で数式番号が左側になります。
+% \texttt{fleqn} で数式が本文左端から一定距離のところに出力されます。
 % 森本さんにしたがって訂正しました。
 %
 %    \begin{macrocode}
@@ -490,7 +495,7 @@
 %
 % \paragraph{ドラフト}
 %
-% \texttt{draft}でoverfull boxの起きた行末に5ptの罫線を引きます。
+% \texttt{draft} でoverfull boxの起きた行末に5ptの罫線を引きます。
 %
 %    \begin{macrocode}
 \newif\ifdraft
@@ -536,7 +541,7 @@
 %
 % \paragraph{英語化}
 %
-% オプション\texttt{english}を新設しました。
+% オプション \texttt{english} を新設しました。
 %
 %    \begin{macrocode}
 \newif\if@english
@@ -546,7 +551,7 @@
 %
 % \paragraph{ltjsreport相当}
 %
-% オプション\texttt{report}を新設しました。
+% オプション \texttt{report} を新設しました。
 %
 %    \begin{macrocode}
 %<*book>
@@ -697,7 +702,7 @@
 % \end{macro}
 % \end{macro}
 %
-% \section{和文フォントの選択}
+% \section{和文フォントの変更}
 %
 % JISの1ポイントは0.3514mm（約1/72.28インチ），
 % PostScriptの1ポイントは1/72インチですが，
@@ -749,7 +754,7 @@
 %
 % 某学会誌では，
 % 和文フォントをPostScriptの9ポイントにするために，
-% $0.9*72.27/72 \simeq 0.903375$倍します。
+% $0.9*72.27/72 \simeq 0.903375$ 倍します。
 %
 %    \begin{macrocode}
 %<*jspf>
@@ -830,12 +835,12 @@
 %
 % これは |\pounds| 命令で実際に呼び出される文字です。
 % 従来からのOT1エンコーディングでは |\$| のイタリック体が |\pounds|
-% なので\texttt{cmti}が使われていましたが，
-% 1994年春からは\texttt{cmu}（upright italic，直立イタリック体）
+% なので \texttt{cmti} が使われていましたが，
+% 1994年春からは \texttt{cmu}（upright italic，直立イタリック体）
 % に変わりました。
-% しかし\texttt{cmu}はその性格からして実験的なものであり，
+% しかし \texttt{cmu} はその性格からして実験的なものであり，
 % |\pounds| 以外で使われるとは思えないので，
-% ここでは\texttt{cmti}に戻してしまいます。
+% ここでは \texttt{cmti} に戻してしまいます。
 %
 % [2003-08-20] Computer Modernフォントを使う機会も減り，T1エンコーディング
 % が一般的になってきました。この定義はもうあまり意味がないので消します。
@@ -845,24 +850,33 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% 「〒515」の記号と数字の間に四分アキが入らないようにします。
+% アスキーの \texttt{kinsoku.dtx} では「’」「“」「”」前後のペナルティが5000に
+% なっていたので，\texttt{jsclasses.dtx} ではそれを 10000 に補正していました。
+% しかし，Lua\TeX-jaでは最初からこれらのパラメータは 10000 なので，
+% もはや補正する必要はありません。
+%
+% 「\TeX！」「〒515」の記号と数字の間に四分アキが入らないようにします。
 %
 %    \begin{macrocode}
-\ltjsetparameter{jaxspmode={`〒,2}}
+\ltjsetparameter{jaxspmode={`！,2}}
+\ltjsetparameter{jaxspmode={`〒,1}}
 %    \end{macrocode}
 %
 % 「CやC++では……」と書くと，C++の直後に四分アキが入らないのでバランスが悪くなります。
-% 四分アキが入るようにしました。\%の両側も同じです。
+% 四分アキが入るようにしました。\% の両側も同じです。
 %
 %    \begin{macrocode}
 \ltjsetparameter{alxspmode={`+,3}}
 \ltjsetparameter{alxspmode={`\%,3}}
 %    \end{macrocode}
 %
+% \texttt{jsclasses.dtx} では80〜ffの文字の |\xspcode| を全て3にしていましたが，
+% Lua\TeX-jaでは同様の内容が最初から設定されていますので，対応する部分は削除。
+%
 % \begin{macro}{\@}
 %
-% \LaTeX の |\def\@{\spacefactor\@m}| という定義（|\@m| は1000）
-% では |I watch TV\@.| と書くとVとピリオドのペアカーニングが効かなくなります。
+% 欧文といえば，\LaTeX の |\def\@{\spacefactor\@m}| という定義（|\@m| は1000）
+% では |I watch TV\@.| と書くと V とピリオドのペアカーニングが効かなくなります。
 % そこで，次のような定義に直し，|I watch TV.\@| と書くことにします。
 %
 %    \begin{macrocode}
@@ -915,7 +929,7 @@
 %
 % |\parindent| については，0（以下）でなければ全角幅（|1\zw|）に直します。
 %
-% [2008-02-18] |english| オプションで |\parindent| を1emにしました。
+% [2008-02-18] |english| オプションで |\parindent| を 1em にしました。
 %
 %    \begin{macrocode}
 \def\@setfontsize#1#2#3{%
@@ -995,7 +1009,7 @@
 % 公称10ポイントの和文フォントが約9.25ポイント
 % （アスキーのものの0.961倍）であることもあり，
 % 行送りがかなりゆったりとしたと思います。
-% 実際，$16/9.25 \approx 1.73$であり，
+% 実際，$16/9.25 \approx 1.73$ であり，
 % 和文の推奨値の一つ「二分四分」（1.75）
 % に近づきました。
 %
@@ -1046,7 +1060,7 @@
 % \begin{macro}{\Chs}
 %
 % 基準となる長さの設定をします。
-% \texttt{lltjfont.dtx}で宣言されている
+% \texttt{lltjfont.sty}で宣言されている
 % パラメータに実際の値を設定します。
 % たとえば |\Cwd| は |\normalfont| の全角幅（|1\zw|）です。
 %
@@ -1068,10 +1082,10 @@
 %
 % |\small| も |\normalsize| と同様に設定します。
 % 行送りは，|\normalsize| が16ポイントなら，
-% 割合からすれば$16 \times 0.9 = 14.4$ポイントになりますが，
+% 割合からすれば $16 \times 0.9 = 14.4$ ポイントになりますが，
 % |\small| の使われ方を考えて，ここでは和文13ポイント，
 % 欧文11ポイントとします。
-% また，|\topsep| と |\parsep| は，元はそれぞれ$4 \pm 2$，$2 \pm 1$
+% また，|\topsep| と |\parsep| は，元はそれぞれ $4 \pm 2$，$2 \pm 1$
 % ポイントでしたが，ここではゼロ（|\z@|）にしました。
 %
 %    \begin{macrocode}
@@ -1224,7 +1238,7 @@
 % 上下の行の文字が |\lineskiplimit| より接近したら，
 % |\lineskip| より近づかないようにします。
 % 元は0ptでしたが1ptに変更しました。
-% \texttt{normal...}の付いた方は保存用です。
+% \texttt{normal...} の付いた方は保存用です。
 %
 %    \begin{macrocode}
 \setlength\lineskip{1\p@}
@@ -1257,7 +1271,7 @@
 % \begin{macro}{\parindent}
 %
 % |\parskip| は段落間の追加スペースです。
-% 元は0pt plus 1ptになっていましたが，ここではゼロにしました。
+% 元は 0pt plus 1pt になっていましたが，ここではゼロにしました。
 % |\parindent| は段落の先頭の字下げ幅です。
 %
 %    \begin{macrocode}
@@ -1290,7 +1304,7 @@
 %
 % \begin{macro}{\interlinepenalty}
 %
-% 段落中の改ページのペナルティです。デフォルトは0です。
+% 段落中の改ページのペナルティです。デフォルトは 0 です。
 %
 %    \begin{macrocode}
 % \interlinepenalty 0
@@ -1315,7 +1329,7 @@
 % \begin{macro}{\topskip}
 %
 % |\topskip| は本文領域上端と本文1行目のベースラインとの距離です。
-% あまりぎりぎりの値にすると，本文中に$\int$のような高い文字が
+% あまりぎりぎりの値にすると，本文中に $\int$ のような高い文字が
 % 入ったときに1行目のベースラインが他のページより下がってしまいます。
 % ここでは本文の公称フォントサイズ（10pt）にします。
 %
@@ -1341,8 +1355,8 @@
 % \begin{macro}{\footskip}
 %
 % |\footskip| は本文領域下端とフッタ下端との距離です。
-% 標準クラスファイルでは，bookで0.35in（約8.89mm），
-% book以外で30pt（約10.54mm）となっていましたが，
+% 標準クラスファイルでは，book で0.35in（約8.89mm），
+% book 以外で30pt（約10.54mm）となっていましたが，
 % ここではA4判のときちょうど1cmとなるように，
 % |\paperheight| の0.03367倍（最小 |\baselineskip|）としました。
 % 書籍については，フッタは使わないことにして，ゼロにしました。
@@ -1375,9 +1389,9 @@
 % \begin{macro}{\headsep}
 %
 % |\headsep| はヘッダ下端と本文領域上端との距離です。
-% 元はbookで18pt（約6.33mm），
+% 元は book で18pt（約6.33mm），
 % それ以外で25pt（約8.79mm）になっていました。
-% ここではarticleは |\footskip| $-$ |\topskip| としました。
+% ここでは article は |\footskip| $-$ |\topskip| としました。
 %
 %    \begin{macrocode}
 %<*article>
@@ -1435,10 +1449,10 @@
 \newdimen\fullwidth
 %    \end{macrocode}
 %
-% この |\fullwidth| はarticleでは紙幅 |\paperwidth|の0.76倍を超えない
+% この |\fullwidth| は article では紙幅 |\paperwidth|の0.76倍を超えない
 % 全角幅の整数倍（二段組では全角幅の偶数倍）にします。0.76倍という数値は
 % A4縦置きの場合に紙幅から約2インチを引いた値になるように選びました。
-% bookでは紙幅から36ミリを引いた値にしました。
+% book では紙幅から36ミリを引いた値にしました。
 %
 % \begin{macro}{\textwidth}
 %
@@ -1636,7 +1650,7 @@
 % \begin{macro}{\footins}
 %
 % |\skip\footins| は本文の最終行と最初の脚注との間の距離です。
-% 標準の10ポイントクラスでは9 plus 4 minus 2ポイントになっていますが，
+% 標準の10ポイントクラスでは 9 plus 4 minus 2 ポイントになっていますが，
 % 和文の行送りを考えてもうちょっと大きくします。
 %
 %    \begin{macrocode}
@@ -1665,7 +1679,7 @@
 % \begin{macro}{\topfraction}
 %
 % 本文ページ上部のフロートが占有できる最大の割合です。
-% フロートが入りやすいように，元の値0.7を0.8 [2003-08-23: 0.85]に変えてあります。
+% フロートが入りやすいように，元の値 0.7 を 0.8 [2003-08-23: 0.85] に変えてあります。
 %
 %    \begin{macrocode}
 \renewcommand{\topfraction}{.85}
@@ -1685,7 +1699,7 @@
 %
 % \begin{macro}{\bottomfraction}
 %
-% 本文ページ下部のフロートが占有できる最大の割合です。元は0.3でした。
+% 本文ページ下部のフロートが占有できる最大の割合です。元は 0.3 でした。
 %
 %    \begin{macrocode}
 \renewcommand{\bottomfraction}{.8}
@@ -1706,7 +1720,7 @@
 % \begin{macro}{\textfraction}
 %
 % 本文ページに最低限入らなければならない本文の割合です。
-% フロートが入りやすいように元の0.2を0.1に変えました。
+% フロートが入りやすいように元の 0.2 を 0.1 に変えました。
 %
 %    \begin{macrocode}
 \renewcommand{\textfraction}{.1}
@@ -1716,7 +1730,7 @@
 % \begin{macro}{\floatpagefraction}
 %
 % フロートだけのページでのフロートの最小割合です。
-% これも0.5を0.8に変えてあります。
+% これも 0.5 を 0.8 に変えてあります。
 %
 %    \begin{macrocode}
 \renewcommand{\floatpagefraction}{.8}
@@ -1739,7 +1753,7 @@
 %
 % 二段組のとき本文ページ上部に出力できる
 % 段抜きフロートが占めうる最大の割合です。
-% 0.7を0.8に変えてあります。
+% 0.7 を 0.8 に変えてあります。
 %
 %    \begin{macrocode}
 \renewcommand{\dbltopfraction}{.8}
@@ -1750,7 +1764,7 @@
 %
 % 二段組のときフロートだけのページに入るべき
 % 段抜きフロートの最小割合です。
-% 0.5を0.8に変えてあります。
+% 0.5 を 0.8 に変えてあります。
 %
 %    \begin{macrocode}
 \renewcommand{\dblfloatpagefraction}{.8}
@@ -1824,7 +1838,7 @@
 % ページスタイルとして，\LaTeXe （欧文版）の標準クラス
 % では |empty|，|plain|，|headings|，|myheadings| があります。
 % このうち |empty|，|plain| スタイルは\LaTeXe 本体
-% で定義されています。
+% で定義されています。 
 %
 % アスキーのクラスファイルでは |headnombre|，|footnombre|，
 % |bothstyle|，|jpl@in| が追加されていますが，
@@ -1925,7 +1939,7 @@
 % |headings| スタイルはヘッダに見出しとページ番号を出力します。
 % ここではヘッダにアンダーラインを引くようにしてみました。
 %
-% まずarticleの場合です。
+% まず article の場合です。
 %
 %    \begin{macrocode}
 %<*article|kiyou>
@@ -1961,10 +1975,13 @@
 %</article|kiyou>
 %    \end{macrocode}
 %
-% 次はbookの場合です。
+% 次は book の場合です。
+% [2011-05-10] しっぽ愛好家さん [qa:6370] のパッチを取り込ませていただきました
+% （北見さん [qa:55896] のご指摘ありがとうございます）。
 %
 %    \begin{macrocode}
 %<*book>
+\newif\if@omit@number
 \def\ps@headings{%
   \let\@oddfoot\@empty
   \let\@evenfoot\@empty
@@ -1979,7 +1996,9 @@
   \def\chaptermark##1{\markboth{%
     \ifnum \c@secnumdepth >\m@ne
       \if@mainmatter
-        \@chapapp\thechapter\@chappos\hskip1\zw
+        \if@omit@number\else
+          \@chapapp\thechapter\@chappos\hskip1\zw
+        \fi
       \fi
     \fi
     ##1}{}}%
@@ -2395,7 +2414,7 @@
 % 二つ挿入した |\everyparhook| のうち後者が |\paragraph| 類の後で2回実行され，
 % それ以降は前者が実行されます。
 %
-% [2011-10-05] Lua\TeX-jaでは|\everyparhook|は不要なので削除。
+% [2011-10-05] Lua\TeX-jaでは |\everyparhook| は不要なので削除。
 %
 %    \begin{macrocode}
 \def\@xsect#1{%
@@ -2491,7 +2510,7 @@
 %
 % 見出し番号のカウンタです。
 % |\newcounter| の第1引数が新たに作るカウンタです。
-% これは第2引数が増加するたびに0に戻されます。
+% これは第2引数が増加するたびに 0 に戻されます。
 % 第2引数は定義済みのカウンタです。
 %
 %    \begin{macrocode}
@@ -2699,7 +2718,7 @@
 % 部の見出しを出力します。
 % |\bfseries| を |\headfont| に変えました。
 %
-% |book| クラス以外では |secnumdepth| が$-1$より大きいとき
+% |book| クラス以外では |secnumdepth| が $-1$ より大きいとき
 % 部番号を付けます。
 %
 %    \begin{macrocode}
@@ -2729,7 +2748,7 @@
 %</!book>
 %    \end{macrocode}
 %
-% |book| クラスでは |secnumdepth| が$-2$より大きいとき部番号を付けます。
+% |book| クラスでは |secnumdepth| が $-2$ より大きいとき部番号を付けます。
 %
 %    \begin{macrocode}
 %<*book>
@@ -2808,7 +2827,7 @@
 %
 %    章の最初のページスタイルは，全体が |empty| でなければ |plain| に
 %    します。
-%    また，|\@topnum| を0にして，
+%    また，|\@topnum| を 0 にして，
 %    章見出しの上に図や表が来ないようにします。
 %
 %    \begin{macrocode}
@@ -2818,7 +2837,9 @@
   \plainifnotempty % 元: \thispagestyle{plain}
   \global\@topnum\z@
   \if@english \@afterindentfalse \else \@afterindenttrue \fi
-  \secdef\@chapter\@schapter}
+  \secdef
+    {\@omit@numberfalse\@chapter}%
+    {\@omit@numbertrue\@schapter}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2835,7 +2856,8 @@
       \typeout{\@chapapp\thechapter\@chappos}%
       \addcontentsline{toc}{chapter}%
         {\protect\numberline
-        {\if@english\thechapter\else\@chapapp\thechapter\@chappos\fi}%
+        % {\if@english\thechapter\else\@chapapp\thechapter\@chappos\fi}%
+        {\@chapapp\thechapter\@chappos}%
         #1}%
     \else\addcontentsline{toc}{chapter}{#1}\fi
   \else
@@ -3006,13 +3028,13 @@
 %
 % \subsection{リスト環境}
 %
-% 第$k$レベルのリストの初期化をするのが |\@list|$k$です
+% 第 $k$ レベルのリストの初期化をするのが |\@list|$k$ です
 % （$k = \mathtt{i}, \mathtt{ii}, \mathtt{iii}, \mathtt{iv}$）。
-% |\@list|$k$は |\leftmargin| を |\leftmargin|$k$に設定します。
+% |\@list|$k$ は |\leftmargin| を |\leftmargin|$k$ に設定します。
 %
 % \begin{macro}{\leftmargini}
 %
-% 二段組であるかないかに応じてそれぞれ2em，2.5emでしたが，
+% 二段組であるかないかに応じてそれぞれ 2em，2.5em でしたが，
 % ここでは全角幅の2倍にしました。
 %
 % [2002-05-11] |3\zw| に変更しました。
@@ -3039,7 +3061,7 @@
 % \begin{macro}{\leftmarginvi}
 %
 %    |ii|，|iii|，|iv| は |\labelsep| と
-%    それぞれ`(m)'，`vii.'，`M.'の幅との和より大きくする
+%    それぞれ `(m)'，`vii.'，`M.' の幅との和より大きくする
 %    ことになっています。ここでは全角幅の整数倍に丸めました。
 %
 %    \begin{macrocode}
@@ -3083,7 +3105,7 @@
 %    リスト環境の前に空行がある場合，
 %    |\parskip| と |\topsep| に |\partopsep| を
 %    加えた値だけ縦方向の空白ができます。
-%    0に改変しました。
+%    0 に改変しました。
 %
 %    \begin{macrocode}
 \setlength\partopsep{\z@} % {2\p@ \@plus 1\p@ \@minus 1\p@}
@@ -3120,7 +3142,7 @@
 %    トップレベルの |itemize|，|enumerate| 環境でだけ
 %    最初と最後に行送りの半分の空きが入るようになっていました。
 %
-%    [2004-09-27] |\topsep| のグルー$_{-0.1}^{+0.2}$ |\baselineskip|
+%    [2004-09-27] |\topsep| のグルー $_{-0.1}^{+0.2}$ |\baselineskip|
 %    を思い切って外しました。
 %
 %    \begin{macrocode}
@@ -3177,7 +3199,7 @@
 % \paragraph{enumerate環境}
 %
 % |enumerate| 環境はカウンタ |enumi|，|enumii|，|enumiii|，
-% |enumiv| を使います。|enum|$n$は第$n$レベルの番号です。
+% |enumiv| を使います。|enum|$n$ は第 $n$ レベルの番号です。
 %
 % \begin{macro}{\theenumi}
 % \begin{macro}{\theenumii}
@@ -3185,7 +3207,7 @@
 % \begin{macro}{\theenumiv}
 %
 %    出力する番号の書式を設定します。
-%    これらは\LaTeX 本体（\texttt{ltlists.dtx}参照）で定義済みですが，
+%    これらは\LaTeX 本体（\texttt{ltlists.dtx} 参照）で定義済みですが，
 %    ここでは表し方を変えています。
 %    |\@arabic|，|\@alph|，|\@roman|，|\@Alph| はそれぞれ
 %    算用数字，小文字アルファベット，小文字ローマ数字，大文字アルファベット
@@ -3229,7 +3251,7 @@
 % \begin{macro}{\p@enumiii}
 % \begin{macro}{\p@enumiv}
 %
-%    |\p@enum|$n$は |\ref| コマンドで |enumerate| 環境の第$n$レベルの
+%    |\p@enum|$n$ は |\ref| コマンドで |enumerate| 環境の第 $n$ レベルの
 %    項目が参照されるときの書式です。
 %    これも第2レベルは和文用かっこにしました。
 %
@@ -3248,7 +3270,7 @@
 % \begin{macro}{\labelitemii}
 % \begin{macro}{\labelitemiii}
 % \begin{macro}{\labelitemiv}
-%    |itemize| 環境の第$n$レベルのラベルを作るコマンドです。
+%    |itemize| 環境の第 $n$ レベルのラベルを作るコマンドです。
 %    \begin{macrocode}
 \newcommand\labelitemi{\textbullet}
 \newcommand\labelitemii{\normalfont\bfseries \textendash}
@@ -3417,7 +3439,7 @@
 % \begin{environment}{quotation}
 %
 % 段落の頭の字下げ量を1.5emから |\parindent| に変えました。
-% また，右マージンを0にしました。
+% また，右マージンを 0 にしました。
 %
 %    \begin{macrocode}
 \newenvironment{quotation}{%
@@ -3978,7 +4000,7 @@
 %
 % \begin{macro}{\@dotsep}
 %
-% 点の間隔です（単位mu）。
+% 点の間隔です（単位 mu）。
 %
 % \begin{macro}{\c@tocdepth}
 %
@@ -4004,9 +4026,18 @@
 %
 % 目次を生成します。
 %
+% \begin{macro}{\js@tocl@width}
+%
+% [2013-12-30] |\prechaptername| などから見積もった目次のラベルの長さです。(by ts)
+%
 %    \begin{macrocode}
+\newdimen\js@tocl@width
 \newcommand{\tableofcontents}{%
 %<*book>
+  \settowidth\js@tocl@width{\headfont\prechaptername\postchaptername}%
+  \settowidth\@tempdima{\headfont\appendixname}%
+  \ifdim\js@tocl@width<\@tempdima \setlength\js@tocl@width{\@tempdima}\fi
+  \ifdim\js@tocl@width<2\zw \divide\js@tocl@width by 2 \advance\js@tocl@width 1\zw\fi
   \if@twocolumn
     \@restonecoltrue\onecolumn
   \else
@@ -4016,6 +4047,10 @@
   \@mkboth{\contentsname}{}%
 %</book>
 %<*!book>
+  \settowidth\js@tocl@width{\headfont\presectionname\postsectionname}%
+  \settowidth\@tempdima{\headfont\appendixname}%
+  \ifdim\js@tocl@width<\@tempdima\relax\setlength\js@tocl@width{\@tempdima}\fi
+  \ifdim\js@tocl@width<2\zw \divide\js@tocl@width by 2 \advance\js@tocl@width 1\zw\fi
   \section*{\contentsname}%
   \@mkboth{\contentsname}{\contentsname}%
 %</!book>
@@ -4023,7 +4058,7 @@
 %<book>  \if@restonecol\twocolumn\fi
 }
 %    \end{macrocode}
-% \end{macro}
+% \end{macro}\end{macro}
 %
 % \begin{macro}{\l@part}
 %
@@ -4055,7 +4090,10 @@
 %
 % \begin{macro}{\l@chapter}
 %
-% 章の目次です。|\@lnumwidth| を|4.683\zw|に増やしました。
+% 章の目次です。|\@lnumwidth| を |4.683\zw| に増やしました。
+%
+% [2013-12-30] |\@lnumwidth| を |\js@tocl@width| から
+% 決めるようにしてみました。(by ts)
 %
 %    \begin{macrocode}
 %<*book>
@@ -4070,7 +4108,8 @@
       \rightskip\@tocrmarg
       \parfillskip-\rightskip
       \leavevmode\headfont
-      \if@english\setlength\@lnumwidth{5.5em}\else\setlength\@lnumwidth{4.683\zw}\fi
+      % \if@english\setlength\@lnumwidth{5.5em}\else\setlength\@lnumwidth{4.683\zw}\fi
+      \setlength\@lnumwidth{\js@tocl@width}\advance\@lnumwidth 2.683\zw
       \advance\leftskip\@lnumwidth \hskip-\leftskip
       #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
       \penalty\@highpenalty
@@ -4096,7 +4135,8 @@
       \rightskip\@tocrmarg
       \parfillskip-\rightskip
       \leavevmode\headfont
-      \setlength\@lnumwidth{4\zw}% 元1.5em [2003-03-02]
+      %\setlength\@lnumwidth{4\zw}% 元1.5em [2003-03-02]
+      \setlength\@lnumwidth{\js@tocl@width}\advance\@lnumwidth 2\zw
       \advance\leftskip\@lnumwidth \hskip-\leftskip
       #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
     \endgroup
@@ -4108,8 +4148,12 @@
 % |1\zw|，|3.683\zw|に変えました。
 %
 %    \begin{macrocode}
-%<book>\newcommand*{\l@section}{\@dottedtocline{1}{1\zw}{3.683\zw}}
+%<book> % \newcommand*{\l@section}{\@dottedtocline{1}{1\zw}{3.683\zw}}
 %    \end{macrocode}
+%
+% [2013-12-30] 上のインデントは |\js@tocl@width| から決めるように
+% しました。(by ts)
+%
 % \end{macro}
 %
 % \begin{macro}{\l@subsection}
@@ -4120,22 +4164,54 @@
 % さらに下位レベルの目次項目の体裁です。
 % あまり使ったことがありませんので，要修正かもしれません。
 %
+% [2013-12-30] ここも  |\js@tocl@width| から決めるように
+% してみました。(by ts)
+%
 %    \begin{macrocode}
 %<*!book>
 % \newcommand*{\l@subsection}   {\@dottedtocline{2}{1.5em}{2.3em}}
-\newcommand*{\l@subsection}   {\@dottedtocline{2}{1\zw}{3\zw}}
 % \newcommand*{\l@subsubsection}{\@dottedtocline{3}{3.8em}{3.2em}}
-\newcommand*{\l@subsubsection}{\@dottedtocline{3}{2\zw}{3\zw}}
 % \newcommand*{\l@paragraph}    {\@dottedtocline{4}{7.0em}{4.1em}}
-\newcommand*{\l@paragraph}    {\@dottedtocline{4}{3\zw}{3\zw}}
 % \newcommand*{\l@subparagraph} {\@dottedtocline{5}{10em}{5em}}
-\newcommand*{\l@subparagraph} {\@dottedtocline{5}{4\zw}{3\zw}}
+%
+% \newcommand*{\l@subsection}   {\@dottedtocline{2}{1\zw}{3\zw}}
+% \newcommand*{\l@subsubsection}{\@dottedtocline{3}{2\zw}{3\zw}}
+% \newcommand*{\l@paragraph}    {\@dottedtocline{4}{3\zw}{3\zw}}
+% \newcommand*{\l@subparagraph} {\@dottedtocline{5}{4\zw}{3\zw}}
+%
+\newcommand*{\l@subsection}{%
+          \@tempdima\js@tocl@width \advance\@tempdima -1\zw
+          \@dottedtocline{2}{\@tempdima}{3\zw}}
+\newcommand*{\l@subsubsection}{%
+          \@tempdima\js@tocl@width \advance\@tempdima 0\zw
+          \@dottedtocline{3}{\@tempdima}{4\zw}}
+\newcommand*{\l@paragraph}{%
+          \@tempdima\js@tocl@width \advance\@tempdima 1\zw
+          \@dottedtocline{4}{\@tempdima}{5\zw}}
+\newcommand*{\l@subparagraph}{%
+          \@tempdima\js@tocl@width \advance\@tempdima 2\zw
+          \@dottedtocline{5}{\@tempdima}{6\zw}}
 %</!book>
 %<*book>
-\newcommand*{\l@subsection}   {\@dottedtocline{2}{3.8em}{3.2em}}
-\newcommand*{\l@subsubsection}{\@dottedtocline{3}{7.0em}{4.1em}}
-\newcommand*{\l@paragraph}    {\@dottedtocline{4}{10em}{5em}}
-\newcommand*{\l@subparagraph} {\@dottedtocline{5}{12em}{6em}}
+% \newcommand*{\l@subsection}   {\@dottedtocline{2}{3.8em}{3.2em}}
+% \newcommand*{\l@subsubsection}{\@dottedtocline{3}{7.0em}{4.1em}}
+% \newcommand*{\l@paragraph}    {\@dottedtocline{4}{10em}{5em}}
+% \newcommand*{\l@subparagraph} {\@dottedtocline{5}{12em}{6em}}
+\newcommand*{\l@section}{%
+          \@tempdima\js@tocl@width \advance\@tempdima -1\zw
+          \@dottedtocline{1}{\@tempdima}{3.683\zw}}
+\newcommand*{\l@subsection}{%
+          \@tempdima\js@tocl@width \advance\@tempdima 2.683\zw
+          \@dottedtocline{2}{\@tempdima}{3.5\zw}}
+\newcommand*{\l@subsubsection}{%
+          \@tempdima\js@tocl@width \advance\@tempdima 6.183\zw
+          \@dottedtocline{3}{\@tempdima}{4.5\zw}}
+\newcommand*{\l@paragraph}{%
+          \@tempdima\js@tocl@width \advance\@tempdima 10.683\zw
+          \@dottedtocline{4}{\@tempdima}{5.5\zw}}
+\newcommand*{\l@subparagraph}{%
+          \@tempdima\js@tocl@width \advance\@tempdima 16.183\zw
+          \@dottedtocline{5}{\@tempdima}{6.5\zw}}
 %</book>
 %    \end{macrocode}
 % \end{macro}
@@ -4175,7 +4251,7 @@
    \@lnumwidth #3\relax
    \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
     {#4}\nobreak
-    \leaders\hbox{$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
+    \leaders\hbox{$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep 
        mu$}\hfill \nobreak\hb@xt@\@pnumwidth{%
          \hfil\normalfont \normalcolor #5}\par}\fi}
 %    \end{macrocode}
@@ -4250,7 +4326,7 @@
 % \begin{macro}{\bibindent}
 %
 % オープンスタイルの参考文献で使うインデント幅です。
-% 元は1.5emでした。
+% 元は 1.5em でした。
 %
 %    \begin{macrocode}
 \newdimen\bibindent
@@ -4329,7 +4405,7 @@
 % \begin{macro}{\@cite}
 % \begin{macro}{\@citex}
 %
-% 文献の番号を出力する部分は\texttt{ltbibl.dtx}で定義されていますが，
+% 文献の番号を出力する部分は \texttt{ltbibl.dtx} で定義されていますが，
 % コンマとかっこを和文フォントにするには次のようにします。
 % とりあえずコメントアウトしておきましたので，必要に応じて生かしてください。
 % かっこの前後に入るグルーを |\inhibitglue| で取っていますので，
@@ -4488,12 +4564,15 @@
 %
 % [2002-04-09] インプリメントの仕方を変えたため消しました。
 %
+% [2013-04-23] 新しい\pTeX では脚注番号のまわりにスペースが入りすぎることを防ぐため，
+% 北川さんのパッチ [qa:57090] を取り込みました。
+%
+% [2013-05-14] plcore.ltx に倣った形に書き直しました（Thanks: 北川さん）。
+%
 %    \begin{macrocode}
-% \def\@makefnmark{\hbox{\@textsuperscript{\normalfont
-%       \ifx\@thefnmark\@empty\else
-%         \textasteriskcentered
-%       \fi
-%       \@thefnmark}}}
+\renewcommand\@makefnmark{\hbox{}\hbox{%
+  \ifydir \@textsuperscript{\normalfont\@thefnmark}%
+  \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -4726,7 +4805,7 @@
 % \begin{macro}{\TeX}
 % \begin{macro}{\LaTeX}
 %
-% これらは\texttt{ltlogos.dtx}で定義されていますが，
+% これらは \texttt{ltlogos.dtx} で定義されていますが，
 % TimesやHelveticaでも見栄えがするように若干変更しました。
 %
 % [2003-06-12] Palatinoも加えました（要調整）。
@@ -4854,7 +4933,7 @@
 %
 % |\LaTeXe| コマンドの |\mbox{\m@th ...| で始まる新しい定義では
 % 直後の和文との間に |xkanjiskip| が入りません。また，
-% |mathptmx| パッケージなどと併用すると，最後の$\varepsilon$が
+% |mathptmx| パッケージなどと併用すると，最後の $\varepsilon$ が
 % 下がりすぎてしまいます。そのため，ちょっと手を加えました。
 %
 %    \begin{macrocode}
@@ -4882,7 +4961,7 @@
 %
 % \begin{macro}{\AmSTeX}
 %
-% \texttt{amstex.sty}で定義されています。
+% \texttt{amstex.sty} で定義されています。
 %
 %    \begin{macrocode}
 \def\AmSTeX{\protect\AmS-\protect\TeX{}}
@@ -4893,7 +4972,7 @@
 % \begin{macro}{\BibTeX}
 % \begin{macro}{\SliTeX}
 %
-% これらは\texttt{doc.dtx}から取ったものです。
+% これらは \texttt{doc.dtx} から取ったものです。
 % ただし，|\BibTeX| だけはちょっと修正しました。
 %
 %    \begin{macrocode}
@@ -4963,7 +5042,7 @@
 %    \begin{macrocode}
 %<!jspf>\newcommand{\figurename}{\if@english Fig.~\else 図\fi}
 %<jspf>\newcommand{\figurename}{Fig.~}
-%<!jspf>\newcommand{\tablename}{\if@english Table.~\else 表\fi}
+%<!jspf>\newcommand{\tablename}{\if@english Table~\else 表\fi}
 %<jspf>\newcommand{\tablename}{Table~}
 %    \end{macrocode}
 % \end{macro}
@@ -4972,7 +5051,8 @@
 % \begin{macro}{\appendixname}
 % \begin{macro}{\abstractname}
 %    \begin{macrocode}
-\newcommand{\appendixname}{\if@english Appendix~\else 付録\fi}
+% \newcommand{\appendixname}{\if@english Appendix~\else 付録\fi}
+\newcommand{\appendixname}{\if@english \else 付録\fi}
 %<!book>\newcommand{\abstractname}{\if@english Abstract\else 概要\fi}
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/source/luatex/luatexja/tool/ivslist.tex b/Master/texmf-dist/source/luatex/luatexja/tool/ivslist.tex
new file mode 100644
index 00000000000..3788bf27191
--- /dev/null
+++ b/Master/texmf-dist/source/luatex/luatexja/tool/ivslist.tex
@@ -0,0 +1,81 @@
+%#!lualatex
+\documentclass{article}
+\batchmode
+\usepackage{luaotfload,booktabs,array,luacode,longtable}
+\usepackage[scale=0.8]{geometry}
+\errorstopmode
+
+\ifdefined\myfontname\else
+{\newlinechar=`@
+\message{@Name of the font to test = }
+\read-1 to\myfontname \global\let\myfontname\myfontname
+\message{@}}
+\fi
+\font\test=\myfontname\space at 12pt
+{\test\begin{luacode}
+  ident = fonts.hashes.identifiers[font.current()]
+\end{luacode}
+}
+
+
+\def\FMT#1#2{{\oalign{\test\char#1\crcr\rm\tiny\hss#2\hss\crcr}}}
+\def\OUT#1{\leavevmode\hbox to 7em{{\test\char"#1}\ ({\tt U+#1})\hss}}%"
+\begin{document}
+{\noindent\Large\bf \myfontname\\\null\hfill (%
+  \directlua{tex.sprint(ident.fullname)}%
+)}
+
+\bigskip
+\baselineskip18pt
+
+\begin{luacode}
+local fl = fontloader.open(ident.filename)
+local ft = fontloader.to_table(fl)
+
+local ivs, ivsi = {}, {}
+local uniq_flag
+local function add_ivs_table(tg)
+   for gu, gv in pairs(tg) do
+      local ga = gv.altuni
+      if ga then
+	 for _,at in pairs(ga) do
+	    local bu, vs = at.unicode, (at.variant or 0)-0xE0100
+	    if vs>=0 and vs<0xF0 then
+	       if not ivs[bu] then ivs[bu] = {}; ivsi[1+#ivsi]=bu end
+	       uniq_flag = true
+               for _,v in pairs(ivs[bu]) do
+                  if v[1]==vs then uniq_flag = false; break end
+               end
+	       if uniq_flag then ivs[bu][1+#(ivs[bu])] = { vs, gv.name } end
+	    end
+	 end
+      end
+   end
+end
+
+add_ivs_table(ft.glyphs)
+if ft.subfonts then
+   for _,v in pairs(ft.subfonts) do
+      add_ivs_table(v.glyphs)
+   end
+end
+fontloader.close(fl)
+
+local unicodes = ident.resources.unicodes
+local sort = table.sort
+local sortfn = function (a,b) return a[1]<b[1] end
+sort(ivsi)
+for _,v in pairs(ivsi) do 
+   sort(ivs[v], sortfn) 
+   tex.sprint('\\OUT{' .. string.format('%X', v) .. '}\\ ')
+   for _, cn in pairs(ivs[v]) do
+     tex.sprint('\\FMT{' .. tostring(unicodes[cn[2]]) .. '}{' .. cn[1] .. '}' )
+   end
+   tex.sprint('\\par')
+end
+
+
+\end{luacode}
+
+
+\end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/source/luatex/luatexja/tool/kyoikukanjiChars.tex b/Master/texmf-dist/source/luatex/luatexja/tool/kyoikukanjiChars.tex
index 82ff1ebfbee..623d4fb8e7b 100644
--- a/Master/texmf-dist/source/luatex/luatexja/tool/kyoikukanjiChars.tex
+++ b/Master/texmf-dist/source/luatex/luatexja/tool/kyoikukanjiChars.tex
@@ -1 +1 @@
-defcharrange{210}{"4e00,"53f3,"96e8,"5186,"738b,"97f3,"4e0b,"706b,"82b1,"8c9d,"5b66,"6c17,"4e5d,"4f11,"7389,"91d1,"7a7a,"6708,"72ac,"898b,"4e94,"53e3,"6821,"5de6,"4e09,"5c71,"5b50,"56db,"7cf8,"5b57,"8033,"4e03,"8eca,"624b,"5341,"51fa,"5973,"5c0f,"4e0a,"68ee,"4eba,"6c34,"6b63,"751f,"9752,"5915,"77f3,"8d64,"5343,"5ddd,"5148,"65e9,"8349,"8db3,"6751,"5927,"7537,"7af9,"4e2d,"866b,"753a,"5929,"7530,"571f,"4e8c,"65e5,"5165,"5e74,"767d,"516b,"767e,"6587,"6728,"672c,"540d,"76ee,"7acb,"529b,"6797,"516d,"5f15,"7fbd,"96f2,"5712,"9060,"4f55,"79d1,"590f,"5bb6,"6b4c,"753b,"56de,"4f1a,"6d77,"7d75,"5916,"89d2,"697d,"6d3b,"9593,"4e38,"5ca9,"9854,"6c7d,"8a18,"5e30,"5f13,"725b,"9b5a,"4eac,"5f37,"6559,"8fd1,"5144,"5f62,"8a08,"5143,"8a00,"539f,"6238,"53e4,"5348,"5f8c,"8a9e,"5de5,"516c,"5e83,"4ea4,"5149,"8003,"884c,"9ad8,"9ec4,"5408,"8c37,"56fd,"9ed2,"4eca,"624d,"7d30,"4f5c,"7b97,"6b62,"5e02,"77e2,"59c9,"601d,"7d19,"5bfa,"81ea,"6642,"5ba4,"793e,"5f31,"9996,"79cb,"9031,"6625,"66f8,"5c11,"5834,"8272,"98df,"5fc3,"65b0,"89aa,"56f3,"6570,"897f,"58f0,"661f,"6674,"5207,"96ea,"8239,"7dda,"524d,"7d44,"8d70,"591a,"592a,"4f53,"53f0,"5730,"6c60,"77e5,"8336,"663c,"9577,"9ce5,"671d,"76f4,"901a,"5f1f,"5e97,"70b9,"96fb,"5200,"51ac,"5f53,"6771,"7b54,"982d,"540c,"9053,"8aad,"5185,"5357,"8089,"99ac,"58f2,"8cb7,"9ea6,"534a,"756a,"7236,"98a8,"5206,"805e,"7c73,"6b69,"6bcd,"65b9,"5317,"6bce,"59b9,"4e07,"660e,"9cf4,"6bdb,"9580,"591c,"91ce,"53cb,"7528,"66dc,"6765,"91cc,"7406,"8a71,"60aa,"5b89,"6697,"533b,"59d4,"610f,"80b2,"54e1,"9662,"98f2,"904b,"6cf3,"99c5,"592e,"6a2a,"5c4b,"6e29,"5316,"8377,"754c,"958b,"968e,"5bd2,"611f,"6f22,"9928,"5cb8,"8d77,"671f,"5ba2,"7a76,"6025,"7d1a,"5bae,"7403,"53bb,"6a4b,"696d,"66f2,"5c40,"9280,"533a,"82e6,"5177,"541b,"4fc2,"8efd,"8840,"6c7a,"7814,"770c,"5eab,"6e56,"5411,"5e78,"6e2f,"53f7,"6839,"796d,"76bf,"4ed5,"6b7b,"4f7f,"59cb,"6307,"6b6f,"8a69,"6b21,"4e8b,"6301,"5f0f,"5b9f,"5199,"8005,"4e3b,"5b88,"53d6,"9152,"53d7,"5dde,"62fe,"7d42,"7fd2,"96c6,"4f4f,"91cd,"5bbf,"6240,"6691,"52a9,"662d,"6d88,"5546,"7ae0,"52dd,"4e57,"690d,"7533,"8eab,"795e,"771f,"6df1,"9032,"4e16,"6574,"6614,"5168,"76f8,"9001,"60f3,"606f,"901f,"65cf,"4ed6,"6253,"5bfe,"5f85,"4ee3,"7b2c,"984c,"70ad,"77ed,"8ac7,"7740,"6ce8,"67f1,"4e01,"5e33,"8abf,"8ffd,"5b9a,"5ead,"7b1b,"9244,"8ee2,"90fd,"5ea6,"6295,"8c46,"5cf6,"6e6f,"767b,"7b49,"52d5,"7ae5,"8fb2,"6ce2,"914d,"500d,"7bb1,"7551,"767a,"53cd,"5742,"677f,"76ae,"60b2,"7f8e,"9f3b,"7b46,"6c37,"8868,"79d2,"75c5,"54c1,"8ca0,"90e8,"670d,"798f,"7269,"5e73,"8fd4,"52c9,"653e,"5473,"547d,"9762,"554f,"5f79,"85ac,"7531,"6cb9,"6709,"904a,"4e88,"7f8a,"6d0b,"8449,"967d,"69d8,"843d,"6d41,"65c5,"4e21,"7dd1,"793c,"5217,"7df4,"8def,"548c,"611b,"6848,"4ee5,"8863,"4f4d,"56f2,"80c3,"5370,"82f1,"6804,"5869,"5104,"52a0,"679c,"8ca8,"8ab2,"82bd,"6539,"68b0,"5bb3,"8857,"5404,"899a,"5b8c,"5b98,"7ba1,"95a2,"89b3,"9858,"5e0c,"5b63,"7d00,"559c,"65d7,"5668,"6a5f,"8b70,"6c42,"6ce3,"6551,"7d66,"6319,"6f01,"5171,"5354,"93e1,"7af6,"6975,"8a13,"8ecd,"90e1,"5f84,"578b,"666f,"82b8,"6b20,"7d50,"5efa,"5065,"9a13,"56fa,"529f,"597d,"5019,"822a,"5eb7,"544a,"5dee,"83dc,"6700,"6750,"6628,"672d,"5237,"6bba,"5bdf,"53c2,"7523,"6563,"6b8b,"58eb,"6c0f,"53f2,"53f8,"8a66,"5150,"6cbb,"8f9e,"5931,"501f,"7a2e,"5468,"795d,"9806,"521d,"677e,"7b11,"5531,"713c,"8c61,"7167,"8cde,"81e3,"4fe1,"6210,"7701,"6e05,"9759,"5e2d,"7a4d,"6298,"7bc0,"8aac,"6d45,"6226,"9078,"7136,"4e89,"5009,"5de3,"675f,"5074,"7d9a,"5352,"5b6b,"5e2f,"968a,"9054,"5358,"7f6e,"4ef2,"8caf,"5146,"8178,"4f4e,"5e95,"505c,"7684,"5178,"4f1d,"5f92,"52aa,"706f,"5802,"50cd,"7279,"5f97,"6bd2,"71b1,"5ff5,"6557,"6885,"535a,"98ef,"98db,"8cbb,"5fc5,"7968,"6a19,"4e0d,"592b,"4ed8,"5e9c,"526f,"7c89,"5175,"5225,"8fba,"5909,"4fbf,"5305,"6cd5,"671b,"7267,"672b,"6e80,"672a,"8108,"6c11,"7121,"7d04,"52c7,"8981,"990a,"6d74,"5229,"9678,"826f,"6599,"91cf,"8f2a,"985e,"4ee4,"51b7,"4f8b,"6b74,"9023,"8001,"52b4,"9332,"5727,"79fb,"56e0,"6c38,"55b6,"885b,"6613,"76ca,"6db2,"6f14,"5fdc,"5f80,"685c,"6069,"53ef,"4eee,"4fa1,"6cb3,"904e,"8cc0,"5feb,"89e3,"683c,"78ba,"984d,"520a,"5e79,"6163,"773c,"57fa,"5bc4,"898f,"6280,"7fa9,"9006,"4e45,"65e7,"5c45,"8a31,"5883,"5747,"7981,"53e5,"7fa4,"7d4c,"6f54,"4ef6,"5238,"967a,"691c,"9650,"73fe,"6e1b,"6545,"500b,"8b77,"52b9,"539a,"8015,"9271,"69cb,"8208,"8b1b,"6df7,"67fb,"518d,"707d,"59bb,"63a1,"969b,"5728,"8ca1,"7f6a,"96d1,"9178,"8cdb,"652f,"5fd7,"679d,"5e2b,"8cc7,"98fc,"793a,"4f3c,"8b58,"8cea,"820e,"8b1d,"6388,"4fee,"8ff0,"8853,"6e96,"5e8f,"62db,"627f,"8a3c,"6761,"72b6,"5e38,"60c5,"7e54,"8077,"5236,"6027,"653f,"52e2,"7cbe,"88fd,"7a0e,"8cac,"7e3e,"63a5,"8a2d,"820c,"7d76,"92ad,"7956,"7d20,"7dcf,"9020,"50cf,"5897,"5247,"6e2c,"5c5e,"7387,"640d,"9000,"8cb8,"614b,"56e3,"65ad,"7bc9,"5f35,"63d0,"7a0b,"9069,"6575,"7d71,"9285,"5c0e,"5fb3,"72ec,"4efb,"71c3,"80fd,"7834,"72af,"5224,"7248,"6bd4,"80a5,"975e,"5099,"4ff5,"8a55,"8ca7,"5e03,"5a66,"5bcc,"6b66,"5fa9,"8907,"4ecf,"7de8,"5f01,"4fdd,"5893,"5831,"8c4a,"9632,"8cbf,"66b4,"52d9,"5922,"8ff7,"7dbf,"8f38,"4f59,"9810,"5bb9,"7565,"7559,"9818,"7570,"907a,"57df,"5b87,"6620,"5ef6,"6cbf,"6211,"7070,"62e1,"9769,"95a3,"5272,"682a,"5e72,"5dfb,"770b,"7c21,"5371,"673a,"63ee,"8cb4,"7591,"5438,"4f9b,"80f8,"90f7,"52e4,"7b4b,"7cfb,"656c,"8b66,"5287,"6fc0,"7a74,"7d79,"6a29,"61b2,"6e90,"53b3,"5df1,"547c,"8aa4,"540e,"5b5d,"7687,"7d05,"964d,"92fc,"523b,"7a40,"9aa8,"56f0,"7802,"5ea7,"6e08,"88c1,"7b56,"518a,"8695,"81f3,"79c1,"59ff,"8996,"8a5e,"8a8c,"78c1,"5c04,"6368,"5c3a,"82e5,"6a39,"53ce,"5b97,"5c31,"8846,"5f93,"7e26,"7e2e,"719f,"7d14,"51e6,"7f72,"8af8,"9664,"5c06,"50b7,"969c,"57ce,"84b8,"91dd,"4ec1,"5782,"63a8,"5bf8,"76db,"8056,"8aa0,"5ba3,"5c02,"6cc9,"6d17,"67d3,"5584,"594f,"7a93,"5275,"88c5,"5c64,"64cd,"8535,"81d3,"5b58,"5c0a,"5b85,"62c5,"63a2,"8a95,"6bb5,"6696,"5024,"5b99,"5fe0,"8457,"5e81,"9802,"6f6e,"8cc3,"75db,"5c55,"8a0e,"515a,"7cd6,"5c4a,"96e3,"4e73,"8a8d,"7d0d,"8133,"6d3e,"62dd,"80cc,"80ba,"4ff3,"73ed,"6669,"5426,"6279,"79d8,"8179,"596e,"4e26,"965b,"9589,"7247,"88dc,"66ae,"5b9d,"8a2a,"4ea1,"5fd8,"68d2,"679a,"5e55,"5bc6,"76df,"6a21,"8a33,"90f5,"512a,"5e7c,"6b32,"7fcc,"4e71,"5375,"89a7,"88cf,"5f8b,"81e8,"6717,"8ad6,}
+\ltjdefcharrange{210}{"4E00,"53F3,"96E8,"5186,"738B,"97F3,"4E0B,"706B,"82B1,"8C9D,"5B66,"6C17,"4E5D,"4F11,"7389,"91D1,"7A7A,"6708,"72AC,"898B,"4E94,"53E3,"6821,"5DE6,"4E09,"5C71,"5B50,"56DB,"7CF8,"5B57,"8033,"4E03,"8ECA,"624B,"5341,"51FA,"5973,"5C0F,"4E0A,"68EE,"4EBA,"6C34,"6B63,"751F,"9752,"5915,"77F3,"8D64,"5343,"5DDD,"5148,"65E9,"8349,"8DB3,"6751,"5927,"7537,"7AF9,"4E2D,"866B,"753A,"5929,"7530,"571F,"4E8C,"65E5,"5165,"5E74,"767D,"516B,"767E,"6587,"6728,"672C,"540D,"76EE,"7ACB,"529B,"6797,"516D,"5F15,"7FBD,"96F2,"5712,"9060,"4F55,"79D1,"590F,"5BB6,"6B4C,"753B,"56DE,"4F1A,"6D77,"7D75,"5916,"89D2,"697D,"6D3B,"9593,"4E38,"5CA9,"9854,"6C7D,"8A18,"5E30,"5F13,"725B,"9B5A,"4EAC,"5F37,"6559,"8FD1,"5144,"5F62,"8A08,"5143,"8A00,"539F,"6238,"53E4,"5348,"5F8C,"8A9E,"5DE5,"516C,"5E83,"4EA4,"5149,"8003,"884C,"9AD8,"9EC4,"5408,"8C37,"56FD,"9ED2,"4ECA,"624D,"7D30,"4F5C,"7B97,"6B62,"5E02,"77E2,"59C9,"601D,"7D19,"5BFA,"81EA,"6642,"5BA4,"793E,"5F31,"9996,"79CB,"9031,"6625,"66F8,"5C11,"5834,"8272,"98DF,"5FC3,"65B0,"89AA,"56F3,"6570,"897F,"58F0,"661F,"6674,"5207,"96EA,"8239,"7DDA,"524D,"7D44,"8D70,"591A,"592A,"4F53,"53F0,"5730,"6C60,"77E5,"8336,"663C,"9577,"9CE5,"671D,"76F4,"901A,"5F1F,"5E97,"70B9,"96FB,"5200,"51AC,"5F53,"6771,"7B54,"982D,"540C,"9053,"8AAD,"5185,"5357,"8089,"99AC,"58F2,"8CB7,"9EA6,"534A,"756A,"7236,"98A8,"5206,"805E,"7C73,"6B69,"6BCD,"65B9,"5317,"6BCE,"59B9,"4E07,"660E,"9CF4,"6BDB,"9580,"591C,"91CE,"53CB,"7528,"66DC,"6765,"91CC,"7406,"8A71,"60AA,"5B89,"6697,"533B,"59D4,"610F,"80B2,"54E1,"9662,"98F2,"904B,"6CF3,"99C5,"592E,"6A2A,"5C4B,"6E29,"5316,"8377,"754C,"958B,"968E,"5BD2,"611F,"6F22,"9928,"5CB8,"8D77,"671F,"5BA2,"7A76,"6025,"7D1A,"5BAE,"7403,"53BB,"6A4B,"696D,"66F2,"5C40,"9280,"533A,"82E6,"5177,"541B,"4FC2,"8EFD,"8840,"6C7A,"7814,"770C,"5EAB,"6E56,"5411,"5E78,"6E2F,"53F7,"6839,"796D,"76BF,"4ED5,"6B7B,"4F7F,"59CB,"6307,"6B6F,"8A69,"6B21,"4E8B,"6301,"5F0F,"5B9F,"5199,"8005,"4E3B,"5B88,"53D6,"9152,"53D7,"5DDE,"62FE,"7D42,"7FD2,"96C6,"4F4F,"91CD,"5BBF,"6240,"6691,"52A9,"662D,"6D88,"5546,"7AE0,"52DD,"4E57,"690D,"7533,"8EAB,"795E,"771F,"6DF1,"9032,"4E16,"6574,"6614,"5168,"76F8,"9001,"60F3,"606F,"901F,"65CF,"4ED6,"6253,"5BFE,"5F85,"4EE3,"7B2C,"984C,"70AD,"77ED,"8AC7,"7740,"6CE8,"67F1,"4E01,"5E33,"8ABF,"8FFD,"5B9A,"5EAD,"7B1B,"9244,"8EE2,"90FD,"5EA6,"6295,"8C46,"5CF6,"6E6F,"767B,"7B49,"52D5,"7AE5,"8FB2,"6CE2,"914D,"500D,"7BB1,"7551,"767A,"53CD,"5742,"677F,"76AE,"60B2,"7F8E,"9F3B,"7B46,"6C37,"8868,"79D2,"75C5,"54C1,"8CA0,"90E8,"670D,"798F,"7269,"5E73,"8FD4,"52C9,"653E,"5473,"547D,"9762,"554F,"5F79,"85AC,"7531,"6CB9,"6709,"904A,"4E88,"7F8A,"6D0B,"8449,"967D,"69D8,"843D,"6D41,"65C5,"4E21,"7DD1,"793C,"5217,"7DF4,"8DEF,"548C,"611B,"6848,"4EE5,"8863,"4F4D,"56F2,"80C3,"5370,"82F1,"6804,"5869,"5104,"52A0,"679C,"8CA8,"8AB2,"82BD,"6539,"68B0,"5BB3,"8857,"5404,"899A,"5B8C,"5B98,"7BA1,"95A2,"89B3,"9858,"5E0C,"5B63,"7D00,"559C,"65D7,"5668,"6A5F,"8B70,"6C42,"6CE3,"6551,"7D66,"6319,"6F01,"5171,"5354,"93E1,"7AF6,"6975,"8A13,"8ECD,"90E1,"5F84,"578B,"666F,"82B8,"6B20,"7D50,"5EFA,"5065,"9A13,"56FA,"529F,"597D,"5019,"822A,"5EB7,"544A,"5DEE,"83DC,"6700,"6750,"6628,"672D,"5237,"6BBA,"5BDF,"53C2,"7523,"6563,"6B8B,"58EB,"6C0F,"53F2,"53F8,"8A66,"5150,"6CBB,"8F9E,"5931,"501F,"7A2E,"5468,"795D,"9806,"521D,"677E,"7B11,"5531,"713C,"8C61,"7167,"8CDE,"81E3,"4FE1,"6210,"7701,"6E05,"9759,"5E2D,"7A4D,"6298,"7BC0,"8AAC,"6D45,"6226,"9078,"7136,"4E89,"5009,"5DE3,"675F,"5074,"7D9A,"5352,"5B6B,"5E2F,"968A,"9054,"5358,"7F6E,"4EF2,"8CAF,"5146,"8178,"4F4E,"5E95,"505C,"7684,"5178,"4F1D,"5F92,"52AA,"706F,"5802,"50CD,"7279,"5F97,"6BD2,"71B1,"5FF5,"6557,"6885,"535A,"98EF,"98DB,"8CBB,"5FC5,"7968,"6A19,"4E0D,"592B,"4ED8,"5E9C,"526F,"7C89,"5175,"5225,"8FBA,"5909,"4FBF,"5305,"6CD5,"671B,"7267,"672B,"6E80,"672A,"8108,"6C11,"7121,"7D04,"52C7,"8981,"990A,"6D74,"5229,"9678,"826F,"6599,"91CF,"8F2A,"985E,"4EE4,"51B7,"4F8B,"6B74,"9023,"8001,"52B4,"9332,"5727,"79FB,"56E0,"6C38,"55B6,"885B,"6613,"76CA,"6DB2,"6F14,"5FDC,"5F80,"685C,"6069,"53EF,"4EEE,"4FA1,"6CB3,"904E,"8CC0,"5FEB,"89E3,"683C,"78BA,"984D,"520A,"5E79,"6163,"773C,"57FA,"5BC4,"898F,"6280,"7FA9,"9006,"4E45,"65E7,"5C45,"8A31,"5883,"5747,"7981,"53E5,"7FA4,"7D4C,"6F54,"4EF6,"5238,"967A,"691C,"9650,"73FE,"6E1B,"6545,"500B,"8B77,"52B9,"539A,"8015,"9271,"69CB,"8208,"8B1B,"6DF7,"67FB,"518D,"707D,"59BB,"63A1,"969B,"5728,"8CA1,"7F6A,"96D1,"9178,"8CDB,"652F,"5FD7,"679D,"5E2B,"8CC7,"98FC,"793A,"4F3C,"8B58,"8CEA,"820E,"8B1D,"6388,"4FEE,"8FF0,"8853,"6E96,"5E8F,"62DB,"627F,"8A3C,"6761,"72B6,"5E38,"60C5,"7E54,"8077,"5236,"6027,"653F,"52E2,"7CBE,"88FD,"7A0E,"8CAC,"7E3E,"63A5,"8A2D,"820C,"7D76,"92AD,"7956,"7D20,"7DCF,"9020,"50CF,"5897,"5247,"6E2C,"5C5E,"7387,"640D,"9000,"8CB8,"614B,"56E3,"65AD,"7BC9,"5F35,"63D0,"7A0B,"9069,"6575,"7D71,"9285,"5C0E,"5FB3,"72EC,"4EFB,"71C3,"80FD,"7834,"72AF,"5224,"7248,"6BD4,"80A5,"975E,"5099,"4FF5,"8A55,"8CA7,"5E03,"5A66,"5BCC,"6B66,"5FA9,"8907,"4ECF,"7DE8,"5F01,"4FDD,"5893,"5831,"8C4A,"9632,"8CBF,"66B4,"52D9,"5922,"8FF7,"7DBF,"8F38,"4F59,"9810,"5BB9,"7565,"7559,"9818,"7570,"907A,"57DF,"5B87,"6620,"5EF6,"6CBF,"6211,"7070,"62E1,"9769,"95A3,"5272,"682A,"5E72,"5DFB,"770B,"7C21,"5371,"673A,"63EE,"8CB4,"7591,"5438,"4F9B,"80F8,"90F7,"52E4,"7B4B,"7CFB,"656C,"8B66,"5287,"6FC0,"7A74,"7D79,"6A29,"61B2,"6E90,"53B3,"5DF1,"547C,"8AA4,"540E,"5B5D,"7687,"7D05,"964D,"92FC,"523B,"7A40,"9AA8,"56F0,"7802,"5EA7,"6E08,"88C1,"7B56,"518A,"8695,"81F3,"79C1,"59FF,"8996,"8A5E,"8A8C,"78C1,"5C04,"6368,"5C3A,"82E5,"6A39,"53CE,"5B97,"5C31,"8846,"5F93,"7E26,"7E2E,"719F,"7D14,"51E6,"7F72,"8AF8,"9664,"5C06,"50B7,"969C,"57CE,"84B8,"91DD,"4EC1,"5782,"63A8,"5BF8,"76DB,"8056,"8AA0,"5BA3,"5C02,"6CC9,"6D17,"67D3,"5584,"594F,"7A93,"5275,"88C5,"5C64,"64CD,"8535,"81D3,"5B58,"5C0A,"5B85,"62C5,"63A2,"8A95,"6BB5,"6696,"5024,"5B99,"5FE0,"8457,"5E81,"9802,"6F6E,"8CC3,"75DB,"5C55,"8A0E,"515A,"7CD6,"5C4A,"96E3,"4E73,"8A8D,"7D0D,"8133,"6D3E,"62DD,"80CC,"80BA,"4FF3,"73ED,"6669,"5426,"6279,"79D8,"8179,"596E,"4E26,"965B,"9589,"7247,"88DC,"66AE,"5B9D,"8A2A,"4EA1,"5FD8,"68D2,"679A,"5E55,"5BC6,"76DF,"6A21,"8A33,"90F5,"512A,"5E7C,"6B32,"7FCC,"4E71,"5375,"89A7,"88CF,"5F8B,"81E8,"6717,"8AD6,}
diff --git a/Master/texmf-dist/source/luatex/luatexja/tool/unicodeBlocks.tex b/Master/texmf-dist/source/luatex/luatexja/tool/unicodeBlocks.tex
index 8c7407df04f..afdd0620dae 100644
--- a/Master/texmf-dist/source/luatex/luatexja/tool/unicodeBlocks.tex
+++ b/Master/texmf-dist/source/luatex/luatexja/tool/unicodeBlocks.tex
@@ -1,210 +1,210 @@
 % based on Unicode blocks Blocks-6.0.0.txt
-\defcharrange{1}{"0000-"007F} % Basic Latin
-\defcharrange{2}{"0080-"00FF} % Latin-1 Supplement
-\defcharrange{3}{"0100-"017F} % Latin Extended-A
-\defcharrange{4}{"0180-"024F} % Latin Extended-B
-\defcharrange{5}{"0250-"02AF} % IPA Extensions
-\defcharrange{6}{"02B0-"02FF} % Spacing Modifier Letters
-\defcharrange{7}{"0300-"036F} % Combining Diacritical Marks
-\defcharrange{8}{"0370-"03FF} % Greek and Coptic
-\defcharrange{9}{"0400-"04FF} % Cyrillic
-\defcharrange{10}{"0500-"052F} % Cyrillic Supplement
-\defcharrange{11}{"0530-"058F} % Armenian
-\defcharrange{12}{"0590-"05FF} % Hebrew
-\defcharrange{13}{"0600-"06FF} % Arabic
-\defcharrange{14}{"0700-"074F} % Syriac
-\defcharrange{15}{"0750-"077F} % Arabic Supplement
-\defcharrange{16}{"0780-"07BF} % Thaana
-\defcharrange{17}{"07C0-"07FF} % NKo
-\defcharrange{18}{"0800-"083F} % Samaritan
-\defcharrange{19}{"0840-"085F} % Mandaic
-\defcharrange{20}{"0900-"097F} % Devanagari
-\defcharrange{21}{"0980-"09FF} % Bengali
-\defcharrange{22}{"0A00-"0A7F} % Gurmukhi
-\defcharrange{23}{"0A80-"0AFF} % Gujarati
-\defcharrange{24}{"0B00-"0B7F} % Oriya
-\defcharrange{25}{"0B80-"0BFF} % Tamil
-\defcharrange{26}{"0C00-"0C7F} % Telugu
-\defcharrange{27}{"0C80-"0CFF} % Kannada
-\defcharrange{28}{"0D00-"0D7F} % Malayalam
-\defcharrange{29}{"0D80-"0DFF} % Sinhala
-\defcharrange{30}{"0E00-"0E7F} % Thai
-\defcharrange{31}{"0E80-"0EFF} % Lao
-\defcharrange{32}{"0F00-"0FFF} % Tibetan
-\defcharrange{33}{"1000-"109F} % Myanmar
-\defcharrange{34}{"10A0-"10FF} % Georgian
-\defcharrange{35}{"1100-"11FF} % Hangul Jamo
-\defcharrange{36}{"1200-"137F} % Ethiopic
-\defcharrange{37}{"1380-"139F} % Ethiopic Supplement
-\defcharrange{38}{"13A0-"13FF} % Cherokee
-\defcharrange{39}{"1400-"167F} % Unified Canadian Aboriginal Syllabics
-\defcharrange{40}{"1680-"169F} % Ogham
-\defcharrange{41}{"16A0-"16FF} % Runic
-\defcharrange{42}{"1700-"171F} % Tagalog
-\defcharrange{43}{"1720-"173F} % Hanunoo
-\defcharrange{44}{"1740-"175F} % Buhid
-\defcharrange{45}{"1760-"177F} % Tagbanwa
-\defcharrange{46}{"1780-"17FF} % Khmer
-\defcharrange{47}{"1800-"18AF} % Mongolian
-\defcharrange{48}{"18B0-"18FF} % Unified Canadian Aboriginal Syllabics Extended
-\defcharrange{49}{"1900-"194F} % Limbu
-\defcharrange{50}{"1950-"197F} % Tai Le
-\defcharrange{51}{"1980-"19DF} % New Tai Lue
-\defcharrange{52}{"19E0-"19FF} % Khmer Symbols
-\defcharrange{53}{"1A00-"1A1F} % Buginese
-\defcharrange{54}{"1A20-"1AAF} % Tai Tham
-\defcharrange{55}{"1B00-"1B7F} % Balinese
-\defcharrange{56}{"1B80-"1BBF} % Sundanese
-\defcharrange{57}{"1BC0-"1BFF} % Batak
-\defcharrange{58}{"1C00-"1C4F} % Lepcha
-\defcharrange{59}{"1C50-"1C7F} % Ol Chiki
-\defcharrange{60}{"1CD0-"1CFF} % Vedic Extensions
-\defcharrange{61}{"1D00-"1D7F} % Phonetic Extensions
-\defcharrange{62}{"1D80-"1DBF} % Phonetic Extensions Supplement
-\defcharrange{63}{"1DC0-"1DFF} % Combining Diacritical Marks Supplement
-\defcharrange{64}{"1E00-"1EFF} % Latin Extended Additional
-\defcharrange{65}{"1F00-"1FFF} % Greek Extended
-\defcharrange{66}{"2000-"206F} % General Punctuation
-\defcharrange{67}{"2070-"209F} % Superscripts and Subscripts
-\defcharrange{68}{"20A0-"20CF} % Currency Symbols
-\defcharrange{69}{"20D0-"20FF} % Combining Diacritical Marks for Symbols
-\defcharrange{70}{"2100-"214F} % Letterlike Symbols
-\defcharrange{71}{"2150-"218F} % Number Forms
-\defcharrange{72}{"2190-"21FF} % Arrows
-\defcharrange{73}{"2200-"22FF} % Mathematical Operators
-\defcharrange{74}{"2300-"23FF} % Miscellaneous Technical
-\defcharrange{75}{"2400-"243F} % Control Pictures
-\defcharrange{76}{"2440-"245F} % Optical Character Recognition
-\defcharrange{77}{"2460-"24FF} % Enclosed Alphanumerics
-\defcharrange{78}{"2500-"257F} % Box Drawing
-\defcharrange{79}{"2580-"259F} % Block Elements
-\defcharrange{80}{"25A0-"25FF} % Geometric Shapes
-\defcharrange{81}{"2600-"26FF} % Miscellaneous Symbols
-\defcharrange{82}{"2700-"27BF} % Dingbats
-\defcharrange{83}{"27C0-"27EF} % Miscellaneous Mathematical Symbols-A
-\defcharrange{84}{"27F0-"27FF} % Supplemental Arrows-A
-\defcharrange{85}{"2800-"28FF} % Braille Patterns
-\defcharrange{86}{"2900-"297F} % Supplemental Arrows-B
-\defcharrange{87}{"2980-"29FF} % Miscellaneous Mathematical Symbols-B
-\defcharrange{88}{"2A00-"2AFF} % Supplemental Mathematical Operators
-\defcharrange{89}{"2B00-"2BFF} % Miscellaneous Symbols and Arrows
-\defcharrange{90}{"2C00-"2C5F} % Glagolitic
-\defcharrange{91}{"2C60-"2C7F} % Latin Extended-C
-\defcharrange{92}{"2C80-"2CFF} % Coptic
-\defcharrange{93}{"2D00-"2D2F} % Georgian Supplement
-\defcharrange{94}{"2D30-"2D7F} % Tifinagh
-\defcharrange{95}{"2D80-"2DDF} % Ethiopic Extended
-\defcharrange{96}{"2DE0-"2DFF} % Cyrillic Extended-A
-\defcharrange{97}{"2E00-"2E7F} % Supplemental Punctuation
-\defcharrange{98}{"2E80-"2EFF} % CJK Radicals Supplement
-\defcharrange{99}{"2F00-"2FDF} % Kangxi Radicals
-\defcharrange{100}{"2FF0-"2FFF} % Ideographic Description Characters
-\defcharrange{101}{"3000-"303F} % CJK Symbols and Punctuation
-\defcharrange{102}{"3040-"309F} % Hiragana
-\defcharrange{103}{"30A0-"30FF} % Katakana
-\defcharrange{104}{"3100-"312F} % Bopomofo
-\defcharrange{105}{"3130-"318F} % Hangul Compatibility Jamo
-\defcharrange{106}{"3190-"319F} % Kanbun
-\defcharrange{107}{"31A0-"31BF} % Bopomofo Extended
-\defcharrange{108}{"31C0-"31EF} % CJK Strokes
-\defcharrange{109}{"31F0-"31FF} % Katakana Phonetic Extensions
-\defcharrange{110}{"3200-"32FF} % Enclosed CJK Letters and Months
-\defcharrange{111}{"3300-"33FF} % CJK Compatibility
-\defcharrange{112}{"3400-"4DBF} % CJK Unified Ideographs Extension A
-\defcharrange{113}{"4DC0-"4DFF} % Yijing Hexagram Symbols
-\defcharrange{114}{"4E00-"9FFF} % CJK Unified Ideographs
-\defcharrange{115}{"A000-"A48F} % Yi Syllables
-\defcharrange{116}{"A490-"A4CF} % Yi Radicals
-\defcharrange{117}{"A4D0-"A4FF} % Lisu
-\defcharrange{118}{"A500-"A63F} % Vai
-\defcharrange{119}{"A640-"A69F} % Cyrillic Extended-B
-\defcharrange{120}{"A6A0-"A6FF} % Bamum
-\defcharrange{121}{"A700-"A71F} % Modifier Tone Letters
-\defcharrange{122}{"A720-"A7FF} % Latin Extended-D
-\defcharrange{123}{"A800-"A82F} % Syloti Nagri
-\defcharrange{124}{"A830-"A83F} % Common Indic Number Forms
-\defcharrange{125}{"A840-"A87F} % Phags-pa
-\defcharrange{126}{"A880-"A8DF} % Saurashtra
-\defcharrange{127}{"A8E0-"A8FF} % Devanagari Extended
-\defcharrange{128}{"A900-"A92F} % Kayah Li
-\defcharrange{129}{"A930-"A95F} % Rejang
-\defcharrange{130}{"A960-"A97F} % Hangul Jamo Extended-A
-\defcharrange{131}{"A980-"A9DF} % Javanese
-\defcharrange{132}{"AA00-"AA5F} % Cham
-\defcharrange{133}{"AA60-"AA7F} % Myanmar Extended-A
-\defcharrange{134}{"AA80-"AADF} % Tai Viet
-\defcharrange{135}{"AB00-"AB2F} % Ethiopic Extended-A
-\defcharrange{136}{"ABC0-"ABFF} % Meetei Mayek
-\defcharrange{137}{"AC00-"D7AF} % Hangul Syllables
-\defcharrange{138}{"D7B0-"D7FF} % Hangul Jamo Extended-B
-\defcharrange{139}{"D800-"DB7F} % High Surrogates
-\defcharrange{140}{"DB80-"DBFF} % High Private Use Surrogates
-\defcharrange{141}{"DC00-"DFFF} % Low Surrogates
-\defcharrange{142}{"E000-"F8FF} % Private Use Area
-\defcharrange{143}{"F900-"FAFF} % CJK Compatibility Ideographs
-\defcharrange{144}{"FB00-"FB4F} % Alphabetic Presentation Forms
-\defcharrange{145}{"FB50-"FDFF} % Arabic Presentation Forms-A
-\defcharrange{146}{"FE00-"FE0F} % Variation Selectors
-\defcharrange{147}{"FE10-"FE1F} % Vertical Forms
-\defcharrange{148}{"FE20-"FE2F} % Combining Half Marks
-\defcharrange{149}{"FE30-"FE4F} % CJK Compatibility Forms
-\defcharrange{150}{"FE50-"FE6F} % Small Form Variants
-\defcharrange{151}{"FE70-"FEFF} % Arabic Presentation Forms-B
-\defcharrange{152}{"FF00-"FFEF} % Halfwidth and Fullwidth Forms
-\defcharrange{153}{"FFF0-"FFFF} % Specials
-\defcharrange{154}{"10000-"1007F} % Linear B Syllabary
-\defcharrange{155}{"10080-"100FF} % Linear B Ideograms
-\defcharrange{156}{"10100-"1013F} % Aegean Numbers
-\defcharrange{157}{"10140-"1018F} % Ancient Greek Numbers
-\defcharrange{158}{"10190-"101CF} % Ancient Symbols
-\defcharrange{159}{"101D0-"101FF} % Phaistos Disc
-\defcharrange{160}{"10280-"1029F} % Lycian
-\defcharrange{161}{"102A0-"102DF} % Carian
-\defcharrange{162}{"10300-"1032F} % Old Italic
-\defcharrange{163}{"10330-"1034F} % Gothic
-\defcharrange{164}{"10380-"1039F} % Ugaritic
-\defcharrange{165}{"103A0-"103DF} % Old Persian
-\defcharrange{166}{"10400-"1044F} % Deseret
-\defcharrange{167}{"10450-"1047F} % Shavian
-\defcharrange{168}{"10480-"104AF} % Osmanya
-\defcharrange{169}{"10800-"1083F} % Cypriot Syllabary
-\defcharrange{170}{"10840-"1085F} % Imperial Aramaic
-\defcharrange{171}{"10900-"1091F} % Phoenician
-\defcharrange{172}{"10920-"1093F} % Lydian
-\defcharrange{173}{"10A00-"10A5F} % Kharoshthi
-\defcharrange{174}{"10A60-"10A7F} % Old South Arabian
-\defcharrange{175}{"10B00-"10B3F} % Avestan
-\defcharrange{176}{"10B40-"10B5F} % Inscriptional Parthian
-\defcharrange{177}{"10B60-"10B7F} % Inscriptional Pahlavi
-\defcharrange{178}{"10C00-"10C4F} % Old Turkic
-\defcharrange{179}{"10E60-"10E7F} % Rumi Numeral Symbols
-\defcharrange{180}{"11000-"1107F} % Brahmi
-\defcharrange{181}{"11080-"110CF} % Kaithi
-\defcharrange{182}{"12000-"123FF} % Cuneiform
-\defcharrange{183}{"12400-"1247F} % Cuneiform Numbers and Punctuation
-\defcharrange{184}{"13000-"1342F} % Egyptian Hieroglyphs
-\defcharrange{185}{"16800-"16A3F} % Bamum Supplement
-\defcharrange{186}{"1B000-"1B0FF} % Kana Supplement
-\defcharrange{187}{"1D000-"1D0FF} % Byzantine Musical Symbols
-\defcharrange{188}{"1D100-"1D1FF} % Musical Symbols
-\defcharrange{189}{"1D200-"1D24F} % Ancient Greek Musical Notation
-\defcharrange{190}{"1D300-"1D35F} % Tai Xuan Jing Symbols
-\defcharrange{191}{"1D360-"1D37F} % Counting Rod Numerals
-\defcharrange{192}{"1D400-"1D7FF} % Mathematical Alphanumeric Symbols
-\defcharrange{193}{"1F000-"1F02F} % Mahjong Tiles
-\defcharrange{194}{"1F030-"1F09F} % Domino Tiles
-\defcharrange{195}{"1F0A0-"1F0FF} % Playing Cards
-\defcharrange{196}{"1F100-"1F1FF} % Enclosed Alphanumeric Supplement
-\defcharrange{197}{"1F200-"1F2FF} % Enclosed Ideographic Supplement
-\defcharrange{198}{"1F300-"1F5FF} % Miscellaneous Symbols And Pictographs
-\defcharrange{199}{"1F600-"1F64F} % Emoticons
-\defcharrange{200}{"1F680-"1F6FF} % Transport And Map Symbols
-\defcharrange{201}{"1F700-"1F77F} % Alchemical Symbols
-\defcharrange{202}{"20000-"2A6DF} % CJK Unified Ideographs Extension B
-\defcharrange{203}{"2A700-"2B73F} % CJK Unified Ideographs Extension C
-\defcharrange{204}{"2B740-"2B81F} % CJK Unified Ideographs Extension D
-\defcharrange{205}{"2F800-"2FA1F} % CJK Compatibility Ideographs Supplement
-\defcharrange{206}{"E0000-"E007F} % Tags
-\defcharrange{207}{"E0100-"E01EF} % Variation Selectors Supplement
-\defcharrange{208}{"F0000-"FFFFF} % Supplementary Private Use Area-A
-\defcharrange{209}{"100000-"10FFFF} % Supplementary Private Use Area-B
+\ltjdefcharrange{1}{"0000-"007F} % Basic Latin
+\ltjdefcharrange{2}{"0080-"00FF} % Latin-1 Supplement
+\ltjdefcharrange{3}{"0100-"017F} % Latin Extended-A
+\ltjdefcharrange{4}{"0180-"024F} % Latin Extended-B
+\ltjdefcharrange{5}{"0250-"02AF} % IPA Extensions
+\ltjdefcharrange{6}{"02B0-"02FF} % Spacing Modifier Letters
+\ltjdefcharrange{7}{"0300-"036F} % Combining Diacritical Marks
+\ltjdefcharrange{8}{"0370-"03FF} % Greek and Coptic
+\ltjdefcharrange{9}{"0400-"04FF} % Cyrillic
+\ltjdefcharrange{10}{"0500-"052F} % Cyrillic Supplement
+\ltjdefcharrange{11}{"0530-"058F} % Armenian
+\ltjdefcharrange{12}{"0590-"05FF} % Hebrew
+\ltjdefcharrange{13}{"0600-"06FF} % Arabic
+\ltjdefcharrange{14}{"0700-"074F} % Syriac
+\ltjdefcharrange{15}{"0750-"077F} % Arabic Supplement
+\ltjdefcharrange{16}{"0780-"07BF} % Thaana
+\ltjdefcharrange{17}{"07C0-"07FF} % NKo
+\ltjdefcharrange{18}{"0800-"083F} % Samaritan
+\ltjdefcharrange{19}{"0840-"085F} % Mandaic
+\ltjdefcharrange{20}{"0900-"097F} % Devanagari
+\ltjdefcharrange{21}{"0980-"09FF} % Bengali
+\ltjdefcharrange{22}{"0A00-"0A7F} % Gurmukhi
+\ltjdefcharrange{23}{"0A80-"0AFF} % Gujarati
+\ltjdefcharrange{24}{"0B00-"0B7F} % Oriya
+\ltjdefcharrange{25}{"0B80-"0BFF} % Tamil
+\ltjdefcharrange{26}{"0C00-"0C7F} % Telugu
+\ltjdefcharrange{27}{"0C80-"0CFF} % Kannada
+\ltjdefcharrange{28}{"0D00-"0D7F} % Malayalam
+\ltjdefcharrange{29}{"0D80-"0DFF} % Sinhala
+\ltjdefcharrange{30}{"0E00-"0E7F} % Thai
+\ltjdefcharrange{31}{"0E80-"0EFF} % Lao
+\ltjdefcharrange{32}{"0F00-"0FFF} % Tibetan
+\ltjdefcharrange{33}{"1000-"109F} % Myanmar
+\ltjdefcharrange{34}{"10A0-"10FF} % Georgian
+\ltjdefcharrange{35}{"1100-"11FF} % Hangul Jamo
+\ltjdefcharrange{36}{"1200-"137F} % Ethiopic
+\ltjdefcharrange{37}{"1380-"139F} % Ethiopic Supplement
+\ltjdefcharrange{38}{"13A0-"13FF} % Cherokee
+\ltjdefcharrange{39}{"1400-"167F} % Unified Canadian Aboriginal Syllabics
+\ltjdefcharrange{40}{"1680-"169F} % Ogham
+\ltjdefcharrange{41}{"16A0-"16FF} % Runic
+\ltjdefcharrange{42}{"1700-"171F} % Tagalog
+\ltjdefcharrange{43}{"1720-"173F} % Hanunoo
+\ltjdefcharrange{44}{"1740-"175F} % Buhid
+\ltjdefcharrange{45}{"1760-"177F} % Tagbanwa
+\ltjdefcharrange{46}{"1780-"17FF} % Khmer
+\ltjdefcharrange{47}{"1800-"18AF} % Mongolian
+\ltjdefcharrange{48}{"18B0-"18FF} % Unified Canadian Aboriginal Syllabics Extended
+\ltjdefcharrange{49}{"1900-"194F} % Limbu
+\ltjdefcharrange{50}{"1950-"197F} % Tai Le
+\ltjdefcharrange{51}{"1980-"19DF} % New Tai Lue
+\ltjdefcharrange{52}{"19E0-"19FF} % Khmer Symbols
+\ltjdefcharrange{53}{"1A00-"1A1F} % Buginese
+\ltjdefcharrange{54}{"1A20-"1AAF} % Tai Tham
+\ltjdefcharrange{55}{"1B00-"1B7F} % Balinese
+\ltjdefcharrange{56}{"1B80-"1BBF} % Sundanese
+\ltjdefcharrange{57}{"1BC0-"1BFF} % Batak
+\ltjdefcharrange{58}{"1C00-"1C4F} % Lepcha
+\ltjdefcharrange{59}{"1C50-"1C7F} % Ol Chiki
+\ltjdefcharrange{60}{"1CD0-"1CFF} % Vedic Extensions
+\ltjdefcharrange{61}{"1D00-"1D7F} % Phonetic Extensions
+\ltjdefcharrange{62}{"1D80-"1DBF} % Phonetic Extensions Supplement
+\ltjdefcharrange{63}{"1DC0-"1DFF} % Combining Diacritical Marks Supplement
+\ltjdefcharrange{64}{"1E00-"1EFF} % Latin Extended Additional
+\ltjdefcharrange{65}{"1F00-"1FFF} % Greek Extended
+\ltjdefcharrange{66}{"2000-"206F} % General Punctuation
+\ltjdefcharrange{67}{"2070-"209F} % Superscripts and Subscripts
+\ltjdefcharrange{68}{"20A0-"20CF} % Currency Symbols
+\ltjdefcharrange{69}{"20D0-"20FF} % Combining Diacritical Marks for Symbols
+\ltjdefcharrange{70}{"2100-"214F} % Letterlike Symbols
+\ltjdefcharrange{71}{"2150-"218F} % Number Forms
+\ltjdefcharrange{72}{"2190-"21FF} % Arrows
+\ltjdefcharrange{73}{"2200-"22FF} % Mathematical Operators
+\ltjdefcharrange{74}{"2300-"23FF} % Miscellaneous Technical
+\ltjdefcharrange{75}{"2400-"243F} % Control Pictures
+\ltjdefcharrange{76}{"2440-"245F} % Optical Character Recognition
+\ltjdefcharrange{77}{"2460-"24FF} % Enclosed Alphanumerics
+\ltjdefcharrange{78}{"2500-"257F} % Box Drawing
+\ltjdefcharrange{79}{"2580-"259F} % Block Elements
+\ltjdefcharrange{80}{"25A0-"25FF} % Geometric Shapes
+\ltjdefcharrange{81}{"2600-"26FF} % Miscellaneous Symbols
+\ltjdefcharrange{82}{"2700-"27BF} % Dingbats
+\ltjdefcharrange{83}{"27C0-"27EF} % Miscellaneous Mathematical Symbols-A
+\ltjdefcharrange{84}{"27F0-"27FF} % Supplemental Arrows-A
+\ltjdefcharrange{85}{"2800-"28FF} % Braille Patterns
+\ltjdefcharrange{86}{"2900-"297F} % Supplemental Arrows-B
+\ltjdefcharrange{87}{"2980-"29FF} % Miscellaneous Mathematical Symbols-B
+\ltjdefcharrange{88}{"2A00-"2AFF} % Supplemental Mathematical Operators
+\ltjdefcharrange{89}{"2B00-"2BFF} % Miscellaneous Symbols and Arrows
+\ltjdefcharrange{90}{"2C00-"2C5F} % Glagolitic
+\ltjdefcharrange{91}{"2C60-"2C7F} % Latin Extended-C
+\ltjdefcharrange{92}{"2C80-"2CFF} % Coptic
+\ltjdefcharrange{93}{"2D00-"2D2F} % Georgian Supplement
+\ltjdefcharrange{94}{"2D30-"2D7F} % Tifinagh
+\ltjdefcharrange{95}{"2D80-"2DDF} % Ethiopic Extended
+\ltjdefcharrange{96}{"2DE0-"2DFF} % Cyrillic Extended-A
+\ltjdefcharrange{97}{"2E00-"2E7F} % Supplemental Punctuation
+\ltjdefcharrange{98}{"2E80-"2EFF} % CJK Radicals Supplement
+\ltjdefcharrange{99}{"2F00-"2FDF} % Kangxi Radicals
+\ltjdefcharrange{100}{"2FF0-"2FFF} % Ideographic Description Characters
+\ltjdefcharrange{101}{"3000-"303F} % CJK Symbols and Punctuation
+\ltjdefcharrange{102}{"3040-"309F} % Hiragana
+\ltjdefcharrange{103}{"30A0-"30FF} % Katakana
+\ltjdefcharrange{104}{"3100-"312F} % Bopomofo
+\ltjdefcharrange{105}{"3130-"318F} % Hangul Compatibility Jamo
+\ltjdefcharrange{106}{"3190-"319F} % Kanbun
+\ltjdefcharrange{107}{"31A0-"31BF} % Bopomofo Extended
+\ltjdefcharrange{108}{"31C0-"31EF} % CJK Strokes
+\ltjdefcharrange{109}{"31F0-"31FF} % Katakana Phonetic Extensions
+\ltjdefcharrange{110}{"3200-"32FF} % Enclosed CJK Letters and Months
+\ltjdefcharrange{111}{"3300-"33FF} % CJK Compatibility
+\ltjdefcharrange{112}{"3400-"4DBF} % CJK Unified Ideographs Extension A
+\ltjdefcharrange{113}{"4DC0-"4DFF} % Yijing Hexagram Symbols
+\ltjdefcharrange{114}{"4E00-"9FFF} % CJK Unified Ideographs
+\ltjdefcharrange{115}{"A000-"A48F} % Yi Syllables
+\ltjdefcharrange{116}{"A490-"A4CF} % Yi Radicals
+\ltjdefcharrange{117}{"A4D0-"A4FF} % Lisu
+\ltjdefcharrange{118}{"A500-"A63F} % Vai
+\ltjdefcharrange{119}{"A640-"A69F} % Cyrillic Extended-B
+\ltjdefcharrange{120}{"A6A0-"A6FF} % Bamum
+\ltjdefcharrange{121}{"A700-"A71F} % Modifier Tone Letters
+\ltjdefcharrange{122}{"A720-"A7FF} % Latin Extended-D
+\ltjdefcharrange{123}{"A800-"A82F} % Syloti Nagri
+\ltjdefcharrange{124}{"A830-"A83F} % Common Indic Number Forms
+\ltjdefcharrange{125}{"A840-"A87F} % Phags-pa
+\ltjdefcharrange{126}{"A880-"A8DF} % Saurashtra
+\ltjdefcharrange{127}{"A8E0-"A8FF} % Devanagari Extended
+\ltjdefcharrange{128}{"A900-"A92F} % Kayah Li
+\ltjdefcharrange{129}{"A930-"A95F} % Rejang
+\ltjdefcharrange{130}{"A960-"A97F} % Hangul Jamo Extended-A
+\ltjdefcharrange{131}{"A980-"A9DF} % Javanese
+\ltjdefcharrange{132}{"AA00-"AA5F} % Cham
+\ltjdefcharrange{133}{"AA60-"AA7F} % Myanmar Extended-A
+\ltjdefcharrange{134}{"AA80-"AADF} % Tai Viet
+\ltjdefcharrange{135}{"AB00-"AB2F} % Ethiopic Extended-A
+\ltjdefcharrange{136}{"ABC0-"ABFF} % Meetei Mayek
+\ltjdefcharrange{137}{"AC00-"D7AF} % Hangul Syllables
+\ltjdefcharrange{138}{"D7B0-"D7FF} % Hangul Jamo Extended-B
+\ltjdefcharrange{139}{"D800-"DB7F} % High Surrogates
+\ltjdefcharrange{140}{"DB80-"DBFF} % High Private Use Surrogates
+\ltjdefcharrange{141}{"DC00-"DFFF} % Low Surrogates
+\ltjdefcharrange{142}{"E000-"F8FF} % Private Use Area
+\ltjdefcharrange{143}{"F900-"FAFF} % CJK Compatibility Ideographs
+\ltjdefcharrange{144}{"FB00-"FB4F} % Alphabetic Presentation Forms
+\ltjdefcharrange{145}{"FB50-"FDFF} % Arabic Presentation Forms-A
+\ltjdefcharrange{146}{"FE00-"FE0F} % Variation Selectors
+\ltjdefcharrange{147}{"FE10-"FE1F} % Vertical Forms
+\ltjdefcharrange{148}{"FE20-"FE2F} % Combining Half Marks
+\ltjdefcharrange{149}{"FE30-"FE4F} % CJK Compatibility Forms
+\ltjdefcharrange{150}{"FE50-"FE6F} % Small Form Variants
+\ltjdefcharrange{151}{"FE70-"FEFF} % Arabic Presentation Forms-B
+\ltjdefcharrange{152}{"FF00-"FFEF} % Halfwidth and Fullwidth Forms
+\ltjdefcharrange{153}{"FFF0-"FFFF} % Specials
+\ltjdefcharrange{154}{"10000-"1007F} % Linear B Syllabary
+\ltjdefcharrange{155}{"10080-"100FF} % Linear B Ideograms
+\ltjdefcharrange{156}{"10100-"1013F} % Aegean Numbers
+\ltjdefcharrange{157}{"10140-"1018F} % Ancient Greek Numbers
+\ltjdefcharrange{158}{"10190-"101CF} % Ancient Symbols
+\ltjdefcharrange{159}{"101D0-"101FF} % Phaistos Disc
+\ltjdefcharrange{160}{"10280-"1029F} % Lycian
+\ltjdefcharrange{161}{"102A0-"102DF} % Carian
+\ltjdefcharrange{162}{"10300-"1032F} % Old Italic
+\ltjdefcharrange{163}{"10330-"1034F} % Gothic
+\ltjdefcharrange{164}{"10380-"1039F} % Ugaritic
+\ltjdefcharrange{165}{"103A0-"103DF} % Old Persian
+\ltjdefcharrange{166}{"10400-"1044F} % Deseret
+\ltjdefcharrange{167}{"10450-"1047F} % Shavian
+\ltjdefcharrange{168}{"10480-"104AF} % Osmanya
+\ltjdefcharrange{169}{"10800-"1083F} % Cypriot Syllabary
+\ltjdefcharrange{170}{"10840-"1085F} % Imperial Aramaic
+\ltjdefcharrange{171}{"10900-"1091F} % Phoenician
+\ltjdefcharrange{172}{"10920-"1093F} % Lydian
+\ltjdefcharrange{173}{"10A00-"10A5F} % Kharoshthi
+\ltjdefcharrange{174}{"10A60-"10A7F} % Old South Arabian
+\ltjdefcharrange{175}{"10B00-"10B3F} % Avestan
+\ltjdefcharrange{176}{"10B40-"10B5F} % Inscriptional Parthian
+\ltjdefcharrange{177}{"10B60-"10B7F} % Inscriptional Pahlavi
+\ltjdefcharrange{178}{"10C00-"10C4F} % Old Turkic
+\ltjdefcharrange{179}{"10E60-"10E7F} % Rumi Numeral Symbols
+\ltjdefcharrange{180}{"11000-"1107F} % Brahmi
+\ltjdefcharrange{181}{"11080-"110CF} % Kaithi
+\ltjdefcharrange{182}{"12000-"123FF} % Cuneiform
+\ltjdefcharrange{183}{"12400-"1247F} % Cuneiform Numbers and Punctuation
+\ltjdefcharrange{184}{"13000-"1342F} % Egyptian Hieroglyphs
+\ltjdefcharrange{185}{"16800-"16A3F} % Bamum Supplement
+\ltjdefcharrange{186}{"1B000-"1B0FF} % Kana Supplement
+\ltjdefcharrange{187}{"1D000-"1D0FF} % Byzantine Musical Symbols
+\ltjdefcharrange{188}{"1D100-"1D1FF} % Musical Symbols
+\ltjdefcharrange{189}{"1D200-"1D24F} % Ancient Greek Musical Notation
+\ltjdefcharrange{190}{"1D300-"1D35F} % Tai Xuan Jing Symbols
+\ltjdefcharrange{191}{"1D360-"1D37F} % Counting Rod Numerals
+\ltjdefcharrange{192}{"1D400-"1D7FF} % Mathematical Alphanumeric Symbols
+\ltjdefcharrange{193}{"1F000-"1F02F} % Mahjong Tiles
+\ltjdefcharrange{194}{"1F030-"1F09F} % Domino Tiles
+\ltjdefcharrange{195}{"1F0A0-"1F0FF} % Playing Cards
+\ltjdefcharrange{196}{"1F100-"1F1FF} % Enclosed Alphanumeric Supplement
+\ltjdefcharrange{197}{"1F200-"1F2FF} % Enclosed Ideographic Supplement
+\ltjdefcharrange{198}{"1F300-"1F5FF} % Miscellaneous Symbols And Pictographs
+\ltjdefcharrange{199}{"1F600-"1F64F} % Emoticons
+\ltjdefcharrange{200}{"1F680-"1F6FF} % Transport And Map Symbols
+\ltjdefcharrange{201}{"1F700-"1F77F} % Alchemical Symbols
+\ltjdefcharrange{202}{"20000-"2A6DF} % CJK Unified Ideographs Extension B
+\ltjdefcharrange{203}{"2A700-"2B73F} % CJK Unified Ideographs Extension C
+\ltjdefcharrange{204}{"2B740-"2B81F} % CJK Unified Ideographs Extension D
+\ltjdefcharrange{205}{"2F800-"2FA1F} % CJK Compatibility Ideographs Supplement
+\ltjdefcharrange{206}{"E0000-"E007F} % Tags
+\ltjdefcharrange{207}{"E0100-"E01EF} % Variation Selectors Supplement
+\ltjdefcharrange{208}{"F0000-"FFFFF} % Supplementary Private Use Area-A
+\ltjdefcharrange{209}{"100000-"10FFFF} % Supplementary Private Use Area-B