From: Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Date: Wed, 18 Apr 2012 01:54:58 +0000 (+0900)
Subject: Move files which are not required in the regular use into src/no_runtime/.
X-Git-Tag: 20120419.0~4
X-Git-Url: http://git.osdn.net/view?p=luatex-ja%2Fluatexja.git;a=commitdiff_plain;h=56d2da83350729779acfedc381914448c1fa0905

Move files which are not required in the regular use into src/no_runtime/.

- Update lltjp-xunicode.sty, according to the post #63280 by Z.R. in the forum.
- Modify remarks on xunicode.sty in the manual.
---

diff --git a/src/ltjclasses/ltjclasses.pdf b/doc/ltjclasses.pdf
similarity index 100%
rename from src/ltjclasses/ltjclasses.pdf
rename to doc/ltjclasses.pdf
diff --git a/src/ltjclasses/ltjltxdoc.pdf b/doc/ltjltxdoc.pdf
similarity index 100%
rename from src/ltjclasses/ltjltxdoc.pdf
rename to doc/ltjltxdoc.pdf
diff --git a/src/ltjsclasses/ltjsclasses.pdf b/doc/ltjsclasses.pdf
similarity index 100%
rename from src/ltjsclasses/ltjsclasses.pdf
rename to doc/ltjsclasses.pdf
diff --git a/doc/man-en.pdf b/doc/man-en.pdf
index b524ae1..82ab7ef 100644
Binary files a/doc/man-en.pdf and b/doc/man-en.pdf differ
diff --git a/doc/man-ja.pdf b/doc/man-ja.pdf
index 16b1a68..228afad 100644
Binary files a/doc/man-ja.pdf and b/doc/man-ja.pdf differ
diff --git a/doc/manual.dtx b/doc/manual.dtx
index bdf8f91..a5ff5cf 100644
--- a/doc/manual.dtx
+++ b/doc/manual.dtx
@@ -85,7 +85,8 @@
 
 %<*en>
 \textbf{This documentation is far from complete. It may have many
-grammatical (and contextual) errors.}
+grammatical (and contextual) errors.} Also, several parts
+(especially, Section~\ref{sec-jfmglue}) are written in Japanese only.
 %</en>
 %<*ja>
 \textbf{\large 本ドキュメントはまだまだ未完成です．}
@@ -246,7 +247,7 @@ The followings are major changes from \pTeX:
 %</ja>
 
 %<*en>
-\item \emph{Caution: due to above two points, many methods which did the
+\item \emph{Caution: due to above two points, many methods which did for the
       dividing the process of the insertion of \textbf{JAglue} in \pTeX\ are not
       effective anymore.} In concrete terms, the following two methods are not effective anymore:
 %</en>
@@ -456,6 +457,22 @@ If you are using \TeX~Live~2011 or current W32\TeX, you don't have to worry.
 %<*ja>
 \item \LuaTeX-ja のソースアーカイブ（もちろん \texttt{:)}）．
 %</ja>
+%<*en>
+\item The \Pkg{filehook} package.
+%</en>
+%<*ja>
+\item \Pkg{filehook} パッケージ．
+%</ja>
+%<*en>
+\item The \Pkg{xunicode} package, which version is \emph{just v0.981 (2011/09/09)}.\\
+If you have the \Pkg{fontspec} package, this \Pkg{xunicode} package must be exist.
+But be careful about the version; other versions may not work correctly with \LuaTeX-ja.
+%</en>
+%<*ja>
+\item \Pkg{xunicode} パッケージ (\textbf{2011/09/09,~v0.981})．\\
+\Pkg{fontspec} パッケージが導入されていればこのパッケージも導入されているはずであるが，
+この v0.981 以外のバージョンでは\LuaTeX-ja 上で正しく動作しない危険性がある．
+%</ja>
 \end{itemize}
 
 %<*en>
@@ -482,7 +499,7 @@ The installation methods are as follows:
 $ git clone git://git.sourceforge.jp/gitroot/luatex-ja/luatexja.git
 \end{verbatim}
 %<*en>
-      or download the archive of HEAD in \texttt{master} branch from
+      or download the archive of HEAD in the \texttt{master} branch from
 %</en>
 %<*ja>
       もしくは，\texttt{master} ブランチの HEAD のアーカイブを以下からダウンロードしてもよい：
@@ -492,7 +509,7 @@ $ git clone git://git.sourceforge.jp/gitroot/luatex-ja/luatexja.git
 \end{flushleft}
 
 %<*en>
-Note that the forefront of development may not be in \texttt{master} branch.
+Note that the forefront of development may not be the \texttt{master} branch.
 %</en>
 %<*ja>
 \texttt{master} ブランチはたまにしか更新されない．
@@ -509,10 +526,15 @@ Note that the forefront of development may not be in \texttt{master} branch.
 %</ja>
 
 %<*en>
