X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2Ftable.cpp;h=79781c74951dd5ef46d426a2fd87982082f12e64;hb=8e7b5eebf0ef9742e5f6983d8f55f563c12a31ab;hp=9e212b404cd352fa41537174e5c9446d9f6b0ea5;hpb=c90e02ff0d0a764fee622999fcc45ec8dd3b07f1;p=lyx.git

diff --git a/src/tex2lyx/table.cpp b/src/tex2lyx/table.cpp
index 9e212b404c..79781c7495 100644
--- 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
@@ -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);
 						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");