X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fencodings;h=ca47cf18220d68275c1c7a4983781ecbb86ac1ba;hb=ef39cde0addf2b78f8b42a588be62ed9175ca649;hp=8ab1cce270b9f008598e06740573e2a01ae8f822;hpb=41055bab88d89604e516fbf7620127173d1ae2a0;p=lyx.git

diff --git a/lib/encodings b/lib/encodings
index 8ab1cce270..ca47cf1822 100644
--- a/lib/encodings
+++ b/lib/encodings
@@ -47,12 +47,12 @@
 # and pt254.
 
 # inputenc's standard utf8 support:
-Encoding utf8 utf8 "Unicode (utf8)" UTF-8 variable inputenc
+Encoding utf8 utf8 "Default" UTF-8 variable inputenc
 End
 
-# This one is used by many CJK packages. utf8 is supposed to be the successor,
-# but does not have all features of utf8x yet.
-Encoding utf8x utf8x "Unicode (ucs-extended) (utf8x)" UTF-8 variable inputenc
+# extended utf8 support from the "ucs" package:
+# Larger set of supported characters but conflicts with some packages.
+Encoding utf8x utf8x "Extended [ucs] (utf8x)" UTF-8 variable inputenc
 End
 
 # from http://www.ctan.org/pkg/armtex
@@ -212,7 +212,7 @@ Encoding euc-kr KS "Korean (EUC-KR)" EUC-KR variable CJK
 End
 
 # The CJK package has yet another name for utf8...
-Encoding utf8-cjk UTF8 "Unicode (CJK) (utf8)" UTF-8 variable CJK
+Encoding utf8-cjk UTF8 "Extended [CJK] (Chinese/Japanese/Korean)" UTF-8 variable CJK
 End
 
 # For traditional chinese
@@ -233,13 +233,13 @@ Encoding jis-platex jis "Japanese (pLaTeX) (JIS)" ISO-2022-JP variable japanese
 End
 Encoding shift-jis-platex sjis "Japanese (pLaTeX) (SJIS)" CP932 variable japanese
 End
-Encoding utf8-platex utf8 "Japanese (pLaTeX) (UTF8)" UTF-8 variable japanese
+Encoding utf8-platex utf8 "Extended [pLaTeX] (Japanese)" UTF-8 variable japanese
 End
 
 # A plain utf8 encoding that does not use the inputenc package
 # nor the LyX-added conversions in lib/unicodesymbols.
 # Such an encoding is required for XeTeX and LuaTeX.
-Encoding utf8-plain utf8-plain "Unicode (XeTeX) (utf8)" UTF-8 variable none
+Encoding utf8-plain utf8-plain "Direct" UTF-8 variable none
 End
 
 # Pure 7bit ASCII encoding (partially hardcoded in LyX)