Don't allow newline characters in document settings.

[lyx.git] / lib / encodings

diff --git a/lib/encodings b/lib/encodings
index 66d571231e45e9eadec807b1dbf4a463607827ce..b0a001baa9610d8528f081f756b0debfa5f05fff 100644 (file)
--- a/lib/encodings
+++ b/lib/encodings
@@ -29,7 +29,7 @@ End
 Encoding iso8859-2 latin2 "Central European (ISO 8859-2)" ISO-8859-2 fixed inputenc
 End
 
-Encoding iso8859-3 latin3 "Middle European (ISO 8859-3)" ISO-8859-3 fixed inputenc
+Encoding iso8859-3 latin3 "South European (ISO 8859-3)" ISO-8859-3 fixed inputenc
 End
 
 Encoding iso8859-4 latin4 "Baltic (ISO 8859-4)" ISO-8859-4 fixed inputenc
@@ -61,6 +61,9 @@ End
 Encoding iso8859-16 latin10 "South-Eastern European (ISO 8859-16)" ISO-8859-16 fixed inputenc
 End
 
+Encoding applemac applemac "Western European (Macintosh Roman)" Macintosh fixed inputenc
+End
+
 Encoding cp437 cp437 "DOS (CP 437)" CP437 fixed inputenc
 End
 
@@ -95,6 +98,7 @@ End
 Encoding cp1251 cp1251 "Cyrillic (CP 1251)" CP1251 fixed inputenc
 End
 
+# "ansinew" is harcoded as a synonym of this (see Encodings::fromLaTeXName)
 Encoding cp1252 cp1252 "Western European (CP 1252)" CP1252 fixed inputenc
 End
 
@@ -171,13 +175,13 @@ End
 
 # encodings that do not use a package
 
-# Traditional Japanese TeX programs require neither CJK nor inputenc
-# package.
-Encoding euc-jp-plain EUC-JP-pLaTeX "Japanese (non-CJK) (EUC-JP)" EUC-JP variable none
+# Traditional Japanese TeX programs require the japanese package.
+# that is incompatible with CJK and inputenc.
+Encoding euc-jp-plain EUC-JP-pLaTeX "Japanese (non-CJK) (EUC-JP)" EUC-JP variable japanese
 End
-Encoding jis-plain JIS-pLaTeX "Japanese (non-CJK) (JIS)" ISO-2022-JP variable none
+Encoding jis-plain JIS-pLaTeX "Japanese (non-CJK) (JIS)" ISO-2022-JP variable japanese
 End
-Encoding shift-jis-plain SJIS-pLaTeX "Japanese (non-CJK) (SJIS)" CP932 variable none
+Encoding shift-jis-plain SJIS-pLaTeX "Japanese (non-CJK) (SJIS)" CP932 variable japanese
 End
 
 # This one needs hardcoded support, since the inputenc package does not know