* src/LyXRC.{cpp,h}:

[lyx.git] / src / Text2.cpp

diff --git a/src/Text2.cpp b/src/Text2.cpp
index c5171fbbd581a73e1a88cdfcd4018a951c5d9926..2a6abbfb39566c6cc997e9e820d313f1fffe9b50 100644 (file)
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -28,7 +28,7 @@
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Bullet.h"
-#include "Color.h"
+#include "Changes.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
 #include "debug.h"
@@ -48,7 +48,6 @@
 #include "Server.h"
 #include "ServerSocket.h"
 #include "TextMetrics.h"
-#include "Undo.h"
 #include "VSpace.h"
 
 #include "frontends/FontMetrics.h"
@@ -84,42 +83,42 @@ bool Text::isMainText(Buffer const & buffer) const
 }
 
 
-Font Text::getLayoutFont(Buffer const & buffer, pit_type const pit) const
+FontInfo Text::getLayoutFont(Buffer const & buffer, pit_type const pit) const
 {
        LayoutPtr const & layout = pars_[pit].layout();
 
        if (!pars_[pit].getDepth())  {
-               Font lf = layout->resfont;
+               FontInfo lf = layout->resfont;
                // In case the default family has been customized
-               if (layout->font.family() == Font::INHERIT_FAMILY)
-                       lf.setFamily(buffer.params().getFont().family());
+               if (layout->font.family() == INHERIT_FAMILY)
+                       lf.setFamily(buffer.params().getFont().fontInfo().family());
                return lf;
        }
 
-       Font font = layout->font;
+       FontInfo font = layout->font;
        // Realize with the fonts of lesser depth.
        //font.realize(outerFont(pit, paragraphs()));
-       font.realize(buffer.params().getFont());
+       font.realize(buffer.params().getFont().fontInfo());
 
        return font;
 }
 
 
-Font Text::getLabelFont(Buffer const & buffer, Paragraph const & par) const
+FontInfo Text::getLabelFont(Buffer const & buffer, Paragraph const & par) const
 {
        LayoutPtr const & layout = par.layout();
 
        if (!par.getDepth()) {
-               Font lf = layout->reslabelfont;
+               FontInfo lf = layout->reslabelfont;
                // In case the default family has been customized
-               if (layout->labelfont.family() == Font::INHERIT_FAMILY)
-                       lf.setFamily(buffer.params().getFont().family());
+               if (layout->labelfont.family() == INHERIT_FAMILY)
+                       lf.setFamily(buffer.params().getFont().fontInfo().family());
                return lf;
        }
 
-       Font font = layout->labelfont;
+       FontInfo font = layout->labelfont;
        // Realize with the fonts of lesser depth.
-       font.realize(buffer.params().getFont());
+       font.realize(buffer.params().getFont().fontInfo());
 
        return font;
 }
