]> git.lyx.org Git - lyx.git/blobdiff - src/tex2lyx/tex2lyx.C
Fix bug 2667
[lyx.git] / src / tex2lyx / tex2lyx.C
index fd372a63faaeb5f11d35c3c355e857d0b868eb63..09dcf7cbbcf35c7678056ef9b73df038005e3d31 100644 (file)
-/** The .tex to .lyx converter
-    \author André Pönitz (2003)
+/**
+ * \file tex2lyx.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 // {[(
 
 #include <config.h>
 
-#include <algorithm>
+#include "tex2lyx.h"
+#include "context.h"
+
+#include "debug.h"
+#include "lyxtextclass.h"
+
+#include "support/convert.h"
+#include "support/filetools.h"
+#include "support/fs_extras.h"
+#include "support/lstrings.h"
+#include "support/lyxlib.h"
+#include "support/os.h"
+#include "support/package.h"
+
+#include <boost/function.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/path.hpp>
+
 #include <cctype>
 #include <fstream>
 #include <iostream>
-#include <map>
-#include <stack>
 #include <string>
+#include <sstream>
 #include <vector>
+#include <map>
 
-#include "Lsstream.h"
-
-#include "texparser.h"
-
-using std::count_if;
+using std::endl;
 using std::cout;
 using std::cerr;
-using std::endl;
-using std::fill;
 using std::getline;
-using std::ios;
+
 using std::ifstream;
-using std::istream;
+using std::ofstream;
 using std::istringstream;
-using std::map;
-using std::swap;
-using std::ostream;
 using std::ostringstream;
-using std::stack;
+using std::stringstream;
 using std::string;
 using std::vector;
+using std::map;
 
+using lyx::support::changeExtension;
+using lyx::support::isStrUnsignedInt;
+using lyx::support::ltrim;
+using lyx::support::makeAbsPath;
+using lyx::support::onlyPath;
+using lyx::support::rtrim;
+using lyx::support::isFileReadable;
 
-namespace {
-
-struct ColInfo
-{
-       ColInfo() : rightline(false) {}
-       string align;      // column alignment
-       string width;      // column width
-       bool   rightline;  // a line on the right?
-};
-
-
-struct RowInfo
-{
-       RowInfo() : topline(false), bottomline(false) {} 
-       bool topline;     // horizontal line above
-       bool bottomline;  // horizontal line below
-};
-
-
-struct CellInfo
-{
-       CellInfo()
-               : multi(0), leftline(false), rightline(false),
-          topline(false), bottomline(false)
-       {}
-
-       string content;    // cell content
-       int multi;         // multicolumn flag
-       string align;      // cell alignment
-       bool leftline;     // do we have a line on the left?
-       bool rightline;    // do we have a line on the right?
-       bool topline;        // do we have a line above?
-       bool bottomline;   // do we have a line below?
-};
-
-
-void parse_preamble(Parser & p, ostream & os);
-
-void parse(Parser & p, ostream & os, unsigned flags, const mode_type mode,
-const bool outer);
-
-string parse(Parser & p, unsigned flags, const mode_type mode,
-const bool outer)
-{
-       ostringstream os;
-       parse(p, os, flags, mode, outer);
-       return os.str();
-}
-
-int string2int(string const & s, int deflt = 0)
-{
-       istringstream is(s);
-       int i = deflt;
-       is >> i;
-       return i;
-}
-
-string read_hlines(Parser & p)
-{
-       ostringstream os;
-       p.skipSpaces();
-       while (p.good()) {
-               if (p.nextToken().cs() == "hline") {
-                       p.getToken();
-                       os << "\\hline";
-               } else if (p.nextToken().cs() == "cline") {
-                       p.getToken();
-                       os << "\\cline{" << p.verbatimItem() << "}";
-               } else
-                       break;
-               p.skipSpaces();
-       };
-       //cerr << "read_hlines(), read: '" << os.str() << "'\n";
-       //cerr << "read_hlines(), next token: " << p.nextToken() << "\n";
-       return os.str();
-}
-
-
-
-/* rather brutish way to code table structure in a string:
-
-  \begin{tabular}{ccc}
-    1 & 2 & 3\\ \hline
-    \multicolumn{2}{c}{4} & 5 //
-    6 & 7 \\
-  \end{tabular}
-
- gets "translated" to:
-
-  1 TAB 2 TAB 3 LINE
-  \hline HLINE  TAB 5 LINE
-  5 TAB 7 LINE
-*/
-
-char const TAB   = '\001';
-char const LINE  = '\002';
-char const HLINE = '\004';
-
-const char * known_languages[] = { "austrian", "babel", "bahasa", "basque",
-"breton", "british", "bulgarian", "catalan", "croatian", "czech", "danish",
-"dutch", "english", "esperanto", "estonian", "finnish", "francais",
-"frenchb", "galician", "german", "germanb", "greek", "hebcal", "hebfont",
-"hebrew", "hebrew_newcode", "hebrew_oldcode", "hebrew_p", "hyphen",
-"icelandic", "irish", "italian", "latin", "lgrcmr", "lgrcmro", "lgrcmss",
-"lgrcmtt", "lgrenc", "lgrlcmss", "lgrlcmtt", "lheclas", "lhecmr",
-"lhecmss", "lhecmtt", "lhecrml", "lheenc", "lhefr", "lheredis", "lheshold",
-"lheshscr", "lheshstk", "lsorbian", "magyar", "naustrian", "ngermanb",
-"ngerman", "norsk", "polish", "portuges", "rlbabel", "romanian",
-"russianb", "samin", "scottish", "serbian", "slovak", "slovene", "spanish",
-"swedish", "turkish", "ukraineb", "usorbian", "welsh", 0};
-
-char const * known_fontsizes[] = { "10pt", "11pt", "12pt", 0 };
-
-char const * known_headings[] = { "caption", "title", "author", "date",
-"paragraph", "chapter", "section", "subsection", "subsubsection", 0 };
-
-char const * known_math_envs[] = { "equation", "equation*",
-"eqnarray", "eqnarray*", "align", "align*", 0};
-
-char const * known_latex_commands[] = { "ref", "cite", "label", "index",
-"printindex", "pageref", "url", 0 };
-
-// LaTeX names for quotes
-char const * known_quotes[] = { "glqq", "grqq", "quotedblbase",
-"textquotedblleft", 0};
-
-// the same as known_quotes with .lyx names
-char const * known_coded_quotes[] = { "gld", "grd", "gld", "grd", 0};
-
-
-
-// some ugly stuff
-ostringstream h_preamble;
-string h_textclass               = "article";
-string h_options                 = "";
-string h_language                = "english";
-string h_inputencoding           = "latin1";
-string h_fontscheme              = "default";
-string h_graphics                = "default";
-string h_paperfontsize           = "default";
-string h_spacing                 = "single";
-string h_papersize               = "default";
-string h_paperpackage            = "default";
-string h_use_geometry            = "0";
-string h_use_amsmath             = "0";
-string h_use_natbib              = "0";
-string h_use_numerical_citations = "0";
-string h_paperorientation        = "portrait";
-string h_secnumdepth             = "3";
-string h_tocdepth                = "3";
-string h_paragraph_separation    = "indent";
-string h_defskip                 = "medskip";
-string h_quotes_language         = "english";
-string h_quotes_times            = "2";
-string h_papercolumns            = "1";
-string h_papersides              = "1";
-string h_paperpagestyle          = "default";
-string h_tracking_changes        = "0";
-
-// current stack of nested environments
-stack<string> active_environments;
+namespace fs = boost::filesystem;
 
 
-string cap(string s)
-{
-       if (s.size())
-               s[0] = toupper(s[0]);
-       return s;
-}
+// Hacks to allow the thing to link in the lyxlayout stuff
+LyXErr lyxerr(std::cerr.rdbuf());
 
 
-string const trim(string const & a, char const * p = " \t\n\r")
+string const trim(string const & a, char const * p)
 {
-       // lyx::Assert(p);
+       // BOOST_ASSERT(p);
 
        if (a.empty() || !*p)
                return a;
@@ -227,7 +85,7 @@ string const trim(string const & a, char const * p = " \t\n\r")
 }
 
 
-void split(string const & s, vector<string> & result, char delim = ',')
+void split(string const & s, vector<string> & result, char delim)
 {
        //cerr << "split 1: '" << s << "'\n";
        istringstream is(s);
@@ -238,22 +96,6 @@ void split(string const & s, vector<string> & result, char delim = ',')
 }
 
 
-// splits "x=z, y=b" into a map
-map<string, string> split_map(string const & s)
-{
-       map<string, string> res;
-       vector<string> v;
-       split(s, v);
-       for (size_t i = 0; i < v.size(); ++i) {
-               size_t const pos   = v[i].find('=');
-               string const index = v[i].substr(0, pos);
-               string const value = v[i].substr(pos + 1, string::npos);
-               res[trim(index)] = trim(value);
-       }
-       return res;
-}
-
-
 string join(vector<string> const & input, char const * delim)
 {
        ostringstream os;
@@ -266,7 +108,7 @@ string join(vector<string> const & input, char const * delim)
 }
 
 
-char const ** is_known(string const & str, char const ** what)
+char const * const * is_known(string const & str, char const * const * what)
 {
        for ( ; *what; ++what)
                if (str == *what)
@@ -275,1208 +117,418 @@ char const ** is_known(string const & str, char const ** what)
 }
 
 
-void handle_opt(vector<string> & opts, char const ** what, string & target)
-{
-       if (opts.empty())
-               return;
-
-       for ( ; *what; ++what) {
-               vector<string>::iterator it = find(opts.begin(), opts.end(), *what);
-               if (it != opts.end()) {
-                       //cerr << "### found option '" << *what << "'\n";
-                       target = *what;
-                       opts.erase(it);
-                       return;
-               }
-       }
-}
-
-
-bool is_math_env(string const & name)
-{
-       for (char const ** what = known_math_envs; *what; ++what)
-               if (*what == name)
-                       return true;
-       return false;
-}
-
-
-void begin_inset(ostream & os, string const & name)
-{
-       os << "\n\\begin_inset " << name;
-}
-
-
-void end_inset(ostream & os)
-{
-       os << "\n\\end_inset\n\n";
-}
-
-
-string curr_env()
-{
-       return active_environments.empty() ? string() : active_environments.top();
-}
-
 
-void handle_ert(ostream & os, string const & s)
-{
-       begin_inset(os, "ERT");
-       os << "\nstatus Collapsed\n\n\\layout Standard\n\n";
-       for (string::const_iterator it = s.begin(), et = s.end(); it != et; ++it) {
-               if (*it == '\\')
-                       os << "\n\\backslash\n";
-               else
-                       os << *it;
-       }
-       end_inset(os);
-}
+// current stack of nested environments
+vector<string> active_environments;
 
 
-void handle_par(ostream & os)
+string active_environment()
 {
-       if (active_environments.empty())
-               return;
-       os << "\n\\layout ";
-       string s = curr_env();
-       if (s == "document" || s == "table")
-               os << "Standard\n\n";
-       else if (s == "lyxcode")
-               os << "LyX-Code\n\n";
-       else if (s == "lyxlist")
-               os << "List\n\n";
-       else if (s == "thebibliography")
-               os << "Bibliography\n\n";
-       else
-               os << cap(s) << "\n\n";
+       return active_environments.empty() ? string() : active_environments.back();
 }
 
 
-void handle_package(string const & name, string const & options)
-{
-       //cerr << "handle_package: '" << name << "'\n";
-       if (name == "a4wide") {
-               h_papersize = "a4paper";
-               h_paperpackage = "widemarginsa4";
-       } else if (name == "ae")
-               h_fontscheme = "ae";
-       else if (name == "aecompl")
-               h_fontscheme = "ae";
-       else if (name == "amsmath")
-               h_use_amsmath = "1";
-       else if (name == "amssymb")
-               h_use_amsmath = "1";
-       else if (name == "babel")
-               ; // ignore this
-       else if (name == "fontenc")
-               ; // ignore this
-       else if (name == "inputenc")
-               h_inputencoding = options;
-       else if (name == "makeidx")
-               ; // ignore this
-       else if (name == "verbatim")
-               ; // ignore this
-       else if (is_known(name, known_languages)) {
-               h_language = name;
-               h_quotes_language = name;
-       } else {
-               if (options.size())
-                       h_preamble << "\\usepackage[" << options << "]{" << name << "}\n";
-               else
-                       h_preamble << "\\usepackage{" << name << "}\n";
-       }
-}
+CommandMap known_commands;
+CommandMap known_environments;
+CommandMap known_math_environments;
 
 
-bool handle_colalign(Parser & p, vector<ColInfo> & colinfo)
+void add_known_command(string const & command, string const & o1,
+                      bool o2)
 {
-       if (p.getToken().cat() != catBegin)
-               cerr << "wrong syntax for table column alignment. '{' expected\n";
-
-       string nextalign = "block";
-       bool leftline = false;
-       for (Token t = p.getToken(); p.good() && t.cat() != catEnd; t = p.getToken()){
-#ifdef FILEDEBUG
-               cerr << "t: " << t << "  c: '" << t.character() << "'\n";
-#endif
-
-               switch (t.character()) {
-                       case 'c':
-                               colinfo.push_back(ColInfo());
-                               colinfo.back().align = "center";
-                               break;
-                       case 'l':
-                               colinfo.push_back(ColInfo());
-                               colinfo.back().align = "left";
-                               break;
-                       case 'r':
-                               colinfo.push_back(ColInfo());
-                               colinfo.back().align = "right";
-                               break;
-                       case 'p':
-                               colinfo.push_back(ColInfo());
-                               colinfo.back().align = nextalign;
-                               colinfo.back().width = p.verbatimItem();
-                               nextalign = "block";
-                               break;
-                       case '|':
-                               if (colinfo.empty())
-                                       leftline = true;
-                               else
-                                       colinfo.back().rightline = true;
-                               break;
-                       case '>': {
-                               string s = p.verbatimItem();
-                               if (s == "\\raggedleft ")
-                                       nextalign = "left";
-                               else if (s == "\\raggedright ")
-                                       nextalign = "right";
-                               else
-                                       cerr << "unknown '>' column '" << s << "'\n";
-                               break;
-                       }
-                       default:
-                               cerr << "ignoring special separator '" << t << "'\n";
-                               break;
-                       }
+       // We have to handle the following cases:
+       // definition                      o1    o2    invocation result
+       // \newcommand{\foo}{bar}          ""    false \foo       bar
+       // \newcommand{\foo}[1]{bar #1}    "[1]" false \foo{x}    bar x
+       // \newcommand{\foo}[1][]{bar #1}  "[1]" true  \foo       bar
+       // \newcommand{\foo}[1][]{bar #1}  "[1]" true  \foo[x]    bar x
+       // \newcommand{\foo}[1][x]{bar #1} "[1]" true  \foo[x]    bar x
+       unsigned int nargs = 0;
+       vector<ArgumentType> arguments;
+       string const opt1 = rtrim(ltrim(o1, "["), "]");
+       if (isStrUnsignedInt(opt1)) {
+               // The command has arguments
+               nargs = convert<unsigned int>(opt1);
+               if (nargs > 0 && o2) {
+                       // The first argument is optional
+                       arguments.push_back(optional);
+                       --nargs;
+               }
        }
-       return leftline;
+       for (unsigned int i = 0; i < nargs; ++i)
+               arguments.push_back(required);
+       known_commands[command] = arguments;
 }
 
 
+namespace {
 
-void handle_tabular(Parser & p, ostream & os, mode_type mode)
-{
-       begin_inset(os, "Tabular \n");
-       string posopts = p.getOpt();
-       if (posopts.size())
-               cerr << "vertical tabular positioning '" << posopts << "' ignored\n";
-
-       vector<ColInfo>            colinfo;
-
-       // handle column formatting
-       bool leftline = handle_colalign(p, colinfo);
-
-       // handle initial hlines
-
-       // first scan of cells
-       // use table mode to keep it minimal-invasive
-       // not exactly what's TeX doing...
-       vector<string> lines;
-       ostringstream ss;
-       ss << read_hlines(p) << HLINE; // handle initial hlines
-       parse(p, ss, FLAG_END, TABLE_MODE, false);
-       split(ss.str(), lines, LINE);
-
-       vector< vector<CellInfo> > cellinfo(lines.size());
-       vector<RowInfo> rowinfo(lines.size());
-       
-       // split into rows
-       //cerr << "// split into rows\n";
-       for (size_t row = 0; row < rowinfo.size(); ++row) {
-
-               // init row
-               vector<CellInfo> & cellinfos = cellinfo[row];
-               cellinfos.resize(colinfo.size());
-
-               // split row    
-               vector<string> dummy;
-               //cerr << "\n########### LINE: " << lines[row] << "########\n";
-               split(lines[row], dummy, HLINE);
-
-               // handle horizontal line fragments
-               if (dummy.size() != 3) {
-                       if (dummy.size() != 1)
-                               cerr << "unexpected dummy size: " << dummy.size()
-                                       << " content: " << lines[row] << "\n";
-                       dummy.resize(3);
-               }
-               lines[row] = dummy[1];
-
-               //cerr << "line: " << row << " above 0: " << dummy[0] << "\n";
-               //cerr << "line: " << row << " below 2: " << dummy[2] <<  "\n";
-               //cerr << "line: " << row << " cells 1: " << dummy[1] <<  "\n";
-
-               for (int i = 0; i <= 2; i += 2) {       
-                       //cerr << "   reading from line string '" << dummy[i] << "'\n";
-                       Parser p1(dummy[i]);
-                       while (p1.good()) {
-                               Token t = p1.getToken();
-                               //cerr << "read token: " << t << "\n";
-                               if (t.cs() == "hline") {
-                                       if (i == 0) {
-                                               rowinfo[row].topline = true;
-                                               for (size_t col = 0; col < colinfo.size(); ++col)
-                                                       cellinfos[col].topline = true;
-                                       } else {
-                                               rowinfo[row].bottomline = true;
-                                               for (size_t col = 0; col < colinfo.size(); ++col)
-                                                       cellinfos[col].bottomline = true;
-                                       }
-                               } else if (t.cs() == "cline") {
-                                       string arg = p1.verbatimItem();
-                                       //cerr << "read cline arg: '" << arg << "'\n";
-                                       vector<string> t;
-                                       split(arg, t, '-');
-                                       t.resize(2);
-                                       size_t from = string2int(t[0]);
-                                       size_t to = string2int(t[1]);
-                                       for (size_t col = from; col < to; ++col) {
-                                               if (i == 0) 
-                                                       cellinfos[col].topline = true;
-                                               else    
-                                                       cellinfos[col].bottomline = true;
-                                       }
-                               } else {
-                                       cerr << "unexpected line token: " << t << endl;
-                               }
-                       }
-               }
-
-               // split into cells
-               vector<string> cells;
-               split(lines[row], cells, TAB);
-               for (size_t col = 0, cell = 0; cell < cells.size() && col < colinfo.size(); ++col, ++cell) {
-                       //cerr << "cell content: " << cells[cell] << "\n";
-                       Parser p(cells[cell]);
-                       p.skipSpaces(); 
-                       //cerr << "handling cell: " << p.nextToken().cs() << " '" <<
-                       //cells[cell] << "'\n";
-                       if (p.nextToken().cs() == "multicolumn") {
-                               // how many cells?
-                               p.getToken();
-                               size_t ncells = string2int(p.verbatimItem());
-
-                               // special cell properties alignment    
-                               vector<ColInfo> t;
-                               bool leftline = handle_colalign(p, t);
-                               CellInfo & ci = cellinfos[col];
-                               ci.multi     = 1;
-                               ci.align     = t.front().align;
-                               ci.content   = parse(p, FLAG_ITEM, mode, false);
-                               ci.leftline  = leftline;
-                               ci.rightline = t.front().rightline;
-
-                               // add dummy cells for multicol
-                               for (size_t i = 0; i < ncells - 1 && col < colinfo.size(); ++i) {
-                                       ++col;
-                                       cellinfos[col].multi = 2;
-                                       cellinfos[col].align = "center";
-                               }
-                       } else {
-                               cellinfos[col].content = parse(p, FLAG_ITEM, mode, false);
-                       }
-               }
-
-               cellinfo.push_back(cellinfos);
-
-               //cerr << "//  handle almost empty last row what we have\n";
-               // handle almost empty last row
-               if (row && lines[row].empty() && row + 1 == rowinfo.size()) {
-                       //cerr << "remove empty last line\n";
-                       if (rowinfo[row].topline);
-                               rowinfo[row - 1].bottomline = true;
-                       for (size_t col = 0; col < colinfo.size(); ++col)
-                               if (cellinfo[row][col].topline)
-                                       cellinfo[row - 1][col].bottomline = true;
-                       rowinfo.pop_back();
-               }
 
+/*!
+ * Read one command definition from the syntax file
+ */
+void read_command(Parser & p, string command, CommandMap & commands) {
+       if (p.next_token().asInput() == "*") {
+               p.get_token();
+               command += '*';
        }
-
-       //cerr << "// output what we have\n";
-       // output what we have
-       os << "<lyxtabular version=\"3\" rows=\"" << rowinfo.size()
-                << "\" columns=\"" << colinfo.size() << "\">\n"
-                << "<features>\n";
-
-       //cerr << "// after header\n";
-       for (size_t col = 0; col < colinfo.size(); ++col) {
-               os << "<column alignment=\"" << colinfo[col].align << "\"";
-               if (colinfo[col].rightline)
-                       os << " rightline=\"true\"";
-               if (col == 0 && leftline)
-                       os << " leftline=\"true\"";
-               os << " valignment=\"top\"";
-               os << " width=\"" << colinfo[col].width << "\"";
-               os << ">\n";
-       }
-       //cerr << "// after cols\n";
-
-       for (size_t row = 0; row < rowinfo.size(); ++row) {
-               os << "<row";
-               if (rowinfo[row].topline)
-                       os << " topline=\"true\"";
-               if (rowinfo[row].bottomline)
-                       os << " bottomline=\"true\"";
-               os << ">\n";
-               for (size_t col = 0; col < colinfo.size(); ++col) {
-                       CellInfo const & cell = cellinfo[row][col];
-                       os << "<cell";
-                       if (cell.multi)
-                               os << " multicolumn=\"" << cell.multi << "\"";
-                       if (cell.leftline)
-                               os << " leftline=\"true\"";
-                       if (cell.rightline)
-                               os << " rightline=\"true\"";
-                       if (cell.topline)
-                               os << " topline=\"true\"";
-                       if (cell.bottomline)
-                               os << " bottomline=\"true\"";
-                       os << " alignment=\"" << cell.align << "\""
-                                << " valignment=\"top\""
-                                << " usebox=\"none\""
-                                << ">";
-                       begin_inset(os, "Text");
-                       os << "\n\n\\layout Standard\n\n";
-                       os << cell.content;
-                       end_inset(os);
-                       os << "</cell>\n";
+       vector<ArgumentType> arguments;
+       while (p.next_token().cat() == catBegin ||
+              p.next_token().asInput() == "[") {
+               if (p.next_token().cat() == catBegin) {
+                       string const arg = p.getArg('{', '}');
+                       if (arg == "translate")
+                               arguments.push_back(required);
+                       else
+                               arguments.push_back(verbatim);
+               } else {
+                       p.getArg('[', ']');
+                       arguments.push_back(optional);
                }
-               os << "</row>\n";
        }
-                       
-       os << "</lyxtabular>\n";
-       end_inset(os);
-}
-
-
-void end_preamble(ostream & os)
-{
-       os << "# tex2lyx 0.0.2 created this file\n"
-          << "\\lyxformat 222\n"
-          << "\\textclass " << h_textclass << "\n"
-          << "\\begin_preamble\n" << h_preamble.str() << "\n\\end_preamble\n"
-          << "\\options " << h_options << "\n"
-          << "\\language " << h_language << "\n"
-          << "\\inputencoding " << h_inputencoding << "\n"
-          << "\\fontscheme " << h_fontscheme << "\n"
-          << "\\graphics " << h_graphics << "\n"
-          << "\\paperfontsize " << h_paperfontsize << "\n"
-          << "\\spacing " << h_spacing << "\n"
-          << "\\papersize " << h_papersize << "\n"
-          << "\\paperpackage " << h_paperpackage << "\n"
-          << "\\use_geometry " << h_use_geometry << "\n"
-          << "\\use_amsmath " << h_use_amsmath << "\n"
-          << "\\use_natbib " << h_use_natbib << "\n"
-          << "\\use_numerical_citations " << h_use_numerical_citations << "\n"
-          << "\\paperorientation " << h_paperorientation << "\n"
-          << "\\secnumdepth " << h_secnumdepth << "\n"
-          << "\\tocdepth " << h_tocdepth << "\n"
-          << "\\paragraph_separation " << h_paragraph_separation << "\n"
-          << "\\defskip " << h_defskip << "\n"
-          << "\\quotes_language " << h_quotes_language << "\n"
-          << "\\quotes_times " << h_quotes_times << "\n"
-          << "\\papercolumns " << h_papercolumns << "\n"
-          << "\\papersides " << h_papersides << "\n"
-          << "\\paperpagestyle " << h_paperpagestyle << "\n"
-          << "\\tracking_changes " << h_tracking_changes << "\n";
+       commands[command] = arguments;
 }
 
 
-void parse_preamble(Parser & p, ostream & os)
+/*!
+ * Read a class of environments from the syntax file
+ */
+void read_environment(Parser & p, string const & begin,
+                     CommandMap & environments)
 {
+       string environment;
        while (p.good()) {
-               Token const & t = p.getToken();
-
-#ifdef FILEDEBUG
-               cerr << "t: " << t << " flags: " << flags << "\n";
-               //cell->dump();
-#endif
-
-               //
-               // cat codes
-               //
-               if (t.cat() == catLetter ||
-                         t.cat() == catSpace ||
-                         t.cat() == catSuper ||
-                         t.cat() == catSub ||
-                         t.cat() == catOther ||
-                         t.cat() == catMath ||
-                         t.cat() == catActive ||
-                         t.cat() == catBegin ||
-                         t.cat() == catEnd ||
-                         t.cat() == catAlign ||
-                         t.cat() == catNewline ||
-                         t.cat() == catParameter)
-               h_preamble << t.character();
-
-               else if (t.cat() == catComment) {
-                       string s;
-                       while (p.good()) {
-                               Token const & t = p.getToken();
-                               if (t.cat() == catNewline)
-                                       break;
-                               s += t.asString();
-                       }
-                       //cerr << "comment\n";
-                       p.skipSpaces();
-               }
-
-               else if (t.cs() == "pagestyle")
-                       h_paperpagestyle == p.verbatimItem();
-
-               else if (t.cs() == "makeatletter") {
-                       p.setCatCode('@', catLetter);
-                       h_preamble << "\\makeatletter\n";
-               }
-
-               else if (t.cs() == "makeatother") {
-                       p.setCatCode('@', catOther);
-                       h_preamble << "\\makeatother\n";
-               }
-
-               else if (t.cs() == "newcommand" || t.cs() == "renewcommand"
-                           || t.cs() == "providecommand") {
-                       bool star = false;
-                       if (p.nextToken().character() == '*') {
-                               p.getToken();
-                               star = true;
-                       }
-                       string const name = p.verbatimItem();
-                       string const opts = p.getOpt();
-                       string const body = p.verbatimItem();
-                       // only non-lyxspecific stuff
-                       if (name != "\\noun "
-                                 && name != "\\tabularnewline "
-                           && name != "\\LyX "
-                                 && name != "\\lyxline "
-                                 && name != "\\lyxaddress "
-                                 && name != "\\lyxrightaddress "
-                                 && name != "\\boldsymbol "
-                                 && name != "\\lyxarrow ") {
-                               ostringstream ss;
-                               ss << '\\' << t.cs();
-                               if (star)
-                                       ss << '*';
-                               ss << '{' << name << '}' << opts << '{' << body << "}\n";
-                               h_preamble << ss.str();
-/*
-                               ostream & out = in_preamble ? h_preamble : os;
-                               out << "\\" << t.cs() << "{" << name << "}"
-                                   << opts << "{" << body << "}\n";
-                               if (!in_preamble)
-                                       end_inset(os);
-*/
-                       }
-               }
-
-               else if (t.cs() == "documentclass") {
-                       vector<string> opts;
-                       split(p.getArg('[', ']'), opts, ',');
-                       handle_opt(opts, known_languages, h_language);
-                       handle_opt(opts, known_fontsizes, h_paperfontsize);
-                       h_quotes_language = h_language;
-                       h_options = join(opts, ",");
-                       h_textclass = p.getArg('{', '}');
-               }
-
-               else if (t.cs() == "usepackage") {
-                       string const options = p.getArg('[', ']');
-                       string const name = p.getArg('{', '}');
-                       if (options.empty() && name.find(',')) {
-                               vector<string> vecnames;
-                               split(name, vecnames, ',');
-                               vector<string>::const_iterator it  = vecnames.begin();
-                               vector<string>::const_iterator end = vecnames.end();
-                               for (; it != end; ++it)
-                                       handle_package(trim(*it), string());
-                       } else {
-                               handle_package(name, options);
-                       }
-               }
-
-               else if (t.cs() == "newenvironment") {
-                       string const name = p.getArg('{', '}');
-                       ostringstream ss;
-                       ss << "\\newenvironment{" << name << "}";
-                       ss << p.getOpt();
-                       ss << p.getOpt();
-                       ss << '{' << p.verbatimItem() << '}';
-                       ss << '{' << p.verbatimItem() << '}';
-                       ss << '\n';
-                       if (name != "lyxcode" && name != "lyxlist"
-                                       && name != "lyxrightadress" && name != "lyxaddress")
-                               h_preamble << ss.str();
-               }
-
-               else if (t.cs() == "def") {
-                       string name = p.getToken().cs();
-                       while (p.nextToken().cat() != catBegin)
-                               name += p.getToken().asString();
-                       h_preamble << "\\def\\" << name << '{' << p.verbatimItem() << "}\n";
-               }
-
-               else if (t.cs() == "setcounter") {
-                       string const name = p.getArg('{', '}');
-                       string const content = p.getArg('{', '}');
-                       if (name == "secnumdepth")
-                               h_secnumdepth = content;
-                       else if (name == "tocdepth")
-                               h_tocdepth = content;
-                       else
-                               h_preamble << "\\setcounter{" << name << "}{" << content << "}\n";
-               }
-
-               else if (t.cs() == "setlength") {
-                       string const name = p.verbatimItem();
-                       string const content = p.verbatimItem();
-                       if (name == "parskip")
-                               h_paragraph_separation = "skip";
-                       else if (name == "parindent")
-                               h_paragraph_separation = "skip";
-                       else
-                               h_preamble << "\\setlength{" + name + "}{" + content + "}\n";
-               }
-
-               else if (t.cs() == "par")
-                       h_preamble << '\n';
-
-               else if (t.cs() == "begin") {
-                       string const name = p.getArg('{', '}');
-                       if (name == "document") {
-                               end_preamble(os);
-                               os << "\n\n\\layout Standard\n\n";
+               Token const & t = p.get_token();
+               if (t.cat() == catLetter)
+                       environment += t.asInput();
+               else if (!environment.empty()) {
+                       p.putback();
+                       read_command(p, environment, environments);
+                       environment.erase();
+               }
+               if (t.cat() == catEscape && t.asInput() == "\\end") {
+                       string const end = p.getArg('{', '}');
+                       if (end == begin)
                                return;
-                       }
-                       h_preamble << "\\begin{" << name << "}";
                }
-
-               else if (t.cs().size())
-                       h_preamble << '\\' << t.cs() << ' ';
        }
 }
 
 
-void parse(Parser & p, ostream & os, unsigned flags, const mode_type mode,
-bool outer)
+/*!
+ * Read a list of TeX commands from a reLyX compatible syntax file.
+ * Since this list is used after all commands that have a LyX counterpart
+ * are handled, it does not matter that the "syntax.default" file
+ * has almost all of them listed. For the same reason the reLyX-specific
+ * reLyXre environment is ignored.
+ */
+void read_syntaxfile(string const & file_name)
 {
-       string hlines;
-
+       ifstream is(file_name.c_str());
+       if (!is.good()) {
+               cerr << "Could not open syntax file \"" << file_name
+                    << "\" for reading." << endl;
+               exit(2);
+       }
+       // We can use our TeX parser, since the syntax of the layout file is
+       // modeled after TeX.
+       // Unknown tokens are just silently ignored, this helps us to skip some
+       // reLyX specific things.
+       Parser p(is);
        while (p.good()) {
-               Token const & t = p.getToken();
-
-#ifdef FILEDEBUG
-               cerr << "t: " << t << " flags: " << flags << "\n";
-#endif
-
-               if (flags & FLAG_ITEM) {
-                       if (t.cat() == catSpace)
-                               continue;
-
-                       flags &= ~FLAG_ITEM;
-                       if (t.cat() == catBegin) {
-                               // skip the brace and collect everything to the next matching
-                               // closing brace
-                               flags |= FLAG_BRACE_LAST;
-                               continue;
-                       }
-
-                       // handle only this single token, leave the loop if done
-                       flags |= FLAG_LEAVE;
-               }
-
-
-               //
-               // cat codes
-               //
-               if (t.cat() == catMath) {
-                       if (mode == TEXT_MODE || mode == MATHTEXT_MODE) {
-                               // we are inside some text mode thingy, so opening new math is allowed
-                               if (mode == TEXT_MODE)
-                                       begin_inset(os, "Formula ");
-                               Token const & n = p.getToken();
-                               if (n.cat() == catMath && outer) {
-                                       // TeX's $$...$$ syntax for displayed math
-                                       os << "\\[";
-                                       parse(p, os, FLAG_SIMPLE, MATH_MODE, outer);
-                                       os << "\\]";
-                                       p.getToken(); // skip the second '$' token
-                               } else {
-                                       // simple $...$  stuff
-                                       p.putback();
-                                       os << '$';
-                                       parse(p, os, FLAG_SIMPLE, MATH_MODE, outer);
-                                       os << '$';
-                               }
-                               if (mode == TEXT_MODE)
-                                       end_inset(os);
-                       }
-
-                       else if (mode == TABLE_MODE) {
-                               os << '$';
-                       }
-
-                       else if (flags & FLAG_SIMPLE) {
-                               // this is the end of the formula
-                               return;
-                       }
-
-                       else {
-                               cerr << "\nmode: " << mode << endl;
-                               p.error("something strange in the parser\n");
-                               break;
-                       }
-               }
-
-               else if (t.cat() == catLetter ||
-                              t.cat() == catSpace ||
-                              t.cat() == catSuper ||
-                              t.cat() == catSub ||
-                              t.cat() == catOther ||
-                              t.cat() == catParameter)
-                       os << t.character();
-
-               else if (t.cat() == catNewline) {
-                       if (p.nextToken().cat() == catNewline) {
-                               p.getToken();
-                               handle_par(os);
-                       } else {
-                               os << "\n "; // note the space
-                       }
-               }
-
-               else if (t.cat() == catActive) {
-                       if (t.character() == '~') {
-                               if (curr_env() == "lyxcode")
-                                       os << ' ';
-                               else if (mode == TEXT_MODE)
-                                       os << "\\SpecialChar ~\n";
-                               else
-                                       os << '~';
-                       } else
-                               os << t.character();
-               }
-
-               else if (t.cat() == catBegin) {
-                       if (mode == TEXT_MODE) {
-                               handle_ert(os, "{");
-                               parse(p, os, FLAG_BRACE_LAST, mode, outer);
-                               handle_ert(os, "}");
-                       } else {
-                               os << '{';
-                       }
-               }
-
-               else if (t.cat() == catEnd) {
-                       if (flags & FLAG_BRACE_LAST)
-                               return;
-                       if (mode == TEXT_MODE)
-                               handle_ert(os, "}");
-                       else
-                               os << '}';
-               }
-
-               else if (t.cat() == catAlign) {
-                       if (mode == TABLE_MODE)
-                               os << TAB;
-                       else
-                               os << t.character();
-               }
-
-               else if (t.cs() == "tabularnewline") {
-                       if (mode == TABLE_MODE) {
-                               // stuff before the line break
-                               // and look ahead for stuff after the line break
-                               os << HLINE << hlines << HLINE << LINE << read_hlines(p) << HLINE;
-                               hlines.clear();
-                       } else {
-                               os << t.asInput();
-                       }
-               }
-
-               else if (t.cs() == "\\" && mode == MATH_MODE)
-                       os << t.asInput();
-
-               else if (t.cs() == "\\" && mode == TEXT_MODE && curr_env() == "tabular")
-                       os << LINE;
-
-               else if (t.cat() == catOther)
-                       os << string(1, t.character());
-
-               else if (t.cat() == catComment) {
-                       string s;
-                       while (p.good()) {
-                               Token const & t = p.getToken();
-                               if (t.cat() == catNewline)
-                                       break;
-                               s += t.asString();
-                       }
-                       //cerr << "comment\n";
-                       p.skipSpaces();
-               }
-
-               //
-               // control sequences
-               //
-
-               else if (t.cs() == "ldots" && mode == MATH_MODE)
-                       os << "\n\\SpecialChar \\ldots{}\n";
-
-               else if (t.cs() == "lyxlock")
-                       ; // ignored
-
-               else if (t.cs() == "makeatletter") {
-                       p.setCatCode('@', catLetter);
-                       handle_ert(os, "\\makeatletter\n");
-               }
-
-               else if (t.cs() == "makeatother") {
-                       p.setCatCode('@', catOther);
-                       handle_ert(os, "\\makeatother\n");
-               }
-
-               else if (t.cs() == "newcommand" || t.cs() == "renewcommand"
-                           || t.cs() == "providecommand") {
-                       string const name = p.verbatimItem();
-                       string const opts = p.getOpt();
-                       string const body = p.verbatimItem();
-                       // only non-lyxspecific stuff
-                       if (name != "\\noun " && name != "\\tabularnewline ") {
-                               ostringstream ss;
-                               ss << '\\' << t.cs() << '{' << name << '}'
-                                       << opts << '{' << body << "}\n";
-                               handle_ert(os, ss.str());
-/*
-                               ostream & out = in_preamble ? h_preamble : os;
-                               if (!in_preamble)
-                                       begin_inset(os, "FormulaMacro\n");
-                               out << "\\" << t.cs() << "{" << name << "}"
-                                   << opts << "{" << body << "}\n";
-                               if (!in_preamble)
-                                       end_inset(os);
-*/
-                       }
-               }
-
-               else if (t.cs() == "newtheorem") {
-                       ostringstream ss;
-                       ss << "\\newtheorem";
-                       ss << '{' << p.verbatimItem() << '}';
-                       ss << p.getOpt();
-                       ss << '{' << p.verbatimItem() << '}';
-                       ss << p.getOpt();
-                       ss << '\n';
-                       handle_ert(os, ss.str());
-               }
-
-               else if (t.cs() == "(") {
-                       begin_inset(os, "Formula");
-                       os << " \\(";
-                       parse(p, os, FLAG_SIMPLE2, MATH_MODE, outer);
-                       os << "\\)";
-                       end_inset(os);
-               }
-
-               else if (t.cs() == "[" && mode == TEXT_MODE) {
-                       begin_inset(os, "Formula");
-                       os << " \\[";
-                       parse(p, os, FLAG_EQUATION, MATH_MODE, outer);
-                       os << "\\]";
-                       end_inset(os);
-               }
-
-               else if (t.cs() == "protect")
-                       // ignore \\protect, will hopefully be re-added during output
-                       ;
-
-               else if (t.cs() == "begin") {
-                       string const name = p.getArg('{', '}');
-                       active_environments.push(name);
-                       if (name == "abstract") {
-                               handle_par(os);
-                               parse(p, os, FLAG_END, mode, outer);
-                       } else if (is_math_env(name)) {
-                               begin_inset(os, "Formula ");
-                               os << "\\begin{" << name << "}";
-                               parse(p, os, FLAG_END, MATH_MODE, outer);
-                               os << "\\end{" << name << "}";
-                               end_inset(os);
-                       } else if (name == "tabular") {
-                               if (mode == TEXT_MODE)
-                                       handle_tabular(p, os, mode);
-                               else {
-                                       os << "\\begin{" << name << "}";
-                                       parse(p, os, FLAG_END, MATHTEXT_MODE, outer);
-                                       os << "\\end{" << name << "}";
-                               }
-                       } else if (name == "table" || name == "figure") {
-                               string opts = p.getOpt();
-                               begin_inset(os, "Float " + name + "\n");
-                               if (opts.size())
-                                       os << "placement " << opts << '\n';
-                               os << "wide false\n"
-                                        << "collapsed false\n"
-                                        << "\n"
-                                        << "\\layout Standard\n";
-                               parse(p, os, FLAG_END, mode, outer);
-                               end_inset(os);
-                       } else if (name == "lyxlist") {
-                               p.verbatimItem(); // swallow next arg
-                               parse(p, os, FLAG_END, mode, outer);
-                               os << "\n\\layout Bibliography\n\n";
-                       } else if (name == "thebibliography") {
-                               p.verbatimItem(); // swallow next arg
-                               parse(p, os, FLAG_END, mode, outer);
-                               os << "\n\\layout Bibliography\n\n";
-                       } else if (mode == MATH_MODE || mode == MATHTEXT_MODE) {
-                               os << "\\begin{" << name << "}";
-                               parse(p, os, FLAG_END, mode, outer);
-                               os << "\\end{" << name << "}";
-                       } else {
-                               parse(p, os, FLAG_END, mode, outer);
-                       }
-               }
-
-               else if (t.cs() == "end") {
-                       if (flags & FLAG_END) {
-                               // eat environment name
+               Token const & t = p.get_token();
+               if (t.cat() == catEscape) {
+                       string const command = t.asInput();
+                       if (command == "\\begin") {
                                string const name = p.getArg('{', '}');
-                               if (name != curr_env())
-                                       p.error("\\end{" + name + "} does not match \\begin{"
-                                               + curr_env() + "}");
-                               active_environments.pop();
-                               return;
-                       }
-                       p.error("found 'end' unexpectedly");
-               }
-
-               else if (t.cs() == "item")
-                       handle_par(os);
-
-               else if (t.cs() == ")") {
-                       if (flags & FLAG_SIMPLE2)
-                               return;
-                       p.error("found '\\)' unexpectedly");
-               }
-
-               else if (t.cs() == "]") {
-                       if (flags & FLAG_EQUATION)
-                               return;
-                       p.error("found '\\]' unexpectedly");
-               }
-
-               else if (t.cs() == "documentclass") {
-                       vector<string> opts;
-                       split(p.getArg('[', ']'), opts, ',');
-                       handle_opt(opts, known_languages, h_language);
-                       handle_opt(opts, known_fontsizes, h_paperfontsize);
-                       h_quotes_language = h_language;
-                       h_options = join(opts, ",");
-                       h_textclass = p.getArg('{', '}');
-               }
-
-               else if (t.cs() == "usepackage") {
-                       string const options = p.getArg('[', ']');
-                       string const name = p.getArg('{', '}');
-                       if (options.empty() && name.find(',')) {
-                               vector<string> vecnames;
-                               split(name, vecnames, ',');
-                               vector<string>::const_iterator it  = vecnames.begin();
-                               vector<string>::const_iterator end = vecnames.end();
-                               for (; it != end; ++it)
-                                       handle_package(trim(*it), string());
+                               if (name == "environments" || name == "reLyXre")
+                                       // We understand "reLyXre", but it is
+                                       // not as powerful as "environments".
+                                       read_environment(p, name,
+                                               known_environments);
+                               else if (name == "mathenvironments")
+                                       read_environment(p, name,
+                                               known_math_environments);
                        } else {
-                               handle_package(name, options);
+                               read_command(p, command, known_commands);
                        }
                }
+       }
+}
 
-               else if (t.cs() == "def") {
-                       string name = p.getToken().cs();
-                       while (p.nextToken().cat() != catBegin)
-                               name += p.getToken().asString();
-                       handle_ert(os, "\\def\\" + name + '{' + p.verbatimItem() + '}');
-               }
-
-               else if (t.cs() == "par")
-                       handle_par(os);
-
-               else if (is_known(t.cs(), known_headings)) {
-                       string name = t.cs();
-                       if (p.nextToken().asInput() == "*") {
-                               p.getToken();
-                               name += "*";
-                       }
-                       os << "\n\n\\layout " << cap(name) << "\n\n";
-                       string opt = p.getOpt();
-                       if (opt.size()) {
-                               begin_inset(os, "OptArg\n");
-                               os << "collapsed true\n\n\\layout Standard\n\n" << opt;
-                               end_inset(os);
-                       }
-                       parse(p, os, FLAG_ITEM, mode, outer);
-                       os << "\n\n\\layout Standard\n\n";
-               }
-
-               else if (t.cs() == "includegraphics") {
-                       if (mode == TEXT_MODE) {
-                               map<string, string> opts = split_map(p.getArg('[', ']'));
-                               string name = p.verbatimItem();
-                               begin_inset(os, "Graphics ");
-                               os << "\n\tfilename " << name << '\n';
-                               if (opts.find("width") != opts.end())
-                                       os << "\twidth " << opts["width"] << '\n';
-                               if (opts.find("height") != opts.end())
-                                       os << "\theight " << opts["height"] << '\n';
-                               end_inset(os);
-                       } else {
-                               os << "\\includegraphics ";
-                       }
-               }
-               
-               else if (t.cs() == "footnote") {
-                       begin_inset(os, "Foot\n");
-                       os << "collapsed true\n\n\\layout Standard\n\n";
-                       parse(p, os, FLAG_ITEM, mode, false);
-                       end_inset(os);
-               }
-
-               else if (t.cs() == "makeindex" || t.cs() == "maketitle")
-                       ; // swallow this
-
-               else if (t.cs() == "tableofcontents")
-                       p.verbatimItem(); // swallow this
 
-               else if (t.cs() == "hline" && mode == TABLE_MODE)
-                       hlines += "\\hline";
+string documentclass;
+string syntaxfile;
+bool overwrite_files = false;
 
-               else if (t.cs() == "cline" && mode == TABLE_MODE)
-                       hlines += "\\cline{" + p.verbatimItem() + '}';
 
-               else if (t.cs() == "tiny" && mode == TEXT_MODE)
-                       os << "\n\\size tiny\n";
+/// return the number of arguments consumed
+typedef boost::function<int(string const &, string const &)> cmd_helper;
 
-               else if (t.cs() == "scriptsize" && mode == TEXT_MODE)
-                       os << "\n\\size scriptsize\n";
 
-               else if (t.cs() == "Large" && mode == TEXT_MODE)
-                       os << "\n\\size larger\n";
+int parse_help(string const &, string const &)
+{
+       cerr << "Usage: tex2lyx [ command line switches ] <infile.tex> [<outfile.lyx>]\n"
+               "Command line switches (case sensitive):\n"
+               "\t-help              summarize tex2lyx usage\n"
+               "\t-f                 Force creation of .lyx files even if they exist already\n"
+               "\t-userdir dir       try to set user directory to dir\n"
+               "\t-sysdir dir        try to set system directory to dir\n"
+               "\t-c textclass       declare the textclass\n"
+               "\t-s syntaxfile      read additional syntax file" << endl;
+       exit(0);
+}
 
-               else if (t.cs() == "textrm") {
-                       if (mode == TEXT_MODE) {
-                               os << "\n\\family roman\n";
-                               parse(p, os, FLAG_ITEM, TEXT_MODE, outer);
-                               os << "\n\\family default\n";
-                       } else {
-                               os << '\\' << t.cs() << '{';
-                               parse(p, os, FLAG_ITEM, MATHTEXT_MODE, outer);
-                               os << '}';
-                       }
-               }
 
-               else if (t.cs() == "textsf") {
-                       if (mode == TEXT_MODE) {
-                               os << "\n\\family sans\n";
-                               parse(p, os, FLAG_ITEM, TEXT_MODE, outer);
-                               os << "\n\\family default\n";
-                       } else {
-                               os << '\\' << t.cs() << '{';
-                               parse(p, os, FLAG_ITEM, MATHTEXT_MODE, outer);
-                               os << '}';
-                       }
-               }
+int parse_class(string const & arg, string const &)
+{
+       if (arg.empty()) {
+               cerr << "Missing textclass string after -c switch" << endl;
+               exit(1);
+       }
+       documentclass = arg;
+       return 1;
+}
 
-               else if (t.cs() == "texttt") {
-                       if (mode == TEXT_MODE) {
-                               os << "\n\\family typewriter\n";
-                               parse(p, os, FLAG_ITEM, TEXT_MODE, outer);
-                               os << "\n\\family default\n";
-                       } else {
-                               os << '\\' << t.cs() << '{';
-                               parse(p, os, FLAG_ITEM, MATHTEXT_MODE, outer);
-                               os << '}';
-                       }
-               }
 
-               else if (t.cs() == "textsc") {
-                       if (mode == TEXT_MODE) {
-                               os << "\n\\noun on\n";
-                               parse(p, os, FLAG_ITEM, TEXT_MODE, outer);
-                               os << "\n\\noun default\n";
-                       } else {
-                               os << '\\' << t.cs() << '{';
-                               parse(p, os, FLAG_ITEM, MATHTEXT_MODE, outer);
-                               os << '}';
-                       }
-               }
+int parse_syntaxfile(string const & arg, string const &)
+{
+       if (arg.empty()) {
+               cerr << "Missing syntaxfile string after -s switch" << endl;
+               exit(1);
+       }
+       syntaxfile = arg;
+       return 1;
+}
 
-               else if (t.cs() == "textbf") {
-                       if (mode == TEXT_MODE) {
-                               os << "\n\\series bold\n";
-                               parse(p, os, FLAG_ITEM, TEXT_MODE, outer);
-                               os << "\n\\series default\n";
-                       } else {
-                               os << '\\' << t.cs() << '{';
-                               parse(p, os, FLAG_ITEM, MATHTEXT_MODE, outer);
-                               os << '}';
-                       }
-               }
 
-               else if (t.cs() == "underbar") {
-                       if (mode == TEXT_MODE) {
-                               os << "\n\\bar under\n";
-                               parse(p, os, FLAG_ITEM, TEXT_MODE, outer);
-                               os << "\n\\bar default\n";
-                       } else {
-                               os << '\\' << t.cs() << '{';
-                               parse(p, os, FLAG_ITEM, MATHTEXT_MODE, outer);
-                               os << '}';
-                       }
-               }
+// Filled with the command line arguments "foo" of "-sysdir foo" or
+// "-userdir foo".
+string cl_system_support;
+string cl_user_support;
 
-               else if ((t.cs() == "emph" || t.cs() == "noun") && mode == TEXT_MODE) {
-                       os << "\n\\" << t.cs() << " on\n";
-                       parse(p, os, FLAG_ITEM, mode, outer);
-                       os << "\n\\" << t.cs() << " default\n";
-               }
 
-               else if (t.cs() == "mbox" && mode != TEXT_MODE) {
-                       os << "\n\\mbox{";
-                       parse(p, os, FLAG_ITEM, MATHTEXT_MODE, outer);
-                       os << '}';
-               }
+int parse_sysdir(string const & arg, string const &)
+{
+       if (arg.empty()) {
+               cerr << "Missing directory for -sysdir switch" << endl;
+               exit(1);
+       }
+       cl_system_support = arg;
+       return 1;
+}
 
-               else if (is_known(t.cs(), known_latex_commands) && mode == TEXT_MODE) {
-                       begin_inset(os, "LatexCommand ");
-                       os << '\\' << t.cs();
-                       os << p.getOpt();
-                       os << p.getOpt();
-                       os << '{' << p.verbatimItem() << '}';
-                       end_inset(os);
-               }
 
-               else if (t.cs() == "bibitem") {
-                       os << "\n\\layout Bibliography\n\\bibitem ";
-                       os << p.getOpt();
-                       os << '{' << p.verbatimItem() << '}' << "\n\n";
-               }
+int parse_userdir(string const & arg, string const &)
+{
+       if (arg.empty()) {
+               cerr << "Missing directory for -userdir switch" << endl;
+               exit(1);
+       }
+       cl_user_support = arg;
+       return 1;
+}
 
-               else if (mode == TEXT_MODE && is_known(t.cs(), known_quotes)) {
-                 char const ** where = is_known(t.cs(), known_quotes);
-                       begin_inset(os, "Quotes ");
-                       os << known_coded_quotes[where - known_quotes];
-                       end_inset(os);
-               }
 
-               else if (t.cs() == "LyX" && mode == TEXT_MODE) {
-                       p.verbatimItem(); // eat {}
-                       os << "LyX";
-               }
+int parse_force(string const &, string const &)
+{
+       overwrite_files = true;
+       return 0;
+}
 
-               else if (t.cs() == "TeX" && mode == TEXT_MODE) {
-                       p.verbatimItem(); // eat {}
-                       os << "TeX";
-               }
 
-               else if (t.cs() == "LaTeX" && mode == TEXT_MODE) {
-                       p.verbatimItem(); // eat {}
-                       os << "LaTeX";
-               }
+void easyParse(int & argc, char * argv[])
+{
+       map<string, cmd_helper> cmdmap;
+
+       cmdmap["-c"] = parse_class;
+       cmdmap["-f"] = parse_force;
+       cmdmap["-s"] = parse_syntaxfile;
+       cmdmap["-help"] = parse_help;
+       cmdmap["--help"] = parse_help;
+       cmdmap["-sysdir"] = parse_sysdir;
+       cmdmap["-userdir"] = parse_userdir;
+
+       for (int i = 1; i < argc; ++i) {
+               std::map<string, cmd_helper>::const_iterator it
+                       = cmdmap.find(argv[i]);
+
+               // don't complain if not found - may be parsed later
+               if (it == cmdmap.end())
+                       continue;
+
+               string arg((i + 1 < argc) ? argv[i + 1] : "");
+               string arg2((i + 2 < argc) ? argv[i + 2] : "");
+
+               int const remove = 1 + it->second(arg, arg2);
+
+               // Now, remove used arguments by shifting
+               // the following ones remove places down.
+               argc -= remove;
+               for (int j = i; j < argc; ++j)
+                       argv[j] = argv[j + remove];
+               --i;
+       }
+}
 
-               else if (t.cs() == "LaTeXe" && mode == TEXT_MODE) {
-                       p.verbatimItem(); // eat {}
-                       os << "LaTeXe";
-               }
 
-               else if (t.cs() == "lyxarrow" && mode == TEXT_MODE) {
-                       p.verbatimItem();
-                       os << "\\SpecialChar \\menuseparator\n";
-               }
+// path of the first parsed file
+string masterFilePath;
+// path of the currently parsed file
+string parentFilePath;
 
-               else if (t.cs() == "ldots" && mode == TEXT_MODE) {
-                       p.verbatimItem();
-                       os << "\\SpecialChar \\ldots{}\n";
-               }
+} // anonymous namespace
 
-               else if (t.cs() == "@" && mode == TEXT_MODE)
-                       os << "\\SpecialChar \\@";
 
-               else if (t.cs() == "textasciitilde" && mode == TEXT_MODE)
-                       os << '~';
+string getMasterFilePath()
+{
+       return masterFilePath;
+}
 
-               else if (t.cs() == "_" && mode == TEXT_MODE)
-                       os << '_';
+string getParentFilePath()
+{
+       return parentFilePath;
+}
 
-               else if (t.cs() == "&" && mode == TEXT_MODE)
-                       os << '&';
 
-               else if (t.cs() == "#" && mode == TEXT_MODE)
-                       os << "#";
+namespace {
 
-               else if (t.cs() == "\"") {
-                       string const name = p.verbatimItem();
-                            if (name == "a") os << 'ä';
-                       else if (name == "o") os << 'ö';
-                       else if (name == "u") os << 'ü';
-                       else if (name == "A") os << 'Ä';
-                       else if (name == "O") os << 'Ö';
-                       else if (name == "U") os << 'Ü';
-                       else handle_ert(os, "\"{" + name + "}");
-               }
+/*!
+ *  Reads tex input from \a is and writes lyx output to \a os.
+ *  Uses some common settings for the preamble, so this should only
+ *  be used more than once for included documents.
+ *  Caution: Overwrites the existing preamble settings if the new document
+ *  contains a preamble.
+ *  You must ensure that \p parentFilePath is properly set before calling
+ *  this function!
+ */
+void tex2lyx(std::istream &is, std::ostream &os)
+{
+       Parser p(is);
+       //p.dump();
+
+       stringstream ss;
+       LyXTextClass textclass = parse_preamble(p, ss, documentclass);
+
+       active_environments.push_back("document");
+       Context context(true, textclass);
+       parse_text(p, ss, FLAG_END, true, context);
+       if (Context::empty)
+               // Empty document body. LyX needs at least one paragraph.
+               context.check_layout(ss);
+       context.check_end_layout(ss);
+       ss << "\n\\end_body\n\\end_document\n";
+       active_environments.pop_back();
+       ss.seekg(0);
+       os << ss.str();
+#ifdef TEST_PARSER
+       p.reset();
+       ofstream parsertest("parsertest.tex");
+       while (p.good())
+               parsertest << p.get_token().asInput();
+       // <origfile> and parsertest.tex should now have identical content
+#endif
+}
 
-               else if (t.cs() == "ss")
-                       os << "ß";
 
-               else if (t.cs() == "input")
-                       handle_ert(os, "\\input{" + p.verbatimItem() + "}\n");
+/// convert TeX from \p infilename to LyX and write it to \p os
+bool tex2lyx(string const &infilename, std::ostream &os)
+{
+       BOOST_ASSERT(lyx::support::absolutePath(infilename));
+       ifstream is(infilename.c_str());
+       if (!is.good()) {
+               cerr << "Could not open input file \"" << infilename
+                    << "\" for reading." << endl;
+               return false;
+       }
+       string const oldParentFilePath = parentFilePath;
+       parentFilePath = onlyPath(infilename);
+       tex2lyx(is, os);
+       parentFilePath = oldParentFilePath;
+       return true;
+}
 
-               else if (t.cs() == "fancyhead") {
-                       ostringstream ss;
-                       ss << "\\fancyhead";
-                       ss << p.getOpt();
-                       ss << '{' << p.verbatimItem() << "}\n";
-                       handle_ert(os, ss.str());
-               }
+} // anonymous namespace
 
-               else {
-                       //cerr << "#: " << t << " mode: " << mode << endl;
-                       if (mode == TEXT_MODE) {
-                               // heuristic: read up to next non-nested space
-                               /*
-                               string s = t.asInput();
-                               string z = p.verbatimItem();
-                               while (p.good() && z != " " && z.size()) {
-                                       //cerr << "read: " << z << endl;
-                                       s += z;
-                                       z = p.verbatimItem();
-                               }
-                               cerr << "found ERT: " << s << endl;
-                               handle_ert(os, s + ' ');
-                               */
-                               handle_ert(os, t.asInput() + ' ');
-                       } else {
-                               os << t.asInput();
-                               //cerr << "#: writing: '" << t.asInput() << "'\n";
-                       }
-               }
 
-               if (flags & FLAG_LEAVE) {
-                       flags &= ~FLAG_LEAVE;
-                       break;
+bool tex2lyx(string const &infilename, string const &outfilename)
+{
+       if (isFileReadable(outfilename)) {
+               if (overwrite_files) {
+                       cerr << "Overwriting existing file "
+                            << outfilename << endl;
+               } else {
+                       cerr << "Not overwriting existing file "
+                            << outfilename << endl;
+                       return false;
                }
+       } else {
+               cerr << "Creating file " << outfilename << endl;
        }
+       ofstream os(outfilename.c_str());
+       if (!os.good()) {
+               cerr << "Could not open output file \"" << outfilename
+                    << "\" for writing." << endl;
+               return false;
+       }
+#ifdef FILEDEBUG
+       cerr << "Input file: " << infilename << "\n";
+       cerr << "Output file: " << outfilename << "\n";
+#endif
+       return tex2lyx(infilename, os);
 }
 
 
-
-} // anonymous namespace
-
-
 int main(int argc, char * argv[])
 {
+       fs::path::default_name_check(fs::no_check);
+
+       easyParse(argc, argv);
+
        if (argc <= 1) {
-               cerr << "Usage: " << argv[0] << " <infile.tex>" << endl;
+               cerr << "Usage: tex2lyx [ command line switches ] <infile.tex> [<outfile.lyx>]\n"
+                         "See tex2lyx -help." << endl;
                return 2;
        }
 
-       ifstream is(argv[1]);
-       Parser p(is);
-       parse_preamble(p, cout);
-       active_environments.push("document");
-       parse(p, cout, FLAG_END, TEXT_MODE, true);
-       cout << "\n\\the_end";
+       lyx::support::os::init(argc, argv);
+       lyx::support::init_package(argv[0], cl_system_support, cl_user_support,
+                                  lyx::support::top_build_dir_is_two_levels_up);
+
+       // Now every known option is parsed. Look for input and output
+       // file name (the latter is optional).
+       string const infilename = makeAbsPath(argv[1]);
+       string outfilename;
+       if (argc > 2) {
+               outfilename = argv[2];
+               if (outfilename != "-")
+                       outfilename = makeAbsPath(argv[2]);
+       } else
+               outfilename = changeExtension(infilename, ".lyx");
+
+       string const system_syntaxfile = lyx::support::libFileSearch("", "syntax.default");
+       if (system_syntaxfile.empty()) {
+               cerr << "Error: Could not find syntax file \"syntax.default\"." << endl;
+               exit(1);
+       }
+       read_syntaxfile(system_syntaxfile);
+       if (!syntaxfile.empty())
+               read_syntaxfile(syntaxfile);
 
-       return 0;
+       masterFilePath = onlyPath(infilename);
+       parentFilePath = masterFilePath;
+
+       if (outfilename == "-") {
+               if (tex2lyx(infilename, cout))
+                       return EXIT_SUCCESS;
+               else
+                       return EXIT_FAILURE;
+       } else {
+               if (tex2lyx(infilename, outfilename))
+                       return EXIT_SUCCESS;
+               else
+                       return EXIT_FAILURE;
+       }
 }
 
 // }])