From 2e854cd36c80ef4fc3d9446d391bfa18b0469e30 Mon Sep 17 00:00:00 2001
From: =?utf8?q?G=C3=BCnter=20Milde?= <milde@lyx.org>
Date: Tue, 2 Apr 2019 16:38:52 +0200
Subject: [PATCH] ctest update.

* some Japanese (platex) documents fail with inputenc "utf8-platex"
  (missing characters in non-Japanese text parts), because the
  Unicodechar definitions from "inputenc" are not used.

* some Japanes (platex) documents show wrong output with "auto",
  because platex ignores the encoding switch for text parts
  in other languages.

* Japanese Beamer documents must set default output to "pdf",
  because dvipdfm(x) produces wrong output with document class "Beamer".

* update tagging/inverting rules.

* use HE8 font encoding for Hebrew in language test.
---
 .../export/latex/ja_wrong_auto_encoding.lyx   | 214 ++----------------
 .../export/latex/supported-languages.lyx      |   4 +-
 development/autotests/ignoredTests            |  24 +-
 development/autotests/invertedTests           |  14 +-
 lib/examples/ja/Modules/Braille.lyx           |   2 +-
 lib/examples/ja/Presentations/Beamer.lyx      |   4 +-
 lib/templates/ja/Presentations/Beamer.lyx     |   2 +-
 7 files changed, 36 insertions(+), 228 deletions(-)

diff --git a/autotests/export/latex/ja_wrong_auto_encoding.lyx b/autotests/export/latex/ja_wrong_auto_encoding.lyx
index 7d620c28d0..f75dc4f55e 100644
--- a/autotests/export/latex/ja_wrong_auto_encoding.lyx
+++ b/autotests/export/latex/ja_wrong_auto_encoding.lyx
@@ -1,7 +1,8 @@
-#LyX 2.2 created this file. For more info see http://www.lyx.org/
-\lyxformat 503
+#LyX 2.4 created this file. For more info see https://www.lyx.org/
+\lyxformat 569
 \begin_document
 \begin_header
+\save_transient_properties true
 \origin unavailable
 \textclass scrbook
 \begin_preamble
@@ -42,7 +43,7 @@
 
 \usepackage{t1enc}
 \end_preamble
-\options fleqn,bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading
+\options bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading
 \use_default_options false
 \begin_modules
 logicalmkup
@@ -97,7 +98,7 @@ End
 \language japanese
 \language_package default
 \inputencoding auto
-\fontencoding global
+\fontencoding auto
 \font_roman "default" "default"
 \font_sans "default" "default"
 \font_typewriter "default" "default"
@@ -108,6 +109,8 @@ End
 \font_osf false
 \font_sf_scale 100 100
 \font_tt_scale 100 100
+\use_microtype false
+\use_dash_ligatures true
 \graphics default
 \default_output_format default
 \output_sync 0
@@ -151,6 +154,7 @@ End
 \suppress_date false
 \justification true
 \use_refstyle 0
+\use_minted 0
 \notefontcolor #0000ff
 \index 索引
 \shortcut idx
@@ -160,10 +164,15 @@ End
 \tocdepth 3
 \paragraph_separation indent
 \paragraph_indentation default
-\quotes_language english
+\is_math_indent 1
+\math_indentation default
+\math_numbering_side default
+\quotes_style english
+\dynamic_quotes 0
 \papercolumns 1
 \papersides 2
 \paperpagestyle headings
+\tablestyle default
 \tracking_changes false
 \output_changes false
 \html_math_output 0
@@ -173,102 +182,16 @@ End
 
 \begin_body
 
