From 7a2a491edde92c34984581d4f26e6a7c0c90e703 Mon Sep 17 00:00:00 2001
From: =?utf8?q?G=C3=BCnter=20Milde?= <milde@lyx.org>
Date: Sun, 29 Dec 2019 16:10:54 +0100
Subject: [PATCH] ctest: work around conflict between Macedonian and some other
 Cyrillic-using languages.

---
 .../languages/cyrillic-languages-conflict.lyx | 348 ++++++++++++++++++
 .../latex/languages/supported-languages.lyx   |  77 ++--
 .../languages/supported-languages_babel.lyx   |  18 +-
 .../supported-languages_babel_auto-legacy.lyx |   9 +-
 4 files changed, 412 insertions(+), 40 deletions(-)
 create mode 100644 autotests/export/latex/languages/cyrillic-languages-conflict.lyx

diff --git a/autotests/export/latex/languages/cyrillic-languages-conflict.lyx b/autotests/export/latex/languages/cyrillic-languages-conflict.lyx
new file mode 100644
index 0000000000..e1d3a0fd93
--- /dev/null
+++ b/autotests/export/latex/languages/cyrillic-languages-conflict.lyx
@@ -0,0 +1,348 @@
+#LyX 2.4 created this file. For more info see https://www.lyx.org/
+\lyxformat 589
+\begin_document
+\begin_header
+\save_transient_properties true
+\origin unavailable
+\textclass article
+\use_default_options true
+\maintain_unincluded_children false
+\language english
+\language_package default
+\inputencoding auto-legacy
+\fontencoding auto
+\font_roman "default" "default"
+\font_sans "default" "default"
+\font_typewriter "default" "default"
+\font_math "auto" "auto"
+\font_default_family default
+\use_non_tex_fonts false
+\font_sc false
+\font_roman_osf false
+\font_sans_osf false
+\font_typewriter_osf false
+\font_sf_scale 100 100
+\font_tt_scale 100 100
+\use_microtype false
+\use_dash_ligatures true
+\graphics default
+\default_output_format pdf
+\output_sync 0
+\bibtex_command default
+\index_command default
+\float_placement class
+\float_alignment class
+\paperfontsize default
+\spacing single
+\use_hyperref 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 true
+\use_refstyle 1
+\use_minted 0
+\use_lineno 0
+\branch Russian
+\selected 1
+\filename_suffix 0
+\color #faf0e6
+\end_branch
+\branch Belarusian
+\selected 1
+\filename_suffix 0
+\color #faf0e6
+\end_branch
+\branch Bulgarian
+\selected 1
+\filename_suffix 0
+\color #faf0e6
+\end_branch
+\branch Macedonian
+\selected 1
+\filename_suffix 0
+\color #faf0e6
+\end_branch
+\branch Mongolian
+\selected 1
+\filename_suffix 0
+\color #faf0e6
+\end_branch
+\branch Ukrainian
+\selected 1
+\filename_suffix 0
+\color #faf0e6
+\end_branch
+\branch Serbian
+\selected 1
+\filename_suffix 0
+\color #faf0e6
+\end_branch
+\index Index
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\paragraph_indentation default
+\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
+\html_css_as_file 0
+\html_be_strict false
+\end_header
+
+\begin_body
+
+\begin_layout Title
+Cyrillic-using Languages supported by LyX
+\end_layout
+
+\begin_layout Standard
+Some cyrillic-using languages cannot be used together in one document when
+ compiling with Babel (conflict of the Babel language definition (*.ldf)
+ files).
+\end_layout
+
+\begin_layout Itemize
+Macedonian <-> Belarusian, Bulgarian, Mongolian, Ukrainian, Russian
+\end_layout
+
+\begin_layout Itemize
+Macedonian works together with Serbian and Kazakh.
+\end_layout
+
+\begin_layout Subsection*
+Belarusian
+\end_layout
+
+\begin_layout Standard
+\begin_inset Branch Belarusian
+inverted 0
+status open
+
+\begin_layout Quote
+
+\emph on
+\lang belarusian
+Белару́ская мо́ва
+\emph default
+ — загрожаная мова ўсходняе групы славянскае галіны індаэўрапейскае сям’і
+ моваў, на якой размаўляюць беларусы і частка прадстаўнікоў этнічных мяншыняў
+ Беларусі.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Itemize
+Until 2018-08-25 (babel-belarusian 1.4), the babel option was "belarusianb"
+ but the language name "belarusian" (without trailing "b").
+\end_layout
+
+\begin_layout Subsection*
+Bulgarian
+\end_layout
+
+\begin_layout Standard
+\begin_inset Branch Bulgarian
+inverted 0
+status open
+
+\begin_layout Quote
+
+\emph on
+\lang bulgarian
+Бъ̀лгарският езѝк
+\emph off
+ е индоевропейски език от групата на южнославянските езици.
+ Той е официалният език на Република България и един от 23-те официални
+ езика на Европейския съюз.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Subsection*
+Macedonian
+\end_layout
+
+\begin_layout Standard
+\begin_inset Branch Macedonian
+inverted 0
+status open
+
+\begin_layout Quote
+
+\emph on
+\lang macedonian
+Македонски јазик
+\emph default
+ — јужнословенски јазик, дел од групата на словенски јазици од јазичното
+ семејство на индоевропски јазици.
+ Македонскиот е службен и национален јазик во Македонија.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Itemize
+Conflict with Babel-Belarussian.
+\end_layout
+
+\begin_layout Subsection*
+Mongolian
+\end_layout
+
+\begin_layout Standard
+\begin_inset Branch Mongolian
+inverted 0
+status open
+
+\begin_layout Quote
+
+\lang mongolian
+Монгол үндэстний эрт эдүгээ цагийн хэл аялгуу, үсэг бичгийг хамтад нь 
+\emph on
+Монгол хэл
+\emph default
+ бичиг гэнэ.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+Babel mongolian
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+Script Cyrillic
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+LangCode mn_MN
+\end_layout
+
+\begin_layout Subsection*
+Russian
+\end_layout
+
+\begin_layout Standard
+\begin_inset Branch Russian
+inverted 0
+status open
+
+\begin_layout Quote
+
+\emph on
+\lang russian
+Ру́сский язы́к
+\emph default
+ — один из восточнославянских языков, национальный язык русского народа.
+ Является одним из наиболее распространённых языков мира.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Itemize
+Option clash with Belarusian: 
+\end_layout
+
+\begin_deeper
+\begin_layout LyX-Code
+Package babel Error: if@uni@ode already defined.
+\end_layout
+
+\end_deeper
+\begin_layout Subsubsection*
+Serbian (Cyrillic)
+\end_layout
+
+\begin_layout Standard
+\begin_inset Branch Serbian
+inverted 0
+status open
+
+\begin_layout Quote
+
+\emph on
+\lang serbian
+Српски језик
+\emph default
+ припада словенској групи језика породице индоевропских језика.
+ Српски језик је званичан у Србији, Босни и Херцеговини и Црној Гори и говори
+ га око 12 милиона људи.
+ Такође је мањински језик у државама централне и источне Европе.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Subsection*
+Ukrainian
+\end_layout
+
+\begin_layout Standard
+\begin_inset Branch Ukrainian
+inverted 0
+status open
+
+\begin_layout Quote
+
+\emph on
+\lang ukrainian
+Украї́нська мо́ва
+\emph default
+ (історичні назви — ру́ська, руси́нська) — національна мова українців.
+ Належить до слов'янської групи індоєвропейської мовної сім'ї.
+ Число мовців — близько 45 млн, більшість яких живе в Україні.
+\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 5a64aceb69..7813d13c2b 100644
--- a/autotests/export/latex/languages/supported-languages.lyx
+++ b/autotests/export/latex/languages/supported-languages.lyx
@@ -105,18 +105,13 @@ enumitem
 \filename_suffix 0
 \color #faf0e6
 \end_branch
