Fix more ja documents for LuaTeX/XeTeX + systemF

I used the following command inside the ja directories, and
confirmed the diff manually:

  git ls-files -z | xargs -0 sed -i -e 's/\\font_typewriter "default" "default"/\\font_typewriter "default" "IPAGothic"/'

These changes are consistent with 6656dd22.

diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests
index 31d591dbd0d124ab05dbb1e04b122acce0081f75..0aad5eba41943e4207735ab5f799f2d9e095bc48 100644 (file)
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -65,12 +65,12 @@ export/export/latex/unicodesymbols/031-thai_th_(euc-|gbk|jis|utf8-cjk).*
 
 # Package clashes when Japanese documents are compiled with non-TeX fonts,
 #
-export/doc/ja/(Additional|LaTeXConfig|Math|UserGuide).*_systemF
+export/doc/ja/(Additional|Math|UserGuide).*_systemF
 export/doc/ja/(Formula-numbering|EmbeddedObjects)_pdf4_systemF
 
 # Test for command \pdfsave fails:
 # ! Package xypdf Error: pdfTeX version 1.40.0 or higher is needed for the xypdf
-export/examples/ja/Graphics_and_Insets/XY-Pic.*_systemF
+export/examples/ja/Graphics_and_Insets/XY-Pic.*_pdf5_systemF
 
 # Does this still fail in TL19? What is the error?
 export/.*/fa/Welcome_(dvi3|pdf5)_systemF

diff --git a/lib/doc/ja/Additional.lyx b/lib/doc/ja/Additional.lyx
index 17312cbdee193a2905d597918d9ba102f8132b5d..6ee601505c1b08b94d3821997354e306f1b5f545 100644 (file)
--- a/lib/doc/ja/Additional.lyx
+++ b/lib/doc/ja/Additional.lyx
@@ -105,7 +105,7 @@ End
 \fontencoding auto
 \font_roman "lmodern" "IPAexMincho"
 \font_sans "default" "IPAexGothic"
-\font_typewriter "default" "default"
+\font_typewriter "default" "IPAGothic"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false

diff --git a/lib/doc/ja/DummyDocument1.lyx b/lib/doc/ja/DummyDocument1.lyx
index da2d7ab9b2937d8aa2a413fd4f5d9c6df05f8830..b5573efd7ce4f3952ea4317c3a9d1f115f3c8853 100644 (file)
--- a/lib/doc/ja/DummyDocument1.lyx
+++ b/lib/doc/ja/DummyDocument1.lyx
@@ -19,7 +19,7 @@
 \fontencoding auto
 \font_roman "lmodern" "IPAexMincho"
 \font_sans "default" "IPAexGothic"
-\font_typewriter "default" "default"
+\font_typewriter "default" "IPAGothic"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false

diff --git a/lib/doc/ja/DummyDocument2.lyx b/lib/doc/ja/DummyDocument2.lyx
index 52cc03af87d2660656078b1e652528f31ef2ff7c..cbb3ee185826b2f6bdc5083a9c4f31bf7a39efab 100644 (file)
--- a/lib/doc/ja/DummyDocument2.lyx
+++ b/lib/doc/ja/DummyDocument2.lyx
@@ -19,7 +19,7 @@
 \fontencoding auto
 \font_roman "lmodern" "IPAexMincho"
 \font_sans "default" "IPAexGothic"
-\font_typewriter "default" "default"
+\font_typewriter "default" "IPAGothic"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false

diff --git a/lib/doc/ja/Formula-numbering.lyx b/lib/doc/ja/Formula-numbering.lyx
index dcaaec52dd423c5aba5c926600141dc46e0c380b..1be34d4e11a6e1966e68cb754c517e9469e93fd8 100644 (file)
--- a/lib/doc/ja/Formula-numbering.lyx
+++ b/lib/doc/ja/Formula-numbering.lyx
@@ -54,7 +54,7 @@
 \fontencoding auto
 \font_roman "lmodern" "IPAexMincho"
 \font_sans "default" "IPAexGothic"
-\font_typewriter "default" "default"
+\font_typewriter "default" "IPAGothic"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false

diff --git a/lib/doc/ja/LaTeXConfig.lyx b/lib/doc/ja/LaTeXConfig.lyx
index 38f0260aa3877882f033d685b1e313ee1855736f..91b2bbb1db24f5d40052449c99313ec9e1c941c3 100644 (file)
--- a/lib/doc/ja/LaTeXConfig.lyx
+++ b/lib/doc/ja/LaTeXConfig.lyx
@@ -13,7 +13,7 @@
 \fontencoding auto
 \font_roman "lmodern" "IPAexMincho"
 \font_sans "default" "IPAexGothic"
-\font_typewriter "default" "default"
+\font_typewriter "default" "IPAGothic"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false

