Rearranged .dtx, .ins and others

diff --git a/README b/README
index e1d0392..c1858cc 100644 (file)
--- a/README
+++ b/README
@@ -8,7 +8,9 @@ This package is highly affected by ASCII pTeX engine, but not a porting of it.
 
 Note that this package is still *alpha-stage*; documentations are not complete
 and specifications are subject to change. Documentations are located at
-  doc/luatexja-en.pdf (en), doc/luatexja-ja.pdf (ja), doc/luatexja-zh.pdf (zh).
+  doc/luatexja-en.pdf (en), doc/luatexja-ja.pdf (ja).
+These documents are generated from doc/luatexja.{dtx,ins}. However,
+to produce PDF files, you will need Kozuka fonts (commercial fonts).
 
 LuaTeX-ja is developed on
   <http://sourceforge.jp/projects/luatex-ja/wiki/FrontPage(en)>.
@@ -37,13 +39,19 @@ Installation
       <http://git.sourceforge.jp/view?p=luatex-ja/luatexja.git
                               ;a=snapshot;h=refs/tags/$VER$;sf=tgz>
 
-   b. Extract the archive and put src/ into your TEXMF tree.
+   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
+
+   c. 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.
 
-   c. You may need to update the filename database, by 'mktexlsr' or something.
+   d. You may need to update the filename database, by 'mktexlsr' or something.
 
 
 Basic Usage

diff --git a/doc/luatexja-en.pdf b/doc/luatexja-en.pdf
index 4fdc7e4..65716f4 100644 (file)
Binary files a/doc/luatexja-en.pdf and b/doc/luatexja-en.pdf differ

diff --git a/doc/luatexja-ja.pdf b/doc/luatexja-ja.pdf
index 09a0a41..5322648 100644 (file)
Binary files a/doc/luatexja-ja.pdf and b/doc/luatexja-ja.pdf differ

diff --git a/doc/luatexja-zh.pdf b/doc/luatexja-zh.pdf
deleted file mode 100644 (file)
index 5ce5eb8..0000000
Binary files a/doc/luatexja-zh.pdf and /dev/null differ

diff --git a/doc/luatexja.dtx b/doc/luatexja.dtx
index 7b73c3f..8102c6e 100644 (file)
--- a/doc/luatexja.dtx
+++ b/doc/luatexja.dtx
@@ -593,6 +593,20 @@ But only the contents in \texttt{src/} are needed to work \LuaTeX-ja.
 %</ja>
 
 %<*en>
+\item If you downloaded this package from CTAN, you have to process following three
+   files with \LuaLaTeX to generate classes:
+%</en>
+%<*ja>
+\item もしCTANから本パッケージを取得したのであれば，日本語用クラスファイルを
+生成するために，以下の3ファイルを\LuaLaTeX で処理する必要がある：
+%</ja>
+\begin{itemize}
+ \item \texttt{src/ltjclasses/ltjclasses.ins}
+ \item \texttt{src/ltjclasses/ltjltxdoc.ins}
+ \item \texttt{src/ltjsclasses/ltjsclasses.ins}
+\end{itemize}
+
+%<*en>
 \item Copy all the contents of \texttt{src/} into one of your \texttt{TEXMF} tree.
       \texttt{TEXMF/tex/luatex/luatexja/} is an example location.
       If you cloned entire Git repository, making a symbolic link of \texttt{src/}

diff --git a/no_runtime/luatexja-kinsoku_make.tex b/no_runtime/luatexja-kinsoku_make.tex
deleted file mode 100644 (file)
index be36d2f..0000000
--- a/no_runtime/luatexja-kinsoku_make.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-%#!lualatex luatexja-kinsoku_make.tex
-\documentclass{article}
-\usepackage{luatexja}
-\makeatletter
-\input{luatexja-kinsoku.tex}
-\usepackage{luacode}
-\begin{luacode}
- s = table.copy(luatexja.stack.charprop_stack_table[0])
- s.kanjiskip = nil; s.xkanjiskip = nil
- table.tofile('ltj-kinsoku.lua', s, 'return', false, true, false)
-\end{luacode}
-\begin{document}
-\end{document}

diff --git a/src/ltjclasses/ltjarticle.cls b/src/ltjarticle.cls
similarity index 100%
rename from src/ltjclasses/ltjarticle.cls
rename to src/ltjarticle.cls

diff --git a/src/ltjclasses/ltjbk10.clo b/src/ltjbk10.clo
similarity index 100%
rename from src/ltjclasses/ltjbk10.clo
rename to src/ltjbk10.clo

diff --git a/src/ltjclasses/ltjbk11.clo b/src/ltjbk11.clo
similarity index 100%
rename from src/ltjclasses/ltjbk11.clo
rename to src/ltjbk11.clo

diff --git a/src/ltjclasses/ltjbk12.clo b/src/ltjbk12.clo
similarity index 100%
rename from src/ltjclasses/ltjbk12.clo
rename to src/ltjbk12.clo

diff --git a/src/ltjclasses/ltjbook.cls b/src/ltjbook.cls
similarity index 100%
rename from src/ltjclasses/ltjbook.cls
rename to src/ltjbook.cls

diff --git a/no_runtime/ltjclasses.dtx b/src/ltjclasses.dtx
similarity index 100%
rename from no_runtime/ltjclasses.dtx
rename to src/ltjclasses.dtx

diff --git a/no_runtime/ltjclasses.ins b/src/ltjclasses.ins
similarity index 100%
rename from no_runtime/ltjclasses.ins
rename to src/ltjclasses.ins

diff --git a/src/ltjclasses/ltjltxdoc.cls b/src/ltjltxdoc.cls
similarity index 100%
rename from src/ltjclasses/ltjltxdoc.cls
rename to src/ltjltxdoc.cls

diff --git a/no_runtime/ltjltxdoc.dtx b/src/ltjltxdoc.dtx
similarity index 100%
rename from no_runtime/ltjltxdoc.dtx
rename to src/ltjltxdoc.dtx

diff --git a/no_runtime/ltjltxdoc.ins b/src/ltjltxdoc.ins
similarity index 100%
rename from no_runtime/ltjltxdoc.ins
rename to src/ltjltxdoc.ins

diff --git a/src/ltjclasses/ltjreport.cls b/src/ltjreport.cls
similarity index 100%
rename from src/ltjclasses/ltjreport.cls
rename to src/ltjreport.cls

diff --git a/src/ltjsclasses/ltjsarticle.cls b/src/ltjsarticle.cls
similarity index 100%
rename from src/ltjsclasses/ltjsarticle.cls
rename to src/ltjsarticle.cls

diff --git a/src/ltjsclasses/ltjsbook.cls b/src/ltjsbook.cls
similarity index 100%
rename from src/ltjsclasses/ltjsbook.cls
rename to src/ltjsbook.cls

diff --git a/no_runtime/ltjsclasses.dtx b/src/ltjsclasses.dtx
similarity index 100%
rename from no_runtime/ltjsclasses.dtx
rename to src/ltjsclasses.dtx

diff --git a/no_runtime/ltjsclasses.ins b/src/ltjsclasses.ins
similarity index 100%
rename from no_runtime/ltjsclasses.ins
rename to src/ltjsclasses.ins

diff --git a/src/ltjclasses/ltjsize10.clo b/src/ltjsize10.clo
similarity index 100%
rename from src/ltjclasses/ltjsize10.clo
rename to src/ltjsize10.clo

diff --git a/src/ltjclasses/ltjsize11.clo b/src/ltjsize11.clo
similarity index 100%
rename from src/ltjclasses/ltjsize11.clo
rename to src/ltjsize11.clo

diff --git a/src/ltjclasses/ltjsize12.clo b/src/ltjsize12.clo
similarity index 100%
rename from src/ltjclasses/ltjsize12.clo
rename to src/ltjsize12.clo

diff --git a/src/ltjsclasses/ltjskiyou.cls b/src/ltjskiyou.cls
similarity index 100%
rename from src/ltjsclasses/ltjskiyou.cls
rename to src/ltjskiyou.cls

diff --git a/src/ltjsclasses/ltjspf.cls b/src/ltjspf.cls
similarity index 100%
rename from src/ltjsclasses/ltjspf.cls
rename to src/ltjspf.cls

diff --git a/no_runtime/luatexja-kinsoku.tex b/src/make-kinsoku.tex
similarity index 95%
rename from no_runtime/luatexja-kinsoku.tex
rename to src/make-kinsoku.tex
index bd75dca..758acf7 100644 (file)
--- a/no_runtime/luatexja-kinsoku.tex
+++ b/src/make-kinsoku.tex
@@ -1,3 +1,8 @@
+%#!lualatex luatexja-kinsoku_make.tex
+\documentclass{article}
+\usepackage{luatexja}
+\makeatletter
+
 \ltj@tempcnta="0%"
 \loop\ifnum\ltj@tempcnta<"100%"
   \ltjsetparameter{alxspmode={\ltj@tempcnta,0}}%
@@ -440,15 +445,12 @@
 \ltjsetparameter{jaxspmode={`｢,preonly}}
 \ltjsetparameter{jaxspmode={`｣,postonly}}
 
-\endinput 
-cat `locate ukinsoku.tex` \
-  | sed "s/prebreakpenalty\(.*\)=\([0-9]*\)/ltjsetparameter{prebreakpenalty={\1,\2}}/" \
-  | sed "s/postbreakpenalty\(.*\)=\([0-9]*\)/ltjsetparameter{postbreakpenalty={\1,\2}}/" \
-  | sed "s/inhibitxspcode\(.*\)=0/ltjsetparameter{jaxspmode={\1,inhibit}}/" \
-  | sed "s/inhibitxspcode\(.*\)=1/ltjsetparameter{jaxspmode={\1,postonly}}/" \
-  | sed "s/inhibitxspcode\(.*\)=2/ltjsetparameter{jaxspmode={\1,preonly}}/" \
-  | sed "s/inhibitxspcode\(.*\)=3/ltjsetparameter{jaxspmode={\1,allow}}/" \
-  | sed "s/xspcode\(.*\)=0/ltjsetparameter{alxspmode={\1,inhibit}}/" \
-  | sed "s/xspcode\(.*\)=2/ltjsetparameter{alxspmode={\1,postonly}}/" \
-  | sed "s/xspcode\(.*\)=1/ltjsetparameter{alxspmode={\1,preonly}}/" \
-  | sed "s/xspcode\(.*\)=3/ltjsetparameter{alxspmode={\1,allow}}/"  > luatexja-kinsoku.tex
\ No newline at end of file
+
+\usepackage{luacode}
+\begin{luacode}
+ s = table.copy(luatexja.stack.charprop_stack_table[0])
+ s.kanjiskip = nil; s.xkanjiskip = nil
+ table.tofile('ltj-kinsoku.lua', s, 'return', false, true, false)
+\end{luacode}
+\begin{document}
+\end{document}

diff --git a/tool/release.sh b/tool/release.sh
index b901b29..22fa925 100755 (executable)
--- a/tool/release.sh
+++ b/tool/release.sh
@@ -24,6 +24,8 @@ git commit -m "Releases $VER" --allow-empty
 git archive --format=tar --prefix=$PROJECT-$VER/ HEAD | (cd $TEMP && tar xf -)
 cd $TEMP
 rm -rf $PROJECT-$VER/test
+rm -rf $PROJECT-$VER/src/*.cl*
+rm -rf $PROJECT-$VER/src/make-kinsoku.tex
 rm -rf $PROJECT-$VER-orig
 cp -r $PROJECT-$VER $PROJECT-$VER-orig
 cd $PROJECT-$VER