diff options
19 files changed, 517 insertions, 3869 deletions
diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README index ec829936504..8dd4e8f05b2 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/README +++ b/Master/texmf-dist/doc/luatex/luatexja/README @@ -1,6 +1,6 @@ -The LuaTeX-ja Package 20141013.0 +The LuaTeX-ja Package 20150307.0 -------------------------------- -Copyright (c) 2011--2014 The LuaTeX-ja project +Copyright (c) 2011--2015 The LuaTeX-ja project License: modified BSD (see COPYING) LuaTeX-ja is a macro package for typesetting Japanese documents with LuaTeX. @@ -35,26 +35,26 @@ Installation 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20141013.0 in the Git repository by + or tagged as 20150307.0 in the Git repository by <http://git.sourceforge.jp/view?p=luatex-ja/luatexja.git - ;a=snapshot;h=refs/tags/20141013.0;sf=tgz> + ;a=snapshot;h=refs/tags/20150307.0;sf=tgz> - b1. Extract the archive and process following three files by LuaLaTeX + b. Extract the archive and process following three files by LuaLaTeX to generate classes for Japanese typesetting: src/ltjclasses.ins src/ltjltxdoc.ins src/ltjsclasses.ins - b2. Process src/ltj-kinsoku_make.tex by (plain) LuaTeX to generate ltj-kinsoku.lua, + c. Process src/ltj-kinsoku_make.tex by (plain) LuaTeX to generate ltj-kinsoku.lua, which stores default "kinsoku" parameters. - c. Put src/ into your TEXMF tree. + d. Put src/ into your TEXMF tree. An example location is TEXMF/tex/luatex/luatexja. If you are updating from old version, you MUST remove it before extracting the new version of LuaTeX-ja. - d. You may need to update the filename database, by 'mktexlsr' or something. + e. You may need to update the filename database, by 'mktexlsr' or something. Basic Usage @@ -66,7 +66,7 @@ Simply loading luatexja.sty by \input or \usepackage does the minimal setting. - If you want to create Japanese-based documents, you can consider the use of ltj{article,book,report}.cls or ltjs{article,book}.cls. - If you want to use the fontspec package, please load luatexja-fontspec.sty. - It defines control sequences such as \setmainjfont, setsansjfont and + It defines control sequences such as \setmainjfont, \setsansjfont and \jfontspec, which can be used for specifying Japanese fonts. Notes @@ -82,4 +82,4 @@ Notes * src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use. -Last commit date: Mon Oct 13 15:12:04 2014 +0900 +Last commit date: Sat Mar 7 14:21:00 2015 +0900 diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf Binary files differindex c42dbc652a5..0259ee6564c 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf +++ b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf 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 9a397716855..b98bfbccd84 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 a664af6c94b..ab58b8a2201 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 f98bd5dfcd0..aabf2ecd5c1 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx @@ -917,9 +917,25 @@ Note that the bold series in both family are same as the medium series of \emph{ また，どちらのファミリでもイタリック体・スラント体は定義されない． %</ja> - %<en>\item Japanese characters in math mode are typeset by the font family \texttt{mc}. %<ja>\item 数式モード中の和文文字は明朝体(\texttt{mc})で出力される． + +%<*en> +\item If you use the \Pkg{beamer} class with the default font theme (which uses sans serif + fonts) and with \LuaTeX-ja, you might want to change default Japanese fonts to + \emph{gothic} family. The following line changes the default Japanese font family + to \emph{gothic}: +%</en> +%<*ja> +\item \Pkg{beamer}クラスを既定のフォント設定で使う場合，既定欧文フォントがサンセリフなの + で，既定和文フォントもゴシック体にしたいと思うかもしれない．その場合はプリアンブルに +次を書けばよい： +%</ja> +\begin{lstlisting} + \renewcommand{\kanjifamilydefault}{\gtdefault} +\end{lstlisting} + + \end{itemize} %<*en> @@ -1075,6 +1091,7 @@ auto select&\cs{fontencoding}&\cs{fontfamily}&---&---&\cs{usefont}\\ \ref{ssec-altfont}節の \cs{ltjdeclarealtfont} と，その\LaTeX 版の\ \cs{DeclareAlternateKanjiFont}（\ref{ssec-nfsspat}節）を参照せよ． %</ja> + \end{itemize} %<*en> @@ -2502,7 +2519,7 @@ for \LuaTeX, \emph{to match the \cs{catcode} setting with that of \XeTeX.} %<en>&\bf row&\bf col.&\bf \pTeX&\bf \upTeX&\bf\LuaTeX-ja\\ %<ja>&\bf 区&\bf 点&\bf \pTeX&\bf \upTeX&\fontseries{b}\selectfont\LuaTeX-ja\\ \midrule -\D 3000&1&1&N&N&Y\\ +%\D 3000&1&1&N&N&Y\\ \D 30FB&1&6&N&Y&N\\ \D 309B&1&11&N&Y&N\\ \D 309C&1&12&N&Y&N\\ @@ -2510,16 +2527,18 @@ for \LuaTeX, \emph{to match the \cs{catcode} setting with that of \XeTeX.} \D FF3E&1&16&N&N&Y\\ \D FFE3&1&17&N&N&Y\\ \D FF3F&1&18&N&N&Y\\ -\D 30FD&1&19&N&Y&Y\\ -\D 30FE&1&20&N&Y&Y\\ -\D 309D&1&21&N&Y&Y\\ -\D 309E&1&22&N&Y&Y\\ +%\D 30FD&1&19&N&Y&Y\\ +%\D 30FE&1&20&N&Y&Y\\ +%\D 309D&1&21&N&Y&Y\\ +%\D 309E&1&22&N&Y&Y\\ \D 3003&1&23&N&N&Y\\ \D 4EDD&1&24&N&Y&Y\\ \D 3005&1&25&N&N&Y\\ \D 3006&1&26&N&N&Y\\ \D 3007&1&27&N&N&Y\\ \D 30FC&1&28&N&Y&Y\\ +\D FF0F&1&31&N&N&Y\\ +\D FF3C&1&32&N&N&Y\\ \bottomrule \end{tabular}\qquad \begin{tabular}{cccccc} @@ -2527,8 +2546,6 @@ for \LuaTeX, \emph{to match the \cs{catcode} setting with that of \XeTeX.} %<en>&\bf row&\bf col.&\bf \pTeX&\bf \upTeX&\bf\LuaTeX-ja\\ %<ja>&\bf 区&\bf 点&\bf \pTeX&\bf \upTeX&\fontseries{b}\selectfont\LuaTeX-ja\\ \midrule -\D FF0F&1&31&N&N&Y\\ -\D FF3C&1&32&N&N&Y\\ \D FF5C&1&35&N&N&Y\\ \D FF0B&1&60&N&N&Y\\ \D FF1D&1&65&N&N&Y\\ @@ -2546,7 +2563,6 @@ for \LuaTeX, \emph{to match the \cs{catcode} setting with that of \XeTeX.} %<en>\multicolumn{3}{c}{$\vphantom{\D 3000}$\hbox{}Cyrillic letters (row 7)}&N&N&Y\\ %<ja>\multicolumn{3}{c}{$\vphantom{\D 3000}$\hbox{}ギリシャ文字（6区）}&Y&N&Y\\ %<ja>\multicolumn{3}{c}{$\vphantom{\D 3000}$\hbox{}キリル文字（7区）}&N&N&Y\\ -$\vphantom{\D 3000}$\\ \bottomrule \end{tabular}\hss}\par \end{table} @@ -2573,8 +2589,6 @@ For the detail, see \url{https://github.com/h-kitagawa/kct}. 異なっているところだけを載せると，表\ref{table-kcat-diff}のようになる． 「・」「゛」「゜」「゠」を除けば，\LuaTeX-jaでは\upTeX より多くの文字が 制御綴に使用可能になっている． -\textbf{特に重要なのは，全角空白(\texttt{U+3000})が -\LuaTeX-jaでは制御綴中に使用可能であることである．} JIS~X~0213の範囲に広げると，差異はさらに大きくなる． 詳細については例えば \url{https://github.com/h-kitagawa/kct} 中の\ @@ -6967,7 +6981,7 @@ then the patch \Pkg{lltjp-listings} is loaded automatically at \verb+\begin{docu 意識する必要はない． %</ja> -%<en>\subsection{Notes} +%<en>\subsection{Notes and additional keys} %<ja>\subsection{注意} %<*en> \paragraph{Escaping to \LaTeX} @@ -7009,6 +7023,20 @@ instead of ``\verb+\ほげ+''. 「\cs{}\IVSA FFFFF」というcontrol symbolが実行されることになる． %</ja> +%<*en> +\paragraph{Variation selectors} +\Pkg{lltjp-listings} add two keys, namely \texttt{vsraw}~and~\texttt{vscmd}, +which specify how variation selectors are treated in +\texttt{lstlisting} or other enviroments. +Note that these additional keys are not usable in the preamble, +since \Pkg{lltjp-listings} is loaded at \verb+\begin{document}+. + +\texttt{vsraw} is a key which takes a boolean value, and its default value is +false. +\begin{itemize} + \item If the \texttt{vsraw} key is true, then +variation selectors are ``combined'' with the previous character. +%</en> %<*ja> \paragraph{異体字セレクタの扱い} \texttt{lstlisting} 環境などの内部にある異体字セレクタを扱うため， @@ -7021,21 +7049,31 @@ instead of ``\verb+\ほげ+''. \item trueの場合は，異体字セレクタは「直前の文字に続けて」出力される． もしもIVSサポート（\ref{ssec-ltjotf}節）が有効になっていた場合は， 以下の例（左側は入力，右側はその出力）のようになる． +%</ja> \begin{LTXexample} \begin{lstlisting}[vsraw=true] 葛󠄀城市，葛󠄁飾区，葛西 \end{lstlisting} \end{LTXexample} +%<*en> +\item If the \texttt{vsraw} key is false, then +variation selectors are typeset by an appropriate command, which is specified by + the \texttt{vscmd} key. +The default setting of the \texttt{vscmd} key produces the following. +%</en> +%<*ja> \item falseの場合は，異体字セレクタは適当な命令によって「見える形で」出力される． どのような形で出力されるかを規定するのが \texttt{vscmd} キーであり， \Pkg{lltjp-listings} の標準設定では以下の例の右側のように出力される． +%</ja> \begin{LTXexample} \begin{lstlisting}[vsraw=false, vscmd=\ltjlistingsvsstdcmd] 葛󠄀城市，葛󠄁飾区，葛西 \end{lstlisting} \end{LTXexample} -ちなみに，本ドキュメントでは次のようにしている： +%<ja> ちなみに，本ドキュメントでは次のようにしている： +%<en> For example, the following code is the setting of the \texttt{vscmd} key in this document. \begin{lstlisting}[numbers=left] \def\IVSA#1#2#3#4#5{% \textcolor{blue}{\raisebox{3.5pt}{\tt% @@ -7049,10 +7087,56 @@ instead of ``\verb+\ほげ+''. \lstset{vscmd=\IVSB} \end{lstlisting} \end{itemize} -既定の出力命令を復活させたい場合は\ \verb+vsraw=\ltjlistingsvsstdcmd+\ +%<*en> +The default output command of variation selectors is stored in \verb+\ltjlistingsvsstdcmd+. +%</en> +%<*ja> +既定の出力命令を復活させたい場合は\ \verb+vscmd=\ltjlistingsvsstdcmd+\ とすれば良い． %</ja> +%<*en> +\paragraph{The \texttt{doubleletterspace} key} +Even the column format is \texttt{[c]fixed}, sometimes characters are not vertically aligned. +The following example is typeset with \texttt{basewidth=2em}, and +you'll see the leftmost ``\texttt{H}'' are not vertically aligned. +\begin{lstlisting}[basewidth=2em, basicstyle=\tt,numbers=left] +:H: +:HHHH: +\end{lstlisting} + +\Pkg{lltjp-listing} adds the \texttt{doubleletterspace} key (not activated by default, for +compatibility) to +improve the situation, namely doubles inter-character space in each output unit. +With this key, the above input now produces better output. +\begin{lstlisting}[basewidth=2em, basicstyle=\tt,numbers=left, doubleletterspace] +:H: +:HHHH: +\end{lstlisting} +%</en> +%<*ja> +\paragraph{\texttt{doubleletterspace}キー} +\Pkg{listings}パッケージで列揃えが \texttt{[c]fixed} となっている場合でも， +場合によっては文字が縦に揃わない場合もある． +例を以下に示そう．これは強調するために \texttt{basewidth=2em} を設定している． +\begin{lstlisting}[basewidth=2em, basicstyle=\tt,numbers=left] +:H: +:HHHH: +\end{lstlisting} +1行目と2行目の「\texttt{H}」の位置が揃っていないが， +これは出力単位ごとに，先頭・末尾・各文字間に同じ量の空白を挿入することによる． + +\Pkg{lltjp-listing}では，このような症状を改善させるために \texttt{doubleletterspace} キー +を追加した（標準では互換性のために無効になっている）．このキーを有効にすると， +出力単位中の各文字間の空白を2倍にすることで文字を揃いやすくしている． +上と同じものを \texttt{doubleletterspace} キーを有効にして組んだものが以下であり， +きちんと「\texttt{H}」の位置が揃っていることが分かる． +\begin{lstlisting}[basewidth=2em, basicstyle=\tt,numbers=left, doubleletterspace] +:H: +:HHHH: +\end{lstlisting} +%</ja> + %<en>\subsection{Class of Characters} %<ja>\subsection{文字種} @@ -7182,7 +7266,7 @@ are classified into above 5~classes by the following rules: Letter, Other, Kanji, Open, Closeのどれに属するかは次によって決まる： %</ja> \begin{itemize} -%<en>\item \textbf{ALchar}s above \texttt{U+0080} are classified as Letter. +%<en>\item \textbf{ALchar}s above or equal to~\texttt{U+0080} are classified as Letter. %<ja>\item （\texttt{U+0080}以降の）\textbf{ALchar}は，すべてLetter扱いである． %<en>\item \textbf{JAchar}s are classified in the order as follows: @@ -7394,10 +7478,11 @@ OpenTypeフォントでもTrueTypeフォントでもIVS情報が格納されて \texttt{fontloader} の呼び出しでかなり時間を消費することから， %%% to_table を使わなくしたことで，メモリ使用量は減った IVS情報をキャッシュに保存することで2回目以降の実行時間を節約している． +%</ja> +%<*ja> \section{複数フォントの「合成」（未完）} - \section{\LuaTeX-jaにおけるキャッシュ} \Pkg{luaotfload}パッケージが，各TrueType・OpenTypeフォントの情報を キャッシュとして保存しているのと同様の方法で， diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx index 6bff5843602..53b2f0524b5 100644 --- a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx +++ b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx @@ -22,7 +22,7 @@ % ----------------------------------------- % % \fi -% \CheckSum{5203} +% \CheckSum{5210} %% \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,7 +50,7 @@ %<*driver> \ProvidesFile{ltjsclasses.dtx} %</driver> - [2014/05/14 ] + [2014/12/24 ] %<*driver> \documentclass{ltjsarticle} \usepackage{doc} @@ -132,6 +132,8 @@ % % [2014-02-07 LTJ] jsclasses 2014-02-07 ベースにしました． % +% [2014-12-24 LTJ] |\@setfontsize| 中の和欧文間空白の設定で if 文が抜けていたのを直しました． +% % \StopEventually{} % % 以下では実際のコードに即して説明します。 @@ -960,6 +962,10 @@ % |\ltjsetkanjiskip| と |\ltjsetxkanjiskip|（両者とも， % 実行前には |\ltj@setpar@global| の実行が必要）にしました． % +% [2014-12-24 LTJ] |jsclasses| では，|\@setfontsize| 中で |xkanjiskip| を +% 設定するのは現在の和欧文間空白の自然長が正の場合だけでした． +% |ltjsclasses| では最初からこの判定が抜けてしまっていたので，復活させます． +% % \begin{macrocode} \def\@setfontsize#1#2#3{% % \@nomath#1% @@ -975,11 +981,14 @@ \fi \fi \ltj@setpar@global - \ltjsetkanjiskip{0pt plus .1\zw minus .01\zw} - \if@slide - \ltjsetxkanjiskip{0.1em} - \else - \ltjsetxkanjiskip{0.25em plus 0.15em minus 0.06em} + \ltjsetkanjiskip{\z@ plus .1\zw minus .01\zw} + \@tempskipa=\ltjgetparameter{xkanjiskip} + \ifdim\@tempskipa>\z@ + \if@slide + \ltjsetxkanjiskip{0.1em} + \else + \ltjsetxkanjiskip{0.25em plus 0.15em minus 0.06em} + \fi \fi} % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/luatex/luatexja/tool/ltj-unicode-ccfix_make2.pl b/Master/texmf-dist/source/luatex/luatexja/tool/ltj-unicode-ccfix_make2.pl new file mode 100755 index 00000000000..d5db9643eb2 --- /dev/null +++ b/Master/texmf-dist/source/luatex/luatexja/tool/ltj-unicode-ccfix_make2.pl @@ -0,0 +1,109 @@ +#!/usr/bin/env perl + +# create ltj-unicode-ccfix.tex by processing Unicode data file +# LineBreak.txt + +# modified from unicode-char-prep.pl (part of the XeTeX typesetting system). +# original copyright is as follows: +# +# /****************************************************************************\ +# Part of the XeTeX typesetting system +# Copyright (c) 1994-2008 by SIL International +# Copyright (c) 2009 by Jonathan Kew +# +# SIL Author(s): Jonathan Kew +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE +# FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF +# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the copyright holders +# shall not be used in advertising or otherwise to promote the sale, +# use or other dealings in this Software without prior written +# authorization from the copyright holders. +# \****************************************************************************/ + +die "usage: perl $0 LineBreak.txt > unicode-letters.tex\n" + unless $#ARGV == 0; + +sub parse_unidata { + my (@u) = @_; + $lccode{$u[0]} = $u[13] if $u[13] ne ''; + $lccode{$u[0]} = $u[0] if $u[13] eq '' and ($u[2] =~ /^L/ or $u[12] ne ''); + $uccode{$u[0]} = $u[12] if $u[12] ne ''; + $uccode{$u[0]} = $u[0] if $u[12] eq '' and ($u[2] =~ /^L/ or $u[13] ne ''); + if ($u[2] =~ /^L/) { + push(@letters, $u[0]); + } + elsif ($u[2] =~ /^M/) { + push(@marks, $u[0]); + } + elsif (exists $lccode{$u[0]} or exists $uccode{$u[0]}) { + push(@casesym, $u[0]); + } +} + + +my ($start, $end); +$date = `date`; +chomp $date; +print << "__EOT__"; +-- Do not edit this file! +-- Created from LineBreak.txt by ltj-unicode-ccfix_make.pl on $date. +-- In case of errors, fix the Perl script instead. +__EOT__ + +%lineBreakClass = ( + 'ID' => 1, # ideograph +); + + +print << '__EOT__'; +if tex.getcatcode(0x6F22)==12 then + local tex_catcode = tex.setcatcode + local function set_letter(b,e) + for i=b,e do tex_catcode('global', i, 11) end + end + +__EOT__ + +open LineBreak, $ARGV[0] or die "can't read $ARGV[0]"; +while (<LineBreak>) { + chomp; + s/ *#.*//; + s/ +$//; + if (m/([0-9A-F]{4,6})(?:\.\.([0-9A-F]{4,6}))?;(..)/) { + $s = $1; + $e = $2; + $lb = $3; + $e = $s if $e eq ''; + if (exists $lineBreakClass{$lb}) { + if ($lineBreakClass{$lb} == 1) { + # ideographs: set whole range to class 1 + print " set_letter(0x$s,0x$e)\n"; + } + } + } +} +close LineBreak; + +print << '__EOT__'; + +end + +__EOT__ diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-24.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-24.sty index 4bd81c62cc9..f4438544b0c 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-24.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-24.sty @@ -3,13 +3,12 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{luatexja-fontspec-24}[2014/06/19 fontspec support of LuaTeX-ja] +\ProvidesPackage{luatexja-fontspec-24}[2014/12/03 fontspec support of LuaTeX-ja] \RequirePackage{l3keys2e,luatexja} \ExplSyntaxOn %%%%%%%% Change Japanese font family by \rmfamily or not -\bool_if:NTF \ltj_fontspec_match -{ +\cs_new:Npn \ltj_fontspec_match_cmd { \renewcommand\jttdefault{\gtdefault} \DeclareRobustCommand\rmfamily {\not@math@alphabet\rmfamily\mathrm @@ -21,12 +20,11 @@ {\not@math@alphabet\ttfamily\mathtt \romanfamily\ttdefault\kanjifamily\jttdefault\selectfont} \DeclareDocumentCommand \setmonojfont { O{} m } { - \ltj_fontspec_set_family:Nnn \jttdefault {#1}{#2} + \ltj_fontspec_set_family:Nnn \jttdefault {##1}{##2} \normalfont } -}{ } - +\bool_if:NT \ltj_fontspec_match_bool \ltj_fontspec_match_cmd %%%%%%%% Messages \msg_new:nnn {luatexja-fontspec} {addjfontfeatures-ignored} diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty index 51346d56d14..6287324f5e0 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{luatexja-fontspec}[2014/06/19 fontspec support of LuaTeX-ja] +\ProvidesPackage{luatexja-fontspec}[2014/12/03 fontspec support of LuaTeX-ja] \RequirePackage{l3keys2e,luatexja} \ExplSyntaxOn @@ -11,16 +11,16 @@ \cs_set:Nn \ltj_fontspec_pass_opts: {} \keys_define:nn { luatexja-fontspec } { - match .bool_set:N = \ltj_fontspec_match, + match .bool_set:N = \ltj_fontspec_match_bool, match .default:n = true, - pass .code:n = \cs_set:Nn \ltj_fontspec_pass_opts: {#1}, + pass .code:n = \cs_set:Nn \ltj_fontspec_pass_opts: {#1},% 互換性 } \ProcessKeysOptions { luatexja-fontspec } -\RequirePackage[\ltj_fontspec_pass_opts:]{fontspec}[2011/09/13] -\cs_if_exist:NTF \fontspec_update_featstr:n { - \RequirePackage{luatexja-fontspec-23} -} { +\RequirePackage[\ltj_fontspec_pass_opts:]{fontspec}[2014/06/01] +%\cs_if_exist:NTF \fontspec_update_featstr:n { +% \RequirePackage{luatexja-fontspec-23} +%} { \RequirePackage{luatexja-fontspec-24} -} +%} \endinput 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 3f6b4efc9f5..680f689919c 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}[2013/10/28 Japanese font presets] +\ProvidesPackage{luatexja-preset}[2014/12/03 Japanese font presets] \RequirePackage{expl3} \RequirePackage{luatexja-fontspec} @@ -195,6 +195,14 @@ } \ExecuteOptions{ipaex} + +% match +\DeclareOption{match} { + \bool_if:NF \ltj_fontspec_match_bool { + \ltj_fontspec_match_cmd + \bool_set_true:N \ltj_fontspec_match_bool + } +} \ProcessOptions* %% KozMinPr6N の場合はjp04 feature がないので，nlck にする diff --git a/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua b/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua index d957a2d61c6..cb4e9c1f4c8 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua @@ -216,27 +216,6 @@ luatexja.jfont.define_jfm { } }, - [9] = { -- 和字間隔 - chars = { - ' ' - }, - align = 'left', left = 0.0, down = 0.0, - width = 1.0, height = 0.88, depth = 0.12, italic=0.0, - glue = { - [0] = {0, 0, 0}, - [1] = {0, 0, 0}, - [2] = {0, 0, 0}, - [3] = { 0.25, 0.0, 0.25, 1 }, - [4] = {0, 0, 0}, - [5] = {0, 0, 0}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, 0, 0}, - [9] = {0, 0, 0}, - }, - }, - - [99] = { -- box末尾 chars = {'boxbdd', 'parbdd'}, glue = { diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-unicode-ccfix.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-unicode-ccfix.lua new file mode 100644 index 00000000000..660fa256580 --- /dev/null +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-unicode-ccfix.lua @@ -0,0 +1,183 @@ +-- Do not edit this file! +-- Created from LineBreak.txt by ltj-unicode-ccfix_make.pl on 2015年 2月 12日 木曜日 13:28:31 JST. +-- In case of errors, fix the Perl script instead. +do + local tex_catcode = tex.setcatcode + local function set_letter(b,e) + for i=b,e do tex_catcode('global', i, 11) end + end + + set_letter(0x231A,0x231B) + set_letter(0x23F0,0x23F3) + set_letter(0x2600,0x2603) + set_letter(0x2614,0x2615) + set_letter(0x2618,0x2618) + set_letter(0x261A,0x261F) + set_letter(0x2639,0x263B) + set_letter(0x2668,0x2668) + set_letter(0x267F,0x267F) + set_letter(0x26BD,0x26C8) + set_letter(0x26CD,0x26CD) + set_letter(0x26CF,0x26D1) + set_letter(0x26D3,0x26D4) + set_letter(0x26D8,0x26D9) + set_letter(0x26DC,0x26DC) + set_letter(0x26DF,0x26E1) + set_letter(0x26EA,0x26EA) + set_letter(0x26F1,0x26F5) + set_letter(0x26F7,0x26FA) + set_letter(0x26FD,0x26FF) + set_letter(0x2700,0x2704) + set_letter(0x2708,0x270D) + set_letter(0x2E80,0x2E99) + set_letter(0x2E9B,0x2EF3) + set_letter(0x2F00,0x2FD5) + set_letter(0x2FF0,0x2FFB) + set_letter(0x3003,0x3003) + set_letter(0x3004,0x3004) + set_letter(0x3006,0x3006) + set_letter(0x3007,0x3007) + set_letter(0x3012,0x3013) + set_letter(0x3020,0x3020) + set_letter(0x3021,0x3029) + set_letter(0x3030,0x3030) + set_letter(0x3031,0x3034) + set_letter(0x3036,0x3037) + set_letter(0x3038,0x303A) + set_letter(0x303D,0x303D) + set_letter(0x303E,0x303F) + set_letter(0x3042,0x3042) + set_letter(0x3044,0x3044) + set_letter(0x3046,0x3046) + set_letter(0x3048,0x3048) + set_letter(0x304A,0x3062) + set_letter(0x3064,0x3082) + set_letter(0x3084,0x3084) + set_letter(0x3086,0x3086) + set_letter(0x3088,0x308D) + set_letter(0x308F,0x3094) + set_letter(0x309F,0x309F) + set_letter(0x30A2,0x30A2) + set_letter(0x30A4,0x30A4) + set_letter(0x30A6,0x30A6) + set_letter(0x30A8,0x30A8) + set_letter(0x30AA,0x30C2) + set_letter(0x30C4,0x30E2) + set_letter(0x30E4,0x30E4) + set_letter(0x30E6,0x30E6) + set_letter(0x30E8,0x30ED) + set_letter(0x30EF,0x30F4) + set_letter(0x30F7,0x30FA) + set_letter(0x30FF,0x30FF) + set_letter(0x3105,0x312D) + set_letter(0x3131,0x318E) + set_letter(0x3190,0x3191) + set_letter(0x3192,0x3195) + set_letter(0x3196,0x319F) + set_letter(0x31A0,0x31BA) + set_letter(0x31C0,0x31E3) + set_letter(0x3200,0x321E) + set_letter(0x3220,0x3229) + set_letter(0x322A,0x3247) + set_letter(0x3250,0x3250) + set_letter(0x3251,0x325F) + set_letter(0x3260,0x327F) + set_letter(0x3280,0x3289) + set_letter(0x328A,0x32B0) + set_letter(0x32B1,0x32BF) + set_letter(0x32C0,0x32FE) + set_letter(0x3300,0x33FF) + set_letter(0x3400,0x4DB5) + set_letter(0x4DB6,0x4DBF) + set_letter(0x4E00,0x9FCC) + set_letter(0x9FCD,0x9FFF) + set_letter(0xA000,0xA014) + set_letter(0xA016,0xA48C) + set_letter(0xA490,0xA4C6) + set_letter(0xF900,0xFA6D) + set_letter(0xFA6E,0xFA6F) + set_letter(0xFA70,0xFAD9) + set_letter(0xFADA,0xFAFF) + set_letter(0xFE30,0xFE30) + set_letter(0xFE31,0xFE32) + set_letter(0xFE33,0xFE34) + set_letter(0xFE45,0xFE46) + set_letter(0xFE49,0xFE4C) + set_letter(0xFE4D,0xFE4F) + set_letter(0xFE51,0xFE51) + set_letter(0xFE58,0xFE58) + set_letter(0xFE5F,0xFE61) + set_letter(0xFE62,0xFE62) + set_letter(0xFE63,0xFE63) + set_letter(0xFE64,0xFE66) + set_letter(0xFE68,0xFE68) + set_letter(0xFE6B,0xFE6B) + set_letter(0xFF02,0xFF03) + set_letter(0xFF06,0xFF07) + set_letter(0xFF0A,0xFF0A) + set_letter(0xFF0B,0xFF0B) + set_letter(0xFF0D,0xFF0D) + set_letter(0xFF0F,0xFF0F) + set_letter(0xFF10,0xFF19) + set_letter(0xFF1C,0xFF1E) + set_letter(0xFF20,0xFF20) + set_letter(0xFF21,0xFF3A) + set_letter(0xFF3C,0xFF3C) + set_letter(0xFF3E,0xFF3E) + set_letter(0xFF3F,0xFF3F) + set_letter(0xFF40,0xFF40) + set_letter(0xFF41,0xFF5A) + set_letter(0xFF5C,0xFF5C) + set_letter(0xFF5E,0xFF5E) + set_letter(0xFFE2,0xFFE2) + set_letter(0xFFE3,0xFFE3) + set_letter(0xFFE4,0xFFE4) + set_letter(0x1B000,0x1B001) + set_letter(0x1F000,0x1F02B) + set_letter(0x1F030,0x1F093) + set_letter(0x1F0A0,0x1F0AE) + set_letter(0x1F0B1,0x1F0BF) + set_letter(0x1F0C1,0x1F0CF) + set_letter(0x1F0D1,0x1F0F5) + set_letter(0x1F200,0x1F202) + set_letter(0x1F210,0x1F23A) + set_letter(0x1F240,0x1F248) + set_letter(0x1F250,0x1F251) + set_letter(0x1F300,0x1F32C) + set_letter(0x1F330,0x1F37D) + set_letter(0x1F380,0x1F39B) + set_letter(0x1F39E,0x1F3B4) + set_letter(0x1F3B7,0x1F3BB) + set_letter(0x1F3BD,0x1F3CE) + set_letter(0x1F3D4,0x1F3F7) + set_letter(0x1F400,0x1F49F) + set_letter(0x1F4A1,0x1F4A1) + set_letter(0x1F4A3,0x1F4A3) + set_letter(0x1F4A5,0x1F4AE) + set_letter(0x1F4B0,0x1F4B0) + set_letter(0x1F4B3,0x1F4FE) + set_letter(0x1F507,0x1F516) + set_letter(0x1F525,0x1F531) + set_letter(0x1F54A,0x1F54A) + set_letter(0x1F550,0x1F579) + set_letter(0x1F57B,0x1F5A3) + set_letter(0x1F5A5,0x1F5D3) + set_letter(0x1F5DC,0x1F5F3) + set_letter(0x1F5FA,0x1F5FF) + set_letter(0x1F600,0x1F642) + set_letter(0x1F645,0x1F64F) + set_letter(0x1F680,0x1F6CF) + set_letter(0x1F6E0,0x1F6EC) + set_letter(0x1F6F0,0x1F6F3) + set_letter(0x20000,0x2A6D6) + set_letter(0x2A6D7,0x2A6FF) + set_letter(0x2A700,0x2B734) + set_letter(0x2B735,0x2B73F) + set_letter(0x2B740,0x2B81D) + set_letter(0x2B81E,0x2F7FF) + set_letter(0x2F800,0x2FA1D) + set_letter(0x2FA1E,0x2FFFD) + set_letter(0x30000,0x3FFFD) + +end + diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-unicode-ccfix.tex b/Master/texmf-dist/tex/luatex/luatexja/ltj-unicode-ccfix.tex deleted file mode 100644 index 0c85adeb899..00000000000 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-unicode-ccfix.tex +++ /dev/null @@ -1,3763 +0,0 @@ -%% ltj-unicode-ccfix.tex - -\begingroup -\catcode`\{=1 \catcode`\}=2 \catcode`\#=6 - -\message{and category codes} - -% definitions for script classes based on LineBreak.txt -\def\ID #1 #2 {\set{#1}{#2}{\global\catcode\n=11 }} -\def\EX #1 #2 {\relax} -\def\IS #1 #2 {\relax} -\def\CM #1 #2 {\relax} -\def\OP #1 #2 {\relax} -\def\NS #1 #2 {\relax} -\def\CL #1 #2 {\relax} -\countdef\n=255 -\def\set#1#2#3{% execute setting "#3" with \n set to each value from #1 to #2 - \n="#1 \loop #3 \ifnum\n<"#2 \advance\n by 1 \repeat} -% copy \loop etc from plain.tex -\def\loop#1\repeat{\def\body{#1}\iterate} -\def\iterate{\body \let\next\iterate \else\let\next\relax\fi \next} -\let\repeat=\fi % this makes \loop...\if...\repeat skippable - -\OP 2329 2329 -\CL 232A 232A -\ID 2E80 2E80 -\ID 2E81 2E81 -\ID 2E82 2E82 -\ID 2E83 2E83 -\ID 2E84 2E84 -\ID 2E85 2E85 -\ID 2E86 2E86 -\ID 2E87 2E87 -\ID 2E88 2E88 -\ID 2E89 2E89 -\ID 2E8A 2E8A -\ID 2E8B 2E8B -\ID 2E8C 2E8C -\ID 2E8D 2E8D -\ID 2E8E 2E8E -\ID 2E8F 2E8F -\ID 2E90 2E90 -\ID 2E91 2E91 -\ID 2E92 2E92 -\ID 2E93 2E93 -\ID 2E94 2E94 -\ID 2E95 2E95 -\ID 2E96 2E96 -\ID 2E97 2E97 -\ID 2E98 2E98 -\ID 2E99 2E99 -\ID 2E9B 2E9B -\ID 2E9C 2E9C -\ID 2E9D 2E9D -\ID 2E9E 2E9E -\ID 2E9F 2E9F -\ID 2EA0 2EA0 -\ID 2EA1 2EA1 -\ID 2EA2 2EA2 -\ID 2EA3 2EA3 -\ID 2EA4 2EA4 -\ID 2EA5 2EA5 -\ID 2EA6 2EA6 -\ID 2EA7 2EA7 -\ID 2EA8 2EA8 -\ID 2EA9 2EA9 -\ID 2EAA 2EAA -\ID 2EAB 2EAB -\ID 2EAC 2EAC -\ID 2EAD 2EAD -\ID 2EAE 2EAE -\ID 2EAF 2EAF -\ID 2EB0 2EB0 -\ID 2EB1 2EB1 -\ID 2EB2 2EB2 -\ID 2EB3 2EB3 -\ID 2EB4 2EB4 -\ID 2EB5 2EB5 -\ID 2EB6 2EB6 -\ID 2EB7 2EB7 -\ID 2EB8 2EB8 -\ID 2EB9 2EB9 -\ID 2EBA 2EBA -\ID 2EBB 2EBB -\ID 2EBC 2EBC -\ID 2EBD 2EBD -\ID 2EBE 2EBE -\ID 2EBF 2EBF -\ID 2EC0 2EC0 -\ID 2EC1 2EC1 -\ID 2EC2 2EC2 -\ID 2EC3 2EC3 -\ID 2EC4 2EC4 -\ID 2EC5 2EC5 -\ID 2EC6 2EC6 -\ID 2EC7 2EC7 -\ID 2EC8 2EC8 -\ID 2EC9 2EC9 -\ID 2ECA 2ECA -\ID 2ECB 2ECB -\ID 2ECC 2ECC -\ID 2ECD 2ECD -\ID 2ECE 2ECE -\ID 2ECF 2ECF -\ID 2ED0 2ED0 -\ID 2ED1 2ED1 -\ID 2ED2 2ED2 -\ID 2ED3 2ED3 -\ID 2ED4 2ED4 -\ID 2ED5 2ED5 -\ID 2ED6 2ED6 -\ID 2ED7 2ED7 -\ID 2ED8 2ED8 -\ID 2ED9 2ED9 -\ID 2EDA 2EDA -\ID 2EDB 2EDB -\ID 2EDC 2EDC -\ID 2EDD 2EDD -\ID 2EDE 2EDE -\ID 2EDF 2EDF -\ID 2EE0 2EE0 -\ID 2EE1 2EE1 -\ID 2EE2 2EE2 -\ID 2EE3 2EE3 -\ID 2EE4 2EE4 -\ID 2EE5 2EE5 -\ID 2EE6 2EE6 -\ID 2EE7 2EE7 -\ID 2EE8 2EE8 -\ID 2EE9 2EE9 -\ID 2EEA 2EEA -\ID 2EEB 2EEB -\ID 2EEC 2EEC -\ID 2EED 2EED -\ID 2EEE 2EEE -\ID 2EEF 2EEF -\ID 2EF0 2EF0 -\ID 2EF1 2EF1 -\ID 2EF2 2EF2 -\ID 2EF3 2EF3 -\ID 2F00 2F00 -\ID 2F01 2F01 -\ID 2F02 2F02 -\ID 2F03 2F03 -\ID 2F04 2F04 -\ID 2F05 2F05 -\ID 2F06 2F06 -\ID 2F07 2F07 -\ID 2F08 2F08 -\ID 2F09 2F09 -\ID 2F0A 2F0A -\ID 2F0B 2F0B -\ID 2F0C 2F0C -\ID 2F0D 2F0D -\ID 2F0E 2F0E -\ID 2F0F 2F0F -\ID 2F10 2F10 -\ID 2F11 2F11 -\ID 2F12 2F12 -\ID 2F13 2F13 -\ID 2F14 2F14 -\ID 2F15 2F15 -\ID 2F16 2F16 -\ID 2F17 2F17 -\ID 2F18 2F18 -\ID 2F19 2F19 -\ID 2F1A 2F1A -\ID 2F1B 2F1B -\ID 2F1C 2F1C -\ID 2F1D 2F1D -\ID 2F1E 2F1E -\ID 2F1F 2F1F -\ID 2F20 2F20 -\ID 2F21 2F21 -\ID 2F22 2F22 -\ID 2F23 2F23 -\ID 2F24 2F24 -\ID 2F25 2F25 -\ID 2F26 2F26 -\ID 2F27 2F27 -\ID 2F28 2F28 -\ID 2F29 2F29 -\ID 2F2A 2F2A -\ID 2F2B 2F2B -\ID 2F2C 2F2C -\ID 2F2D 2F2D -\ID 2F2E 2F2E -\ID 2F2F 2F2F -\ID 2F30 2F30 -\ID 2F31 2F31 -\ID 2F32 2F32 -\ID 2F33 2F33 -\ID 2F34 2F34 -\ID 2F35 2F35 -\ID 2F36 2F36 -\ID 2F37 2F37 -\ID 2F38 2F38 -\ID 2F39 2F39 -\ID 2F3A 2F3A -\ID 2F3B 2F3B -\ID 2F3C 2F3C -\ID 2F3D 2F3D -\ID 2F3E 2F3E -\ID 2F3F 2F3F -\ID 2F40 2F40 -\ID 2F41 2F41 -\ID 2F42 2F42 -\ID 2F43 2F43 -\ID 2F44 2F44 -\ID 2F45 2F45 -\ID 2F46 2F46 -\ID 2F47 2F47 -\ID 2F48 2F48 -\ID 2F49 2F49 -\ID 2F4A 2F4A -\ID 2F4B 2F4B -\ID 2F4C 2F4C -\ID 2F4D 2F4D -\ID 2F4E 2F4E -\ID 2F4F 2F4F -\ID 2F50 2F50 -\ID 2F51 2F51 -\ID 2F52 2F52 -\ID 2F53 2F53 -\ID 2F54 2F54 -\ID 2F55 2F55 -\ID 2F56 2F56 -\ID 2F57 2F57 -\ID 2F58 2F58 -\ID 2F59 2F59 -\ID 2F5A 2F5A -\ID 2F5B 2F5B -\ID 2F5C 2F5C -\ID 2F5D 2F5D -\ID 2F5E 2F5E -\ID 2F5F 2F5F -\ID 2F60 2F60 -\ID 2F61 2F61 -\ID 2F62 2F62 -\ID 2F63 2F63 -\ID 2F64 2F64 -\ID 2F65 2F65 -\ID 2F66 2F66 -\ID 2F67 2F67 -\ID 2F68 2F68 -\ID 2F69 2F69 -\ID 2F6A 2F6A -\ID 2F6B 2F6B -\ID 2F6C 2F6C -\ID 2F6D 2F6D -\ID 2F6E 2F6E -\ID 2F6F 2F6F -\ID 2F70 2F70 -\ID 2F71 2F71 -\ID 2F72 2F72 -\ID 2F73 2F73 -\ID 2F74 2F74 -\ID 2F75 2F75 -\ID 2F76 2F76 -\ID 2F77 2F77 -\ID 2F78 2F78 -\ID 2F79 2F79 -\ID 2F7A 2F7A -\ID 2F7B 2F7B -\ID 2F7C 2F7C -\ID 2F7D 2F7D -\ID 2F7E 2F7E -\ID 2F7F 2F7F -\ID 2F80 2F80 -\ID 2F81 2F81 -\ID 2F82 2F82 -\ID 2F83 2F83 -\ID 2F84 2F84 -\ID 2F85 2F85 -\ID 2F86 2F86 -\ID 2F87 2F87 -\ID 2F88 2F88 -\ID 2F89 2F89 -\ID 2F8A 2F8A -\ID 2F8B 2F8B -\ID 2F8C 2F8C -\ID 2F8D 2F8D -\ID 2F8E 2F8E -\ID 2F8F 2F8F -\ID 2F90 2F90 -\ID 2F91 2F91 -\ID 2F92 2F92 -\ID 2F93 2F93 -\ID 2F94 2F94 -\ID 2F95 2F95 -\ID 2F96 2F96 -\ID 2F97 2F97 -\ID 2F98 2F98 -\ID 2F99 2F99 -\ID 2F9A 2F9A -\ID 2F9B 2F9B -\ID 2F9C 2F9C -\ID 2F9D 2F9D -\ID 2F9E 2F9E -\ID 2F9F 2F9F -\ID 2FA0 2FA0 -\ID 2FA1 2FA1 -\ID 2FA2 2FA2 -\ID 2FA3 2FA3 -\ID 2FA4 2FA4 -\ID 2FA5 2FA5 -\ID 2FA6 2FA6 -\ID 2FA7 2FA7 -\ID 2FA8 2FA8 -\ID 2FA9 2FA9 -\ID 2FAA 2FAA -\ID 2FAB 2FAB -\ID 2FAC 2FAC -\ID 2FAD 2FAD -\ID 2FAE 2FAE -\ID 2FAF 2FAF -\ID 2FB0 2FB0 -\ID 2FB1 2FB1 -\ID 2FB2 2FB2 -\ID 2FB3 2FB3 -\ID 2FB4 2FB4 -\ID 2FB5 2FB5 -\ID 2FB6 2FB6 -\ID 2FB7 2FB7 -\ID 2FB8 2FB8 -\ID 2FB9 2FB9 -\ID 2FBA 2FBA -\ID 2FBB 2FBB -\ID 2FBC 2FBC -\ID 2FBD 2FBD -\ID 2FBE 2FBE -\ID 2FBF 2FBF -\ID 2FC0 2FC0 -\ID 2FC1 2FC1 -\ID 2FC2 2FC2 -\ID 2FC3 2FC3 -\ID 2FC4 2FC4 -\ID 2FC5 2FC5 -\ID 2FC6 2FC6 -\ID 2FC7 2FC7 -\ID 2FC8 2FC8 -\ID 2FC9 2FC9 -\ID 2FCA 2FCA -\ID 2FCB 2FCB -\ID 2FCC 2FCC -\ID 2FCD 2FCD -\ID 2FCE 2FCE -\ID 2FCF 2FCF -\ID 2FD0 2FD0 -\ID 2FD1 2FD1 -\ID 2FD2 2FD2 -\ID 2FD3 2FD3 -\ID 2FD4 2FD4 -\ID 2FD5 2FD5 -\ID 2FF0 2FF0 -\ID 2FF1 2FF1 -\ID 2FF2 2FF2 -\ID 2FF3 2FF3 -\ID 2FF4 2FF4 -\ID 2FF5 2FF5 -\ID 2FF6 2FF6 -\ID 2FF7 2FF7 -\ID 2FF8 2FF8 -\ID 2FF9 2FF9 -\ID 2FFA 2FFA -\ID 2FFB 2FFB -\ID 3000 3000 -\CL 3001 3001 -\CL 3002 3002 -\ID 3003 3003 -\ID 3004 3004 -\NS 3005 3005 -\ID 3006 3006 -\ID 3007 3007 -\OP 3008 3008 -\CL 3009 3009 -\OP 300A 300A -\CL 300B 300B -\OP 300C 300C -\CL 300D 300D -\OP 300E 300E -\CL 300F 300F -\OP 3010 3010 -\CL 3011 3011 -\ID 3012 3012 -\ID 3013 3013 -\OP 3014 3014 -\CL 3015 3015 -\OP 3016 3016 -\CL 3017 3017 -\OP 3018 3018 -\CL 3019 3019 -\OP 301A 301A -\CL 301B 301B -\NS 301C 301C -\OP 301D 301D -\CL 301E 301E -\CL 301F 301F -\ID 3020 3020 -\ID 3021 3021 -\ID 3022 3022 -\ID 3023 3023 -\ID 3024 3024 -\ID 3025 3025 -\ID 3026 3026 -\ID 3027 3027 -\ID 3028 3028 -\ID 3029 3029 -\CM 302A 302A -\CM 302B 302B -\CM 302C 302C -\CM 302D 302D -\CM 302E 302E -\CM 302F 302F -\ID 3030 3030 -\ID 3031 3031 -\ID 3032 3032 -\ID 3033 3033 -\ID 3034 3034 -\ID 3035 3035 -\ID 3036 3036 -\ID 3037 3037 -\ID 3038 3038 -\ID 3039 3039 -\ID 303A 303A -\NS 303B 303B -\NS 303C 303C -\ID 303D 303D -\ID 303E 303E -\ID 303F 303F -\NS 3041 3041 -\ID 3042 3042 -\NS 3043 3043 -\ID 3044 3044 -\NS 3045 3045 -\ID 3046 3046 -\NS 3047 3047 -\ID 3048 3048 -\NS 3049 3049 -\ID 304A 304A -\ID 304B 304B -\ID 304C 304C -\ID 304D 304D -\ID 304E 304E -\ID 304F 304F -\ID 3050 3050 -\ID 3051 3051 -\ID 3052 3052 -\ID 3053 3053 -\ID 3054 3054 -\ID 3055 3055 -\ID 3056 3056 -\ID 3057 3057 -\ID 3058 3058 -\ID 3059 3059 -\ID 305A 305A -\ID 305B 305B -\ID 305C 305C -\ID 305D 305D -\ID 305E 305E -\ID 305F 305F -\ID 3060 3060 -\ID 3061 3061 -\ID 3062 3062 -\NS 3063 3063 -\ID 3064 3064 -\ID 3065 3065 -\ID 3066 3066 -\ID 3067 3067 -\ID 3068 3068 -\ID 3069 3069 -\ID 306A 306A -\ID 306B 306B -\ID 306C 306C -\ID 306D 306D -\ID 306E 306E -\ID 306F 306F -\ID 3070 3070 -\ID 3071 3071 -\ID 3072 3072 -\ID 3073 3073 -\ID 3074 3074 -\ID 3075 3075 -\ID 3076 3076 -\ID 3077 3077 -\ID 3078 3078 -\ID 3079 3079 -\ID 307A 307A -\ID 307B 307B -\ID 307C 307C -\ID 307D 307D -\ID 307E 307E -\ID 307F 307F -\ID 3080 3080 -\ID 3081 3081 -\ID 3082 3082 -\NS 3083 3083 -\ID 3084 3084 -\NS 3085 3085 -\ID 3086 3086 -\NS 3087 3087 -\ID 3088 3088 -\ID 3089 3089 -\ID 308A 308A -\ID 308B 308B -\ID 308C 308C -\ID 308D 308D -\NS 308E 308E -\ID 308F 308F -\ID 3090 3090 -\ID 3091 3091 -\ID 3092 3092 -\ID 3093 3093 -\ID 3094 3094 -\NS 3095 3095 -\NS 3096 3096 -\CM 3099 3099 -\CM 309A 309A -\NS 309B 309B -\NS 309C 309C -\NS 309D 309D -\NS 309E 309E -\ID 309F 309F -\NS 30A0 30A0 -\NS 30A1 30A1 -\ID 30A2 30A2 -\NS 30A3 30A3 -\ID 30A4 30A4 -\NS 30A5 30A5 -\ID 30A6 30A6 -\NS 30A7 30A7 -\ID 30A8 30A8 -\NS 30A9 30A9 -\ID 30AA 30AA -\ID 30AB 30AB -\ID 30AC 30AC -\ID 30AD 30AD -\ID 30AE 30AE -\ID 30AF 30AF -\ID 30B0 30B0 -\ID 30B1 30B1 -\ID 30B2 30B2 -\ID 30B3 30B3 -\ID 30B4 30B4 -\ID 30B5 30B5 -\ID 30B6 30B6 -\ID 30B7 30B7 -\ID 30B8 30B8 -\ID 30B9 30B9 -\ID 30BA 30BA -\ID 30BB 30BB -\ID 30BC 30BC -\ID 30BD 30BD -\ID 30BE 30BE -\ID 30BF 30BF -\ID 30C0 30C0 -\ID 30C1 30C1 -\ID 30C2 30C2 -\NS 30C3 30C3 -\ID 30C4 30C4 -\ID 30C5 30C5 -\ID 30C6 30C6 -\ID 30C7 30C7 -\ID 30C8 30C8 -\ID 30C9 30C9 -\ID 30CA 30CA -\ID 30CB 30CB -\ID 30CC 30CC -\ID 30CD 30CD -\ID 30CE 30CE -\ID 30CF 30CF -\ID 30D0 30D0 -\ID 30D1 30D1 -\ID 30D2 30D2 -\ID 30D3 30D3 -\ID 30D4 30D4 -\ID 30D5 30D5 -\ID 30D6 30D6 -\ID 30D7 30D7 -\ID 30D8 30D8 -\ID 30D9 30D9 -\ID 30DA 30DA -\ID 30DB 30DB -\ID 30DC 30DC -\ID 30DD 30DD -\ID 30DE 30DE -\ID 30DF 30DF -\ID 30E0 30E0 -\ID 30E1 30E1 -\ID 30E2 30E2 -\NS 30E3 30E3 -\ID 30E4 30E4 -\NS 30E5 30E5 -\ID 30E6 30E6 -\NS 30E7 30E7 -\ID 30E8 30E8 -\ID 30E9 30E9 -\ID 30EA 30EA -\ID 30EB 30EB -\ID 30EC 30EC -\ID 30ED 30ED -\NS 30EE 30EE -\ID 30EF 30EF -\ID 30F0 30F0 -\ID 30F1 30F1 -\ID 30F2 30F2 -\ID 30F3 30F3 -\ID 30F4 30F4 -\NS 30F5 30F5 -\NS 30F6 30F6 -\ID 30F7 30F7 -\ID 30F8 30F8 -\ID 30F9 30F9 -\ID 30FA 30FA -\NS 30FB 30FB -\NS 30FC 30FC -\NS 30FD 30FD -\NS 30FE 30FE -\ID 30FF 30FF -\ID 3105 3105 -\ID 3106 3106 -\ID 3107 3107 -\ID 3108 3108 -\ID 3109 3109 -\ID 310A 310A -\ID 310B 310B -\ID 310C 310C -\ID 310D 310D -\ID 310E 310E -\ID 310F 310F -\ID 3110 3110 -\ID 3111 3111 -\ID 3112 3112 -\ID 3113 3113 -\ID 3114 3114 -\ID 3115 3115 -\ID 3116 3116 -\ID 3117 3117 -\ID 3118 3118 -\ID 3119 3119 -\ID 311A 311A -\ID 311B 311B -\ID 311C 311C -\ID 311D 311D -\ID 311E 311E -\ID 311F 311F -\ID 3120 3120 -\ID 3121 3121 -\ID 3122 3122 -\ID 3123 3123 -\ID 3124 3124 -\ID 3125 3125 -\ID 3126 3126 -\ID 3127 3127 -\ID 3128 3128 -\ID 3129 3129 -\ID 312A 312A -\ID 312B 312B -\ID 312C 312C -\ID 312D 312D -\ID 3131 3131 -\ID 3132 3132 -\ID 3133 3133 -\ID 3134 3134 -\ID 3135 3135 -\ID 3136 3136 -\ID 3137 3137 -\ID 3138 3138 -\ID 3139 3139 -\ID 313A 313A -\ID 313B 313B -\ID 313C 313C -\ID 313D 313D -\ID 313E 313E -\ID 313F 313F -\ID 3140 3140 -\ID 3141 3141 -\ID 3142 3142 -\ID 3143 3143 -\ID 3144 3144 -\ID 3145 3145 -\ID 3146 3146 -\ID 3147 3147 -\ID 3148 3148 -\ID 3149 3149 -\ID 314A 314A -\ID 314B 314B -\ID 314C 314C -\ID 314D 314D -\ID 314E 314E -\ID 314F 314F -\ID 3150 3150 -\ID 3151 3151 -\ID 3152 3152 -\ID 3153 3153 -\ID 3154 3154 -\ID 3155 3155 -\ID 3156 3156 -\ID 3157 3157 -\ID 3158 3158 -\ID 3159 3159 -\ID 315A 315A -\ID 315B 315B -\ID 315C 315C -\ID 315D 315D -\ID 315E 315E -\ID 315F 315F -\ID 3160 3160 -\ID 3161 3161 -\ID 3162 3162 -\ID 3163 3163 -\ID 3164 3164 -\ID 3165 3165 -\ID 3166 3166 -\ID 3167 3167 -\ID 3168 3168 -\ID 3169 3169 -\ID 316A 316A -\ID 316B 316B -\ID 316C 316C -\ID 316D 316D -\ID 316E 316E -\ID 316F 316F -\ID 3170 3170 -\ID 3171 3171 -\ID 3172 3172 -\ID 3173 3173 -\ID 3174 3174 -\ID 3175 3175 -\ID 3176 3176 -\ID 3177 3177 -\ID 3178 3178 -\ID 3179 3179 -\ID 317A 317A -\ID 317B 317B -\ID 317C 317C -\ID 317D 317D -\ID 317E 317E -\ID 317F 317F -\ID 3180 3180 -\ID 3181 3181 -\ID 3182 3182 -\ID 3183 3183 -\ID 3184 3184 -\ID 3185 3185 -\ID 3186 3186 -\ID 3187 3187 -\ID 3188 3188 -\ID 3189 3189 -\ID 318A 318A -\ID 318B 318B -\ID 318C 318C -\ID 318D 318D -\ID 318E 318E -\ID 3190 3190 -\ID 3191 3191 -\ID 3192 3192 -\ID 3193 3193 -\ID 3194 3194 -\ID 3195 3195 -\ID 3196 3196 -\ID 3197 3197 -\ID 3198 3198 -\ID 3199 3199 -\ID 319A 319A -\ID 319B 319B -\ID 319C 319C -\ID 319D 319D -\ID 319E 319E -\ID 319F 319F -\ID 31A0 31A0 -\ID 31A1 31A1 -\ID 31A2 31A2 -\ID 31A3 31A3 -\ID 31A4 31A4 -\ID 31A5 31A5 -\ID 31A6 31A6 -\ID 31A7 31A7 -\ID 31A8 31A8 -\ID 31A9 31A9 -\ID 31AA 31AA -\ID 31AB 31AB -\ID 31AC 31AC -\ID 31AD 31AD -\ID 31AE 31AE -\ID 31AF 31AF -\ID 31B0 31B0 -\ID 31B1 31B1 -\ID 31B2 31B2 -\ID 31B3 31B3 -\ID 31B4 31B4 -\ID 31B5 31B5 -\ID 31B6 31B6 -\ID 31B7 31B7 -\ID 31C0 31C0 -\ID 31C1 31C1 -\ID 31C2 31C2 -\ID 31C3 31C3 -\ID 31C4 31C4 -\ID 31C5 31C5 -\ID 31C6 31C6 -\ID 31C7 31C7 -\ID 31C8 31C8 -\ID 31C9 31C9 -\ID 31CA 31CA -\ID 31CB 31CB -\ID 31CC 31CC -\ID 31CD 31CD -\ID 31CE 31CE -\ID 31CF 31CF -\ID 31D0 31D0 -\ID 31D1 31D1 -\ID 31D2 31D2 -\ID 31D3 31D3 -\ID 31D4 31D4 -\ID 31D5 31D5 -\ID 31D6 31D6 -\ID 31D7 31D7 -\ID 31D8 31D8 -\ID 31D9 31D9 -\ID 31DA 31DA -\ID 31DB 31DB -\ID 31DC 31DC -\ID 31DD 31DD -\ID 31DE 31DE -\ID 31DF 31DF -\ID 31E0 31E0 -\ID 31E1 31E1 -\ID 31E2 31E2 -\ID 31E3 31E3 -\NS 31F0 31F0 -\NS 31F1 31F1 -\NS 31F2 31F2 -\NS 31F3 31F3 -\NS 31F4 31F4 -\NS 31F5 31F5 -\NS 31F6 31F6 -\NS 31F7 31F7 -\NS 31F8 31F8 -\NS 31F9 31F9 -\NS 31FA 31FA -\NS 31FB 31FB -\NS 31FC 31FC -\NS 31FD 31FD -\NS 31FE 31FE -\NS 31FF 31FF -\ID 3200 3200 -\ID 3201 3201 -\ID 3202 3202 -\ID 3203 3203 -\ID 3204 3204 -\ID 3205 3205 -\ID 3206 3206 -\ID 3207 3207 -\ID 3208 3208 -\ID 3209 3209 -\ID 320A 320A -\ID 320B 320B -\ID 320C 320C -\ID 320D 320D -\ID 320E 320E -\ID 320F 320F -\ID 3210 3210 -\ID 3211 3211 -\ID 3212 3212 -\ID 3213 3213 -\ID 3214 3214 -\ID 3215 3215 -\ID 3216 3216 -\ID 3217 3217 -\ID 3218 3218 -\ID 3219 3219 -\ID 321A 321A -\ID 321B 321B -\ID 321C 321C -\ID 321D 321D -\ID 321E 321E -\ID 3220 3220 -\ID 3221 3221 -\ID 3222 3222 -\ID 3223 3223 -\ID 3224 3224 -\ID 3225 3225 -\ID 3226 3226 -\ID 3227 3227 -\ID 3228 3228 -\ID 3229 3229 -\ID 322A 322A -\ID 322B 322B -\ID 322C 322C -\ID 322D 322D -\ID 322E 322E -\ID 322F 322F -\ID 3230 3230 -\ID 3231 3231 -\ID 3232 3232 -\ID 3233 3233 -\ID 3234 3234 -\ID 3235 3235 -\ID 3236 3236 -\ID 3237 3237 -\ID 3238 3238 -\ID 3239 3239 -\ID 323A 323A -\ID 323B 323B -\ID 323C 323C -\ID 323D 323D -\ID 323E 323E -\ID 323F 323F -\ID 3240 3240 -\ID 3241 3241 -\ID 3242 3242 -\ID 3243 3243 -\ID 3250 3250 -\ID 3251 3251 -\ID 3252 3252 -\ID 3253 3253 -\ID 3254 3254 -\ID 3255 3255 -\ID 3256 3256 -\ID 3257 3257 -\ID 3258 3258 -\ID 3259 3259 -\ID 325A 325A -\ID 325B 325B -\ID 325C 325C -\ID 325D 325D -\ID 325E 325E -\ID 325F 325F -\ID 3260 3260 -\ID 3261 3261 -\ID 3262 3262 -\ID 3263 3263 -\ID 3264 3264 -\ID 3265 3265 -\ID 3266 3266 -\ID 3267 3267 -\ID 3268 3268 -\ID 3269 3269 -\ID 326A 326A -\ID 326B 326B -\ID 326C 326C -\ID 326D 326D -\ID 326E 326E -\ID 326F 326F -\ID 3270 3270 -\ID 3271 3271 -\ID 3272 3272 -\ID 3273 3273 -\ID 3274 3274 -\ID 3275 3275 -\ID 3276 3276 -\ID 3277 3277 -\ID 3278 3278 -\ID 3279 3279 -\ID 327A 327A -\ID 327B 327B -\ID 327C 327C -\ID 327D 327D -\ID 327E 327E -\ID 327F 327F -\ID 3280 3280 -\ID 3281 3281 -\ID 3282 3282 -\ID 3283 3283 -\ID 3284 3284 -\ID 3285 3285 -\ID 3286 3286 -\ID 3287 3287 -\ID 3288 3288 -\ID 3289 3289 -\ID 328A 328A -\ID 328B 328B -\ID 328C 328C -\ID 328D 328D -\ID 328E 328E -\ID 328F 328F -\ID 3290 3290 -\ID 3291 3291 -\ID 3292 3292 -\ID 3293 3293 -\ID 3294 3294 -\ID 3295 3295 -\ID 3296 3296 -\ID 3297 3297 -\ID 3298 3298 -\ID 3299 3299 -\ID 329A 329A -\ID 329B 329B -\ID 329C 329C -\ID 329D 329D -\ID 329E 329E -\ID 329F 329F -\ID 32A0 32A0 -\ID 32A1 32A1 -\ID 32A2 32A2 -\ID 32A3 32A3 -\ID 32A4 32A4 -\ID 32A5 32A5 -\ID 32A6 32A6 -\ID 32A7 32A7 -\ID 32A8 32A8 -\ID 32A9 32A9 -\ID 32AA 32AA -\ID 32AB 32AB -\ID 32AC 32AC -\ID 32AD 32AD -\ID 32AE 32AE -\ID 32AF 32AF -\ID 32B0 32B0 -\ID 32B1 32B1 -\ID 32B2 32B2 -\ID 32B3 32B3 -\ID 32B4 32B4 -\ID 32B5 32B5 -\ID 32B6 32B6 -\ID 32B7 32B7 -\ID 32B8 32B8 -\ID 32B9 32B9 -\ID 32BA 32BA -\ID 32BB 32BB -\ID 32BC 32BC -\ID 32BD 32BD -\ID 32BE 32BE -\ID 32BF 32BF -\ID 32C0 32C0 -\ID 32C1 32C1 -\ID 32C2 32C2 -\ID 32C3 32C3 -\ID 32C4 32C4 -\ID 32C5 32C5 -\ID 32C6 32C6 -\ID 32C7 32C7 -\ID 32C8 32C8 -\ID 32C9 32C9 -\ID 32CA 32CA -\ID 32CB 32CB -\ID 32CC 32CC -\ID 32CD 32CD -\ID 32CE 32CE -\ID 32CF 32CF -\ID 32D0 32D0 -\ID 32D1 32D1 -\ID 32D2 32D2 -\ID 32D3 32D3 -\ID 32D4 32D4 -\ID 32D5 32D5 -\ID 32D6 32D6 -\ID 32D7 32D7 -\ID 32D8 32D8 -\ID 32D9 32D9 -\ID 32DA 32DA -\ID 32DB 32DB -\ID 32DC 32DC -\ID 32DD 32DD -\ID 32DE 32DE -\ID 32DF 32DF -\ID 32E0 32E0 -\ID 32E1 32E1 -\ID 32E2 32E2 -\ID 32E3 32E3 -\ID 32E4 32E4 -\ID 32E5 32E5 -\ID 32E6 32E6 -\ID 32E7 32E7 -\ID 32E8 32E8 -\ID 32E9 32E9 -\ID 32EA 32EA -\ID 32EB 32EB -\ID 32EC 32EC -\ID 32ED 32ED -\ID 32EE 32EE -\ID 32EF 32EF -\ID 32F0 32F0 -\ID 32F1 32F1 -\ID 32F2 32F2 -\ID 32F3 32F3 -\ID 32F4 32F4 -\ID 32F5 32F5 -\ID 32F6 32F6 -\ID 32F7 32F7 -\ID 32F8 32F8 -\ID 32F9 32F9 -\ID 32FA 32FA -\ID 32FB 32FB -\ID 32FC 32FC -\ID 32FD 32FD -\ID 32FE 32FE -\ID 3300 3300 -\ID 3301 3301 -\ID 3302 3302 -\ID 3303 3303 -\ID 3304 3304 -\ID 3305 3305 -\ID 3306 3306 -\ID 3307 3307 -\ID 3308 3308 -\ID 3309 3309 -\ID 330A 330A -\ID 330B 330B -\ID 330C 330C -\ID 330D 330D -\ID 330E 330E -\ID 330F 330F -\ID 3310 3310 -\ID 3311 3311 -\ID 3312 3312 -\ID 3313 3313 -\ID 3314 3314 -\ID 3315 3315 -\ID 3316 3316 -\ID 3317 3317 -\ID 3318 3318 -\ID 3319 3319 -\ID 331A 331A -\ID 331B 331B -\ID 331C 331C -\ID 331D 331D -\ID 331E 331E -\ID 331F 331F -\ID 3320 3320 -\ID 3321 3321 -\ID 3322 3322 -\ID 3323 3323 -\ID 3324 3324 -\ID 3325 3325 -\ID 3326 3326 -\ID 3327 3327 -\ID 3328 3328 -\ID 3329 3329 -\ID 332A 332A -\ID 332B 332B -\ID 332C 332C -\ID 332D 332D -\ID 332E 332E -\ID 332F 332F -\ID 3330 3330 -\ID 3331 3331 -\ID 3332 3332 -\ID 3333 3333 -\ID 3334 3334 -\ID 3335 3335 -\ID 3336 3336 -\ID 3337 3337 -\ID 3338 3338 -\ID 3339 3339 -\ID 333A 333A -\ID 333B 333B -\ID 333C 333C -\ID 333D 333D -\ID 333E 333E -\ID 333F 333F -\ID 3340 3340 -\ID 3341 3341 -\ID 3342 3342 -\ID 3343 3343 -\ID 3344 3344 -\ID 3345 3345 -\ID 3346 3346 -\ID 3347 3347 -\ID 3348 3348 -\ID 3349 3349 -\ID 334A 334A -\ID 334B 334B -\ID 334C 334C -\ID 334D 334D -\ID 334E 334E -\ID 334F 334F -\ID 3350 3350 -\ID 3351 3351 -\ID 3352 3352 -\ID 3353 3353 -\ID 3354 3354 -\ID 3355 3355 -\ID 3356 3356 -\ID 3357 3357 -\ID 3358 3358 -\ID 3359 3359 -\ID 335A 335A -\ID 335B 335B -\ID 335C 335C -\ID 335D 335D -\ID 335E 335E -\ID 335F 335F -\ID 3360 3360 -\ID 3361 3361 -\ID 3362 3362 -\ID 3363 3363 -\ID 3364 3364 -\ID 3365 3365 -\ID 3366 3366 -\ID 3367 3367 -\ID 3368 3368 -\ID 3369 3369 -\ID 336A 336A -\ID 336B 336B -\ID 336C 336C -\ID 336D 336D -\ID 336E 336E -\ID 336F 336F -\ID 3370 3370 -\ID 3371 3371 -\ID 3372 3372 -\ID 3373 3373 -\ID 3374 3374 -\ID 3375 3375 -\ID 3376 3376 -\ID 3377 3377 -\ID 3378 3378 -\ID 3379 3379 -\ID 337A 337A -\ID 337B 337B -\ID 337C 337C -\ID 337D 337D -\ID 337E 337E -\ID 337F 337F -\ID 3380 3380 -\ID 3381 3381 -\ID 3382 3382 -\ID 3383 3383 -\ID 3384 3384 -\ID 3385 3385 -\ID 3386 3386 -\ID 3387 3387 -\ID 3388 3388 -\ID 3389 3389 -\ID 338A 338A -\ID 338B 338B -\ID 338C 338C -\ID 338D 338D -\ID 338E 338E -\ID 338F 338F -\ID 3390 3390 -\ID 3391 3391 -\ID 3392 3392 -\ID 3393 3393 -\ID 3394 3394 -\ID 3395 3395 -\ID 3396 3396 -\ID 3397 3397 -\ID 3398 3398 -\ID 3399 3399 -\ID 339A 339A -\ID 339B 339B -\ID 339C 339C -\ID 339D 339D -\ID 339E 339E -\ID 339F 339F -\ID 33A0 33A0 -\ID 33A1 33A1 -\ID 33A2 33A2 -\ID 33A3 33A3 -\ID 33A4 33A4 -\ID 33A5 33A5 -\ID 33A6 33A6 -\ID 33A7 33A7 -\ID 33A8 33A8 -\ID 33A9 33A9 -\ID 33AA 33AA -\ID 33AB 33AB -\ID 33AC 33AC -\ID 33AD 33AD -\ID 33AE 33AE -\ID 33AF 33AF -\ID 33B0 33B0 -\ID 33B1 33B1 -\ID 33B2 33B2 -\ID 33B3 33B3 -\ID 33B4 33B4 -\ID 33B5 33B5 -\ID 33B6 33B6 -\ID 33B7 33B7 -\ID 33B8 33B8 -\ID 33B9 33B9 -\ID 33BA 33BA -\ID 33BB 33BB -\ID 33BC 33BC -\ID 33BD 33BD -\ID 33BE 33BE -\ID 33BF 33BF -\ID 33C0 33C0 -\ID 33C1 33C1 -\ID 33C2 33C2 -\ID 33C3 33C3 -\ID 33C4 33C4 -\ID 33C5 33C5 -\ID 33C6 33C6 -\ID 33C7 33C7 -\ID 33C8 33C8 -\ID 33C9 33C9 -\ID 33CA 33CA -\ID 33CB 33CB -\ID 33CC 33CC -\ID 33CD 33CD -\ID 33CE 33CE -\ID 33CF 33CF -\ID 33D0 33D0 -\ID 33D1 33D1 -\ID 33D2 33D2 -\ID 33D3 33D3 -\ID 33D4 33D4 -\ID 33D5 33D5 -\ID 33D6 33D6 -\ID 33D7 33D7 -\ID 33D8 33D8 -\ID 33D9 33D9 -\ID 33DA 33DA -\ID 33DB 33DB -\ID 33DC 33DC -\ID 33DD 33DD -\ID 33DE 33DE -\ID 33DF 33DF -\ID 33E0 33E0 -\ID 33E1 33E1 -\ID 33E2 33E2 -\ID 33E3 33E3 -\ID 33E4 33E4 -\ID 33E5 33E5 -\ID 33E6 33E6 -\ID 33E7 33E7 -\ID 33E8 33E8 -\ID 33E9 33E9 -\ID 33EA 33EA -\ID 33EB 33EB -\ID 33EC 33EC -\ID 33ED 33ED -\ID 33EE 33EE -\ID 33EF 33EF -\ID 33F0 33F0 -\ID 33F1 33F1 -\ID 33F2 33F2 -\ID 33F3 33F3 -\ID 33F4 33F4 -\ID 33F5 33F5 -\ID 33F6 33F6 -\ID 33F7 33F7 -\ID 33F8 33F8 -\ID 33F9 33F9 -\ID 33FA 33FA -\ID 33FB 33FB -\ID 33FC 33FC -\ID 33FD 33FD -\ID 33FE 33FE -\ID 33FF 33FF -\ID 3400 4DB5 -\ID 4E00 9FC3 -\ID A000 A000 -\ID A001 A001 -\ID A002 A002 -\ID A003 A003 -\ID A004 A004 -\ID A005 A005 -\ID A006 A006 -\ID A007 A007 -\ID A008 A008 -\ID A009 A009 -\ID A00A A00A -\ID A00B A00B -\ID A00C A00C -\ID A00D A00D -\ID A00E A00E -\ID A00F A00F -\ID A010 A010 -\ID A011 A011 -\ID A012 A012 -\ID A013 A013 -\ID A014 A014 -\NS A015 A015 -\ID A016 A016 -\ID A017 A017 -\ID A018 A018 -\ID A019 A019 -\ID A01A A01A -\ID A01B A01B -\ID A01C A01C -\ID A01D A01D -\ID A01E A01E -\ID A01F A01F -\ID A020 A020 -\ID A021 A021 -\ID A022 A022 -\ID A023 A023 -\ID A024 A024 -\ID A025 A025 -\ID A026 A026 -\ID A027 A027 -\ID A028 A028 -\ID A029 A029 -\ID A02A A02A -\ID A02B A02B -\ID A02C A02C -\ID A02D A02D -\ID A02E A02E -\ID A02F A02F -\ID A030 A030 -\ID A031 A031 -\ID A032 A032 -\ID A033 A033 -\ID A034 A034 -\ID A035 A035 -\ID A036 A036 -\ID A037 A037 -\ID A038 A038 -\ID A039 A039 -\ID A03A A03A -\ID A03B A03B -\ID A03C A03C -\ID A03D A03D -\ID A03E A03E -\ID A03F A03F -\ID A040 A040 -\ID A041 A041 -\ID A042 A042 -\ID A043 A043 -\ID A044 A044 -\ID A045 A045 -\ID A046 A046 -\ID A047 A047 -\ID A048 A048 -\ID A049 A049 -\ID A04A A04A -\ID A04B A04B -\ID A04C A04C -\ID A04D A04D -\ID A04E A04E -\ID A04F A04F -\ID A050 A050 -\ID A051 A051 -\ID A052 A052 -\ID A053 A053 -\ID A054 A054 -\ID A055 A055 -\ID A056 A056 -\ID A057 A057 -\ID A058 A058 -\ID A059 A059 -\ID A05A A05A -\ID A05B A05B -\ID A05C A05C -\ID A05D A05D -\ID A05E A05E -\ID A05F A05F -\ID A060 A060 -\ID A061 A061 -\ID A062 A062 -\ID A063 A063 -\ID A064 A064 -\ID A065 A065 -\ID A066 A066 -\ID A067 A067 -\ID A068 A068 -\ID A069 A069 -\ID A06A A06A -\ID A06B A06B -\ID A06C A06C -\ID A06D A06D -\ID A06E A06E -\ID A06F A06F -\ID A070 A070 -\ID A071 A071 -\ID A072 A072 -\ID A073 A073 -\ID A074 A074 -\ID A075 A075 -\ID A076 A076 -\ID A077 A077 -\ID A078 A078 -\ID A079 A079 -\ID A07A A07A -\ID A07B A07B -\ID A07C A07C -\ID A07D A07D -\ID A07E A07E -\ID A07F A07F -\ID A080 A080 -\ID A081 A081 -\ID A082 A082 -\ID A083 A083 -\ID A084 A084 -\ID A085 A085 -\ID A086 A086 -\ID A087 A087 -\ID A088 A088 -\ID A089 A089 -\ID A08A A08A -\ID A08B A08B -\ID A08C A08C -\ID A08D A08D -\ID A08E A08E -\ID A08F A08F -\ID A090 A090 -\ID A091 A091 -\ID A092 A092 -\ID A093 A093 -\ID A094 A094 -\ID A095 A095 -\ID A096 A096 -\ID A097 A097 -\ID A098 A098 -\ID A099 A099 -\ID A09A A09A -\ID A09B A09B -\ID A09C A09C -\ID A09D A09D -\ID A09E A09E -\ID A09F A09F -\ID A0A0 A0A0 -\ID A0A1 A0A1 -\ID A0A2 A0A2 -\ID A0A3 A0A3 -\ID A0A4 A0A4 -\ID A0A5 A0A5 -\ID A0A6 A0A6 -\ID A0A7 A0A7 -\ID A0A8 A0A8 -\ID A0A9 A0A9 -\ID A0AA A0AA -\ID A0AB A0AB -\ID A0AC A0AC -\ID A0AD A0AD -\ID A0AE A0AE -\ID A0AF A0AF -\ID A0B0 A0B0 -\ID A0B1 A0B1 -\ID A0B2 A0B2 -\ID A0B3 A0B3 -\ID A0B4 A0B4 -\ID A0B5 A0B5 -\ID A0B6 A0B6 -\ID A0B7 A0B7 -\ID A0B8 A0B8 -\ID A0B9 A0B9 -\ID A0BA A0BA -\ID A0BB A0BB -\ID A0BC A0BC -\ID A0BD A0BD -\ID A0BE A0BE -\ID A0BF A0BF -\ID A0C0 A0C0 -\ID A0C1 A0C1 -\ID A0C2 A0C2 -\ID A0C3 A0C3 -\ID A0C4 A0C4 -\ID A0C5 A0C5 -\ID A0C6 A0C6 -\ID A0C7 A0C7 -\ID A0C8 A0C8 -\ID A0C9 A0C9 -\ID A0CA A0CA -\ID A0CB A0CB -\ID A0CC A0CC -\ID A0CD A0CD -\ID A0CE A0CE -\ID A0CF A0CF -\ID A0D0 A0D0 -\ID A0D1 A0D1 -\ID A0D2 A0D2 -\ID A0D3 A0D3 -\ID A0D4 A0D4 -\ID A0D5 A0D5 -\ID A0D6 A0D6 -\ID A0D7 A0D7 -\ID A0D8 A0D8 -\ID A0D9 A0D9 -\ID A0DA A0DA -\ID A0DB A0DB -\ID A0DC A0DC -\ID A0DD A0DD -\ID A0DE A0DE -\ID A0DF A0DF -\ID A0E0 A0E0 -\ID A0E1 A0E1 -\ID A0E2 A0E2 -\ID A0E3 A0E3 -\ID A0E4 A0E4 -\ID A0E5 A0E5 -\ID A0E6 A0E6 -\ID A0E7 A0E7 -\ID A0E8 A0E8 -\ID A0E9 A0E9 -\ID A0EA A0EA -\ID A0EB A0EB -\ID A0EC A0EC -\ID A0ED A0ED -\ID A0EE A0EE -\ID A0EF A0EF -\ID A0F0 A0F0 -\ID A0F1 A0F1 -\ID A0F2 A0F2 -\ID A0F3 A0F3 -\ID A0F4 A0F4 -\ID A0F5 A0F5 -\ID A0F6 A0F6 -\ID A0F7 A0F7 -\ID A0F8 A0F8 -\ID A0F9 A0F9 -\ID A0FA A0FA -\ID A0FB A0FB -\ID A0FC A0FC -\ID A0FD A0FD -\ID A0FE A0FE -\ID A0FF A0FF -\ID A100 A100 -\ID A101 A101 -\ID A102 A102 -\ID A103 A103 -\ID A104 A104 -\ID A105 A105 -\ID A106 A106 -\ID A107 A107 -\ID A108 A108 -\ID A109 A109 -\ID A10A A10A -\ID A10B A10B -\ID A10C A10C -\ID A10D A10D -\ID A10E A10E -\ID A10F A10F -\ID A110 A110 -\ID A111 A111 -\ID A112 A112 -\ID A113 A113 -\ID A114 A114 -\ID A115 A115 -\ID A116 A116 -\ID A117 A117 -\ID A118 A118 -\ID A119 A119 -\ID A11A A11A -\ID A11B A11B -\ID A11C A11C -\ID A11D A11D -\ID A11E A11E -\ID A11F A11F -\ID A120 A120 -\ID A121 A121 -\ID A122 A122 -\ID A123 A123 -\ID A124 A124 -\ID A125 A125 -\ID A126 A126 -\ID A127 A127 -\ID A128 A128 -\ID A129 A129 -\ID A12A A12A -\ID A12B A12B -\ID A12C A12C -\ID A12D A12D -\ID A12E A12E -\ID A12F A12F -\ID A130 A130 -\ID A131 A131 -\ID A132 A132 -\ID A133 A133 -\ID A134 A134 -\ID A135 A135 -\ID A136 A136 -\ID A137 A137 -\ID A138 A138 -\ID A139 A139 -\ID A13A A13A -\ID A13B A13B -\ID A13C A13C -\ID A13D A13D -\ID A13E A13E -\ID A13F A13F -\ID A140 A140 -\ID A141 A141 -\ID A142 A142 -\ID A143 A143 -\ID A144 A144 -\ID A145 A145 -\ID A146 A146 -\ID A147 A147 -\ID A148 A148 -\ID A149 A149 -\ID A14A A14A -\ID A14B A14B -\ID A14C A14C -\ID A14D A14D -\ID A14E A14E -\ID A14F A14F -\ID A150 A150 -\ID A151 A151 -\ID A152 A152 -\ID A153 A153 -\ID A154 A154 -\ID A155 A155 -\ID A156 A156 -\ID A157 A157 -\ID A158 A158 -\ID A159 A159 -\ID A15A A15A -\ID A15B A15B -\ID A15C A15C -\ID A15D A15D -\ID A15E A15E -\ID A15F A15F -\ID A160 A160 -\ID A161 A161 -\ID A162 A162 -\ID A163 A163 -\ID A164 A164 -\ID A165 A165 -\ID A166 A166 -\ID A167 A167 -\ID A168 A168 -\ID A169 A169 -\ID A16A A16A -\ID A16B A16B -\ID A16C A16C -\ID A16D A16D -\ID A16E A16E -\ID A16F A16F -\ID A170 A170 -\ID A171 A171 -\ID A172 A172 -\ID A173 A173 -\ID A174 A174 -\ID A175 A175 -\ID A176 A176 -\ID A177 A177 -\ID A178 A178 -\ID A179 A179 -\ID A17A A17A -\ID A17B A17B -\ID A17C A17C -\ID A17D A17D -\ID A17E A17E -\ID A17F A17F -\ID A180 A180 -\ID A181 A181 -\ID A182 A182 -\ID A183 A183 -\ID A184 A184 -\ID A185 A185 -\ID A186 A186 -\ID A187 A187 -\ID A188 A188 -\ID A189 A189 -\ID A18A A18A -\ID A18B A18B -\ID A18C A18C -\ID A18D A18D -\ID A18E A18E -\ID A18F A18F -\ID A190 A190 -\ID A191 A191 -\ID A192 A192 -\ID A193 A193 -\ID A194 A194 -\ID A195 A195 -\ID A196 A196 -\ID A197 A197 -\ID A198 A198 -\ID A199 A199 -\ID A19A A19A -\ID A19B A19B -\ID A19C A19C -\ID A19D A19D -\ID A19E A19E -\ID A19F A19F -\ID A1A0 A1A0 -\ID A1A1 A1A1 -\ID A1A2 A1A2 -\ID A1A3 A1A3 -\ID A1A4 A1A4 -\ID A1A5 A1A5 -\ID A1A6 A1A6 -\ID A1A7 A1A7 -\ID A1A8 A1A8 -\ID A1A9 A1A9 -\ID A1AA A1AA -\ID A1AB A1AB -\ID A1AC A1AC -\ID A1AD A1AD -\ID A1AE A1AE -\ID A1AF A1AF -\ID A1B0 A1B0 -\ID A1B1 A1B1 -\ID A1B2 A1B2 -\ID A1B3 A1B3 -\ID A1B4 A1B4 -\ID A1B5 A1B5 -\ID A1B6 A1B6 -\ID A1B7 A1B7 -\ID A1B8 A1B8 -\ID A1B9 A1B9 -\ID A1BA A1BA -\ID A1BB A1BB -\ID A1BC A1BC -\ID A1BD A1BD -\ID A1BE A1BE -\ID A1BF A1BF -\ID A1C0 A1C0 -\ID A1C1 A1C1 -\ID A1C2 A1C2 -\ID A1C3 A1C3 -\ID A1C4 A1C4 -\ID A1C5 A1C5 -\ID A1C6 A1C6 -\ID A1C7 A1C7 -\ID A1C8 A1C8 -\ID A1C9 A1C9 -\ID A1CA A1CA -\ID A1CB A1CB -\ID A1CC A1CC -\ID A1CD A1CD -\ID A1CE A1CE -\ID A1CF A1CF -\ID A1D0 A1D0 -\ID A1D1 A1D1 -\ID A1D2 A1D2 -\ID A1D3 A1D3 -\ID A1D4 A1D4 -\ID A1D5 A1D5 -\ID A1D6 A1D6 -\ID A1D7 A1D7 -\ID A1D8 A1D8 -\ID A1D9 A1D9 -\ID A1DA A1DA -\ID A1DB A1DB -\ID A1DC A1DC -\ID A1DD A1DD -\ID A1DE A1DE -\ID A1DF A1DF -\ID A1E0 A1E0 -\ID A1E1 A1E1 -\ID A1E2 A1E2 -\ID A1E3 A1E3 -\ID A1E4 A1E4 -\ID A1E5 A1E5 -\ID A1E6 A1E6 -\ID A1E7 A1E7 -\ID A1E8 A1E8 -\ID A1E9 A1E9 -\ID A1EA A1EA -\ID A1EB A1EB -\ID A1EC A1EC -\ID A1ED A1ED -\ID A1EE A1EE -\ID A1EF A1EF -\ID A1F0 A1F0 -\ID A1F1 A1F1 -\ID A1F2 A1F2 -\ID A1F3 A1F3 -\ID A1F4 A1F4 -\ID A1F5 A1F5 -\ID A1F6 A1F6 -\ID A1F7 A1F7 -\ID A1F8 A1F8 -\ID A1F9 A1F9 -\ID A1FA A1FA -\ID A1FB A1FB -\ID A1FC A1FC -\ID A1FD A1FD -\ID A1FE A1FE -\ID A1FF A1FF -\ID A200 A200 -\ID A201 A201 -\ID A202 A202 -\ID A203 A203 -\ID A204 A204 -\ID A205 A205 -\ID A206 A206 -\ID A207 A207 -\ID A208 A208 -\ID A209 A209 -\ID A20A A20A -\ID A20B A20B -\ID A20C A20C -\ID A20D A20D -\ID A20E A20E -\ID A20F A20F -\ID A210 A210 -\ID A211 A211 -\ID A212 A212 -\ID A213 A213 -\ID A214 A214 -\ID A215 A215 -\ID A216 A216 -\ID A217 A217 -\ID A218 A218 -\ID A219 A219 -\ID A21A A21A -\ID A21B A21B -\ID A21C A21C -\ID A21D A21D -\ID A21E A21E -\ID A21F A21F -\ID A220 A220 -\ID A221 A221 -\ID A222 A222 -\ID A223 A223 -\ID A224 A224 -\ID A225 A225 -\ID A226 A226 -\ID A227 A227 -\ID A228 A228 -\ID A229 A229 -\ID A22A A22A -\ID A22B A22B -\ID A22C A22C -\ID A22D A22D -\ID A22E A22E -\ID A22F A22F -\ID A230 A230 -\ID A231 A231 -\ID A232 A232 -\ID A233 A233 -\ID A234 A234 -\ID A235 A235 -\ID A236 A236 -\ID A237 A237 -\ID A238 A238 -\ID A239 A239 -\ID A23A A23A -\ID A23B A23B -\ID A23C A23C -\ID A23D A23D -\ID A23E A23E -\ID A23F A23F -\ID A240 A240 -\ID A241 A241 -\ID A242 A242 -\ID A243 A243 -\ID A244 A244 -\ID A245 A245 -\ID A246 A246 -\ID A247 A247 -\ID A248 A248 -\ID A249 A249 -\ID A24A A24A -\ID A24B A24B -\ID A24C A24C -\ID A24D A24D -\ID A24E A24E -\ID A24F A24F -\ID A250 A250 -\ID A251 A251 -\ID A252 A252 -\ID A253 A253 -\ID A254 A254 -\ID A255 A255 -\ID A256 A256 -\ID A257 A257 -\ID A258 A258 -\ID A259 A259 -\ID A25A A25A -\ID A25B A25B -\ID A25C A25C -\ID A25D A25D -\ID A25E A25E -\ID A25F A25F -\ID A260 A260 -\ID A261 A261 -\ID A262 A262 -\ID A263 A263 -\ID A264 A264 -\ID A265 A265 -\ID A266 A266 -\ID A267 A267 -\ID A268 A268 -\ID A269 A269 -\ID A26A A26A -\ID A26B A26B -\ID A26C A26C -\ID A26D A26D -\ID A26E A26E -\ID A26F A26F -\ID A270 A270 -\ID A271 A271 -\ID A272 A272 -\ID A273 A273 -\ID A274 A274 -\ID A275 A275 -\ID A276 A276 -\ID A277 A277 -\ID A278 A278 -\ID A279 A279 -\ID A27A A27A -\ID A27B A27B -\ID A27C A27C -\ID A27D A27D -\ID A27E A27E -\ID A27F A27F -\ID A280 A280 -\ID A281 A281 -\ID A282 A282 -\ID A283 A283 -\ID A284 A284 -\ID A285 A285 -\ID A286 A286 -\ID A287 A287 -\ID A288 A288 -\ID A289 A289 -\ID A28A A28A -\ID A28B A28B -\ID A28C A28C -\ID A28D A28D -\ID A28E A28E -\ID A28F A28F -\ID A290 A290 -\ID A291 A291 -\ID A292 A292 -\ID A293 A293 -\ID A294 A294 -\ID A295 A295 -\ID A296 A296 -\ID A297 A297 -\ID A298 A298 -\ID A299 A299 -\ID A29A A29A -\ID A29B A29B -\ID A29C A29C -\ID A29D A29D -\ID A29E A29E -\ID A29F A29F -\ID A2A0 A2A0 -\ID A2A1 A2A1 -\ID A2A2 A2A2 -\ID A2A3 A2A3 -\ID A2A4 A2A4 -\ID A2A5 A2A5 -\ID A2A6 A2A6 -\ID A2A7 A2A7 -\ID A2A8 A2A8 -\ID A2A9 A2A9 -\ID A2AA A2AA -\ID A2AB A2AB -\ID A2AC A2AC -\ID A2AD A2AD -\ID A2AE A2AE -\ID A2AF A2AF -\ID A2B0 A2B0 -\ID A2B1 A2B1 -\ID A2B2 A2B2 -\ID A2B3 A2B3 -\ID A2B4 A2B4 -\ID A2B5 A2B5 -\ID A2B6 A2B6 -\ID A2B7 A2B7 -\ID A2B8 A2B8 -\ID A2B9 A2B9 -\ID A2BA A2BA -\ID A2BB A2BB -\ID A2BC A2BC -\ID A2BD A2BD -\ID A2BE A2BE -\ID A2BF A2BF -\ID A2C0 A2C0 -\ID A2C1 A2C1 -\ID A2C2 A2C2 -\ID A2C3 A2C3 -\ID A2C4 A2C4 -\ID A2C5 A2C5 -\ID A2C6 A2C6 -\ID A2C7 A2C7 -\ID A2C8 A2C8 -\ID A2C9 A2C9 -\ID A2CA A2CA -\ID A2CB A2CB -\ID A2CC A2CC -\ID A2CD A2CD -\ID A2CE A2CE -\ID A2CF A2CF -\ID A2D0 A2D0 -\ID A2D1 A2D1 -\ID A2D2 A2D2 -\ID A2D3 A2D3 -\ID A2D4 A2D4 -\ID A2D5 A2D5 -\ID A2D6 A2D6 -\ID A2D7 A2D7 -\ID A2D8 A2D8 -\ID A2D9 A2D9 -\ID A2DA A2DA -\ID A2DB A2DB -\ID A2DC A2DC -\ID A2DD A2DD -\ID A2DE A2DE -\ID A2DF A2DF -\ID A2E0 A2E0 -\ID A2E1 A2E1 -\ID A2E2 A2E2 -\ID A2E3 A2E3 -\ID A2E4 A2E4 -\ID A2E5 A2E5 -\ID A2E6 A2E6 -\ID A2E7 A2E7 -\ID A2E8 A2E8 -\ID A2E9 A2E9 -\ID A2EA A2EA -\ID A2EB A2EB -\ID A2EC A2EC -\ID A2ED A2ED -\ID A2EE A2EE -\ID A2EF A2EF -\ID A2F0 A2F0 -\ID A2F1 A2F1 -\ID A2F2 A2F2 -\ID A2F3 A2F3 -\ID A2F4 A2F4 -\ID A2F5 A2F5 -\ID A2F6 A2F6 -\ID A2F7 A2F7 -\ID A2F8 A2F8 -\ID A2F9 A2F9 -\ID A2FA A2FA -\ID A2FB A2FB -\ID A2FC A2FC -\ID A2FD A2FD -\ID A2FE A2FE -\ID A2FF A2FF -\ID A300 A300 -\ID A301 A301 -\ID A302 A302 -\ID A303 A303 -\ID A304 A304 -\ID A305 A305 -\ID A306 A306 -\ID A307 A307 -\ID A308 A308 -\ID A309 A309 -\ID A30A A30A -\ID A30B A30B -\ID A30C A30C -\ID A30D A30D -\ID A30E A30E -\ID A30F A30F -\ID A310 A310 -\ID A311 A311 -\ID A312 A312 -\ID A313 A313 -\ID A314 A314 -\ID A315 A315 -\ID A316 A316 -\ID A317 A317 -\ID A318 A318 -\ID A319 A319 -\ID A31A A31A -\ID A31B A31B -\ID A31C A31C -\ID A31D A31D -\ID A31E A31E -\ID A31F A31F -\ID A320 A320 -\ID A321 A321 -\ID A322 A322 -\ID A323 A323 -\ID A324 A324 -\ID A325 A325 -\ID A326 A326 -\ID A327 A327 -\ID A328 A328 -\ID A329 A329 -\ID A32A A32A -\ID A32B A32B -\ID A32C A32C -\ID A32D A32D -\ID A32E A32E -\ID A32F A32F -\ID A330 A330 -\ID A331 A331 -\ID A332 A332 -\ID A333 A333 -\ID A334 A334 -\ID A335 A335 -\ID A336 A336 -\ID A337 A337 -\ID A338 A338 -\ID A339 A339 -\ID A33A A33A -\ID A33B A33B -\ID A33C A33C -\ID A33D A33D -\ID A33E A33E -\ID A33F A33F -\ID A340 A340 -\ID A341 A341 -\ID A342 A342 -\ID A343 A343 -\ID A344 A344 -\ID A345 A345 -\ID A346 A346 -\ID A347 A347 -\ID A348 A348 -\ID A349 A349 -\ID A34A A34A -\ID A34B A34B -\ID A34C A34C -\ID A34D A34D -\ID A34E A34E -\ID A34F A34F -\ID A350 A350 -\ID A351 A351 -\ID A352 A352 -\ID A353 A353 -\ID A354 A354 -\ID A355 A355 -\ID A356 A356 -\ID A357 A357 -\ID A358 A358 -\ID A359 A359 -\ID A35A A35A -\ID A35B A35B -\ID A35C A35C -\ID A35D A35D -\ID A35E A35E -\ID A35F A35F -\ID A360 A360 -\ID A361 A361 -\ID A362 A362 -\ID A363 A363 -\ID A364 A364 -\ID A365 A365 -\ID A366 A366 -\ID A367 A367 -\ID A368 A368 -\ID A369 A369 -\ID A36A A36A -\ID A36B A36B -\ID A36C A36C -\ID A36D A36D -\ID A36E A36E -\ID A36F A36F -\ID A370 A370 -\ID A371 A371 -\ID A372 A372 -\ID A373 A373 -\ID A374 A374 -\ID A375 A375 -\ID A376 A376 -\ID A377 A377 -\ID A378 A378 -\ID A379 A379 -\ID A37A A37A -\ID A37B A37B -\ID A37C A37C -\ID A37D A37D -\ID A37E A37E -\ID A37F A37F -\ID A380 A380 -\ID A381 A381 -\ID A382 A382 -\ID A383 A383 -\ID A384 A384 -\ID A385 A385 -\ID A386 A386 -\ID A387 A387 -\ID A388 A388 -\ID A389 A389 -\ID A38A A38A -\ID A38B A38B -\ID A38C A38C -\ID A38D A38D -\ID A38E A38E -\ID A38F A38F -\ID A390 A390 -\ID A391 A391 -\ID A392 A392 -\ID A393 A393 -\ID A394 A394 -\ID A395 A395 -\ID A396 A396 -\ID A397 A397 -\ID A398 A398 -\ID A399 A399 -\ID A39A A39A -\ID A39B A39B -\ID A39C A39C -\ID A39D A39D -\ID A39E A39E -\ID A39F A39F -\ID A3A0 A3A0 -\ID A3A1 A3A1 -\ID A3A2 A3A2 -\ID A3A3 A3A3 -\ID A3A4 A3A4 -\ID A3A5 A3A5 -\ID A3A6 A3A6 -\ID A3A7 A3A7 -\ID A3A8 A3A8 -\ID A3A9 A3A9 -\ID A3AA A3AA -\ID A3AB A3AB -\ID A3AC A3AC -\ID A3AD A3AD -\ID A3AE A3AE -\ID A3AF A3AF -\ID A3B0 A3B0 -\ID A3B1 A3B1 -\ID A3B2 A3B2 -\ID A3B3 A3B3 -\ID A3B4 A3B4 -\ID A3B5 A3B5 -\ID A3B6 A3B6 -\ID A3B7 A3B7 -\ID A3B8 A3B8 -\ID A3B9 A3B9 -\ID A3BA A3BA -\ID A3BB A3BB -\ID A3BC A3BC -\ID A3BD A3BD -\ID A3BE A3BE -\ID A3BF A3BF -\ID A3C0 A3C0 -\ID A3C1 A3C1 -\ID A3C2 A3C2 -\ID A3C3 A3C3 -\ID A3C4 A3C4 -\ID A3C5 A3C5 -\ID A3C6 A3C6 -\ID A3C7 A3C7 -\ID A3C8 A3C8 -\ID A3C9 A3C9 -\ID A3CA A3CA -\ID A3CB A3CB -\ID A3CC A3CC -\ID A3CD A3CD -\ID A3CE A3CE -\ID A3CF A3CF -\ID A3D0 A3D0 -\ID A3D1 A3D1 -\ID A3D2 A3D2 -\ID A3D3 A3D3 -\ID A3D4 A3D4 -\ID A3D5 A3D5 -\ID A3D6 A3D6 -\ID A3D7 A3D7 -\ID A3D8 A3D8 -\ID A3D9 A3D9 -\ID A3DA A3DA -\ID A3DB A3DB -\ID A3DC A3DC -\ID A3DD A3DD -\ID A3DE A3DE -\ID A3DF A3DF -\ID A3E0 A3E0 -\ID A3E1 A3E1 -\ID A3E2 A3E2 -\ID A3E3 A3E3 -\ID A3E4 A3E4 -\ID A3E5 A3E5 -\ID A3E6 A3E6 -\ID A3E7 A3E7 -\ID A3E8 A3E8 -\ID A3E9 A3E9 -\ID A3EA A3EA -\ID A3EB A3EB -\ID A3EC A3EC -\ID A3ED A3ED -\ID A3EE A3EE -\ID A3EF A3EF -\ID A3F0 A3F0 -\ID A3F1 A3F1 -\ID A3F2 A3F2 -\ID A3F3 A3F3 -\ID A3F4 A3F4 -\ID A3F5 A3F5 -\ID A3F6 A3F6 -\ID A3F7 A3F7 -\ID A3F8 A3F8 -\ID A3F9 A3F9 -\ID A3FA A3FA -\ID A3FB A3FB -\ID A3FC A3FC -\ID A3FD A3FD -\ID A3FE A3FE -\ID A3FF A3FF -\ID A400 A400 -\ID A401 A401 -\ID A402 A402 -\ID A403 A403 -\ID A404 A404 -\ID A405 A405 -\ID A406 A406 -\ID A407 A407 -\ID A408 A408 -\ID A409 A409 -\ID A40A A40A -\ID A40B A40B -\ID A40C A40C -\ID A40D A40D -\ID A40E A40E -\ID A40F A40F -\ID A410 A410 -\ID A411 A411 -\ID A412 A412 -\ID A413 A413 -\ID A414 A414 -\ID A415 A415 -\ID A416 A416 -\ID A417 A417 -\ID A418 A418 -\ID A419 A419 -\ID A41A A41A -\ID A41B A41B -\ID A41C A41C -\ID A41D A41D -\ID A41E A41E -\ID A41F A41F -\ID A420 A420 -\ID A421 A421 -\ID A422 A422 -\ID A423 A423 -\ID A424 A424 -\ID A425 A425 -\ID A426 A426 -\ID A427 A427 -\ID A428 A428 -\ID A429 A429 -\ID A42A A42A -\ID A42B A42B -\ID A42C A42C -\ID A42D A42D -\ID A42E A42E -\ID A42F A42F -\ID A430 A430 -\ID A431 A431 -\ID A432 A432 -\ID A433 A433 -\ID A434 A434 -\ID A435 A435 -\ID A436 A436 -\ID A437 A437 -\ID A438 A438 -\ID A439 A439 -\ID A43A A43A -\ID A43B A43B -\ID A43C A43C -\ID A43D A43D -\ID A43E A43E -\ID A43F A43F -\ID A440 A440 -\ID A441 A441 -\ID A442 A442 -\ID A443 A443 -\ID A444 A444 -\ID A445 A445 -\ID A446 A446 -\ID A447 A447 -\ID A448 A448 -\ID A449 A449 -\ID A44A A44A -\ID A44B A44B -\ID A44C A44C -\ID A44D A44D -\ID A44E A44E -\ID A44F A44F -\ID A450 A450 -\ID A451 A451 -\ID A452 A452 -\ID A453 A453 -\ID A454 A454 -\ID A455 A455 -\ID A456 A456 -\ID A457 A457 -\ID A458 A458 -\ID A459 A459 -\ID A45A A45A -\ID A45B A45B -\ID A45C A45C -\ID A45D A45D -\ID A45E A45E -\ID A45F A45F -\ID A460 A460 -\ID A461 A461 -\ID A462 A462 -\ID A463 A463 -\ID A464 A464 -\ID A465 A465 -\ID A466 A466 -\ID A467 A467 -\ID A468 A468 -\ID A469 A469 -\ID A46A A46A -\ID A46B A46B -\ID A46C A46C -\ID A46D A46D -\ID A46E A46E -\ID A46F A46F -\ID A470 A470 -\ID A471 A471 -\ID A472 A472 -\ID A473 A473 -\ID A474 A474 -\ID A475 A475 -\ID A476 A476 -\ID A477 A477 -\ID A478 A478 -\ID A479 A479 -\ID A47A A47A -\ID A47B A47B -\ID A47C A47C -\ID A47D A47D -\ID A47E A47E -\ID A47F A47F -\ID A480 A480 -\ID A481 A481 -\ID A482 A482 -\ID A483 A483 -\ID A484 A484 -\ID A485 A485 -\ID A486 A486 -\ID A487 A487 -\ID A488 A488 -\ID A489 A489 -\ID A48A A48A -\ID A48B A48B -\ID A48C A48C -\ID A490 A490 -\ID A491 A491 -\ID A492 A492 -\ID A493 A493 -\ID A494 A494 -\ID A495 A495 -\ID A496 A496 -\ID A497 A497 -\ID A498 A498 -\ID A499 A499 -\ID A49A A49A -\ID A49B A49B -\ID A49C A49C -\ID A49D A49D -\ID A49E A49E -\ID A49F A49F -\ID A4A0 A4A0 -\ID A4A1 A4A1 -\ID A4A2 A4A2 -\ID A4A3 A4A3 -\ID A4A4 A4A4 -\ID A4A5 A4A5 -\ID A4A6 A4A6 -\ID A4A7 A4A7 -\ID A4A8 A4A8 -\ID A4A9 A4A9 -\ID A4AA A4AA -\ID A4AB A4AB -\ID A4AC A4AC -\ID A4AD A4AD -\ID A4AE A4AE -\ID A4AF A4AF -\ID A4B0 A4B0 -\ID A4B1 A4B1 -\ID A4B2 A4B2 -\ID A4B3 A4B3 -\ID A4B4 A4B4 -\ID A4B5 A4B5 -\ID A4B6 A4B6 -\ID A4B7 A4B7 -\ID A4B8 A4B8 -\ID A4B9 A4B9 -\ID A4BA A4BA -\ID A4BB A4BB -\ID A4BC A4BC -\ID A4BD A4BD -\ID A4BE A4BE -\ID A4BF A4BF -\ID A4C0 A4C0 -\ID A4C1 A4C1 -\ID A4C2 A4C2 -\ID A4C3 A4C3 -\ID A4C4 A4C4 -\ID A4C5 A4C5 -\ID A4C6 A4C6 -\ID F900 F900 -\ID F901 F901 -\ID F902 F902 -\ID F903 F903 -\ID F904 F904 -\ID F905 F905 -\ID F906 F906 -\ID F907 F907 -\ID F908 F908 -\ID F909 F909 -\ID F90A F90A -\ID F90B F90B -\ID F90C F90C -\ID F90D F90D -\ID F90E F90E -\ID F90F F90F -\ID F910 F910 -\ID F911 F911 -\ID F912 F912 -\ID F913 F913 -\ID F914 F914 -\ID F915 F915 -\ID F916 F916 -\ID F917 F917 -\ID F918 F918 -\ID F919 F919 -\ID F91A F91A -\ID F91B F91B -\ID F91C F91C -\ID F91D F91D -\ID F91E F91E -\ID F91F F91F -\ID F920 F920 -\ID F921 F921 -\ID F922 F922 -\ID F923 F923 -\ID F924 F924 -\ID F925 F925 -\ID F926 F926 -\ID F927 F927 -\ID F928 F928 -\ID F929 F929 -\ID F92A F92A -\ID F92B F92B -\ID F92C F92C -\ID F92D F92D -\ID F92E F92E -\ID F92F F92F -\ID F930 F930 -\ID F931 F931 -\ID F932 F932 -\ID F933 F933 -\ID F934 F934 -\ID F935 F935 -\ID F936 F936 -\ID F937 F937 -\ID F938 F938 -\ID F939 F939 -\ID F93A F93A -\ID F93B F93B -\ID F93C F93C -\ID F93D F93D -\ID F93E F93E -\ID F93F F93F -\ID F940 F940 -\ID F941 F941 -\ID F942 F942 -\ID F943 F943 -\ID F944 F944 -\ID F945 F945 -\ID F946 F946 -\ID F947 F947 -\ID F948 F948 -\ID F949 F949 -\ID F94A F94A -\ID F94B F94B -\ID F94C F94C -\ID F94D F94D -\ID F94E F94E -\ID F94F F94F -\ID F950 F950 -\ID F951 F951 -\ID F952 F952 -\ID F953 F953 -\ID F954 F954 -\ID F955 F955 -\ID F956 F956 -\ID F957 F957 -\ID F958 F958 -\ID F959 F959 -\ID F95A F95A -\ID F95B F95B -\ID F95C F95C -\ID F95D F95D -\ID F95E F95E -\ID F95F F95F -\ID F960 F960 -\ID F961 F961 -\ID F962 F962 -\ID F963 F963 -\ID F964 F964 -\ID F965 F965 -\ID F966 F966 -\ID F967 F967 -\ID F968 F968 -\ID F969 F969 -\ID F96A F96A -\ID F96B F96B -\ID F96C F96C -\ID F96D F96D -\ID F96E F96E -\ID F96F F96F -\ID F970 F970 -\ID F971 F971 -\ID F972 F972 -\ID F973 F973 -\ID F974 F974 -\ID F975 F975 -\ID F976 F976 -\ID F977 F977 -\ID F978 F978 -\ID F979 F979 -\ID F97A F97A -\ID F97B F97B -\ID F97C F97C -\ID F97D F97D -\ID F97E F97E -\ID F97F F97F -\ID F980 F980 -\ID F981 F981 -\ID F982 F982 -\ID F983 F983 -\ID F984 F984 -\ID F985 F985 -\ID F986 F986 -\ID F987 F987 -\ID F988 F988 -\ID F989 F989 -\ID F98A F98A -\ID F98B F98B -\ID F98C F98C -\ID F98D F98D -\ID F98E F98E -\ID F98F F98F -\ID F990 F990 -\ID F991 F991 -\ID F992 F992 -\ID F993 F993 -\ID F994 F994 -\ID F995 F995 -\ID F996 F996 -\ID F997 F997 -\ID F998 F998 -\ID F999 F999 -\ID F99A F99A -\ID F99B F99B -\ID F99C F99C -\ID F99D F99D -\ID F99E F99E -\ID F99F F99F -\ID F9A0 F9A0 -\ID F9A1 F9A1 -\ID F9A2 F9A2 -\ID F9A3 F9A3 -\ID F9A4 F9A4 -\ID F9A5 F9A5 -\ID F9A6 F9A6 -\ID F9A7 F9A7 -\ID F9A8 F9A8 -\ID F9A9 F9A9 -\ID F9AA F9AA -\ID F9AB F9AB -\ID F9AC F9AC -\ID F9AD F9AD -\ID F9AE F9AE -\ID F9AF F9AF -\ID F9B0 F9B0 -\ID F9B1 F9B1 -\ID F9B2 F9B2 -\ID F9B3 F9B3 -\ID F9B4 F9B4 -\ID F9B5 F9B5 -\ID F9B6 F9B6 -\ID F9B7 F9B7 -\ID F9B8 F9B8 -\ID F9B9 F9B9 -\ID F9BA F9BA -\ID F9BB F9BB -\ID F9BC F9BC -\ID F9BD F9BD -\ID F9BE F9BE -\ID F9BF F9BF -\ID F9C0 F9C0 -\ID F9C1 F9C1 -\ID F9C2 F9C2 -\ID F9C3 F9C3 -\ID F9C4 F9C4 -\ID F9C5 F9C5 -\ID F9C6 F9C6 -\ID F9C7 F9C7 -\ID F9C8 F9C8 -\ID F9C9 F9C9 -\ID F9CA F9CA -\ID F9CB F9CB -\ID F9CC F9CC -\ID F9CD F9CD -\ID F9CE F9CE -\ID F9CF F9CF -\ID F9D0 F9D0 -\ID F9D1 F9D1 -\ID F9D2 F9D2 -\ID F9D3 F9D3 -\ID F9D4 F9D4 -\ID F9D5 F9D5 -\ID F9D6 F9D6 -\ID F9D7 F9D7 -\ID F9D8 F9D8 -\ID F9D9 F9D9 -\ID F9DA F9DA -\ID F9DB F9DB -\ID F9DC F9DC -\ID F9DD F9DD -\ID F9DE F9DE -\ID F9DF F9DF -\ID F9E0 F9E0 -\ID F9E1 F9E1 -\ID F9E2 F9E2 -\ID F9E3 F9E3 -\ID F9E4 F9E4 -\ID F9E5 F9E5 -\ID F9E6 F9E6 -\ID F9E7 F9E7 -\ID F9E8 F9E8 -\ID F9E9 F9E9 -\ID F9EA F9EA -\ID F9EB F9EB -\ID F9EC F9EC -\ID F9ED F9ED -\ID F9EE F9EE -\ID F9EF F9EF -\ID F9F0 F9F0 -\ID F9F1 F9F1 -\ID F9F2 F9F2 -\ID F9F3 F9F3 -\ID F9F4 F9F4 -\ID F9F5 F9F5 -\ID F9F6 F9F6 -\ID F9F7 F9F7 -\ID F9F8 F9F8 -\ID F9F9 F9F9 -\ID F9FA F9FA -\ID F9FB F9FB -\ID F9FC F9FC -\ID F9FD F9FD -\ID F9FE F9FE -\ID F9FF F9FF -\ID FA00 FA00 -\ID FA01 FA01 -\ID FA02 FA02 -\ID FA03 FA03 -\ID FA04 FA04 -\ID FA05 FA05 -\ID FA06 FA06 -\ID FA07 FA07 -\ID FA08 FA08 -\ID FA09 FA09 -\ID FA0A FA0A -\ID FA0B FA0B -\ID FA0C FA0C -\ID FA0D FA0D -\ID FA0E FA0E -\ID FA0F FA0F -\ID FA10 FA10 -\ID FA11 FA11 -\ID FA12 FA12 -\ID FA13 FA13 -\ID FA14 FA14 -\ID FA15 FA15 -\ID FA16 FA16 -\ID FA17 FA17 -\ID FA18 FA18 -\ID FA19 FA19 -\ID FA1A FA1A -\ID FA1B FA1B -\ID FA1C FA1C -\ID FA1D FA1D -\ID FA1E FA1E -\ID FA1F FA1F -\ID FA20 FA20 -\ID FA21 FA21 -\ID FA22 FA22 -\ID FA23 FA23 -\ID FA24 FA24 -\ID FA25 FA25 -\ID FA26 FA26 -\ID FA27 FA27 -\ID FA28 FA28 -\ID FA29 FA29 -\ID FA2A FA2A -\ID FA2B FA2B -\ID FA2C FA2C -\ID FA2D FA2D -\ID FA30 FA30 -\ID FA31 FA31 -\ID FA32 FA32 -\ID FA33 FA33 -\ID FA34 FA34 -\ID FA35 FA35 -\ID FA36 FA36 -\ID FA37 FA37 -\ID FA38 FA38 -\ID FA39 FA39 -\ID FA3A FA3A -\ID FA3B FA3B -\ID FA3C FA3C -\ID FA3D FA3D -\ID FA3E FA3E -\ID FA3F FA3F -\ID FA40 FA40 -\ID FA41 FA41 -\ID FA42 FA42 -\ID FA43 FA43 -\ID FA44 FA44 -\ID FA45 FA45 -\ID FA46 FA46 -\ID FA47 FA47 -\ID FA48 FA48 -\ID FA49 FA49 -\ID FA4A FA4A -\ID FA4B FA4B -\ID FA4C FA4C -\ID FA4D FA4D -\ID FA4E FA4E -\ID FA4F FA4F -\ID FA50 FA50 -\ID FA51 FA51 -\ID FA52 FA52 -\ID FA53 FA53 -\ID FA54 FA54 -\ID FA55 FA55 -\ID FA56 FA56 -\ID FA57 FA57 -\ID FA58 FA58 -\ID FA59 FA59 -\ID FA5A FA5A -\ID FA5B FA5B -\ID FA5C FA5C -\ID FA5D FA5D -\ID FA5E FA5E -\ID FA5F FA5F -\ID FA60 FA60 -\ID FA61 FA61 -\ID FA62 FA62 -\ID FA63 FA63 -\ID FA64 FA64 -\ID FA65 FA65 -\ID FA66 FA66 -\ID FA67 FA67 -\ID FA68 FA68 -\ID FA69 FA69 -\ID FA6A FA6A -\ID FA70 FA70 -\ID FA71 FA71 -\ID FA72 FA72 -\ID FA73 FA73 -\ID FA74 FA74 -\ID FA75 FA75 -\ID FA76 FA76 -\ID FA77 FA77 -\ID FA78 FA78 -\ID FA79 FA79 -\ID FA7A FA7A -\ID FA7B FA7B -\ID FA7C FA7C -\ID FA7D FA7D -\ID FA7E FA7E -\ID FA7F FA7F -\ID FA80 FA80 -\ID FA81 FA81 -\ID FA82 FA82 -\ID FA83 FA83 -\ID FA84 FA84 -\ID FA85 FA85 -\ID FA86 FA86 -\ID FA87 FA87 -\ID FA88 FA88 -\ID FA89 FA89 -\ID FA8A FA8A -\ID FA8B FA8B -\ID FA8C FA8C -\ID FA8D FA8D -\ID FA8E FA8E -\ID FA8F FA8F -\ID FA90 FA90 -\ID FA91 FA91 -\ID FA92 FA92 -\ID FA93 FA93 -\ID FA94 FA94 -\ID FA95 FA95 -\ID FA96 FA96 -\ID FA97 FA97 -\ID FA98 FA98 -\ID FA99 FA99 -\ID FA9A FA9A -\ID FA9B FA9B -\ID FA9C FA9C -\ID FA9D FA9D -\ID FA9E FA9E -\ID FA9F FA9F -\ID FAA0 FAA0 -\ID FAA1 FAA1 -\ID FAA2 FAA2 -\ID FAA3 FAA3 -\ID FAA4 FAA4 -\ID FAA5 FAA5 -\ID FAA6 FAA6 -\ID FAA7 FAA7 -\ID FAA8 FAA8 -\ID FAA9 FAA9 -\ID FAAA FAAA -\ID FAAB FAAB -\ID FAAC FAAC -\ID FAAD FAAD -\ID FAAE FAAE -\ID FAAF FAAF -\ID FAB0 FAB0 -\ID FAB1 FAB1 -\ID FAB2 FAB2 -\ID FAB3 FAB3 -\ID FAB4 FAB4 -\ID FAB5 FAB5 -\ID FAB6 FAB6 -\ID FAB7 FAB7 -\ID FAB8 FAB8 -\ID FAB9 FAB9 -\ID FABA FABA -\ID FABB FABB -\ID FABC FABC -\ID FABD FABD -\ID FABE FABE -\ID FABF FABF -\ID FAC0 FAC0 -\ID FAC1 FAC1 -\ID FAC2 FAC2 -\ID FAC3 FAC3 -\ID FAC4 FAC4 -\ID FAC5 FAC5 -\ID FAC6 FAC6 -\ID FAC7 FAC7 -\ID FAC8 FAC8 -\ID FAC9 FAC9 -\ID FACA FACA -\ID FACB FACB -\ID FACC FACC -\ID FACD FACD -\ID FACE FACE -\ID FACF FACF -\ID FAD0 FAD0 -\ID FAD1 FAD1 -\ID FAD2 FAD2 -\ID FAD3 FAD3 -\ID FAD4 FAD4 -\ID FAD5 FAD5 -\ID FAD6 FAD6 -\ID FAD7 FAD7 -\ID FAD8 FAD8 -\ID FAD9 FAD9 -\IS FE10 FE10 -\CL FE11 FE11 -\CL FE12 FE12 -\IS FE13 FE13 -\IS FE14 FE14 -\EX FE15 FE15 -\EX FE16 FE16 -\OP FE17 FE17 -\CL FE18 FE18 -\ID FE30 FE30 -\ID FE31 FE31 -\ID FE32 FE32 -\ID FE33 FE33 -\ID FE34 FE34 -\OP FE35 FE35 -\CL FE36 FE36 -\OP FE37 FE37 -\CL FE38 FE38 -\OP FE39 FE39 -\CL FE3A FE3A -\OP FE3B FE3B -\CL FE3C FE3C -\OP FE3D FE3D -\CL FE3E FE3E -\OP FE3F FE3F -\CL FE40 FE40 -\OP FE41 FE41 -\CL FE42 FE42 -\OP FE43 FE43 -\CL FE44 FE44 -\ID FE45 FE45 -\ID FE46 FE46 -\OP FE47 FE47 -\CL FE48 FE48 -\ID FE49 FE49 -\ID FE4A FE4A -\ID FE4B FE4B -\ID FE4C FE4C -\ID FE4D FE4D -\ID FE4E FE4E -\ID FE4F FE4F -\CL FE50 FE50 -\ID FE51 FE51 -\CL FE52 FE52 -\NS FE54 FE54 -\NS FE55 FE55 -\EX FE56 FE56 -\EX FE57 FE57 -\ID FE58 FE58 -\OP FE59 FE59 -\CL FE5A FE5A -\OP FE5B FE5B -\CL FE5C FE5C -\OP FE5D FE5D -\CL FE5E FE5E -\ID FE5F FE5F -\ID FE60 FE60 -\ID FE61 FE61 -\ID FE62 FE62 -\ID FE63 FE63 -\ID FE64 FE64 -\ID FE65 FE65 -\ID FE66 FE66 -\ID FE68 FE68 -\ID FE6B FE6B -\EX FF01 FF01 -\ID FF02 FF02 -\ID FF03 FF03 -\ID FF06 FF06 -\ID FF07 FF07 -\OP FF08 FF08 -\CL FF09 FF09 -\ID FF0A FF0A -\ID FF0B FF0B -\CL FF0C FF0C -\ID FF0D FF0D -\CL FF0E FF0E -\ID FF0F FF0F -\ID FF10 FF10 -\ID FF11 FF11 -\ID FF12 FF12 -\ID FF13 FF13 -\ID FF14 FF14 -\ID FF15 FF15 -\ID FF16 FF16 -\ID FF17 FF17 -\ID FF18 FF18 -\ID FF19 FF19 -\NS FF1A FF1A -\NS FF1B FF1B -\ID FF1C FF1C -\ID FF1D FF1D -\ID FF1E FF1E -\EX FF1F FF1F -\ID FF20 FF20 -\ID FF21 FF21 -\ID FF22 FF22 -\ID FF23 FF23 -\ID FF24 FF24 -\ID FF25 FF25 -\ID FF26 FF26 -\ID FF27 FF27 -\ID FF28 FF28 -\ID FF29 FF29 -\ID FF2A FF2A -\ID FF2B FF2B -\ID FF2C FF2C -\ID FF2D FF2D -\ID FF2E FF2E -\ID FF2F FF2F -\ID FF30 FF30 -\ID FF31 FF31 -\ID FF32 FF32 -\ID FF33 FF33 -\ID FF34 FF34 -\ID FF35 FF35 -\ID FF36 FF36 -\ID FF37 FF37 -\ID FF38 FF38 -\ID FF39 FF39 -\ID FF3A FF3A -\OP FF3B FF3B -\ID FF3C FF3C -\CL FF3D FF3D -\ID FF3E FF3E -\ID FF3F FF3F -\ID FF40 FF40 -\ID FF41 FF41 -\ID FF42 FF42 -\ID FF43 FF43 -\ID FF44 FF44 -\ID FF45 FF45 -\ID FF46 FF46 -\ID FF47 FF47 -\ID FF48 FF48 -\ID FF49 FF49 -\ID FF4A FF4A -\ID FF4B FF4B -\ID FF4C FF4C -\ID FF4D FF4D -\ID FF4E FF4E -\ID FF4F FF4F -\ID FF50 FF50 -\ID FF51 FF51 -\ID FF52 FF52 -\ID FF53 FF53 -\ID FF54 FF54 -\ID FF55 FF55 -\ID FF56 FF56 -\ID FF57 FF57 -\ID FF58 FF58 -\ID FF59 FF59 -\ID FF5A FF5A -\OP FF5B FF5B -\ID FF5C FF5C -\CL FF5D FF5D -\ID FF5E FF5E -\OP FF5F FF5F -\CL FF60 FF60 -\CL FF61 FF61 -\OP FF62 FF62 -\CL FF63 FF63 -\CL FF64 FF64 -\NS FF65 FF65 -\NS FF67 FF67 -\NS FF68 FF68 -\NS FF69 FF69 -\NS FF6A FF6A -\NS FF6B FF6B -\NS FF6C FF6C -\NS FF6D FF6D -\NS FF6E FF6E -\NS FF6F FF6F -\NS FF70 FF70 -\NS FF9E FF9E -\NS FF9F FF9F -\ID FFE2 FFE2 -\ID FFE3 FFE3 -\ID FFE4 FFE4 -\ID 20000 2A6D6 -\ID 2F800 2F800 -\ID 2F801 2F801 -\ID 2F802 2F802 -\ID 2F803 2F803 -\ID 2F804 2F804 -\ID 2F805 2F805 -\ID 2F806 2F806 -\ID 2F807 2F807 -\ID 2F808 2F808 -\ID 2F809 2F809 -\ID 2F80A 2F80A -\ID 2F80B 2F80B -\ID 2F80C 2F80C -\ID 2F80D 2F80D -\ID 2F80E 2F80E -\ID 2F80F 2F80F -\ID 2F810 2F810 -\ID 2F811 2F811 -\ID 2F812 2F812 -\ID 2F813 2F813 -\ID 2F814 2F814 -\ID 2F815 2F815 -\ID 2F816 2F816 -\ID 2F817 2F817 -\ID 2F818 2F818 -\ID 2F819 2F819 -\ID 2F81A 2F81A -\ID 2F81B 2F81B -\ID 2F81C 2F81C -\ID 2F81D 2F81D -\ID 2F81E 2F81E -\ID 2F81F 2F81F -\ID 2F820 2F820 -\ID 2F821 2F821 -\ID 2F822 2F822 -\ID 2F823 2F823 -\ID 2F824 2F824 -\ID 2F825 2F825 -\ID 2F826 2F826 -\ID 2F827 2F827 -\ID 2F828 2F828 -\ID 2F829 2F829 -\ID 2F82A 2F82A -\ID 2F82B 2F82B -\ID 2F82C 2F82C -\ID 2F82D 2F82D -\ID 2F82E 2F82E -\ID 2F82F 2F82F -\ID 2F830 2F830 -\ID 2F831 2F831 -\ID 2F832 2F832 -\ID 2F833 2F833 -\ID 2F834 2F834 -\ID 2F835 2F835 -\ID 2F836 2F836 -\ID 2F837 2F837 -\ID 2F838 2F838 -\ID 2F839 2F839 -\ID 2F83A 2F83A -\ID 2F83B 2F83B -\ID 2F83C 2F83C -\ID 2F83D 2F83D -\ID 2F83E 2F83E -\ID 2F83F 2F83F -\ID 2F840 2F840 -\ID 2F841 2F841 -\ID 2F842 2F842 -\ID 2F843 2F843 -\ID 2F844 2F844 -\ID 2F845 2F845 -\ID 2F846 2F846 -\ID 2F847 2F847 -\ID 2F848 2F848 -\ID 2F849 2F849 -\ID 2F84A 2F84A -\ID 2F84B 2F84B -\ID 2F84C 2F84C -\ID 2F84D 2F84D -\ID 2F84E 2F84E -\ID 2F84F 2F84F -\ID 2F850 2F850 -\ID 2F851 2F851 -\ID 2F852 2F852 -\ID 2F853 2F853 -\ID 2F854 2F854 -\ID 2F855 2F855 -\ID 2F856 2F856 -\ID 2F857 2F857 -\ID 2F858 2F858 -\ID 2F859 2F859 -\ID 2F85A 2F85A -\ID 2F85B 2F85B -\ID 2F85C 2F85C -\ID 2F85D 2F85D -\ID 2F85E 2F85E -\ID 2F85F 2F85F -\ID 2F860 2F860 -\ID 2F861 2F861 -\ID 2F862 2F862 -\ID 2F863 2F863 -\ID 2F864 2F864 -\ID 2F865 2F865 -\ID 2F866 2F866 -\ID 2F867 2F867 -\ID 2F868 2F868 -\ID 2F869 2F869 -\ID 2F86A 2F86A -\ID 2F86B 2F86B -\ID 2F86C 2F86C -\ID 2F86D 2F86D -\ID 2F86E 2F86E -\ID 2F86F 2F86F -\ID 2F870 2F870 -\ID 2F871 2F871 -\ID 2F872 2F872 -\ID 2F873 2F873 -\ID 2F874 2F874 -\ID 2F875 2F875 -\ID 2F876 2F876 -\ID 2F877 2F877 -\ID 2F878 2F878 -\ID 2F879 2F879 -\ID 2F87A 2F87A -\ID 2F87B 2F87B -\ID 2F87C 2F87C -\ID 2F87D 2F87D -\ID 2F87E 2F87E -\ID 2F87F 2F87F -\ID 2F880 2F880 -\ID 2F881 2F881 -\ID 2F882 2F882 -\ID 2F883 2F883 -\ID 2F884 2F884 -\ID 2F885 2F885 -\ID 2F886 2F886 -\ID 2F887 2F887 -\ID 2F888 2F888 -\ID 2F889 2F889 -\ID 2F88A 2F88A -\ID 2F88B 2F88B -\ID 2F88C 2F88C -\ID 2F88D 2F88D -\ID 2F88E 2F88E -\ID 2F88F 2F88F -\ID 2F890 2F890 -\ID 2F891 2F891 -\ID 2F892 2F892 -\ID 2F893 2F893 -\ID 2F894 2F894 -\ID 2F895 2F895 -\ID 2F896 2F896 -\ID 2F897 2F897 -\ID 2F898 2F898 -\ID 2F899 2F899 -\ID 2F89A 2F89A -\ID 2F89B 2F89B -\ID 2F89C 2F89C -\ID 2F89D 2F89D -\ID 2F89E 2F89E -\ID 2F89F 2F89F -\ID 2F8A0 2F8A0 -\ID 2F8A1 2F8A1 -\ID 2F8A2 2F8A2 -\ID 2F8A3 2F8A3 -\ID 2F8A4 2F8A4 -\ID 2F8A5 2F8A5 -\ID 2F8A6 2F8A6 -\ID 2F8A7 2F8A7 -\ID 2F8A8 2F8A8 -\ID 2F8A9 2F8A9 -\ID 2F8AA 2F8AA -\ID 2F8AB 2F8AB -\ID 2F8AC 2F8AC -\ID 2F8AD 2F8AD -\ID 2F8AE 2F8AE -\ID 2F8AF 2F8AF -\ID 2F8B0 2F8B0 -\ID 2F8B1 2F8B1 -\ID 2F8B2 2F8B2 -\ID 2F8B3 2F8B3 -\ID 2F8B4 2F8B4 -\ID 2F8B5 2F8B5 -\ID 2F8B6 2F8B6 -\ID 2F8B7 2F8B7 -\ID 2F8B8 2F8B8 -\ID 2F8B9 2F8B9 -\ID 2F8BA 2F8BA -\ID 2F8BB 2F8BB -\ID 2F8BC 2F8BC -\ID 2F8BD 2F8BD -\ID 2F8BE 2F8BE -\ID 2F8BF 2F8BF -\ID 2F8C0 2F8C0 -\ID 2F8C1 2F8C1 -\ID 2F8C2 2F8C2 -\ID 2F8C3 2F8C3 -\ID 2F8C4 2F8C4 -\ID 2F8C5 2F8C5 -\ID 2F8C6 2F8C6 -\ID 2F8C7 2F8C7 -\ID 2F8C8 2F8C8 -\ID 2F8C9 2F8C9 -\ID 2F8CA 2F8CA -\ID 2F8CB 2F8CB -\ID 2F8CC 2F8CC -\ID 2F8CD 2F8CD -\ID 2F8CE 2F8CE -\ID 2F8CF 2F8CF -\ID 2F8D0 2F8D0 -\ID 2F8D1 2F8D1 -\ID 2F8D2 2F8D2 -\ID 2F8D3 2F8D3 -\ID 2F8D4 2F8D4 -\ID 2F8D5 2F8D5 -\ID 2F8D6 2F8D6 -\ID 2F8D7 2F8D7 -\ID 2F8D8 2F8D8 -\ID 2F8D9 2F8D9 -\ID 2F8DA 2F8DA -\ID 2F8DB 2F8DB -\ID 2F8DC 2F8DC -\ID 2F8DD 2F8DD -\ID 2F8DE 2F8DE -\ID 2F8DF 2F8DF -\ID 2F8E0 2F8E0 -\ID 2F8E1 2F8E1 -\ID 2F8E2 2F8E2 -\ID 2F8E3 2F8E3 -\ID 2F8E4 2F8E4 -\ID 2F8E5 2F8E5 -\ID 2F8E6 2F8E6 -\ID 2F8E7 2F8E7 -\ID 2F8E8 2F8E8 -\ID 2F8E9 2F8E9 -\ID 2F8EA 2F8EA -\ID 2F8EB 2F8EB -\ID 2F8EC 2F8EC -\ID 2F8ED 2F8ED -\ID 2F8EE 2F8EE -\ID 2F8EF 2F8EF -\ID 2F8F0 2F8F0 -\ID 2F8F1 2F8F1 -\ID 2F8F2 2F8F2 -\ID 2F8F3 2F8F3 -\ID 2F8F4 2F8F4 -\ID 2F8F5 2F8F5 -\ID 2F8F6 2F8F6 -\ID 2F8F7 2F8F7 -\ID 2F8F8 2F8F8 -\ID 2F8F9 2F8F9 -\ID 2F8FA 2F8FA -\ID 2F8FB 2F8FB -\ID 2F8FC 2F8FC -\ID 2F8FD 2F8FD -\ID 2F8FE 2F8FE -\ID 2F8FF 2F8FF -\ID 2F900 2F900 -\ID 2F901 2F901 -\ID 2F902 2F902 -\ID 2F903 2F903 -\ID 2F904 2F904 -\ID 2F905 2F905 -\ID 2F906 2F906 -\ID 2F907 2F907 -\ID 2F908 2F908 -\ID 2F909 2F909 -\ID 2F90A 2F90A -\ID 2F90B 2F90B -\ID 2F90C 2F90C -\ID 2F90D 2F90D -\ID 2F90E 2F90E -\ID 2F90F 2F90F -\ID 2F910 2F910 -\ID 2F911 2F911 -\ID 2F912 2F912 -\ID 2F913 2F913 -\ID 2F914 2F914 -\ID 2F915 2F915 -\ID 2F916 2F916 -\ID 2F917 2F917 -\ID 2F918 2F918 -\ID 2F919 2F919 -\ID 2F91A 2F91A -\ID 2F91B 2F91B -\ID 2F91C 2F91C -\ID 2F91D 2F91D -\ID 2F91E 2F91E -\ID 2F91F 2F91F -\ID 2F920 2F920 -\ID 2F921 2F921 -\ID 2F922 2F922 -\ID 2F923 2F923 -\ID 2F924 2F924 -\ID 2F925 2F925 -\ID 2F926 2F926 -\ID 2F927 2F927 -\ID 2F928 2F928 -\ID 2F929 2F929 -\ID 2F92A 2F92A -\ID 2F92B 2F92B -\ID 2F92C 2F92C -\ID 2F92D 2F92D -\ID 2F92E 2F92E -\ID 2F92F 2F92F -\ID 2F930 2F930 -\ID 2F931 2F931 -\ID 2F932 2F932 -\ID 2F933 2F933 -\ID 2F934 2F934 -\ID 2F935 2F935 -\ID 2F936 2F936 -\ID 2F937 2F937 -\ID 2F938 2F938 -\ID 2F939 2F939 -\ID 2F93A 2F93A -\ID 2F93B 2F93B -\ID 2F93C 2F93C -\ID 2F93D 2F93D -\ID 2F93E 2F93E -\ID 2F93F 2F93F -\ID 2F940 2F940 -\ID 2F941 2F941 -\ID 2F942 2F942 -\ID 2F943 2F943 -\ID 2F944 2F944 -\ID 2F945 2F945 -\ID 2F946 2F946 -\ID 2F947 2F947 -\ID 2F948 2F948 -\ID 2F949 2F949 -\ID 2F94A 2F94A -\ID 2F94B 2F94B -\ID 2F94C 2F94C -\ID 2F94D 2F94D -\ID 2F94E 2F94E -\ID 2F94F 2F94F -\ID 2F950 2F950 -\ID 2F951 2F951 -\ID 2F952 2F952 -\ID 2F953 2F953 -\ID 2F954 2F954 -\ID 2F955 2F955 -\ID 2F956 2F956 -\ID 2F957 2F957 -\ID 2F958 2F958 -\ID 2F959 2F959 -\ID 2F95A 2F95A -\ID 2F95B 2F95B -\ID 2F95C 2F95C -\ID 2F95D 2F95D -\ID 2F95E 2F95E -\ID 2F95F 2F95F -\ID 2F960 2F960 -\ID 2F961 2F961 -\ID 2F962 2F962 -\ID 2F963 2F963 -\ID 2F964 2F964 -\ID 2F965 2F965 -\ID 2F966 2F966 -\ID 2F967 2F967 -\ID 2F968 2F968 -\ID 2F969 2F969 -\ID 2F96A 2F96A -\ID 2F96B 2F96B -\ID 2F96C 2F96C -\ID 2F96D 2F96D -\ID 2F96E 2F96E -\ID 2F96F 2F96F -\ID 2F970 2F970 -\ID 2F971 2F971 -\ID 2F972 2F972 -\ID 2F973 2F973 -\ID 2F974 2F974 -\ID 2F975 2F975 -\ID 2F976 2F976 -\ID 2F977 2F977 -\ID 2F978 2F978 -\ID 2F979 2F979 -\ID 2F97A 2F97A -\ID 2F97B 2F97B -\ID 2F97C 2F97C -\ID 2F97D 2F97D -\ID 2F97E 2F97E -\ID 2F97F 2F97F -\ID 2F980 2F980 -\ID 2F981 2F981 -\ID 2F982 2F982 -\ID 2F983 2F983 -\ID 2F984 2F984 -\ID 2F985 2F985 -\ID 2F986 2F986 -\ID 2F987 2F987 -\ID 2F988 2F988 -\ID 2F989 2F989 -\ID 2F98A 2F98A -\ID 2F98B 2F98B -\ID 2F98C 2F98C -\ID 2F98D 2F98D -\ID 2F98E 2F98E -\ID 2F98F 2F98F -\ID 2F990 2F990 -\ID 2F991 2F991 -\ID 2F992 2F992 -\ID 2F993 2F993 -\ID 2F994 2F994 -\ID 2F995 2F995 -\ID 2F996 2F996 -\ID 2F997 2F997 -\ID 2F998 2F998 -\ID 2F999 2F999 -\ID 2F99A 2F99A -\ID 2F99B 2F99B -\ID 2F99C 2F99C -\ID 2F99D 2F99D -\ID 2F99E 2F99E -\ID 2F99F 2F99F -\ID 2F9A0 2F9A0 -\ID 2F9A1 2F9A1 -\ID 2F9A2 2F9A2 -\ID 2F9A3 2F9A3 -\ID 2F9A4 2F9A4 -\ID 2F9A5 2F9A5 -\ID 2F9A6 2F9A6 -\ID 2F9A7 2F9A7 -\ID 2F9A8 2F9A8 -\ID 2F9A9 2F9A9 -\ID 2F9AA 2F9AA -\ID 2F9AB 2F9AB -\ID 2F9AC 2F9AC -\ID 2F9AD 2F9AD -\ID 2F9AE 2F9AE -\ID 2F9AF 2F9AF -\ID 2F9B0 2F9B0 -\ID 2F9B1 2F9B1 -\ID 2F9B2 2F9B2 -\ID 2F9B3 2F9B3 -\ID 2F9B4 2F9B4 -\ID 2F9B5 2F9B5 -\ID 2F9B6 2F9B6 -\ID 2F9B7 2F9B7 -\ID 2F9B8 2F9B8 -\ID 2F9B9 2F9B9 -\ID 2F9BA 2F9BA -\ID 2F9BB 2F9BB -\ID 2F9BC 2F9BC -\ID 2F9BD 2F9BD -\ID 2F9BE 2F9BE -\ID 2F9BF 2F9BF -\ID 2F9C0 2F9C0 -\ID 2F9C1 2F9C1 -\ID 2F9C2 2F9C2 -\ID 2F9C3 2F9C3 -\ID 2F9C4 2F9C4 -\ID 2F9C5 2F9C5 -\ID 2F9C6 2F9C6 -\ID 2F9C7 2F9C7 -\ID 2F9C8 2F9C8 -\ID 2F9C9 2F9C9 -\ID 2F9CA 2F9CA -\ID 2F9CB 2F9CB -\ID 2F9CC 2F9CC -\ID 2F9CD 2F9CD -\ID 2F9CE 2F9CE -\ID 2F9CF 2F9CF -\ID 2F9D0 2F9D0 -\ID 2F9D1 2F9D1 -\ID 2F9D2 2F9D2 -\ID 2F9D3 2F9D3 -\ID 2F9D4 2F9D4 -\ID 2F9D5 2F9D5 -\ID 2F9D6 2F9D6 -\ID 2F9D7 2F9D7 -\ID 2F9D8 2F9D8 -\ID 2F9D9 2F9D9 -\ID 2F9DA 2F9DA -\ID 2F9DB 2F9DB -\ID 2F9DC 2F9DC -\ID 2F9DD 2F9DD -\ID 2F9DE 2F9DE -\ID 2F9DF 2F9DF -\ID 2F9E0 2F9E0 -\ID 2F9E1 2F9E1 -\ID 2F9E2 2F9E2 -\ID 2F9E3 2F9E3 -\ID 2F9E4 2F9E4 -\ID 2F9E5 2F9E5 -\ID 2F9E6 2F9E6 -\ID 2F9E7 2F9E7 -\ID 2F9E8 2F9E8 -\ID 2F9E9 2F9E9 -\ID 2F9EA 2F9EA -\ID 2F9EB 2F9EB -\ID 2F9EC 2F9EC -\ID 2F9ED 2F9ED -\ID 2F9EE 2F9EE -\ID 2F9EF 2F9EF -\ID 2F9F0 2F9F0 -\ID 2F9F1 2F9F1 -\ID 2F9F2 2F9F2 -\ID 2F9F3 2F9F3 -\ID 2F9F4 2F9F4 -\ID 2F9F5 2F9F5 -\ID 2F9F6 2F9F6 -\ID 2F9F7 2F9F7 -\ID 2F9F8 2F9F8 -\ID 2F9F9 2F9F9 -\ID 2F9FA 2F9FA -\ID 2F9FB 2F9FB -\ID 2F9FC 2F9FC -\ID 2F9FD 2F9FD -\ID 2F9FE 2F9FE -\ID 2F9FF 2F9FF -\ID 2FA00 2FA00 -\ID 2FA01 2FA01 -\ID 2FA02 2FA02 -\ID 2FA03 2FA03 -\ID 2FA04 2FA04 -\ID 2FA05 2FA05 -\ID 2FA06 2FA06 -\ID 2FA07 2FA07 -\ID 2FA08 2FA08 -\ID 2FA09 2FA09 -\ID 2FA0A 2FA0A -\ID 2FA0B 2FA0B -\ID 2FA0C 2FA0C -\ID 2FA0D 2FA0D -\ID 2FA0E 2FA0E -\ID 2FA0F 2FA0F -\ID 2FA10 2FA10 -\ID 2FA11 2FA11 -\ID 2FA12 2FA12 -\ID 2FA13 2FA13 -\ID 2FA14 2FA14 -\ID 2FA15 2FA15 -\ID 2FA16 2FA16 -\ID 2FA17 2FA17 -\ID 2FA18 2FA18 -\ID 2FA19 2FA19 -\ID 2FA1A 2FA1A -\ID 2FA1B 2FA1B -\ID 2FA1C 2FA1C -\ID 2FA1D 2FA1D - -\def\ND #1 #2 {\set{#1}{#2}{\global\catcode\n=12 }} -%\ND 3000 3000 -%\ND FF00 FFF0 -%\ID FF10 FF19 -%\ID FF21 FF3A -%\ID FF41 FF5A -\endgroup diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls index 3d31a054427..0625a07619b 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjsarticle} - [2014/05/14 ] + [2014/12/24 ] \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -364,11 +364,14 @@ \fi \fi \ltj@setpar@global - \ltjsetkanjiskip{0pt plus .1\zw minus .01\zw} - \if@slide - \ltjsetxkanjiskip{0.1em} - \else - \ltjsetxkanjiskip{0.25em plus 0.15em minus 0.06em} + \ltjsetkanjiskip{\z@ plus .1\zw minus .01\zw} + \@tempskipa=\ltjgetparameter{xkanjiskip} + \ifdim\@tempskipa>\z@ + \if@slide + \ltjsetxkanjiskip{0.1em} + \else + \ltjsetxkanjiskip{0.25em plus 0.15em minus 0.06em} + \fi \fi} \emergencystretch 3\zw \newif\ifnarrowbaselines diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls index 4e3e12bf3d3..d455f09830e 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjsbook} - [2014/05/14 ] + [2014/12/24 ] \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -371,11 +371,14 @@ \fi \fi \ltj@setpar@global - \ltjsetkanjiskip{0pt plus .1\zw minus .01\zw} - \if@slide - \ltjsetxkanjiskip{0.1em} - \else - \ltjsetxkanjiskip{0.25em plus 0.15em minus 0.06em} + \ltjsetkanjiskip{\z@ plus .1\zw minus .01\zw} + \@tempskipa=\ltjgetparameter{xkanjiskip} + \ifdim\@tempskipa>\z@ + \if@slide + \ltjsetxkanjiskip{0.1em} + \else + \ltjsetxkanjiskip{0.25em plus 0.15em minus 0.06em} + \fi \fi} \emergencystretch 3\zw \newif\ifnarrowbaselines diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls index 1311decaa0a..e673e1b368e 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjskiyou} - [2014/05/14 ] + [2014/12/24 ] \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -366,11 +366,14 @@ \fi \fi \ltj@setpar@global - \ltjsetkanjiskip{0pt plus .1\zw minus .01\zw} - \if@slide - \ltjsetxkanjiskip{0.1em} - \else - \ltjsetxkanjiskip{0.25em plus 0.15em minus 0.06em} + \ltjsetkanjiskip{\z@ plus .1\zw minus .01\zw} + \@tempskipa=\ltjgetparameter{xkanjiskip} + \ifdim\@tempskipa>\z@ + \if@slide + \ltjsetxkanjiskip{0.1em} + \else + \ltjsetxkanjiskip{0.25em plus 0.15em minus 0.06em} + \fi \fi} \emergencystretch 3\zw \newif\ifnarrowbaselines diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls index fab8f0cd061..046dcdc89da 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjspf} - [2014/05/14 ] + [2014/12/24 ] \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -364,11 +364,14 @@ \fi \fi \ltj@setpar@global - \ltjsetkanjiskip{0pt plus .1\zw minus .01\zw} - \if@slide - \ltjsetxkanjiskip{0.1em} - \else - \ltjsetxkanjiskip{0.25em plus 0.15em minus 0.06em} + \ltjsetkanjiskip{\z@ plus .1\zw minus .01\zw} + \@tempskipa=\ltjgetparameter{xkanjiskip} + \ifdim\@tempskipa>\z@ + \if@slide + \ltjsetxkanjiskip{0.1em} + \else + \ltjsetxkanjiskip{0.25em plus 0.15em minus 0.06em} + \fi \fi} \emergencystretch 3\zw \newif\ifnarrowbaselines diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty index 6bdeab53d6c..a6ede22dcb8 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty @@ -1,7 +1,6 @@ % % luatexja.sty % - %! 外から読まれるので多少仰々しくなってます %% Avoid multiple loading. \csname\if11luatexjaLoaded\fi\endcsname @@ -38,9 +37,7 @@ \ProvidesPackage{luatexja}[2013/05/14 Japanese Typesetting with LuaTeX] \fi %</LaTeX> -\ifnum\catcode`漢=12 - \input ltj-unicode-ccfix.tex -\fi +\directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs %% Load all sub-packages. \ifltj@in@latex %<*LaTeX> diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty index b2c7d9afea2..3017f08563a 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty @@ -3,12 +3,16 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjp-listings}[2014/01/09 Patch to listings for LuaTeX-ja] +\ProvidesPackage{lltjp-listings}[2015/01/07 Patch to listings for LuaTeX-ja] \RequirePackage{listings,luatexbase-cctb} %%%%%%%%%%%%%%%% Japanese support +%% whether letter-space in a fixed mode box is doubled or not +\newif\if@ltj@lst@double +\lst@Key{doubleletterspace}f[t]{\lstKV@SetIf{#1}\if@ltj@lst@double} + %% IVS support -\newif\if@ltj@lst@vsraw \@ltj@lst@vsrawfalse +\newif\if@ltj@lst@vsraw \def\ltj@lst@vscmd{} \lst@Key{vsraw}f[t]{\lstKV@SetIf{#1}\if@ltj@lst@vsraw} \lst@Key{vscmd}\relax{\def\ltj@lst@vscmd{#1}} @@ -30,17 +34,19 @@ local cat_str = luatexbase.catcodetables['string'] local cat_lp = luatexbase.catcodetables['latex-package'] local ubyte = unicode.utf8.byte + local spccmd = string.char(0x5C) .. 'ltj@lst@hss@normal' luatexja.lst = {} function luatexja.lst.althss(t) t = ubyte(t) if not (t>=0xE0100 and t<0xE01F0) then - tex.sprint(cat_lp, string.char(0x5C) .. 'lst@hss') + tex.sprint(cat_lp, spccmd) end end } -\gdef\ltj@lst@hss@ivs#1{% +\def\ltj@lst@hss@ivs#1{% \directlua{luatexja.lst.althss('\luatexluaescapestring{#1}')}#1% } +\def\ltj@lst@hss@double{\lst@hss\lst@hss} % lowest level \newif\if@ltj@lst@kanji @@ -64,7 +70,7 @@ \lst@Output \else \if@ltj@lst@kanji\else\lst@OutputOther\fi\lst@lettertrue - \fi} + \fi\@ltj@lst@kanjitrue} \def\ltj@lst@setopenflag{% \lst@ifletter @@ -173,6 +179,26 @@ \SetCatcodeRange{"FE00}{"FE0F}{13}% Variation Selector } +% redefine \lstinline@ and \lst@InlineG +% because \lstinline!あ...! causes ``Runaway argument?'' Error +\def\lstinline@#1{% + \lst@Init\relax + \ltj@lst@check@inline{\lst@InlineM#1}{\lst@InlineJ#1}} +\def\lst@InlineG{% + \lst@Init\relax + \ltj@lst@check@inline{\lst@InlineM\}}% + {\let\lst@arg\@empty \lst@InlineGJ}} + +\def\ltj@lst@check@inline#1#2#3{% + \begingroup \lccode`\~=`#3\lowercase{\endgroup + \ifx~}#3% + \def\lst@next{#1}% + \else\ifnum`#3>127\relax + \def\lst@next{#1}% + \else + \def\lst@next{#2}% + \fi\fi\lst@next #3} + % We redefine \lst@BeginDropInput, since now we have % two additional `process macros'. \def\lst@BeginDropInput#1{% @@ -192,7 +218,7 @@ % hook! -\lst@AddToHook{Init}{ +\lst@AddToHook{Init}{% \luatexcatcodetable\CatcodeTableLTJlistings\ltj@@listing@jpcmd \lccode`\~="FFFFF\lowercase{\def~{\ltj@lst@ProcessJALetter}}%" \directlua{luatexbase.add_to_callback('process_input_buffer', @@ -201,17 +227,22 @@ for i = 1, utf.len(buf) do local c = utf.sub(buf, i, i) local cu = utf.byte(c) - if cu > 0x80 and tex.getcatcode(cu) \string~= 13 then + if cu >= 0x80 and tex.getcatcode(cu) \string~= 13 then ret = ret .. utf.char(1048575) % U+FFFFF end ret = ret .. c end return ret end, 'ltj.listings_unicode', 1)}% + \if@ltj@lst@double + \let\ltj@lst@hss@normal=\ltj@lst@hss@double + \else + \let\ltj@lst@hss@normal=\lst@hss + \fi \if@ltj@lst@vsraw \let\ltj@lst@hss=\ltj@lst@hss@ivs \else - \let\ltj@lst@hss=\lst@hss + \let\ltj@lst@hss=\ltj@lst@hss@normal \fi } \lst@AddToHook{ExitVars}{% @@ -298,4 +329,4 @@ \def\lstlistingname{ソースコード} \def\lstlistlistingname{ソースコード目次} % \end{修正事項} -\endinput
\ No newline at end of file +\endinput |