From: Scott Kostyshak Date: Mon, 30 Jan 2023 17:53:25 +0000 (-0500) Subject: Fix more ja documents for LuaTeX/XeTeX + systemF X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=795d5c408d9aebd424543aee4189171a486e975c;p=features.git 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 31d591dbd0..0aad5eba41 100644 --- 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 17312cbdee..6ee601505c 100644 --- 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 da2d7ab9b2..b5573efd7c 100644 --- 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 52cc03af87..cbb3ee1858 100644 --- 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 dcaaec52dd..1be34d4e11 100644 --- 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 38f0260aa3..91b2bbb1db 100644 --- 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 3cf1ec00fe..75745aebad 100644 --- 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 b420cdca75..d45b7a7c3b 100644 --- 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 48d981bbb1..df6278d591 100644 --- 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 b768c2afcb..0302c2f5fa 100644 --- 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 17aecbbcf4..b6e8de040f 100644 --- 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 ed0e518a97..3de3f3b1f4 100644 --- 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 716504f10e..b85a1d50a9 100644 --- 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 990ac7b33c..3383d56301 100644 --- 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 abbf5b5ca5..897a674ec9 100644 --- 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 4a89e1c64d..6585974b41 100644 --- 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 635a1b2e8f..e57fd689ae 100644 --- 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 d712f6cf5f..48f8cc6752 100644 --- 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 860c26f19d..e30cb3d68c 100644 --- 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 e851f8d058..12c6c23058 100644 --- 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