X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flanguages;h=e4c0dd5c941037eaaa1f4bf76ec5879ce633facf;hb=c5782ff4bbf0129b8ef95c92b33560d67e593024;hp=3fe5b8f4c57db74c8d1d13ead0eba7b535077485;hpb=2c6264d0b0499caf486e60eda8f8534991562012;p=lyx.git

diff --git a/lib/languages b/lib/languages
index 3fe5b8f4c5..e4c0dd5c94 100644
--- a/lib/languages
+++ b/lib/languages
@@ -167,19 +167,25 @@ Language australian
 	LangCode         en_AU
 End
 
-# not yet supported by polyglossia
+# 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 austrian
 	GuiName          "German (Austria, old spelling)"
 	BabelName        austrian
+	PolyglossiaName  german
+	PolyglossiaOpts  "variant=austrian,spelling=old,babelshorthands=true"
 	QuoteStyle       german
 	Encoding         iso8859-15
 	LangCode         de_AT
 End
 
-# not yet supported by polyglossia
+# 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
+	PolyglossiaName  german
+	PolyglossiaOpts  "variant=austrian,babelshorthands=true"
 	QuoteStyle       german
 	Encoding         iso8859-15
 	LangCode         de_AT
@@ -471,18 +477,33 @@ Language ngerman
 	LangCode         de_DE
 End
 
-# Swiss German is not supported by babel and polyglossia yet
-# We use ngerman for now (spellchecking is supported though!)
+# In Babel, this is supported since release 2.7 of babel-german (Dec 2013)
+# We introduce it with LyX 2.2 to give the support time to settle.
+# Polyglossia does not yet support Swiss German. We use ngerman for now.
 Language german-ch
 	GuiName          "German (Switzerland)"
-	BabelName        ngerman
+	BabelName        nswissgerman
 	PolyglossiaName  german
 	PolyglossiaOpts  "babelshorthands=true"
+#	PolyglossiaOpts  "variant=swiss,babelshorthands=true"
 	QuoteStyle       danish
 	Encoding         iso8859-15
 	LangCode         de_CH
 End
 
+# In Babel, this is supported since release 2.7 of babel-german (Dec 2013)
+# Polyglossia does not yet support Swiss German. We use german for now.
+Language german-ch-old
+	GuiName          "German (Switzerland, old spelling)"
+ 	BabelName        swissgerman
+ 	PolyglossiaName  german
+ 	PolyglossiaOpts  "spelling=old,babelshorthands=true"
+# 	PolyglossiaOpts  "variant=swiss,spelling=old,babelshorthands=true"
+ 	QuoteStyle       danish
+ 	Encoding         iso8859-15
+ 	LangCode         de_CH
+End
+
 Language greek
 	GuiName           "Greek"
 	BabelName         greek
@@ -883,13 +904,13 @@ Language swedish
 End
 
 # not supported by babel
-Language syriac
-	GuiName          "Syriac"
-	PolyglossiaName  syriac
-	Encoding         utf8
-	RTL              true
-	LangCode         syr_SY
-End
+#Language syriac
+#	GuiName          "Syriac"
+#	PolyglossiaName  syriac
+#	Encoding         utf8
+#	RTL              true
+#	LangCode         syr_SY
+#End
 
 # not supported by babel
 Language tamil
@@ -970,13 +991,13 @@ Language uppersorbian
 End
 
 # not supported by babel
-Language urdu
-	GuiName          "Urdu"
-	PolyglossiaName  urdu
-	Encoding         utf8
-	RTL              true
-	LangCode         ur_PK
-End
+#Language urdu
+#	GuiName          "Urdu"
+#	PolyglossiaName  urdu
+#	Encoding         utf8
+#	RTL              true
+#	LangCode         ur_PK
+#End
 
 # vietnam must be loaded locally with babel options,
 # not globally via class options, see