commit f674f563da36443c2d498d6a46970d6a43684431
Author: Günter Milde <[email protected]>
Date: Mon Mar 4 22:12:09 2019 +0100
ctest update: compilation errors due to #6463 are fixed.
---
autotests/export/latex/cyrillic-accent-ascii.lyx | 25 ++++++++++++++++++---
autotests/export/latex/ru-accent-ascii.lyx | 13 ++++++++--
development/autotests/invertedTests | 4 ---
3 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/autotests/export/latex/cyrillic-accent-ascii.lyx
b/autotests/export/latex/cyrillic-accent-ascii.lyx
index a9d7f44..8b062e2 100644
--- a/autotests/export/latex/cyrillic-accent-ascii.lyx
+++ b/autotests/export/latex/cyrillic-accent-ascii.lyx
@@ -94,8 +94,16 @@
\begin_body
\begin_layout Standard
-Accented cyrillic characters still fail if the input encoding is ASCII and
- the current language not using a cyrillic script (i.e.
+Accented cyrillic characters work since LyX 2.4.
+\end_layout
+
+\begin_layout Standard
+Test: English document with input encoding ASCII
+\end_layout
+
+\begin_layout Standard
+Accent as ERT still fails if the current language not using a cyrillic script
+ (i.e.
if the
\begin_inset Quotes eld
\end_inset
@@ -106,10 +114,14 @@ textcyr
\begin_inset Quotes erd
\end_inset
- feature is required), both ERT
+ feature is required)
\end_layout
\begin_layout Quotation
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
Вы узн
\begin_inset ERT
status collapsed
@@ -126,8 +138,13 @@ status collapsed
аете, как использовать LyX.
\end_layout
+\end_inset
+
+
+\end_layout
+
\begin_layout Standard
-and Combining chars
+it works for Combining chars
\end_layout
\begin_layout Quotation
diff --git a/autotests/export/latex/ru-accent-ascii.lyx
b/autotests/export/latex/ru-accent-ascii.lyx
index 98af54f..2214c81 100644
--- a/autotests/export/latex/ru-accent-ascii.lyx
+++ b/autotests/export/latex/ru-accent-ascii.lyx
@@ -114,8 +114,15 @@
\begin_body
\begin_layout Standard
-Accented cyrillic characters failed if the input encoding is ASCII, both
- ERT
+Accented cyrillic characters work since LyX 2.4.
+\end_layout
+
+\begin_layout Standard
+Test: Russian document with input encoding ASCII
+\end_layout
+
+\begin_layout Standard
+Accent in ERT
\end_layout
\begin_layout Quotation
@@ -136,7 +143,7 @@ status collapsed
\end_layout
\begin_layout Standard
-and Combining chars
+and as Combining character
\end_layout
\begin_layout Quotation
diff --git a/development/autotests/invertedTests
b/development/autotests/invertedTests
index 518c854..0efd6af 100644
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -143,10 +143,6 @@ Sublabel: lyxbugs
# missing character with XeTeX/LuaTeX and Babel (OK with Polyglossia)
export/export/latex/6197-polish-amssymb_pdf._texF
-#6463 font encoding changes and combining accents
-# problem remains for Cyrillic in a non-Cyrillic-using language
-export/export/latex/cyrillic-accent-ascii_pdf2
-
#9871 LyX sends invalid Unicode to iconv when converting to ASCII
# most probably due to BabelPreamble code (language specific headings for
# theorems, problems , ... are written in the language's default encoding