-\branch conflict-rus-belarus
-\selected 0
-\filename_suffix 0
-\color #faf0e6
-\end_branch
 \branch conflict-es-gl
 \selected 0
 \filename_suffix 0
 \color #faf0e6
 \end_branch
-\branch conflict-bg-mk
-\selected 1
+\branch conflict-mk
+\selected 0
 \filename_suffix 0
 \color #faf0e6
 \end_branch
@@ -803,8 +798,8 @@ inverted 0
 status open
 
 \begin_layout Standard
-\begin_inset Branch conflict-rus-belarus
-inverted 0
+\begin_inset Branch conflict-mk
+inverted 1
 status open
 
 \begin_layout Quote
@@ -849,7 +844,7 @@ Until 2018-08-25 (babel-belarusian 1.4), the babel option was "belarusianb"
 \end_layout
 
 \begin_layout Itemize
-Conflict with Russian and Macedonian.
+Conflict with Macedonian.
 \end_layout
 
 \begin_layout Subsection*
@@ -956,6 +951,11 @@ LangCode br_FR
 Bulgarian
 \end_layout
 
+\begin_layout Standard
+\begin_inset Branch conflict-mk
+inverted 1
+status open
+
 \begin_layout Quote
 
 \emph off
@@ -965,6 +965,11 @@ Bulgarian
  езика на Европейския съюз.
 \end_layout
 
+\end_inset
+
+
+\end_layout
+
 \begin_layout Labeling
 \labelwidthstring 00.00.0000
 Babel bulgarian
@@ -985,6 +990,10 @@ LangCode bg_BG
 Script Cyrillic
 \end_layout
 
