Merge branch 'master' of git.sourceforge.jp:/gitroot/luatex-ja/luatexja

diff --git a/.gitignore b/.gitignore
index e01d227..f6e0774 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,9 @@
 *.out
 *.tmp
 *~
+*.synctex*
+*.ltjruby
+doc/Makefile
+doc/showexpl.cfg
+doc/luatexja-ja.tex
+doc/luatexja-en.tex

diff --git a/README b/README
index 85b7f9a..39e293d 100644 (file)
--- a/README
+++ b/README
@@ -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

diff --git a/doc/luatexja-en.pdf b/doc/luatexja-en.pdf
index 9a39771..b98bfbc 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 a664af6..ab58b8a 100644 (file)
Binary files a/doc/luatexja-ja.pdf and b/doc/luatexja-ja.pdf differ