Fix shortcut clash (bug #8878)

[lyx.git] / lib / languages

diff --git a/lib/languages b/lib/languages
index a922cb8678583419dda7c3745378079d76a821f0..3ce6239625e549517f90ae82ac286260e14c3be6 100644 (file)
--- 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
@@ -144,6 +144,7 @@ Language arabic_arabi
        QuoteStyle       french
        Encoding         cp1256
        RTL              true
+       AsBabelOptions   true
        LangCode         ar_SA
 End
 
@@ -209,6 +210,9 @@ Language basque
        QuoteStyle       french
        Encoding         iso8859-15
        LangCode         eu_ES
+       PostBabelPreamble
+       \addto\extrasbasque{\bbl@deactivate{~}}
+       EndPostBabelPreamble
 End
 
 # not yet supported by polyglossia
@@ -218,6 +222,7 @@ Language belarusian
        QuoteStyle       french
        Encoding         cp1251
        LangCode         be_BY
+       AsBabelOptions   true
 End
 
 Language brazilian
@@ -303,7 +308,7 @@ Language chinese-traditional
        GuiName         "Chinese (traditional)"
        QuoteStyle       english
        Encoding        utf8-cjk
-       LangCode        zh_CN
+       LangCode        zh_TW
        Requires         CJK
 End
 
@@ -387,6 +392,9 @@ Language estonian
        QuoteStyle       polish
        Encoding         iso8859-15
        LangCode         et_EE
+       PostBabelPreamble
+       \addto\extrasestonian{\bbl@deactivate{~}}
+       EndPostBabelPreamble
 End
 
 # the preamble definitions are only used due to bugs in the
@@ -436,6 +444,9 @@ Language galician
        QuoteStyle       french
        Encoding         iso8859-15
        LangCode         gl_ES
+       PostBabelPreamble
+       \addto\shorthandsgalician{\galiciandeactivate{~}}
+       EndPostBabelPreamble
 End
 
 # german does not use a country code (due to the variety)
@@ -563,13 +574,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
@@ -581,11 +595,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
@@ -763,7 +781,7 @@ Language russian
        BabelName        russian
        PolyglossiaName  russian
        QuoteStyle       french
-       Encoding         koi8
+       Encoding         koi8-r
        LangCode         ru_RU
 End
 
@@ -794,11 +812,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
@@ -808,7 +827,7 @@ Language serbian-latin
        PolyglossiaOpts  "script=latin"
        QuoteStyle       german
        Encoding         iso8859-2
-       LangCode         sr_RS
+       LangCode         sr_RS-Latin
 End
 
 Language slovak
@@ -899,6 +918,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