@@ -132,7 +131,7 @@ void Text::setCharFont(Buffer const & buffer, pit_type pit,
        LayoutPtr const & layout = pars_[pit].layout();
 
        // Get concrete layout font to reduce against
-       Font layoutfont;
+       FontInfo layoutfont;
 
        if (pos < pars_[pit].beginOfBody())
                layoutfont = layout->labelfont;
@@ -154,12 +153,12 @@ void Text::setCharFont(Buffer const & buffer, pit_type pit,
        // Inside inset, apply the inset's font attributes if any
        // (charstyle!)
        if (!isMainText(buffer))
-               layoutfont.realize(display_font);
+               layoutfont.realize(display_font.fontInfo());
 
-       layoutfont.realize(buffer.params().getFont());
+       layoutfont.realize(buffer.params().getFont().fontInfo());
 
        // Now, reduce font against full layout font
-       font.reduce(layoutfont);
+       font.fontInfo().reduce(layoutfont);
 
        pars_[pit].setFont(pos, font);
 }
@@ -292,7 +291,7 @@ void Text::changeDepth(Cursor & cur, DEPTH_CHANGE type)
        BOOST_ASSERT(this == cur.text());
        pit_type const beg = cur.selBegin().pit();
        pit_type const end = cur.selEnd().pit() + 1;
-       recordUndoSelection(cur);
+       cur.recordUndoSelection();
        int max_depth = (beg != 0 ? pars_[beg - 1].getMaxDepthAfter() : 0);
 
        for (pit_type pit = beg; pit != end; ++pit) {
@@ -317,7 +316,7 @@ void Text::setFont(Cursor & cur, Font const & font, bool toggleall)
        BOOST_ASSERT(this == cur.text());
        // Set the current_font
        // Determine basis font
-       Font layoutfont;
+       FontInfo layoutfont;
        pit_type pit = cur.pit();
        if (cur.pos() < pars_[pit].beginOfBody())
                layoutfont = getLabelFont(cur.buffer(), pars_[pit]);
@@ -331,16 +330,16 @@ void Text::setFont(Cursor & cur, Font const & font, bool toggleall)
 
        // Reduce to implicit settings
        cur.current_font = cur.real_current_font;
-       cur.current_font.reduce(layoutfont);
+       cur.current_font.fontInfo().reduce(layoutfont);
        // And resolve it completely
-       cur.real_current_font.realize(layoutfont);
+       cur.real_current_font.fontInfo().realize(layoutfont);
 
        // if there is no selection that's all we need to do
        if (!cur.selection())
                return;
 
        // Ok, we have a selection.
-       recordUndoSelection(cur);
+       cur.recordUndoSelection();
 
        setFont(cur.bv(), cur.selectionBegin().top(), 
                cur.selectionEnd().top(), font, toggleall);
@@ -396,7 +395,8 @@ void Text::toggleFree(Cursor & cur, Font const & font, bool toggleall)
 {
        BOOST_ASSERT(this == cur.text());
        // If the mask is completely neutral, tell user
-       if (font == Font(Font::ALL_IGNORE)) {
+       if (font.fontInfo() == ignore_font && 
+               (font.language() == 0 || font.language() == ignore_language)) {
                // Could only happen with user style
                cur.message(_("No font change defined."));
                return;
@@ -408,7 +408,7 @@ void Text::toggleFree(Cursor & cur, Font const & font, bool toggleall)
        CursorSlice resetCursor = cur.top();
        bool implicitSelection =
                font.language() == ignore_language
-               && font.number() == Font::IGNORE
+               && font.fontInfo().number() == FONT_IGNORE
                && selectWordWhenUnderCursor(cur, WHOLE_WORD_STRICT);
 
        // Set font
@@ -586,7 +586,7 @@ bool Text::checkAndActivateInset(Cursor & cur, bool front)
        if (!front && cur.pos() == 0)
                return false;
        Inset * inset = front ? cur.nextInset() : cur.prevInset();
-       if (!isHighlyEditableInset(inset))
+       if (!inset || inset->editable() != Inset::HIGHLY_EDITABLE)
                return false;
        /*
         * Apparently, when entering an inset we are expected to be positioned
@@ -602,7 +602,7 @@ bool Text::checkAndActivateInset(Cursor & cur, bool front)
 }
 
 
-bool Text::cursorLeft(Cursor & cur)
+bool Text::cursorBackward(Cursor & cur)
 {
        // Tell BufferView to test for FitCursor in any case!
        cur.updateFlags(Update::FitCursor);
@@ -644,7 +644,7 @@ bool Text::cursorLeft(Cursor & cur)
 }
 
 
-bool Text::cursorRight(Cursor & cur)
+bool Text::cursorForward(Cursor & cur)
 {
        // Tell BufferView to test for FitCursor in any case!
        cur.updateFlags(Update::FitCursor);
@@ -812,7 +812,7 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur,
 
        if (oldpar.empty() || (oldpar.size() == 1 && oldpar.isLineSeparator(0))) {
                // Delete old par.
-               recordUndo(old, Undo::ATOMIC,
+               old.recordUndo(ATOMIC_UNDO,
                           max(old.pit() - 1, pit_type(0)),
                           min(old.pit() + 1, old.lastpit()));
                ParagraphList & plist = old.text()->paragraphs();
@@ -893,13 +893,13 @@ void Text::deleteEmptyParagraphMechanism(pit_type first, pit_type last, bool tra
 
 void Text::recUndo(Cursor & cur, pit_type first, pit_type last) const
 {
-       recordUndo(cur, Undo::ATOMIC, first, last);
+       cur.recordUndo(ATOMIC_UNDO, first, last);
 }
 
 
 void Text::recUndo(Cursor & cur, pit_type par) const
 {
-       recordUndo(cur, Undo::ATOMIC, par, par);
+       cur.recordUndo(ATOMIC_UNDO, par, par);
 }
 
 } // namespace lyx