* do not ignore "requires" field in MathMacro

[lyx.git] / src / CutAndPaste.cpp

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index d315984ac0141ed37147d5a6a4b809d06d8a4cca..6220982e02b3b9e32d7b7d6bad78f2d770cd944e 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -28,8 +28,8 @@
 #include "lfuns.h"
 #include "LyXFunc.h"
 #include "LyXRC.h"
-#include "LyXText.h"
-#include "LyXTextClassList.h"
+#include "Text.h"
+#include "TextClassList.h"
 #include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
@@ -39,7 +39,7 @@
 #include "insets/InsetCharStyle.h"
 #include "insets/InsetTabular.h"
 
-#include "mathed/MathArray.h"
+#include "mathed/MathData.h"
 #include "mathed/InsetMath.h"
 #include "mathed/MathSupport.h"
 
@@ -83,10 +83,10 @@ bool dirty_tabular_stack_ = false;
 
 
 void region(CursorSlice const & i1, CursorSlice const & i2,
-       InsetBase::row_type & r1, InsetBase::row_type & r2,
-       InsetBase::col_type & c1, InsetBase::col_type & c2)
+       Inset::row_type & r1, Inset::row_type & r2,
+       Inset::col_type & c1, Inset::col_type & c2)
 {
-       InsetBase & p = i1.inset();
+       Inset & p = i1.inset();
        c1 = p.col(i1.idx());
        c2 = p.col(i2.idx());
        if (c1 > c2)
@@ -128,7 +128,7 @@ 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() == InsetBase::ERT_CODE) {
+           pars[pit].inInset()->lyxCode() == Inset::ERT_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)) {
@@ -145,8 +145,8 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
        // If we are in an inset which returns forceDefaultParagraphs,
        // set the paragraphs to default
        if (cur.inset().forceDefaultParagraphs(cur.idx())) {
-               LyXLayout_ptr const layout = 
-                       buffer.params().getLyXTextClass().defaultLayout();
+               Layout_ptr const layout = 
+                       buffer.params().getTextClass().defaultLayout();
                ParagraphList::iterator const end = insertion.end();
                for (ParagraphList::iterator par = insertion.begin(); 
                                par != end; ++par)
@@ -220,7 +220,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
 
                for (; lit != eit; ++lit) {
                        switch (lit->inset->lyxCode()) {
-                       case InsetBase::TABULAR_CODE: {
+                       case Inset::TABULAR_CODE: {
                                InsetTabular * it = static_cast<InsetTabular*>(lit->inset);
                                it->buffer(&buffer);
                                break;
@@ -374,7 +374,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() == InsetBase::ERT_CODE) {
+               if (it->ownerCode() == Inset::ERT_CODE) {
                        it->changeLanguage(buf.params(), latex_language,
                                           buf.getLanguage());
                }
@@ -382,9 +382,9 @@ void copySelectionHelper(Buffer const & buf, ParagraphList & pars,
        }
 
        // do not copy text (also nested in insets) which is marked as deleted
-       // acceptChanges() is defined for LyXText rather than ParagraphList
-       // Thus we must wrap copy_pars into a LyXText object and cross our fingers
-       LyXText lt;
+       // acceptChanges() is defined for Text rather than ParagraphList
+       // Thus we must wrap copy_pars into a Text object and cross our fingers
+       Text lt;
        copy_pars.swap(lt.paragraphs());
        lt.acceptChanges(buf.params());
        copy_pars.swap(lt.paragraphs());
@@ -416,8 +416,8 @@ void switchBetweenClasses(textclass_type c1, textclass_type c2,
        if (c1 == c2)
                return;
 
-       LyXTextClass const & tclass1 = textclasslist[c1];
-       LyXTextClass const & tclass2 = textclasslist[c2];
+       TextClass const & tclass1 = textclasslist[c1];
+       TextClass const & tclass2 = textclasslist[c2];
 
        // layouts
        ParIterator end = par_iterator_end(in);
@@ -446,7 +446,7 @@ void switchBetweenClasses(textclass_type c1, textclass_type c2,
        // character styles
        InsetIterator const i_end = inset_iterator_end(in);
        for (InsetIterator it = inset_iterator_begin(in); it != i_end; ++it) {
-               if (it->lyxCode() == InsetBase::CHARSTYLE_CODE) {
+               if (it->lyxCode() == Inset::CHARSTYLE_CODE) {
                        InsetCharStyle & inset =
                                static_cast<InsetCharStyle &>(*it);
                        string const name = inset.params().type;
@@ -520,7 +520,7 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut)
        // and cur.selEnd()
 
        if (cur.inTexted()) {
-               LyXText * text = cur.text();
+               Text * text = cur.text();
                BOOST_ASSERT(text);
 
                // make sure that the depth behind the selection are restored, too
@@ -602,7 +602,7 @@ void copySelectionToStack(Cursor & cur, CutStack & cutstack)
                return;
 
        if (cur.inTexted()) {
-               LyXText * text = cur.text();
+               Text * text = cur.text();
                BOOST_ASSERT(text);
                // ok we have a selection. This is always between cur.selBegin()
                // and sel_end cursor
@@ -625,8 +625,8 @@ void copySelectionToStack(Cursor & cur, CutStack & cutstack)
                ParagraphList pars;
                Paragraph par;
                BufferParams const & bp = cur.buffer().params();
-               par.layout(bp.getLyXTextClass().defaultLayout());
-               par.insert(0, grabSelection(cur), LyXFont(), Change(Change::UNCHANGED));
+               par.layout(bp.getTextClass().defaultLayout());
+               par.insert(0, grabSelection(cur), Font(), Change(Change::UNCHANGED));
                pars.push_back(par);
                cutstack.push(make_pair(pars, bp.textclass));
        }
@@ -652,8 +652,8 @@ void copySelection(Cursor & cur, docstring const & plaintext)
                ParagraphList pars;
                Paragraph par;
                BufferParams const & bp = cur.buffer().params();
-               par.layout(bp.getLyXTextClass().defaultLayout());
-               par.insert(0, plaintext, LyXFont(), Change(Change::UNCHANGED));
+               par.layout(bp.getTextClass().defaultLayout());
+               par.insert(0, plaintext, Font(), Change(Change::UNCHANGED));
                pars.push_back(par);
                theCuts.push(make_pair(pars, bp.textclass));
        } else
@@ -701,7 +701,7 @@ void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
                        textclass_type textclass, ErrorList & errorList)
 {
        if (cur.inTexted()) {
-               LyXText * text = cur.text();
+               Text * text = cur.text();
                BOOST_ASSERT(text);
 
                pit_type endpit;
@@ -789,7 +789,7 @@ void replaceSelectionWithString(Cursor & cur, docstring const & str, bool backwa
        DocIterator selbeg = cur.selectionBegin();
 
        // Get font setting before we cut
-       LyXFont const font =
+       Font const font =
                selbeg.paragraph().getFontSettings(cur.buffer().params(), selbeg.pos());
 
        // Insert the new string
@@ -835,11 +835,11 @@ void eraseSelection(Cursor & cur)
                                cur.pos() = cur.lastpos();
                } else {
                        InsetMath * p = i1.asInsetMath();
-                       InsetBase::row_type r1, r2;
-                       InsetBase::col_type c1, c2;
+                       Inset::row_type r1, r2;
+                       Inset::col_type c1, c2;
                        region(i1, i2, r1, r2, c1, c2);
-                       for (InsetBase::row_type row = r1; row <= r2; ++row)
-                               for (InsetBase::col_type col = c1; col <= c2; ++col)
+                       for (Inset::row_type row = r1; row <= r2; ++row)
+                               for (Inset::col_type col = c1; col <= c2; ++col)
                                        p->cell(p->index(row, col)).clear();
                        // We've deleted the whole cell. Only pos 0 is valid.
                        cur.pos() = 0;
@@ -891,23 +891,23 @@ docstring grabSelection(Cursor const & cur)
 
        if (i1.idx() == i2.idx()) {
                if (i1.inset().asInsetMath()) {
-                       MathArray::const_iterator it = i1.cell().begin();
-                       return asString(MathArray(it + i1.pos(), it + i2.pos()));
+                       MathData::const_iterator it = i1.cell().begin();
+                       return asString(MathData(it + i1.pos(), it + i2.pos()));
                } else {
                        return from_ascii("unknown selection 1");
                }
        }
 
-       InsetBase::row_type r1, r2;
-       InsetBase::col_type c1, c2;
+       Inset::row_type r1, r2;
+       Inset::col_type c1, c2;
        region(i1, i2, r1, r2, c1, c2);
 
        docstring data;
        if (i1.inset().asInsetMath()) {
-               for (InsetBase::row_type row = r1; row <= r2; ++row) {
+               for (Inset::row_type row = r1; row <= r2; ++row) {
                        if (row > r1)
                                data += "\\\\";
-                       for (InsetBase::col_type col = c1; col <= c2; ++col) {
+                       for (Inset::col_type col = c1; col <= c2; ++col) {
                                if (col > c1)
                                        data += '&';
                                data += asString(i1.asInsetMath()->