tex2lyx: support for beraserif.sty

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

diff --git a/src/tex2lyx/table.cpp b/src/tex2lyx/table.cpp
index de4e7bd9ec5a91bdf8d7dc59d7673a52609a17cb..e5862d043411afc697a9b1ca632a2abed3494cca 100644 (file)
--- a/src/tex2lyx/table.cpp
+++ b/src/tex2lyx/table.cpp
@@ -321,7 +321,7 @@ void handle_colalign(Parser & p, vector<ColInfo> & colinfo,
                                break;
                        case '>': {
                                // text before the next column
-                               string const s = trim(p.verbatim_item());
+                               string const s = trimSpaceAndEol(p.verbatim_item());
                                if (next.special.empty() &&
                                    next.align == 'n') {
                                        // Maybe this can be converted to a
@@ -341,7 +341,7 @@ void handle_colalign(Parser & p, vector<ColInfo> & colinfo,
                        }
                        case '<': {
                                // text after the last column
-                               string const s = trim(p.verbatim_item());
+                               string const s = trimSpaceAndEol(p.verbatim_item());
                                if (colinfo.empty())
                                        // This is not possible in LaTeX.
                                        cerr << "Ignoring separator '<{"
@@ -520,7 +520,7 @@ void parse_table(Parser & p, ostream & os, bool is_long_tabular,
                Token const & t = p.get_token();
 
 #ifdef FILEDEBUG
-               cerr << "t: " << t << " flags: " << flags << "\n";
+               debugToken(cerr, t, flags);
 #endif
 
                // comments and whitespace in hlines