Really fix start_of_appendix output

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

diff --git a/src/tex2lyx/math.C b/src/tex2lyx/math.C
index 5e84b5d50dc23f25d6a45a2b92ada7720e3b73a8..eb57b1b822b53117c96b9a90aa47f4a063690445 100644 (file)
--- a/src/tex2lyx/math.C
+++ b/src/tex2lyx/math.C
@@ -25,14 +25,15 @@ using std::string;
 
 bool is_math_env(string const & name)
 {
-       static char const * known_math_envs[] = { "equation", "equation*",
-       "eqnarray", "eqnarray*", "align", "align*", "gather", "gather*",
-       "multline", "multline*", "math", "displaymath", "flalign", "flalign*",
+       static char const * const known_math_envs[] = { "equation",
+       "equation*", "eqnarray", "eqnarray*", "align", "align*", "gather",
+       "gather*", "multline", "multline*", "math", "displaymath", "flalign",
+       "flalign*",
        // These require extra args
        "alignat", "alignat*", "xalignat", "xalignat*", "xxalignat",
        0};
 
-       for (char const ** what = known_math_envs; *what; ++what)
+       for (char const * const * what = known_math_envs; *what; ++what)
                if (*what == name)
                        return true;
        return false;
@@ -100,7 +101,6 @@ void parse_math(Parser & p, ostream & os, unsigned flags, const mode_type mode)
                }
 
                else if (t.cat() == catLetter ||
-                              t.cat() == catSpace ||
                               t.cat() == catSuper ||
                               t.cat() == catSub ||
                               t.cat() == catOther ||
@@ -109,15 +109,6 @@ void parse_math(Parser & p, ostream & os, unsigned flags, const mode_type mode)
                               t.cat() == catParameter)
                        os << t.character();
 
-               else if (t.cat() == catNewline) {
-                       //if (p.next_token().cat() == catNewline) {
-                       //      p.get_token();
-                       //      handle_par(os);
-                       //} else {
-                               os << "\n "; // note the space
-                       //}
-               }
-
                else if (t.cat() == catBegin) {
                        os << '{';
                        parse_math(p, os, FLAG_BRACE_LAST, mode);
@@ -130,8 +121,13 @@ void parse_math(Parser & p, ostream & os, unsigned flags, const mode_type mode)
                        os << "unexpected '}' in math\n";
                }
 
-               else if (t.cat() == catComment)
-                       handle_comment(p);
+               else if (t.cat() == catComment) {
+                       if (!t.cs().empty())
+                               cerr << "Ignoring comment: " << t.asInput();
+                       else
+                               // "%\n" combination
+                               p.skip_spaces();
+               }
 
                //
                // control sequences
@@ -220,6 +216,13 @@ void parse_math(Parser & p, ostream & os, unsigned flags, const mode_type mode)
                else if (t.cs() == "ss")
                        os << "ß";
 
+               else if (t.cs() == "cr") {
+                       // lyx can't handle \\cr
+                       cerr << "Warning: Converting TeX '\\cr' to LaTeX '\\\\'."
+                            << endl;
+                       os << "\\\\";
+               }
+
                else
                        os << t.asInput();