Use consistent iconv encoding names

We should stick to the names used in lib/encodings. iconv has many aliases,
but fi we ever compare names it is better to use only one variant.

diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp
index 5001ad0af59b8e44e2b7df21187b0de8186e976c..4ce2512179b6da836746a76ac3de958e7024ca0b 100644 (file)
--- a/src/tex2lyx/tex2lyx.cpp
+++ b/src/tex2lyx/tex2lyx.cpp
@@ -844,12 +844,12 @@ bool tex2lyx(idocstream & is, ostream & os, string encoding,
 {
        // Set a sensible default encoding.
        // This is used until an encoding command is found.
-       // For child documents use the encoding of the master, else ISO8859-1,
-       // (formerly known by its latex name latin1), since ISO8859-1 does not
+       // For child documents use the encoding of the master, else ISO-8859-1,
+       // (formerly known by its latex name latin1), since ISO-8859-1 does not
        // cause an iconv error if the actual encoding is different (bug 7509).
        if (encoding.empty()) {
                if (preamble.inputencoding() == "auto")
-                       encoding = "ISO8859-1";
+                       encoding = "ISO-8859-1";
                else {
                        Encoding const * const enc = encodings.fromLyXName(
                                preamble.inputencoding(), true);