#include "BufferView.h"
#include "Cursor.h"
#include "CutAndPaste.h"
-#include "debug.h"
#include "DispatchResult.h"
#include "ErrorList.h"
#include "factory.h"
#include "FuncRequest.h"
-#include "gettext.h"
#include "InsetList.h"
#include "Intl.h"
#include "Language.h"
#include "Paragraph.h"
#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
+#include "TextClass.h"
#include "TextMetrics.h"
#include "VSpace.h"
-#include "ParIterator.h"
#include "frontends/Clipboard.h"
#include "frontends/Selection.h"
#include "insets/InsetText.h"
#include "insets/InsetInfo.h"
-#include "support/lstrings.h"
-#include "support/lyxlib.h"
#include "support/convert.h"
+#include "support/debug.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
#include "support/lyxtime.h"
#include "mathed/InsetMathHull.h"
#include "mathed/MathMacroTemplate.h"
-#include <boost/current_function.hpp>
+#include <boost/next_prior.hpp>
#include <clocale>
#include <sstream>
-using std::endl;
-using std::string;
-using std::istringstream;
-using std::ostringstream;
+using namespace std;
+using namespace lyx::support;
namespace lyx {
using cap::copySelection;
using cap::cutSelection;
using cap::pasteFromStack;
-using cap::pasteClipboard;
+using cap::pasteClipboardText;
+using cap::pasteClipboardGraphics;
using cap::replaceSelection;
-using support::isStrUnsignedInt;
-using support::token;
-
// globals...
-static Font freefont(Font::ALL_IGNORE);
+static Font freefont(ignore_font, ignore_language);
static bool toggleall = false;
static void toggleAndShow(Cursor & cur, Text * text,
text->toggleFree(cur, font, toggleall);
if (font.language() != ignore_language ||
- font.number() != Font::IGNORE) {
+ font.fontInfo().number() != FONT_IGNORE) {
TextMetrics const & tm = cur.bv().textMetrics(text);
- if (cur.boundary() != tm.isRTLBoundary(cur.pit(),
- cur.pos(), cur.real_current_font))
+ if (cur.boundary() != tm.isRTLBoundary(cur.pit(), cur.pos(),
+ cur.real_current_font))
text->setCursor(cur, cur.pit(), cur.pos(),
- false, !cur.boundary());
+ false, !cur.boundary());
}
}
// somewhere, and an ordinary formula
// otherwise
if (sel.find(from_ascii("\\newcommand")) == string::npos
+ && sel.find(from_ascii("\\newlyxcommand")) == string::npos
&& sel.find(from_ascii("\\def")) == string::npos)
{
InsetMathHull * formula = new InsetMathHull;
istringstream is(to_utf8(sel));
Lexer lex(0, 0);
lex.setStream(is);
- formula->read(cur.buffer(), lex);
+ formula->read(lex);
if (formula->getType() == hullNone)
// Don't create pseudo formulas if
// delimiters are left out
cur.recordUndo();
cap::replaceSelection(cur);
cur.insert(new InsetSpecialChar(kind));
- cur.posRight();
+ cur.posForward();
}
static bool doInsertInset(Cursor & cur, Text * text,
FuncRequest const & cmd, bool edit, bool pastesel)
{
- Inset * inset = createInset(&cur.bv(), cmd);
+ Buffer & buffer = cur.bv().buffer();
+ BufferParams const & bparams = buffer.params();
+ Inset * inset = createInset(buffer, cmd);
if (!inset)
return false;
+ if (InsetCollapsable * ci = inset->asInsetCollapsable())
+ ci->setLayout(bparams);
+
cur.recordUndo();
if (cmd.action == LFUN_INDEX_INSERT) {
- docstring ds = support::subst(text->getStringToIndex(cur), '\n', ' ');
+ docstring ds = subst(text->getStringToIndex(cur), '\n', ' ');
text->insertInset(cur, inset);
if (edit)
inset->edit(cur, true);
// Now put this into inset
static_cast<InsetCollapsable *>(inset)->text_.insertStringAsParagraphs(cur, ds);
- } else {
- bool gotsel = false;
- if (cur.selection()) {
- lyx::dispatch(FuncRequest(LFUN_CUT));
- gotsel = true;
- }
- text->insertInset(cur, inset);
+ return true;
+ }
- if (edit)
- inset->edit(cur, true);
+ bool gotsel = false;
+ if (cur.selection()) {
+ lyx::dispatch(FuncRequest(LFUN_CUT));
+ gotsel = true;
+ }
+ text->insertInset(cur, inset);
- if (gotsel && pastesel) {
- lyx::dispatch(FuncRequest(LFUN_PASTE, "0"));
- InsetText * insetText = dynamic_cast<InsetText *>(inset);
- if (insetText && !insetText->allowMultiPar()
- || cur.lastpit() == 0) {
- // reset first par to default
- LayoutPtr const layout =
- cur.buffer().params().getTextClass().defaultLayout();
- cur.text()->paragraphs().begin()->layout(layout);
- cur.pos() = 0;
- cur.pit() = 0;
- // Merge multiple paragraphs -- hack
- while (cur.lastpit() > 0) {
- mergeParagraph(cur.buffer().params(),
- cur.text()->paragraphs(), 0);
- }
- } else {
- // reset surrounding par to default
- docstring const layoutname =
- cur.buffer().params().getTextClass().defaultLayoutName();
- cur.leaveInset(*inset);
- text->setLayout(cur, layoutname);
- }
- }
+ if (edit)
+ inset->edit(cur, true);
+
+ if (!gotsel || !pastesel)
+ return true;
+
+ lyx::dispatch(FuncRequest(LFUN_PASTE, "0"));
+ InsetText * insetText = dynamic_cast<InsetText *>(inset);
+ if (insetText && !insetText->allowMultiPar() || cur.lastpit() == 0) {
+ // reset first par to default
+ cur.text()->paragraphs().begin()
+ ->setEmptyOrDefaultLayout(bparams.documentClass());
+ cur.pos() = 0;
+ cur.pit() = 0;
+ // Merge multiple paragraphs -- hack
+ while (cur.lastpit() > 0)
+ mergeParagraph(bparams, cur.text()->paragraphs(), 0);
+ } else {
+ // reset surrounding par to default
+ docstring const layoutname = insetText->useEmptyLayout()
+ ? bparams.documentClass().emptyLayoutName()
+ : bparams.documentClass().defaultLayoutName();
+ cur.leaveInset(*inset);
+ text->setLayout(cur, layoutname);
}
+
return true;
}
}
+/// the type of outline operation
+enum OutlineOp {
+ OutlineUp, // Move this header with text down
+ OutlineDown, // Move this header with text up
+ OutlineIn, // Make this header deeper
+ OutlineOut // Make this header shallower
+};
+
+
+static void outline(OutlineOp mode, Cursor & cur)
+{
+ Buffer & buf = cur.buffer();
+ pit_type & pit = cur.pit();
+ ParagraphList & pars = buf.text().paragraphs();
+ ParagraphList::iterator bgn = pars.begin();
+ // The first paragraph of the area to be copied:
+ ParagraphList::iterator start = boost::next(bgn, pit);
+ // The final paragraph of area to be copied:
+ ParagraphList::iterator finish = start;
+ ParagraphList::iterator end = pars.end();
+
+ DocumentClass const & tc = buf.params().documentClass();
+
+ int const thistoclevel = start->layout().toclevel;
+ int toclevel;
+
+ // Move out (down) from this section header
+ if (finish != end)
+ ++finish;
+ // Seek the one (on same level) below
+ for (; finish != end; ++finish) {
+ toclevel = finish->layout().toclevel;
+ if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel) {
+ break;
+ }
+ }
+
+ switch (mode) {
+ case OutlineUp: {
+ ParagraphList::iterator dest = start;
+ // Move out (up) from this header
+ if (dest == bgn)
+ return;
+ // Search previous same-level header above
+ do {
+ --dest;
+ toclevel = dest->layout().toclevel;
+ } while(dest != bgn
+ && (toclevel == Layout::NOT_IN_TOC
+ || toclevel > thistoclevel));
+ // Not found; do nothing
+ if (toclevel == Layout::NOT_IN_TOC || toclevel > thistoclevel)
+ return;
+ pit_type const newpit = distance(bgn, dest);
+ pit_type const len = distance(start, finish);
+ pit_type const deletepit = pit + len;
+ buf.undo().recordUndo(cur, ATOMIC_UNDO, newpit, deletepit - 1);
+ pars.insert(dest, start, finish);
+ start = boost::next(pars.begin(), deletepit);
+ pit = newpit;
+ pars.erase(start, finish);
+ return;
+ }
+ case OutlineDown: {
+ ParagraphList::iterator dest = finish;
+ // One such was found:
+ pit_type newpit = distance(bgn, dest);
+ pit_type const len = distance(start, finish);
+ buf.undo().recordUndo(cur, ATOMIC_UNDO, pit, newpit - 1);
+ pars.insert(dest, start, finish);
+ start = boost::next(bgn, pit);
+ pit = newpit - len;
+ pars.erase(start, finish);
+ return;
+ }
+ case OutlineIn: {
+ pit_type const len = distance(start, finish);
+ buf.undo().recordUndo(cur, ATOMIC_UNDO, pit, pit + len - 1);
+ for (; start != finish; ++start) {
+ toclevel = start->layout().toclevel;
+ if (toclevel == Layout::NOT_IN_TOC)
+ continue;
+ DocumentClass::const_iterator lit = tc.begin();
+ DocumentClass::const_iterator len = tc.end();
+ for (; lit != len; ++lit) {
+ if (lit->toclevel == toclevel + 1 &&
+ start->layout().labeltype == lit->labeltype) {
+ start->setLayout(*lit);
+ break;
+ }
+ }
+ }
+ return;
+ }
+ case OutlineOut: {
+ pit_type const len = distance(start, finish);
+ buf.undo().recordUndo(cur, ATOMIC_UNDO, pit, pit + len - 1);
+ for (; start != finish; ++start) {
+ toclevel = start->layout().toclevel;
+ if (toclevel == Layout::NOT_IN_TOC)
+ continue;
+ DocumentClass::const_iterator lit = tc.begin();
+ DocumentClass::const_iterator len = tc.end();
+ for (; lit != len; ++lit) {
+ if (lit->toclevel == toclevel - 1 &&
+ start->layout().labeltype == lit->labeltype) {
+ start->setLayout(*lit);
+ break;
+ }
+ }
+ }
+ return;
+ }
+ }
+}
+
+
void Text::number(Cursor & cur)
{
- Font font(Font::ALL_IGNORE);
- font.setNumber(Font::TOGGLE);
- toggleAndShow(cur, this, font);
+ FontInfo font = ignore_font;
+ font.setNumber(FONT_TOGGLE);
+ toggleAndShow(cur, this, Font(font, ignore_language));
}
void Text::dispatch(Cursor & cur, FuncRequest & cmd)
{
- LYXERR(Debug::ACTION) << "Text::dispatch: cmd: " << cmd << endl;
+ LYXERR(Debug::ACTION, "Text::dispatch: cmd: " << cmd);
+
+ BufferView * bv = &cur.bv();
+ TextMetrics & tm = bv->textMetrics(this);
+ if (!tm.contains(cur.pit()))
+ lyx::dispatch(FuncRequest(LFUN_SCREEN_RECENTER));
// FIXME: We use the update flag to indicates wether a singlePar or a
// full screen update is needed. We reset it here but shall we restore it
cur.noUpdate();
BOOST_ASSERT(cur.text() == this);
- BufferView * bv = &cur.bv();
- TextMetrics & tm = cur.bv().textMetrics(this);
CursorSlice oldTopSlice = cur.top();
bool oldBoundary = cur.boundary();
bool sel = cur.selection();
// Signals that a full-screen update is required
bool needsUpdate = !(lyxaction.funcHasFlag(cmd.action,
LyXAction::NoUpdate) || singleParUpdate);
- // Remember the old paragraph metric (_outer_ paragraph!)
- ParagraphMetrics const & pm = cur.bv().parMetrics(
- cur.bottom().text(), cur.bottom().pit());
- Dimension olddim = pm.dim();
switch (cmd.action) {
pit_type const pit = cur.pit();
recUndo(cur, pit, pit + 1);
cur.finishUndo();
- std::swap(pars_[pit], pars_[pit + 1]);
+ swap(pars_[pit], pars_[pit + 1]);
updateLabels(cur.buffer());
needsUpdate = true;
++cur.pit();
pit_type const pit = cur.pit();
recUndo(cur, pit - 1, pit);
cur.finishUndo();
- std::swap(pars_[pit], pars_[pit - 1]);
+ swap(pars_[pit], pars_[pit - 1]);
updateLabels(cur.buffer());
--cur.pit();
needsUpdate = true;
} else {
cur.undispatched();
}
+ cur.updateFlags(Update::FitCursor);
break;
case LFUN_BUFFER_END:
} else {
cur.undispatched();
}
+ cur.updateFlags(Update::FitCursor);
break;
case LFUN_CHAR_FORWARD:
case LFUN_CHAR_FORWARD_SELECT:
- //lyxerr << BOOST_CURRENT_FUNCTION
- // << " LFUN_CHAR_FORWARD[SEL]:\n" << cur << endl;
+ //LYXERR0(" LFUN_CHAR_FORWARD[SEL]:\n" << cur);
needsUpdate |= cur.selHandle(cmd.action == LFUN_CHAR_FORWARD_SELECT);
needsUpdate |= cursorForward(cur);
case LFUN_CHAR_LEFT:
case LFUN_CHAR_LEFT_SELECT:
- //FIXME: for visual cursor, really move left
- if (reverseDirectionNeeded(cur)) {
- lyx::dispatch(FuncRequest(
- cmd.action == LFUN_CHAR_LEFT_SELECT ?
- LFUN_CHAR_FORWARD_SELECT : LFUN_CHAR_FORWARD));
+ if (lyxrc.visual_cursor) {
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_CHAR_LEFT_SELECT);
+ needsUpdate |= cursorVisLeft(cur);
+ if (!needsUpdate && oldTopSlice == cur.top()
+ && cur.boundary() == oldBoundary) {
+ cur.undispatched();
+ cmd = FuncRequest(LFUN_FINISHED_LEFT);
+ }
} else {
- lyx::dispatch(FuncRequest(
- cmd.action == LFUN_CHAR_LEFT_SELECT ?
- LFUN_CHAR_BACKWARD_SELECT : LFUN_CHAR_BACKWARD));
+ if (reverseDirectionNeeded(cur)) {
+ cmd.action = cmd.action == LFUN_CHAR_LEFT_SELECT ?
+ LFUN_CHAR_FORWARD_SELECT : LFUN_CHAR_FORWARD;
+ } else {
+ cmd.action = cmd.action == LFUN_CHAR_LEFT_SELECT ?
+ LFUN_CHAR_BACKWARD_SELECT : LFUN_CHAR_BACKWARD;
+ }
+ dispatch(cur, cmd);
+ return;
}
break;
case LFUN_CHAR_RIGHT:
case LFUN_CHAR_RIGHT_SELECT:
- //FIXME: for visual cursor, really move right
- if (reverseDirectionNeeded(cur)) {
- lyx::dispatch(FuncRequest(
- cmd.action == LFUN_CHAR_RIGHT_SELECT ?
- LFUN_CHAR_BACKWARD_SELECT : LFUN_CHAR_BACKWARD));
+ if (lyxrc.visual_cursor) {
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_CHAR_RIGHT_SELECT);
+ needsUpdate |= cursorVisRight(cur);
+ if (!needsUpdate && oldTopSlice == cur.top()
+ && cur.boundary() == oldBoundary) {
+ cur.undispatched();
+ cmd = FuncRequest(LFUN_FINISHED_RIGHT);
+ }
} else {
- lyx::dispatch(FuncRequest(
- cmd.action == LFUN_CHAR_RIGHT_SELECT ?
- LFUN_CHAR_FORWARD_SELECT : LFUN_CHAR_FORWARD));
+ if (reverseDirectionNeeded(cur)) {
+ cmd.action = cmd.action == LFUN_CHAR_RIGHT_SELECT ?
+ LFUN_CHAR_BACKWARD_SELECT : LFUN_CHAR_BACKWARD;
+ } else {
+ cmd.action = cmd.action == LFUN_CHAR_RIGHT_SELECT ?
+ LFUN_CHAR_FORWARD_SELECT : LFUN_CHAR_FORWARD;
+ }
+ dispatch(cur, cmd);
+ return;
}
break;
+
case LFUN_UP_SELECT:
case LFUN_DOWN_SELECT:
bool up = cmd.action == LFUN_UP_SELECT || cmd.action == LFUN_UP;
bool const successful = cur.upDownInText(up, needsUpdate);
if (successful) {
- // notify insets which were left and get their update flags
- notifyCursorLeaves(cur.beforeDispatchCursor(), cur);
- cur.fixIfBroken();
-
// redraw if you leave mathed (for the decorations)
needsUpdate |= cur.beforeDispatchCursor().inMathed();
} else
needsUpdate |= cursorDownParagraph(cur);
break;
- case LFUN_SCREEN_UP_SELECT:
- needsUpdate |= cur.selHandle(true);
- if (cur.pit() == 0 && cur.textRow().pos() == 0)
- cur.undispatched();
- else {
- tm.cursorPrevious(cur);
- }
- break;
-
- case LFUN_SCREEN_DOWN_SELECT:
- needsUpdate |= cur.selHandle(true);
- if (cur.pit() == cur.lastpit()
- && cur.textRow().endpos() == cur.lastpos())
- cur.undispatched();
- else {
- tm.cursorNext(cur);
- }
- break;
-
case LFUN_LINE_BEGIN:
case LFUN_LINE_BEGIN_SELECT:
needsUpdate |= cur.selHandle(cmd.action == LFUN_LINE_BEGIN_SELECT);
needsUpdate |= tm.cursorEnd(cur);
break;
+ case LFUN_WORD_RIGHT:
+ case LFUN_WORD_RIGHT_SELECT:
+ //FIXME: for visual cursor mode, really move right
+ if (reverseDirectionNeeded(cur)) {
+ cmd.action = cmd.action == LFUN_WORD_RIGHT_SELECT ?
+ LFUN_WORD_BACKWARD_SELECT : LFUN_WORD_BACKWARD;
+ } else {
+ cmd.action = cmd.action == LFUN_WORD_RIGHT_SELECT ?
+ LFUN_WORD_FORWARD_SELECT : LFUN_WORD_FORWARD;
+ }
+ dispatch(cur, cmd);
+ return;
+
case LFUN_WORD_FORWARD:
case LFUN_WORD_FORWARD_SELECT:
needsUpdate |= cur.selHandle(cmd.action == LFUN_WORD_FORWARD_SELECT);
- if (reverseDirectionNeeded(cur))
- needsUpdate |= cursorLeftOneWord(cur);
- else
- needsUpdate |= cursorRightOneWord(cur);
+ needsUpdate |= cursorForwardOneWord(cur);
break;
+ case LFUN_WORD_LEFT:
+ case LFUN_WORD_LEFT_SELECT:
+ //FIXME: for visual cursor mode, really move left
+ if (reverseDirectionNeeded(cur)) {
+ cmd.action = cmd.action == LFUN_WORD_LEFT_SELECT ?
+ LFUN_WORD_FORWARD_SELECT : LFUN_WORD_FORWARD;
+ } else {
+ cmd.action = cmd.action == LFUN_WORD_LEFT_SELECT ?
+ LFUN_WORD_BACKWARD_SELECT : LFUN_WORD_BACKWARD;
+ }
+ dispatch(cur, cmd);
+ return;
+
case LFUN_WORD_BACKWARD:
case LFUN_WORD_BACKWARD_SELECT:
needsUpdate |= cur.selHandle(cmd.action == LFUN_WORD_BACKWARD_SELECT);
- if (reverseDirectionNeeded(cur))
- needsUpdate |= cursorRightOneWord(cur);
- else
- needsUpdate |= cursorLeftOneWord(cur);
+ needsUpdate |= cursorBackwardOneWord(cur);
break;
case LFUN_WORD_SELECT: {
break;
}
- case LFUN_BREAK_LINE: {
+ case LFUN_NEW_LINE: {
// Not allowed by LaTeX (labels or empty par)
if (cur.pos() > cur.paragraph().beginOfBody()) {
// this avoids a double undo
cur.recordUndo();
cap::replaceSelection(cur);
cur.insert(new InsetNewline);
- cur.posRight();
+ cur.posForward();
+ moveCursor(cur, false);
+ }
+ break;
+ }
+
+ case LFUN_LINE_BREAK: {
+ // Not allowed by LaTeX (labels or empty par)
+ if (cur.pos() > cur.paragraph().beginOfBody()) {
+ // this avoids a double undo
+ // FIXME: should not be needed, ideally
+ if (!cur.selection())
+ cur.recordUndo();
+ cap::replaceSelection(cur);
+ cur.insert(new InsetLinebreak);
+ cur.posForward();
moveCursor(cur, false);
}
break;
case LFUN_INSET_INSERT: {
cur.recordUndo();
- Inset * inset = createInset(bv, cmd);
+ Inset * inset = createInset(bv->buffer(), cmd);
if (inset) {
// FIXME (Abdel 01/02/2006):
// What follows would be a partial fix for bug 2154:
/*
Paragraph & par = pars_[cur.pit()];
if (inset->lyxCode() == LABEL_CODE
- && par.layout()->labeltype == LABEL_COUNTER) {
+ && par.layout().labeltype == LABEL_COUNTER) {
// Go to the end of the paragraph
// Warning: Because of Change-Tracking, the last
// position is 'size()' and not 'size()-1':
*/
if (cur.selection())
cutSelection(cur, true, false);
- insertInset(cur, inset);
- cur.posRight();
+ cur.insert(inset);
+ cur.posForward();
}
break;
}
break;
case LFUN_SPACE_INSERT:
- if (cur.paragraph().layout()->free_spacing)
+ if (cur.paragraph().layout().free_spacing)
insertChar(cur, ' ');
else {
doInsertInset(cur, this, cmd, false, false);
- cur.posRight();
+ cur.posForward();
}
moveCursor(cur, false);
break;
- case LFUN_HYPHENATION_POINT_INSERT:
- specialChar(cur, InsetSpecialChar::HYPHENATION);
- break;
-
- case LFUN_LIGATURE_BREAK_INSERT:
- specialChar(cur, InsetSpecialChar::LIGATURE_BREAK);
- break;
-
- case LFUN_DOTS_INSERT:
- specialChar(cur, InsetSpecialChar::LDOTS);
- break;
-
- case LFUN_END_OF_SENTENCE_PERIOD_INSERT:
- specialChar(cur, InsetSpecialChar::END_OF_SENTENCE);
- break;
-
- case LFUN_MENU_SEPARATOR_INSERT:
- specialChar(cur, InsetSpecialChar::MENU_SEPARATOR);
+ case LFUN_SPECIALCHAR_INSERT: {
+ string const name = to_utf8(cmd.argument());
+ if (name == "hyphenation")
+ specialChar(cur, InsetSpecialChar::HYPHENATION);
+ else if (name == "ligature-break")
+ specialChar(cur, InsetSpecialChar::LIGATURE_BREAK);
+ else if (name == "slash")
+ specialChar(cur, InsetSpecialChar::SLASH);
+ else if (name == "nobreakdash")
+ specialChar(cur, InsetSpecialChar::NOBREAKDASH);
+ else if (name == "dots")
+ specialChar(cur, InsetSpecialChar::LDOTS);
+ else if (name == "end-of-sentence")
+ specialChar(cur, InsetSpecialChar::END_OF_SENTENCE);
+ else if (name == "menu-separator")
+ specialChar(cur, InsetSpecialChar::MENU_SEPARATOR);
+ else if (name.empty())
+ lyxerr << "LyX function 'specialchar-insert' needs an argument." << endl;
+ else
+ lyxerr << "Wrong argument for LyX function 'specialchar-insert'." << endl;
break;
+ }
case LFUN_WORD_UPCASE:
changeCase(cur, text_uppercase);
charsTranspose(cur);
break;
- case LFUN_PASTE:
+ case LFUN_PASTE: {
cur.message(_("Paste"));
cap::replaceSelection(cur);
- if (cmd.argument().empty() && !theClipboard().isInternal())
- pasteClipboard(cur, bv->buffer().errorList("Paste"));
- else {
- string const arg(to_utf8(cmd.argument()));
+
+ // without argument?
+ string const arg = to_utf8(cmd.argument());
+ if (arg.empty()) {
+ if (theClipboard().isInternal())
+ pasteFromStack(cur, bv->buffer().errorList("Paste"), 0);
+ else if (theClipboard().hasGraphicsContents())
+ pasteClipboardGraphics(cur, bv->buffer().errorList("Paste"));
+ else
+ pasteClipboardText(cur, bv->buffer().errorList("Paste"));
+ } else if (isStrUnsignedInt(arg)) {
+ // we have a numerical argument
pasteFromStack(cur, bv->buffer().errorList("Paste"),
- isStrUnsignedInt(arg) ?
- convert<unsigned int>(arg) :
- 0);
+ convert<unsigned int>(arg));
+ } else {
+ Clipboard::GraphicsType type = Clipboard::AnyGraphicsType;
+ if (arg == "pdf")
+ type = Clipboard::PdfGraphicsType;
+ else if (arg == "png")
+ type = Clipboard::PngGraphicsType;
+ else if (arg == "jpeg")
+ type = Clipboard::JpegGraphicsType;
+ else if (arg == "linkback")
+ type = Clipboard::LinkBackGraphicsType;
+ else
+ BOOST_ASSERT(false);
+
+ pasteClipboardGraphics(cur, bv->buffer().errorList("Paste"), type);
}
+
bv->buffer().errors("Paste");
cur.clearSelection(); // bug 393
cur.finishUndo();
break;
+ }
case LFUN_CUT:
cutSelection(cur, true, true);
is >> x >> y;
if (!is)
lyxerr << "SETXY: Could not parse coordinates in '"
- << to_utf8(cmd.argument()) << std::endl;
+ << to_utf8(cmd.argument()) << endl;
else
tm.setCursorFromCoordinates(cur, x, y);
break;
}
case LFUN_SERVER_GET_FONT:
- if (cur.current_font.shape() == Font::ITALIC_SHAPE)
+ if (cur.current_font.fontInfo().shape() == ITALIC_SHAPE)
cur.message(from_ascii("E"));
- else if (cur.current_font.shape() == Font::SMALLCAPS_SHAPE)
+ else if (cur.current_font.fontInfo().shape() == SMALLCAPS_SHAPE)
cur.message(from_ascii("N"));
else
cur.message(from_ascii("0"));
break;
case LFUN_SERVER_GET_LAYOUT:
- cur.message(cur.paragraph().layout()->name());
+ cur.message(cur.paragraph().layout().name());
break;
case LFUN_LAYOUT: {
docstring layout = cmd.argument();
- LYXERR(Debug::INFO) << "LFUN_LAYOUT: (arg) " << to_utf8(layout) << endl;
+ LYXERR(Debug::INFO, "LFUN_LAYOUT: (arg) " << to_utf8(layout));
- docstring const old_layout = cur.paragraph().layout()->name();
+ Paragraph const & para = cur.paragraph();
+ docstring const old_layout = para.layout().name();
+ DocumentClass const & tclass = bv->buffer().params().documentClass();
- // Derive layout number from given argument (string)
- // and current buffer's textclass (number)
- TextClass const & tclass = bv->buffer().params().getTextClass();
if (layout.empty())
layout = tclass.defaultLayoutName();
+
+ if (para.forceEmptyLayout())
+ // in this case only the empty layout is allowed
+ layout = tclass.emptyLayoutName();
+ else if (para.useEmptyLayout()) {
+ // in this case, default layout maps to empty layout
+ if (layout == tclass.defaultLayoutName())
+ layout = tclass.emptyLayoutName();
+ } else {
+ // otherwise, the empty layout maps to the default
+ if (layout == tclass.emptyLayoutName())
+ layout = tclass.defaultLayoutName();
+ }
+
bool hasLayout = tclass.hasLayout(layout);
// If the entry is obsolete, use the new one instead.
if (hasLayout) {
- docstring const & obs = tclass[layout]->obsoleted_by();
+ docstring const & obs = tclass[layout].obsoleted_by();
if (!obs.empty())
layout = obs;
}
pit_type spit = cur.selBegin().pit();
pit_type epit = cur.selEnd().pit() + 1;
while (spit != epit) {
- if (pars_[spit].layout()->name() != old_layout) {
+ if (pars_[spit].layout().name() != old_layout) {
change_layout = true;
break;
}
case LFUN_CLIPBOARD_PASTE:
cur.clearSelection();
- pasteClipboard(cur, bv->buffer().errorList("Paste"),
+ pasteClipboardText(cur, bv->buffer().errorList("Paste"),
cmd.argument() == "paragraph");
bv->buffer().errors("Paste");
break;
if (cmd.argument().empty())
break;
docstring hexstring = cmd.argument();
- if (lyx::support::isHex(hexstring)) {
- char_type c = lyx::support::hexToInt(hexstring);
+ if (isHex(hexstring)) {
+ char_type c = hexToInt(hexstring);
if (c >= 32 && c < 0x10ffff) {
lyxerr << "Inserting c: " << c << endl;
docstring s = docstring(1, c);
Paragraph & par = cur.paragraph();
pos_type pos = cur.pos();
BufferParams const & bufparams = bv->buffer().params();
- LayoutPtr const & style = par.layout();
- if (!style->pass_thru
+ Layout const & style = par.layout();
+ if (!style.pass_thru
&& par.getFontSettings(bufparams, pos).language()->lang() != "hebrew") {
// this avoids a double undo
// FIXME: should not be needed, ideally
cur.insert(new InsetQuotes(c,
bufparams.quotes_language,
InsetQuotes::DoubleQ));
- cur.posRight();
+ cur.posForward();
}
else
lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, "\""));
// ignore motions deeper nested than the real anchor
Cursor & bvcur = cur.bv().cursor();
- if (bvcur.anchor_.hasPart(cur)) {
- CursorSlice old = bvcur.top();
-
- int const wh = bv->workHeight();
- int const y = std::max(0, std::min(wh - 1, cmd.y));
-
- tm.setCursorFromCoordinates(cur, cmd.x, y);
- cur.setTargetX(cmd.x);
+ if (!bvcur.anchor_.hasPart(cur)) {
+ cur.undispatched();
+ break;
+ }
+ CursorSlice old = bvcur.top();
+
+ int const wh = bv->workHeight();
+ int const y = max(0, min(wh - 1, cmd.y));
+
+ tm.setCursorFromCoordinates(cur, cmd.x, y);
+ cur.setTargetX(cmd.x);
+ if (cmd.y >= wh)
+ lyx::dispatch(FuncRequest(LFUN_DOWN_SELECT));
+ else if (cmd.y < 0)
+ lyx::dispatch(FuncRequest(LFUN_UP_SELECT));
+ // This is to allow jumping over large insets
+ if (cur.top() == old) {
if (cmd.y >= wh)
lyx::dispatch(FuncRequest(LFUN_DOWN_SELECT));
else if (cmd.y < 0)
lyx::dispatch(FuncRequest(LFUN_UP_SELECT));
- // This is to allow jumping over large insets
- if (cur.top() == old) {
- if (cmd.y >= wh)
- lyx::dispatch(FuncRequest(LFUN_DOWN_SELECT));
- else if (cmd.y < 0)
- lyx::dispatch(FuncRequest(LFUN_UP_SELECT));
- }
-
- if (cur.top() == old)
- cur.noUpdate();
- else {
- // don't set anchor_
- bvcur.setCursor(cur);
- bvcur.selection() = true;
- //lyxerr << "MOTION: " << bv->cursor() << endl;
- }
+ }
- } else
- cur.undispatched();
+ if (cur.top() == old)
+ cur.noUpdate();
+ else {
+ // FIXME: This is brute force! But without it the selected
+ // area is not corrected updated while moving the mouse.
+ cur.updateFlags(Update::Force | Update::FitCursor);
+ // don't set anchor_
+ bvcur.setCursor(cur);
+ bvcur.selection() = true;
+ //lyxerr << "MOTION: " << bv->cursor() << endl;
+ }
break;
}
// "auto_region_delete", which defaults to
// true (on).
- if (lyxrc.auto_region_delete && cur.selection()) {
+ if (lyxrc.auto_region_delete && cur.selection())
cutSelection(cur, false, false);
- // When change tracking is set to off, the metrics update
- // mechanism correctly detects if a full update is needed or not.
- // This detection fails when a selection spans multiple rows and
- // change tracking is enabled because the paragraph metrics stays
- // the same. In this case, we force the full update:
- // (see http://bugzilla.lyx.org/show_bug.cgi?id=3992)
- if (cur.buffer().params().trackChanges)
- cur.updateFlags(Update::Force);
- }
cur.clearSelection();
Font const old_font = cur.real_current_font;
content : cmd.argument();
string const data = InsetCommandMailer::params2string("href", p);
if (p["target"].empty()) {
- bv->showInsetDialog("href", data, 0);
+ bv->showDialog("href", data);
} else {
FuncRequest fr(LFUN_INSET_INSERT, data);
dispatch(cur, fr);
string const data = InsetCommandMailer::params2string("label", p);
if (cmd.argument().empty()) {
- bv->showInsetDialog("label", data, 0);
+ bv->showDialog("label", data);
} else {
FuncRequest fr(LFUN_INSET_INSERT, data);
dispatch(cur, fr);
}
case LFUN_INFO_INSERT: {
- Inset * inset = createInset(&cur.bv(), cmd);
+ Inset * inset = createInset(cur.bv().buffer(), cmd);
if (!inset)
break;
// if an empty inset is created (cmd.argument() is empty)
docstring ds = cur.selectionAsString(false);
cutSelection(cur, true, false);
static_cast<InsetInfo *>(inset)->setInfo(to_utf8(ds));
+ static_cast<InsetInfo *>(inset)->updateInfo();
}
insertInset(cur, inset);
- cur.posRight();
+ cur.posForward();
break;
}
#if 0
case LFUN_LIST_INSERT:
- case LFUN_THEOREM_INSERT:
#endif
case LFUN_CAPTION_INSERT:
- // Open the inset, and move the current selection
- // inside it.
- doInsertInset(cur, this, cmd, true, true);
- cur.posRight();
- updateLabels(bv->buffer());
- break;
+ case LFUN_FOOTNOTE_INSERT:
case LFUN_NOTE_INSERT:
case LFUN_FLEX_INSERT:
case LFUN_BOX_INSERT:
case LFUN_BIBITEM_INSERT:
case LFUN_ERT_INSERT:
case LFUN_LISTING_INSERT:
- case LFUN_FOOTNOTE_INSERT:
case LFUN_MARGINALNOTE_INSERT:
case LFUN_OPTIONAL_INSERT:
case LFUN_ENVIRONMENT_INSERT:
+ case LFUN_INDEX_INSERT:
// Open the inset, and move the current selection
// inside it.
doInsertInset(cur, this, cmd, true, true);
- cur.posRight();
+ cur.posForward();
+ // Some insets are numbered, others are shown in the outline pane so
+ // let's update the labels and the toc backend.
+ updateLabels(bv->buffer());
break;
case LFUN_TABULAR_INSERT:
// if there were no arguments, just open the dialog
if (doInsertInset(cur, this, cmd, false, true))
- cur.posRight();
+ cur.posForward();
else
bv->showDialog("tabularcreate");
bool content = cur.selection(); // will some text be moved into the inset?
doInsertInset(cur, this, cmd, true, true);
- cur.posRight();
+ cur.posForward();
ParagraphList & pars = cur.text()->paragraphs();
- TextClass const & tclass = bv->buffer().params().getTextClass();
+ DocumentClass const & tclass = bv->buffer().params().documentClass();
// add a separate paragraph for the caption inset
pars.push_back(Paragraph());
pars.back().setInsetOwner(pars[0].inInset());
- pars.back().layout(tclass.defaultLayout());
-
+ pars.back().setEmptyOrDefaultLayout(tclass);
int cap_pit = pars.size() - 1;
// if an empty inset was created, we create an additional empty
if (!content) {
pars.push_back(Paragraph());
pars.back().setInsetOwner(pars[0].inInset());
- pars.back().layout(tclass.defaultLayout());
-
+ pars.back().setEmptyOrDefaultLayout(tclass);
}
// reposition the cursor to the caption
break;
}
- case LFUN_INDEX_INSERT:
- doInsertInset(cur, this, cmd, true, true);
- cur.posRight();
- break;
case LFUN_NOMENCL_INSERT: {
- Inset * inset = createInset(&cur.bv(), cmd);
+ FuncRequest cmd1 = cmd;
+ if (cmd.argument().empty())
+ cmd1 = FuncRequest(cmd,
+ bv->cursor().innerText()->getStringToIndex(bv->cursor()));
+ Inset * inset = createInset(cur.bv().buffer(), cmd1);
if (!inset)
break;
cur.recordUndo();
// description entry still needs to be filled in.
if (cmd.action == LFUN_NOMENCL_INSERT)
inset->edit(cur, true);
- cur.posRight();
+ cur.posForward();
break;
}
case LFUN_TOC_INSERT:
case LFUN_HFILL_INSERT:
case LFUN_LINE_INSERT:
+ case LFUN_NEWPAGE_INSERT:
case LFUN_PAGEBREAK_INSERT:
case LFUN_CLEARPAGE_INSERT:
case LFUN_CLEARDOUBLEPAGE_INSERT:
// do nothing fancy
doInsertInset(cur, this, cmd, false, false);
- cur.posRight();
+ cur.posForward();
break;
case LFUN_DEPTH_DECREMENT:
string const s1 = token(s, ' ', 1);
int const nargs = s1.empty() ? 0 : convert<int>(s1);
string const s2 = token(s, ' ', 2);
- string const type = s2.empty() ? "newcommand" : s2;
- cur.insert(new MathMacroTemplate(from_utf8(token(s, ' ', 0)), nargs, from_utf8(type)));
+ MacroType type = MacroTypeNewcommand;
+ if (s2 == "def")
+ type = MacroTypeDef;
+ cur.insert(new MathMacroTemplate(from_utf8(token(s, ' ', 0)), nargs, false, type));
//cur.nextInset()->edit(cur, true);
}
break;
case LFUN_MATH_MATRIX:
case LFUN_MATH_DELIM:
case LFUN_MATH_BIGDELIM: {
- if (cur.selection())
- cur.clearSelection();
- // FIXME: instead of the above, this one
- // should be used (but it asserts with Bidi enabled)
- // cf. http://bugzilla.lyx.org/show_bug.cgi?id=4055
- // cap::replaceSelection(cur);
+ cap::replaceSelection(cur);
cur.insert(new InsetMathHull(hullSimple));
checkAndActivateInset(cur, true);
BOOST_ASSERT(cur.inMathed());
}
case LFUN_FONT_EMPH: {
- Font font(Font::ALL_IGNORE);
- font.setEmph(Font::TOGGLE);
+ Font font(ignore_font, ignore_language);
+ font.fontInfo().setEmph(FONT_TOGGLE);
toggleAndShow(cur, this, font);
break;
}
case LFUN_FONT_BOLD: {
- Font font(Font::ALL_IGNORE);
- font.setSeries(Font::BOLD_SERIES);
+ Font font(ignore_font, ignore_language);
+ font.fontInfo().setSeries(BOLD_SERIES);
toggleAndShow(cur, this, font);
break;
}
case LFUN_FONT_NOUN: {
- Font font(Font::ALL_IGNORE);
- font.setNoun(Font::TOGGLE);
+ Font font(ignore_font, ignore_language);
+ font.fontInfo().setNoun(FONT_TOGGLE);
toggleAndShow(cur, this, font);
break;
}
case LFUN_FONT_TYPEWRITER: {
- Font font(Font::ALL_IGNORE);
- font.setFamily(Font::TYPEWRITER_FAMILY); // no good
+ Font font(ignore_font, ignore_language);
+ font.fontInfo().setFamily(TYPEWRITER_FAMILY); // no good
toggleAndShow(cur, this, font);
break;
}
case LFUN_FONT_SANS: {
- Font font(Font::ALL_IGNORE);
- font.setFamily(Font::SANS_FAMILY);
+ Font font(ignore_font, ignore_language);
+ font.fontInfo().setFamily(SANS_FAMILY);
toggleAndShow(cur, this, font);
break;
}
case LFUN_FONT_ROMAN: {
- Font font(Font::ALL_IGNORE);
- font.setFamily(Font::ROMAN_FAMILY);
+ Font font(ignore_font, ignore_language);
+ font.fontInfo().setFamily(ROMAN_FAMILY);
toggleAndShow(cur, this, font);
break;
}
case LFUN_FONT_DEFAULT: {
- Font font(Font::ALL_INHERIT, ignore_language);
+ Font font(inherit_font, ignore_language);
toggleAndShow(cur, this, font);
break;
}
case LFUN_FONT_UNDERLINE: {
- Font font(Font::ALL_IGNORE);
- font.setUnderbar(Font::TOGGLE);
+ Font font(ignore_font, ignore_language);
+ font.fontInfo().setUnderbar(FONT_TOGGLE);
toggleAndShow(cur, this, font);
break;
}
case LFUN_FONT_SIZE: {
- Font font(Font::ALL_IGNORE);
- font.setLyXSize(to_utf8(cmd.argument()));
+ Font font(ignore_font, ignore_language);
+ setLyXSize(to_utf8(cmd.argument()), font.fontInfo());
toggleAndShow(cur, this, font);
break;
}
Language const * lang = languages.getLanguage(to_utf8(cmd.argument()));
if (!lang)
break;
- Font font(Font::ALL_IGNORE);
- font.setLanguage(lang);
+ Font font(ignore_font, lang);
toggleAndShow(cur, this, font);
break;
}
toggleall = toggle;
toggleAndShow(cur, this, freefont, toggleall);
cur.message(_("Character set"));
+ } else {
+ lyxerr << "Argument not ok";
}
break;
}
case LFUN_FINISHED_LEFT:
- LYXERR(Debug::DEBUG) << "handle LFUN_FINISHED_LEFT:\n" << cur << endl;
- if (reverseDirectionNeeded(cur)) {
- ++cur.pos();
- cur.setCurrentFont();
- }
+ LYXERR(Debug::DEBUG, "handle LFUN_FINISHED_LEFT:\n" << cur);
+ // We're leaving an inset, going left. If the inset is LTR, we're
+ // leaving from the front, so we should not move (remain at --- but
+ // not in --- the inset). If the inset is RTL, move left, without
+ // entering the inset itself; i.e., move to after the inset.
+ if (cur.paragraph().getFontSettings(
+ cur.bv().buffer().params(), cur.pos()).isRightToLeft())
+ cursorVisLeft(cur, true);
break;
case LFUN_FINISHED_RIGHT:
- LYXERR(Debug::DEBUG) << "handle LFUN_FINISHED_RIGHT:\n" << cur << endl;
- if (!reverseDirectionNeeded(cur)) {
- ++cur.pos();
- cur.setCurrentFont();
- }
+ LYXERR(Debug::DEBUG, "handle LFUN_FINISHED_RIGHT:\n" << cur);
+ // We're leaving an inset, going right. If the inset is RTL, we're
+ // leaving from the front, so we should not move (remain at --- but
+ // not in --- the inset). If the inset is LTR, move right, without
+ // entering the inset itself; i.e., move to after the inset.
+ if (!cur.paragraph().getFontSettings(
+ cur.bv().buffer().params(), cur.pos()).isRightToLeft())
+ cursorVisRight(cur, true);
break;
case LFUN_FINISHED_BACKWARD:
- LYXERR(Debug::DEBUG) << "handle LFUN_FINISHED_BACKWARD:\n" << cur << endl;
+ LYXERR(Debug::DEBUG, "handle LFUN_FINISHED_BACKWARD:\n" << cur);
break;
case LFUN_FINISHED_FORWARD:
- LYXERR(Debug::DEBUG) << "handle LFUN_FINISHED_FORWARD:\n" << cur << endl;
+ LYXERR(Debug::DEBUG, "handle LFUN_FINISHED_FORWARD:\n" << cur);
++cur.pos();
cur.setCurrentFont();
break;
string data;
params2string(cur.paragraph(), data);
data = "show\n" + data;
- bv->showDialogWithData("paragraph", data);
+ bv->showDialog("paragraph", data);
break;
}
params2string(cur.paragraph(), data);
// Will the paragraph accept changes from the dialog?
- bool const accept = !cur.inset().forceDefaultParagraphs(cur.idx());
+ bool const accept =
+ cur.inset().allowParagraphCustomization(cur.idx());
data = "update " + convert<string>(accept) + '\n' + data;
bv->updateDialog("paragraph", data);
break;
case LFUN_FLOAT_LIST: {
- TextClass const & tclass = bv->buffer().params().getTextClass();
+ DocumentClass const & tclass = bv->buffer().params().documentClass();
if (tclass.floats().typeExist(to_utf8(cmd.argument()))) {
cur.recordUndo();
if (cur.selection())
breakParagraph(cur);
}
+ //FIXME Check if this should be emptyLayout()
setLayout(cur, tclass.defaultLayoutName());
ParagraphParameters p;
setParagraphs(cur, p);
insertInset(cur, new InsetFloatList(to_utf8(cmd.argument())));
- cur.posRight();
+ cur.posForward();
} else {
lyxerr << "Non-existent float type: "
<< to_utf8(cmd.argument()) << endl;
arg = cur.selectionAsString(false);
}
}
- bv->showDialogWithData("thesaurus", to_utf8(arg));
+ bv->showDialog("thesaurus", to_utf8(arg));
break;
}
}
break;
+ case LFUN_OUTLINE_UP:
+ outline(OutlineUp, cur);
+ setCursor(cur, cur.pit(), 0);
+ updateLabels(cur.buffer());
+ needsUpdate = true;
+ break;
+
+ case LFUN_OUTLINE_DOWN:
+ outline(OutlineDown, cur);
+ setCursor(cur, cur.pit(), 0);
+ updateLabels(cur.buffer());
+ needsUpdate = true;
+ break;
+
+ case LFUN_OUTLINE_IN:
+ outline(OutlineIn, cur);
+ updateLabels(cur.buffer());
+ needsUpdate = true;
+ break;
+
+ case LFUN_OUTLINE_OUT:
+ outline(OutlineOut, cur);
+ updateLabels(cur.buffer());
+ needsUpdate = true;
+ break;
+
default:
- LYXERR(Debug::ACTION)
- << BOOST_CURRENT_FUNCTION
- << ": Command " << cmd
- << " not DISPATCHED by Text" << endl;
+ LYXERR(Debug::ACTION, "Command " << cmd << " not DISPATCHED by Text");
cur.undispatched();
break;
}
// FIXME: the following code should go in favor of fine grained
// update flag treatment.
if (singleParUpdate) {
- // Inserting characters does not change par height
- ParagraphMetrics const & pms
- = cur.bv().parMetrics(cur.bottom().text(), cur.bottom().pit());
- if (pms.dim().height()
- == olddim.height()) {
- // if so, update _only_ this paragraph
- cur.updateFlags(Update::SinglePar |
- Update::FitCursor |
- Update::MultiParSel);
- return;
- } else
- needsUpdate = true;
+ // Inserting characters does not change par height in general. So, try
+ // to update _only_ this paragraph. BufferView will detect if a full
+ // metrics update is needed anyway.
+ cur.updateFlags(Update::SinglePar | Update::FitCursor);
+ return;
}
if (!needsUpdate
BOOST_ASSERT(cur.text() == this);
Font const & font = cur.real_current_font;
+ FontInfo const & fontinfo = font.fontInfo();
bool enable = true;
InsetCode code = NO_CODE;
return true;
case LFUN_BIBITEM_INSERT:
- enable = (cur.paragraph().layout()->labeltype == LABEL_BIBLIO
+ enable = (cur.paragraph().layout().labeltype == LABEL_BIBLIO
&& cur.pos() == 0);
break;
case LFUN_LIST_INSERT:
code = LIST_CODE;
break;
- case LFUN_THEOREM_INSERT:
- code = THEOREM_CODE;
- break;
#endif
case LFUN_CAPTION_INSERT:
code = CAPTION_CODE;
case LFUN_FLEX_INSERT: {
code = 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")
+ InsetLayout il =
+ cur.buffer().params().documentClass().insetLayout(from_utf8(s));
+ if (il.lyxtype() != "charstyle" &&
+ il.lyxtype() != "custom" &&
+ il.lyxtype() != "element" &&
+ il.lyxtype ()!= "standard")
enable = false;
break;
}
case LFUN_OPTIONAL_INSERT:
code = OPTARG_CODE;
enable = cur.paragraph().insetList().count(OPTARG_CODE)
- < cur.paragraph().layout()->optionalargs;
+ < cur.paragraph().layout().optionalargs;
break;
case LFUN_ENVIRONMENT_INSERT:
code = BOX_CODE;
// always allow this, since we will inset a raw quote
// if an inset is not allowed.
break;
- case LFUN_HYPHENATION_POINT_INSERT:
- case LFUN_LIGATURE_BREAK_INSERT:
case LFUN_HFILL_INSERT:
- case LFUN_MENU_SEPARATOR_INSERT:
- case LFUN_DOTS_INSERT:
- case LFUN_END_OF_SENTENCE_PERIOD_INSERT:
+ case LFUN_SPECIALCHAR_INSERT:
code = SPECIALCHAR_CODE;
break;
case LFUN_SPACE_INSERT:
break;
case LFUN_FONT_EMPH:
- flag.setOnOff(font.emph() == Font::ON);
+ flag.setOnOff(fontinfo.emph() == FONT_ON);
return true;
case LFUN_FONT_NOUN:
- flag.setOnOff(font.noun() == Font::ON);
+ flag.setOnOff(fontinfo.noun() == FONT_ON);
return true;
case LFUN_FONT_BOLD:
- flag.setOnOff(font.series() == Font::BOLD_SERIES);
+ flag.setOnOff(fontinfo.series() == BOLD_SERIES);
return true;
case LFUN_FONT_SANS:
- flag.setOnOff(font.family() == Font::SANS_FAMILY);
+ flag.setOnOff(fontinfo.family() == SANS_FAMILY);
return true;
case LFUN_FONT_ROMAN:
- flag.setOnOff(font.family() == Font::ROMAN_FAMILY);
+ flag.setOnOff(fontinfo.family() == ROMAN_FAMILY);
return true;
case LFUN_FONT_TYPEWRITER:
- flag.setOnOff(font.family() == Font::TYPEWRITER_FAMILY);
+ flag.setOnOff(fontinfo.family() == TYPEWRITER_FAMILY);
return true;
case LFUN_CUT:
enable = cur.selection();
break;
- case LFUN_PASTE:
+ case LFUN_PASTE: {
if (cmd.argument().empty()) {
if (theClipboard().isInternal())
enable = cap::numberOfSelections() > 0;
else
enable = !theClipboard().empty();
- } else {
- string const arg = to_utf8(cmd.argument());
- if (isStrUnsignedInt(arg)) {
- unsigned int n = convert<unsigned int>(arg);
- enable = cap::numberOfSelections() > n;
- } else
- // unknown argument
- enable = false;
+ break;
+ }
+
+ // we have an argument
+ string const arg = to_utf8(cmd.argument());
+ if (isStrUnsignedInt(arg)) {
+ // it's a number and therefore means the internal stack
+ unsigned int n = convert<unsigned int>(arg);
+ enable = cap::numberOfSelections() > n;
+ break;
}
+
+ // explicit graphics type?
+ if ((arg == "pdf" && theClipboard().hasGraphicsContents(Clipboard::PdfGraphicsType))
+ || (arg == "png" && theClipboard().hasGraphicsContents(Clipboard::PngGraphicsType))
+ || (arg == "jpeg" && theClipboard().hasGraphicsContents(Clipboard::JpegGraphicsType))
+ || (arg == "linkback" && theClipboard().hasGraphicsContents(Clipboard::LinkBackGraphicsType))) {
+ enable = true;
+ break;
+ }
+
+ // unknown argument
+ enable = false;
break;
+ }
case LFUN_CLIPBOARD_PASTE:
enable = !theClipboard().empty();
if (!cmd.argument().empty()) {
InsetLayout il = cur.inset().getLayout(cur.buffer().params());
enable = cur.inset().lyxCode() == FLEX_CODE
- && il.lyxtype == to_utf8(cmd.argument());
+ && il.lyxtype() == to_utf8(cmd.argument());
} else {
enable = !isMainText(cur.bv().buffer())
&& cur.inset().nargs() == 1;
enable = true;
break;
+ case LFUN_OUTLINE_UP:
+ case LFUN_OUTLINE_DOWN:
+ case LFUN_OUTLINE_IN:
+ case LFUN_OUTLINE_OUT:
+ enable = (cur.paragraph().layout().toclevel != Layout::NOT_IN_TOC);
+ break;
+
case LFUN_WORD_DELETE_FORWARD:
case LFUN_WORD_DELETE_BACKWARD:
case LFUN_LINE_DELETE:
case LFUN_WORD_FORWARD:
case LFUN_WORD_BACKWARD:
+ case LFUN_WORD_RIGHT:
+ case LFUN_WORD_LEFT:
case LFUN_CHAR_FORWARD:
case LFUN_CHAR_FORWARD_SELECT:
case LFUN_CHAR_BACKWARD:
case LFUN_DOWN_SELECT:
case LFUN_PARAGRAPH_UP_SELECT:
case LFUN_PARAGRAPH_DOWN_SELECT:
- case LFUN_SCREEN_UP_SELECT:
- case LFUN_SCREEN_DOWN_SELECT:
case LFUN_LINE_BEGIN_SELECT:
case LFUN_LINE_END_SELECT:
case LFUN_WORD_FORWARD_SELECT:
case LFUN_WORD_BACKWARD_SELECT:
+ case LFUN_WORD_RIGHT_SELECT:
+ case LFUN_WORD_LEFT_SELECT:
case LFUN_WORD_SELECT:
case LFUN_PARAGRAPH_UP:
case LFUN_PARAGRAPH_DOWN:
case LFUN_LINE_BEGIN:
+ case LFUN_LINE_BREAK:
case LFUN_LINE_END:
- case LFUN_BREAK_LINE:
+ case LFUN_NEW_LINE:
case LFUN_CHAR_DELETE_FORWARD:
case LFUN_DELETE_FORWARD_SKIP:
case LFUN_CHAR_DELETE_BACKWARD:
case LFUN_DATE_INSERT:
case LFUN_SELF_INSERT:
case LFUN_LINE_INSERT:
+ case LFUN_NEWPAGE_INSERT:
case LFUN_PAGEBREAK_INSERT:
case LFUN_CLEARPAGE_INSERT:
case LFUN_CLEARDOUBLEPAGE_INSERT: