* doxy

[lyx.git] / src / tex2lyx / table.cpp

diff --git a/src/tex2lyx/table.cpp b/src/tex2lyx/table.cpp
index 79f750d8c79b5475c9f6dc71f1696be7d61b7aaa..d23db7088a1bd700bc85be7a7ca5db4b4c671c59 100644 (file)
--- a/src/tex2lyx/table.cpp
+++ b/src/tex2lyx/table.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  * \author Jean-Marc Lasgouttes
  * \author Georg Baum
  *
@@ -16,6 +16,7 @@
 
 #include "tex2lyx.h"
 
+#include "support/lassert.h"
 #include "support/convert.h"
 #include "support/lstrings.h"
 
@@ -463,7 +464,7 @@ void fix_colalign(vector<ColInfo> & colinfo)
 bool parse_hlines(Parser & p, Token const & t, string & hlines,
                  bool is_long_tabular)
 {
-       BOOST_ASSERT(t.cat() == catEscape);
+       LASSERT(t.cat() == catEscape, return false);
 
        if (t.cs() == "hline")
                hlines += "\\hline";
@@ -660,16 +661,15 @@ void parse_table(Parser & p, ostream & os, bool is_long_tabular,
                        }
                }
 
-               else if (t.cat() == catSpace || t.cat() == catNewline)
-                               os << t.cs();
-
-               else if (t.cat() == catLetter ||
-                              t.cat() == catSuper ||
-                              t.cat() == catSub ||
-                              t.cat() == catOther ||
-                              t.cat() == catActive ||
-                              t.cat() == catParameter)
-                       os << t.character();
+               else if (t.cat() == catSpace 
+                        || t.cat() == catNewline
+                        || t.cat() == catLetter 
+                        || t.cat() == catSuper 
+                        || t.cat() == catSub 
+                        || t.cat() == catOther 
+                        || t.cat() == catActive 
+                        || t.cat() == catParameter)
+                       os << t.cs();
 
                else if (t.cat() == catBegin) {
                        os << '{';