From d1800d4d5a1d26f2a16265eee81cceec435b42d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Wed, 27 Jun 2012 22:48:22 +0200 Subject: [PATCH] tex2lyx: reprivatize another variable --- src/tex2lyx/Preamble.h | 5 +++-- src/tex2lyx/tex2lyx.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/tex2lyx/Preamble.h b/src/tex2lyx/Preamble.h index 585cb25c73..500083df4c 100644 --- a/src/tex2lyx/Preamble.h +++ b/src/tex2lyx/Preamble.h @@ -34,13 +34,13 @@ class Preamble public: Preamble(); - /// - std::string h_language; /// std::string inputencoding() const { return h_inputencoding; } /// std::string notefontcolor() const { return h_notefontcolor; } /// + std::string language() const { return h_language; } + /// std::string use_indices() const { return h_use_indices; } /// bool indentParagraphs() const; @@ -117,6 +117,7 @@ private: std::string h_index_command; std::string h_inputencoding; std::string h_justification; + std::string h_language; std::string h_language_package; std::string h_listings_params; std::string h_maintain_unincluded_children; diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp index b713e4c76d..a7f83c25a3 100644 --- a/src/tex2lyx/tex2lyx.cpp +++ b/src/tex2lyx/tex2lyx.cpp @@ -673,7 +673,7 @@ bool tex2lyx(idocstream & is, ostream & os, string encoding) 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.h_language; + context.font.language = preamble.language(); // parse the main text parse_text(p, ss, FLAG_END, true, context); if (Context::empty)