More no-math fonts

[lyx.git] / src / tex2lyx / Preamble.cpp

diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 4dc363b5e1c563cf14d9c05aab19cfdbb3b7ebf7..afa099790419dae3770807ed444ecd35f51cc200 100644 (file)
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -507,14 +507,14 @@ Preamble::Preamble() : one_language(true), title_layout_found(false)
        h_use_geometry            = "false";
        h_use_default_options     = "false";
        h_use_hyperref            = "0";
-       h_use_refstyle            = "1";
+       h_use_refstyle            = "0";
        h_use_packages["amsmath"]    = "1";
-       h_use_packages["amssymb"]    = "1";
+       h_use_packages["amssymb"]    = "0";
        h_use_packages["esint"]      = "1";
-       h_use_packages["mhchem"]     = "1";
-       h_use_packages["mathdots"]   = "1";
-       h_use_packages["mathtools"]  = "1";
-       h_use_packages["undertilde"] = "1";
+       h_use_packages["mhchem"]     = "0";
+       h_use_packages["mathdots"]   = "0";
+       h_use_packages["mathtools"]  = "0";
+       h_use_packages["undertilde"] = "0";
 }
 
 
@@ -759,7 +759,8 @@ void Preamble::handle_package(Parser &p, string const & name,
                have_CJK = true;
                // set the encoding to "auto" because it might be set to "default" by the babel handling
                // and this would not be correct for CJK
-               h_inputencoding = "auto";
+               if (h_inputencoding == "default")
+                       h_inputencoding = "auto";
                registerAutomaticallyLoadedPackage("CJK");
        }