commit cd3b040a70d4a3bcff72ebc688d485b48b92b7ee
Author: Georg Baum <[email protected]>
Date: Mon Dec 29 22:29:20 2014 +0100
Write fixed encoding to LyX file (bug #9178)
If the user gave the -fixednec argument to tex2lyx then set that encoding as
LaTeX input encoding in the generated LyX file. Otherwise, included .bib
files
could be interpreted using a wrong encoding.
diff --git a/src/tex2lyx/Preamble.h b/src/tex2lyx/Preamble.h
index 3216c3c..a0e5198 100644
--- a/src/tex2lyx/Preamble.h
+++ b/src/tex2lyx/Preamble.h
@@ -37,6 +37,8 @@ public:
///
std::string inputencoding() const { return h_inputencoding; }
///
+ void setInputencoding(std::string const & e) { h_inputencoding = e; }
+ ///
std::string notefontcolor() const { return h_notefontcolor; }
///
bool refstyle() const { return h_use_refstyle; }
diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp
index 2ef209f..e4c2660 100644
--- a/src/tex2lyx/tex2lyx.cpp
+++ b/src/tex2lyx/tex2lyx.cpp
@@ -789,14 +789,6 @@ bool roundtripMode()
}
-string fixedEncoding()
-{
- if (fixed_encoding)
- return default_encoding;
- return "";
-}
-
-
namespace {
/*!
@@ -1065,6 +1057,8 @@ int main(int argc, char * argv[])
if (!enc)
error_message("Unknown LaTeX encoding `" +
default_encoding + "'");
default_encoding = enc->iconvName();
+ if (fixed_encoding)
+ preamble.setInputencoding(enc->name());
}
// Load the layouts