diff --git a/lib/doc/ja/Math.lyx b/lib/doc/ja/Math.lyx
index 3cf1ec00fe48d35080f4c358cc9b340df51df51a..75745aebad7020a05860b56f1c365f5b9ff1b74b 100644 (file)
--- a/lib/doc/ja/Math.lyx
+++ b/lib/doc/ja/Math.lyx
@@ -187,7 +187,7 @@ End
 \fontencoding auto
 \font_roman "lmodern" "IPAexMincho"
 \font_sans "default" "IPAexGothic"
-\font_typewriter "default" "default"
+\font_typewriter "default" "IPAGothic"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false

diff --git a/lib/doc/ja/MergedManuals.lyx b/lib/doc/ja/MergedManuals.lyx
index b420cdca75962259bbc8ed55f711c764bc7aa845..d45b7a7c3b8709462c6a17113d38d1b27526c03e 100644 (file)
--- a/lib/doc/ja/MergedManuals.lyx
+++ b/lib/doc/ja/MergedManuals.lyx
@@ -23,7 +23,7 @@ initials
 \fontencoding auto
 \font_roman "lmodern" "IPAexMincho"
 \font_sans "default" "IPAexGothic"
-\font_typewriter "default" "default"
+\font_typewriter "default" "IPAGothic"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false

diff --git a/lib/doc/ja/Shortcuts.lyx b/lib/doc/ja/Shortcuts.lyx
index 48d981bbb1e6c2ffdddd669aaac7c122f99f8aca..df6278d591bcad73a59bf32fab35fcc01e7ffa62 100644 (file)
--- a/lib/doc/ja/Shortcuts.lyx
+++ b/lib/doc/ja/Shortcuts.lyx
@@ -16,7 +16,7 @@ ruby
 \fontencoding auto
 \font_roman "lmodern" "IPAexMincho"
 \font_sans "default" "IPAexGothic"
-\font_typewriter "default" "default"
+\font_typewriter "default" "IPAGothic"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false

diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index b768c2afcbaa8de361b1b23da64d1d20f7683da0..0302c2f5fa32a8a4789f9bbf4e53035922731644 100644 (file)
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -100,7 +100,7 @@ End
 \fontencoding auto
 \font_roman "lmodern" "IPAexMincho"
 \font_sans "default" "IPAexGothic"
-\font_typewriter "default" "default"
+\font_typewriter "default" "IPAGothic"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false

diff --git a/lib/examples/ja/Graphics_and_Insets/Feynman_Diagrams.lyx b/lib/examples/ja/Graphics_and_Insets/Feynman_Diagrams.lyx
index 17aecbbcf4d567ab614f14216ace9db8bddf2981..b6e8de040f5512dabd91e0200b28c535b0bfda08 100644 (file)
--- a/lib/examples/ja/Graphics_and_Insets/Feynman_Diagrams.lyx
+++ b/lib/examples/ja/Graphics_and_Insets/Feynman_Diagrams.lyx
@@ -41,7 +41,7 @@
 \fontencoding auto
 \font_roman "lmodern" "IPAexMincho"
 \font_sans "default" "IPAexGothic"
-\font_typewriter "default" "default"
+\font_typewriter "default" "IPAGothic"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false

diff --git a/lib/examples/ja/Graphics_and_Insets/XY-Pic.lyx b/lib/examples/ja/Graphics_and_Insets/XY-Pic.lyx
index ed0e518a9788b655efddf3564b85e2e7b397fb3e..3de3f3b1f402a3d3d84e7b57e9dea7ddb152d301 100644 (file)
--- a/lib/examples/ja/Graphics_and_Insets/XY-Pic.lyx
+++ b/lib/examples/ja/Graphics_and_Insets/XY-Pic.lyx
@@ -37,7 +37,7 @@
 \fontencoding auto
 \font_roman "lmodern" "IPAexMincho"
 \font_sans "default" "IPAexGothic"
-\font_typewriter "default" "default"
+\font_typewriter "default" "IPAGothic"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false

diff --git a/lib/examples/ja/Modules/Braille.lyx b/lib/examples/ja/Modules/Braille.lyx
index 716504f10e314c90e66dbf38b14feb8c868c11fb..b85a1d50a9a789f14c309f6d9d9f37a5e574863f 100644 (file)
--- a/lib/examples/ja/Modules/Braille.lyx
+++ b/lib/examples/ja/Modules/Braille.lyx
@@ -24,7 +24,7 @@ braille
 \fontencoding auto
 \font_roman "lmodern" "IPAexMincho"
 \font_sans "default" "IPAexGothic"
-\font_typewriter "default" "default"
+\font_typewriter "default" "IPAGothic"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false