-\begin_layout Title
-\SpecialChar LyX
-の高度な機能
-\begin_inset Newline newline
-\end_inset
-
-
-\size large
-第2.2.x版
-\end_layout
-
-\begin_layout Author
-\SpecialChar LyX
-プロジェクトチーム
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-このファイルは主にRichard Heckによって管理されています。コメントをされたい場合や誤りを発見された場合には、\SpecialChar LyX
-文書化メーリングリスト
-\begin_inset Flex Code
-status open
-
-\begin_layout Plain Layout
-\noindent
-
-\family typewriter
-<lyx-docs@lists.lyx.org>
-\end_layout
-
-\end_inset
-
-に英文にてお知らせ下さい。この文書の翻訳は、当初人見光太郎氏が行った貢献に基づいています。
-\end_layout
-
-\end_inset
-
- 
-\end_layout
-
-\begin_layout Standard
-\begin_inset CommandInset toc
-LatexCommand tableofcontents
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Chapter
-ソフトウェアを追加する必要がある \SpecialChar LyX
-機能
-\end_layout
-
-\begin_layout Section
-\SpecialChar TeX
-のチェック
-\end_layout
-
-\begin_layout Standard
-
-\noun on
-Asger Alstrup
-\noun default
-文
-\end_layout
-
-\begin_layout Section
-\SpecialChar LyX
-でのバージョン管理
-\end_layout
-
 \begin_layout Standard
 
-\noun on
-Lars Bullik Bjønnes
-\noun default
-および
-\noun on
-Pavel Sanda
-\noun default
-文
-\end_layout
-
-\begin_layout Subsection
-はじめに
+\lang english
+The following error if exporting to dvi shows only if the language immediately
+ before the (sub)section is in a secondary laguage.
 \end_layout
 
 \begin_layout Standard
 
 \lang english
-The following error if exporting to dvi shows only if the language immediately
- before the subchapter is in non default laguage.
-\begin_inset Newline newline
-\end_inset
-
 There is something special with the \SpecialChar LyX
 -character in the subsection.
  The error shows only if '\SpecialChar LyX
@@ -292,108 +215,5 @@ There is something special with the \SpecialChar LyX
 は、RCS 5.7/5.8に対して試験されています。
 \end_layout
 
-\begin_layout Subsubsection
-
-\family sans
-登録
-\end_layout
-
-\begin_layout Standard
-
-\series bold
-【ヒント】
-\family sans
-\series default
-Jpgfdraw
-\family default
-で複雑な形を描く場合、まず形を好きなプログラムで描き、出来上がった画像を
-\family sans
-Jpgfdraw
-\family default
-に読み込む方法があります。この場合、画像の外枠に沿って、直線またはスプラインを描くだけですみます。
-\end_layout
-
-\begin_layout Standard
-\begin_inset VSpace bigskip
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-
-\family sans
-任意の段落形
-\family default
-モジュールは、
-\family sans
-shapepar
-\family default
-と
-\family sans
-Shapepar
-\family default
-の二つのコマンドも提供していて、任意の形を座標毎に定義するのに使用することができます。
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-これらのコマンドは、上述の全ての形で内部的に使用されています。
-\end_layout
-
-\end_inset
-
-これらのスタイルがどのように使われていて、どのような設定ができるのかについての詳しい情報は、
-\series bold
-shapepar
-\series default
-パッケージの取扱説明書
-\begin_inset CommandInset citation
-LatexCommand cite
-key "shapepar"
-
-\end_inset
-
-をご覧ください。
-\end_layout
-
-\begin_layout Bibliography
-\begin_inset CommandInset bibitem
-LatexCommand bibitem
-key "multicol"
-
-\end_inset
-
-\SpecialChar LaTeX
-パッケージ
-\begin_inset CommandInset href
-LatexCommand href
-name "multicol"
-target "http://mirror.ctan.org/macros/latex/required/tools/multicol.pdf"
-
-\end_inset
-
-の取扱説明書
-\end_layout
-
-\begin_layout Bibliography
-\begin_inset CommandInset bibitem
-LatexCommand bibitem
-key "shapepar"
-
-\end_inset
-
-\SpecialChar LaTeX
-パッケージ
-\begin_inset CommandInset href
-LatexCommand href
-name "shapepar"
-target "http://mirrors.ctan.org/macros/latex/contrib/shapepar/shapepar.pdf"
-
-\end_inset
-
-の取扱説明書
-\end_layout
-
 \end_body
 \end_document
