#include <clocale>
#include <sstream>
+using std::endl;
+using std::string;
+using std::istringstream;
+using std::ostringstream;
namespace lyx {
using support::isStrUnsignedInt;
using support::token;
-using std::endl;
-using std::string;
-using std::istringstream;
-using std::ostringstream;
-
-
+namespace frontend {
extern docstring current_layout;
-
+}
namespace {
lyx::dispatch(FuncRequest(LFUN_PASTE, "0"));
// reset first par to default
if (cur.lastpit() != 0 || cur.lastpos() != 0) {
- Layout_ptr const layout =
+ LayoutPtr const layout =
cur.buffer().params().getTextClass().defaultLayout();
cur.text()->paragraphs().begin()->layout(layout);
}
Paragraph & par = cur.paragraph();
bool start = !par.params().startOfAppendix();
-#ifdef WITH_WARNINGS
-#warning The code below only makes sense at top level.
+// FIXME: The code below only makes sense at top level.
// Should LFUN_APPENDIX be restricted to top-level paragraphs?
-#endif
// ensure that we have only one start_of_appendix in this document
// FIXME: this don't work for multipart document!
for (pit_type tmp = 0, end = pars_.size(); tmp != end; ++tmp) {
case LFUN_DELETE_BACKWARD_SKIP:
// Reverse the effect of LFUN_BREAK_PARAGRAPH_SKIP.
if (!cur.selection()) {
-#ifdef WITH_WARNINGS
-#warning look here
-#endif
+ // FIXME: look here
//CursorSlice cur = cursor();
backspace(cur);
//anchor() = cur;
break;
}
+ // TODO
+ // With the creation of LFUN_PARAGRAPH_PARAMS, this is now redundant,
+ // as its duties can be performed there. Should it be removed??
+ // FIXME For now, it can just dispatch LFUN_PARAGRAPH_PARAMS...
case LFUN_PARAGRAPH_SPACING: {
Paragraph & par = cur.paragraph();
Spacing::Space cur_spacing = par.params().spacing().getSpace();
cur.message(_("Paste"));
cap::replaceSelection(cur);
if (cmd.argument().empty() && !theClipboard().isInternal())
- pasteClipboard(cur, bv->buffer()->errorList("Paste"));
+ pasteClipboard(cur, bv->buffer().errorList("Paste"));
else {
string const arg(to_utf8(cmd.argument()));
- pasteFromStack(cur, bv->buffer()->errorList("Paste"),
+ pasteFromStack(cur, bv->buffer().errorList("Paste"),
isStrUnsignedInt(arg) ?
convert<unsigned int>(arg) :
0);
}
- bv->buffer()->errors("Paste");
+ bv->buffer().errors("Paste");
cur.clearSelection(); // bug 393
finishUndo();
break;
// Derive layout number from given argument (string)
// and current buffer's textclass (number)
- TextClass const & tclass = bv->buffer()->params().getTextClass();
+ TextClass const & tclass = bv->buffer().params().getTextClass();
if (layout.empty())
layout = tclass.defaultLayoutName();
bool hasLayout = tclass.hasLayout(layout);
break;
}
- bool change_layout = (current_layout != layout);
+ bool change_layout = (frontend::current_layout != layout);
if (!change_layout && cur.selection() &&
cur.selBegin().pit() != cur.selEnd().pit())
pit_type spit = cur.selBegin().pit();
pit_type epit = cur.selEnd().pit() + 1;
while (spit != epit) {
- if (pars_[spit].layout()->name() != current_layout) {
+ if (pars_[spit].layout()->name() != frontend::current_layout) {
change_layout = true;
break;
}
case LFUN_CLIPBOARD_PASTE:
cur.clearSelection();
- pasteClipboard(cur, bv->buffer()->errorList("Paste"),
+ pasteClipboard(cur, bv->buffer().errorList("Paste"),
cmd.argument() == "paragraph");
- bv->buffer()->errors("Paste");
+ bv->buffer().errors("Paste");
break;
case LFUN_PRIMARY_SELECTION_PASTE:
case LFUN_QUOTE_INSERT: {
Paragraph & par = cur.paragraph();
pos_type pos = cur.pos();
- BufferParams const & bufparams = bv->buffer()->params();
- Layout_ptr const & style = par.layout();
+ BufferParams const & bufparams = bv->buffer().params();
+ LayoutPtr const & style = par.layout();
if (!style->pass_thru
&& par.getFontSettings(bufparams, pos).language()->lang() != "hebrew") {
// this avoids a double undo
break;
}
- case LFUN_DATE_INSERT:
- if (cmd.argument().empty())
- lyx::dispatch(FuncRequest(LFUN_SELF_INSERT,
- formatted_time(current_time())));
- else
- lyx::dispatch(FuncRequest(LFUN_SELF_INSERT,
- formatted_time(current_time(), to_utf8(cmd.argument()))));
+ case LFUN_DATE_INSERT: {
+ string const format = cmd.argument().empty()
+ ? lyxrc.date_insert_format : to_utf8(cmd.argument());
+ string const time = formatted_time(current_time(), format);
+ lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, time));
break;
+ }
case LFUN_MOUSE_TRIPLE:
if (cmd.button() == mouse_button::button1) {
// Single-click on work area
case LFUN_MOUSE_PRESS: {
- cap::saveSelection(bv->cursor());
// Right click on a footnote flag opens float menu
if (cmd.button() == mouse_button::button3)
cur.clearSelection();
- // Middle button press pastes if we have a selection
- // We do this here as if the selection was inside an inset
- // it could get cleared on the unlocking of the inset so
- // we have to check this first
- bool paste_internally = false;
- if (cmd.button() == mouse_button::button2 && cap::selection()) {
- // Copy the selection buffer to the clipboard
- // stack, because we want it to appear in the
- // "Edit->Paste recent" menu.
- cap::copySelectionToStack();
- paste_internally = true;
- }
+ // Set the cursor
+ bool update = bv->mouseSetCursor(cur);
// Insert primary selection with middle mouse
// if there is a local selection in the current buffer,
// insert this
if (cmd.button() == mouse_button::button2) {
- if (paste_internally) {
- cap::pasteSelection(cur, bv->buffer()->errorList("Paste"));
- bv->buffer()->errors("Paste");
- cur.clearSelection(); // bug 393
- bv->buffer()->markDirty();
+ if (cap::selection()) {
+ // Copy the selection buffer to the clipboard
+ // stack, because we want it to appear in the
+ // "Edit->Paste recent" menu.
+ cap::copySelectionToStack();
+
+ cap::pasteSelection(bv->cursor(),
+ bv->buffer().errorList("Paste"));
+ bv->buffer().errors("Paste");
+ bv->buffer().markDirty();
finishUndo();
} else {
- bv->mouseSetCursor(cur);
lyx::dispatch(FuncRequest(LFUN_PRIMARY_SELECTION_PASTE, "paragraph"));
}
}
- // we have to update after dePM triggered
- bool update = bv->mouseSetCursor(cur);
-
+ // we have to update after dEPM triggered
if (!update && cmd.button() == mouse_button::button1) {
needsUpdate = false;
cur.noUpdate();
// inside it.
doInsertInset(cur, this, cmd, true, true);
cur.posRight();
- updateLabels(*bv->buffer());
+ updateLabels(bv->buffer());
break;
case LFUN_NOTE_INSERT:
case LFUN_CHARSTYLE_INSERT:
cur.posRight();
ParagraphList & pars = cur.text()->paragraphs();
- TextClass const & tclass = bv->buffer()->params().getTextClass();
+ TextClass const & tclass = bv->buffer().params().getTextClass();
// add a separate paragraph for the caption inset
pars.push_back(Paragraph());
// reposition the cursor to the caption
cur.pit() = cap_pit;
cur.pos() = 0;
- cur.dispatch(FuncRequest(LFUN_CAPTION_INSERT));
+ // FIXME: This Text/Cursor dispatch handling is a mess!
+ // We cannot use Cursor::dispatch here it needs access to up to
+ // date metrics.
+ cur.text()->dispatch(cur, FuncRequest(LFUN_CAPTION_INSERT));
+ cur.updateFlags(Update::Force);
// FIXME: When leaving the Float (or Wrap) inset we should
// delete any empty paragraph left above or below the
// caption.
break;
case LFUN_FLOAT_LIST: {
- TextClass const & tclass = bv->buffer()->params().getTextClass();
+ TextClass const & tclass = bv->buffer().params().getTextClass();
if (tclass.floats().typeExist(to_utf8(cmd.argument()))) {
recordUndo(cur);
if (cur.selection())
}
setLayout(cur, tclass.defaultLayoutName());
- setParagraph(cur, Spacing(), LYX_ALIGN_LAYOUT, docstring(), 0);
+ ParagraphParameters p;
+ setParagraphs(cur, p);
insertInset(cur, new InsetFloatList(to_utf8(cmd.argument())));
cur.posRight();
} else {
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(to_utf8(cmd.argument()));
- Lexer lex(0, 0);
- lex.setStream(is);
- ParagraphParameters params;
- params.read(lex);
- setParagraph(cur,
- params.spacing(),
- params.align(),
- params.labelWidthString(),
- params.noindent());
+ // the current paragraph, or currently selected paragraphs,
+ // appropriately.
+ // NOTE: This function overrides all existing settings.
+ setParagraphs(cur, cmd.argument());
+ cur.message(_("Paragraph layout set"));
+ break;
+ }
+
+ case LFUN_PARAGRAPH_PARAMS: {
+ // Given data, an encoding of the ParagraphParameters as we'd
+ // find them in a LyX file, this function modifies the current paragraph,
+ // or currently selected paragraphs.
+ // NOTE: This function only modifies, and does not override, existing
+ // settings.
+ setParagraphs(cur, cmd.argument(), true);
cur.message(_("Paragraph layout set"));
break;
}
}
needsUpdate |= (cur.pos() != cur.lastpos()) && cur.selection();
- theSelection().haveSelection(bv->cursor().selection());
// FIXME: The cursor flag is reset two lines below
// so we need to check here if some of the LFUN did touch that.
break;
case LFUN_CHARSTYLE_INSERT:
code = Inset::CHARSTYLE_CODE;
- if (cur.buffer().params().getTextClass().charstyles().empty())
+ if (cur.buffer().params().getTextClass().insetlayouts().empty())
enable = false;
break;
case LFUN_BOX_INSERT:
break;
case LFUN_INSET_DISSOLVE:
- enable = !isMainText(*cur.bv().buffer()) && cur.inset().nargs() == 1;
+ enable = !isMainText(cur.bv().buffer()) && cur.inset().nargs() == 1;
break;
case LFUN_CHANGE_ACCEPT:
case LFUN_ACCENT_OGONEK:
case LFUN_THESAURUS_ENTRY:
case LFUN_PARAGRAPH_PARAMS_APPLY:
+ case LFUN_PARAGRAPH_PARAMS:
case LFUN_ESCAPE:
case LFUN_BUFFER_END:
case LFUN_BUFFER_BEGIN: