#include "CutAndPaste.h"
#include "debug.h"
#include "dispatchresult.h"
+#include "errorlist.h"
#include "factory.h"
#include "funcrequest.h"
#include "gettext.h"
#include "ParagraphParameters.h"
#include "undo.h"
#include "vspace.h"
+#include "pariterator.h"
#include "frontends/Dialogs.h"
+#include "frontends/Gui.h"
#include "frontends/LyXView.h"
+#include "frontends/Clipboard.h"
+#include "frontends/Selection.h"
#include "insets/insetcommand.h"
#include "insets/insetfloatlist.h"
#include "support/convert.h"
#include "support/lyxtime.h"
-#include "mathed/math_hullinset.h"
-#include "mathed/math_macrotemplate.h"
+#include "mathed/InsetMathHull.h"
+#include "mathed/MathMacroTemplate.h"
#include <boost/current_function.hpp>
#include <clocale>
#include <sstream>
+using lyx::char_type;
+using lyx::docstring;
using lyx::pos_type;
using lyx::cap::copySelection;
using std::endl;
using std::string;
using std::istringstream;
+using std::ostringstream;
extern string current_layout;
if (selecting || cur.mark())
cur.setSelection();
if (!cur.selection())
- cur.bv().haveSelection(false);
+ cur.bv().owner()->gui().selection().haveSelection(false);
cur.bv().switchKeyMap();
}
void mathDispatch(LCursor & cur, FuncRequest const & cmd, bool display)
{
recordUndo(cur);
- string sel = cur.selectionAsString(false);
+ string sel = lyx::to_utf8(cur.selectionAsString(false));
//lyxerr << "selection is: '" << sel << "'" << endl;
// It may happen that sel is empty but there is a selection
if (sel.empty()) {
const int old_pos = cur.pos();
- cur.insert(new MathHullInset("simple"));
+ cur.insert(new InsetMathHull(hullSimple));
BOOST_ASSERT(old_pos == cur.pos());
cur.nextInset()->edit(cur, true);
// don't do that also for LFUN_MATH_MODE
cur.dispatch(FuncRequest(LFUN_MATH_DISPLAY));
// Avoid an unnecessary undo step if cmd.argument
// is empty
- if (!cmd.argument.empty())
- cur.dispatch(FuncRequest(LFUN_INSERT_MATH,
- cmd.argument));
+ if (!cmd.argument().empty())
+ cur.dispatch(FuncRequest(LFUN_MATH_INSERT,
+ cmd.argument()));
} else {
// create a macro if we see "\\newcommand"
// somewhere, and an ordinary formula
if (sel.find("\\newcommand") == string::npos
&& sel.find("\\def") == string::npos)
{
- MathHullInset * formula = new MathHullInset;
+ InsetMathHull * formula = new InsetMathHull;
LyXLex lex(0, 0);
lex.setStream(is);
formula->read(cur.buffer(), lex);
- if (formula->getType() == "none")
+ if (formula->getType() == hullNone)
// Don't create pseudo formulas if
// delimiters are left out
- formula->mutate("simple");
+ formula->mutate(hullSimple);
cur.insert(formula);
} else
cur.insert(new MathMacroTemplate(is));
}
- cur.message(N_("Math editor mode"));
+ cur.message(lyx::from_utf8(N_("Math editor mode")));
}
} // namespace anon
updated |= cursorUp(cur);
}
- cur.bv().updateScrollbar();
finishUndo();
return updated;
}
updated |= cursorDown(cur);
}
- cur.bv().updateScrollbar();
finishUndo();
return updated;
}
if (edit)
inset->edit(cur, true);
- if (gotsel && pastesel)
+ if (gotsel && pastesel) {
cur.bv().owner()->dispatch(FuncRequest(LFUN_PASTE));
+ // reset first par to default
+ if (cur.lastpit() != 0 || cur.lastpos() != 0) {
+ LyXLayout_ptr const layout =
+ cur.buffer().params().getLyXTextClass().defaultLayout();
+ cur.text()->paragraphs().begin()->layout(layout);
+ }
+ }
return true;
}
switch (cmd.action) {
+ case LFUN_PARAGRAPH_MOVE_DOWN: {
+ pit_type const pit = cur.pit();
+ recUndo(pit, pit + 1);
+ finishUndo();
+ std::swap(pars_[pit], pars_[pit + 1]);
+
+ ParIterator begin(cur);
+ ++cur.pit();
+ ParIterator end = boost::next(ParIterator(cur));
+ updateLabels(cur.buffer(), begin, end);
+
+ needsUpdate = true;
+ break;
+ }
+
+ case LFUN_PARAGRAPH_MOVE_UP: {
+ pit_type const pit = cur.pit();
+ recUndo(pit - 1, pit);
+ finishUndo();
+ std::swap(pars_[pit], pars_[pit - 1]);
+
+ ParIterator end = boost::next(ParIterator(cur));
+ --cur.pit();
+ ParIterator begin(cur);
+ updateLabels(cur.buffer(), begin, end);
+
+ needsUpdate = true;
+ break;
+ }
+
case LFUN_APPENDIX: {
Paragraph & par = cur.paragraph();
bool start = !par.params().startOfAppendix();
par.params().startOfAppendix(start);
// we can set the refreshing parameters now
- updateCounters(cur.buffer());
+ updateLabels(cur.buffer());
break;
}
- case LFUN_DELETE_WORD_FORWARD:
+ case LFUN_WORD_DELETE_FORWARD:
cur.clearSelection();
deleteWordForward(cur);
finishChange(cur, false);
break;
- case LFUN_DELETE_WORD_BACKWARD:
+ case LFUN_WORD_DELETE_BACKWARD:
cur.clearSelection();
deleteWordBackward(cur);
finishChange(cur, false);
break;
- case LFUN_DELETE_LINE_FORWARD:
+ case LFUN_LINE_DELETE:
cur.clearSelection();
deleteLineForward(cur);
finishChange(cur, false);
break;
- case LFUN_WORDRIGHT:
- if (!cur.mark())
- cur.clearSelection();
- if (isRTL(cur.paragraph()))
- needsUpdate = cursorLeftOneWord(cur);
- else
- needsUpdate = cursorRightOneWord(cur);
- finishChange(cur, false);
- break;
-
- case LFUN_WORDLEFT:
- if (!cur.mark())
- cur.clearSelection();
- if (isRTL(cur.paragraph()))
- needsUpdate = cursorRightOneWord(cur);
- else
- needsUpdate = cursorLeftOneWord(cur);
- finishChange(cur, false);
- break;
-
- case LFUN_BEGINNINGBUF:
+ case LFUN_BUFFER_BEGIN:
+ case LFUN_BUFFER_BEGIN_SELECT:
+ cur.selHandle(cmd.action == LFUN_BUFFER_BEGIN_SELECT);
if (cur.depth() == 1) {
- if (!cur.mark())
- cur.clearSelection();
needsUpdate = cursorTop(cur);
- finishChange(cur, false);
- } else {
- cur.undispatched();
- }
- break;
-
- case LFUN_BEGINNINGBUFSEL:
- if (cur.depth() == 1) {
- if (!cur.selection())
- cur.resetAnchor();
- needsUpdate = cursorTop(cur);
- finishChange(cur, true);
- } else {
- cur.undispatched();
- }
- break;
-
- case LFUN_ENDBUF:
- if (cur.depth() == 1) {
- if (!cur.mark())
- cur.clearSelection();
- needsUpdate = cursorBottom(cur);
- finishChange(cur, false);
} else {
cur.undispatched();
}
break;
- case LFUN_ENDBUFSEL:
+ case LFUN_BUFFER_END:
+ case LFUN_BUFFER_END_SELECT:
+ cur.selHandle(cmd.action == LFUN_BUFFER_END_SELECT);
if (cur.depth() == 1) {
- if (!cur.selection())
- cur.resetAnchor();
needsUpdate = cursorBottom(cur);
- finishChange(cur, true);
} else {
cur.undispatched();
}
break;
- case LFUN_RIGHT:
- case LFUN_RIGHTSEL:
+ case LFUN_CHAR_FORWARD:
+ case LFUN_CHAR_FORWARD_SELECT:
//lyxerr << BOOST_CURRENT_FUNCTION
- // << " LFUN_RIGHT[SEL]:\n" << cur << endl;
- cur.selHandle(cmd.action == LFUN_RIGHTSEL);
+ // << " LFUN_CHAR_FORWARD[SEL]:\n" << cur << endl;
+ cur.selHandle(cmd.action == LFUN_CHAR_FORWARD_SELECT);
if (isRTL(cur.paragraph()))
needsUpdate = cursorLeft(cur);
else
}
break;
- case LFUN_LEFT:
- case LFUN_LEFTSEL:
- //lyxerr << "handle LFUN_LEFT[SEL]:\n" << cur << endl;
- cur.selHandle(cmd.action == LFUN_LEFTSEL);
+ case LFUN_CHAR_BACKWARD:
+ case LFUN_CHAR_BACKWARD_SELECT:
+ //lyxerr << "handle LFUN_CHAR_BACKWARD[_SELECT]:\n" << cur << endl;
+ cur.selHandle(cmd.action == LFUN_CHAR_BACKWARD_SELECT);
if (isRTL(cur.paragraph()))
needsUpdate = cursorRight(cur);
else
break;
case LFUN_UP:
- case LFUN_UPSEL:
+ case LFUN_UP_SELECT:
update(cur);
//lyxerr << "handle LFUN_UP[SEL]:\n" << cur << endl;
- cur.selHandle(cmd.action == LFUN_UPSEL);
+ cur.selHandle(cmd.action == LFUN_UP_SELECT);
needsUpdate = cursorUp(cur);
if (!needsUpdate && oldTopSlice == cur.top()
break;
case LFUN_DOWN:
- case LFUN_DOWNSEL:
+ case LFUN_DOWN_SELECT:
update(cur);
//lyxerr << "handle LFUN_DOWN[SEL]:\n" << cur << endl;
- cur.selHandle(cmd.action == LFUN_DOWNSEL);
+ cur.selHandle(cmd.action == LFUN_DOWN_SELECT);
needsUpdate = cursorDown(cur);
if (!needsUpdate && oldTopSlice == cur.top() &&
cur.boundary() == oldBoundary)
}
break;
- case LFUN_UP_PARAGRAPH:
- if (!cur.mark())
- cur.clearSelection();
+ case LFUN_PARAGRAPH_UP:
+ case LFUN_PARAGRAPH_UP_SELECT:
+ cur.selHandle(cmd.action == LFUN_PARAGRAPH_UP_SELECT);
needsUpdate = cursorUpParagraph(cur);
- finishChange(cur, false);
break;
- case LFUN_UP_PARAGRAPHSEL:
- if (!cur.selection())
- cur.resetAnchor();
- cursorUpParagraph(cur);
- finishChange(cur, true);
- break;
-
- case LFUN_DOWN_PARAGRAPH:
- if (!cur.mark())
- cur.clearSelection();
+ case LFUN_PARAGRAPH_DOWN:
+ case LFUN_PARAGRAPH_DOWN_SELECT:
+ cur.selHandle(cmd.action == LFUN_PARAGRAPH_DOWN_SELECT);
needsUpdate = cursorDownParagraph(cur);
- finishChange(cur, false);
- break;
-
- case LFUN_DOWN_PARAGRAPHSEL:
- if (!cur.selection())
- cur.resetAnchor();
- cursorDownParagraph(cur);
- finishChange(cur, true);
break;
- case LFUN_PRIORSEL:
+ case LFUN_SCREEN_UP:
+ case LFUN_SCREEN_UP_SELECT:
update(cur);
- if (!cur.selection())
- cur.resetAnchor();
- needsUpdate = cursorPrevious(cur);
- finishChange(cur, true);
+ cur.selHandle(cmd.action == LFUN_SCREEN_UP_SELECT);
+ if (cur.pit() == 0 && cur.textRow().pos() == 0) {
+ cur.undispatched();
+ cmd = FuncRequest(LFUN_FINISHED_UP);
+ } else {
+ needsUpdate = cursorPrevious(cur);
+ }
break;
- case LFUN_NEXTSEL:
+ case LFUN_SCREEN_DOWN:
+ case LFUN_SCREEN_DOWN_SELECT:
update(cur);
- if (!cur.selection())
- cur.resetAnchor();
- needsUpdate = cursorNext(cur);
- finishChange(cur, true);
+ cur.selHandle(cmd.action == LFUN_SCREEN_DOWN_SELECT);
+ if (cur.pit() == cur.lastpit()
+ && cur.textRow().endpos() == cur.lastpos()) {
+ cur.undispatched();
+ cmd = FuncRequest(LFUN_FINISHED_DOWN);
+ } else {
+ needsUpdate = cursorNext(cur);
+ }
break;
- case LFUN_HOMESEL:
+ case LFUN_LINE_BEGIN:
+ case LFUN_LINE_BEGIN_SELECT:
update(cur);
- if (!cur.selection())
- cur.resetAnchor();
+ cur.selHandle(cmd.action == LFUN_LINE_BEGIN_SELECT);
needsUpdate = cursorHome(cur);
- finishChange(cur, true);
break;
- case LFUN_ENDSEL:
+ case LFUN_LINE_END:
+ case LFUN_LINE_END_SELECT:
update(cur);
- if (!cur.selection())
- cur.resetAnchor();
+ cur.selHandle(cmd.action == LFUN_LINE_END_SELECT);
needsUpdate = cursorEnd(cur);
- finishChange(cur, true);
break;
- case LFUN_WORDRIGHTSEL:
- if (!cur.selection())
- cur.resetAnchor();
+ case LFUN_WORD_FORWARD:
+ case LFUN_WORD_FORWARD_SELECT:
+ cur.selHandle(cmd.action == LFUN_WORD_FORWARD_SELECT);
if (isRTL(cur.paragraph()))
- cursorLeftOneWord(cur);
+ needsUpdate = cursorLeftOneWord(cur);
else
- cursorRightOneWord(cur);
- finishChange(cur, true);
+ needsUpdate = cursorRightOneWord(cur);
break;
- case LFUN_WORDLEFTSEL:
- if (!cur.selection())
- cur.resetAnchor();
+ case LFUN_WORD_BACKWARD:
+ case LFUN_WORD_BACKWARD_SELECT:
+ cur.selHandle(cmd.action == LFUN_WORD_BACKWARD_SELECT);
if (isRTL(cur.paragraph()))
- cursorRightOneWord(cur);
+ needsUpdate = cursorRightOneWord(cur);
else
- cursorLeftOneWord(cur);
- finishChange(cur, true);
+ needsUpdate = cursorLeftOneWord(cur);
break;
- case LFUN_WORDSEL: {
+ case LFUN_WORD_SELECT: {
selectWord(cur, lyx::WHOLE_WORD);
finishChange(cur, true);
break;
}
- case LFUN_PRIOR:
- update(cur);
- if (!cur.mark())
- cur.clearSelection();
- finishChange(cur, false);
- if (cur.pit() == 0 && cur.textRow().pos() == 0) {
- cur.undispatched();
- cmd = FuncRequest(LFUN_FINISHED_UP);
- } else {
- needsUpdate = cursorPrevious(cur);
- }
- break;
-
- case LFUN_NEXT:
- update(cur);
- if (!cur.mark())
- cur.clearSelection();
- finishChange(cur, false);
- if (cur.pit() == cur.lastpit()
- && cur.textRow().endpos() == cur.lastpos()) {
- cur.undispatched();
- cmd = FuncRequest(LFUN_FINISHED_DOWN);
- } else {
- needsUpdate = cursorNext(cur);
- }
- break;
-
- case LFUN_HOME:
- if (!cur.mark())
- cur.clearSelection();
- needsUpdate = cursorHome(cur);
- finishChange(cur, false);
- break;
-
- case LFUN_END:
- if (!cur.mark())
- cur.clearSelection();
- needsUpdate = cursorEnd(cur);
- finishChange(cur, false);
- break;
-
- case LFUN_BREAKLINE: {
+ case LFUN_BREAK_LINE: {
// Not allowed by LaTeX (labels or empty par)
if (cur.pos() > cur.paragraph().beginOfBody()) {
lyx::cap::replaceSelection(cur);
break;
}
- case LFUN_DELETE:
+ case LFUN_CHAR_DELETE_FORWARD:
if (!cur.selection()) {
if (cur.pos() == cur.paragraph().size())
// Par boundary, force full-screen update
moveCursor(cur, false);
break;
- case LFUN_DELETE_SKIP:
- // Reverse the effect of LFUN_BREAKPARAGRAPH_SKIP.
+ case LFUN_DELETE_FORWARD_SKIP:
+ // Reverse the effect of LFUN_BREAK_PARAGRAPH_SKIP.
if (!cur.selection()) {
if (cur.pos() == cur.lastpos()) {
cursorRight(cur);
break;
- case LFUN_BACKSPACE:
+ case LFUN_CHAR_DELETE_BACKWARD:
if (!cur.selection()) {
- if (bv->owner()->getIntl().getTransManager().backspace()) {
+ if (bv->getIntl().getTransManager().backspace()) {
// Par boundary, full-screen update
if (cur.pos() == 0)
singleParUpdate = false;
bv->switchKeyMap();
break;
- case LFUN_BACKSPACE_SKIP:
- // Reverse the effect of LFUN_BREAKPARAGRAPH_SKIP.
+ case LFUN_DELETE_BACKWARD_SKIP:
+ // Reverse the effect of LFUN_BREAK_PARAGRAPH_SKIP.
if (!cur.selection()) {
#ifdef WITH_WARNINGS
#warning look here
}
break;
- case LFUN_BREAKPARAGRAPH:
+ case LFUN_BREAK_PARAGRAPH:
lyx::cap::replaceSelection(cur);
breakParagraph(cur, 0);
cur.resetAnchor();
bv->switchKeyMap();
break;
- case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
+ case LFUN_BREAK_PARAGRAPH_KEEP_LAYOUT:
lyx::cap::replaceSelection(cur);
breakParagraph(cur, 1);
cur.resetAnchor();
bv->switchKeyMap();
break;
- case LFUN_BREAKPARAGRAPH_SKIP: {
+ case LFUN_BREAK_PARAGRAPH_SKIP: {
// When at the beginning of a paragraph, remove
- // indentation. Otherwise, do the same as LFUN_BREAKPARAGRAPH.
+ // indentation. Otherwise, do the same as LFUN_BREAK_PARAGRAPH.
lyx::cap::replaceSelection(cur);
if (cur.pos() == 0)
cur.paragraph().params().labelWidthString(string());
if (cur_spacing == Spacing::Other)
cur_value = par.params().spacing().getValueAsString();
- istringstream is(cmd.argument);
+ istringstream is(lyx::to_utf8(cmd.argument()));
string tmp;
is >> tmp;
Spacing::Space new_spacing = cur_spacing;
} else if (tmp == "default") {
new_spacing = Spacing::Default;
} else {
- lyxerr << _("Unknown spacing argument: ")
- << cmd.argument << endl;
+ lyxerr << lyx::to_utf8(_("Unknown spacing argument: "))
+ << lyx::to_utf8(cmd.argument()) << endl;
}
if (cur_spacing != new_spacing || cur_value != new_value)
par.params().spacing(Spacing(new_spacing, new_value));
break;
}
- case LFUN_INSET_SETTINGS:
- cur.inset().showInsetDialog(bv);
+ case LFUN_INSET_DISSOLVE:
+ needsUpdate = dissolveInset(cur);
break;
- case LFUN_NEXT_INSET_TOGGLE: {
- InsetBase * inset = cur.nextInset();
- // this is the real function we want to invoke
- cmd = FuncRequest(LFUN_INSET_TOGGLE);
- cur.undispatched();
- // if there is an inset at cursor, see whether it
- // wants to toggle.
- if (inset) {
- LCursor tmpcur = cur;
- tmpcur.pushLeft(*inset);
- inset->dispatch(tmpcur, cmd);
- if (tmpcur.result().dispatched()) {
- cur.clearSelection();
- cur.dispatched();
- }
- }
- // if it did not work, try the underlying inset.
- if (!cur.result().dispatched())
- cur.inset().dispatch(cur, cmd);
+ case LFUN_INSET_SETTINGS:
+ cur.inset().showInsetDialog(bv);
break;
- }
case LFUN_SPACE_INSERT:
if (cur.paragraph().layout()->free_spacing)
moveCursor(cur, false);
break;
- case LFUN_HYPHENATION:
+ case LFUN_HYPHENATION_POINT_INSERT:
specialChar(cur, InsetSpecialChar::HYPHENATION);
break;
- case LFUN_LIGATURE_BREAK:
+ case LFUN_LIGATURE_BREAK_INSERT:
specialChar(cur, InsetSpecialChar::LIGATURE_BREAK);
break;
- case LFUN_LDOTS:
+ case LFUN_DOTS_INSERT:
specialChar(cur, InsetSpecialChar::LDOTS);
break;
- case LFUN_END_OF_SENTENCE:
+ case LFUN_END_OF_SENTENCE_PERIOD_INSERT:
specialChar(cur, InsetSpecialChar::END_OF_SENTENCE);
break;
- case LFUN_MENU_SEPARATOR:
+ case LFUN_MENU_SEPARATOR_INSERT:
specialChar(cur, InsetSpecialChar::MENU_SEPARATOR);
break;
- case LFUN_UPCASE_WORD:
+ case LFUN_WORD_UPCASE:
changeCase(cur, LyXText::text_uppercase);
break;
- case LFUN_LOWCASE_WORD:
+ case LFUN_WORD_LOWCASE:
changeCase(cur, LyXText::text_lowercase);
break;
- case LFUN_CAPITALIZE_WORD:
+ case LFUN_WORD_CAPITALIZE:
changeCase(cur, LyXText::text_capitalization);
break;
- case LFUN_TRANSPOSE_CHARS:
+ case LFUN_CHARS_TRANSPOSE:
recordUndo(cur);
break;
case LFUN_PASTE:
cur.message(_("Paste"));
lyx::cap::replaceSelection(cur);
- if (isStrUnsignedInt(cmd.argument))
- pasteSelection(cur, convert<unsigned int>(cmd.argument));
+ if (isStrUnsignedInt(lyx::to_utf8(cmd.argument())))
+ pasteSelection(cur, bv->buffer()->errorList("Paste"),
+ convert<unsigned int>(lyx::to_utf8(cmd.argument())));
else
- pasteSelection(cur, 0);
+ pasteSelection(cur, bv->buffer()->errorList("Paste"),
+ 0);
+ bv->buffer()->errors("Paste");
cur.clearSelection(); // bug 393
bv->switchKeyMap();
finishUndo();
cur.message(_("Copy"));
break;
- case LFUN_GETXY:
- cur.message(convert<string>(cursorX(cur.top(), cur.boundary())) + ' '
- + convert<string>(cursorY(cur.top(), cur.boundary())));
+ case LFUN_SERVER_GET_XY:
+ cur.message(lyx::from_utf8(
+ convert<string>(cursorX(cur.top(), cur.boundary())) + ' '
+ + convert<string>(cursorY(cur.top(), cur.boundary()))));
break;
- case LFUN_SETXY: {
+ case LFUN_SERVER_SET_XY: {
int x = 0;
int y = 0;
- istringstream is(cmd.argument);
+ istringstream is(lyx::to_utf8(cmd.argument()));
is >> x >> y;
if (!is)
lyxerr << "SETXY: Could not parse coordinates in '"
- << cmd.argument << std::endl;
+ << lyx::to_utf8(cmd.argument()) << std::endl;
else
setCursorFromCoordinates(cur, x, y);
break;
}
- case LFUN_GETFONT:
+ case LFUN_SERVER_GET_FONT:
if (current_font.shape() == LyXFont::ITALIC_SHAPE)
- cur.message("E");
+ cur.message(lyx::from_utf8("E"));
else if (current_font.shape() == LyXFont::SMALLCAPS_SHAPE)
- cur.message("N");
+ cur.message(lyx::from_utf8("N"));
else
- cur.message("0");
+ cur.message(lyx::from_utf8("0"));
break;
- case LFUN_GETLAYOUT:
- cur.message(cur.paragraph().layout()->name());
+ case LFUN_SERVER_GET_LAYOUT:
+ cur.message(lyx::from_utf8(cur.paragraph().layout()->name()));
break;
case LFUN_LAYOUT: {
lyxerr[Debug::INFO] << "LFUN_LAYOUT: (arg) "
- << cmd.argument << endl;
+ << lyx::to_utf8(cmd.argument()) << endl;
// This is not the good solution to the empty argument
// problem, but it will hopefully suffice for 1.2.0.
// The correct solution would be to augument the
// function list/array with information about what
// functions needs arguments and their type.
- if (cmd.argument.empty()) {
+ if (cmd.argument().empty()) {
cur.errorMessage(_("LyX function 'layout' needs an argument."));
break;
}
// Derive layout number from given argument (string)
// and current buffer's textclass (number)
LyXTextClass const & tclass = bv->buffer()->params().getLyXTextClass();
- bool hasLayout = tclass.hasLayout(cmd.argument);
- string layout = cmd.argument;
+ bool hasLayout = tclass.hasLayout(lyx::to_utf8(cmd.argument()));
+ string layout = lyx::to_utf8(cmd.argument());
// If the entry is obsolete, use the new one instead.
if (hasLayout) {
}
if (!hasLayout) {
- cur.errorMessage(string(N_("Layout ")) + cmd.argument +
- N_(" not known"));
+ cur.errorMessage(lyx::from_utf8(N_("Layout ")) + cmd.argument() +
+ lyx::from_utf8(N_(" not known")));
break;
}
break;
}
- case LFUN_PASTESELECTION: {
+ case LFUN_CLIPBOARD_PASTE: {
+ cur.clearSelection();
+ docstring const clip = bv->owner()->gui().clipboard().get();
+ if (!clip.empty()) {
+ recordUndo(cur);
+ if (cmd.argument() == "paragraph")
+ insertStringAsParagraphs(cur, clip);
+ else
+ insertStringAsLines(cur, clip);
+ }
+ break;
+ }
+
+ case LFUN_PRIMARY_SELECTION_PASTE: {
cur.clearSelection();
- string const clip = bv->getClipboard();
+ docstring const clip = bv->owner()->gui().selection().get();
if (!clip.empty()) {
recordUndo(cur);
- if (cmd.argument == "paragraph")
+ if (cmd.argument() == "paragraph")
insertStringAsParagraphs(cur, clip);
else
insertStringAsLines(cur, clip);
break;
}
- case LFUN_QUOTE: {
+ case LFUN_QUOTE_INSERT: {
lyx::cap::replaceSelection(cur);
Paragraph & par = cur.paragraph();
lyx::pos_type pos = cur.pos();
BufferParams const & bufparams = bv->buffer()->params();
if (!style->pass_thru
&& par.getFontSettings(bufparams, pos).language()->lang() != "hebrew") {
- string arg = cmd.argument;
+ string arg = lyx::to_utf8(cmd.argument());
if (arg == "single")
cur.insert(new InsetQuotes(c,
bufparams.quotes_language,
cur.posRight();
}
else
- bv->owner()->dispatch(FuncRequest(LFUN_SELFINSERT, "\""));
+ bv->owner()->dispatch(FuncRequest(LFUN_SELF_INSERT, "\""));
break;
}
case LFUN_DATE_INSERT:
- if (cmd.argument.empty())
- bv->owner()->dispatch(FuncRequest(LFUN_SELFINSERT,
+ if (cmd.argument().empty())
+ bv->owner()->dispatch(FuncRequest(LFUN_SELF_INSERT,
lyx::formatted_time(lyx::current_time())));
else
- bv->owner()->dispatch(FuncRequest(LFUN_SELFINSERT,
- lyx::formatted_time(lyx::current_time(), cmd.argument)));
+ bv->owner()->dispatch(FuncRequest(LFUN_SELF_INSERT,
+ lyx::formatted_time(lyx::current_time(), lyx::to_utf8(cmd.argument()))));
break;
case LFUN_MOUSE_TRIPLE:
cursorEnd(cur);
cur.setSelection();
bv->cursor() = cur;
- bv->haveSelection(cur.selection());
+ bv->owner()->gui().selection().haveSelection(cur.selection());
}
break;
if (cmd.button() == mouse_button::button1) {
selectWord(cur, lyx::WHOLE_WORD_STRICT);
bv->cursor() = cur;
- bv->haveSelection(cur.selection());
+ bv->owner()->gui().selection().haveSelection(cur.selection());
}
break;
// Single-click on work area
case LFUN_MOUSE_PRESS: {
// Right click on a footnote flag opens float menu
- if (cmd.button() == mouse_button::button3) {
+ if (cmd.button() == mouse_button::button3)
cur.clearSelection();
- break;
- }
// Middle button press pastes if we have a selection
// We do this here as if the selection was inside an inset
if (paste_internally)
bv->owner()->dispatch(FuncRequest(LFUN_PASTE));
else
- bv->owner()->dispatch(FuncRequest(LFUN_PASTESELECTION, "paragraph"));
+ bv->owner()->dispatch(FuncRequest(LFUN_PRIMARY_SELECTION_PASTE, "paragraph"));
}
break;
// finish selection
if (cmd.button() == mouse_button::button1)
- bv->haveSelection(cur.selection());
+ bv->owner()->gui().selection().haveSelection(cur.selection());
bv->switchKeyMap();
bv->owner()->updateMenubar();
break;
}
- case LFUN_SELFINSERT: {
- if (cmd.argument.empty())
+ case LFUN_SELF_INSERT: {
+ if (cmd.argument().empty())
break;
// Automatically delete the currently selected
if (lyxrc.auto_region_delete) {
if (cur.selection())
cutSelection(cur, false, false);
- bv->haveSelection(false);
+ bv->owner()->gui().selection().haveSelection(false);
}
cur.clearSelection();
LyXFont const old_font = real_current_font;
- string::const_iterator cit = cmd.argument.begin();
- string::const_iterator end = cmd.argument.end();
+ docstring::const_iterator cit = cmd.argument().begin();
+ docstring::const_iterator end = cmd.argument().end();
for (; cit != end; ++cit)
- bv->owner()->getIntl().getTransManager().
+#if 0
+ bv->getIntl().getTransManager().
translateAndInsert(*cit, this);
+#else
+ insertChar(bv->cursor(), *cit);
+#endif
cur.resetAnchor();
moveCursor(cur, false);
- bv->updateScrollbar();
break;
}
- case LFUN_URL: {
+ case LFUN_URL_INSERT: {
InsetCommandParams p("url");
string const data = InsetCommandMailer::params2string("url", p);
bv->owner()->getDialogs().show("url", data, 0);
break;
}
- case LFUN_HTMLURL: {
+ case LFUN_HTML_INSERT: {
InsetCommandParams p("htmlurl");
string const data = InsetCommandMailer::params2string("url", p);
bv->owner()->getDialogs().show("url", data, 0);
break;
}
- case LFUN_INSERT_LABEL: {
+ case LFUN_LABEL_INSERT: {
// Try to generate a valid label
- string const contents = cmd.argument.empty() ?
- cur.getPossibleLabel() : cmd.argument;
+ string const contents = cmd.argument().empty() ?
+ cur.getPossibleLabel() : lyx::to_utf8(cmd.argument());
InsetCommandParams p("label", contents);
string const data = InsetCommandMailer::params2string("label", p);
- if (cmd.argument.empty()) {
+ if (cmd.argument().empty()) {
bv->owner()->getDialogs().show("label", data, 0);
} else {
FuncRequest fr(LFUN_INSET_INSERT, data);
#if 0
- case LFUN_INSET_LIST:
- case LFUN_INSET_THEOREM:
- case LFUN_INSET_CAPTION:
+ case LFUN_LIST_INSERT:
+ case LFUN_THEOREM_INSERT:
+ case LFUN_CAPTION_INSERT:
#endif
- case LFUN_INSERT_NOTE:
- case LFUN_INSERT_CHARSTYLE:
- case LFUN_INSERT_BOX:
- case LFUN_INSERT_BRANCH:
- case LFUN_INSERT_BIBITEM:
- case LFUN_INSET_ERT:
- case LFUN_INSET_FOOTNOTE:
- case LFUN_INSET_MARGINAL:
- case LFUN_INSET_OPTARG:
+ case LFUN_NOTE_INSERT:
+ case LFUN_CHARSTYLE_INSERT:
+ case LFUN_BOX_INSERT:
+ case LFUN_BRANCH_INSERT:
+ case LFUN_BIBITEM_INSERT:
+ case LFUN_ERT_INSERT:
+ case LFUN_FOOTNOTE_INSERT:
+ case LFUN_MARGINALNOTE_INSERT:
+ case LFUN_OPTIONAL_INSERT:
case LFUN_ENVIRONMENT_INSERT:
// Open the inset, and move the current selection
// inside it.
break;
- case LFUN_INSET_FLOAT:
- case LFUN_INSET_WIDE_FLOAT:
- case LFUN_INSET_WRAP:
+ case LFUN_FLOAT_INSERT:
+ case LFUN_FLOAT_WIDE_INSERT:
+ case LFUN_WRAP_INSERT:
doInsertInset(cur, this, cmd, true, true);
cur.posRight();
// FIXME: the "Caption" name should not be hardcoded,
case LFUN_INDEX_PRINT:
case LFUN_TOC_INSERT:
- case LFUN_HFILL:
- case LFUN_INSERT_LINE:
- case LFUN_INSERT_PAGEBREAK:
+ case LFUN_HFILL_INSERT:
+ case LFUN_LINE_INSERT:
+ case LFUN_PAGEBREAK_INSERT:
// do nothing fancy
doInsertInset(cur, this, cmd, false, false);
cur.posRight();
break;
- case LFUN_DEPTH_MIN:
+ case LFUN_DEPTH_DECREMENT:
changeDepth(cur, DEC_DEPTH);
break;
- case LFUN_DEPTH_PLUS:
+ case LFUN_DEPTH_INCREMENT:
changeDepth(cur, INC_DEPTH);
break;
case LFUN_MATH_IMPORT_SELECTION:
case LFUN_MATH_MODE:
- if (cmd.argument == "on")
+ if (cmd.argument() == "on")
// don't pass "on" as argument
mathDispatch(cur, FuncRequest(LFUN_MATH_MODE), false);
else
break;
case LFUN_MATH_MACRO:
- if (cmd.argument.empty())
- cur.errorMessage(N_("Missing argument"));
+ if (cmd.argument().empty())
+ cur.errorMessage(lyx::from_utf8(N_("Missing argument")));
else {
- string s = cmd.argument;
+ string s = lyx::to_utf8(cmd.argument());
string const s1 = token(s, ' ', 1);
int const nargs = s1.empty() ? 0 : convert<int>(s1);
string const s2 = token(s, ' ', 2);
break;
// passthrough hat and underscore outside mathed:
- case LFUN_SUBSCRIPT:
- mathDispatch(cur, FuncRequest(LFUN_SELFINSERT, "_"), false);
+ case LFUN_MATH_SUBSCRIPT:
+ mathDispatch(cur, FuncRequest(LFUN_SELF_INSERT, "_"), false);
break;
- case LFUN_SUPERSCRIPT:
- mathDispatch(cur, FuncRequest(LFUN_SELFINSERT, "^"), false);
+ case LFUN_MATH_SUPERSCRIPT:
+ mathDispatch(cur, FuncRequest(LFUN_SELF_INSERT, "^"), false);
break;
- case LFUN_INSERT_MATH:
- case LFUN_INSERT_MATRIX:
- case LFUN_MATH_DELIM: {
- cur.insert(new MathHullInset("simple"));
- cur.dispatch(FuncRequest(LFUN_RIGHT));
+ case LFUN_MATH_INSERT:
+ case LFUN_MATH_MATRIX:
+ case LFUN_MATH_DELIM:
+ case LFUN_MATH_BIGDELIM: {
+ cur.insert(new InsetMathHull(hullSimple));
+ cur.dispatch(FuncRequest(LFUN_CHAR_FORWARD));
cur.dispatch(cmd);
break;
}
- case LFUN_EMPH: {
+ case LFUN_FONT_EMPH: {
LyXFont font(LyXFont::ALL_IGNORE);
font.setEmph(LyXFont::TOGGLE);
toggleAndShow(cur, this, font);
break;
}
- case LFUN_BOLD: {
+ case LFUN_FONT_BOLD: {
LyXFont font(LyXFont::ALL_IGNORE);
font.setSeries(LyXFont::BOLD_SERIES);
toggleAndShow(cur, this, font);
break;
}
- case LFUN_NOUN: {
+ case LFUN_FONT_NOUN: {
LyXFont font(LyXFont::ALL_IGNORE);
font.setNoun(LyXFont::TOGGLE);
toggleAndShow(cur, this, font);
break;
}
- case LFUN_CODE: {
+ case LFUN_FONT_CODE: {
LyXFont font(LyXFont::ALL_IGNORE);
font.setFamily(LyXFont::TYPEWRITER_FAMILY); // no good
toggleAndShow(cur, this, font);
break;
}
- case LFUN_SANS: {
+ case LFUN_FONT_SANS: {
LyXFont font(LyXFont::ALL_IGNORE);
font.setFamily(LyXFont::SANS_FAMILY);
toggleAndShow(cur, this, font);
break;
}
- case LFUN_ROMAN: {
+ case LFUN_FONT_ROMAN: {
LyXFont font(LyXFont::ALL_IGNORE);
font.setFamily(LyXFont::ROMAN_FAMILY);
toggleAndShow(cur, this, font);
break;
}
- case LFUN_DEFAULT: {
+ case LFUN_FONT_DEFAULT: {
LyXFont font(LyXFont::ALL_INHERIT, ignore_language);
toggleAndShow(cur, this, font);
break;
}
- case LFUN_UNDERLINE: {
+ case LFUN_FONT_UNDERLINE: {
LyXFont font(LyXFont::ALL_IGNORE);
font.setUnderbar(LyXFont::TOGGLE);
toggleAndShow(cur, this, font);
case LFUN_FONT_SIZE: {
LyXFont font(LyXFont::ALL_IGNORE);
- font.setLyXSize(cmd.argument);
+ font.setLyXSize(lyx::to_utf8(cmd.argument()));
toggleAndShow(cur, this, font);
break;
}
case LFUN_LANGUAGE: {
- Language const * lang = languages.getLanguage(cmd.argument);
+ Language const * lang = languages.getLanguage(lyx::to_utf8(cmd.argument()));
if (!lang)
break;
LyXFont font(LyXFont::ALL_IGNORE);
break;
}
- case LFUN_FREEFONT_APPLY:
+ case LFUN_FONT_FREE_APPLY:
toggleAndShow(cur, this, freefont, toggleall);
cur.message(_("Character set"));
break;
// Set the freefont using the contents of \param data dispatched from
// the frontends and apply it at the current cursor location.
- case LFUN_FREEFONT_UPDATE: {
+ case LFUN_FONT_FREE_UPDATE: {
LyXFont font;
bool toggle;
- if (bv_funcs::string2font(cmd.argument, font, toggle)) {
+ if (bv_funcs::string2font(lyx::to_utf8(cmd.argument()), font, toggle)) {
freefont = font;
toggleall = toggle;
toggleAndShow(cur, this, freefont, toggleall);
break;
}
- case LFUN_UMLAUT:
- case LFUN_CIRCUMFLEX:
- case LFUN_GRAVE:
- case LFUN_ACUTE:
- case LFUN_TILDE:
- case LFUN_CEDILLA:
- case LFUN_MACRON:
- case LFUN_DOT:
- case LFUN_UNDERDOT:
- case LFUN_UNDERBAR:
- case LFUN_CARON:
- case LFUN_SPECIAL_CARON:
- case LFUN_BREVE:
- case LFUN_TIE:
- case LFUN_HUNG_UMLAUT:
- case LFUN_CIRCLE:
- case LFUN_OGONEK:
+ case LFUN_ACCENT_UMLAUT:
+ case LFUN_ACCENT_CIRCUMFLEX:
+ case LFUN_ACCENT_GRAVE:
+ case LFUN_ACCENT_ACUTE:
+ case LFUN_ACCENT_TILDE:
+ case LFUN_ACCENT_CEDILLA:
+ case LFUN_ACCENT_MACRON:
+ case LFUN_ACCENT_DOT:
+ case LFUN_ACCENT_UNDERDOT:
+ case LFUN_ACCENT_UNDERBAR:
+ case LFUN_ACCENT_CARON:
+ case LFUN_ACCENT_SPECIAL_CARON:
+ case LFUN_ACCENT_BREVE:
+ case LFUN_ACCENT_TIE:
+ case LFUN_ACCENT_HUNGARIAN_UMLAUT:
+ case LFUN_ACCENT_CIRCLE:
+ case LFUN_ACCENT_OGONEK:
bv->owner()->getLyXFunc().handleKeyFunc(cmd.action);
- if (!cmd.argument.empty())
- bv->owner()->getIntl().getTransManager()
- .translateAndInsert(cmd.argument[0], this);
+ if (!cmd.argument().empty())
+ // FIXME: Are all these characters encoded in one byte in utf8?
+ bv->getIntl().getTransManager()
+ .translateAndInsert(cmd.argument()[0], this);
break;
case LFUN_FLOAT_LIST: {
LyXTextClass const & tclass = bv->buffer()->params().getLyXTextClass();
- if (tclass.floats().typeExist(cmd.argument)) {
+ if (tclass.floats().typeExist(lyx::to_utf8(cmd.argument()))) {
// not quite sure if we want this...
recordUndo(cur);
cur.clearSelection();
setLayout(cur, tclass.defaultLayoutName());
setParagraph(cur, Spacing(), LYX_ALIGN_LAYOUT, string(), 0);
- insertInset(cur, new InsetFloatList(cmd.argument));
+ insertInset(cur, new InsetFloatList(lyx::to_utf8(cmd.argument())));
cur.posRight();
} else {
lyxerr << "Non-existent float type: "
- << cmd.argument << endl;
+ << lyx::to_utf8(cmd.argument()) << endl;
}
break;
}
- case LFUN_ACCEPT_CHANGE: {
+ case LFUN_CHANGE_ACCEPT: {
acceptChange(cur);
break;
}
- case LFUN_REJECT_CHANGE: {
+ case LFUN_CHANGE_REJECT: {
rejectChange(cur);
break;
}
case LFUN_THESAURUS_ENTRY: {
- string arg = cmd.argument;
+ docstring arg = cmd.argument();
if (arg.empty()) {
arg = cur.selectionAsString(false);
// FIXME
arg = cur.selectionAsString(false);
}
}
- bv->owner()->getDialogs().show("thesaurus", arg);
+ bv->owner()->getDialogs().show("thesaurus", lyx::to_utf8(arg));
break;
}
- case LFUN_PARAGRAPH_APPLY: {
+ case LFUN_PARAGRAPH_PARAMS_APPLY: {
// Given data, an encoding of the ParagraphParameters
// generated in the Paragraph dialog, this function sets
// the current paragraph appropriately.
- istringstream is(cmd.argument);
+ istringstream is(lyx::to_utf8(cmd.argument()));
LyXLex lex(0, 0);
lex.setStream(is);
ParagraphParameters params;
break;
}
- case LFUN_INSET_DIALOG_SHOW: {
- InsetBase * inset = cur.nextInset();
- if (inset) {
- FuncRequest fr(LFUN_INSET_DIALOG_SHOW);
- inset->dispatch(cur, fr);
- }
- break;
- }
-
case LFUN_ESCAPE:
if (cur.selection()) {
cur.selection() = false;
switch (cmd.action) {
- case LFUN_DEPTH_MIN:
+ case LFUN_DEPTH_DECREMENT:
enable = changeDepthAllowed(cur, DEC_DEPTH);
break;
- case LFUN_DEPTH_PLUS:
+ case LFUN_DEPTH_INCREMENT:
enable = changeDepthAllowed(cur, INC_DEPTH);
break;
flag.setOnOff(cur.paragraph().params().startOfAppendix());
return true;
- case LFUN_INSERT_BIBITEM:
+ case LFUN_BIBITEM_INSERT:
enable = (cur.paragraph().layout()->labeltype == LABEL_BIBLIO);
break;
case LFUN_DIALOG_SHOW_NEW_INSET:
- if (cmd.argument == "bibitem")
+ if (cmd.argument() == "bibitem")
code = InsetBase::BIBITEM_CODE;
- else if (cmd.argument == "bibtex")
+ else if (cmd.argument() == "bibtex")
code = InsetBase::BIBTEX_CODE;
- else if (cmd.argument == "box")
+ else if (cmd.argument() == "box")
code = InsetBase::BOX_CODE;
- else if (cmd.argument == "branch")
+ else if (cmd.argument() == "branch")
code = InsetBase::BRANCH_CODE;
- else if (cmd.argument == "citation")
+ else if (cmd.argument() == "citation")
code = InsetBase::CITE_CODE;
- else if (cmd.argument == "ert")
+ else if (cmd.argument() == "ert")
code = InsetBase::ERT_CODE;
- else if (cmd.argument == "external")
+ else if (cmd.argument() == "external")
code = InsetBase::EXTERNAL_CODE;
- else if (cmd.argument == "float")
+ else if (cmd.argument() == "float")
code = InsetBase::FLOAT_CODE;
- else if (cmd.argument == "graphics")
+ else if (cmd.argument() == "graphics")
code = InsetBase::GRAPHICS_CODE;
- else if (cmd.argument == "include")
+ else if (cmd.argument() == "include")
code = InsetBase::INCLUDE_CODE;
- else if (cmd.argument == "index")
+ else if (cmd.argument() == "index")
code = InsetBase::INDEX_CODE;
- else if (cmd.argument == "label")
+ else if (cmd.argument() == "label")
code = InsetBase::LABEL_CODE;
- else if (cmd.argument == "note")
+ else if (cmd.argument() == "note")
code = InsetBase::NOTE_CODE;
- else if (cmd.argument == "ref")
+ else if (cmd.argument() == "ref")
code = InsetBase::REF_CODE;
- else if (cmd.argument == "toc")
+ else if (cmd.argument() == "toc")
code = InsetBase::TOC_CODE;
- else if (cmd.argument == "url")
+ else if (cmd.argument() == "url")
code = InsetBase::URL_CODE;
- else if (cmd.argument == "vspace")
+ else if (cmd.argument() == "vspace")
code = InsetBase::VSPACE_CODE;
- else if (cmd.argument == "wrap")
+ else if (cmd.argument() == "wrap")
code = InsetBase::WRAP_CODE;
break;
- case LFUN_INSET_ERT:
+ case LFUN_ERT_INSERT:
code = InsetBase::ERT_CODE;
break;
- case LFUN_INSET_FOOTNOTE:
+ case LFUN_FOOTNOTE_INSERT:
code = InsetBase::FOOT_CODE;
break;
case LFUN_TABULAR_INSERT:
code = InsetBase::TABULAR_CODE;
break;
- case LFUN_INSET_MARGINAL:
+ case LFUN_MARGINALNOTE_INSERT:
code = InsetBase::MARGIN_CODE;
break;
- case LFUN_INSET_FLOAT:
- case LFUN_INSET_WIDE_FLOAT:
+ case LFUN_FLOAT_INSERT:
+ case LFUN_FLOAT_WIDE_INSERT:
code = InsetBase::FLOAT_CODE;
break;
- case LFUN_INSET_WRAP:
+ case LFUN_WRAP_INSERT:
code = InsetBase::WRAP_CODE;
break;
case LFUN_FLOAT_LIST:
code = InsetBase::FLOAT_LIST_CODE;
break;
#if 0
- case LFUN_INSET_LIST:
+ case LFUN_LIST_INSERT:
code = InsetBase::LIST_CODE;
break;
- case LFUN_INSET_THEOREM:
+ case LFUN_THEOREM_INSERT:
code = InsetBase::THEOREM_CODE;
break;
#endif
- case LFUN_INSET_CAPTION:
+ case LFUN_CAPTION_INSERT:
code = InsetBase::CAPTION_CODE;
break;
- case LFUN_INSERT_NOTE:
+ case LFUN_NOTE_INSERT:
code = InsetBase::NOTE_CODE;
break;
- case LFUN_INSERT_CHARSTYLE:
+ case LFUN_CHARSTYLE_INSERT:
code = InsetBase::CHARSTYLE_CODE;
if (cur.buffer().params().getLyXTextClass().charstyles().empty())
enable = false;
break;
- case LFUN_INSERT_BOX:
+ case LFUN_BOX_INSERT:
code = InsetBase::BOX_CODE;
break;
- case LFUN_INSERT_BRANCH:
+ case LFUN_BRANCH_INSERT:
code = InsetBase::BRANCH_CODE;
if (cur.buffer().getMasterBuffer()->params().branchlist().empty())
enable = false;
break;
- case LFUN_INSERT_LABEL:
+ case LFUN_LABEL_INSERT:
code = InsetBase::LABEL_CODE;
break;
- case LFUN_INSET_OPTARG:
+ case LFUN_OPTIONAL_INSERT:
code = InsetBase::OPTARG_CODE;
enable = numberOfOptArgs(cur.paragraph())
< cur.paragraph().layout()->optionalargs;
case LFUN_TOC_INSERT:
code = InsetBase::TOC_CODE;
break;
- case LFUN_HTMLURL:
- case LFUN_URL:
+ case LFUN_HTML_INSERT:
+ case LFUN_URL_INSERT:
code = InsetBase::URL_CODE;
break;
- case LFUN_QUOTE:
+ case LFUN_QUOTE_INSERT:
// always allow this, since we will inset a raw quote
// if an inset is not allowed.
break;
- case LFUN_HYPHENATION:
- case LFUN_LIGATURE_BREAK:
- case LFUN_HFILL:
- case LFUN_MENU_SEPARATOR:
- case LFUN_LDOTS:
- case LFUN_END_OF_SENTENCE:
+ 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:
code = InsetBase::SPECIALCHAR_CODE;
break;
case LFUN_SPACE_INSERT:
code = InsetBase::SPACE_CODE;
break;
-#ifdef WITH_WARNINGS
-#warning This LFUN is not used anymore and should be nuked (JMarc 29/10/2005)
-#endif
-#if 0
- case LFUN_INSET_DIALOG_SHOW: {
- InsetBase * inset = cur.nextInset();
- enable = inset;
- if (inset) {
- code = inset->lyxCode();
- if (!(code == InsetBase::INCLUDE_CODE
- || code == InsetBase::BIBTEX_CODE
- || code == InsetBase::FLOAT_LIST_CODE
- || code == InsetBase::TOC_CODE))
- enable = false;
- }
- break;
- }
-#endif
-
case LFUN_INSET_MODIFY:
// We need to disable this, because we may get called for a
// tabular cell via
enable = false;
break;
- case LFUN_EMPH:
+ case LFUN_FONT_EMPH:
flag.setOnOff(font.emph() == LyXFont::ON);
return true;
- case LFUN_NOUN:
+ case LFUN_FONT_NOUN:
flag.setOnOff(font.noun() == LyXFont::ON);
return true;
- case LFUN_BOLD:
+ case LFUN_FONT_BOLD:
flag.setOnOff(font.series() == LyXFont::BOLD_SERIES);
return true;
- case LFUN_SANS:
+ case LFUN_FONT_SANS:
flag.setOnOff(font.family() == LyXFont::SANS_FAMILY);
return true;
- case LFUN_ROMAN:
+ case LFUN_FONT_ROMAN:
flag.setOnOff(font.family() == LyXFont::ROMAN_FAMILY);
return true;
- case LFUN_CODE:
+ case LFUN_FONT_CODE:
flag.setOnOff(font.family() == LyXFont::TYPEWRITER_FAMILY);
return true;
enable = lyx::cap::numberOfSelections() > 0;
break;
- case LFUN_DELETE_WORD_FORWARD:
- case LFUN_DELETE_WORD_BACKWARD:
- case LFUN_DELETE_LINE_FORWARD:
- case LFUN_WORDRIGHT:
- case LFUN_WORDLEFT:
- case LFUN_RIGHT:
- case LFUN_RIGHTSEL:
- case LFUN_LEFT:
- case LFUN_LEFTSEL:
+ case LFUN_PARAGRAPH_MOVE_UP:
+ enable = cur.pit() > 0 && !cur.selection();
+ break;
+
+ case LFUN_PARAGRAPH_MOVE_DOWN:
+ enable = cur.pit() < cur.lastpit() && !cur.selection();
+ break;
+
+ case LFUN_INSET_DISSOLVE:
+ enable = !isMainText() && cur.inset().nargs() == 1;
+ 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_CHAR_FORWARD:
+ case LFUN_CHAR_FORWARD_SELECT:
+ case LFUN_CHAR_BACKWARD:
+ case LFUN_CHAR_BACKWARD_SELECT:
case LFUN_UP:
- case LFUN_UPSEL:
+ case LFUN_UP_SELECT:
case LFUN_DOWN:
- case LFUN_DOWNSEL:
- case LFUN_UP_PARAGRAPHSEL:
- case LFUN_DOWN_PARAGRAPHSEL:
- case LFUN_PRIORSEL:
- case LFUN_NEXTSEL:
- case LFUN_HOMESEL:
- case LFUN_ENDSEL:
- case LFUN_WORDRIGHTSEL:
- case LFUN_WORDLEFTSEL:
- case LFUN_WORDSEL:
- case LFUN_UP_PARAGRAPH:
- case LFUN_DOWN_PARAGRAPH:
- case LFUN_PRIOR:
- case LFUN_NEXT:
- case LFUN_HOME:
- case LFUN_END:
- case LFUN_BREAKLINE:
- case LFUN_DELETE:
- case LFUN_DELETE_SKIP:
- case LFUN_BACKSPACE:
- case LFUN_BACKSPACE_SKIP:
- case LFUN_BREAKPARAGRAPH:
- case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
- case LFUN_BREAKPARAGRAPH_SKIP:
+ 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_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:
+ case LFUN_CHAR_DELETE_FORWARD:
+ case LFUN_DELETE_FORWARD_SKIP:
+ case LFUN_CHAR_DELETE_BACKWARD:
+ case LFUN_DELETE_BACKWARD_SKIP:
+ case LFUN_BREAK_PARAGRAPH:
+ case LFUN_BREAK_PARAGRAPH_KEEP_LAYOUT:
+ case LFUN_BREAK_PARAGRAPH_SKIP:
case LFUN_PARAGRAPH_SPACING:
case LFUN_INSET_INSERT:
- case LFUN_NEXT_INSET_TOGGLE:
- case LFUN_UPCASE_WORD:
- case LFUN_LOWCASE_WORD:
- case LFUN_CAPITALIZE_WORD:
- case LFUN_TRANSPOSE_CHARS:
- case LFUN_GETXY:
- case LFUN_SETXY:
- case LFUN_GETFONT:
- case LFUN_GETLAYOUT:
+ case LFUN_WORD_UPCASE:
+ case LFUN_WORD_LOWCASE:
+ case LFUN_WORD_CAPITALIZE:
+ case LFUN_CHARS_TRANSPOSE:
+ case LFUN_SERVER_GET_XY:
+ case LFUN_SERVER_SET_XY:
+ case LFUN_SERVER_GET_FONT:
+ case LFUN_SERVER_GET_LAYOUT:
case LFUN_LAYOUT:
- case LFUN_PASTESELECTION:
+ case LFUN_CLIPBOARD_PASTE:
+ case LFUN_PRIMARY_SELECTION_PASTE:
case LFUN_DATE_INSERT:
- case LFUN_SELFINSERT:
- case LFUN_INSERT_LINE:
- case LFUN_INSERT_PAGEBREAK:
+ case LFUN_SELF_INSERT:
+ case LFUN_LINE_INSERT:
+ case LFUN_PAGEBREAK_INSERT:
case LFUN_MATH_DISPLAY:
case LFUN_MATH_IMPORT_SELECTION:
case LFUN_MATH_MODE:
case LFUN_MATH_MACRO:
- case LFUN_INSERT_MATH:
- case LFUN_INSERT_MATRIX:
+ case LFUN_MATH_INSERT:
+ case LFUN_MATH_MATRIX:
case LFUN_MATH_DELIM:
- case LFUN_SUBSCRIPT:
- case LFUN_SUPERSCRIPT:
- case LFUN_DEFAULT:
- case LFUN_UNDERLINE:
+ case LFUN_MATH_BIGDELIM:
+ case LFUN_MATH_SUBSCRIPT:
+ case LFUN_MATH_SUPERSCRIPT:
+ case LFUN_FONT_DEFAULT:
+ case LFUN_FONT_UNDERLINE:
case LFUN_FONT_SIZE:
case LFUN_LANGUAGE:
- case LFUN_FREEFONT_APPLY:
- case LFUN_FREEFONT_UPDATE:
+ case LFUN_FONT_FREE_APPLY:
+ case LFUN_FONT_FREE_UPDATE:
case LFUN_LAYOUT_PARAGRAPH:
case LFUN_PARAGRAPH_UPDATE:
- case LFUN_UMLAUT:
- case LFUN_CIRCUMFLEX:
- case LFUN_GRAVE:
- case LFUN_ACUTE:
- case LFUN_TILDE:
- case LFUN_CEDILLA:
- case LFUN_MACRON:
- case LFUN_DOT:
- case LFUN_UNDERDOT:
- case LFUN_UNDERBAR:
- case LFUN_CARON:
- case LFUN_SPECIAL_CARON:
- case LFUN_BREVE:
- case LFUN_TIE:
- case LFUN_HUNG_UMLAUT:
- case LFUN_CIRCLE:
- case LFUN_OGONEK:
- case LFUN_ACCEPT_CHANGE:
- case LFUN_REJECT_CHANGE:
+ case LFUN_ACCENT_UMLAUT:
+ case LFUN_ACCENT_CIRCUMFLEX:
+ case LFUN_ACCENT_GRAVE:
+ case LFUN_ACCENT_ACUTE:
+ case LFUN_ACCENT_TILDE:
+ case LFUN_ACCENT_CEDILLA:
+ case LFUN_ACCENT_MACRON:
+ case LFUN_ACCENT_DOT:
+ case LFUN_ACCENT_UNDERDOT:
+ case LFUN_ACCENT_UNDERBAR:
+ case LFUN_ACCENT_CARON:
+ case LFUN_ACCENT_SPECIAL_CARON:
+ case LFUN_ACCENT_BREVE:
+ case LFUN_ACCENT_TIE:
+ case LFUN_ACCENT_HUNGARIAN_UMLAUT:
+ case LFUN_ACCENT_CIRCLE:
+ case LFUN_ACCENT_OGONEK:
+ case LFUN_CHANGE_ACCEPT:
+ case LFUN_CHANGE_REJECT:
case LFUN_THESAURUS_ENTRY:
- case LFUN_PARAGRAPH_APPLY:
+ case LFUN_PARAGRAPH_PARAMS_APPLY:
case LFUN_ESCAPE:
- case LFUN_ENDBUF:
- case LFUN_BEGINNINGBUF:
- case LFUN_BEGINNINGBUFSEL:
- case LFUN_ENDBUFSEL:
+ case LFUN_BUFFER_END:
+ case LFUN_BUFFER_BEGIN:
+ case LFUN_BUFFER_BEGIN_SELECT:
+ case LFUN_BUFFER_END_SELECT:
// these are handled in our dispatch()
enable = true;
break;
projects / lyx.git / blobdiff