anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tex2lyx: backport fix for bug #8210

Browse Source
This commit is contained in:
Uwe Stöhr 2012-06-30 03:40:40 +02:00
parent 530c2ca7a3
commit 2eb4a46d0b
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tex2lyx/Preamble.h
View File

@ -39,6 +39,8 @@ public:
/// ///
std::string notefontcolor() const { return h_notefontcolor; } std::string notefontcolor() const { return h_notefontcolor; }
/// ///
std::string language() const { return h_language; }
///
std::string use_indices() const { return h_use_indices; } std::string use_indices() const { return h_use_indices; }
/// ///
bool indentParagraphs() const; bool indentParagraphs() const;

4
src/tex2lyx/tex2lyx.cpp
View File

@ -681,6 +681,10 @@ bool tex2lyx(idocstream & is, ostream & os, string encoding)
active_environments.push_back("document"); active_environments.push_back("document");
Context context(true, textclass); Context context(true, textclass);
stringstream ss; stringstream ss;
// store the document language in the context to be able to handle the
// commands like \foreignlanguage and \textenglish etc.
context.font.language = preamble.language();
// parse the main text
parse_text(p, ss, FLAG_END, true, context); parse_text(p, ss, FLAG_END, true, context);
if (Context::empty) if (Context::empty)
// Empty document body. LyX needs at least one paragraph. // Empty document body. LyX needs at least one paragraph.

1
status.20x
View File

@ -84,6 +84,7 @@ What's new
* TEX2LYX * TEX2LYX
- Fix bug that language change was not recognized (bug 8210).
* ADVANCED FIND AND REPLACE * ADVANCED FIND AND REPLACE