drop support for ArmTeX as its non-standard armscii8 encoding was quite unusable in real life, use polyglossia/XeTeX instead as clean solution via Unicode; fileformat change; fixes the second part of bug #8026

lib/languages

@@ -134,7 +134,7 @@ End
 Language armenian
 	GuiName          "Armenian"
 	PolyglossiaName  armenian
-	Encoding         armscii8
+	Encoding         utf8
 	LangCode         hy_AM
 End
 

lib/lyx2lyx/lyx_2_1.py

@@ -807,6 +807,24 @@ def revert_languages(document):
                 j = len(document.body)
 
 
+def convert_armenian(document):
+    "Use polyglossia and thus non-TeX fonts for Armenian" 
+
+    if document.language == "armenian": 
+        i = find_token(document.header, "\\use_non_tex_fonts", 0) 
+        if i != -1: 
+            document.header[i] = "\\use_non_tex_fonts true" 
+
+
+def revert_armenian(document):
+    "Use ArmTeX and thus TeX fonts for Armenian" 
+
+    if document.language == "armenian": 
+        i = find_token(document.header, "\\use_non_tex_fonts", 0) 
+        if i != -1: 
+            document.header[i] = "\\use_non_tex_fonts false" 
+
+
 ##
 # Conversion hub
 #
@@ -831,10 +849,12 @@ convert = [
            [429, [convert_table_rotation]],
            [430, [convert_listoflistings]],
            [431, [convert_use_amssymb]],
-           [432, []]
+           [432, []],
+           [433, [convert_armenian]]
           ]
 
 revert =  [
+           [432, [revert_armenian]],
            [431, [revert_languages, revert_ancientgreek]],
            [430, [revert_use_amssymb]],
            [429, [revert_listoflistings]],

src/BufferParams.cpp

@@ -2742,12 +2742,6 @@ void BufferParams::writeEncodingPreamble(otexstream & os,
 			break;
 		}
 	}
-
-	// The encoding "armscii8" (for Armenian) is only available when
-	// the package "armtex" is loaded.
-	if (language->encoding()->latexName() == "armscii8"
-	    || inputenc == "armscii8")
-		os << "\\usepackage{armtex}\n";
 }
 
 

src/version.h

@@ -30,8 +30,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 432 // uwestoehr: support for many languages like Telugu
-#define LYX_FORMAT_TEX2LYX 432 // uwestoehr: support for polyglossia/XeTeX
+#define LYX_FORMAT_LYX 433 // uwestoehr: Armenian support for many languages like Telugu
+#define LYX_FORMAT_TEX2LYX 433 // uwestoehr: Armenian support for polyglossia/XeTeX
 
 #if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
 #ifndef _MSC_VER