commit 81bcb04131005ad32a22517f69d4deb650497c55
Author: Günter Milde <mi...@lyx.org>
Date: Thu Dec 19 13:57:02 2019 +0100
ctests: Babel-Belarus conflicts also with Macedonian.
The Belarus language support from Babel has some problematic definitions
that prevent its use together with Russian or Macedonean in one document.
---
.../export/latex/languages/supported-languages.lyx | 24 +++++++++++++------
.../supported-languages_babel_auto-legacy.lyx | 9 +++++--
2 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/autotests/export/latex/languages/supported-languages.lyx
b/autotests/export/latex/languages/supported-languages.lyx
index 4155ab1..5a64ace 100644
--- a/autotests/export/latex/languages/supported-languages.lyx
+++ b/autotests/export/latex/languages/supported-languages.lyx
@@ -106,7 +106,7 @@ enumitem
\color #faf0e6
\end_branch
\branch conflict-rus-belarus
-\selected 1
+\selected 0
\filename_suffix 0
\color #faf0e6
\end_branch
@@ -849,15 +849,9 @@ Until 2018-08-25 (babel-belarusian 1.4), the babel option
was "belarusianb"
\end_layout
\begin_layout Itemize
-Option clash with Russian:
+Conflict with Russian and Macedonian.
\end_layout
-\begin_deeper
-\begin_layout LyX-Code
-Package babel Error: if@uni@ode already defined.
-\end_layout
-
-\end_deeper
\begin_layout Subsection*
Bengali
\end_layout
@@ -4184,6 +4178,11 @@ status open
inverted 0
status open
+\begin_layout Standard
+\begin_inset Branch conflict-rus-belarus
+inverted 1
+status open
+
\begin_layout Quote
\emph on
@@ -4205,6 +4204,11 @@ status open
\end_layout
+\end_inset
+
+
+\end_layout
+
\begin_layout Labeling
\labelwidthstring 00.00.0000
Babel macedonian
@@ -4220,6 +4224,10 @@ Script Cyrillic
LangCode mk_MK
\end_layout
+\begin_layout Itemize
+Conflict with Babel-Belarussian.
+\end_layout
+
\begin_layout Subsection*
Malay
\end_layout
diff --git
a/autotests/export/latex/languages/supported-languages_babel_auto-legacy.lyx
b/autotests/export/latex/languages/supported-languages_babel_auto-legacy.lyx
index 1a85c24..c26d211 100644
--- a/autotests/export/latex/languages/supported-languages_babel_auto-legacy.lyx
+++ b/autotests/export/latex/languages/supported-languages_babel_auto-legacy.lyx
@@ -1,5 +1,5 @@
#LyX 2.4 created this file. For more info see https://www.lyx.org/
-\lyxformat 574
+\lyxformat 589
\begin_document
\begin_header
\save_transient_properties true
@@ -24,7 +24,9 @@ enumitem
\font_default_family default
\use_non_tex_fonts false
\font_sc false
-\font_osf false
+\font_roman_osf false
+\font_sans_osf false
+\font_typewriter_osf false
\font_sf_scale 100 100
\font_tt_scale 100 100
\font_cjk gbsn
@@ -49,7 +51,7 @@ enumitem
\pdf_colorlinks true
\pdf_backref section
\pdf_pdfusetitle true
-\papersize a4paper
+\papersize a4
\use_geometry false
\use_package amsmath 1
\use_package amssymb 1
@@ -71,6 +73,7 @@ enumitem
\justification false
\use_refstyle 0
\use_minted 0
+\use_lineno 0
\branch only-as-document-language
\selected 0
\filename_suffix 0
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
