rev 19644: I forgot this.

[lyx.git] / src / Text3.cpp

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 1d3f0e30dff6d41d3ef1c8ceca73660ffbba5566..ee0e7b1fc99c671f08b4f1f8c652236b1b26ac5d 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -71,6 +71,10 @@
 #include <clocale>
 #include <sstream>
 
+using std::endl;
+using std::string;
+using std::istringstream;
+using std::ostringstream;
 
 namespace lyx {
 
@@ -83,14 +87,9 @@ using cap::replaceSelection;
 using support::isStrUnsignedInt;
 using support::token;
 
-using std::endl;
-using std::string;
-using std::istringstream;
-using std::ostringstream;
-
-
+namespace frontend {
 extern docstring current_layout;
-
+}
 
 namespace {
 
@@ -686,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();
@@ -896,7 +899,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                        break;
                }
 
-               bool change_layout = (current_layout != layout);
+               bool change_layout = (frontend::current_layout != layout);
 
                if (!change_layout && cur.selection() &&
                        cur.selBegin().pit() != cur.selEnd().pit())
@@ -904,7 +907,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                        pit_type spit = cur.selBegin().pit();
                        pit_type epit = cur.selEnd().pit() + 1;
                        while (spit != epit) {
-                               if (pars_[spit].layout()->name() != current_layout) {
+                               if (pars_[spit].layout()->name() != frontend::current_layout) {
                                        change_layout = true;
                                        break;
                                }
@@ -1526,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 {
@@ -1564,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;
        }
@@ -1992,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: