Fix #10328.

[lyx.git] / src / Text.cpp

diff --git a/src/Text.cpp b/src/Text.cpp
index 2be5b8602e31b831e765ea3f6081833709b6b4d3..e03c2cb57c630edcafd2288c21c4a7ea07394a86 100644 (file)
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -37,7 +37,6 @@
 #include "InsetList.h"
 #include "Language.h"
 #include "Layout.h"
-#include "Length.h"
 #include "Lexer.h"
 #include "lyxfind.h"
 #include "LyXRC.h"
@@ -65,6 +64,7 @@
 #include "support/docstream.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
+#include "support/Length.h"
 #include "support/lstrings.h"
 #include "support/lyxalgo.h"
 #include "support/lyxtime.h"
@@ -619,7 +619,8 @@ void Text::readParagraph(Paragraph & par, Lexer & lex,
                }
        }
        // Final change goes to paragraph break:
-       par.setChange(par.size(), change);
+       if (inset().allowMultiPar())
+               par.setChange(par.size(), change);
 
        // Initialize begin_of_body_ on load; redoParagraph maintains
        par.setBeginOfBody();
@@ -1011,11 +1012,11 @@ void Text::insertChar(Cursor & cur, char_type c)
                static docstring const number_operators = from_ascii("+-/*");
                static docstring const number_unary_operators = from_ascii("+-");
 
-               // European Number Separators: comma, dot etc.
+               // Common Number Separators: comma, dot etc.
                // European Number Terminators: percent, permille, degree, euro etc.
                if (cur.current_font.fontInfo().number() == FONT_ON) {
                        if (!isDigitASCII(c) && !contains(number_operators, c) &&
-                           !(isEuropeanNumberSeparator(c) &&
+                           !(isCommonNumberSeparator(c) &&
                              cur.pos() != 0 &&
                              cur.pos() != cur.lastpos() &&
                              tm.displayFont(pit, cur.pos()).fontInfo().number() == FONT_ON &&
@@ -1040,7 +1041,7 @@ void Text::insertChar(Cursor & cur, char_type c)
                                  ) {
                                        setCharFont(pit, cur.pos() - 1, cur.current_font,
                                                tm.font_);
-                               } else if (isEuropeanNumberSeparator(ch)
+                               } else if (isCommonNumberSeparator(ch)
                                     && cur.pos() >= 2
                                     && tm.displayFont(pit, cur.pos() - 2).fontInfo().number() == FONT_ON) {
                                        setCharFont(pit, cur.pos() - 1, cur.current_font,
@@ -1684,10 +1685,7 @@ bool Text::backspacePos0(Cursor & cur)
        if (cur.pit() == 0)
                return false;
 
-       bool needsUpdate = false;
-
        BufferParams const & bufparams = cur.buffer()->params();
-       DocumentClass const & tclass = bufparams.documentClass();
        ParagraphList & plist = cur.text()->paragraphs();
        Paragraph const & par = cur.paragraph();
        Cursor prevcur = cur;
@@ -1700,14 +1698,12 @@ bool Text::backspacePos0(Cursor & cur)
            || (cur.lastpos() == 1 && par.isSeparator(0))) {
                cur.recordUndo(prevcur.pit());
                plist.erase(plist.iterator_at(cur.pit()));
-               needsUpdate = true;
        }
        // is previous par empty?
        else if (prevcur.lastpos() == 0
                 || (prevcur.lastpos() == 1 && prevpar.isSeparator(0))) {
                cur.recordUndo(prevcur.pit());
                plist.erase(plist.iterator_at(prevcur.pit()));
-               needsUpdate = true;
        }
        // FIXME: Do we really not want to allow this???
        // Pasting is not allowed, if the paragraphs have different
@@ -1715,20 +1711,15 @@ bool Text::backspacePos0(Cursor & cur)
        // word processors to allow it. It confuses the user.
        // Correction: Pasting is always allowed with standard-layout
        // or the empty layout.
-       else if (par.layout() == prevpar.layout()
-                || tclass.isDefaultLayout(par.layout())
-                || tclass.isPlainLayout(par.layout())) {
+       else {
                cur.recordUndo(prevcur.pit());
                mergeParagraph(bufparams, plist, prevcur.pit());
-               needsUpdate = true;
        }
 
-       if (needsUpdate) {
-               cur.forceBufferUpdate();
-               setCursorIntern(cur, prevcur.pit(), prevcur.pos());
-       }
+       cur.forceBufferUpdate();
+       setCursorIntern(cur, prevcur.pit(), prevcur.pos());
 
-       return needsUpdate;
+       return true;
 }