Merge branch 'kitagawa_direct' into kitagawa_test

Conflicts:
	doc/luatexja.dtx
	src/ltj-adjust.lua
	src/ltj-jfont.lua

diff --cc src/ltj-jfont.lua
index 8209fe2,7e10815..ec0cf23
--- 1/src/ltj-jfont.lua
--- 2/src/ltj-jfont.lua
+++ b/src/ltj-jfont.lua
@@@ -300,6 -321,7 +321,10 @@@ en
  -- LATEX INTERFACE
  ------------------------------------------------------------------------
  do
++<<<<<<< HEAD
++=======
+    -- these function are called from ltj-latex.sty
++>>>>>>> kitagawa_direct
     local kyenc_list, ktenc_list = {}, {}
     function add_kyenc_list(enc) kyenc_list[enc] = 'true ' end
     function add_ktenc_list(enc) ktenc_list[enc] = 'true ' end