Get rid of extraneous whitespace.

[lyx.git] / src / tex2lyx / preamble.C

diff --git a/src/tex2lyx/preamble.C b/src/tex2lyx/preamble.C
index cd61b2f5838270477308f0f44cffaeb4e1580c33..449d9b9c26460068709a68257a8fae4d431b654c 100644 (file)
--- a/src/tex2lyx/preamble.C
+++ b/src/tex2lyx/preamble.C
@@ -68,13 +68,12 @@ string h_fontscheme              = "default";
 string h_graphics                = "default";
 string h_paperfontsize           = "default";
 string h_spacing                 = "single";
-// Match the entry in ../src/tex-strings.C. Why not "default"?
-string h_papersize               = "Default";
+string h_papersize               = "default";
 string h_paperpackage            = "none";
-string h_use_geometry            = "0";
+string h_use_geometry            = "false";
 string h_use_amsmath             = "0";
 string h_cite_engine             = "basic";
-string h_use_bibtopic            = "0";
+string h_use_bibtopic            = "false";
 string h_paperorientation        = "portrait";
 string h_secnumdepth             = "3";
 string h_tocdepth                = "3";
@@ -85,7 +84,7 @@ string h_quotes_times            = "2";
 string h_papercolumns            = "1";
 string h_papersides              = string();
 string h_paperpagestyle          = "default";
-string h_tracking_changes        = "0";
+string h_tracking_changes        = "false";
 
 
 void handle_opt(vector<string> & opts, char const * const * what, string & target)
@@ -131,7 +130,7 @@ vector<string> split_options(string const & input)
                } else if (t.cat() != catSpace)
                        option += t.asInput();
        }
-       
+
        if (!option.empty())
                options.push_back(option);
 
@@ -225,8 +224,10 @@ void handle_package(string const & name, string const & opts)
 
 void end_preamble(ostream & os, LyXTextClass const & /*textclass*/)
 {
-       os << "#LyX file created by  tex2lyx 0.1.2 \n"
-          << "\\lyxformat 235\n"
+       os << "#LyX file created by  tex2lyx 0.1.2\n"
+          << "\\lyxformat 237\n"
+          << "\\begin_document\n"
+          << "\\begin_header\n"
           << "\\textclass " << h_textclass << "\n"
           << "\\begin_preamble\n" << h_preamble.str() << "\n\\end_preamble\n";
        if (!h_options.empty())
@@ -254,7 +255,8 @@ void end_preamble(ostream & os, LyXTextClass const & /*textclass*/)
           << "\\papersides " << h_papersides << "\n"
           << "\\paperpagestyle " << h_paperpagestyle << "\n"
           << "\\tracking_changes " << h_tracking_changes << "\n"
-          << "\\end_header\n";
+          << "\\end_header\n\n"
+          << "\\begin_body\n";
        // clear preamble for subdocuments
        h_preamble.str("");
 }
@@ -327,7 +329,8 @@ LyXTextClass const parse_preamble(Parser & p, ostream & os, string const & force
                                star = true;
                        }
                        string const name = p.verbatim_item();
-                       string const opts = p.getOpt();
+                       string const opt1 = p.getOpt();
+                       string const opt2 = p.getFullOpt();
                        string const body = p.verbatim_item();
                        // only non-lyxspecific stuff
                        if (   name != "\\noun"
@@ -343,8 +346,12 @@ LyXTextClass const parse_preamble(Parser & p, ostream & os, string const & force
                                ss << '\\' << t.cs();
                                if (star)
                                        ss << '*';
-                               ss << '{' << name << '}' << opts << '{' << body << "}";
+                               ss << '{' << name << '}' << opt1 << opt2
+                                  << '{' << body << "}";
                                h_preamble << ss.str();
+
+                               // Add the command to the known commands
+                               add_known_command(name, opt1, !opt2.empty());
 /*
                                ostream & out = in_preamble ? h_preamble : os;
                                out << "\\" << t.cs() << "{" << name << "}"