cut down pch.h to more frequently needed headers

[lyx.git] / src / Text3.cpp

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 320e3b43875f862d277104f7f04ed5f67503c8e2..a7186bc64f42691d61da2069a37b7bea82caf7d9 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -26,7 +26,6 @@
 #include "BufferView.h"
 #include "bufferview_funcs.h"
 #include "Cursor.h"
-#include "CoordCache.h"
 #include "CutAndPaste.h"
 #include "debug.h"
 #include "DispatchResult.h"
@@ -40,7 +39,6 @@
 #include "LyXFunc.h"
 #include "Lexer.h"
 #include "LyXRC.h"
-#include "Row.h"
 #include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
@@ -104,9 +102,9 @@ namespace {
 
                if (font.language() != ignore_language ||
                                font.number() != Font::IGNORE) {
-                       Paragraph & par = cur.paragraph();
-                       if (cur.boundary() != text->isRTLBoundary(cur.buffer(), par,
-                                               cur.pos(), text->real_current_font))
+                       TextMetrics const & tm = cur.bv().textMetrics(text);
+                       if (cur.boundary() != tm.isRTLBoundary(cur.pit(),
+                                               cur.pos(), cur.real_current_font))
                                text->setCursor(cur, cur.pit(), cur.pos(),
                                                false, !cur.boundary());
                }
@@ -249,57 +247,7 @@ void Text::number(Cursor & cur)
 
 bool Text::isRTL(Buffer const & buffer, Paragraph const & par) const
 {
-       return par.isRightToLeftPar(buffer.params());
-}
-
-
-bool Text::isRTL(Buffer const & buffer, CursorSlice const & sl, bool boundary) const
-{
-       if (!lyxrc.rtl_support && !sl.text())
-               return false;
-
-       int correction = 0;
-       if (boundary && sl.pos() > 0)
-               correction = -1;
-               
-       Paragraph const & par = getPar(sl.pit());
-       return getFont(buffer, par, sl.pos() + correction).isVisibleRightToLeft();
-}
-
-
-bool Text::isRTLBoundary(Buffer const & buffer, Paragraph const & par,
-                         pos_type pos) const
-{
-       if (!lyxrc.rtl_support)
-               return false;
-
-       // no RTL boundary at line start
-       if (pos == 0)
-               return false;
-
-       bool left = getFont(buffer, par, pos - 1).isVisibleRightToLeft();
-       bool right;
-       if (pos == par.size())
-               right = par.isRightToLeftPar(buffer.params());
-       else
-               right = getFont(buffer, par, pos).isVisibleRightToLeft();
-       return left != right;
-}
-
-
-bool Text::isRTLBoundary(Buffer const & buffer, Paragraph const & par,
-                         pos_type pos, Font const & font) const
-{
-       if (!lyxrc.rtl_support)
-               return false;
-
-       bool left = font.isVisibleRightToLeft();
-       bool right;
-       if (pos == par.size())
-               right = par.isRightToLeftPar(buffer.params());
-       else
-               right = getFont(buffer, par, pos).isVisibleRightToLeft();
-       return left != right;
+       return par.isRTL(buffer.params());
 }
 
 
@@ -398,7 +346,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                if (cur.selection()) {
                        cutSelection(cur, true, false);
                } else
-                       deleteLineForward(cur);
+                       tm.deleteLineForward(cur);
                finishChange(cur, false);
                break;
 
@@ -492,9 +440,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                needsUpdate |= cursorDownParagraph(cur);
                break;
 
-       case LFUN_SCREEN_UP:
        case LFUN_SCREEN_UP_SELECT:
-               needsUpdate |= cur.selHandle(cmd.action == LFUN_SCREEN_UP_SELECT);
+               needsUpdate |= cur.selHandle(true);
                if (cur.pit() == 0 && cur.textRow().pos() == 0)
                        cur.undispatched();
                else {
@@ -502,9 +449,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                }
                break;
 
-       case LFUN_SCREEN_DOWN:
        case LFUN_SCREEN_DOWN_SELECT:
-               needsUpdate |= cur.selHandle(cmd.action == LFUN_SCREEN_DOWN_SELECT);
+               needsUpdate |= cur.selHandle(true);
                if (cur.pit() == cur.lastpit()
                          && cur.textRow().endpos() == cur.lastpos())
                        cur.undispatched();
@@ -516,13 +462,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_LINE_BEGIN:
        case LFUN_LINE_BEGIN_SELECT:
                needsUpdate |= cur.selHandle(cmd.action == LFUN_LINE_BEGIN_SELECT);
-               needsUpdate |= cursorHome(cur);
+               needsUpdate |= tm.cursorHome(cur);
                break;
 
        case LFUN_LINE_END:
        case LFUN_LINE_END_SELECT:
                needsUpdate |= cur.selHandle(cmd.action == LFUN_LINE_END_SELECT);
-               needsUpdate |= cursorEnd(cur);
+               needsUpdate |= tm.cursorEnd(cur);
                break;
 
        case LFUN_WORD_FORWARD:
@@ -626,13 +572,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
        case LFUN_BREAK_PARAGRAPH:
                cap::replaceSelection(cur);
-               breakParagraph(cur, 0);
+               breakParagraph(cur, false);
                cur.resetAnchor();
                break;
 
        case LFUN_BREAK_PARAGRAPH_KEEP_LAYOUT:
                cap::replaceSelection(cur);
-               breakParagraph(cur, 1);
+               breakParagraph(cur, true);
                cur.resetAnchor();
                break;
 
@@ -643,7 +589,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                if (cur.pos() == 0)
                        cur.paragraph().params().labelWidthString(docstring());
                else
-                       breakParagraph(cur, 0);
+                       breakParagraph(cur, false);
                cur.resetAnchor();
                break;
        }
@@ -826,9 +772,9 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        }
 
        case LFUN_SERVER_GET_FONT:
-               if (current_font.shape() == Font::ITALIC_SHAPE)
+               if (cur.current_font.shape() == Font::ITALIC_SHAPE)
                        cur.message(from_ascii("E"));
-               else if (current_font.shape() == Font::SMALLCAPS_SHAPE)
+               else if (cur.current_font.shape() == Font::SMALLCAPS_SHAPE)
                        cur.message(from_ascii("N"));
                else
                        cur.message(from_ascii("0"));
@@ -959,9 +905,9 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
        case LFUN_MOUSE_TRIPLE:
                if (cmd.button() == mouse_button::button1) {
-                       cursorHome(cur);
+                       tm.cursorHome(cur);
                        cur.resetAnchor();
-                       cursorEnd(cur);
+                       tm.cursorEnd(cur);
                        cur.setSelection();
                        bv->cursor() = cur;
                }
@@ -1098,7 +1044,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                }
 
                cur.clearSelection();
-               Font const old_font = real_current_font;
+               Font const old_font = cur.real_current_font;
 
                docstring::const_iterator cit = cmd.argument().begin();
                docstring::const_iterator end = cmd.argument().end();
@@ -1178,7 +1124,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                updateLabels(bv->buffer());
                break;
        case LFUN_NOTE_INSERT:
-       case LFUN_CHARSTYLE_INSERT:
+       case LFUN_FLEX_INSERT:
        case LFUN_BOX_INSERT:
        case LFUN_BRANCH_INSERT:
        case LFUN_BIBITEM_INSERT:
@@ -1254,12 +1200,10 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                recordUndo(cur);
                cur.clearSelection();
                insertInset(cur, inset);
-               inset->edit(cur, true);
                // Show the dialog for the nomenclature entry, since the
                // description entry still needs to be filled in.
                if (cmd.action == LFUN_NOMENCL_INSERT)
-                       InsetCommandMailer("nomenclature",
-                               *reinterpret_cast<InsetCommand *>(inset)).showDialog(&cur.bv());
+                       inset->edit(cur, true);
                cur.posRight();
                break;
        }
@@ -1627,7 +1571,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 {
        BOOST_ASSERT(cur.text() == this);
 
-       Font const & font = real_current_font;
+       Font const & font = cur.real_current_font;
        bool enable = true;
        Inset::Code code = Inset::NO_CODE;
 
@@ -1732,11 +1676,16 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_NOTE_INSERT:
                code = Inset::NOTE_CODE;
                break;
-       case LFUN_CHARSTYLE_INSERT:
-               code = Inset::CHARSTYLE_CODE;
-               if (cur.buffer().params().getTextClass().insetlayouts().empty())
+       case LFUN_FLEX_INSERT: {
+               code = Inset::FLEX_CODE;
+               string s = cmd.getArg(0);
+               InsetLayout il =  cur.buffer().params().getTextClass().insetlayout(from_utf8(s));
+               if (il.lyxtype != "charstyle" &&
+                   il.lyxtype != "custom" &&
+                   il.lyxtype != "element")
                        enable = false;
                break;
+               }
        case LFUN_BOX_INSERT:
                code = Inset::BOX_CODE;
                break;
@@ -1902,8 +1851,6 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_WORD_SELECT:
        case LFUN_PARAGRAPH_UP:
        case LFUN_PARAGRAPH_DOWN:
-       case LFUN_SCREEN_UP:
-       case LFUN_SCREEN_DOWN:
        case LFUN_LINE_BEGIN:
        case LFUN_LINE_END:
        case LFUN_BREAK_LINE: