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 5a2d299844d336bff8c25fe3379a6c4fc02f5a7e..9a4ca4f4108016ac873d3f1d20464f463d3048dc 100644 (file)
--- a/src/tex2lyx/tex2lyx.cpp
+++ b/src/tex2lyx/tex2lyx.cpp
@@ -332,6 +332,7 @@ bool checkModule(string const & name, bool command)
 
 bool noweb_mode = false;
 bool pdflatex = false;
+bool xetex = false;
 bool roundtrip = false;
 
 
@@ -354,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;
@@ -639,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.
@@ -677,7 +685,10 @@ void tex2lyx(idocstream & is, ostream & os, string encoding)
                for (; it != end; it++)
                        preamble.addModule(*it);
        }
-       preamble.writeLyXHeader(os);
+       if (!preamble.writeLyXHeader(os, !active_environments.empty())) {
+               cerr << "Could write LyX file header." << endl;
+               return false;
+       }
 
        ss.seekg(0);
        os << ss.str();
@@ -688,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;
 }
 
 
@@ -705,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