anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-13 06:20:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Write fixed encoding to LyX file (bug #9178)

Browse Source 
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.
This commit is contained in:
Georg Baum 2014-12-29 22:29:20 +01:00
parent ff9b4a3834
commit cd3b040a70
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tex2lyx/Preamble.h
View File

@ -37,6 +37,8 @@ public:
/// ///
std::string inputencoding() const { return h_inputencoding; } std::string inputencoding() const { return h_inputencoding; }
/// ///
void setInputencoding(std::string const & e) { h_inputencoding = e; }
///
std::string notefontcolor() const { return h_notefontcolor; } std::string notefontcolor() const { return h_notefontcolor; }
/// ///
bool refstyle() const { return h_use_refstyle; } bool refstyle() const { return h_use_refstyle; }

10
src/tex2lyx/tex2lyx.cpp
View File

@ -789,14 +789,6 @@ bool roundtripMode()
} }
string fixedEncoding()
{
if (fixed_encoding)
return default_encoding;
return "";
}
namespace { namespace {
/*! /*!
@ -1065,6 +1057,8 @@ int main(int argc, char * argv[])
if (!enc) if (!enc)
error_message("Unknown LaTeX encoding `" + default_encoding + "'"); error_message("Unknown LaTeX encoding `" + default_encoding + "'");
default_encoding = enc->iconvName(); default_encoding = enc->iconvName();
if (fixed_encoding)
preamble.setInputencoding(enc->name());
} }
// Load the layouts // Load the layouts