brkstr2str_pos: avoid case where length is negative

[features.git] / src / Text.cpp

diff --git a/src/Text.cpp b/src/Text.cpp
index 19b3af5b28b2a272a1f50726f5a57313346893eb..e379337ee89a527bee072b38e20491a41d41e4f2 100644 (file)
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -209,7 +209,7 @@ pit_type Text::outerHook(pit_type par_offset) const
 
        if (par.getDepth() == 0)
                return pars_.size();
-       return depthHook(par_offset, depth_type(par.getDepth() - 1));
+       return depthHook(par_offset, par.getDepth() - 1);
 }
 
 
@@ -369,7 +369,7 @@ InsetText const & Text::inset() const
 void Text::readParToken(Paragraph & par, Lexer & lex,
        string const & token, Font & font, Change & change, ErrorList & errorList)
 {
-       Buffer * buf = const_cast<Buffer *>(&owner_->buffer());
+       Buffer * buf = &owner_->buffer();
        BufferParams & bp = buf->params();
 
        if (token[0] != '\\') {
@@ -859,11 +859,12 @@ void Text::insertStringAsLines(Cursor & cur, docstring const & str,
        pos_type pos = cur.pos();
 
        // The special chars we handle
-       map<wchar_t, InsetSpecialChar::Kind> specialchars;
-       specialchars[0x200c] = InsetSpecialChar::LIGATURE_BREAK;
-       specialchars[0x200b] = InsetSpecialChar::ALLOWBREAK;
-       specialchars[0x2026] = InsetSpecialChar::LDOTS;
-       specialchars[0x2011] = InsetSpecialChar::NOBREAKDASH;
+       static map<wchar_t, InsetSpecialChar::Kind> specialchars = {
+               { 0x200c, InsetSpecialChar::LIGATURE_BREAK },
+               { 0x200b, InsetSpecialChar::ALLOWBREAK },
+               { 0x2026, InsetSpecialChar::LDOTS },
+               { 0x2011, InsetSpecialChar::NOBREAKDASH }
+       };
 
        // insert the string, don't insert doublespace
        bool space_inserted = true;
@@ -894,11 +895,11 @@ void Text::insertStringAsLines(Cursor & cur, docstring const & str,
                                ++pos;
                                space_inserted = true;
                        }
-               } else if (specialchars.find(ch) != specialchars.end()) {
-                       par.insertInset(pos, new InsetSpecialChar(specialchars.find(ch)->second),
-                                       font, bparams.track_changes ?
-                                               Change(Change::INSERTED)
-                                             : Change(Change::UNCHANGED));
+               } else if (specialchars.find(ch) != specialchars.end()
+                          && (par.insertInset(pos, new InsetSpecialChar(specialchars.find(ch)->second),
+                                              font, bparams.track_changes
+                                              ? Change(Change::INSERTED)
+                                              : Change(Change::UNCHANGED)))) {
                        ++pos;
                        space_inserted = false;
                } else if (!isPrintable(ch)) {
@@ -1495,7 +1496,8 @@ void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op)
        }
 
        // finally, invoke the DEPM
-       deleteEmptyParagraphMechanism(begPit, endPit, cur.buffer()->params().track_changes);
+       deleteEmptyParagraphMechanism(begPit, endPit, begPos, endPos,
+                                     cur.buffer()->params().track_changes);
 
        cur.finishUndo();
        cur.clearSelection();
@@ -1880,6 +1882,7 @@ bool Text::dissolveInset(Cursor & cur)
                }
 
                pasteParagraphList(cur, plist, b.params().documentClassPtr(),
+                                  b.params().authors(),
                                   b.errorList("Paste"));
        }
 
@@ -2146,7 +2149,10 @@ docstring Text::currentState(CursorData const & cur, bool devel_mode) const
                if (!par.empty() && cur.pos() < par.size()) {
                        // Force output of code point, not character
                        size_t const c = par.getChar(cur.pos());
-                       os << _(", Char: 0x") << hex << c;
+                       if (c == META_INSET)
+                               os << ", Char: INSET";
+                       else
+                               os << _(", Char: 0x") << hex << c;
                }
                os << _(", Boundary: ") << cur.boundary();
 //             Row & row = cur.textRow();