adjust

[lyx.git] / src / CutAndPaste.cpp

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index d9f92ee1597f15d76cdc62d89d52e9ba374fe582..5136df37df4b54f9e0987c813fbc81f780e52248 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -30,7 +30,6 @@
 #include "LyXFunc.h"
 #include "LyXRC.h"
 #include "Text.h"
-#include "TextClass_ptr.h"
 #include "TextClassList.h"
 #include "Paragraph.h"
 #include "paragraph_funcs.h"
@@ -38,7 +37,7 @@
 #include "ParIterator.h"
 #include "Undo.h"
 
-#include "insets/InsetCharStyle.h"
+#include "insets/InsetFlex.h"
 #include "insets/InsetTabular.h"
 
 #include "mathed/MathData.h"
@@ -52,6 +51,7 @@
 
 #include <boost/current_function.hpp>
 #include <boost/tuple/tuple.hpp>
+#include <boost/next_prior.hpp>
 
 #include <string>
 
@@ -72,7 +72,7 @@ namespace {
 
 typedef std::pair<pit_type, int> PitPosPair;
 
-typedef limited_stack<pair<ParagraphList, TextClass_ptr> > CutStack;
+typedef limited_stack<pair<ParagraphList, TextClassPtr> > CutStack;
 
 CutStack theCuts(10);
 // persistent selection, cleared until the next selection
@@ -108,7 +108,7 @@ bool checkPastePossible(int index)
 
 pair<PitPosPair, pit_type>
 pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
-                    TextClass_ptr textclass, ErrorList & errorlist)
+                    TextClassPtr textclass, ErrorList & errorlist)
 {
        Buffer const & buffer = cur.buffer();
        pit_type pit = cur.pit();
@@ -122,7 +122,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
 
        // Make a copy of the CaP paragraphs.
        ParagraphList insertion = parlist;
-       TextClass_ptr const tc = buffer.params().getTextClass_ptr();
+       TextClassPtr const tc = buffer.params().getTextClassPtr();
 
        // Now remove all out of the pars which is NOT allowed in the
        // new environment and set also another font if that is required.
@@ -130,8 +130,8 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
        // Convert newline to paragraph break in ERT inset.
        // This should not be here!
        if (pars[pit].inInset() &&
-           (pars[pit].inInset()->lyxCode() == Inset::ERT_CODE ||
-               pars[pit].inInset()->lyxCode() == Inset::LISTINGS_CODE)) {
+           (pars[pit].inInset()->lyxCode() == ERT_CODE ||
+               pars[pit].inInset()->lyxCode() == LISTINGS_CODE)) {
                for (ParagraphList::size_type i = 0; i < insertion.size(); ++i) {
                        for (pos_type j = 0; j < insertion[i].size(); ++j) {
                                if (insertion[i].isNewline(j)) {
@@ -223,7 +223,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
 
                for (; lit != eit; ++lit) {
                        switch (lit->inset->lyxCode()) {
-                       case Inset::TABULAR_CODE: {
+                       case TABULAR_CODE: {
                                InsetTabular * it = static_cast<InsetTabular*>(lit->inset);
                                it->buffer(&buffer);
                                break;
@@ -327,7 +327,7 @@ PitPosPair eraseSelectionHelper(BufferParams const & params,
 }
 
 
-void putClipboard(ParagraphList const & paragraphs, TextClass_ptr textclass,
+void putClipboard(ParagraphList const & paragraphs, TextClassPtr textclass,
                  docstring const & plaintext)
 {
        // For some strange reason gcc 3.2 and 3.3 do not accept
@@ -346,7 +346,7 @@ void putClipboard(ParagraphList const & paragraphs, TextClass_ptr textclass,
 
 void copySelectionHelper(Buffer const & buf, ParagraphList & pars,
        pit_type startpit, pit_type endpit,
-       int start, int end, TextClass_ptr tc, CutStack & cutstack)
+       int start, int end, TextClassPtr tc, CutStack & cutstack)
 {
        BOOST_ASSERT(0 <= start && start <= pars[startpit].size());
        BOOST_ASSERT(0 <= end && end <= pars[endpit].size());
@@ -373,7 +373,7 @@ void copySelectionHelper(Buffer const & buf, ParagraphList & pars,
                // ERT paragraphs have the Language latex_language.
                // This is invalid outside of ERT, so we need to change it
                // to the buffer language.
-               if (it->ownerCode() == Inset::ERT_CODE || it->ownerCode() == Inset::LISTINGS_CODE) {
+               if (it->ownerCode() == ERT_CODE || it->ownerCode() == LISTINGS_CODE) {
                        it->changeLanguage(buf.params(), latex_language,
                                           buf.getLanguage());
                }
@@ -403,8 +403,8 @@ docstring grabAndEraseSelection(Cursor & cur)
 }
 
 
-void switchBetweenClasses(TextClass_ptr const & c1, 
-       TextClass_ptr const & c2, InsetText & in, ErrorList & errorlist)
+void switchBetweenClasses(TextClassPtr const & c1, 
+       TextClassPtr const & c2, InsetText & in, ErrorList & errorlist)
 {
        errorlist.clear();
 
@@ -442,24 +442,24 @@ void switchBetweenClasses(TextClass_ptr const & c1,
        // character styles
        InsetIterator const i_end = inset_iterator_end(in);
        for (InsetIterator it = inset_iterator_begin(in); it != i_end; ++it) {
-               if (it->lyxCode() == Inset::CHARSTYLE_CODE) {
-                       InsetCharStyle & inset =
-                               static_cast<InsetCharStyle &>(*it);
+               if (it->lyxCode() == FLEX_CODE) {
+                       InsetFlex & inset =
+                               static_cast<InsetFlex &>(*it);
                        string const name = inset.params().name;
                        InsetLayout const il = 
                                tclass2.insetlayout(from_utf8(name));
                        inset.setLayout(il);
                        if (il.labelstring == from_utf8("UNDEFINED")) {
-                               // The character style is undefined in tclass2
+                               // The flex inset is undefined in tclass2
                                docstring const s = bformat(_(
-                                       "Character style %1$s is "
+                                       "Flex inset %1$s is "
                                        "undefined because of class "
                                        "conversion from\n%2$s to %3$s"),
                                         from_utf8(name), from_utf8(tclass1.name()),
                                         from_utf8(tclass2.name()));
                                // To warn the user that something had to be done.
                                errorlist.push_back(ErrorItem(
-                                       _("Undefined character style"),
+                                       _("Undefined flex inset"),
                                        s, it.paragraph().id(), it.pos(), it.pos() + 1));
                        } 
                }
@@ -530,7 +530,7 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut)
                                text->paragraphs(),
                                begpit, endpit,
                                cur.selBegin().pos(), endpos,
-                               bp.getTextClass_ptr(), theCuts);
+                               bp.getTextClassPtr(), theCuts);
                        // Stuff what we got on the clipboard.
                        // Even if there is no selection.
                        putClipboard(theCuts[0].first, theCuts[0].second,
@@ -614,7 +614,7 @@ void copySelectionToStack(Cursor & cur, CutStack & cutstack)
 
                copySelectionHelper(cur.buffer(), pars, par, cur.selEnd().pit(),
                        pos, cur.selEnd().pos(), 
-                       cur.buffer().params().getTextClass_ptr(), cutstack);
+                       cur.buffer().params().getTextClassPtr(), cutstack);
                dirtyTabularStack(false);
        }
 
@@ -626,7 +626,7 @@ void copySelectionToStack(Cursor & cur, CutStack & cutstack)
                par.layout(bp.getTextClass().defaultLayout());
                par.insert(0, grabSelection(cur), Font(), Change(Change::UNCHANGED));
                pars.push_back(par);
-               cutstack.push(make_pair(pars, bp.getTextClass_ptr()));
+               cutstack.push(make_pair(pars, bp.getTextClassPtr()));
        }
 }
 
@@ -653,7 +653,7 @@ void copySelection(Cursor & cur, docstring const & plaintext)
                par.layout(bp.getTextClass().defaultLayout());
                par.insert(0, plaintext, Font(), Change(Change::UNCHANGED));
                pars.push_back(par);
-               theCuts.push(make_pair(pars, bp.getTextClass_ptr()));
+               theCuts.push(make_pair(pars, bp.getTextClassPtr()));
        } else
                copySelectionToStack(cur, theCuts);
 
@@ -690,6 +690,12 @@ void clearSelection()
 }
 
 
+void clearCutStack()
+{
+       theCuts.clear();
+}
+
+
 docstring getSelection(Buffer const & buf, size_t sel_index)
 {
        return sel_index < theCuts.size()
@@ -699,7 +705,7 @@ docstring getSelection(Buffer const & buf, size_t sel_index)
 
 
 void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
-                       TextClass_ptr textclass, ErrorList & errorList)
+                       TextClassPtr textclass, ErrorList & errorList)
 {
        if (cur.inTexted()) {
                Text * text = cur.text();
@@ -753,7 +759,7 @@ void pasteClipboard(Cursor & cur, ErrorList & errorList, bool asParagraphs)
                        if (buffer.readString(lyx)) {
                                recordUndo(cur);
                                pasteParagraphList(cur, buffer.paragraphs(),
-                                       buffer.params().getTextClass_ptr(), errorList);
+                                       buffer.params().getTextClassPtr(), errorList);
                                cur.setSelection();
                                return;
                        }