Fulfill promise to Andre: TextClass_ptr --> TextClassPtr.

[lyx.git] / src / Text3.cpp

diff --git a/src/Text3.cpp b/src/Text3.cpp
index e89f81e77a75ab8203bf618f9e61c0b3bd542e7c..a7186bc64f42691d61da2069a37b7bea82caf7d9 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -102,9 +102,8 @@ namespace {
 
                if (font.language() != ignore_language ||
                                font.number() != Font::IGNORE) {
-                       Paragraph & par = cur.paragraph();
                        TextMetrics const & tm = cur.bv().textMetrics(text);
-                       if (cur.boundary() != tm.isRTLBoundary(par,
+                       if (cur.boundary() != tm.isRTLBoundary(cur.pit(),
                                                cur.pos(), cur.real_current_font))
                                text->setCursor(cur, cur.pit(), cur.pos(),
                                                false, !cur.boundary());
@@ -248,7 +247,7 @@ void Text::number(Cursor & cur)
 
 bool Text::isRTL(Buffer const & buffer, Paragraph const & par) const
 {
-       return par.isRightToLeftPar(buffer.params());
+       return par.isRTL(buffer.params());
 }
 
 
@@ -441,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 {
@@ -451,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();
@@ -575,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;
 
@@ -592,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;
        }
@@ -1127,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:
@@ -1203,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;
        }
@@ -1681,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;
@@ -1851,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: