Merge branch 'kitagawa_test' of git.osdn.net:/gitroot/luatex-ja/luatexja into kitagaw...

diff --git a/doc/luatexja.dtx b/doc/luatexja.dtx
index 0d5ed00..1328b1b 100644 (file)
--- a/doc/luatexja.dtx
+++ b/doc/luatexja.dtx
@@ -648,6 +648,8 @@ and \emph{Japanese fonts} for fonts used in \textbf{JAchar}.
 %<ja>\LuaTeX-jaパッケージの動作には次のパッケージ類が必要である．
 \begin{itemize}
 \item \href{http://www.luatex.org/}{\LuaTeX}\ 1.10.0 (or later)
+%<en>  (DVI output (\cs{outputmode=0} is not supported.)
+%<ja>  （DVI出力(\cs{outputmode=0})は対応していない．）
 \item recent \href{https://github.com/latex3/luaotfload}{\Pkg{luaotfload}} (v3.1 or later recommended)
 \item \Pkg{adobemapping} (Adobe cmap and pdfmapping files)
 \item \LaTeX\ 2020-02-02 patch level 5 or later

diff --git a/src/luatexja.lua b/src/luatexja.lua
index be2b285..1c039a7 100644 (file)
--- a/src/luatexja.lua
+++ b/src/luatexja.lua
@@ -83,6 +83,11 @@ dir_table.dir_utod = dir_table.dir_tate + dir_table.dir_math_mod
 
 local load_module = luatexja.load_module
 load_module 'base';      local ltjb = luatexja.base
+if tex.outputmode==0 then
+    ltjb.package_error('luatexja',
+      'DVI output is not supported in LuaTeX-ja',
+      'Use lua*tex instead dvilua*tex.')
+end
 load_module 'rmlgbm';    local ltjr = luatexja.rmlgbm -- must be 1st
 if luatexja_debug then load_module('debug') end
 load_module 'lotf_aux';  local ltju = luatexja.lotf_aux

diff --git a/src/luatexja.sty b/src/luatexja.sty
index 2bb9f0d..cfee092 100644 (file)
--- a/src/luatexja.sty
+++ b/src/luatexja.sty
@@ -41,7 +41,7 @@
   \ProcessOptions\relax
 \fi                             %</LaTeX>
 %%%% VERSION
-\def\LuaTeXjaversion{20200919.0}
+\def\LuaTeXjaversion{20201001.0}
 
 \directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs