do not hardcode packages loaded by external insets

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

diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp
index a999b333c60d17394a72ff82112305f6a1f0ac61..9a4ca4f4108016ac873d3f1d20464f463d3048dc 100644 (file)
--- a/src/tex2lyx/tex2lyx.cpp
+++ b/src/tex2lyx/tex2lyx.cpp
@@ -21,6 +21,7 @@
 #include "LayoutFile.h"
 #include "LayoutModuleList.h"
 #include "ModuleList.h"
+#include "Preamble.h"
 #include "TextClass.h"
 
 #include "support/convert.h"
@@ -149,6 +150,7 @@ CommandMap known_environments;
 CommandMap known_math_environments;
 FullCommandMap possible_textclass_commands;
 FullEnvironmentMap possible_textclass_environments;
+int const LYX_FORMAT = LYX_FORMAT_TEX2LYX;
 
 /// used modules
 LayoutModuleList used_modules;
@@ -330,6 +332,7 @@ bool checkModule(string const & name, bool command)
 
 bool noweb_mode = false;
 bool pdflatex = false;
+bool xetex = false;
 bool roundtrip = false;
 
 
@@ -352,13 +355,20 @@ void read_command(Parser & p, string command, CommandMap & commands)
                        string const arg = p.getArg('{', '}');
                        if (arg == "translate")
                                arguments.push_back(required);
+                       else if (arg == "group")
+                               arguments.push_back(req_group);
                        else if (arg == "item")
                                arguments.push_back(item);
+                       else if (arg == "displaymath")
+                               arguments.push_back(displaymath);
                        else
                                arguments.push_back(verbatim);
                } else {
-                       p.getArg('[', ']');
-                       arguments.push_back(optional);
+                       string const arg = p.getArg('[', ']');
+                       if (arg == "group")
+                               arguments.push_back(opt_group);
+                       else
+                               arguments.push_back(optional);
                }
        }
        commands[command] = arguments;
@@ -637,7 +647,7 @@ namespace {
  *  You must ensure that \p parentFilePath is properly set before calling
  *  this function!
  */
-void tex2lyx(idocstream & is, ostream & os, string encoding)
+bool tex2lyx(idocstream & is, ostream & os, string encoding)
 {
        // Set a sensible default encoding.
        // This is used until an encoding command is found.
@@ -645,18 +655,17 @@ void tex2lyx(idocstream & is, ostream & os, string encoding)
        // since latin1 does not cause an iconv error if the actual encoding
        // is different (bug 7509).
        if (encoding.empty()) {
-               if (h_inputencoding == "auto")
+               if (preamble.inputencoding() == "auto")
                        encoding = "latin1";
                else
-                       encoding = h_inputencoding;
+                       encoding = preamble.inputencoding();
        }
 
        Parser p(is);
        p.setEncoding(encoding);
        //p.dump();
 
-       ostringstream ps;
-       parse_preamble(p, ps, documentclass, textclass);
+       preamble.parse(p, documentclass, textclass);
 
        active_environments.push_back("document");
        Context context(true, textclass);
@@ -670,16 +679,16 @@ void tex2lyx(idocstream & is, ostream & os, string encoding)
        active_environments.pop_back();
 
        // We know the used modules only after parsing the full text
-       ostringstream ms;
        if (!used_modules.empty()) {
-               ms << "\\begin_modules\n";
                LayoutModuleList::const_iterator const end = used_modules.end();
                LayoutModuleList::const_iterator it = used_modules.begin();
                for (; it != end; it++)
-                       ms << *it << '\n';
-               ms << "\\end_modules\n";
+                       preamble.addModule(*it);
+       }
+       if (!preamble.writeLyXHeader(os, !active_environments.empty())) {
+               cerr << "Could write LyX file header." << endl;
+               return false;
        }
-       os << subst(ps.str(), modules_placeholder, ms.str());
 
        ss.seekg(0);
        os << ss.str();
@@ -690,6 +699,7 @@ void tex2lyx(idocstream & is, ostream & os, string encoding)
                parsertest << p.get_token().asInput();
        // <origfile> and parsertest.tex should now have identical content
 #endif
+       return true;
 }
 
 
@@ -707,9 +717,9 @@ bool tex2lyx(FileName const & infilename, ostream & os, string const & encoding)
        }
        string const oldParentFilePath = parentFilePath;
        parentFilePath = onlyPath(infilename.absFileName());
-       tex2lyx(is, os, encoding);
+       bool retval = tex2lyx(is, os, encoding);
        parentFilePath = oldParentFilePath;
-       return true;
+       return retval;
 }
 
 } // anonymous namespace