#include "CutAndPaste.h"
#include "debug.h"
#include "dispatchresult.h"
+#include "errorlist.h"
#include "factory.h"
#include "funcrequest.h"
#include "gettext.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 lyx::support::isStrUnsignedInt;
using lyx::support::token;
-using lyx::frontend::Gui;
-using lyx::frontend::Clipboard;
-
using std::endl;
using std::string;
using std::istringstream;
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())
+ if (!cmd.argument().empty())
cur.dispatch(FuncRequest(LFUN_MATH_INSERT,
- cmd.argument));
+ 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
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;
}
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;
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_DISSOLVE: {
- recordUndo(cur);
- cur.selHandle(false);
- // save position
- lyx::pos_type spos = cur.pos();
- lyx::pit_type spit = cur.pit();
- bool content = false;
- if (cur.lastpit() != 0 || cur.lastpos() != 0) {
- setCursor(cur, 0, 0);
- cur.resetAnchor();
- cur.pit() = cur.lastpit();
- cur.pos() = cur.lastpos();
- cur.setSelection();
- copySelection(cur);
- content = true;
- }
- cur.popLeft();
- cur.resetAnchor();
- // store cursor offset
- if (spit == 0)
- spos += cur.pos();
- spit += cur.pit();
- cur.pos()++;
- cur.setSelection();
- if (content) {
- lyx::cap::replaceSelection(cur);
- pasteSelection(cur, 0);
- cur.clearSelection();
- // restore position
- cur.pit() = std::min(cur.lastpit(), spit);
- cur.pos() = std::min(cur.lastpos(), spos);
- cur.resetAnchor();
- } else
- cutSelection(cur, false, false);
- needsUpdate = true;
+ case LFUN_INSET_DISSOLVE:
+ needsUpdate = dissolveInset(cur);
break;
- }
case LFUN_INSET_SETTINGS:
cur.inset().showInsetDialog(bv);
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);
- break;
- }
-
case LFUN_SPACE_INSERT:
if (cur.paragraph().layout()->free_spacing)
insertChar(cur, ' ');
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();
break;
case LFUN_SERVER_GET_XY:
- cur.message(convert<string>(cursorX(cur.top(), cur.boundary())) + ' '
- + convert<string>(cursorY(cur.top(), cur.boundary())));
+ cur.message(lyx::from_utf8(
+ convert<string>(cursorX(cur.top(), cur.boundary())) + ' '
+ + convert<string>(cursorY(cur.top(), cur.boundary()))));
break;
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_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_SERVER_GET_LAYOUT:
- cur.message(cur.paragraph().layout()->name());
+ 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;
}
case LFUN_CLIPBOARD_PASTE: {
cur.clearSelection();
- string const clip = bv->owner()->gui().clipboard().get();
+ docstring const clip = bv->owner()->gui().clipboard().get();
if (!clip.empty()) {
recordUndo(cur);
- if (cmd.argument == "paragraph")
+ if (cmd.argument() == "paragraph")
insertStringAsParagraphs(cur, clip);
else
insertStringAsLines(cur, clip);
case LFUN_PRIMARY_SELECTION_PASTE: {
cur.clearSelection();
- string const clip = bv->owner()->gui().selection().get();
+ 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);
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,
}
case LFUN_DATE_INSERT:
- if (cmd.argument.empty())
+ if (cmd.argument().empty())
bv->owner()->dispatch(FuncRequest(LFUN_SELF_INSERT,
lyx::formatted_time(lyx::current_time())));
else
bv->owner()->dispatch(FuncRequest(LFUN_SELF_INSERT,
- lyx::formatted_time(lyx::current_time(), cmd.argument)));
+ lyx::formatted_time(lyx::current_time(), lyx::to_utf8(cmd.argument()))));
break;
case LFUN_MOUSE_TRIPLE:
}
case LFUN_SELF_INSERT: {
- if (cmd.argument.empty())
+ if (cmd.argument().empty())
break;
// Automatically delete the currently selected
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);
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);
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);
case LFUN_MATH_MATRIX:
case LFUN_MATH_DELIM:
case LFUN_MATH_BIGDELIM: {
- cur.insert(new MathHullInset("simple"));
+ cur.insert(new InsetMathHull(hullSimple));
cur.dispatch(FuncRequest(LFUN_CHAR_FORWARD));
cur.dispatch(cmd);
break;
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);
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);
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_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;
}
// 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_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;
enable = lyx::cap::numberOfSelections() > 0;
break;
- case LFUN_PARAGRAPH_MOVE_UP: {
+ case LFUN_PARAGRAPH_MOVE_UP:
enable = cur.pit() > 0 && !cur.selection();
break;
- }
- case LFUN_PARAGRAPH_MOVE_DOWN: {
+ case LFUN_PARAGRAPH_MOVE_DOWN:
enable = cur.pit() < cur.lastpit() && !cur.selection();
break;
- }
- case LFUN_INSET_DISSOLVE: {
- enable = &cur.inset() && cur.inTexted();
+ case LFUN_INSET_DISSOLVE:
+ enable = !isMainText() && cur.inset().nargs() == 1;
break;
- }
case LFUN_WORD_DELETE_FORWARD:
case LFUN_WORD_DELETE_BACKWARD:
case LFUN_BREAK_PARAGRAPH_SKIP:
case LFUN_PARAGRAPH_SPACING:
case LFUN_INSET_INSERT:
- case LFUN_NEXT_INSET_TOGGLE:
case LFUN_WORD_UPCASE:
case LFUN_WORD_LOWCASE:
case LFUN_WORD_CAPITALIZE:
projects / lyx.git / blobdiff