From: Günter Milde <milde@lyx.org>
Date: Mon, 3 Jun 2019 14:43:16 +0000 (+0200)
Subject: Support more languages (file format change).
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e36291b03d2845197085c5aa50bb04bdbfc7bdc7;p=features.git

Support more languages (file format change).

Format incremented to 576:
Support for the document languages azerbaijani, bengali,
churchslavonic, and oldrussian.
---

diff --git a/autotests/export/latex/CJK/en-de-el-ru-ko_utf8.lyx b/autotests/export/latex/CJK/en-de-el-ru-ko_utf8.lyx
index 19c8d56a2f..ac818ef0aa 100644
--- a/autotests/export/latex/CJK/en-de-el-ru-ko_utf8.lyx
+++ b/autotests/export/latex/CJK/en-de-el-ru-ko_utf8.lyx
@@ -1,19 +1,26 @@
 #LyX 2.4 created this file. For more info see https://www.lyx.org/
-\lyxformat 566
+\lyxformat 575
 \begin_document
 \begin_header
 \save_transient_properties true
 \origin unavailable
 \textclass article
+\begin_preamble
+\@ifpackageloaded{fontspec}{
+  \newfontfamily\hangulfont{UnJamoBatang}
+  \newfontfamily\hangulfontsf{UnJamoDotum}
+  \newfontfamily\hangulfonttt{UnTaza}
+}{}
+\end_preamble
 \use_default_options false
 \maintain_unincluded_children false
 \language english
 \language_package default
 \inputencoding utf8
 \fontencoding default
-\font_roman "cmr" "NanumMyeongjo"
-\font_sans "default" "NanumGothic"
-\font_typewriter "default" "NanumGothicCoding"
+\font_roman "lmodern" "DejaVu Serif"
+\font_sans "default" "DejaVu Sans"
+\font_typewriter "default" "DejaVu Sans Mono"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false
@@ -25,7 +32,7 @@
 \use_microtype false
 \use_dash_ligatures false
 \graphics default
-\default_output_format pdf2
+\default_output_format default
 \output_sync 0
 \bibtex_command default
 \index_command default
@@ -56,6 +63,7 @@
 \justification true
 \use_refstyle 0
 \use_minted 0
+\use_lineno 0
 \index Index
 \shortcut idx
 \color #008000
@@ -71,6 +79,7 @@
 \papercolumns 1
 \papersides 1
 \paperpagestyle default
+\tablestyle default
 \tracking_changes false
 \output_changes false
 \html_math_output 0
@@ -100,8 +109,6 @@ Short texts may be written without setting the language (hyphenation will
 \end_layout
 
 \begin_layout Enumerate
-
-\lang japanese-cjk
 For longer text parts, it is recommended to set the correct language:
 \end_layout
 
diff --git a/autotests/export/latex/languages/supported-languages.lyx b/autotests/export/latex/languages/supported-languages.lyx
index 3d6d65a876..fb6c4b263f 100644
--- a/autotests/export/latex/languages/supported-languages.lyx
+++ b/autotests/export/latex/languages/supported-languages.lyx
@@ -1,5 +1,5 @@
 #LyX 2.4 created this file. For more info see https://www.lyx.org/
-\lyxformat 574
+\lyxformat 576
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -7,9 +7,12 @@
 \textclass scrartcl
 \begin_preamble
 \@ifpackageloaded{fontspec}{
-\newfontfamily\amharicfont[Script=Ethiopic]{Noto Sans Ethiopic}
-\newfontfamily\thaanafont[Script=Thaana]{Noto Sans Thaana}
+\ifdefined\luatexversion\else
+  \newfontfamily\amharicfont[Script=Ethiopic]{Noto Sans Ethiopic}
+\fi
+\newfontfamily\churchslavonicfont[Script=Cyrillic]{MonomakhUnicode}
 \newfontfamily\devanagarifont[Script=Devanagari]{Noto Serif Devanagari}
+\newfontfamily\hangulfont[Script=Hangul]{Baekmuk Batang}
 \newfontfamily\kannadafont[Script=Kannada]{Noto Serif Kannada}
 \newfontfamily\khmerfont[Script=Khmer]{Noto Serif Khmer}
 \newfontfamily\laofont[Script=Lao]{Noto Serif Lao}
@@ -18,6 +21,7 @@
 \newfontfamily\syriacfont[Script=Syriac]{FreeSans}
 \newfontfamily\tamilfont[Script=Tamil]{Noto Serif Tamil}
 \newfontfamily\telugufont[Script=Telugu]{Noto Serif Telugu}
+\newfontfamily\thaanafont[Script=Thaana]{Noto Sans Thaana}
 \newfontfamily\tibetanfont[Script=Tibetan]{Noto Sans Tibetan}
 
 % Font setup for Japanese (not supported by Polyglossia)
@@ -32,9 +36,9 @@
 % see https://tex.stackexchange.com/questions/222980/how-to-use-chinese-with-lualatex
 \usepackage{ifluatex}
 \ifluatex
-  \usepackage{luatexja-fontspec}
+  %\usepackage{luatexja-fontspec}
   % use Mainfont (DejaVu) for Greek and Cyrillic:
-  \ltjsetparameter{jacharrange={-2}}
+  %\ltjsetparameter{jacharrange={-2}}
   %\usepackage[match]{luatexja-fontspec}
   %\setmainjfont[Mapping=tex-text]{WenQuanYi Micro Hei}
   %\setsansjfont[Mapping=tex-text]{WenQuanYi Micro Hei}
@@ -50,7 +54,7 @@ enumitem
 \language english
 \language_package auto
 \inputencoding utf8
-\fontencoding HE8,T1
+\fontencoding auto
 \font_roman "DejaVuSerif" "FreeSerif"
 \font_sans "DejaVuSans" "FreeSans"
 \font_typewriter "default" "FreeMono"
@@ -105,11 +109,8 @@ enumitem
 \justification false
 \use_refstyle 0
 \use_minted 0
-\branch only-as-document-language
-\selected 0
-\filename_suffix 0
-\color #faf0e6
-\end_branch
+\use_lineno 0
+\lineno_options \branch only-as-document-language
 \branch babel-only
 \selected 0
 \filename_suffix 0
@@ -160,6 +161,16 @@ enumitem
 \filename_suffix 0
 \color #faf0e6
 \end_branch
+\branch conflict-ko
+\selected 1
+\filename_suffix 0
+\color #faf0e6
+\end_branch
+\branch conflict-luatex
+\selected 1
+\filename_suffix 0
+\color #faf0e6
+\end_branch
 \index Stichwortverzeichnis
 \shortcut idx
 \color #008000
@@ -422,6 +433,11 @@ Amharic
 inverted 0
 status open
 
+\begin_layout Standard
+\begin_inset Branch conflict-luatex
+inverted 0
+status open
+
 \begin_layout Quote
 
 \lang amharic
@@ -437,6 +453,11 @@ status open
 \end_inset
 
 
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Labeling
@@ -463,6 +484,11 @@ Arabic (Arabi)
 inverted 1
 status open
 
+\begin_layout Standard
+\begin_inset Branch conflict-luatex
+inverted 0
+status open
+
 \begin_layout Standard
 \begin_inset Branch conflict-babel-non-TeX-fonts
 inverted 0
@@ -483,7 +509,7 @@ status open
 
 \begin_layout Standard
 \begin_inset Note Note
-status open
+status collapsed
 
 \begin_layout Plain Layout
 Dummy paragraph to reset input-encoding with 
@@ -510,6 +536,11 @@ auto-legacy
 \end_inset
 
 
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Labeling
@@ -684,12 +715,18 @@ LangCode ast_ES
 \end_layout
 
 \begin_layout Subsection*
-Azerbaijani (Azeri, Azeri Turkish)
+Azerbaijani
 \end_layout
 
+\begin_layout Standard
+\begin_inset Branch babel-only
+inverted 0
+status open
+
 \begin_layout Quote
 
 \emph on
+\lang azerbaijani
 Azərbaycan dili
 \emph default
  (
@@ -718,9 +755,14 @@ sının rəsmi dövlət dilidir.
  daxildir.
 \end_layout
 
+\end_inset
+
+
+\end_layout
+
 \begin_layout Labeling
 \labelwidthstring 00.00.0000
-Babel azerbaijani (not supported by LyX)
+Babel azerbaijani
 \end_layout
 
 \begin_layout Labeling
@@ -744,35 +786,7 @@ Cyrillic script was used 1938-1991 (still used in Dagestan).
 
 \begin_layout Itemize
 Requires font encodings T1 and T2A (for the letter schwa).
- Use preamble code
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-DeclareTextCommand{
-\backslash
-textSchwa}{T1}{
-\backslash
-CYRSCHWA
-\backslash
-bbl@allowhyphens}
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-DeclareTextCommand{
-\backslash
-textschwa}{T1}{
-\backslash
-cyrschwa
-\backslash
-bbl@allowhyphens}
-\end_layout
-
-\begin_layout Subsection*
-Basq
+ 
 \end_layout
 
 \begin_layout Subsection*
@@ -874,14 +888,35 @@ Package babel Error: if@uni@ode already defined.
 Bengali
 \end_layout
 
+\begin_layout Standard
+\begin_inset Branch polyglossia-only
+inverted 0
+status open
+
+\begin_layout Quote
+বাংলা ভাষা একটি ইন্দো-আর্য ভাষা, যা দক্ষিণ এশিয়ার বাঙালি জাতির প্রধান কথ্য
+ ও লেখ্য ভাষা। মাতৃভাষীর সংখ্যায় বাংলা ইন্দো-আর্য ভাষা পরিবারের দ্বিতীয়,
+ ইন্দো-ইউরোপীয় ভাষা পরিবারের চতুর্থ ও বিশ্বের ষষ্ঠ বৃহত্তম ভাষা।
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
 \begin_layout Labeling
 \labelwidthstring 00.00.0000
-LyX (LyX support missing)
+Polyglossia bengali
 \end_layout
 
 \begin_layout Labeling
 \labelwidthstring 00.00.0000
-Polyglossia bengali
+Skript Bengali
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+LangCode bn_IN
 \end_layout
 
 \begin_layout Subsection*
@@ -1287,16 +1322,18 @@ The different CJK languages (simplified and traditional Chinese, Japanese,
 \end_layout
 
 \begin_layout Subsection*
-Churchslavonic
+Church Slavonic
 \end_layout
 
 \begin_layout Standard
-\begin_inset Note Note
+\begin_inset Branch polyglossia-only
+inverted 0
 status open
 
 \begin_layout Quote
 
 \emph on
+\lang churchslavonic
 Црькъвьнословѣ́ньскъ ѩꙁꙑ́къ
 \emph default
  и 
@@ -1313,11 +1350,6 @@ status open
 
 \end_layout
 
-\begin_layout Labeling
-\labelwidthstring 00.00.0000
-LyX (LyX support missing)
-\end_layout
-
 \begin_layout Labeling
 \labelwidthstring 00.00.0000
 Polyglossia churchslavonic
@@ -1480,6 +1512,11 @@ Divehi
 inverted 0
 status open
 
+\begin_layout Standard
+\begin_inset Branch conflict-luatex
+inverted 0
+status open
+
 \begin_layout Quote
 
 \lang divehi
@@ -1491,6 +1528,11 @@ status open
 \end_inset
 
 
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Labeling
@@ -1609,7 +1651,7 @@ Babel canadian
 
 \begin_layout Labeling
 \labelwidthstring 00.00.0000
-Polyglossia english [variant=canadian] # support still missing
+Polyglossia english [variant=canadian] # Polyglossia support still missing
 \end_layout
 
 \begin_layout Labeling
@@ -1757,17 +1799,35 @@ LangCode et_EE
 Farsi
 \end_layout
 
-\begin_layout Quote
+\begin_layout Standard
 \begin_inset Branch CJK
 inverted 1
 status open
 
 \begin_layout Standard
-\begin_inset Branch conflict-babel-non-TeX-fonts
+\begin_inset Branch conflict-luatex
 inverted 0
 status open
 
 \begin_layout Standard
+\begin_inset Branch conflict-babel-non-TeX-fonts
+inverted 0
+status open
+
+\begin_layout Quote
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+Dummy paragraph to set language inside quote
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Quote
 
 \lang farsi
 «فارسی» و «پارسی» به اینجا تغییر مسیر دارند.
@@ -1783,6 +1843,11 @@ status open
 \end_inset
 
 
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
@@ -1918,6 +1983,29 @@ F0 ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ ÿ
 \end_inset
 
 
+\end_layout
+
+\begin_layout Standard
+
+\lang czech
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+Czech dummy paragraph to reset input-encoding with 
+\begin_inset Quotes eld
+\end_inset
+
+auto-legacy
+\begin_inset Quotes erd
+\end_inset
+
+.
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Labeling
@@ -2081,7 +2169,7 @@ LangCode fr_CA
 \end_layout
 
 \begin_layout Subsection*
-Friulian
+Friulan
 \end_layout
 
 \begin_layout Quote
@@ -2678,48 +2766,22 @@ Provides textgreek
 Hebrew
 \end_layout
 
-\begin_layout Quote
-\begin_inset Branch conflict-babel-non-TeX-fonts
+\begin_layout Standard
+\begin_inset Branch conflict-luatex
 inverted 0
 status open
 
 \begin_layout Standard
+\begin_inset Branch conflict-babel-non-TeX-fonts
+inverted 0
+status open
 
-\lang hebrew
-עִבְרִית היא שפה שמית, ממשפחת השפות האפרו-אסיאתיות, הידועה כשפתם של היהודים
- ושל השומרונים, אשר ניב מודרני שלה (עברית ישראלית) הוא שפתה הרשמית של מדינת
- ישראל, מעמד שעוגן בשנת
-\family roman
-\series medium
-\shape up
-\size normal
-\emph off
-\nospellcheck off
-\bar no
-\strikeout off
-\xout off
-\uuline off
-\uwave off
-\noun off
-\color none
- 
-\family default
-\series default
-\shape default
-\size default
-\emph default
-\numeric on
-\nospellcheck default
-\bar default
-\strikeout default
-\xout default
-\uuline default
-\uwave default
-\noun default
-\color inherit
-2018
-\numeric off
- בחוק יסוד: ישראל – מדינת הלאום של העם היהודי.
+\begin_layout Quote
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+Dummy paragraph to set language inside quote
 \end_layout
 
 \end_inset
@@ -2728,11 +2790,6 @@ status open
 \end_layout
 
 \begin_layout Quote
-\begin_inset Branch polyglossia-only
-inverted 0
-status open
-
-\begin_layout Standard
 
 \lang hebrew
 עִבְרִית היא שפה שמית, ממשפחת השפות האפרו-אסיאתיות, הידועה כשפתם של היהודים
@@ -2774,6 +2831,11 @@ status open
 \end_inset
 
 
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
@@ -3338,6 +3400,11 @@ status open
 \end_inset
 
 
+\begin_inset Branch conflict-ko
+inverted 1
+status open
+
+\begin_layout Standard
 \begin_inset Branch polyglossia-only
 inverted 0
 status open
@@ -3354,6 +3421,11 @@ status open
 \end_inset
 
 
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Labeling
@@ -3415,6 +3487,11 @@ utf8-cjk
 .
 \end_layout
 
+\begin_layout Itemize
+XeTeX and LuaTeX work only with non-TeX fonts.
+ Font setup with XeCJK conflicts with Polyglossia-Korean.
+\end_layout
+
 \begin_layout Subsection*
 Kannada
 \end_layout
@@ -3546,6 +3623,11 @@ Khmer
 inverted 0
 status open
 
+\begin_layout Standard
+\begin_inset Branch conflict-luatex
+inverted 0
+status open
+
 \begin_layout Quote
 
 \lang khmer
@@ -3564,6 +3646,11 @@ khmer
 \end_inset
 
 
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Labeling
@@ -3586,12 +3673,19 @@ Korean
 \end_layout
 
 \begin_layout Standard
-\begin_inset Note Note
+\begin_inset Branch conflict-ko
+inverted 0
 status open
 
-\begin_layout Plain Layout
+\begin_layout Standard
+\begin_inset Branch polyglossia-only
+inverted 0
+status open
+
+\begin_layout Quote
 
 \emph on
+\lang korean
 한국어
 \emph default
 (韓國語)또는 
@@ -3610,6 +3704,11 @@ status open
 \end_inset
 
 
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Labeling
@@ -3619,7 +3718,7 @@ LyX korean
 
 \begin_layout Labeling
 \labelwidthstring 00.00.0000
-Polyglossia korean (LyX support missing)
+Polyglossia korean
 \end_layout
 
 \begin_layout Labeling
@@ -3656,6 +3755,11 @@ The different CJK languages (simplified and traditional Chinese, Japanese,
  the preamble.
 \end_layout
 
+\begin_layout Itemize
+XeTeX and LuaTeX work only with non-TeX fonts.
+ Font setup with XeCJK conflicts with Polyglossia-Korean.
+\end_layout
+
 \begin_layout Subsection*
 Kurmanji
 \end_layout
@@ -3999,44 +4103,7 @@ selectfont
 \end_layout
 
 \begin_layout Subsection*
-Lower
-\begin_inset space ~
-\end_inset
-
-Sorbian
-\end_layout
-
-\begin_layout Quote
-
-\emph on
-\lang lowersorbian
-Dolnoserbšćina
-\emph default
-, 
-\emph on
-dolnoserbska rěc
-\emph default
- jo jadna z dweju rěcowu Serbow, kotaraž se wužywa w Dolnej Łužycy, w pódpołdnjo
-wej Bramborskej, na pódzajtšu Nimskej.
-\end_layout
-
-\begin_layout Labeling
-\labelwidthstring 00.00.0000
-Babel lowersorbian
-\end_layout
-
-\begin_layout Labeling
-\labelwidthstring 00.00.0000
-Polyglossia lsorbian
-\end_layout
-
-\begin_layout Labeling
-\labelwidthstring 00.00.0000
-LangCode dsb_DE
-\end_layout
-
-\begin_layout Subsection*
-Macedonian
+Macedonian
 \end_layout
 
 \begin_layout Standard
@@ -4270,12 +4337,12 @@ Babel mongolian
 
 \begin_layout Labeling
 \labelwidthstring 00.00.0000
-LangCode mn_MN
+Script Cyrillic
 \end_layout
 
 \begin_layout Labeling
 \labelwidthstring 00.00.0000
-Script Cyrillic
+LangCode mn_MN
 \end_layout
 
 \begin_layout Subsection*
@@ -4292,6 +4359,56 @@ LyX (LyX support missing)
 Polyglossia nko
 \end_layout
 
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+Script N'ko
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+LangCode nqo
+\end_layout
+
+\begin_layout Subsection*
+North Sami
+\end_layout
+
+\begin_layout Quote
+
+\emph on
+\lang samin
+Davvisámegiella
+\emph default
+ gullá sámegielaid oarjesámegielaid davvejovkui ovttas julev- ja bihtánsámegiela
+in.
+ Eará oarjesámegielat leat ubmisámegiella ja lullisámegiella.
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+Babel samin
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+Polyglossia samin
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+LangCode se_NO 
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+(why country code Norway? Also spoken in Sweden and Finland)
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
 \begin_layout Subsection*
 Norwegian
 \end_layout
@@ -4684,64 +4801,58 @@ Russian
 orthography)
 \end_layout
 
-\begin_layout Labeling
-\labelwidthstring 00.00.0000
-LyX oldrussian (currently not supported by LyX)
+\begin_layout Standard
+\begin_inset Branch polyglossia-only
+inverted 0
+status open
+
+\begin_layout Verse
+Бѣлый, блѣдный, бѣдный бѣсъ
 \end_layout
 
-\begin_layout Labeling
-\labelwidthstring 00.00.0000
-Polyglossia russian 
+\begin_layout Verse
+Убѣжалъ голодный въ лѣсъ.
 \end_layout
 
-\begin_layout Labeling
-\labelwidthstring 00.00.0000
-PolyglossiaOpts spelling=old
+\begin_layout Verse
+Лѣшимъ по лѣсу онъ бѣгалъ,
 \end_layout
 
-\begin_layout Labeling
-\labelwidthstring 00.00.0000
-LangCode ru_petr1708
+\begin_layout Verse
+Рѣдькой съ хрѣномъ пообѣдалъ
 \end_layout
 
-\begin_layout Subsection*
-North Sami
+\begin_layout Verse
+И за горькій тотъ обѣдъ
 \end_layout
 
-\begin_layout Quote
+\begin_layout Verse
+Далъ обѣтъ надѣлать бѣдъ.
+\end_layout
+
+\end_inset
+
 
-\emph on
-\lang samin
-Davvisámegiella
-\emph default
- gullá sámegielaid oarjesámegielaid davvejovkui ovttas julev- ja bihtánsámegiela
-in.
- Eará oarjesámegielat leat ubmisámegiella ja lullisámegiella.
 \end_layout
 
 \begin_layout Labeling
 \labelwidthstring 00.00.0000
-Babel samin
+LyX oldrussian
 \end_layout
 
 \begin_layout Labeling
 \labelwidthstring 00.00.0000
-Polyglossia samin
+Polyglossia russian [spelling=old]
 \end_layout
 
 \begin_layout Labeling
 \labelwidthstring 00.00.0000
-LangCode se_NO 
-\begin_inset Note Note
-status open
-
-\begin_layout Plain Layout
-(why country code Norway? Also spoken in Sweden and Finland)
+Skript Cyrillic
 \end_layout
 
-\end_inset
-
-
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+LangCode ru_petr1708
 \end_layout
 
 \begin_layout Subsection*
@@ -4753,6 +4864,11 @@ Sanskrit
 inverted 0
 status open
 
+\begin_layout Standard
+\begin_inset Branch conflict-luatex
+inverted 0
+status open
+
 \begin_layout Quote
 
 \emph on
@@ -4762,7 +4878,12 @@ status open
  जगतः एकतमा अतिप्राचीना समृद्धा शास्त्रीया च भाषा वर्तते। संस्कृतं भारतस्य
  जगत: वा भाषास्वेकतमा प्राचीनतमा। भारती सुरभारती अमरभारती अमरवाणी सुरवाणी
  गीर्वाणवाणी गीर्वाणी देववाणी देवभाषा संस्कृता वाक् दैवीवाक् इत्यादिभिः
- नामभिः एतद्भाषा प्रसिद्धा। 
+ नामभिः एतद्भाषा प्रसिद्धा।
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \end_inset
@@ -4785,6 +4906,10 @@ Script Devanagari
 LangCode sa_IN
 \end_layout
 
+\begin_layout Itemize
+Works only with XeTeX
+\end_layout
+
 \begin_layout Subsection*
 Scottish
 \end_layout
@@ -5096,6 +5221,74 @@ Polyglossia slovenian
 LangCode sl_SI
 \end_layout
 
+\begin_layout Subsection*
+Sorbian
+\end_layout
+
+\begin_layout Subsubsection*
+Lower
+\begin_inset space ~
+\end_inset
+
+Sorbian
+\end_layout
+
+\begin_layout Quote
+
+\emph on
+\lang lowersorbian
+Dolnoserbšćina
+\emph default
+, 
+\emph on
+dolnoserbska rěc
+\emph default
+ jo jadna z dweju rěcowu Serbow, kotaraž se wužywa w Dolnej Łužycy, w pódpołdnjo
+wej Bramborskej, na pódzajtšu Nimskej.
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+Babel lowersorbian
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+Polyglossia lsorbian
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+LangCode dsb_DE
+\end_layout
+
+\begin_layout Subsubsection*
+Upper Sorbian
+\end_layout
+
+\begin_layout Quote
+
+\lang uppersorbian
+Hornjoserbšćina je zapadosłowjanska rěč, kotraž so w Hornjej Łužicy wokoło
+ městow Budyšin, Kamjenc a Wojerecy rěči.
+ Jako słowjanska rěč hornjoserbšćina k indoeuropskim rěčam słuša.
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+Babel uppersorbian
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+Polyglossia usorbian
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+LangCode hsb_DE
+\end_layout
+
 \begin_layout Subsection*
 Spanish
 \end_layout
@@ -5235,6 +5428,11 @@ Syriac
 inverted 0
 status open
 
+\begin_layout Standard
+\begin_inset Branch conflict-luatex
+inverted 0
+status open
+
 \begin_layout Quote
 Variants of the Syriac alphabet: Esṭrangelā (
 \lang syriac
@@ -5254,6 +5452,11 @@ Variants of the Syriac alphabet: Esṭrangelā (
 \end_inset
 
 
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Labeling
@@ -5504,6 +5707,19 @@ package
 \end_layout
 
 \end_deeper
+\begin_layout Subsubsection*
+Thai (CJK)
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+Babel thaicjk (not supported by LyX)
+\end_layout
+
+\begin_layout Itemize
+Babel support for Thai based on the CJK package and fonts.
+\end_layout
+
 \begin_layout Subsection*
 Tibetan
 \end_layout
@@ -5642,33 +5858,6 @@ Script Cyrillic
 LangCode uk_UA
 \end_layout
 
-\begin_layout Subsection*
-Upper Sorbian
-\end_layout
-
-\begin_layout Quote
-
-\lang uppersorbian
-Hornjoserbšćina je zapadosłowjanska rěč, kotraž so w Hornjej Łužicy wokoło
- městow Budyšin, Kamjenc a Wojerecy rěči.
- Jako słowjanska rěč hornjoserbšćina k indoeuropskim rěčam słuša.
-\end_layout
-
-\begin_layout Labeling
-\labelwidthstring 00.00.0000
-Babel uppersorbian
-\end_layout
-
-\begin_layout Labeling
-\labelwidthstring 00.00.0000
-Polyglossia usorbian
-\end_layout
-
-\begin_layout Labeling
-\labelwidthstring 00.00.0000
-LangCode hsb_DE
-\end_layout
-
 \begin_layout Subsection*
 Urdu
 \end_layout
@@ -5678,13 +5867,23 @@ Urdu
 inverted 0
 status open
 
+\begin_layout Standard
+\begin_inset Branch conflict-luatex
+inverted 0
+status open
+
 \begin_layout Quote
 
 \lang urdu
 اُردُو لشکری زبان (یا جدید معیاری اردو) ہندوستانی زبان کی معیاری قسم ہے۔
  یہ پاکستان کی قومی اور رابطہ عامہ کی زبان ہے، جبکہ بھارت کی چھے ریاستوں
  کی دفتری زبان کا درجہ رکھتی ہے۔ آئین ہند کے مطابق اسے 22 دفتری شناخت زبانوں
- میں شامل کیا جاچکا ہے۔ 
+ میں شامل کیا جاچکا ہے۔
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \end_inset
diff --git a/autotests/export/latex/languages/supported-languages_luatex.lyx b/autotests/export/latex/languages/supported-languages_luatex.lyx
new file mode 100644
index 0000000000..531614985b
--- /dev/null
+++ b/autotests/export/latex/languages/supported-languages_luatex.lyx
@@ -0,0 +1,213 @@
+#LyX 2.4 created this file. For more info see https://www.lyx.org/
+\lyxformat 575
+\begin_document
+\begin_header
+\save_transient_properties true
+\origin unavailable
+\textclass scrartcl
+\begin_preamble
+\newfontfamily\amharicfont{NotoSansEthiopic}
+\newfontfamily\churchslavonicfont[Script=Cyrillic]{MonomakhUnicode}
+\newfontfamily\devanagarifont[Script=Devanagari]{Noto Serif Devanagari}
+\newfontfamily\hangulfont[Script=Hangul]{Baekmuk Batang}
+\newfontfamily\kannadafont[Script=Kannada]{Noto Serif Kannada}
+\newfontfamily\khmerfont[Script=Khmer]{Noto Serif Khmer}
+\newfontfamily\laofont[Script=Lao]{Noto Serif Lao}
+% gloss-marathi.ldf has a spelling error: "script=Devaganari"
+\newfontfamily\marathifont[Script=Devanagari]{Noto Serif Devanagari}
+\newfontfamily\syriacfont[Script=Syriac]{FreeSans}
+\newfontfamily\tamilfont[Script=Tamil]{Noto Serif Tamil}
+\newfontfamily\telugufont[Script=Telugu]{Noto Serif Telugu}
+\newfontfamily\thaanafont[Script=Thaana]{Noto Sans Thaana}
+\newfontfamily\tibetanfont[Script=Tibetan]{Noto Sans Tibetan}
+
+
+% Font setup for Japanese (not supported by Polyglossia)
+% with LuaTeX, https://www.ctan.org/pkg/luatexja
+% see https://tex.stackexchange.com/questions/222980/how-to-use-chinese-with-lualatex
+% Unfortunately, this conflicts with Korean font setup via Polyglossia.
+\ifdefined\luatexversion
+  %\usepackage{luatexja-fontspec}
+  % use Mainfont (DejaVu) for Greek and Cyrillic:
+  %\ltjsetparameter{jacharrange={-2}}
+  %\usepackage[match]{luatexja-fontspec}
+  %\setmainjfont[Mapping=tex-text]{WenQuanYi Micro Hei}
+  %\setsansjfont[Mapping=tex-text]{WenQuanYi Micro Hei}
+  %\setmonojfont{WenQuanYi Micro Hei Mono}
+\fi
+\end_preamble
+\use_default_options false
+\begin_modules
+enumitem
+\end_modules
+\maintain_unincluded_children false
+\language english
+\language_package auto
+\inputencoding auto-legacy
+\fontencoding HE8,T1
+\font_roman "libertine" "FreeSerif"
+\font_sans "biolinum" "FreeSans"
+\font_typewriter "default" "FreeMono"
+\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
+\font_cjk gbsn
+\use_microtype false
+\use_dash_ligatures true
+\graphics default
+\default_output_format pdf5
+\output_sync 0
+\bibtex_command default
+\index_command default
+\float_placement class
+\float_alignment class
+\paperfontsize default
+\spacing single
+\use_hyperref true
+\pdf_bookmarks false
+\pdf_bookmarksnumbered false
+\pdf_bookmarksopen false
+\pdf_bookmarksopenlevel 1
+\pdf_breaklinks false
+\pdf_pdfborder true
+\pdf_colorlinks true
+\pdf_backref section
+\pdf_pdfusetitle true
+\papersize a4paper
+\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
+\use_lineno 0
+\lineno_options 
+\branch only-as-document-language
+\selected 0
+\filename_suffix 0
+\color #faf0e6
+\end_branch
+\branch babel-only
+\selected 0
+\filename_suffix 0
+\color #faf0e6
+\end_branch
+\branch non-TeX-fonts-only
+\selected 1
+\filename_suffix 0
+\color #faf0e6
+\end_branch
+\branch polyglossia-only
+\selected 1
+\filename_suffix 0
+\color #faf0e6
+\end_branch
+\branch CJK
+\selected 0
+\filename_suffix 0
+\color #faf0e6
+\end_branch
+\branch debug
+\selected 0
+\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
+\filename_suffix 0
+\color #faf0e6
+\end_branch
+\branch conflict-babel-non-TeX-fonts
+\selected 1
+\filename_suffix 0
+\color #faf0e6
+\end_branch
+\branch standalone
+\selected 0
+\filename_suffix 0
+\color #faf0e6
+\end_branch
+\branch conflict-luatex
+\selected 0
+\filename_suffix 0
+\color #faf0e6
+\end_branch
+\index Stichwortverzeichnis
+\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
+Languages supported by LyX
+\end_layout
+
+\begin_layout Standard
+With language examples that work with 
+\emph on
+Polyglossian
+\emph default
+ and LuaTeX.
+\end_layout
+
+\begin_layout Standard
+\begin_inset CommandInset include
+LatexCommand input
+filename "supported-languages.lyx"
+literal "false"
+
+\end_inset
+
+
+\end_layout
+
+\end_body
+\end_document
diff --git a/autotests/export/lyx2lyx/revert-languages-polyglossia.lyx b/autotests/export/lyx2lyx/revert-languages-polyglossia.lyx
index 4277074688..4897a82366 100644
--- a/autotests/export/lyx2lyx/revert-languages-polyglossia.lyx
+++ b/autotests/export/lyx2lyx/revert-languages-polyglossia.lyx
@@ -27,7 +27,7 @@
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \use_microtype false
-\use_dash_ligatures true
+\use_dash_ligatures false
 \graphics default
 \default_output_format default
 \output_sync 0
@@ -88,7 +88,7 @@
 \begin_body
 
 \begin_layout Standard
-Document mixing English and Friulan text.
+English document mixing English and Friulan text.
 \end_layout
 
 \begin_layout Standard
@@ -98,13 +98,33 @@ This is a Friulan paragraph.
 \end_layout
 
 \begin_layout Standard
-Followed by an English paragraph with one 
+English paragraph with one 
 \lang friulan
 Friulan
 \lang english
  word.
 \end_layout
 
+\begin_layout Standard
+
+\lang friulan
+Friulan paragraph
+\begin_inset Foot
+status open
+
+\begin_layout Plain Layout
+English footnote
+\end_layout
+
+\end_inset
+
+ with one 
+\lang english
+English
+\lang friulan
+ word.
+\end_layout
+
 \begin_layout Quote
 
 \lang friulan
@@ -134,9 +154,21 @@ List with
 \begin_layout Enumerate
 
 \lang friulan
-Friulan paragraphs
+Friulan paragraph
+\end_layout
+
+\begin_deeper
+\begin_layout Itemize
+with nested item list with English item
+\end_layout
+
+\begin_layout Itemize
+
+\lang friulan
+and Friulan list item.
 \end_layout
 
+\end_deeper
 \begin_layout Enumerate
 
 \lang friulan
@@ -224,10 +256,6 @@ cells
 \end_inset
 
 
-\end_layout
-
-\begin_layout Plain Layout
-
 \end_layout
 
 \end_inset
@@ -248,14 +276,21 @@ Lyxlist with
 \labelwidthstring 00.00.0000
 
 \lang friulan
-Friulan
+Friulan item
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+
+\lang friulan
+label
 \lang english
- label and
+ and
 \end_layout
 
 \begin_layout Labeling
 \labelwidthstring 00.00.0000
-Friulan 
+also 
 \lang friulan
 content
 \end_layout
@@ -265,5 +300,33 @@ content
 inside it.
 \end_layout
 
+\begin_layout Description
+Description with
+\end_layout
+
+\begin_layout Description
+
+\lang friulan
+Friulan item
+\end_layout
+
+\begin_layout Description
+
+\lang friulan
+label 
+\lang english
+and
+\end_layout
+
+\begin_layout Description
+also
+\lang friulan
+ content
+\end_layout
+
+\begin_layout Description
+inside it.
+\end_layout
+
 \end_body
 \end_document
diff --git a/development/FORMAT b/development/FORMAT
index 31f9ed2e7e..2202e8791e 100644
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -7,6 +7,11 @@ changes happened in particular if possible. A good example would be
 
 -----------------------
 
+2019-04-16  Günter Milde <milde@lyx.org>
+        * Format incremented to 576:
+	  Support for the document languages azerbaijani, bengali,
+	  churchslavonic, and oldrussian.
+
 2019-05-21 Pavel Sanda <sanda@lyx.org>
 	* Format incremented to 575: add line numbering via lineno package
 
diff --git a/development/autotests/ignoredTests b/development/autotests/ignoredTests
index c6b84617ac..a401f14dba 100644
--- a/development/autotests/ignoredTests
+++ b/development/autotests/ignoredTests
@@ -107,7 +107,7 @@ export/examples/ja/Modules/Sweave.*
 export/examples/ja/Multilingual_Typesetting_.*CJK.(dvi3|pdf5)_texF
 export/.*/(ko|zh_CN)/.*(dvi3|pdf[45])_texF
 export/export/latex/CJK/zh_CN-toc_*.(dvi3|pdf[45])_texF
-
+export/export/latex/CJK/en-de-el-ru-ko_utf8_.*_texF
 
 # export of minted documents to 2.2.x is not guaranteed to work (and currently
 # fails for our two minted example files), as explained here:
diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests
index c9bd826965..c6ce2707eb 100644
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -48,8 +48,11 @@ export/templates/(|de/|es/|fr/|ja/)Presentations/Beamer_lyx(16|20)
 export/examples/(|es/)Curricula_Vitae/Modern_CV_(lyx(16|20)|dvi|dvi3.*F|pdf|pdf3)
 export/examples/(|es/)Curricula_Vitae/Europe_CV_(dvi|dvi3.*F|pdf|pdf3)
 #
-# back-conversion fails for rotated float inset in a list
+# Back-conversion fails for rotated float inset in a list:
 export/export/lyx2lyx/lyx_2_3_test_lyx(16|20|21|22)
+# Additional empty lines (vs. Separator latexpar) with every round-trip
+# before an ERT nested in a Description list:
+export/export/lyx2lyx/lyx_2_3_test2_lyx(16|20)
 
 # New problem with TL18: endless loop?
 #    ! TeX capacity exceeded, sorry [input stack +size=5000].
@@ -252,6 +255,7 @@ export/export/latex/inputenc-xetex-utf8-expl3-bug_pdf4_texF
 # Korean with LuaTeX:
 # Language korean not found in language.dat.lua
 export/examples/ko/Welcome_(dvi3|pdf5)_systemF
+export/export/latex/CJK/en-de-el-ru-ko_utf8_(dvi3|pdf5)_systemF
 
 # Arabic
 #
diff --git a/lib/examples/ko/Welcome.lyx b/lib/examples/ko/Welcome.lyx
index c1e5f2ed0b..a5c50d6cb5 100644
--- a/lib/examples/ko/Welcome.lyx
+++ b/lib/examples/ko/Welcome.lyx
@@ -1,25 +1,29 @@
 #LyX 2.4 created this file. For more info see https://www.lyx.org/
-\lyxformat 571
+\lyxformat 575
 \begin_document
 \begin_header
 \save_transient_properties true
 \origin /systemlyxdir/examples/ko/
 \textclass article
 \begin_preamble
-\usepackage[cjk,hangul]{kotex}
+\@ifpackageloaded{fontspec}{
+  \newfontfamily\hangulfont{UnJamoBatang}
+  \newfontfamily\hangulfontsf{UnJamoDotum}
+  \newfontfamily\hangulfonttt{UnTaza}
+}{}
 \end_preamble
 \use_default_options false
 \maintain_unincluded_children false
 \language korean
-\language_package default
+\language_package auto
 \inputencoding utf8
 \fontencoding auto
-\font_roman "lmodern" "UnJamoBatang"
-\font_sans "default" "UnJamoNovel"
-\font_typewriter "default" "UnTaza"
+\font_roman "lmodern" "default"
+\font_sans "default" "default"
+\font_typewriter "default" "default"
 \font_math "auto" "auto"
 \font_default_family default
-\use_non_tex_fonts false
+\use_non_tex_fonts true
 \font_sc false
 \font_osf false
 \font_sf_scale 100 100
@@ -59,6 +63,7 @@
 \justification true
 \use_refstyle 0
 \use_minted 0
+\use_lineno 0
 \index Index
 \shortcut idx
 \color #008000
@@ -69,7 +74,7 @@
 \paragraph_indentation default
 \is_math_indent 0
 \math_numbering_side default
-\quotes_style english
+\quotes_style cjkangle
 \dynamic_quotes 0
 \papercolumns 1
 \papersides 1
diff --git a/lib/languages b/lib/languages
index e1f5b47490..f32514f73d 100644
--- a/lib/languages
+++ b/lib/languages
@@ -291,7 +291,6 @@ Language australian
 End
 
 # In polyglossia, this is supported since release 1.33.4 (May 2014)
-# We introduce it with LyX 2.2 to give the support time to settle.
 # Due to the variety, we use no country code.
 Language austrian
 	GuiName          "German (Austria, old spelling)"
@@ -307,7 +306,6 @@ Language austrian
 End
 
 # In polyglossia, this is supported since release 1.33.4 (May 2014)
-# We introduce it with LyX 2.2 to give the support time to settle.
 Language naustrian
 	GuiName          "German (Austria)"
 	BabelName        naustrian
@@ -320,6 +318,22 @@ Language naustrian
 	LangCode         de_AT
 End
 
+Language azerbaijani
+	GuiName          "Azerbaijani"
+	BabelName        azerbaijani
+	QuoteStyle       russian
+	Encoding         iso8859-9
+	FontEncoding	 T2A,T1
+	DateFormats      "d MMMM yyyy|dd.MMM.yyyy|dd.MM.yyyy"
+	LangCode         az_AZ
+	Requires         textschwa
+        # use \cyrschwa in T1, allow hyphenation in remainder of word
+	PostBabelPreamble
+          \DeclareTextCommand{\textschwa}{T1}{\cyrschwa\bbl@allowhyphens}
+          \DeclareTextCommand{\textSchwa}{T1}{\CYRSCHWA\bbl@allowhyphens}
+	EndPostBabelPreamble
+End
+
 Language bahasa
 	GuiName          "Indonesian"
 	HasGuiSupport    true
@@ -371,8 +385,13 @@ Language belarusian
 End
 
 # supported by polyglossia but not LyX:
-# Language bengali
-# 	PolyglossiaName  bengali
+Language bengali
+ 	PolyglossiaName  bengali
+	QuoteStyle       english
+	Encoding         utf8
+	LangCode	 be_IN
+End
+
 
 # not yet supported by polyglossia
 # The (rarely used) Cyrillic script is not supported (try serbian).
@@ -499,8 +518,16 @@ Language chinese-traditional
 End
 
 # supported by polyglossia but not LyX:
-# Language churchslavonic
-# 	PolyglossiaName  churchslavonic
+Language churchslavonic
+	GuiName         "Church Slavonic"
+ 	PolyglossiaName  churchslavonic
+	QuoteStyle       swiss
+	Encoding         utf8
+	FontEncoding     T2A
+	DateFormats      "d MMMM yyyy 'л'.|d MMM yyyy 'л'.|dd.MM.yyyy"
+	LangCode         cu
+	Provides         textcyrillic
+End
 
 # not supported by babel
 # FIXME DateFormats
@@ -790,7 +817,7 @@ Language hebrew
 	QuoteStyle       english
 	InternalEncoding true
 	# babel-hebrew expects the encoding for *other* languages last:
-	# FontEncoding    HE8|LHE
+	FontEncoding    HE8,T1|LHE,T1
 	## Use font encoding HE8 if the Culmus fonts are installed and
 	# work around too simple test for article-like classes in rlbabel.def.
 	PreBabelPreamble
@@ -927,10 +954,9 @@ Language khmer
 	LangCode         km_KH
 End
 
-# Fixme: activate Polyglossia support (file format change)
 Language korean
 	GuiName         "Korean"
-	#PolyglossiaName  korean
+	PolyglossiaName korean
 	Encoding        euc-kr
 	QuoteStyle      cjkangle
 	DateFormats     "yyyy년 M월 d일|yyyy. M. d.|yy. M. d."
@@ -938,6 +964,15 @@ Language korean
 	Requires        CJK
 End
 
+# Language korean-kotex
+# 	GuiName         "Korean (koTeX)"
+# 	Encoding        utf8
+# 	QuoteStyle      cjkangle
+# 	DateFormats     "yyyy년 M월 d일|yyyy. M. d.|yy. M. d."
+# 	LangCode        ko_KR
+# 	Requires        kotex
+# End
+
 # not yet supported by polyglossia
 Language kurmanji
 	GuiName          "Kurmanji"
@@ -1092,14 +1127,25 @@ Language norsk
 	QuoteStyle       swiss
 	Encoding         iso8859-15
 	FontEncoding	 T1|OT1
-	DateFormats      "d. MMMM yyyy|d. MMM yyyy|dd.MM.yyyy"
+	DateFormats      "d. MMMM yyyy|d. MMM yyyy|dd./MM./yyyy"
 	LangCode         nb_NO
 End
 
 # supported by polyglossia but not LyX:
 # Language nko
-#	GuiName		"N’Ko"            
-# 	PolyglossiaName	nko
+# 	GuiName		 "N’Ko"
+# 	PolyglossiaName	 nko
+# 	QuoteStyle       swiss
+# 	Encoding         utf8
+#       FIXME: DateFormats      "d MMMM، yyyy|dd/MM/yyyy|d/M/yyyy"
+#       gloss-nko.ldf says:
+#	In n'ko, this is an example of date :
+#	  ߂߀߁߃ ߞߏ߲ߞߏߜߍ ߕߟߋ߬ ߁߈ (RTL)
+#	  ( 18 February 2013 )
+#       The word "ߕߟߋ߬" is mandatory between month name and day number.
+# 	RTL              true
+# 	LangCode	 nqo
+# End
 
 Language nynorsk
 	GuiName          "Norwegian (Nynorsk)"
@@ -1126,15 +1172,13 @@ End
 # Currently not supported (file format change!)
 # Russian orthography from the Petrine orthographic reforms of
 # 1708 to the 1917 orthographic reform
-# Note: If this is enabled, russian needs to get
-#       PolyglossiaOpts  "spelling=modern"
-# Language oldrussian
-# 	GuiName          "Russian (Petrine orthography)"
-# 	PolyglossiaName  russian
-# 	PolyglossiaOpts  "spelling=old"
-# 	LangCode         ru_petr1708
-#       QuoteStyle       russian
-# End
+Language oldrussian
+	GuiName          "Russian (Petrine orthography)"
+	PolyglossiaName  russian
+	PolyglossiaOpts  "spelling=old"
+	QuoteStyle       russian
+	LangCode         ru_petr1708
+End
 
 # FIXME DateFormats
 Language piedmontese
@@ -1202,6 +1246,7 @@ Language russian
 	HasGuiSupport    true
 	BabelName        russian
 	PolyglossiaName  russian
+	PolyglossiaOpts  "spelling=modern"
 	QuoteStyle       russian
 	Encoding         koi8-r
 	FontEncoding     T2A
@@ -1389,7 +1434,7 @@ Language thai
 	  \@whilenum\@tempcnta<252\do{%
 	    \catcode\@tempcnta=13
 	    \advance\@tempcnta\@ne
-	  }%	  
+	  }%
 	  % Restore \coyright definition corrupted by lthenc.def
 	  \DeclareRobustCommand{\copyright}{%
 	    \ifmmode{\nfss@text{\textcopyright}}\else\textcopyright\fi}
diff --git a/lib/lyx2lyx/lyx_2_4.py b/lib/lyx2lyx/lyx_2_4.py
index 41c4324013..f14090d0e3 100644
--- a/lib/lyx2lyx/lyx_2_4.py
+++ b/lib/lyx2lyx/lyx_2_4.py
@@ -1728,6 +1728,30 @@ def convert_lineno(document):
                                 "\\lineno_options %s" % options]
 
 
+def revert_new_languages(document):
+    """Emulate support for Azerbaijani, Bengali, Church Slavonic, Korean,
+    and Russian (Petrine orthography)."""
+    
+    #revert_language(document, lyxname, babelname="", polyglossianame="")
+    revert_language(document, "azerbaijani", "azerbaijani", "")
+    revert_language(document, "bengali", "", "bengali")
+    revert_language(document, "churchslavonic", "", "churchslavonic")
+    revert_language(document, "oldrussian", "", "russian")
+    
+    # Korean is already supported via CJK, so leave as-is for Babel
+    if not get_bool_value(document.header, "\\use_non_tex_fonts"):
+        return
+    langpack = get_value(document.header, "\\language_package")
+    if langpack not in ("default", "auto"):
+        return
+    if document.language == "korean":
+        add_to_preamble(document, ["\\usepackage{polyglossia}",
+                                   "\\setdefaultlanguage{korean}"])
+    elif find_token(document.body, "\\lang korean") != -1:
+        revert_language(document, "korean", "", "korean")
+
+
+
 ##
 # Conversion hub
 #
@@ -1765,9 +1789,11 @@ convert = [
            [573, [convert_inputencoding_namechange]],
            [574, [convert_ruby_module, convert_utf8_japanese]],
            [575, [convert_lineno]],
+           [576, []],
           ]
 
-revert =  [[574, [revert_lineno]],
+revert =  [[575, [revert_new_languages]],
+           [574, [revert_lineno]],
            [573, [revert_ruby_module, revert_utf8_japanese]],
            [572, [revert_inputencoding_namechange]],
            [571, [revert_notoFonts]],
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index a8d521c504..5fc5ca06a2 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -51,7 +51,7 @@ namespace {
  * please keep this in sync with known_coded_languages line by line!
  */
 const char * const known_languages[] = {"acadian", "afrikaans", "albanian",
-"american", "arabic", "arabtex", "australian", "austrian", "bahasa", "bahasai",
+"american", "arabic", "arabtex", "australian", "austrian", "azerbaijani", "bahasa", "bahasai",
 "bahasam", "basque", "belarusian", "bosnian", "brazil", "brazilian", "breton", "british",
 "bulgarian", "canadian", "canadien", "catalan", "croatian", "czech", "danish",
 "dutch", "english", "esperanto", "estonian", "farsi", "finnish", "francais",
@@ -72,7 +72,7 @@ const char * const known_languages[] = {"acadian", "afrikaans", "albanian",
  * please keep this in sync with known_languages line by line!
  */
 const char * const known_coded_languages[] = {"french", "afrikaans", "albanian",
-"american", "arabic_arabi", "arabic_arabtex", "australian", "austrian", "bahasa", "bahasa",
+"american", "arabic_arabi", "arabic_arabtex", "australian", "austrian", "azerbaijani", "bahasa", "bahasa",
 "bahasam", "basque", "belarusian", "bosnian", "brazilian", "brazilian", "breton", "british",
 "bulgarian", "canadian", "canadien", "catalan", "croatian", "czech", "danish",
 "dutch", "english", "esperanto", "estonian", "farsi", "finnish", "french",
@@ -103,7 +103,7 @@ const char * const known_danish_quotes_languages[] = {"danish", 0};
 
 /// languages with english quotes (.lyx names)
 const char * const known_english_quotes_languages[] = {"american", "australian",
-"bahasa", "bahasam", "brazilian", "canadian", "chinese-simplified", "english",
+"bahasa", "bahasam", "bengali", "brazilian", "canadian", "chinese-simplified", "english",
 "esperanto", "farsi", "interlingua", "irish", "newzealand", "scottish",
 "thai", "turkish", "vietnamese", 0};
 
@@ -124,14 +124,15 @@ const char * const known_polish_quotes_languages[] = {"afrikaans", "bosnian", "c
 "dutch", "magyar", "polish", "romanian", "serbian", "serbian-latin", 0};
 
 /// languages with russian quotes (.lyx names)
-const char * const known_russian_quotes_languages[] = {"russian", "ukrainian", 0};
+const char * const known_russian_quotes_languages[] = {"azerbaijani", "oldrussian",
+"russian", "ukrainian", 0};
 
 /// languages with swedish quotes (.lyx names)
 const char * const known_swedish_quotes_languages[] = {"finnish", "swedish", 0};
 
 /// languages with swiss quotes (.lyx names)
 const char * const known_swiss_quotes_languages[] = {"albanian",
-"armenian", "basque", "german-ch", "german-ch-old",
+"armenian", "basque", "churchslavonic", "german-ch", "german-ch-old",
 "norsk", "nynorsk", "turkmen", "ukrainian", "vietnamese", 0};
 
 /// known language packages from the times before babel
@@ -323,12 +324,12 @@ string process_keyval_opt(vector<string> & options, string name)
 const char * const Preamble::polyglossia_languages[] = {
 "albanian", "american", "amharic", "ancient", "arabic", "armenian", "asturian", "australian",
 "bahasai", "bahasam", "basque", "bengali", "brazil", "brazilian", "breton", "british", "bulgarian",
-"catalan", "coptic", "croatian", "czech", "danish", "divehi", "dutch",
+"catalan", "churchslavonic", "coptic", "croatian", "czech", "danish", "divehi", "dutch",
 "english", "esperanto", "estonian", "farsi", "finnish", "french", "friulan",
 "galician", "greek", "monotonic", "hebrew", "hindi",
-"icelandic", "interlingua", "irish", "italian", "kannada", "khmer",
+"icelandic", "interlingua", "irish", "italian", "kannada", "khmer", "korean",
 "lao", "latin", "latvian", "lithuanian", "lsorbian", "magyar", "malayalam", "marathi",
-"austrian", "newzealand", "german", "norsk", "nynorsk", "occitan",
+"austrian", "newzealand", "german", "norsk", "nynorsk", "occitan", "oldrussian",
 "piedmontese", "polish", "polytonic", "portuges", "romanian", "romansh", "russian",
 "samin", "sanskrit", "scottish", "serbian", "slovak", "slovenian", "spanish", "swedish", "syriac",
 "tamil", "telugu", "thai", "tibetan", "turkish", "turkmen",
@@ -342,12 +343,12 @@ const char * const Preamble::polyglossia_languages[] = {
 const char * const Preamble::coded_polyglossia_languages[] = {
 "albanian", "american", "amharic", "ancientgreek", "arabic_arabi", "armenian", "asturian", "australian",
 "bahasa", "bahasam", "basque", "bengali", "brazilian", "brazilian", "breton", "british", "bulgarian",
-"catalan", "coptic", "croatian", "czech", "danish", "divehi", "dutch",
+"catalan", "churchslavonic", "coptic", "croatian", "czech", "danish", "divehi", "dutch",
 "english", "esperanto", "estonian", "farsi", "finnish", "french", "friulan",
 "galician", "greek", "greek", "hebrew", "hindi",
-"icelandic", "interlingua", "irish", "italian", "kannada", "khmer",
+"icelandic", "interlingua", "irish", "italian", "kannada", "khmer", "korean",
 "lao", "latin", "latvian", "lithuanian", "lowersorbian", "magyar", "malayalam", "marathi",
-"naustrian","newzealand", "ngerman", "norsk", "nynorsk", "occitan",
+"naustrian","newzealand", "ngerman", "norsk", "nynorsk", "occitan", "oldrussian",
 "piedmontese", "polish", "polutonikogreek", "portuges", "romanian", "romansh", "russian",
 "samin", "sanskrit", "scottish", "serbian", "slovak", "slovene", "spanish", "swedish", "syriac",
 "tamil", "telugu", "thai", "tibetan", "turkish", "turkmen",
@@ -399,7 +400,7 @@ void Preamble::addModule(string const & module)
 	for (auto const & m : used_modules) {
 		if (m == module)
 			return;
-	}		
+	}
 	used_modules.push_back(module);
 }
 
diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx
index 0799272fd6..0c4a2f3c8c 100644
--- a/src/tex2lyx/test/CJK.lyx.lyx
+++ b/src/tex2lyx/test/CJK.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 575
+\lyxformat 576
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/CJKutf8.lyx.lyx b/src/tex2lyx/test/CJKutf8.lyx.lyx
index 2e92d9e89f..43b5effcf5 100644
--- a/src/tex2lyx/test/CJKutf8.lyx.lyx
+++ b/src/tex2lyx/test/CJKutf8.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 575
+\lyxformat 576
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/DummyDocument.lyx.lyx b/src/tex2lyx/test/DummyDocument.lyx.lyx
index ee2f32e10b..9fddd797af 100644
--- a/src/tex2lyx/test/DummyDocument.lyx.lyx
+++ b/src/tex2lyx/test/DummyDocument.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 575
+\lyxformat 576
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/Dummy~Document.lyx.lyx b/src/tex2lyx/test/Dummy~Document.lyx.lyx
index e40906c310..3e6ae3aa19 100644
--- a/src/tex2lyx/test/Dummy~Document.lyx.lyx
+++ b/src/tex2lyx/test/Dummy~Document.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 575
+\lyxformat 576
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
index bdaee655f1..1d274e1f24 100644
--- a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
+++ b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 575
+\lyxformat 576
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/algo2e.lyx.lyx b/src/tex2lyx/test/algo2e.lyx.lyx
index 1620379b83..5ed9219cd8 100644
--- a/src/tex2lyx/test/algo2e.lyx.lyx
+++ b/src/tex2lyx/test/algo2e.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 575
+\lyxformat 576
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/beamer.lyx.lyx b/src/tex2lyx/test/beamer.lyx.lyx
index 5fdfbabe85..63b59504ed 100644
--- a/src/tex2lyx/test/beamer.lyx.lyx
+++ b/src/tex2lyx/test/beamer.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 575
+\lyxformat 576
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
index 99cc75b34f..b66944bc64 100644
--- a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
+++ b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 575
+\lyxformat 576
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/listpreamble.lyx.lyx b/src/tex2lyx/test/listpreamble.lyx.lyx
index 7eaa93e9c2..c13ecc6846 100644
--- a/src/tex2lyx/test/listpreamble.lyx.lyx
+++ b/src/tex2lyx/test/listpreamble.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 575
+\lyxformat 576
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/tabular-x-test.lyx.lyx b/src/tex2lyx/test/tabular-x-test.lyx.lyx
index 38612e21cb..314852913d 100644
--- a/src/tex2lyx/test/tabular-x-test.lyx.lyx
+++ b/src/tex2lyx/test/tabular-x-test.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 575
+\lyxformat 576
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/test-insets-basic.lyx.lyx b/src/tex2lyx/test/test-insets-basic.lyx.lyx
index 31abb55d99..09e1e9abaa 100644
--- a/src/tex2lyx/test/test-insets-basic.lyx.lyx
+++ b/src/tex2lyx/test/test-insets-basic.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 575
+\lyxformat 576
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/test-insets.lyx.lyx b/src/tex2lyx/test/test-insets.lyx.lyx
index 1d1688736b..6c0bc60f64 100644
--- a/src/tex2lyx/test/test-insets.lyx.lyx
+++ b/src/tex2lyx/test/test-insets.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 575
+\lyxformat 576
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/test-memoir.lyx.lyx b/src/tex2lyx/test/test-memoir.lyx.lyx
index 45a1685910..419b1b74fa 100644
--- a/src/tex2lyx/test/test-memoir.lyx.lyx
+++ b/src/tex2lyx/test/test-memoir.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 575
+\lyxformat 576
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/test-minted.lyx.lyx b/src/tex2lyx/test/test-minted.lyx.lyx
index 687bdd24f3..c2134cf401 100644
--- a/src/tex2lyx/test/test-minted.lyx.lyx
+++ b/src/tex2lyx/test/test-minted.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 575
+\lyxformat 576
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/test-modules.lyx.lyx b/src/tex2lyx/test/test-modules.lyx.lyx
index 63097f0c6d..4f8d27fef6 100644
--- a/src/tex2lyx/test/test-modules.lyx.lyx
+++ b/src/tex2lyx/test/test-modules.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 575
+\lyxformat 576
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx b/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
index 26048f3f77..58a7738c3b 100644
--- a/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
+++ b/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 575
+\lyxformat 576
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/test-scr.lyx.lyx b/src/tex2lyx/test/test-scr.lyx.lyx
index 6d3b1779bc..64e4ad8bc9 100644
--- a/src/tex2lyx/test/test-scr.lyx.lyx
+++ b/src/tex2lyx/test/test-scr.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 575
+\lyxformat 576
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/test-structure.lyx.lyx b/src/tex2lyx/test/test-structure.lyx.lyx
index 6cb49d2a37..c373bf65b0 100644
--- a/src/tex2lyx/test/test-structure.lyx.lyx
+++ b/src/tex2lyx/test/test-structure.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 575
+\lyxformat 576
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/test.lyx.lyx b/src/tex2lyx/test/test.lyx.lyx
index 205b23fb0f..803be68248 100644
--- a/src/tex2lyx/test/test.lyx.lyx
+++ b/src/tex2lyx/test/test.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 575
+\lyxformat 576
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/verbatim.lyx.lyx b/src/tex2lyx/test/verbatim.lyx.lyx
index 573bca62e2..aac6286633 100644
--- a/src/tex2lyx/test/verbatim.lyx.lyx
+++ b/src/tex2lyx/test/verbatim.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 575
+\lyxformat 576
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/version.h b/src/version.h
index 496e34b8ee..021a1e333a 100644
--- a/src/version.h
+++ b/src/version.h
@@ -32,8 +32,8 @@ extern char const * const lyx_version_info;
 
 // Do not remove the comment below, so we get merge conflict in
 // independent branches. Instead add your own.
-#define LYX_FORMAT_LYX 575 // ps: lineno
-#define LYX_FORMAT_TEX2LYX 575
+#define LYX_FORMAT_LYX 576 // ps: new languages
+#define LYX_FORMAT_TEX2LYX 576
 
 #if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
 #ifndef _MSC_VER