diff --git a/autotests/export/latex/supported-languages.lyx b/autotests/export/latex/supported-languages.lyx
index 4fab424a93..3aabd158a3 100644
--- a/autotests/export/latex/supported-languages.lyx
+++ b/autotests/export/latex/supported-languages.lyx
@@ -7,13 +7,15 @@
 \textclass scrartcl
 \begin_preamble
 %\usepackage{fonts-tlwg}
+
+\def\HeblatexEncoding{HE8}
 \end_preamble
 \use_default_options false
 \maintain_unincluded_children false
 \language english
 \language_package default
 \inputencoding auto
-\fontencoding auto
+\fontencoding HE8,T1
 \font_roman "DejaVuSerif" "default"
 \font_sans "DejaVuSans" "default"
 \font_typewriter "DejaVuSansMono" "default"
diff --git a/development/autotests/ignoredTests b/development/autotests/ignoredTests
index ee30c342ba..7dcb75efbe 100644
--- a/development/autotests/ignoredTests
+++ b/development/autotests/ignoredTests
@@ -53,8 +53,7 @@ export/examples/Articles/Chess/Game_2_pdf[25].*
 export/examples/(|fr/)Presentations/Powerdot_pdf[25].*
 export/examples/Modules/Chessboard_(lyx(16|20|21|22|23)|(pdf3|pdf5|dvi3)_texF)
 
-
-# requires jss.cls (not on CTAN)
+# jss.cls (not on CTAN)
 # "All documents need to be processed by pdflatex" [jss.pdf]
 export/templates/Articles/Journal_of_Statistical_Software_.*(dvi|dvi3_.*|pdf3?)
 
@@ -64,27 +63,22 @@ export/.*/ko/.*texF
 export/.*/zh_CN/.*texF
 export/export/latex/CJK/zh_CN-toc_.*_texF
 
-# Japanese manuals use language "japanese" wich is tied to "platex"
-# (automatically set instead of (plain) LaTeX).
-# For export with other engines, the language must be set to "Japanese (CJK).
-# see also INVERTED.TODO_export/export/latex/ja_wrong_auto_encoding_(dvi|pdf(|3)).*
-# For a discussion of alternatives for Japanese with LaTeX , see also
-# http://www.preining.info/blog/2014/12/writing-japanese-in-latex-part-1-introduction/
-#
-# Exceptions: 
-# * Japanese knitr.lyx and sweave.lyx support only XeLaTeX
-#   with system fonts because they use the "bxjsarticle" class.
+# Japanese knitr.lyx and sweave.lyx support only XeLaTeX with system fonts
+# because they use the "bxjsarticle" class.
 # The "!" means the following:
 #   "Protect these tests from being matched by future patterns in this file".
 !export/examples/ja/Modules/Rnw.*knitr.*_(lyx.*|xhtml|pdf4_systemF)
 export/examples/ja/Modules/Rnw.*knitr.*
 !export/examples/ja/Modules/Sweave.*_(lyx.*|xhtml|pdf4_systemF)
 export/examples/ja/Modules/Sweave.*
-# example for "Japanese (CJK)"
-!export/examples/ja/Multilingual_Typesetting_.*CJKutf8.*
 #
+# Other Japanese documents use language "japanese" wich is tied to "platex"
+# (automatically invoked instead of "latex" to create a DVI file).
+# Export by other engines works with language "japanese-cjk", e.g.
+!export/examples/ja/Multilingual_Typesetting_.*CJK.*
+# For a discussion of alternatives for Japanese with LaTeX , see also
+# http://www.preining.info/blog/2014/12/writing-japanese-in-latex-part-1-introduction/
 export/.*/ja/.*_(pdf[245]|dvi3).*
