mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-13 17:20:55 +00:00
Write fixed encoding to LyX file (bug #9178)
If the user gave the -fixedenc 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:
parent
7b53735bb3
commit
1be2b895d7
@ -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; }
|
||||
|
@ -788,14 +788,6 @@ bool roundtripMode()
|
||||
}
|
||||
|
||||
|
||||
string fixedEncoding()
|
||||
{
|
||||
if (fixed_encoding)
|
||||
return default_encoding;
|
||||
return "";
|
||||
}
|
||||
|
||||
|
||||
namespace {
|
||||
|
||||
/*!
|
||||
@ -1064,6 +1056,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
|
||||
|
@ -102,6 +102,8 @@ What's new
|
||||
|
||||
* TEX2LYX
|
||||
|
||||
- Write fixed encoding to LyX file if -fixedenc was given (bug 9178).
|
||||
|
||||
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user