From 5727cb2d4346c31aad04000f8407bdee21d9e594 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Thu, 28 Jan 2016 20:59:01 +0100 Subject: [PATCH] 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. --- src/tex2lyx/tex2lyx.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp index 5001ad0af5..4ce2512179 100644 --- 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); -- 2.39.2