Use << for raising 2 to power instead of ^

[lyx.git] / src / Text.cpp

diff --git a/src/Text.cpp b/src/Text.cpp
index 1fdef6e2df3dfa3a3d596852097e8196956be16c..4a447577f22c9e91d0139a739525d3a276f1538c 100644 (file)
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -190,10 +190,8 @@ Text::Text(InsetText * owner, bool use_default_layout)
 Text::Text(InsetText * owner, Text const & text)
        : owner_(owner), pars_(text.pars_)
 {
-       ParagraphList::iterator const end = pars_.end();
-       ParagraphList::iterator it = pars_.begin();
-       for (; it != end; ++it)
-               it->setInsetOwner(owner);
+       for (auto & p : pars_)
+               p.setInsetOwner(owner);
 }
 
 
@@ -868,12 +866,18 @@ void Text::insertStringAsLines(Cursor & cur, docstring const & str,
        pit_type pit = cur.pit();
        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;
+
        // insert the string, don't insert doublespace
        bool space_inserted = true;
-       for (docstring::const_iterator cit = str.begin();
-           cit != str.end(); ++cit) {
+       for (auto const & ch : str) {
                Paragraph & par = pars_[pit];
-               if (*cit == '\n') {
+               if (ch == '\n') {
                        if (inset().allowMultiPar() && (!par.empty() || par.allowEmpty())) {
                                lyx::breakParagraph(*this, pit, pos,
                                        par.layout().isEnvironment());
@@ -884,28 +888,35 @@ void Text::insertStringAsLines(Cursor & cur, docstring const & str,
                                continue;
                        }
                // do not insert consecutive spaces if !free_spacing
-               } else if ((*cit == ' ' || *cit == '\t') &&
+               } else if ((ch == ' ' || ch == '\t') &&
                           space_inserted && !par.isFreeSpacing()) {
                        continue;
-               } else if (*cit == '\t') {
+               } else if (ch == '\t') {
                        if (!par.isFreeSpacing()) {
                                // tabs are like spaces here
                                par.insertChar(pos, ' ', font, bparams.track_changes);
                                ++pos;
                                space_inserted = true;
                        } else {
-                               par.insertChar(pos, *cit, font, bparams.track_changes);
+                               par.insertChar(pos, ch, font, bparams.track_changes);
                                ++pos;
                                space_inserted = true;
                        }
-               } else if (!isPrintable(*cit)) {
-                       // Ignore unprintables
+               } 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)) {
+                       // Ignore (other) unprintables
                        continue;
                } else {
                        // just insert the character
-                       par.insertChar(pos, *cit, font, bparams.track_changes);
+                       par.insertChar(pos, ch, font, bparams.track_changes);
                        ++pos;
-                       space_inserted = (*cit == ' ');
+                       space_inserted = (ch == ' ');
                }
        }
        setCursor(cur, pit, pos);
@@ -1733,7 +1744,8 @@ bool Text::backspace(Cursor & cur)
                Cursor prev_cur = cur;
                --prev_cur.pit();
 
-               if (!prev_cur.paragraph().isMergedOnEndOfParDeletion(cur.buffer()->params().track_changes)) {
+               if (cur.paragraph().size() > 0
+                   && !prev_cur.paragraph().isMergedOnEndOfParDeletion(cur.buffer()->params().track_changes)) {
                        cur.recordUndo(prev_cur.pit(), prev_cur.pit());
                        prev_cur.paragraph().setChange(prev_cur.lastpos(), Change(Change::DELETED));
                        setCursorIntern(cur, prev_cur.pit(), prev_cur.lastpos());
@@ -1767,7 +1779,7 @@ bool Text::backspace(Cursor & cur)
        needsUpdate |= handleBibitems(cur);
 
        // A singlePar update is not enough in this case.
-//             cur.screenUpdateFlags(Update::Force);
+       // cur.screenUpdateFlags(Update::Force);
        cur.top().setPitPos(cur.pit(), cur.pos());
 
        return needsUpdate;
@@ -1812,22 +1824,26 @@ bool Text::dissolveInset(Cursor & cur)
                // but we'll try the cheaper solution here.
                cur.buffer()->clearReferenceCache();
 
+               if (!lyxrc.ct_markup_copied)
+                       // Do not revive deleted text
+                       lyx::acceptChanges(plist, b.params());
+
                // ERT paragraphs have the Language latex_language.
                // This is invalid outside of ERT, so we need to
                // change it to the buffer language.
-               ParagraphList::iterator it = plist.begin();
-               ParagraphList::iterator it_end = plist.end();
-               for (; it != it_end; ++it)
-                       it->changeLanguage(b.params(), latex_language, b.language());
+               for (auto & p : plist)
+                       p.changeLanguage(b.params(), latex_language, b.language());
 
-               /* the inset is the only thing in paragraph, then the layout
-                * of the first paragraph of inset should be remembered.
+               /* If the inset is the only thing in paragraph and the layout
+                * is not plain, then the layout of the first paragraph of
+                * inset should be remembered.
                 * FIXME: this does not work as expected when change tracking
                 *   is on However, we do not really know what to do in this
                 *   case.
                 */
+               DocumentClass const & tclass = cur.buffer()->params().documentClass();
                if (inset_it.lastpos() == 1
-                   && inset_it.nextInset() && !inset_it.nextInset()->forcePlainLayout())
+                   && plist[0].layout().name() != tclass.plainLayoutName())
                        cur.paragraph().makeSameLayout(plist[0]);
 
                pasteParagraphList(cur, plist, b.params().documentClassPtr(),