-
 # the unicodesymbols-tests use pdflatex, too:
 export/export/latex/unicodesymbols/.*-platex_pdf2
 
diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests
index 93a3570996..1cdb0c2b66 100644
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -15,22 +15,11 @@ Sublabel: todo
 # * easyfix issues,
 # * LyX bugs to report at trac (move pattern to section "lyxbugs" once done).
 
-# Error in Japanese document if LyX-logo is preceded by foreign language
-export/export/latex/ja_wrong_auto_encoding_(dvi|pdf(|3)).*
-
 # missing glyphs: There is no ^^A in font [lmroman12-regular]
 # and all the line down to ^^Z and beyond...
 # XeTeX artifact? works with LuaTeX, explore:
 export/doc/(|de/|es/|fr/)EmbeddedObjects_pdf4_systemF
 
-# missing glyphs: Missing character: There is no ^^c3 in font cmr12!
-# LyXbug: no [open output anyway], because only DVI generated.
-# Hand-converting dvi -> ps -> pdf works fine.
-export/examples/ja/Modules/Braille_(dvi|pdf.*)
-export/examples/ja/Modules/Braille_lyx2[23]
-# Missing character: There is no ^^e2 in font cmss10!
-export/templates/ja/Presentations/Beamer_(dvi|pdf3?|lyx2[23])
-
 
 # iconv fails, if a nomenclature inset contains an uncodable character
 export/export/latex/iconv-error-nomenclature_pdf2
@@ -195,6 +184,9 @@ export/doc/ar/UserGuide_lyx(22|23)
 
 #11532 inputencoding desynchronisation
 export/export/latex/misplaced-inputenc-switch_pdf2
+# Error in Japanese document if LyX-logo is preceded by foreign language
+export/export/latex/ja_wrong_auto_encoding_(dvi|pdf(|3)).*
+
 
 
 # ==============================================================
diff --git a/lib/examples/ja/Modules/Braille.lyx b/lib/examples/ja/Modules/Braille.lyx
index 8f06c56857..3c7c50ec18 100644
--- a/lib/examples/ja/Modules/Braille.lyx
+++ b/lib/examples/ja/Modules/Braille.lyx
@@ -17,7 +17,7 @@ braille
 \maintain_unincluded_children false
 \language japanese
 \language_package default
-\inputencoding utf8-platex
+\inputencoding jis-platex
 \fontencoding global
 \font_roman "default" "default"
 \font_sans "default" "default"
diff --git a/lib/examples/ja/Presentations/Beamer.lyx b/lib/examples/ja/Presentations/Beamer.lyx
index 1611e5254d..23649bcbf9 100644
--- a/lib/examples/ja/Presentations/Beamer.lyx
+++ b/lib/examples/ja/Presentations/Beamer.lyx
@@ -22,7 +22,7 @@
 \maintain_unincluded_children false
 \language japanese
 \language_package default
-\inputencoding utf8-platex
+\inputencoding jis-platex
 \fontencoding global
 \font_roman "default" "default"
 \font_sans "default" "default"
@@ -37,7 +37,7 @@
 \use_microtype false
 \use_dash_ligatures false
 \graphics default
-\default_output_format default
+\default_output_format pdf
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/templates/ja/Presentations/Beamer.lyx b/lib/templates/ja/Presentations/Beamer.lyx
index a150abb233..4241180e1b 100644
--- a/lib/templates/ja/Presentations/Beamer.lyx
+++ b/lib/templates/ja/Presentations/Beamer.lyx
@@ -21,7 +21,7 @@
 \maintain_unincluded_children false
 \language japanese
 \language_package default
-\inputencoding utf8-platex
+\inputencoding jis-platex
 \fontencoding global
 \font_roman "times" "default"
 \font_sans "default" "default"
-- 
2.39.5