X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flanguages;h=3ce6239625e549517f90ae82ac286260e14c3be6;hb=2291c6289b4467c8f5f9594a83744e4c4d8ee3fd;hp=5d7cdd6a1fac2fcd950847e96b1a376fc3728f62;hpb=837869452ad8d917615aa4bca77402dc49ba094e;p=lyx.git

diff --git a/lib/languages b/lib/languages
index 5d7cdd6a1f..3ce6239625 100644
--- a/lib/languages
+++ b/lib/languages
@@ -10,7 +10,7 @@
 #	PolyglossiaName    <polyglossianame>
 #	PolyglossiaOpts    "<language-specific options>"
 #	Encoding           <encoding>
-#	QuoteStyle         <quotation mark style>
+#	QuoteStyle         <danish|english|french|german|polish|swedish>
 #	InternalEncoding   <true|false>
 #	RTL                <true|false>
 #	AsBabelOptions     <true|false>
@@ -26,10 +26,20 @@
 # End
 #
 #
-# NOTE:
+# NOTES:
 #
 # * Omitted elements will be treated as empty (if string) or "false"
 #   (if boolean).
+# * The QuoteStyle arguments correspond to the following styles:
+#   - danish:  >>text<<  >text<   (inward guillemets)
+#   - english: ``text''  `text'   (66_99)
+#   - french:  <<text>>  <text>   (outward guillemets)
+#   - german:  ,,text``  ,text`   (99/66)
+#   - polish:  ,,text''  ,text'   (99/99)
+#   - swedish: ''text''  'text'   (99_99)
+#   Note that the option names have been selected (rather arbitrarily)
+#   because the respective styles are common in the respective countries.
+#   Of course this does not imply any fixed relation to those countries.
 # * Encoding is not relevant for XeTeX (which is utf8 always), and if
 #   Document > Settings > Language > Encoding is not set to "Language
 #   Default"
@@ -110,7 +120,7 @@ Language ancientgreek
 	GuiName          "Greek (ancient)"
 	PolyglossiaName  greek
 	PolyglossiaOpts  variant=ancient
-	QuoteStyle        french
+	QuoteStyle       french
 	Encoding         iso8859-7
 	LangCode         grc_GR
 End
@@ -134,6 +144,7 @@ Language arabic_arabi
 	QuoteStyle       french
 	Encoding         cp1256
 	RTL              true
+	AsBabelOptions   true
 	LangCode         ar_SA
 End
 
@@ -199,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
@@ -208,6 +222,7 @@ Language belarusian
 	QuoteStyle       french
 	Encoding         cp1251
 	LangCode         be_BY
+	AsBabelOptions   true
 End
 
 Language brazilian
@@ -293,7 +308,7 @@ Language chinese-traditional
 	GuiName         "Chinese (traditional)"
 	QuoteStyle       english
 	Encoding        utf8-cjk
-	LangCode        zh_CN
+	LangCode        zh_TW
 	Requires         CJK
 End
 
@@ -377,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
@@ -426,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)
@@ -553,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
@@ -571,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
@@ -753,7 +781,7 @@ Language russian
 	BabelName        russian
 	PolyglossiaName  russian
 	QuoteStyle       french
-	Encoding         koi8
+	Encoding         koi8-r
 	LangCode         ru_RU
 End
 
@@ -784,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
@@ -798,7 +827,7 @@ Language serbian-latin
 	PolyglossiaOpts  "script=latin"
 	QuoteStyle       german
 	Encoding         iso8859-2
-	LangCode         sr_RS
+	LangCode         sr_RS-Latin
 End
 
 Language slovak
@@ -889,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