X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flanguages;h=0b5277ad21de67912bdb1708db0d4c8aa07a1951;hb=1f2598a6a15863f2d92bb6e032520bc1d7f77039;hp=1c07a32ad9d701e7f122f126569618806cce77e3;hpb=087523f87a9cacdf2d8d34b45bc86142c710001b;p=lyx.git

diff --git a/lib/languages b/lib/languages
index 1c07a32ad9..0b5277ad21 100644
--- a/lib/languages
+++ b/lib/languages
@@ -65,6 +65,8 @@
 # * Encoding is the default encoding used with TeX fonts.
 #   It is only used if Document > Settings > Language > Encoding
 #   is set to "Language Default" and "use non-TeX fonts" is FALSE.
+#   Encoding "inherit" means: keep encoding of the context (used by
+#   latex_language).
 # * InternalEncoding is used to tell LyX that babel internally sets a
 #   non-standard font encoding (such as hebrew to LHE or greek to LGR).
 #   If True, LyX cares for characters/macros that do not exist in
@@ -100,13 +102,13 @@ Language ignore
 	GuiName          "Ignore"
 	BabelName        ignore
 	PolyglossiaName  ignore
-	Encoding         iso8859-1
+	Encoding         inherit
 	LangCode         ignore
 End
 
 Language latex
 	GuiName          "LaTeX"
-	Encoding         iso8859-1
+	Encoding         inherit
 	LangCode         latex
 End
 
@@ -222,6 +224,7 @@ 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)"
 	BabelName        austrian
@@ -229,7 +232,8 @@ Language austrian
 	PolyglossiaOpts  "variant=austrian,spelling=old,babelshorthands=true"
 	QuoteStyle       german
 	Encoding         iso8859-15
-	LangCode         de_AT
+	LangCode         de
+	LangVariety      alt
 End
 
 # In polyglossia, this is supported since release 1.33.4 (May 2014)
@@ -326,6 +330,7 @@ End
 
 Language bulgarian
 	GuiName          "Bulgarian"
+	HasGuiSupport    true
 	BabelName        bulgarian
 	PolyglossiaName  bulgarian
 	QuoteStyle       german
@@ -350,7 +355,7 @@ End
 #       PolyglossiaOpts  "variant=french"
 Language canadien
 	GuiName          "French (Canada)"
-	BabelName        canadien
+	BabelName        acadian
 #	PolyglossiaName  french
 #	PolyglossiaOpts  "variant=canadien"
 	QuoteStyle       french
@@ -1145,9 +1150,6 @@ Language turkish
 	QuoteStyle       english
 	Encoding         iso8859-9
 	LangCode         tr_TR
-	PostBabelPreamble
-	\usepackage{xkeyval}
-	EndPostBabelPreamble
 End
 
 # turkmen must be loaded locally with babel options,
@@ -1191,18 +1193,13 @@ Language urdu
 	LangCode         ur_PK
 End
 
-# vietnam must be loaded locally with babel options,
-# not globally via class options, see
-# http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg129417.html
 Language vietnamese
 	GuiName          "Vietnamese"
-	BabelName        vietnam
+	BabelName        vietnamese
 	PolyglossiaName  vietnamese
 	QuoteStyle       english
 	Encoding         utf8
 	LangCode         vi_VN
-	AsBabelOptions   true
-	Requires         vietnamese
 End
 
 Language welsh