tex2lyx: a fix for the \tone support

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

diff --git a/src/tex2lyx/table.cpp b/src/tex2lyx/table.cpp
index 9e212b404cd352fa41537174e5c9446d9f6b0ea5..eed7bb91c81ad92db450fa87f925cd14c46344f5 100644 (file)
--- a/src/tex2lyx/table.cpp
+++ b/src/tex2lyx/table.cpp
@@ -209,6 +209,14 @@ string const write_attribute(string const & name, string const & s)
 }
 
 
+string const write_attribute(string const & name, int const & i)
+{
+       // we write only true attribute values so we remove a bit of the
+       // file format bloat for tabulars.
+       return i ? write_attribute(name, convert<string>(i)) : string();
+}
+
+
 /*! rather brutish way to code table structure in a string:
 
 \verbatim
@@ -726,13 +734,13 @@ void parse_table(Parser & p, ostream & os, bool is_long_tabular,
                        }
                }
 
-               else if (t.cat() == catSpace 
+               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() == catLetter
+                        || t.cat() == catSuper
+                        || t.cat() == catSub
+                        || t.cat() == catOther
+                        || t.cat() == catActive
                         || t.cat() == catParameter)
                        os << t.cs();
 
@@ -778,7 +786,7 @@ void parse_table(Parser & p, ostream & os, bool is_long_tabular,
                        // treat the nested environment as a block, don't
                        // parse &, \\ etc, because they don't belong to our
                        // table if they appear.
-                       os << p.verbatimEnvironment(name);
+                       os << p.ertEnvironment(name);
                        os << "\\end{" << name << '}';
                        active_environments.pop_back();
                }
@@ -1156,8 +1164,20 @@ void handle_tabular(Parser & p, ostream & os, string const & name,
                                cellinfo[row][col].content += os.str();
 
                                // add dummy cells for multicol
-                               for (size_t i = 0; i < ncells - 1 && col < colinfo.size(); ++i) {
+                               for (size_t i = 0; i < ncells - 1; ++i) {
                                        ++col;
+                                       if (col >= colinfo.size()) {
+                                               cerr << "The cell '"
+                                                       << cells[cell]
+                                                       << "' specifies "
+                                                       << convert<string>(ncells)
+                                                       << " columns while the table has only "
+                                                       << convert<string>(colinfo.size())
+                                                       << " columns!"
+                                                       << " Therefore the surplus columns will be ignored."
+                                                       << endl;
+                                               break;
+                                       }
                                        cellinfo[row][col].multi = CELL_PART_OF_MULTICOLUMN;
                                        cellinfo[row][col].align = 'c';
                                }
@@ -1194,18 +1214,24 @@ void handle_tabular(Parser & p, ostream & os, string const & name,
                                for (size_t c = 1; c < colinfo.size(); ++c)
                                        cellinfo[row][c].multi = CELL_PART_OF_MULTICOLUMN;
                        } else {
-                               bool sideways = false;
+                               bool turn = false;
+                               int rotate = 0;
                                if (p.next_token().cs() == "begin") {
                                        p.pushPosition();
                                        p.get_token();
                                        string const env = p.getArg('{', '}');
-                                       if (env == "sideways") {
+                                       if (env == "sideways" || env == "turn") {
+                                               string angle = "90";
+                                               if (env == "turn") {
+                                                       turn = true;
+                                                       angle = p.getArg('{', '}');
+                                               }
                                                active_environments.push_back(env);
-                                               p.verbatimEnvironment(env);
+                                               p.ertEnvironment(env);
                                                active_environments.pop_back();
                                                p.skip_spaces();
-                                               if (!p.good())
-                                                       sideways = true;
+                                               if (!p.good() && support::isStrInt(angle))
+                                                       rotate = convert<int>(angle);
                                        }
                                        p.popPosition();
                                }
@@ -1213,10 +1239,12 @@ void handle_tabular(Parser & p, ostream & os, string const & name,
                                cellinfo[row][col].rightlines = colinfo[col].rightlines;
                                cellinfo[row][col].align      = colinfo[col].align;
                                ostringstream os;
-                               if (sideways) {
-                                       cellinfo[row][col].rotate = 90;
+                               if (rotate != 0) {
+                                       cellinfo[row][col].rotate = rotate;
                                        p.get_token();
                                        active_environments.push_back(p.getArg('{', '}'));
+                                       if (turn)
+                                               p.getArg('{', '}');
                                        parse_text_in_inset(p, os, FLAG_END, false, context);
                                        active_environments.pop_back();
                                        preamble.registerAutomaticallyLoadedPackage("rotating");