Set use_non_tex_fonts buffer parameter and default encoding correctly when we detect...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40765 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 21106b19b928f1f3bdd095fbf75955bdcfb3dc93..8b107b838a724c15a40eb8e09904149bed8f0db5 100644 (file)
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -410,6 +410,7 @@ Preamble::Preamble() : one_language(true)
        h_font_sans               = "default";
        h_font_typewriter         = "default";
        h_font_default_family     = "default";
+       h_use_non_tex_fonts       = "false";
        h_font_sc                 = "false";
        h_font_osf                = "false";
        h_font_sf_scale           = "100";
@@ -593,8 +594,12 @@ void Preamble::handle_package(Parser &p, string const & name,
        add_package(name, options);
        string scale;
 
-       if (is_known(name, known_xetex_packages))
+       if (is_known(name, known_xetex_packages)) {
                xetex = true;
+               h_use_non_tex_fonts = "true";
+               if (h_inputencoding == "auto")
+                       p.setEncoding("utf8");
+       }
 
        // roman fonts
        if (is_known(name, known_roman_fonts)) {
@@ -887,6 +892,7 @@ bool Preamble::writeLyXHeader(ostream & os, bool subdoc)
           << "\\font_sans " << h_font_sans << "\n"
           << "\\font_typewriter " << h_font_typewriter << "\n"
           << "\\font_default_family " << h_font_default_family << "\n"
+          << "\\use_non_tex_fonts " << h_use_non_tex_fonts << "\n"
           << "\\font_sc " << h_font_sc << "\n"
           << "\\font_osf " << h_font_osf << "\n"
           << "\\font_sf_scale " << h_font_sf_scale << "\n"

diff --git a/src/tex2lyx/Preamble.h b/src/tex2lyx/Preamble.h
index 59f8f88a156cea0c148ab22893e01887f4afe7eb..5c2d883aab51c5bfbbf191c9c858947198977625 100644 (file)
--- a/src/tex2lyx/Preamble.h
+++ b/src/tex2lyx/Preamble.h
@@ -92,6 +92,7 @@ private:
        std::string h_font_sans;
        std::string h_font_typewriter;
        std::string h_font_default_family;
+       std::string h_use_non_tex_fonts;
        std::string h_font_sc;
        std::string h_font_osf;
        std::string h_font_sf_scale;