X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flanguages;h=282d902c78adcb4953794ec6e5595d9f1e6fe289;hb=8ad7b0caead9f58b5ab40626af144adb3d059f01;hp=3a0b6ad234e96850944d2c28a440f743773c9663;hpb=237193f8a888777192981136469a5d4febb8e9d8;p=lyx.git

diff --git a/lib/languages b/lib/languages
index 3a0b6ad234..282d902c78 100644
--- a/lib/languages
+++ b/lib/languages
@@ -44,19 +44,21 @@
 #   (UK) -- try to select the entry that is most generic -- here
 #   English.
 # * The QuoteStyle arguments correspond to the following styles:
-# 		PRIMARY		SECONDARY
-#   - british:	`text'		``text''	(6_9 -- 66_99)
-#   - danish:	>>text<<	>text<		(inward guillemets)
-#   - english:	``text''	`text'		(66_99 -- 6_9)
-#   - french:	<<text>>	``text''	(outward guillemets -- 66_99)
-#   - frenchin: <<text>>	<<text>>	(French Imprimerie Nationale style)
-#   - german:	,,text``	,text`		(99/66 -- 9/6)
-#   - polish:	,,text''	,text'		(99/99 -- 9/9)
-#   - russian:  <<text>>        ,,text``       (outward guillemets -- 99/66)
-#   - swedish:	''text''	'text'		(99_99 -- 9_9)
-#   - swedishg: >>text>>	'text'		(Swedish Guillemets)
-#   - swiss:	<<text>>	<text>		(outward guillemets)
-#   - plain:	"text"		'text'		(non-typographical quotes)
+# 		   PRIMARY		SECONDARY
+#   - british:	  `text'		``text''	(6_9 -- 66_99)
+#   - cjk:        corner brackets	white corner br.
+#   - cjk-angle:  double angle br.	angle br.
+#   - danish:	  >>text<<		>text<		(inward guillemets)
+#   - english:	  ``text''		`text'		(66_99 -- 6_9)
+#   - french:	  <<text>>		``text''	(outward guillemets -- 66_99)
+#   - frenchin:   <<text>>		<<text>>	(French Imprimerie Nationale style)
+#   - german:	  ,,text``		,text`		(99/66 -- 9/6)
+#   - polish:	  ,,text''		,text'		(99/99 -- 9/9)
+#   - russian:    <<text>>		,,text``       	(outward guillemets -- 99/66)
+#   - swedish:	  ''text''		'text'		(99_99 -- 9_9)
+#   - swedishg:   >>text>>		'text'		(Swedish Guillemets)
+#   - swiss:	  <<text>>		<text>		(outward guillemets)
+#   - plain:	  "text"		'text'		(non-typographical quotes)
 #   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.
@@ -184,7 +186,7 @@ Language arabic_arabi
 	PolyglossiaName  arabic
 	QuoteStyle       french
 	Encoding         cp1256
-	FontEncoding     "LFE,LAE"
+	FontEncoding     LAE
 	RTL              true
 	AsBabelOptions   true
 	LangCode         ar_SA
@@ -381,9 +383,9 @@ End
 Language chinese-traditional
 	GuiName         "Chinese (traditional)"
 	HasGuiSupport    true
-	QuoteStyle       english
-	Encoding        utf8-cjk
-	LangCode        zh_TW
+	QuoteStyle       cjk
+	Encoding         utf8-cjk
+	LangCode         zh_TW
 	Requires         CJK
 End
 
@@ -484,7 +486,7 @@ Language farsi
 	BabelName        farsi
 	PolyglossiaName  farsi
 	Encoding         utf8
-	FontEncoding     "LFE,LAE"
+	FontEncoding     LFE
 	RTL              true
 	LangCode         fa_IR
 	QuoteStyle       english
@@ -718,6 +720,7 @@ Language japanese
 	Requires         japanese
 	InternalEncoding true
 	FontEncoding     None
+	QuoteStyle       cjk
 End
 
 # uses CJK package
@@ -726,6 +729,7 @@ Language japanese-cjk
 	Encoding        euc-jp
 	LangCode        ja_JP
 	Requires        CJK
+	QuoteStyle      cjk
 End
 
 # not supported by babel
@@ -759,7 +763,7 @@ End
 Language korean
 	GuiName         "Korean"
 	Encoding        euc-kr
-	QuoteStyle      english
+	QuoteStyle      cjkangle
 	LangCode        ko_KR
 	Requires        CJK
 End
@@ -1187,18 +1191,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