The attached patch fixes the last remaining part of bug 20 - the tex2lyx handling of paragraph spacings. It is just an extension of the paragraph alignment handling.

regards Uwe
Index: text.cpp
===================================================================
--- text.cpp	(revision 24514)
+++ text.cpp	(working copy)
@@ -802,9 +802,12 @@
 		parse_unknown_environment(p, name, os, FLAG_END, outer,
 					  parent_context);
 
-	// Alignment settings
+	// Alignment and spacing settings
+	// these settings can span multiple paragraphs
 	else if (name == "center" || name == "flushleft" || name == "flushright" ||
-		 name == "centering" || name == "raggedright" || name == "raggedleft") {
+		 name == "centering" || name == "raggedright" || name == "raggedleft" ||
+		 name == "singlespace" || name == "onehalfspace" || name == "doublespace" ||
+		 name == "spacing") {
 		eat_whitespace(p, os, parent_context, false);
 		// We must begin a new paragraph if not already done
 		if (! parent_context.atParagraphStart()) {
@@ -815,10 +818,18 @@
 			parent_context.add_extra_stuff("\\align left\n");
 		else if (name == "flushright" || name == "raggedleft")
 			parent_context.add_extra_stuff("\\align right\n");
-		else
+		else if (name == "center" || name == "centering")
 			parent_context.add_extra_stuff("\\align center\n");
+		else if (name == "singlespace")
+			parent_context.add_extra_stuff("\\paragraph_spacing single\n");
+		else if (name == "onehalfspace")
+			parent_context.add_extra_stuff("\\paragraph_spacing onehalf\n");
+		else if (name == "doublespace")
+			parent_context.add_extra_stuff("\\paragraph_spacing double\n");
+		else if (name == "spacing")
+			parent_context.add_extra_stuff("\\paragraph_spacing other " + p.verbatim_item() + "\n");
 		parse_text(p, os, FLAG_END, outer, parent_context);
-		// Just in case the environment is empty ..
+		// 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);

Reply via email to