Cmake build: Creating a define for a header file found

[lyx.git] / src / Text3.cpp

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 9400526c84d3271d7e10aa5688eb857e002424ab..fad451c7288007d612f4c4bca479e7e5b328a7b8 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -295,6 +295,8 @@ static bool doInsertInset(Cursor & cur, Text * text,
                        // Merge multiple paragraphs -- hack
                        while (cur.lastpit() > 0)
                                mergeParagraph(bparams, cur.text()->paragraphs(), 0);
+                       if (cmd.action() == LFUN_FLEX_INSERT)
+                               return true;
                        Cursor old = cur;
                        cur.leaveInset(*inset);
                        if (cmd.action() == LFUN_PREVIEW_INSERT
@@ -938,15 +940,12 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_NEWLINE_INSERT: {
                InsetNewlineParams inp;
                docstring arg = cmd.argument();
-               // this avoids a double undo
-               // FIXME: should not be needed, ideally
-               if (!cur.selection())
-                       cur.recordUndo();
-               cap::replaceSelection(cur);
                if (arg == "linebreak")
                        inp.kind = InsetNewlineParams::LINEBREAK;
                else
                        inp.kind = InsetNewlineParams::NEWLINE;
+               cap::replaceSelection(cur);
+               cur.recordUndo();
                cur.insert(new InsetNewline(inp));
                cur.posForward();
                moveCursor(cur, false);
@@ -1098,7 +1097,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                        /*
                        Paragraph & par = pars_[cur.pit()];
                        if (inset->lyxCode() == LABEL_CODE
-                               && par.layout().labeltype == LABEL_COUNTER) {
+                               && !par.layout().counter.empty() {
                                // Go to the end of the paragraph
                                // Warning: Because of Change-Tracking, the last
                                // position is 'size()' and not 'size()-1':
@@ -1372,10 +1371,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                if (change_layout)
                        setLayout(cur, layout);
 
-               Layout::LaTeXArgMap args = tclass[layout].latexargs();
-               Layout::LaTeXArgMap itemargs = tclass[layout].itemargs();
-               if (!itemargs.empty())
-                       args.insert(itemargs.begin(), itemargs.end());
+               Layout::LaTeXArgMap args = tclass[layout].args();
                Layout::LaTeXArgMap::const_iterator lait = args.begin();
                Layout::LaTeXArgMap::const_iterator const laend = args.end();
                for (; lait != laend; ++lait) {
@@ -1389,6 +1385,21 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                break;
        }
 
+       case LFUN_ENVIRONMENT_SPLIT: {
+               Paragraph const & para = cur.paragraph();
+               docstring const layout = para.layout().name();
+               if (cur.pos() > 0)
+                       lyx::dispatch(FuncRequest(LFUN_PARAGRAPH_BREAK));
+               bool const morecont = cur.lastpos() > cur.pos();
+               lyx::dispatch(FuncRequest(LFUN_LAYOUT, "Separator"));
+               lyx::dispatch(FuncRequest(LFUN_PARAGRAPH_BREAK, "inverse"));
+               if (morecont) 
+                       lyx::dispatch(FuncRequest(LFUN_DOWN));
+               lyx::dispatch(FuncRequest(LFUN_LAYOUT, layout));
+
+               break;
+       }
+
        case LFUN_CLIPBOARD_PASTE:
                cap::replaceSelection(cur);
                pasteClipboardText(cur, bv->buffer().errorList("Paste"),
@@ -1433,14 +1444,14 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        }
 
        case LFUN_QUOTE_INSERT: {
-               // this avoids a double undo
-               // FIXME: should not be needed, ideally
-               if (!cur.selection())
-                       cur.recordUndo();
                cap::replaceSelection(cur);
+               cur.recordUndo();
 
                Paragraph const & par = cur.paragraph();
                pos_type pos = cur.pos();
+               // Ignore deleted text before cursor
+               while (pos > 0 && par.isDeleted(pos - 1))
+                       --pos;
 
                BufferParams const & bufparams = bv->buffer().params();
                bool const hebrew = 
@@ -1699,7 +1710,6 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_CAPTION_INSERT:
        case LFUN_FOOTNOTE_INSERT:
        case LFUN_NOTE_INSERT:
-       case LFUN_FLEX_INSERT:
        case LFUN_BOX_INSERT:
        case LFUN_BRANCH_INSERT:
        case LFUN_PHANTOM_INSERT:
@@ -1720,6 +1730,37 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                cur.forceBufferUpdate();
                break;
 
+       case LFUN_FLEX_INSERT: {
+               // Open the inset, and move the current selection
+               // inside it.
+               bool const sel = cur.selection();
+               doInsertInset(cur, this, cmd, true, true);
+               // Insert auto-insert arguments
+               bool autoargs = false;
+               Layout::LaTeXArgMap args = cur.inset().getLayout().latexargs();
+               Layout::LaTeXArgMap::const_iterator lait = args.begin();
+               Layout::LaTeXArgMap::const_iterator const laend = args.end();
+               for (; lait != laend; ++lait) {
+                       Layout::latexarg arg = (*lait).second;
+                       if (arg.autoinsert) {
+                               // The cursor might have been invalidated by the replaceSelection.
+                               cur.buffer()->changed(true);
+                               FuncRequest cmd(LFUN_ARGUMENT_INSERT, (*lait).first);
+                               lyx::dispatch(cmd);
+                               autoargs = true;
+                       }
+               }
+               if (!autoargs) {
+                       if (sel)
+                               cur.leaveInset(cur.inset());
+                       cur.posForward();
+               }
+               // Some insets are numbered, others are shown in the outline pane so
+               // let's update the labels and the toc backend.
+               cur.forceBufferUpdate();
+               break;
+       }
+
        case LFUN_TABULAR_INSERT:
                // if there were no arguments, just open the dialog
                if (doInsertInset(cur, this, cmd, false, true))
@@ -2484,11 +2525,21 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
                }
                break;
        }
-       case LFUN_CAPTION_INSERT:
+       case LFUN_CAPTION_INSERT: {
                code = CAPTION_CODE;
-               // not allowed in description items
-               enable = !inDescriptionItem(cur);
+               bool varia = true;
+               if (cur.depth() > 0) {
+                       if (&cur[cur.depth() - 1].inset()
+                           && !cur[cur.depth() - 1].inset().allowsCaptionVariation())
+                               varia = false;
+               }
+               string arg = cmd.getArg(0);
+               // not allowed in description items,
+               // and in specific insets
+               enable = !inDescriptionItem(cur)
+                       && (varia || arg.empty() || arg == "Standard");
                break;
+       }
        case LFUN_NOTE_INSERT:
                code = NOTE_CODE;
                // in commands (sections etc.) and description items,
@@ -2539,10 +2590,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
                        break;
                }
                Layout const & lay = cur.paragraph().layout();
-               Layout::LaTeXArgMap args = lay.latexargs();
-               Layout::LaTeXArgMap itemargs = lay.itemargs();
-               if (!itemargs.empty())
-                       args.insert(itemargs.begin(), itemargs.end());
+               Layout::LaTeXArgMap args = lay.args();
                Layout::LaTeXArgMap::const_iterator const lait =
                                args.find(arg);
                if (lait != args.end()) {
@@ -2837,7 +2885,17 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_LAYOUT:
                enable = !cur.inset().forcePlainLayout();
                break;
-               
+       
+       case LFUN_ENVIRONMENT_SPLIT: {
+               if (cur.paragraph().layout().isEnvironment()
+                   && cur.buffer()->params().documentClass().hasLayout(from_ascii("Separator"))) {
+                       enable = true;
+                       break;
+               }
+               enable = false;
+               break;
+       }
+
        case LFUN_LAYOUT_PARAGRAPH:
        case LFUN_PARAGRAPH_PARAMS:
        case LFUN_PARAGRAPH_PARAMS_APPLY: