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

diff --git a/lib/languages b/lib/languages
index 1022f3cdbe..e4c0dd5c94 100644
--- a/lib/languages
+++ b/lib/languages
@@ -120,7 +120,7 @@ Language ancientgreek
 	GuiName          "Greek (ancient)"
 	PolyglossiaName  greek
 	PolyglossiaOpts  variant=ancient
-	QuoteStyle        french
+	QuoteStyle       french
 	Encoding         iso8859-7
 	LangCode         grc_GR
 End
@@ -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
@@ -222,6 +228,7 @@ Language belarusian
 	QuoteStyle       french
 	Encoding         cp1251
 	LangCode         be_BY
+	AsBabelOptions   true
 End
 
 Language brazilian
@@ -307,7 +314,7 @@ Language chinese-traditional
 	GuiName         "Chinese (traditional)"
 	QuoteStyle       english
 	Encoding        utf8-cjk
-	LangCode        zh_CN
+	LangCode        zh_TW
 	Requires         CJK
 End
 
@@ -470,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
@@ -573,13 +595,16 @@ End
 # japanese must be loaded locally with babel options,
 # not globally via class options
 # http://www.lyx.org/trac/ticket/4597#c4
+# Since japanese does not load fontenc, we set
+# InternalEncoding to true.
 Language japanese
 	GuiName          "Japanese"
 	BabelName        japanese
-	Encoding         jis-plain
+	Encoding         jis-platex
 	LangCode         ja_JP
 	AsBabelOptions   true
 	Requires         japanese
+	InternalEncoding true
 End
 
 # uses CJK package
@@ -591,11 +616,15 @@ Language japanese-cjk
 End
 
 # not yet supported by polyglossia
+# not supported by babel
 Language kazakh
 	GuiName         "Kazakh"
-	BabelName       kazakh
-	Encoding        pt154
+	Encoding        ascii
 	LangCode        kk_KZ
+	PostBabelPreamble
+	\input{t2aenc.def}
+	\AtBeginDocument{\fontencoding{T2A}\selectfont}
+	EndPostBabelPreamble
 End
 
 Language korean
@@ -773,7 +802,7 @@ Language russian
 	BabelName        russian
 	PolyglossiaName  russian
 	QuoteStyle       french
-	Encoding         koi8
+	Encoding         koi8-r
 	LangCode         ru_RU
 End
 
@@ -804,11 +833,12 @@ End
 
 Language serbian
 	GuiName          "Serbian"
-	BabelName        serbian
+	BabelName        serbianc
 	PolyglossiaName  serbian
 	QuoteStyle       german
 	Encoding         iso8859-5
 	LangCode         sr_RS
+	AsBabelOptions   true
 End
 
 Language serbian-latin
@@ -818,7 +848,7 @@ Language serbian-latin
 	PolyglossiaOpts  "script=latin"
 	QuoteStyle       german
 	Encoding         iso8859-2
-	LangCode         sr_RS
+	LangCode         sr_RS-Latin
 End
 
 Language slovak
@@ -874,12 +904,13 @@ Language swedish
 End
 
 # not supported by babel
-Language syriac
-	GuiName          "Syriac"
-	PolyglossiaName  syriac
-	Encoding         utf8
-	LangCode         syr_SY
-End
+#Language syriac
+#	GuiName          "Syriac"
+#	PolyglossiaName  syriac
+#	Encoding         utf8
+#	RTL              true
+#	LangCode         syr_SY
+#End
 
 # not supported by babel
 Language tamil
@@ -909,6 +940,14 @@ Language thai
 	EndPostBabelPreamble
 End
 
+# not supported by babel
+Language tibetan
+	GuiName          "Tibetan"
+	PolyglossiaName  tibetan
+	Encoding         utf8
+	LangCode         bo_CN
+End
+
 Language turkish
 	GuiName          "Turkish"
 	BabelName        turkish
@@ -952,12 +991,13 @@ Language uppersorbian
 End
 
 # not supported by babel
-Language urdu
-	GuiName          "Urdu"
-	PolyglossiaName  urdu
-	Encoding         utf8
-	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