diff --git a/lib/examples/ja/Modules/LilyPond_Book.lyx b/lib/examples/ja/Modules/LilyPond_Book.lyx
index 990ac7b33c323a016fceed95cb4df74b6e9b2311..3383d563011cf23caec452b75c1466a4bf9964e9 100644 (file)
--- a/lib/examples/ja/Modules/LilyPond_Book.lyx
+++ b/lib/examples/ja/Modules/LilyPond_Book.lyx
@@ -16,7 +16,7 @@ lilypond
 \fontencoding auto
 \font_roman "lmodern" "IPAexMincho"
 \font_sans "default" "IPAexGothic"
-\font_typewriter "default" "default"
+\font_typewriter "default" "IPAGothic"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false

diff --git a/lib/examples/ja/Modules/Multilingual_Captions.lyx b/lib/examples/ja/Modules/Multilingual_Captions.lyx
index abbf5b5ca5e78e76745aa23edf3c51515d9c9ae2..897a674ec996632acbb5cc7736a1adb7a761c58f 100644 (file)
--- a/lib/examples/ja/Modules/Multilingual_Captions.lyx
+++ b/lib/examples/ja/Modules/Multilingual_Captions.lyx
@@ -35,7 +35,7 @@ bicaption
 \fontencoding auto
 \font_roman "lmodern" "IPAexMincho"
 \font_sans "default" "IPAexGothic"
-\font_typewriter "default" "default"
+\font_typewriter "default" "IPAGothic"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false

diff --git a/lib/examples/ja/Modules/Rnw_%28knitr%29.lyx b/lib/examples/ja/Modules/Rnw_%28knitr%29.lyx
index 4a89e1c64dbb81b203e4a0b2107537042f946d37..6585974b411edf7df91c8a5f60c544586ec2834a 100644 (file)
--- a/lib/examples/ja/Modules/Rnw_%28knitr%29.lyx
+++ b/lib/examples/ja/Modules/Rnw_%28knitr%29.lyx
@@ -16,7 +16,7 @@ knitr
 \fontencoding auto
 \font_roman "palatino" "IPAexMincho"
 \font_sans "default" "IPAexGothic"
-\font_typewriter "default" "default"
+\font_typewriter "default" "IPAGothic"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts true

diff --git a/lib/examples/ja/Modules/Sweave.lyx b/lib/examples/ja/Modules/Sweave.lyx
index 635a1b2e8fcfcd29a7d4ab2d19cd2e59f5e6fcda..e57fd689aecd05221a2d049a5c715b7d18b03129 100644 (file)
--- a/lib/examples/ja/Modules/Sweave.lyx
+++ b/lib/examples/ja/Modules/Sweave.lyx
@@ -28,7 +28,7 @@ sweave
 \fontencoding auto
 \font_roman "palatino" "IPAexMincho"
 \font_sans "default" "IPAexGothic"
-\font_typewriter "default" "default"
+\font_typewriter "default" "IPAGothic"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts true

diff --git a/lib/examples/ja/Presentations/Beamer.lyx b/lib/examples/ja/Presentations/Beamer.lyx
index d712f6cf5fb174c5de88c2a142b9de14a43787b7..48f8cc6752aba49efba2b30cfa0744af28653e1a 100644 (file)
--- a/lib/examples/ja/Presentations/Beamer.lyx
+++ b/lib/examples/ja/Presentations/Beamer.lyx
@@ -26,7 +26,7 @@
 \fontencoding auto
 \font_roman "lmodern" "IPAexMincho"
 \font_sans "default" "IPAexGothic"
-\font_typewriter "default" "default"
+\font_typewriter "default" "IPAGothic"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false

diff --git a/lib/examples/ja/Welcome.lyx b/lib/examples/ja/Welcome.lyx
index 860c26f19d24b8dc799b904ea8f0bde094691613..e30cb3d68cf32f3d57e18719508a098e21203837 100644 (file)
--- a/lib/examples/ja/Welcome.lyx
+++ b/lib/examples/ja/Welcome.lyx
@@ -13,7 +13,7 @@
 \fontencoding auto
 \font_roman "lmodern" "IPAexMincho"
 \font_sans "default" "IPAexGothic"
-\font_typewriter "default" "default"
+\font_typewriter "default" "IPAGothic"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false

diff --git a/lib/templates/ja/Presentations/Beamer.lyx b/lib/templates/ja/Presentations/Beamer.lyx
index e851f8d058574afffdc7ffd71e743e381d4ada3f..12c6c23058299c02b5dae7f70442cb00b9186adc 100644 (file)
--- a/lib/templates/ja/Presentations/Beamer.lyx
+++ b/lib/templates/ja/Presentations/Beamer.lyx
@@ -25,7 +25,7 @@
 \fontencoding auto
 \font_roman "times" "IPAexMincho"
 \font_sans "default" "IPAexGothic"
-\font_typewriter "default" "default"
+\font_typewriter "default" "IPAGothic"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false