X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText3.cpp;h=ee0e7b1fc99c671f08b4f1f8c652236b1b26ac5d;hb=e08e5afeea7194d95be1f02fe9484383574d203f;hp=0b0351b7a2008a3f5a5958371af858214f89c495;hpb=32268e2632df5ee325d9a3589e514590b62fb65f;p=lyx.git

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 0b0351b7a2..ee0e7b1fc9 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -685,6 +685,10 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		break;
 	}
 
+	// TODO
+	// With the creation of LFUN_PARAGRAPH_PARAMS, this is now redundant,
+	// as its duties can be performed there. Should it be removed??
+	// FIXME For now, it can just dispatch LFUN_PARAGRAPH_PARAMS...
 	case LFUN_PARAGRAPH_SPACING: {
 		Paragraph & par = cur.paragraph();
 		Spacing::Space cur_spacing = par.params().spacing().getSpace();
@@ -1525,7 +1529,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			}
 
 			setLayout(cur, tclass.defaultLayoutName());
-			setParagraph(cur, Spacing(), LYX_ALIGN_LAYOUT, docstring(), 0);
+			ParagraphParameters p;
+			setParagraphs(cur, p);
 			insertInset(cur, new InsetFloatList(to_utf8(cmd.argument())));
 			cur.posRight();
 		} else {
@@ -1563,17 +1568,21 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 	case LFUN_PARAGRAPH_PARAMS_APPLY: {
 		// Given data, an encoding of the ParagraphParameters
 		// generated in the Paragraph dialog, this function sets
-		// the current paragraph appropriately.
-		istringstream is(to_utf8(cmd.argument()));
-		Lexer lex(0, 0);
-		lex.setStream(is);
-		ParagraphParameters params;
-		params.read(lex);
-		setParagraph(cur,
-			     params.spacing(),
-			     params.align(),
-			     params.labelWidthString(),
-			     params.noindent());
+		// the current paragraph, or currently selected paragraphs,
+		// appropriately. 
+		// NOTE: This function overrides all existing settings.
+		setParagraphs(cur, cmd.argument());
+		cur.message(_("Paragraph layout set"));
+		break;
+	}
+	
+	case LFUN_PARAGRAPH_PARAMS: {
+		// Given data, an encoding of the ParagraphParameters as we'd
+		// find them in a LyX file, this function modifies the current paragraph, 
+		// or currently selected paragraphs. 
+		// NOTE: This function only modifies, and does not override, existing
+		// settings.
+		setParagraphs(cur, cmd.argument(), true);
 		cur.message(_("Paragraph layout set"));
 		break;
 	}
@@ -1991,6 +2000,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	case LFUN_ACCENT_OGONEK:
 	case LFUN_THESAURUS_ENTRY:
 	case LFUN_PARAGRAPH_PARAMS_APPLY:
+	case LFUN_PARAGRAPH_PARAMS:
 	case LFUN_ESCAPE:
 	case LFUN_BUFFER_END:
 	case LFUN_BUFFER_BEGIN: