update ImageMagick version in windows installer because I really can not find the...

[lyx.git] / lib / encodings

diff --git a/lib/encodings b/lib/encodings
index 68dce4af552a24a9d70920181f6c51ef975bc5bf..b05138119f6c7df0096b74eca2160066b87906ff 100644 (file)
--- a/lib/encodings
+++ b/lib/encodings
@@ -1,11 +1,21 @@
 # FIXME: Have a look at the encodings known by the inputenc package and add
 # missing ones. Caution: File format change!
 
+# Note that you can only add single byte encodings to this file without
+# changing some C++ code.
+# The only multibyte encoding that is currently supported is utf8, and this
+# support is hardcoded to the iconv name "UTF-8".
+
 # Order of names: LyX name LaTeX name iconv name
 
 Encoding utf8 utf8 UTF-8
 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 UTF-8
+End
+
 Encoding iso8859-1 latin1 ISO-8859-1
 End
 
@@ -109,3 +119,7 @@ End
 
 Encoding pt254 pt254 PT254
 End
+
+# Pure 7bit ASCII encoding (partially hardcoded in LyX)
+Encoding ascii ascii ascii
+End