-\item Copy all the contents of \texttt{src/} into one of your \texttt{TEXMF} tree.
+\item Copy all the contents of \texttt{src/} (except \texttt{src/no\_runtime/}) into one of your \texttt{TEXMF} tree.\\
+      \texttt{TEXMF/tex/luatex/luatexja/} is an example location. 
+      Files in \texttt{src/no\_runtime/} are not required for the regular use, 
+      so you may simply remove \texttt{src/no\_runtime/}.
 %</en>
 %<*ja>
-\item \texttt{src/} の中身全てを自分の \texttt{TEXMF} ツリーにコピーする．
+\item \texttt{src/} の中身で，（\texttt{src/no\_runtime/}以外の）全てを自分の \texttt{TEXMF} ツリーにコピーする．\\
+      場所の例としては，例えば \texttt{TEXMF/tex/luatex/luatexja/} がある．
+      \texttt{src/no\_runtime/} 中のファイルは通常の使用には必要ないので，単に削除して構わない．
       シンボリックリンクが利用できる環境で，かつレポジトリを直接取得したのであれば，コピーではなく
       リンクを貼るのが適切だろう．
 %</ja>
@@ -1018,41 +1040,6 @@ these 7~commands, since this feature and \textbf{JAglue} will clash (see
 feature が \textbf{JAglue} と衝突するためである（\ref{para-kern} 節を参照）．
 %</ja>
 
-%<*en>
-\paragraph{Caution}
-\Pkg{xunicode} package will be reloaded during the loading of \Pkg{luatexja-fontspec} package.
-However, this reloading won't work for the current version (2011/09/09,~v0.981) of
-\Pkg{xunicode} package. Hence we have to patch it, using the following patch, for example:
-%</en>
-%<*ja>
-\paragraph{注意}
-\Pkg{luatexja-fontspec}パッケージでは，内部で \Pkg{xunicode} パッケージの再読み込みを
-行っているが， \textbf{\TeX\ Live\ 2011 他に含まれている \Pkg{xunicode} パッケージ
-(2011/09/09,~v0.981) ではその再読み込みがうまく動作せず}，例えば
-以下のようなパッチを当てる必要がある：
-%</ja>
-\begin{lstlisting}
---- xunicode.sty.orig   2011-09-12 08:31:47.000000000 +0900
-+++ xunicode.sty        2011-11-16 22:06:17.061413113 +0900
-@@ -1475,7 +1475,11 @@
-
- \newtoks\tipasavetokens
- \newtoks\tipachecktokens
-+
-+\fi
- \newif\iftipaonetoken
-+\expandafter\ifx\csname ReloadXunicode\endcsname\relax
-+
- \def\tipalasttoken{!@! do nothing with this !@!}
- \def\tipacatchonechar#1{\begingroup
-  \def\textipa##1{##1}% prevent recursion
-\end{lstlisting}
-%<*ja>
-なお，上流で v0.984 (2011/10/14) でこの問題は修正されているそうです（が，2012/03/20
-現在，まだ CTAN には上がっていない）．
-%</ja>
-
-
 %<en>\section{Changing Parameters}
 %<ja>\section{パラメータの変更}
 
@@ -1492,7 +1479,7 @@ The block list is indicated in Table~\ref{table-rng7}.
       発行されていれば，このグルーは挿入されない．
 %</ja>
 %<*en>
-\item The default glue which inserted between two \textbf{JAchar}s (\Param{
+\item The default glue which inserted between two \textbf{JAchar}s (\Param{%
       kanjiskip}).
 %</en>
 %<*ja>
@@ -3177,7 +3164,7 @@ but please remind remarks below.
 %</en>
 %<*ja>
 文字コードが（16進で）<hex\_number> の文字を出力する．
-このコマンドは \verb+\char"+<hex\_number> と似ているが，下の記述に注意すること．
+このコマンドは \verb+\char"+<hex\_number> と似ているが，下の記述に注意すること．%"
 %</ja>
 \end{list}
 
@@ -3858,10 +3845,10 @@ u
 
 %<en>\section{Insertion of JFM glues, \Param{kanjiskip} and \Param{xkanjiskip}}
 %<ja>\section{JFM グルーの挿入，\Param{kanjiskip} と \Param{xkanjiskip}}
+\label{sec-jfmglue}
 %<en>\subsection{Overview}
 %<ja>\subsection{概要}
 
-
 \LuaTeX-ja における和文処理グルーの挿入方法は，\pTeX のそれとは全く異なる．
 \pTeX では次のような仕様であった：
 \begin{itemize}
diff --git a/doc/sample1.pdf b/doc/sample1.pdf
index d5f77dc..9e48080 100644
Binary files a/doc/sample1.pdf and b/doc/sample1.pdf differ
diff --git a/doc/sample1.tex b/doc/sample1.tex
index 094da7e..b6178f3 100644
--- a/doc/sample1.tex
+++ b/doc/sample1.tex
@@ -19,7 +19,7 @@
 
 本パッケージは，（最低でもp\TeX と同等の水準の）日本語組版をLua\TeX 上で実現させることを
 目標としたマクロである．まだまだ足りないところはあるが，とりあえず動くようになった？ので公開する． 
-{\bf 本文章の更新は事実上停止しています．以降の更新は{\tt manual.dtx}と，そこから作られる{\tt man-en.pdf}, {\tt man-ja.pdf}で行います．}
+{\bf 本文章の更新は停止しています．以降の更新は{\tt manual.dtx}と，そこから作られる{\tt man-en.pdf}, {\tt man-ja.pdf}で行います．}
 
 \beginparagraph 特徴
 
diff --git a/src/ltjclasses/ltjclasses.dtx b/src/no_runtime/ltjclasses.dtx
similarity index 100%
rename from src/ltjclasses/ltjclasses.dtx
rename to src/no_runtime/ltjclasses.dtx
diff --git a/src/ltjclasses/ltjclasses.ins b/src/no_runtime/ltjclasses.ins
similarity index 100%
rename from src/ltjclasses/ltjclasses.ins
rename to src/no_runtime/ltjclasses.ins
diff --git a/src/patches/ltjlist.lua b/src/no_runtime/ltjlist.lua
similarity index 100%
rename from src/patches/ltjlist.lua
rename to src/no_runtime/ltjlist.lua
diff --git a/src/ltjclasses/ltjltxdoc.dtx b/src/no_runtime/ltjltxdoc.dtx
similarity index 100%
rename from src/ltjclasses/ltjltxdoc.dtx
rename to src/no_runtime/ltjltxdoc.dtx
diff --git a/src/ltjclasses/ltjltxdoc.ins b/src/no_runtime/ltjltxdoc.ins
similarity index 100%
rename from src/ltjclasses/ltjltxdoc.ins
rename to src/no_runtime/ltjltxdoc.ins
diff --git a/src/ltjsclasses/ltjsclasses.dtx b/src/no_runtime/ltjsclasses.dtx
similarity index 100%
rename from src/ltjsclasses/ltjsclasses.dtx
rename to src/no_runtime/ltjsclasses.dtx
diff --git a/src/ltjsclasses/ltjsclasses.ins b/src/no_runtime/ltjsclasses.ins
similarity index 100%
rename from src/ltjsclasses/ltjsclasses.ins
rename to src/no_runtime/ltjsclasses.ins
diff --git a/src/luatexja-kinsoku_make.tex b/src/no_runtime/luatexja-kinsoku_make.tex
similarity index 100%
rename from src/luatexja-kinsoku_make.tex
rename to src/no_runtime/luatexja-kinsoku_make.tex
diff --git a/src/patches/lltjp-xunicode.sty b/src/patches/lltjp-xunicode.sty
index 4b201d6..94a8bd9 100644
--- a/src/patches/lltjp-xunicode.sty
+++ b/src/patches/lltjp-xunicode.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-xunicode}[2011/11/22 Patch to xunicode for LuaLaTeX-ja]
+\ProvidesPackage{lltjp-xunicode}[2012/4/18 Patch to xunicode for LuaLaTeX-ja]
 
 \def\UTFencname{EU2}\def\XeTeXpicfile{}
 \RequirePackage{xunicode,luatexja}
@@ -79,24 +79,13 @@
 % Therefore temporarily set \hbar=\relax.
 \let\ltj@tmpa\hbar
 \let\hbar\relax
+\let\ltj@tmpb\iftipaonetoken
+\let\iftipaonetoken\relax
+\let\hbar\relax
 \ReloadXunicode{EU2}
 \makeatletter
 \let\hbar\ltj@tmpa
+\let\iftipaonetoken\ltj@tmpb
+\let\ltj@tmpb\relax % no more an if-token
 \endinput
 
-%% the following patch is needed to xunicode.sty:
-%% 
---- /opt/texlive/2011/texmf-dist/tex/xelatex/xunicode/xunicode.sty	2011-09-12 08:31:47.000000000 +0900
-+++ xunicode.sty	2011-11-16 22:06:17.061413113 +0900
-@@ -1475,7 +1475,11 @@
- 
- \newtoks\tipasavetokens
- \newtoks\tipachecktokens
-+
-+\fi
- \newif\iftipaonetoken
-+\expandafter\ifx\csname ReloadXunicode\endcsname\relax
-+
- \def\tipalasttoken{!@! do nothing with this !@!}
- \def\tipacatchonechar#1{\begingroup
-  \def\textipa##1{##1}% prevent recursion