+\begin_layout Itemize
+Conflict with Macedonian.
+\end_layout
+
 \begin_layout Standard
 \begin_inset Branch debug
 inverted 0
@@ -4179,8 +4188,8 @@ inverted 0
 status open
 
 \begin_layout Standard
-\begin_inset Branch conflict-rus-belarus
-inverted 1
+\begin_inset Branch conflict-mk
+inverted 0
 status open
 
 \begin_layout Quote
@@ -4225,7 +4234,7 @@ LangCode mk_MK
 \end_layout
 
 \begin_layout Itemize
-Conflict with Babel-Belarussian.
+Conflict with Belarusian, Bulgarian, Mongolian, Russian, and Ukrainian.
 \end_layout
 
 \begin_layout Subsection*
@@ -4347,6 +4356,11 @@ Mongolian
 inverted 0
 status open
 
+\begin_layout Standard
+\begin_inset Branch conflict-mk
+inverted 1
+status open
+
 \begin_layout Quote
 
 \lang mongolian
@@ -4360,6 +4374,11 @@ status open
 \end_inset
 
 
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
@@ -4421,6 +4440,10 @@ Script Cyrillic
 LangCode mn_MN
 \end_layout
 
+\begin_layout Itemize
+Conflict with Macedonian.
+\end_layout
+
 \begin_layout Subsection*
 N'ko
 \end_layout
@@ -4805,7 +4828,7 @@ Russian
 \end_layout
 
 \begin_layout Standard
-\begin_inset Branch conflict-rus-belarus
+\begin_inset Branch conflict-mk
 inverted 1
 status open
 
@@ -4856,15 +4879,9 @@ LangCode ru_RU
 \end_layout
 
 \begin_layout Itemize
-Option clash with Belarusian: 
+Conflict with Macedonian.
 \end_layout
 
-\begin_deeper
-\begin_layout LyX-Code
-Package babel Error: if@uni@ode already defined.
-\end_layout
-
-\end_deeper
 \begin_layout Subsubsection*
 Russian
 \begin_inset space ~
@@ -5049,8 +5066,8 @@ Serbian (Cyrillic)
 \end_layout
 
 \begin_layout Standard
-\begin_inset Branch polyglossia-only
-inverted 0
+\begin_inset Branch conflict-mk
+inverted 1
 status open
 
 \begin_layout Quote
@@ -5903,6 +5920,11 @@ LangCode tk_TM
 Ukrainian
 \end_layout
 
+\begin_layout Standard
+\begin_inset Branch conflict-mk
+inverted 1
+status open
+
 \begin_layout Quote
 
 \emph on
@@ -5914,6 +5936,11 @@ Ukrainian
  Число мовців — близько 45 млн, більшість яких живе в Україні.
 \end_layout
 
+\end_inset
+
+
+\end_layout
+
 \begin_layout Labeling
 \labelwidthstring 00.00.0000
 Babel ukrainian
@@ -5934,6 +5961,10 @@ Script Cyrillic
 LangCode uk_UA
 \end_layout
 
+\begin_layout Itemize
+Conflict with Macedonian.
+\end_layout
+
 \begin_layout Subsection*
 Urdu
 \end_layout
diff --git a/autotests/export/latex/languages/supported-languages_babel.lyx b/autotests/export/latex/languages/supported-languages_babel.lyx
index c0b37ba1e1..1fe29f5207 100644
--- a/autotests/export/latex/languages/supported-languages_babel.lyx
+++ b/autotests/export/latex/languages/supported-languages_babel.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
@@ -101,18 +104,13 @@ enumitem
 \filename_suffix 0
 \color #faf0e6
 \end_branch
-\branch conflict-rus-belarus
-\selected 1
-\filename_suffix 0
-\color #faf0e6
-\end_branch
 \branch conflict-es-gl
 \selected 0
 \filename_suffix 0
 \color #faf0e6
 \end_branch
-\branch conflict-bg-mk
-\selected 1
+\branch conflict-mk
+\selected 0
 \filename_suffix 0
 \color #faf0e6
 \end_branch
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 c26d211837..fdda28ae69 100644
--- a/autotests/export/latex/languages/supported-languages_babel_auto-legacy.lyx
+++ b/autotests/export/latex/languages/supported-languages_babel_auto-legacy.lyx
@@ -104,18 +104,13 @@ enumitem
 \filename_suffix 0
 \color #faf0e6
 \end_branch
-\branch conflict-rus-belarus
-\selected 1
-\filename_suffix 0
-\color #faf0e6
-\end_branch
 \branch conflict-es-gl
 \selected 0
 \filename_suffix 0
 \color #faf0e6
 \end_branch
-\branch conflict-bg-mk
-\selected 1
+\branch conflict-mk
+\selected 0
 \filename_suffix 0
 \color #faf0e6
 \end_branch
-- 
2.39.5