From: Günter Milde <milde@lyx.org>
Date: Mon, 29 Apr 2019 18:55:48 +0000 (+0200)
Subject: ctest update
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~2084
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=74b1b9d8;p=lyx.git

ctest update

Separate xetex-inputenc test sample in working and non-working parts.

Sort HTML-only tests.

Update tagging and ignore-rules.

Change inputencoding to utf8 in dedicated tests (get pdf4_texF working).
---

diff --git a/autotests/export/IncludeMissingEndTagDiv.lyx b/autotests/export/IncludeMissingEndTagDiv.lyx
deleted file mode 100644
index 3e56e2b09e..0000000000
--- a/autotests/export/IncludeMissingEndTagDiv.lyx
+++ /dev/null
@@ -1,102 +0,0 @@
-#LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 508
-\begin_document
-\begin_header
-\save_transient_properties true
-\origin unavailable
-\textclass article
-\use_default_options false
-\maintain_unincluded_children false
-\language english
-\language_package default
-\inputencoding auto
-\fontencoding global
-\font_roman "default" "TeX Gyre Termes"
-\font_sans "default" "TeX Gyre Pagella"
-\font_typewriter "default" "TeX Gyre Cursor"
-\font_math "auto" "auto"
-\font_default_family default
-\use_non_tex_fonts true
-\font_sc false
-\font_osf false
-\font_sf_scale 100 100
-\font_tt_scale 100 100
-\graphics default
-\default_output_format pdf5
-\output_sync 0
-\bibtex_command default
-\index_command default
-\paperfontsize default
-\spacing single
-\use_hyperref false
-\papersize a4paper
-\use_geometry false
-\use_package amsmath 0
-\use_package amssymb 0
-\use_package cancel 0
-\use_package esint 0
-\use_package mathdots 0
-\use_package mathtools 0
-\use_package mhchem 0
-\use_package stackrel 0
-\use_package stmaryrd 0
-\use_package undertilde 0
-\cite_engine basic
-\cite_engine_type default
-\biblio_style plain
-\use_bibtopic false
-\use_indices false
-\paperorientation portrait
-\suppress_date false
-\justification true
-\use_refstyle 0
-\index Register
-\shortcut idx
-\color #008000
-\end_index
-\paperwidth 22cm
-\paperheight 11cm
-\leftmargin 1cm
-\topmargin 0cm
-\rightmargin 1cm
-\bottommargin 0cm
-\secnumdepth 3
-\tocdepth 3
-\paragraph_separation skip
-\defskip medskip
-\quotes_language english
-\papercolumns 1
-\papersides 1
-\paperpagestyle empty
-\tracking_changes false
-\output_changes false
-\html_math_output 0
-\html_css_as_file 0
-\html_be_strict false
-\end_header
-
-\begin_body
-
-\begin_layout Standard
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
-
-
-\backslash
-addcontentsline{toc}{chapter}{Abstract} 
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-Remove this text or the ERT to make the xhtml export of the main document
- work
-\end_layout
-
-\end_body
-\end_document
diff --git a/autotests/export/MissingEndLayoutBetweenTables.lyx b/autotests/export/MissingEndLayoutBetweenTables.lyx
index bd81c3f9a7..502a999428 100644
--- a/autotests/export/MissingEndLayoutBetweenTables.lyx
+++ b/autotests/export/MissingEndLayoutBetweenTables.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 573
 \begin_document
 \begin_header
+\save_transient_properties true
 \origin unavailable
 \textclass scrbook
 \options bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading,usenames,dvipsnames,table
@@ -13,8 +14,8 @@ graphicboxes
 \maintain_unincluded_children false
 \language english
 \language_package default
-\inputencoding auto
-\fontencoding global
+\inputencoding utf8
+\fontencoding auto
 \font_roman "lmodern" "default"
 \font_sans "lmss" "default"
 \font_typewriter "lmtt" "default"
@@ -25,11 +26,15 @@ graphicboxes
 \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
 \bibtex_command default
 \index_command default
+\float_placement class
+\float_alignment class
 \paperfontsize 12
 \spacing single
 \use_hyperref true
@@ -68,6 +73,7 @@ graphicboxes
 \suppress_date false
 \justification true
 \use_refstyle 0
+\use_minted 0
 \notefontcolor #0000ff
 \index Index
 \shortcut idx
@@ -77,14 +83,18 @@ graphicboxes
 \tocdepth 3
 \paragraph_separation skip
 \defskip medskip
-\quotes_language english
+\is_math_indent 0
+\math_numbering_side default
+\quotes_style english
+\dynamic_quotes 0
 \papercolumns 1
 \papersides 2
 \paperpagestyle default
+\tablestyle default
 \tracking_changes false
+\output_changes false
 \html_math_output 0
 \html_css_as_file 0
-\output_changes false
 \html_be_strict false
 \end_header
 
diff --git a/autotests/export/MissingEndTagDiv.lyx b/autotests/export/MissingEndTagDiv.lyx
deleted file mode 100644
index 4a292a6330..0000000000
--- a/autotests/export/MissingEndTagDiv.lyx
+++ /dev/null
@@ -1,146 +0,0 @@
-#LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 508
-\begin_document
-\begin_header
-\save_transient_properties true
-\origin unavailable
-\textclass scrbook
-\options intoc,bibliography=totoc,index=totoc,BCOR10mm,captions=tableheading,titlepage,fleqn
-\use_default_options true
-\begin_modules
-customHeadersFooters
-\end_modules
-\maintain_unincluded_children false
-\language english
-\language_package default
-\inputencoding auto
-\fontencoding global
-\font_roman "lmodern" "default"
-\font_sans "lmss" "default"
-\font_typewriter "lmtt" "default"
-\font_math "auto" "auto"
-\font_default_family default
-\use_non_tex_fonts false
-\font_sc false
-\font_osf false
-\font_sf_scale 100 100
-\font_tt_scale 100 100
-\graphics default
-\default_output_format default
-\output_sync 0
-\bibtex_command bibtex
-\index_command default
-\float_placement h
-\paperfontsize 12
-\spacing single
-\use_hyperref true
-\pdf_bookmarks true
-\pdf_bookmarksnumbered true
-\pdf_bookmarksopen true
-\pdf_bookmarksopenlevel 1
-\pdf_breaklinks false
-\pdf_pdfborder true
-\pdf_colorlinks false
-\pdf_backref false
-\pdf_pdfusetitle true
-\pdf_quoted_options "pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false"
-\papersize a4paper
-\use_geometry false
-\use_package amsmath 2
-\use_package amssymb 2
-\use_package cancel 0
-\use_package esint 1
-\use_package mathdots 1
-\use_package mathtools 0
-\use_package mhchem 1
-\use_package stackrel 0
-\use_package stmaryrd 0
-\use_package undertilde 0
-\cite_engine basic
-\cite_engine_type default
-\biblio_style plain
-\use_bibtopic false
-\use_indices false
-\paperorientation portrait
-\suppress_date true
-\justification true
-\use_refstyle 0
-\branch chapter-1
-\selected 1
-\filename_suffix 0
-\color #ffaa00
-\end_branch
-\branch chapter-2
-\selected 1
-\filename_suffix 0
-\color #55aaff
-\end_branch
-\branch Summary
-\selected 1
-\filename_suffix 0
-\color #7f7f7f
-\end_branch
-\branch Acknowledgments
-\selected 1
-\filename_suffix 0
-\color #ffff00
-\end_branch
-\branch Appendix
-\selected 1
-\filename_suffix 0
-\color #faf0e6
-\end_branch
-\index Index
-\shortcut idx
-\color #008000
-\end_index
-\secnumdepth 3
-\tocdepth 2
-\paragraph_separation skip
-\defskip medskip
-\quotes_language english
-\papercolumns 1
-\papersides 2
-\paperpagestyle fancy
-\tracking_changes false
-\output_changes false
-\html_math_output 0
-\html_css_as_file 0
-\html_be_strict false
-\end_header
-
-\begin_body
-
-\begin_layout Subject
-Thesis to get the degree of a doctor of philosophy
-\end_layout
-
-\begin_layout Title
-Title of the thesis
-\end_layout
-
-\begin_layout Standard
-\begin_inset Branch Summary
-status open
-
-\begin_layout Standard
-Dissolving or deactivating this branch makes xhtml export work
-\end_layout
-
-\begin_layout Standard
-\begin_inset CommandInset include
-LatexCommand include
-filename "IncludeMissingEndTagDiv.lyx"
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_body
-\end_document
diff --git a/autotests/export/latex/CJK/zh_CN-toc.lyx b/autotests/export/latex/CJK/zh_CN-toc.lyx
index f25b80e53f..da89caed24 100644
--- a/autotests/export/latex/CJK/zh_CN-toc.lyx
+++ b/autotests/export/latex/CJK/zh_CN-toc.lyx
@@ -1,5 +1,5 @@
 #LyX 2.4 created this file. For more info see https://www.lyx.org/
-\lyxformat 566
+\lyxformat 573
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -16,7 +16,7 @@
 \maintain_unincluded_children false
 \language chinese-traditional
 \language_package default
-\inputencoding utf8-cjk
+\inputencoding utf8
 \fontencoding auto
 \font_roman "lmodern" "default"
 \font_sans "default" "default"
@@ -87,6 +87,7 @@
 \papercolumns 1
 \papersides 1
 \paperpagestyle default
+\tablestyle default
 \tracking_changes false
 \output_changes false
 \html_math_output 0
diff --git a/autotests/export/latex/ja_wrong_auto_encoding.lyx b/autotests/export/latex/ja_wrong_auto_encoding.lyx
deleted file mode 100644
index a3a4db9a16..0000000000
--- a/autotests/export/latex/ja_wrong_auto_encoding.lyx
+++ /dev/null
@@ -1,186 +0,0 @@
-#LyX 2.4 created this file. For more info see https://www.lyx.org/
-\lyxformat 572
-\begin_document
-\begin_header
-\save_transient_properties true
-\origin unavailable
-\textclass scrbook
-\begin_preamble
-
-\end_preamble
-\options bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading
-\use_default_options false
-\begin_modules
-logicalmkup
-theorems-ams
-theorems-ams-extended
-multicol
-shapepar
-\end_modules
-\maintain_unincluded_children false
-\begin_local_layout
-Format 57
-InsetLayout		Flex:MenuItem
-LyxType		charstyle
-LabelString           menu
-LatexType             command
-LatexName             menuitem
-Font
-Family              Sans
-EndFont
-Preamble
-\newcommand*{\menuitem}[1]{{\sffamily #1}}
-EndPreamble
-ResetsFont true
-End
-InsetLayout		Flex:Ruby
-LyxType		charstyle
-LatexType		command
-LatexName		ruby
-BgColor		none
-LabelString		"ルビ"
-Decoration		Conglomerate
-Argument post:1
-LabelString	"ルビ文"
-MenuString	"ルビ文(S)|S"
-Decoration	Conglomerate
-Font
-Size		tiny
-EndFont
-LabelFont
-Size		tiny
-EndFont
-Mandatory	1
-EndArgument
-Preamble
-\IfFileExists{okumacro.sty}
-{\usepackage{okumacro}}
-{\newcommand{\ruby}[2]{#2}}
-EndPreamble
-ResetsFont true
-End
-\end_local_layout
-\language japanese
-\language_package default
-\inputencoding auto
-\fontencoding auto
-\font_roman "lmodern" "IPAexGothic"
-\font_sans "default" "IPAexMincho"
-\font_typewriter "default" "default"
-\font_math "auto" "auto"
-\font_default_family default
-\use_non_tex_fonts false
-\font_sc false
-\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
-\bibtex_command default
-\index_command default
-\float_placement class
-\float_alignment class
-\paperfontsize 12
-\spacing single
-\use_hyperref true
-\pdf_title "LyX's Additional Features manual"
-\pdf_author "LyX Team"
-\pdf_subject "LyX's additional features documentation"
-\pdf_keywords "LyX, Documentation, Additional"
-\pdf_bookmarks false
-\pdf_bookmarksnumbered true
-\pdf_bookmarksopen false
-\pdf_bookmarksopenlevel 1
-\pdf_breaklinks false
-\pdf_pdfborder false
-\pdf_colorlinks true
-\pdf_backref false
-\pdf_pdfusetitle false
-\pdf_quoted_options "pdfencoding=pdfdoc, linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false"
-\papersize default
-\use_geometry false
-\use_package amsmath 1
-\use_package amssymb 1
-\use_package cancel 0
-\use_package esint 0
-\use_package mathdots 1
-\use_package mathtools 0
-\use_package mhchem 1
-\use_package stackrel 0
-\use_package stmaryrd 0
-\use_package undertilde 0
-\cite_engine basic
-\cite_engine_type default
-\biblio_style plain
-\use_bibtopic false
-\use_indices false
-\paperorientation portrait
-\suppress_date false
-\justification true
-\use_refstyle 0
-\use_minted 0
-\notefontcolor #0000ff
-\index 索引
-\shortcut idx
-\color #008000
-\end_index
-\secnumdepth 3
-\tocdepth 3
-\paragraph_separation indent
-\paragraph_indentation default
-\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
-\html_css_as_file 0
-\html_be_strict true
-\end_header
-
-\begin_body
-
-\begin_layout Standard
-
-\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
-There is something special with the \SpecialChar LyX
--character in the subsection.
- The error shows only if '\SpecialChar LyX
-' is the first char, but not if preceded with
- some japanese symbol(s).
-\end_layout
-
-\begin_layout Subsection
-\SpecialChar LyX
-におけるRCSコマンド
-\end_layout
-
-\begin_layout Standard
-以下の節では\SpecialChar LyX
-でサポートされているRCSコマンドを説明します。それらのコマンドは
-\family sans
-ファイル\SpecialChar menuseparator
-バージョン管理
-\family default
-のサブメニューにあります。\SpecialChar LyX
-は、RCS 5.7/5.8に対して試験されています。
-\end_layout
-
-\end_body
-\end_document
diff --git a/autotests/export/latex/languagenesting_tablecell.lyx b/autotests/export/latex/languagenesting_tablecell.lyx
index e26cad0f77..1bed424fbc 100644
--- a/autotests/export/latex/languagenesting_tablecell.lyx
+++ b/autotests/export/latex/languagenesting_tablecell.lyx
@@ -1,5 +1,5 @@
 #LyX 2.4 created this file. For more info see https://www.lyx.org/
-\lyxformat 550
+\lyxformat 573
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -9,7 +9,7 @@
 \maintain_unincluded_children false
 \language british
 \language_package default
-\inputencoding auto
+\inputencoding utf8
 \fontencoding auto
 \font_roman "default" "default"
 \font_sans "default" "default"
@@ -28,6 +28,8 @@
 \output_sync 0
 \bibtex_command default
 \index_command default
+\float_placement class
+\float_alignment class
 \paperfontsize default
 \spacing single
 \use_hyperref false
@@ -68,6 +70,7 @@
 \papercolumns 1
 \papersides 1
 \paperpagestyle default
+\tablestyle default
 \tracking_changes false
 \output_changes false
 \html_math_output 0
@@ -78,8 +81,8 @@
 \begin_body
 
 \begin_layout Standard
-This document does not compile, if there is a CR in the second column of
- a fixed size (here 5 cm) with German text.
+This document did not compile, if there because of the two paragraphs in
+ the second column of fixed size (here 5 cm) with German text.
 \end_layout
 
 \begin_layout Standard
diff --git a/autotests/export/latex/languages/he-scrarticle.lyx b/autotests/export/latex/languages/he-scrarticle.lyx
index 4706d0d6ba..c0fff02bb9 100644
--- a/autotests/export/latex/languages/he-scrarticle.lyx
+++ b/autotests/export/latex/languages/he-scrarticle.lyx
@@ -1,5 +1,5 @@
 #LyX 2.4 created this file. For more info see https://www.lyx.org/
-\lyxformat 569
+\lyxformat 573
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -13,7 +13,7 @@
 \maintain_unincluded_children false
 \language english
 \language_package default
-\inputencoding auto
+\inputencoding utf8
 \fontencoding HE8,T1
 \font_roman "lmodern" "default"
 \font_sans "default" "default"
diff --git a/autotests/export/latex/languages/ja-listings-uncodable-error.lyx b/autotests/export/latex/languages/ja-listings-uncodable-error.lyx
new file mode 100644
index 0000000000..a865c506ce
--- /dev/null
+++ b/autotests/export/latex/languages/ja-listings-uncodable-error.lyx
@@ -0,0 +1,162 @@
+#LyX 2.4 created this file. For more info see https://www.lyx.org/
+\lyxformat 573
+\begin_document
+\begin_header
+\save_transient_properties false
+\origin unavailable
+\textclass scrbook
+\use_default_options false
+\maintain_unincluded_children false
+\begin_local_layout
+
+\end_local_layout
+\language japanese
+\language_package default
+\inputencoding utf8
+\fontencoding auto
+\font_roman "lmodern" "IPAexMincho"
+\font_sans "default" "IPAexGothic"
+\font_typewriter "default" "default"
+\font_math "auto" "auto"
+\font_default_family default
+\use_non_tex_fonts false
+\font_sc false
+\font_osf false
+\font_sf_scale 100 100
+\font_tt_scale 100 100
+\use_microtype false
+\use_dash_ligatures false
+\graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\index_command default
+\float_placement class
+\float_alignment class
+\paperfontsize 12
+\spacing single
+\use_hyperref false
+\pdf_title "LyX Configuration Manual"
+\pdf_author "LyX Team"
+\pdf_subject "LyX-Documentation Customization"
+\pdf_keywords "LyX, documentation, customization"
+\pdf_bookmarks false
+\pdf_bookmarksnumbered true
+\pdf_bookmarksopen true
+\pdf_bookmarksopenlevel 1
+\pdf_breaklinks false
+\pdf_pdfborder false
+\pdf_colorlinks true
+\pdf_backref false
+\pdf_pdfusetitle false
+\pdf_quoted_options "driverfallback=dvipdfmx, linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue,pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false"
+\papersize default
+\use_geometry false
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 1
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 1
+\use_package mhchem 1
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
+\cite_engine basic
+\cite_engine_type default
+\biblio_style plain
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date false
+\justification false
+\use_refstyle 0
+\use_minted 0
+\notefontcolor #0000ff
+\branch OutDated
+\selected 0
+\filename_suffix 0
+\color #f5fae7
+\end_branch
+\index 索引
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\paragraph_indentation default
+\is_math_indent 1
+\math_indentation default
+\math_numbering_side default
+\quotes_style cjk
+\dynamic_quotes 0
+\papercolumns 1
+\papersides 2
+\paperpagestyle headings
+\tablestyle default
+\tracking_changes false
+\output_changes false
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict true
+\end_header
+
+\begin_body
+
+\begin_layout Standard
+False positive error:
+\end_layout
+
+\begin_layout Standard
+A listings inset in a Japanese document (both, platex and CJK) resulted
+ in a
+\end_layout
+
+\begin_layout LyX-Code
+Encoding.cpp (251): Uncodable character in latexString!
+\end_layout
+
+\begin_layout Standard
+error messages in the terminal, even if the content is pure ASCII and
+\end_layout
+
+\begin_layout Standard
+the output is fine.
+\end_layout
+
+\begin_layout Standard
+This is because it wants to put the translated listingsname into the preamble
+ but does not believe it can be encoded there...
+\end_layout
+
+\begin_layout Standard
+\begin_inset listings
+inline false
+status open
+
+\begin_layout Plain Layout
+
+HELLO WORLD ラムリ
+\end_layout
+
+\begin_layout Plain Layout
+
+\begin_inset Caption Standard
+
+\begin_layout Plain Layout
+test listing
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_body
+\end_document
diff --git a/autotests/export/latex/languages/supported-languages.lyx b/autotests/export/latex/languages/supported-languages.lyx
index e5a9e9bb9c..80bc3db021 100644
--- a/autotests/export/latex/languages/supported-languages.lyx
+++ b/autotests/export/latex/languages/supported-languages.lyx
@@ -335,17 +335,6 @@ Polyglossia albanian
 LangCode sq_AL
 \end_layout
 
-\begin_layout Itemize
-\begin_inset Quotes eld
-\end_inset
-
-albanian.ldf
-\begin_inset Quotes erd
-\end_inset
-
- (re)defines document-wide the functions
-\end_layout
-
 \begin_layout Quote
 
 \emph on
diff --git a/autotests/export/latex/linebreak-bug.lyx b/autotests/export/latex/linebreak-bug.lyx
index 8b937e2618..124d92b2e8 100644
--- a/autotests/export/latex/linebreak-bug.lyx
+++ b/autotests/export/latex/linebreak-bug.lyx
@@ -1,5 +1,5 @@
 #LyX 2.4 created this file. For more info see https://www.lyx.org/
-\lyxformat 554
+\lyxformat 573
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -9,7 +9,7 @@
 \maintain_unincluded_children false
 \language english
 \language_package default
-\inputencoding auto
+\inputencoding utf8
 \fontencoding auto
 \font_roman "lmodern" "default"
 \font_sans "default" "default"
@@ -28,6 +28,8 @@
 \output_sync 0
 \bibtex_command default
 \index_command default
+\float_placement class
+\float_alignment class
 \paperfontsize default
 \spacing single
 \use_hyperref false
@@ -68,6 +70,7 @@
 \papercolumns 1
 \papersides 1
 \paperpagestyle default
+\tablestyle default
 \tracking_changes false
 \output_changes false
 \html_math_output 0
diff --git a/autotests/export/latex/luainputenc-utf8.lyx b/autotests/export/latex/luainputenc-utf8.lyx
index 4503290417..4be0e296a4 100644
--- a/autotests/export/latex/luainputenc-utf8.lyx
+++ b/autotests/export/latex/luainputenc-utf8.lyx
@@ -1,5 +1,5 @@
 #LyX 2.4 created this file. For more info see https://www.lyx.org/
-\lyxformat 571
+\lyxformat 573
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -243,10 +243,6 @@ Error 256 (driver return code) generating output; file 012-hebrew_he_HE8.pdf
 \end_layout
 
 \begin_layout Standard
-\begin_inset Note Note
-status open
-
-\begin_layout Plain Layout
 \begin_inset CommandInset include
 LatexCommand input
 filename "unicodesymbols/031-thai_th.lyx"
@@ -255,16 +251,6 @@ literal "false"
 \end_inset
 
 
-\end_layout
-
-\begin_layout Plain Layout
-Thai sets catcodes for characters in Latin-Supplement block leading to wrong
- output there.
-\end_layout
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard
diff --git a/autotests/export/latex/xetex-inputenc-utf8.lyx b/autotests/export/latex/xetex-inputenc-utf8.lyx
index 6eca34fe32..0f0b6dd6ce 100644
--- a/autotests/export/latex/xetex-inputenc-utf8.lyx
+++ b/autotests/export/latex/xetex-inputenc-utf8.lyx
@@ -1,5 +1,5 @@
 #LyX 2.4 created this file. For more info see https://www.lyx.org/
-\lyxformat 571
+\lyxformat 573
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -94,7 +94,7 @@
 \begin_body
 
 \begin_layout Standard
-XeTeX should work with 8-bit fonts for 
+XeTeX works with 8-bit fonts for 
 \begin_inset Quotes eld
 \end_inset
 
@@ -110,15 +110,10 @@ ascii
 \begin_inset Quotes erd
 \end_inset
 
- input encodings and not force-convert the input encoding to 
-\begin_inset Quotes eld
-\end_inset
-
-ascii
-\begin_inset Quotes erd
-\end_inset
-
- (LyX bug #10600).
+ input encodings.
+ There are, however, a number of incompatibilities, because the combination
+ XeTeX+TeX-fonts is rarely used and some packages wrongly test for XeTeX
+ instead of fontenc.
 \end_layout
 
 \begin_layout Standard
@@ -249,10 +244,6 @@ Error 256 (driver return code) generating output; file 012-hebrew_he_HE8.pdf
 \end_layout
 
 \begin_layout Standard
-\begin_inset Note Note
-status open
-
-\begin_layout Plain Layout
 \begin_inset CommandInset include
 LatexCommand input
 filename "unicodesymbols/031-thai_th.lyx"
@@ -261,16 +252,6 @@ literal "false"
 \end_inset
 
 
-\end_layout
-
-\begin_layout Plain Layout
-Thai sets catcodes for characters in Latin-Supplement block leading to wrong
- output there.
-\end_layout
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard
@@ -318,6 +299,10 @@ literal "false"
 \end_layout
 
 \begin_layout Standard
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
 \begin_inset CommandInset include
 LatexCommand input
 filename "unicodesymbols/074-76-letterlike-numberforms-arrows.lyx"
@@ -326,6 +311,16 @@ literal "false"
 \end_inset
 
 
+\end_layout
+
+\begin_layout Plain Layout
+Compilation errors with XeTeX, TeX-fonts, inputenc utf8, and expl3.sty (required
+ by xfrac.sty).
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
@@ -340,6 +335,10 @@ literal "false"
 \end_layout
 
 \begin_layout Standard
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
 \begin_inset CommandInset include
 LatexCommand input
 filename "unicodesymbols/078-79-misc-technical-control-pics.lyx"
@@ -348,6 +347,16 @@ literal "false"
 \end_inset
 
 
+\end_layout
+
+\begin_layout Plain Layout
+Compilation errors with XeTeX, TeX-fonts, inputenc utf8, and expl3.sty (required
+ by menukeys.sty).
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
diff --git a/autotests/export/mixing_inTitle_layouts.lyx b/autotests/export/mixing_inTitle_layouts.lyx
index 0fe129f04d..c6efa1f08e 100644
--- a/autotests/export/mixing_inTitle_layouts.lyx
+++ b/autotests/export/mixing_inTitle_layouts.lyx
@@ -1,5 +1,5 @@
-#LyX 2.2 created this file. For more info see http://www.lyx.org/
-\lyxformat 508
+#LyX 2.4 created this file. For more info see https://www.lyx.org/
+\lyxformat 573
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -9,8 +9,8 @@
 \maintain_unincluded_children false
 \language english
 \language_package default
-\inputencoding auto
-\fontencoding global
+\inputencoding utf8
+\fontencoding auto
 \font_roman "default" "default"
 \font_sans "default" "default"
 \font_typewriter "default" "default"
@@ -21,11 +21,15 @@
 \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 1
 \bibtex_command default
 \index_command default
+\float_placement class
+\float_alignment class
 \paperfontsize default
 \spacing single
 \use_hyperref false
@@ -50,6 +54,7 @@
 \suppress_date false
 \justification true
 \use_refstyle 1
+\use_minted 0
 \index Index
 \shortcut idx
 \color #008000
@@ -58,10 +63,14 @@
 \tocdepth 3
 \paragraph_separation indent
 \paragraph_indentation default
-\quotes_language english
+\is_math_indent 0
+\math_numbering_side default
+\quotes_style english
+\dynamic_quotes 0
 \papercolumns 1
 \papersides 1
 \paperpagestyle default
+\tablestyle default
 \tracking_changes false
 \output_changes false
 \html_math_output 0
diff --git a/autotests/export/xhtml/IncludeMissingEndTagDiv.lyx b/autotests/export/xhtml/IncludeMissingEndTagDiv.lyx
new file mode 100644
index 0000000000..3e56e2b09e
--- /dev/null
+++ b/autotests/export/xhtml/IncludeMissingEndTagDiv.lyx
@@ -0,0 +1,102 @@
+#LyX 2.3 created this file. For more info see http://www.lyx.org/
+\lyxformat 508
+\begin_document
+\begin_header
+\save_transient_properties true
+\origin unavailable
+\textclass article
+\use_default_options false
+\maintain_unincluded_children false
+\language english
+\language_package default
+\inputencoding auto
+\fontencoding global
+\font_roman "default" "TeX Gyre Termes"
+\font_sans "default" "TeX Gyre Pagella"
+\font_typewriter "default" "TeX Gyre Cursor"
+\font_math "auto" "auto"
+\font_default_family default
+\use_non_tex_fonts true
+\font_sc false
+\font_osf false
+\font_sf_scale 100 100
+\font_tt_scale 100 100
+\graphics default
+\default_output_format pdf5
+\output_sync 0
+\bibtex_command default
+\index_command default
+\paperfontsize default
+\spacing single
+\use_hyperref false
+\papersize a4paper
+\use_geometry false
+\use_package amsmath 0
+\use_package amssymb 0
+\use_package cancel 0
+\use_package esint 0
+\use_package mathdots 0
+\use_package mathtools 0
+\use_package mhchem 0
+\use_package stackrel 0
+\use_package stmaryrd 0
+\use_package undertilde 0
+\cite_engine basic
+\cite_engine_type default
+\biblio_style plain
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date false
+\justification true
+\use_refstyle 0
+\index Register
+\shortcut idx
+\color #008000
+\end_index
+\paperwidth 22cm
+\paperheight 11cm
+\leftmargin 1cm
+\topmargin 0cm
+\rightmargin 1cm
+\bottommargin 0cm
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation skip
+\defskip medskip
+\quotes_language english
+\papercolumns 1
+\papersides 1
+\paperpagestyle empty
+\tracking_changes false
+\output_changes false
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\end_header
+
+\begin_body
+
+\begin_layout Standard
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+addcontentsline{toc}{chapter}{Abstract} 
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+Remove this text or the ERT to make the xhtml export of the main document
+ work
+\end_layout
+
+\end_body
+\end_document
diff --git a/autotests/export/xhtml/MissingEndTagDiv.lyx b/autotests/export/xhtml/MissingEndTagDiv.lyx
new file mode 100644
index 0000000000..8f8e2c42d4
--- /dev/null
+++ b/autotests/export/xhtml/MissingEndTagDiv.lyx
@@ -0,0 +1,157 @@
+#LyX 2.4 created this file. For more info see https://www.lyx.org/
+\lyxformat 573
+\begin_document
+\begin_header
+\save_transient_properties true
+\origin unavailable
+\textclass scrbook
+\options intoc,bibliography=totoc,index=totoc,BCOR10mm,captions=tableheading,titlepage
+\use_default_options true
+\begin_modules
+customHeadersFooters
+\end_modules
+\maintain_unincluded_children false
+\language english
+\language_package default
+\inputencoding utf8
+\fontencoding auto
+\font_roman "lmodern" "default"
+\font_sans "lmss" "default"
+\font_typewriter "lmtt" "default"
+\font_math "auto" "auto"
+\font_default_family default
+\use_non_tex_fonts false
+\font_sc false
+\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
+\bibtex_command bibtex
+\index_command default
+\float_placement h
+\float_alignment class
+\paperfontsize 12
+\spacing single
+\use_hyperref true
+\pdf_bookmarks true
+\pdf_bookmarksnumbered true
+\pdf_bookmarksopen true
+\pdf_bookmarksopenlevel 1
+\pdf_breaklinks false
+\pdf_pdfborder true
+\pdf_colorlinks false
+\pdf_backref false
+\pdf_pdfusetitle true
+\pdf_quoted_options "pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false"
+\papersize a4paper
+\use_geometry false
+\use_package amsmath 2
+\use_package amssymb 2
+\use_package cancel 0
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 0
+\use_package mhchem 1
+\use_package stackrel 0
+\use_package stmaryrd 0
+\use_package undertilde 0
+\cite_engine basic
+\cite_engine_type default
+\biblio_style plain
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date true
+\justification true
+\use_refstyle 0
+\use_minted 0
+\branch chapter-1
+\selected 1
+\filename_suffix 0
+\color #ffaa00
+\end_branch
+\branch chapter-2
+\selected 1
+\filename_suffix 0
+\color #55aaff
+\end_branch
+\branch Summary
+\selected 1
+\filename_suffix 0
+\color #7f7f7f
+\end_branch
+\branch Acknowledgments
+\selected 1
+\filename_suffix 0
+\color #ffff00
+\end_branch
+\branch Appendix
+\selected 1
+\filename_suffix 0
+\color #faf0e6
+\end_branch
+\index Index
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 2
+\paragraph_separation skip
+\defskip medskip
+\is_math_indent 1
+\math_indentation default
+\math_numbering_side default
+\quotes_style english
+\dynamic_quotes 0
+\papercolumns 1
+\papersides 2
+\paperpagestyle fancy
+\tablestyle default
+\tracking_changes false
+\output_changes false
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\end_header
+
+\begin_body
+
+\begin_layout Subject
+Thesis to get the degree of a doctor of philosophy
+\end_layout
+
+\begin_layout Title
+Title of the thesis
+\end_layout
+
+\begin_layout Standard
+\begin_inset Branch Summary
+inverted 0
+status open
+
+\begin_layout Standard
+Dissolving or deactivating this branch makes xhtml export work
+\end_layout
+
+\begin_layout Standard
+\begin_inset CommandInset include
+LatexCommand include
+filename "IncludeMissingEndTagDiv.lyx"
+literal "true"
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_body
+\end_document
diff --git a/development/autotests/ignoredTests b/development/autotests/ignoredTests
index 3d7bdd69fb..7a7bbf2bdd 100644
--- a/development/autotests/ignoredTests
+++ b/development/autotests/ignoredTests
@@ -65,26 +65,30 @@ export/examples/Modules/Chessboard_(lyx(16|20|21|22|23)|(pdf3|pdf5|dvi3)_texF)
 # XeTeX with TeX fonts
 ######################
 # XeTeX with TeX-fonts works only for input encodings "utf8" and "ascii".
-# Generally, documentation and templates use "auto" 8-bit encodings.
+# Generally, documentation and templates use "auto-legacy" 8-bit encodings.
 # 1. Exceptions to the following pattern (test cases with the right encoding):
 !export/examples/(|ar|ca|cs|da|de|el|es|eu|fa|fr|gl|he|hu|id|it|ko|nb|nl|pl|pt|pt_BR|pt_PT|ro|ru|sk|sl|sr|sv|uk|zh_CN)/Welcome_pdf4_texF
 # encoding right but packages clash:
 #!export/examples/ja/Multilingual_Typesetting_.*CJK.*_pdf4_texF
 # 2. Catchall patterns to ignore the other tests:
-.*_pdf4_texF
-export/(doc|examples|templates)/(|ar|ca|cs|da|de|el|es|eu|fa|fr|gl|he|hu|id|it|ja|ko|nb|nl|pl|pt|pt_BR|pt_PT|ro|ru|sk|sl|sr|sv|uk|zh_CN)/.*pdf4_texF
+export/(doc|examples|templates)/.*_pdf4_texF
+export/(doc|examples|templates)/(|ar|ca|cs|da|de|el|es|eu|fa|fr|gl|he|hu|id|it|ja|ko|nb|nl|pl|pt|pt_BR|pt_PT|ro|sk|sl|sr|sv|uk|zh_CN)/.*pdf4_texF
+# dedicated tests with inputencoding "auto-legacy":
+export/export/latex/languages/supported-languages_pdf4_texF
 
-# CJK fails (sometimes) with LuaTeX and 8-bit fonts:
+# CJK fails (sometimes) with Xe/LuaTeX and 8-bit fonts:
 export/examples/ja/Multilingual_Typesetting_.*CJK.(dvi3|pdf5)_texF
-export/.*/zh_CN/.*(dvi3|pdf5)_texF
-export/export/latex/CJK/zh_CN-toc_*.(dvi3|pdf5)_texF
+export/.*/zh_CN/.*(dvi3|pdf[45])_texF
+export/export/latex/CJK/zh_CN-toc_*.(dvi3|pdf[45])_texF
+
+
 
 # pLaTeX
 ########
 # ignore with pdflatex and Xe/LuaTeX with 8-bit fonts:
 #
 export/export/latex/.*platex.*(pdf2|texF)
-export/export/latex/languages/ja_wrong_auto_encoding_.*(pdf2|texF)
+export/export/latex/languages/ja[-_].*_(pdf2|texF)
 #
 # Most Japanese documents use language "japanese" wich is tied to "platex"
 # (automatically invoked instead of "latex" to create a DVI file).
@@ -163,11 +167,16 @@ Sublabel: irrelevant
 # Dedicated test samples that don't need testing in all variants
 # ==============================================================
 
-# Dedicated test samples for LaTeX:
-# 
+# LaTeX
 # don't check loading, lyx2lyx, or export to other LyX versions or HTML
 check_load/export/latex/.*
 lyx2lyx/export/latex/.*
 export/export/latex/.*(lyx..|xhtml)
 
 # don't test with non-TeX fonts:
+
+# HTML
+# don't check loading, lyx2lyx, or export to other LyX versions or DVI/PDF
+check_load/export/xhtml/.*
+lyx2lyx/export/xhtml/.*
+export/export/xhtml/.*(lyx..|dvi.*|pdf.*)
diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests
index 3d1dc56d17..e6c00f2865 100644
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -92,6 +92,7 @@ export/export/latex/languages/supported-languages_.*_systemF
 #  xdvipdfmx:warning: Interpreting special command ps: (ps:) failed.
 export/export/latex/languages/supported-languages_pdf3
 
+
 # Thai with CJK package requires the babel option "thaicjk" instead of "thai".
 # (see thaifont.txt in the CJK documentation for setup details).
 export/export/latex/unicodesymbols/031-thai_th_(euc-|gbk|jis|utf8-cjk).*
@@ -223,11 +224,21 @@ Sublabel: texissues
 # Fails with ASCII (and hence also with XeTeX).
 export/doc/(|de/|es/|fr/)UserGuide_pdf4_texF
 
+# Problem with Czech and Slovak Babel support.
+# (reported per mail to Petr Tesa\v{r}\'ik, 2016-09-06)
+# All exports using babel fail.
+# Without the Czech or Slovak text it compiles
+# No problem with inserted German (or other foreign language) text
+# No problem if the table is Slovak, too
+export/export/latex/TableErrorIfSlovakTextInserted_(dvi|pdf[23]?|.*_texF)
+
+# Xe/LuaTeX
+###########
+
 # Babel-Russian uses UTF-8 for auto-strings if it detects Xe/LuaTeX.
 # This fails unless the inputencoding is set to utf-8, too.
 export/export/latex/languages/ru_auto-legacy-luatex.*_texF
 
-
 # Babel-Ukrainian uses UTF-8 if it detects Xe/LuaTeX (for "\date").
 # With 8-bit TeX fonts this results in:
 # * garbled output with PDF (LuaTeX)
@@ -240,7 +251,7 @@ export/export/latex/languages/uk-babel-date-missing-chars-with-ascii_(pdf4|dvi3)
 export/doc/uk/Intro_pdf4_texF
 export/examples/uk/Welcome_pdf4_texF
 
-# Fails with XeTeX/LuaTeX
+# Some packages fail with XeTeX/LuaTeX
 # Reported upstream (https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg184435.html)
 # Is there a new version fixing the problem?
 export/examples/Articles/Astronomy_%26_Astrophysics_(dvi3|pdf[45])_.*
@@ -259,14 +270,6 @@ export/examples/Modules/Hazard_and_Precautionary_Statements_.*_systemF
 # xy package:
 export/examples/(|fr/)Graphics_and_Insets/XY-(Pic|Figure)_pdf5.*
 
-# Problem with Check and Slovak Babel support.
-# (reported per mail to Petr Tesa\v{r}\'ik, 2016-09-06)
-# All exports using babel fail.
-# Without the Czech or Slovak text it compiles
-# No problem with inserted German (or other foreign language) text
-# No problem if the table is Slovak, too
-export/export/latex/TableErrorIfSlovakTextInserted_(dvi|pdf[23]?|.*_texF)
-
 # Polyglossia + LuaTeX issue
 # Reported upstream here:
 # https://github.com/reutenauer/polyglossia/issues/163
@@ -284,6 +287,7 @@ export/templates/Presentations/Slides_.*_systemF
 # Beamer: conflicts with some combinations of packages/settings/languages
 export/templates/es/Presentations/Beamer_pdf4_texF
 
+
 # Arabic
 #
 # Larger Arabic documents currently have non-TeX fonts and XeTeX
@@ -324,9 +328,12 @@ export/examples/fa/Welcome_(dvi3|pdf5)_texF
 # does not currently work with LuaTeX (undefined command) (cf. Arabic)
 # terminal message: "Language hebrew not found in language.dat.lua"
 export/.*/he/.*(dvi3|pdf5)_systemF
-# Babel-Arabic loads "inputenc" which fails with LuaTeX
-# Xe/LuaTeX + TeX fonts: "! Right-to-Left Support Error: use TeX--XeT or e-TeX engine."
+#
+# babel-hebrew loads "rlbabel.def" which fails with LuaTeX + TeX fonts:
+# "! Right-to-Left Support Error: use TeX--XeT or e-TeX engine."
+# (XeTeX works, if inputenc is set to "utf8")
 export/.*/he/.*_texF
+export/export/latex/languages/he-.*(dvi3|pdf5)_texF
 
 # Ukrainian
 # See comment in unreliableTests
diff --git a/development/autotests/unreliableTests b/development/autotests/unreliableTests
index 3339f72bf4..5533bdce6c 100644
--- a/development/autotests/unreliableTests
+++ b/development/autotests/unreliableTests
@@ -131,6 +131,10 @@ export/(doc|examples)/uk/(Intro|Welcome)_.*_texF
 # new problem with TL18 (see invertedTests)
 export/export/latex/luainputenc-utf8_pdf5_texF
 
+# Compilation errors under TeXLive-19 with XeTeX, TeX-fonts, inputenc utf8,
+# and expl3.sty (TL 17 works).
+export/export/latex/xetex-inputenc-utf8-expl3-bug_pdf4_texF
+
 # aastex: hard-coded version in class name:
 # 2018-05-12 aastex6.cls -> aastex62.cls
 export/examples/Articles/American_Astronomical_Society_.*