#include "Text.h"
+#include "Bidi.h"
#include "BranchList.h"
#include "FloatList.h"
#include "FuncStatus.h"
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());
bool Text::isRTL(Buffer const & buffer, Paragraph const & par) const
{
- return par.isRightToLeftPar(buffer.params());
+ return par.isRTL(buffer.params());
}
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 {
}
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();
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;
if (cur.pos() == 0)
cur.paragraph().params().labelWidthString(docstring());
else
- breakParagraph(cur, 0);
+ breakParagraph(cur, false);
cur.resetAnchor();
break;
}
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:
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;
}
break;
}
- case LFUN_FONT_CODE: {
+ case LFUN_FONT_TYPEWRITER: {
Font font(Font::ALL_IGNORE);
font.setFamily(Font::TYPEWRITER_FAMILY); // no good
toggleAndShow(cur, this, font);
case LFUN_FINISHED_LEFT:
LYXERR(Debug::DEBUG) << "handle LFUN_FINISHED_LEFT:\n" << cur << endl;
- if (reverseDirectionNeeded(cur))
+ if (reverseDirectionNeeded(cur)) {
++cur.pos();
+ cur.setCurrentFont();
+ }
break;
case LFUN_FINISHED_RIGHT:
LYXERR(Debug::DEBUG) << "handle LFUN_FINISHED_RIGHT:\n" << cur << endl;
- if (!reverseDirectionNeeded(cur))
+ if (!reverseDirectionNeeded(cur)) {
++cur.pos();
+ cur.setCurrentFont();
+ }
break;
case LFUN_LAYOUT_PARAGRAPH: {
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;
flag.setOnOff(font.family() == Font::ROMAN_FAMILY);
return true;
- case LFUN_FONT_CODE:
+ case LFUN_FONT_TYPEWRITER:
flag.setOnOff(font.family() == Font::TYPEWRITER_FAMILY);
return true;
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: