Joao's patches

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6976 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/tex2lyx/ChangeLog b/src/tex2lyx/ChangeLog
index d5281e0324483a9d6ba2975707419e518ba7a631..40de758608bb515f5ace0ddf8f6bac220ad773af 100644 (file)
--- a/src/tex2lyx/ChangeLog
+++ b/src/tex2lyx/ChangeLog
@@ -1,3 +1,6 @@
+2003-05-17  Joao Luis M. Assirati  <assirati@fma.if.usp.br>
+
+       * texparser.C: fix paragraph parsing after comment
 
 2003-04-29  André Pönitz  <poenitz@gmx.net>
        

diff --git a/src/tex2lyx/math.C b/src/tex2lyx/math.C
index b6ca81070934b95f2eca2dca9e9786469fbf3034..e8e64265195d240518434ce52189ea5e9bc0842e 100644 (file)
--- a/src/tex2lyx/math.C
+++ b/src/tex2lyx/math.C
@@ -21,7 +21,8 @@ using std::vector;
 bool is_math_env(string const & name)
 {
        static char const * known_math_envs[] = { "equation", "equation*",
-       "eqnarray", "eqnarray*", "align", "align*", 0};
+       "eqnarray", "eqnarray*", "align", "align*", "gather", "gather*",
+       "multline", "multline*", 0};
 
        for (char const ** what = known_math_envs; *what; ++what)
                if (*what == name)

diff --git a/src/tex2lyx/texparser.C b/src/tex2lyx/texparser.C
index d626ebefb439e19da082bd3e1f2b26626133b39e..a642a167e097c22c31634028057a78bdd9c639a2 100644 (file)
--- a/src/tex2lyx/texparser.C
+++ b/src/tex2lyx/texparser.C
@@ -218,7 +218,7 @@ string Parser::getArg(char left, char right)
 
 string Parser::getOpt()
 {
-       string res = getArg('[', ']');
+       string const res = getArg('[', ']');
        return res.size() ? '[' + res + ']' : string();
 }
 
@@ -252,14 +252,21 @@ void Parser::tokenize(istream & is)
                                break;
                        }
 
-/*
                        case catComment: {
+                               push_back(Token(c, catComment));
                                while (is.get(c) && catcode(c) != catNewline)
-                                       ;
+                                       push_back(Token(c, catLetter));
+                               push_back(Token(c, catNewline));
                                ++lineno_;
+                               is.get(c);
+                               if (catcode(c) == catNewline) {
+                                       push_back(Token("par"));
+                                       ++lineno_;
+                               } else {
+                                       is.putback(c);
+                               }
                                break;
                        }
-*/
 
                        case catEscape: {
                                is.get(c);

diff --git a/src/tex2lyx/text.C b/src/tex2lyx/text.C
index 9becc23b55691cf75b6b93fea89bcb9ecd30b186..99bd488ac3fa57594f9773cb1e64b0227e6a2baa 100644 (file)
--- a/src/tex2lyx/text.C
+++ b/src/tex2lyx/text.C
@@ -113,8 +113,10 @@ void handle_par(ostream & os)
                return;
        os << "\n\\layout ";
        string s = active_environment();
-       if (s == "document" || s == "table" || s == "center")
+       if (s == "document" || s == "table")
                os << "Standard\n\n";
+       else if (s == "center")
+               os << "Standard\n\n\\align center\n";
        else if (s == "lyxcode")
                os << "LyX-Code\n\n";
        else if (s == "lyxlist")
@@ -285,10 +287,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer)
                                parse_text(p, os, FLAG_END, outer);
                                end_inset(os);
                        } else if (name == "center") {
-                               active_environments.pop_back();
-                               handle_par(os); 
-                               active_environments.push_back(name);
-                               os << "\\align center\n";
+                               handle_par(os);
                                parse_text(p, os, FLAG_END, outer);
                        } else if (name == "enumerate" || name == "itemize"
                                        || name == "lyxlist") {