X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2Ftext.C;h=5177d30762a9bf4bc864886660723b842d1c65a2;hb=486e75c3b6f3a41e50881cca8bf3d998b7abb2ab;hp=a1817e04101378bdf64d94cd40b32d6985814ec1;hpb=c38370d1c3dc594b17c53c28582f8092a15901d9;p=lyx.git

diff --git a/src/tex2lyx/text.C b/src/tex2lyx/text.C
index a1817e0410..5177d30762 100644
--- a/src/tex2lyx/text.C
+++ b/src/tex2lyx/text.C
@@ -16,6 +16,7 @@
 #include "tex2lyx.h"
 #include "context.h"
 #include "FloatList.h"
+#include "lengthcommon.h"
 #include "support/lstrings.h"
 #include "support/tostr.h"
 #include "support/filetools.h"
@@ -37,6 +38,7 @@ using std::vector;
 
 using lyx::support::rtrim;
 using lyx::support::suffixIs;
+using lyx::support::contains;
 
 
 // thin wrapper around parse_text using a string
@@ -103,45 +105,118 @@ map<string, string> split_map(string const & s)
 	return res;
 }
 
-// A simple function to translate a latex length to something lyx can
-// understand. Not perfect, but rather best-effort.
-string translate_len(string const & len)
+
+/*!
+ * Split a LaTeX length into value and unit.
+ * The latter can be a real unit like "pt", or a latex length variable
+ * like "\textwidth". The unit may contain additional stuff like glue
+ * lengths, but we don't care, because such lengths are ERT anyway.
+ * \return true if \param value and \param unit are valid.
+ */
+bool splitLatexLength(string const & len, string & value, string & unit)
 {
-	const string::size_type i = len.find_first_not_of(" -0123456789.,");
+	if (len.empty())
+		return false;
+	const string::size_type i = len.find_first_not_of(" -+0123456789.,");
 	//'4,5' is a valid LaTeX length number. Change it to '4.5'
 	string const length = lyx::support::subst(len, ',', '.');
-	// a normal length
-	if (i == string::npos || len[i]  != '\\')
-		return length;
-	double val;
+	if (i == string::npos)
+		return false;
 	if (i == 0) {
-		// We had something like \textwidth without a factor
-		val = 100;
+		if (len[0] == '\\') {
+			// We had something like \textwidth without a factor
+			value = "1.0";
+		} else {
+			return false;
+		}
 	} else {
-		istringstream iss(string(length, 0, i));
-		iss >> val;
-		val = val * 100;
+		value = trim(string(length, 0, i));
 	}
-	ostringstream oss;
-	oss << val;
-	string const valstring = oss.str();
-	const string::size_type i2 = length.find(" ", i);
-	string const unit = string(len, i, i2 - i);
-	string const endlen = (i2 == string::npos) ? string() : string(len, i2);
-	if (unit == "\\textwidth")
-		return valstring + "text%" + endlen;
-	else if (unit == "\\columnwidth")
-		return valstring + "col%" + endlen;
-	else if (unit == "\\paperwidth")
-		return valstring + "page%" + endlen;
-	else if (unit == "\\linewidth")
-		return valstring + "line%" + endlen;
-	else if (unit == "\\paperheight")
-		return valstring + "pheight%" + endlen;
-	else if (unit == "\\textheight")
-		return valstring + "theight%" + endlen;
+	if (value == "-")
+		value = "-1.0";
+	// 'cM' is a valid LaTeX length unit. Change it to 'cm'
+	if (contains(len, '\\'))
+		unit = trim(string(len, i));
 	else
-		return length;
+		unit = lyx::support::lowercase(trim(string(len, i)));
+	return true;
+}
+
+
+// A simple function to translate a latex length to something lyx can
+// understand. Not perfect, but rather best-effort.
+bool translate_len(string const & length, string & valstring, string & unit)
+{
+	if (!splitLatexLength(length, valstring, unit))
+		return false;
+	// LyX uses percent values
+	double value;
+	istringstream iss(valstring);
+	iss >> value;
+	value *= 100;
+	ostringstream oss;
+	oss << value;
+	string const percentval = oss.str();
+	// a normal length
+	if (unit.empty() || unit[0] != '\\')
+		return true;
+	const string::size_type i = unit.find(" ", i);
+	string const endlen = (i == string::npos) ? string() : string(unit, i);
+	if (unit == "\\textwidth") {
+		valstring = percentval;
+		unit = "text%" + endlen;
+	} else if (unit == "\\columnwidth") {
+		valstring = percentval;
+		unit = "col%" + endlen;
+	} else if (unit == "\\paperwidth") {
+		valstring = percentval;
+		unit = "page%" + endlen;
+	} else if (unit == "\\linewidth") {
+		valstring = percentval;
+		unit = "line%" + endlen;
+	} else if (unit == "\\paperheight") {
+		valstring = percentval;
+		unit = "pheight%" + endlen;
+	} else if (unit == "\\textheight") {
+		valstring = percentval;
+		unit = "theight%" + endlen;
+	}
+	return true;
+}
+
+
+string translate_len(string const & length)
+{
+	string unit;
+	string value;
+	if (translate_len(length, value, unit))
+		return value + unit;
+	// If the input is invalid, return what we have.
+	return length;
+}
+
+
+/*!
+ * Translates a LaTeX length into \param value, \param unit and
+ * \param special parts suitable for a box inset.
+ * The difference from translate_len() is that a box inset knows about
+ * some special "units" that are stored in \param special.
+ */
+void translate_box_len(string const & length, string & value, string & unit, string & special)
+{
+	if (translate_len(length, value, unit)) {
+		if (unit == "\\height" || unit == "\\depth" ||
+		    unit == "\\totalheight" || unit == "\\width") {
+			special = unit.substr(1);
+			// The unit is not used, but LyX requires a dummy setting
+			unit = "in";
+		} else
+			special = "none";
+	} else {
+		value.clear();
+		unit = length;
+		special = "none";
+	}
 }
 
 
@@ -170,8 +245,30 @@ void skip_braces(Parser & p)
 }
 
 
-void handle_ert(ostream & os, string const & s, Context const & context)
+void handle_ert(ostream & os, string const & s, Context & context, bool check_layout = true)
+{
+	if (check_layout) {
+		// We must have a valid layout before outputting the ERT inset.
+		context.check_layout(os);
+	}
+	Context newcontext(true, context.textclass);
+	begin_inset(os, "ERT");
+	os << "\nstatus Collapsed\n";
+	newcontext.check_layout(os);
+	for (string::const_iterator it = s.begin(), et = s.end(); it != et; ++it) {
+		if (*it == '\\')
+			os << "\n\\backslash \n";
+		else
+			os << *it;
+	}
+	newcontext.check_end_layout(os);
+	end_inset(os);
+}
+
+
+void handle_comment(ostream & os, string const & s, Context & context)
 {
+	// TODO: Handle this better
 	Context newcontext(true, context.textclass);
 	begin_inset(os, "ERT");
 	os << "\nstatus Collapsed\n";
@@ -182,6 +279,8 @@ void handle_ert(ostream & os, string const & s, Context const & context)
 		else
 			os << *it;
 	}
+	// make sure that our comment is the last thing on the line
+	os << "\n\\newline";
 	newcontext.check_end_layout(os);
 	end_inset(os);
 }
@@ -217,10 +316,11 @@ void output_command_layout(ostream & os, Parser & p, bool outer,
 	context.check_deeper(os);
 	context.check_layout(os);
 	if (context.layout->optionalargs > 0) {
+		p.skip_spaces();
 		if (p.next_token().character() == '[') {
 			p.get_token(); // eat '['
 			begin_inset(os, "OptArg\n");
-			os << "collapsed true\n";
+			os << "status collapsed\n\n";
 			parse_text_in_inset(p, os, FLAG_BRACK_LAST, outer, context);
 			end_inset(os);
 		}
@@ -228,6 +328,183 @@ void output_command_layout(ostream & os, Parser & p, bool outer,
 	parse_text_snippet(p, os, FLAG_ITEM, outer, context);
 	context.check_end_layout(os);
 	context.check_end_deeper(os);
+	// We don't need really a new paragraph, but
+	// we must make sure that the next item gets a \begin_layout.
+	parent_context.new_paragraph(os);
+}
+
+
+/*!
+ * Output a space if necessary.
+ * This function gets called for every whitespace token.
+ *
+ * We have three cases here:
+ * 1. A space must be suppressed. Example: The lyxcode case below
+ * 2. A space may be suppressed. Example: Spaces before "\par"
+ * 3. A space must not be suppressed. Example: A space between two words
+ *
+ * We currently handle only 1. and 3 and from 2. only the case of
+ * spaces before newlines as a side effect.
+ *
+ * 2. could be used to suppress as many spaces as possible. This has two effects:
+ * - Reimporting LyX generated LaTeX files changes almost no whitespace
+ * - Superflous whitespace from non LyX generated LaTeX files is removed.
+ * The drawback is that the logic inside the function becomes
+ * complicated, and that is the reason why it is not implemented.
+ */
+void check_space(Parser const & p, ostream & os, Context & context)
+{
+	Token const next = p.next_token();
+	Token const curr = p.curr_token();
+	// A space before a single newline and vice versa must be ignored
+	// LyX emits a newline before \end{lyxcode}.
+	// This newline must be ignored,
+	// otherwise LyX will add an additional protected space.
+	if (next.cat() == catSpace ||
+	    next.cat() == catNewline ||
+	    (next.cs() == "end" && context.layout->free_spacing && curr.cat() == catNewline)) {
+		return;
+	}
+	context.check_layout(os);
+	os << ' ';
+}
+
+
+/*!
+ * Check wether \param command is a known command. If yes,
+ * handle the command with all arguments.
+ * \return true if the command was parsed, false otherwise.
+ */
+bool parse_command(string const & command, Parser & p, ostream & os,
+                   bool outer, Context & context)
+{
+	if (known_commands.find(command) != known_commands.end()) {
+		vector<ArgumentType> const & template_arguments = known_commands[command];
+		string ert = command;
+		size_t no_arguments = template_arguments.size();
+		for (size_t i = 0; i < no_arguments; ++i) {
+			switch (template_arguments[i]) {
+			case required:
+				// This argument contains regular LaTeX
+				handle_ert(os, ert + '{', context);
+				parse_text(p, os, FLAG_ITEM, outer, context);
+				ert = "}";
+				break;
+			case verbatim:
+				// This argument may contain special characters
+				ert += '{' + p.verbatim_item() + '}';
+				break;
+			case optional:
+				ert += p.getOpt();
+				break;
+			}
+		}
+		handle_ert(os, ert, context);
+		return true;
+	}
+	return false;
+}
+
+
+/// Parses a minipage or parbox
+void parse_box(Parser & p, ostream & os, unsigned flags, bool outer,
+               Context & parent_context, bool use_parbox)
+{
+	string position;
+	string inner_pos;
+	string height_value = "0";
+	string height_unit = "pt";
+	string height_special = "none";
+	string latex_height;
+	if (p.next_token().asInput() == "[") {
+		position = p.getArg('[', ']');
+		if (position != "t" && position != "c" && position != "b") {
+			position = "c";
+			cerr << "invalid position for minipage/parbox" << endl;
+		}
+		if (p.next_token().asInput() == "[") {
+			latex_height = p.getArg('[', ']');
+			translate_box_len(latex_height, height_value, height_unit, height_special);
+
+			if (p.next_token().asInput() == "[") {
+				inner_pos = p.getArg('[', ']');
+				if (inner_pos != "c" && inner_pos != "t" &&
+				    inner_pos != "b" && inner_pos != "s") {
+					inner_pos = position;
+					cerr << "invalid inner_pos for minipage/parbox"
+					     << endl;
+				}
+			}
+		}
+	}
+	string width_value;
+	string width_unit;
+	string const latex_width = p.verbatim_item();
+	translate_len(latex_width, width_value, width_unit);
+	if (contains(width_unit, "\\") || contains(height_unit, "\\")) {
+		// LyX can't handle length variables
+		ostringstream ss;
+		if (use_parbox)
+			ss << "\\parbox";
+		else
+			ss << "\\begin{minipage}";
+		if (!position.empty())
+			ss << '[' << position << ']';
+		if (!latex_height.empty())
+			ss << '[' << latex_height << ']';
+		if (!inner_pos.empty())
+			ss << '[' << inner_pos << ']';
+		ss << "{" << latex_width << "}";
+		if (use_parbox)
+			ss << '{';
+		handle_ert(os, ss.str(), parent_context);
+		parent_context.new_paragraph(os);
+		parse_text_in_inset(p, os, flags, outer, parent_context);
+		if (use_parbox)
+			handle_ert(os, "}", parent_context);
+		else
+			handle_ert(os, "\\end{minipage}", parent_context);
+	} else {
+		// LyX does not like empty positions, so we have
+		// to set them to the LaTeX default values here.
+		if (position.empty())
+			position = "c";
+		if (inner_pos.empty())
+			inner_pos = position;
+		parent_context.check_layout(os);
+		begin_inset(os, "Box Frameless\n");
+		os << "position \"" << position << "\"\n";
+		os << "hor_pos \"c\"\n";
+		os << "has_inner_box 1\n";
+		os << "inner_pos \"" << inner_pos << "\"\n";
+		os << "use_parbox " << use_parbox << "\n";
+		os << "width \"" << width_value << width_unit << "\"\n";
+		os << "special \"none\"\n";
+		os << "height \"" << height_value << height_unit << "\"\n";
+		os << "height_special \"" << height_special << "\"\n";
+		os << "status open\n\n";
+		parse_text_in_inset(p, os, flags, outer, parent_context);
+		end_inset(os);
+#ifdef PRESERVE_LAYOUT
+		// lyx puts a % after the end of the minipage
+		if (p.next_token().cat() == catNewline && p.next_token().cs().size() > 1) {
+			// new paragraph
+			//handle_comment(os, "%dummy", parent_context);
+			p.get_token();
+			p.skip_spaces();
+			parent_context.new_paragraph(os);
+		}
+		else if (p.next_token().cat() == catSpace || p.next_token().cat() == catNewline) {
+			//handle_comment(os, "%dummy", parent_context);
+			p.get_token();
+			p.skip_spaces();
+			// We add a protected space if something real follows
+			if (p.good() && p.next_token().cat() != catComment) {
+				os << "\\InsetSpace ~\n";
+			}
+		}
+#endif
+	}
 }
 
 
@@ -239,6 +516,8 @@ void parse_environment(Parser & p, ostream & os, bool outer,
 	const bool is_starred = suffixIs(name, '*');
 	string const unstarred_name = rtrim(name, "*");
 	active_environments.push_back(name);
+	p.skip_spaces();
+
 	if (is_math_env(name)) {
 		parent_context.check_layout(os);
 		begin_inset(os, "Formula ");
@@ -262,81 +541,36 @@ void parse_environment(Parser & p, ostream & os, bool outer,
 			os << "placement " << p.getArg('[', ']') << '\n';
 		}
 		os << "wide " << tostr(is_starred)
-		   << "\ncollapsed false\n";
+		   << "\nstatus open\n\n";
 		parse_text_in_inset(p, os, FLAG_END, outer, parent_context);
 		end_inset(os);
+		// We don't need really a new paragraph, but
+		// we must make sure that the next item gets a \begin_layout.
+		parent_context.new_paragraph(os);
 	}
 
-	else if (name == "minipage") {
-		parent_context.check_layout(os);
-		string position = "1";
-		string inner_pos = "0";
-		string height = "0pt";
-		string latex_position;
-		string latex_inner_pos;
-		string latex_height;
-		if (p.next_token().asInput() == "[") {
-			latex_position = p.getArg('[', ']');
-			switch(latex_position[0]) {
-			case 't': position = "0"; break;
-			case 'c': position = "1"; break;
-			case 'b': position = "2"; break;
-			default:
-				cerr << "invalid position for minipage"
-				     << endl;
-				break;
-			}
-			if (p.next_token().asInput() == "[") {
-				latex_height = p.getArg('[', ']');
-				height = translate_len(latex_height);
-
-				if (p.next_token().asInput() == "[") {
-					latex_inner_pos = p.getArg('[', ']');
-					switch(latex_inner_pos[0]) {
-					case 't': inner_pos = "0"; break;
-					case 'c': inner_pos = "1"; break;
-					case 'b': inner_pos = "2"; break;
-					case 's': inner_pos = "3"; break;
-					default:
-						cerr << "invalid inner_pos for minipage"
-						     << endl;
-						break;
-					}
-				}
-			}
-		}
-		string width = translate_len(p.verbatim_item());
-		if (width[0] == '\\') {
-			// lyx can't handle length variables
-			ostringstream ss;
-			ss << "\\begin{minipage}";
-			if (latex_position.size())
-				ss << '[' << latex_position << ']';
-			if (latex_height.size())
-				ss << '[' << latex_height << ']';
-			if (latex_inner_pos.size())
-				ss << '[' << latex_inner_pos << ']';
-			ss << "{" << width << "}";
-			handle_ert(os, ss.str(), parent_context);
+	else if (name == "minipage")
+		parse_box(p, os, FLAG_END, outer, parent_context, false);
+
+	// Alignment settings
+	else if (name == "center" || name == "flushleft" || name == "flushright" ||
+	         name == "centering" || name == "raggedright" || name == "raggedleft") {
+		// We must begin a new paragraph if not already done
+		if (! parent_context.atParagraphStart()) {
 			parent_context.check_end_layout(os);
-			parent_context.need_layout = true;
-			parse_text_in_inset(p, os, FLAG_END, outer, parent_context);
-			handle_ert(os, "\\end{minipage}", parent_context);
-		} else {
-			begin_inset(os, "Minipage\n");
-			os << "position " << position << '\n';
-			os << "inner_position " << inner_pos << '\n';
-			os << "height \"" << height << "\"\n";
-			os << "width \"" << width << "\"\n";
-			os << "collapsed false\n\n";
-			parse_text_in_inset(p, os, FLAG_END, outer, parent_context);
-			end_inset(os);
+			parent_context.new_paragraph(os);
 		}
-
-	}
-
-	else if (name == "center") {
+		if (name == "flushleft" || name == "raggedright")
+			parent_context.add_extra_stuff("\\align left ");
+		else if (name == "flushright" || name == "raggedleft")
+			parent_context.add_extra_stuff("\\align right ");
+		else
+			parent_context.add_extra_stuff("\\align center ");
 		parse_text(p, os, FLAG_END, outer, parent_context);
+		// Just in case the environment is empty ..
+		parent_context.extra_stuff.erase();
+		// We must begin a new paragraph to reset the alignment
+		parent_context.new_paragraph(os);
 	}
 
 	// The single '=' is meant here.
@@ -349,9 +583,11 @@ void parse_environment(Parser & p, ostream & os, bool outer,
 		case  LATEX_LIST_ENVIRONMENT:
 			context.extra_stuff = "\\labelwidthstring "
 				+ p.verbatim_item() + '\n';
+			p.skip_spaces();
 			break;
 		case  LATEX_BIB_ENVIRONMENT:
 			p.verbatim_item(); // swallow next arg
+			p.skip_spaces();
 			break;
 		default:
 			break;
@@ -360,6 +596,7 @@ void parse_environment(Parser & p, ostream & os, bool outer,
 		parse_text(p, os, FLAG_END, outer, context);
 		context.check_end_layout(os);
 		context.check_end_deeper(os);
+		parent_context.new_paragraph(os);
 	}
 
 	else if (name == "appendix") {
@@ -375,27 +612,36 @@ void parse_environment(Parser & p, ostream & os, bool outer,
 
 	else if (name == "comment") {
 		parent_context.check_layout(os);
-		begin_inset(os, "Comment\n");
-		os << "collapsed false\n";
+		begin_inset(os, "Note Comment\n");
+		os << "status open\n";
+		parse_text_in_inset(p, os, FLAG_END, outer, parent_context);
+		end_inset(os);
+	}
+
+	else if (name == "lyxgreyedout") {
+		parent_context.check_layout(os);
+		begin_inset(os, "Note Greyedout\n");
+		os << "status open\n";
 		parse_text_in_inset(p, os, FLAG_END, outer, parent_context);
 		end_inset(os);
 	}
 
 	else if (name == "tabbing") {
 		// We need to remember that we have to handle '\=' specially
-		parent_context.check_layout(os);
 		handle_ert(os, "\\begin{" + name + "}", parent_context);
 		parse_text_snippet(p, os, FLAG_END | FLAG_TABBING, outer, parent_context);
 		handle_ert(os, "\\end{" + name + "}", parent_context);
 	}
 
 	else {
-		parent_context.check_layout(os);
 		handle_ert(os, "\\begin{" + name + "}", parent_context);
 		parse_text_snippet(p, os, FLAG_END, outer, parent_context);
 		handle_ert(os, "\\end{" + name + "}", parent_context);
 	}
+
 	active_environments.pop_back();
+	if (name != "math")
+		p.skip_spaces();
 }
 
 } // anonymous namespace
@@ -485,9 +731,10 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 			skip_braces(p);
 		}
 
+		else if (t.cat() == catSpace || (t.cat() == catNewline && t.cs().size() == 1))
+			check_space(p, os, context);
 
 		else if (t.cat() == catLetter ||
-			       t.cat() == catSpace ||
 			       t.cat() == catOther ||
 			       t.cat() == catAlign ||
 			       t.cat() == catParameter) {
@@ -495,16 +742,9 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 			os << t.character();
 		}
 
-		else if (t.cat() == catNewline) {
-			if (p.next_token().cat() == catNewline) {
-				// this should have been be done by
-				// the parser already
-				cerr << "what are we doing here?" << endl;
-				p.get_token();
-				context.need_layout = true;
-			} else {
-				os << " "; // note the space
-			}
+		else if (t.cat() == catNewline || (t.cat() == catEscape && t.cs() == "par")) {
+			p.skip_spaces();
+			context.new_paragraph(os);
 		}
 
 		else if (t.cat() == catActive) {
@@ -519,20 +759,19 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 		}
 
 		else if (t.cat() == catBegin) {
-// FIXME???
 			// special handling of size changes
 			context.check_layout(os);
 			bool const is_size = is_known(p.next_token().cs(), known_sizes);
-			Context newcontext(false, context.textclass);
-//			need_end_layout = false;
-			string const s = parse_text(p, FLAG_BRACE_LAST, outer, newcontext);
-//			need_end_layout = true;
-			if (s.empty() && p.next_token().character() == '`')
-				; // ignore it in  {}``
+			Token const prev = p.prev_token();
+			string const s = parse_text(p, FLAG_BRACE_LAST, outer, context);
+			if (s.empty() && (p.next_token().character() == '`' ||
+			                  (prev.character() == '-' && p.next_token().character())))
+				; // ignore it in {}`` or -{}-
 			else if (is_size || s == "[" || s == "]" || s == "*")
 				os << s;
 			else {
-				handle_ert(os, "{", context);
+				handle_ert(os, "{", context, false);
+				// s will end the current layout and begin a new one if necessary
 				os << s;
 				handle_ert(os, "}", context);
 			}
@@ -540,15 +779,26 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 
 		else if (t.cat() == catEnd) {
 			if (flags & FLAG_BRACE_LAST) {
-				context.check_end_layout(os);
 				return;
 			}
 			cerr << "stray '}' in text\n";
 			handle_ert(os, "}", context);
 		}
 
-		else if (t.cat() == catComment)
-			handle_comment(p);
+		else if (t.cat() == catComment) {
+			context.check_layout(os);
+			if (!t.cs().empty()) {
+				handle_comment(os, '%' + t.cs(), context);
+				if (p.next_token().cat() == catNewline) {
+					// A newline after a comment line starts a new paragraph
+					context.new_paragraph(os);
+					p.skip_spaces();
+				}
+			} else {
+				// "%\n" combination
+				p.skip_spaces();
+			}
+		}
 
 		//
 		// control sequences
@@ -588,8 +838,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 		}
 
 		else if (t.cs() == "item") {
-			// should be done automatically by Parser::tokenize
-			//p.skip_spaces();
+			p.skip_spaces();
 			string s;
 			bool optarg = false;
 			if (p.next_token().character() == '[') {
@@ -598,25 +847,24 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 				s = parse_text(p, FLAG_BRACK_LAST, outer, newcontext);
 				optarg = true;
 			}
-			context.need_layout = true;
-			context.has_item = true;
+			context.set_item();
 			context.check_layout(os);
 			if (optarg) {
-				if (active_environment() == "itemize") {
+				if (context.layout->labeltype != LABEL_MANUAL) {
 					// lyx does not support \item[\mybullet] in itemize environments
 					handle_ert(os, "[", context);
 					os << s;
 					handle_ert(os, "]", context);
-				} else if (s.size()) {
+				} else if (!s.empty()) {
 					// The space is needed to separate the item from the rest of the sentence.
 					os << s << ' ';
+					p.skip_spaces();
 				}
 			}
 		}
 
 		else if (t.cs() == "bibitem") {
-			context.need_layout = true;
-			context.has_item = true;
+			context.set_item();
 			context.check_layout(os);
 			os << "\\bibitem ";
 			os << p.getOpt();
@@ -624,6 +872,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 		}
 
 		else if (t.cs() == "def") {
+			p.skip_spaces();
 			context.check_layout(os);
 			string name = p.get_token().cs();
 			while (p.next_token().cat() != catBegin)
@@ -631,20 +880,14 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 			handle_ert(os, "\\def\\" + name + '{' + p.verbatim_item() + '}', context);
 		}
 
-		else if (t.cs() == "par") {
+		else if (t.cs() == "noindent") {
 			p.skip_spaces();
-			context.check_end_layout(os);
-			context.need_layout = true;
+			context.add_extra_stuff("\\noindent ");
 		}
 
 		else if (t.cs() == "appendix") {
-			context.check_end_layout(os);
-			Context newcontext(true, context.textclass, context.layout,
-					context.layout);
-			newcontext.check_layout(os);
-			os << "\\start_of_appendix\n";
-			parse_text(p, os, FLAG_END, outer, newcontext);
-			newcontext.check_end_layout(os);
+			p.skip_spaces();
+			context.add_extra_stuff("\\start_of_appendix ");
 		}
 
 		// Must attempt to parse "Section*" before "Section".
@@ -655,12 +898,14 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 			 newlayout->isCommand()) {
 			p.get_token();
 			output_command_layout(os, p, outer, context, newlayout);
+			p.skip_spaces();
 		}
 
 		// The single '=' is meant here.
 		else if ((newlayout = findLayout(context.textclass, t.cs())).get() &&
 			 newlayout->isCommand()) {
 			output_command_layout(os, p, outer, context, newlayout);
+			p.skip_spaces();
 		}
 
 		else if (t.cs() == "includegraphics") {
@@ -695,7 +940,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 				if (opt.find('t') != string::npos) ss << "Top";
 				if (opt.find('b') != string::npos) ss << "Bottom";
 				if (opt.find('B') != string::npos) ss << "Baseline";
-				if (ss.str().size())
+				if (!ss.str().empty())
 					os << "\trotateOrigin " << ss.str() << '\n';
 				else
 					cerr << "Warning: Ignoring unknown includegraphics origin argument '" << opt << "'\n";
@@ -752,7 +997,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 			if (opts.find("command") != opts.end())
 				special << "command=" << opts["command"] << ',';
 			string s_special = special.str();
-			if (s_special.size()) {
+			if (!s_special.empty()) {
 				// We had special arguments. Remove the trailing ','.
 				os << "\tspecial " << s_special.substr(0, s_special.size() - 1) << '\n';
 			}
@@ -763,22 +1008,25 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 		}
 
 		else if (t.cs() == "footnote") {
+			p.skip_spaces();
 			context.check_layout(os);
 			begin_inset(os, "Foot\n");
-			os << "collapsed true\n";
+			os << "status collapsed\n\n";
 			parse_text_in_inset(p, os, FLAG_ITEM, false, context);
 			end_inset(os);
 		}
 
 		else if (t.cs() == "marginpar") {
+			p.skip_spaces();
 			context.check_layout(os);
 			begin_inset(os, "Marginal\n");
-			os << "collapsed true\n";
+			os << "status collapsed\n\n";
 			parse_text_in_inset(p, os, FLAG_ITEM, false, context);
 			end_inset(os);
 		}
 
 		else if (t.cs() == "ensuremath") {
+			p.skip_spaces();
 			context.check_layout(os);
 			Context newcontext(false, context.textclass);
 			string s = parse_text(p, FLAG_ITEM, false, newcontext);
@@ -793,12 +1041,16 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 			context.check_layout(os);
 			os << "\n\\hfill\n";
 			skip_braces(p);
+			p.skip_spaces();
 		}
 
-		else if (t.cs() == "makeindex" || t.cs() == "maketitle")
+		else if (t.cs() == "makeindex" || t.cs() == "maketitle") {
+			p.skip_spaces();
 			skip_braces(p); // swallow this
+		}
 
 		else if (t.cs() == "tableofcontents") {
+			p.skip_spaces();
 			context.check_layout(os);
 			begin_inset(os, "LatexCommand \\tableofcontents\n");
 			end_inset(os);
@@ -806,6 +1058,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 		}
 
 		else if (t.cs() == "listoffigures") {
+			p.skip_spaces();
 			context.check_layout(os);
 			begin_inset(os, "FloatList figure\n");
 			end_inset(os);
@@ -813,6 +1066,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 		}
 
 		else if (t.cs() == "listoftables") {
+			p.skip_spaces();
 			context.check_layout(os);
 			begin_inset(os, "FloatList table\n");
 			end_inset(os);
@@ -820,6 +1074,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 		}
 
 		else if (t.cs() == "listof") {
+			p.skip_spaces(true);
 			string const name = p.get_token().asString();
 			if (context.textclass.floats().typeExist(name)) {
 				context.check_layout(os);
@@ -906,6 +1161,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 
 		else if (is_known(t.cs(), known_quotes)) {
 			char const ** where = is_known(t.cs(), known_quotes);
+			context.check_layout(os);
 			begin_inset(os, "Quotes ");
 			os << known_coded_quotes[where - known_quotes];
 			end_inset(os);
@@ -916,6 +1172,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 			char const ** where = is_known(t.cs(), known_sizes);
 			context.check_layout(os);
 			os << "\n\\size " << known_coded_sizes[where - known_sizes] << "\n";
+			p.skip_spaces();
 		}
 
 		else if (t.cs() == "LyX" || t.cs() == "TeX"
@@ -1016,8 +1273,11 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 		// Problem: \= creates a tabstop inside the tabbing environment
 		// and else an accent. In the latter case we really would want
 		// \={o} instead of \= o.
+		else if (t.cs() == "=" && (flags & FLAG_TABBING))
+			handle_ert(os, t.asInput(), context);
+
 		else if (t.cs() == "H" || t.cs() == "c" || t.cs() == "^" || t.cs() == "'"
-		      || t.cs() == "~" || t.cs() == "." || (t.cs() == "=" && ! (flags & FLAG_TABBING))) {
+		      || t.cs() == "~" || t.cs() == "." || t.cs() == "=") {
 			// we need the trim as the LyX parser chokes on such spaces
 			context.check_layout(os);
 			os << "\n\\i \\" << t.cs() << "{"
@@ -1089,22 +1349,103 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 			begin_inset(os, "LatexCommand ");
 			os << "\\bibtex";
 			// Do we have a bibliographystyle set?
-			if (bibliographystyle.size()) {
+			if (!bibliographystyle.empty()) {
 				os << '[' << bibliographystyle << ']';
 			}
 			os << '{' << p.verbatim_item() << "}\n";
 			end_inset(os);
 		}
 
-		else if (t.cs() == "psfrag") {
-			// psfrag{ps-text}[ps-pos][tex-pos]{tex-text}
-			// TODO: Generalize this!
-			string arguments = p.getArg('{', '}');
-			arguments += '}';
-			arguments += p.getOpt();
-			arguments += p.getOpt();
-			p.skip_spaces();
-			handle_ert(os, "\\psfrag{" + arguments, context);
+		else if (t.cs() == "parbox")
+			parse_box(p, os, FLAG_ITEM, outer, context, true);
+
+		else if (t.cs() == "smallskip" ||
+		         t.cs() == "medskip" ||
+			 t.cs() == "bigskip" ||
+			 t.cs() == "vfill") {
+			context.check_layout(os);
+			begin_inset(os, "VSpace ");
+			os << t.cs();
+			end_inset(os);
+		}
+
+		else if (t.cs() == "vspace") {
+			bool starred = false;
+			if (p.next_token().asInput() == "*") {
+				p.get_token();
+				starred = true;
+			}
+			string const length = p.verbatim_item();
+			string unit;
+			string valstring;
+			bool valid = splitLatexLength(length, valstring, unit);
+			bool known_vspace = false;
+			bool known_unit = false;
+			double value;
+			if (valid) {
+				istringstream iss(valstring);
+				iss >> value;
+				if (value == 1.0) {
+					if (unit == "\\smallskipamount") {
+						unit = "smallskip";
+						known_vspace = true;
+					} else if (unit == "\\medskipamount") {
+						unit = "medskip";
+						known_vspace = true;
+					} else if (unit == "\\bigskipamount") {
+						unit = "bigskip";
+						known_vspace = true;
+					} else if (unit == "\\fill") {
+						unit = "vfill";
+						known_vspace = true;
+					}
+				} else {
+					switch (unitFromString(unit)) {
+					case LyXLength::SP:
+					case LyXLength::PT:
+					case LyXLength::BP:
+					case LyXLength::DD:
+					case LyXLength::MM:
+					case LyXLength::PC:
+					case LyXLength::CC:
+					case LyXLength::CM:
+					case LyXLength::IN:
+					case LyXLength::EX:
+					case LyXLength::EM:
+					case LyXLength::MU:
+						known_unit = true;
+						break;
+					default:
+						break;
+					}
+				}
+			}
+
+			if (known_unit || known_vspace) {
+				// Literal length or known variable
+				context.check_layout(os);
+				begin_inset(os, "VSpace ");
+				if (known_unit)
+					os << value;
+				os << unit;
+				if (starred)
+					os << '*';
+				end_inset(os);
+			} else {
+				// LyX can't handle other length variables in Inset VSpace
+				string name = t.asInput();
+				if (starred)
+					name += '*';
+				if (valid) {
+					if (value == 1.0)
+						handle_ert(os, name + '{' + unit + '}', context);
+					else if (value == -1.0)
+						handle_ert(os, name + "{-" + unit + '}', context);
+					else
+						handle_ert(os, name + '{' + valstring + unit + '}', context);
+				} else
+					handle_ert(os, name + '{' + length + '}', context);
+			}
 		}
 
 		else {
@@ -1121,8 +1462,14 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 			cerr << "found ERT: " << s << endl;
 			handle_ert(os, s + ' ', context);
 			*/
-			context.check_layout(os);
-			handle_ert(os, t.asInput() + ' ', context);
+			string name = t.asInput();
+			if (p.next_token().asInput() == "*") {
+				// Starred commands like \vspace*{}
+				p.get_token();				// Eat '*'
+				name += '*';
+			}
+			if (! parse_command(name, p, os, outer, context))
+				handle_ert(os, name, context);
 		}
 
 		if (flags & FLAG_LEAVE) {