Natbib authoryear uses (Ref1; Ref2) by default.

[lyx.git] / src / Text3.cpp

diff --git a/src/Text3.cpp b/src/Text3.cpp
index b009e58b31aff16a44a241a8ff096ac31f0bc802..6e6e9e6f3b57fdabc296757dce530de5d6e7495d 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -148,7 +148,7 @@ static void mathDispatch(Cursor & cur, FuncRequest const & cmd, bool display)
 #endif
                cur.insert(new InsetMathHull(cur.buffer(), hullSimple));
 #ifdef ENABLE_ASSERTIONS
-               LASSERT(old_pos == cur.pos(), /**/);
+               LATTEST(old_pos == cur.pos());
 #endif
                cur.nextInset()->edit(cur, true);
                // don't do that also for LFUN_MATH_MODE
@@ -488,7 +488,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        // at the end?
        cur.noScreenUpdate();
 
-       LASSERT(cur.text() == this, /**/);
+       LBUFERR(this == cur.text());
        CursorSlice const oldTopSlice = cur.top();
        bool const oldBoundary = cur.boundary();
        bool const oldSelection = cur.selection();
@@ -940,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);
@@ -1100,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':
@@ -1239,7 +1236,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
        case LFUN_PASTE: {
                cur.message(_("Paste"));
-               LASSERT(cur.selBegin().idx() == cur.selEnd().idx(), /**/);
+               LASSERT(cur.selBegin().idx() == cur.selEnd().idx(), break);
                cap::replaceSelection(cur);
 
                // without argument?
@@ -1251,11 +1248,15 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                                     && !theClipboard().hasTextContents())
                                pasteClipboardGraphics(cur, bv->buffer().errorList("Paste"));
                        else
-                               pasteClipboardText(cur, bv->buffer().errorList("Paste"));
+                               pasteClipboardText(cur, bv->buffer().errorList("Paste"), true);
                } else if (isStrUnsignedInt(arg)) {
                        // we have a numerical argument
                        pasteFromStack(cur, bv->buffer().errorList("Paste"),
                                       convert<unsigned int>(arg));
+               } else if (arg == "html" || arg == "latex") {
+                       Clipboard::TextType type = (arg == "html") ?
+                               Clipboard::HtmlTextType : Clipboard::LaTeXTextType;
+                       pasteClipboardText(cur, bv->buffer().errorList("Paste"), true, type);
                } else {
                        Clipboard::GraphicsType type = Clipboard::AnyGraphicsType;
                        if (arg == "pdf")
@@ -1270,9 +1271,10 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                                type = Clipboard::EmfGraphicsType;
                        else if (arg == "wmf")
                                type = Clipboard::WmfGraphicsType;
-
                        else
-                               LASSERT(false, /**/);
+                               // We used to assert, but couldn't the argument come from, say, the
+                               // minibuffer and just be mistyped?
+                               LYXERR0("Unrecognized graphics type: " << arg);
 
                        pasteClipboardGraphics(cur, bv->buffer().errorList("Paste"), type);
                }
@@ -1447,14 +1449,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 = 
@@ -1924,7 +1926,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                cap::replaceSelection(cur);
                cur.insert(new InsetMathHull(cur.buffer(), hullSimple));
                checkAndActivateInset(cur, true);
-               LASSERT(cur.inMathed(), /**/);
+               LASSERT(cur.inMathed(), break);
                cur.dispatch(cmd);
                break;
        }
@@ -2375,7 +2377,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
                        FuncStatus & flag) const
 {
-       LASSERT(cur.text() == this, /**/);
+       LBUFERR(this == cur.text());
 
        FontInfo const & fontinfo = cur.real_current_font.fontInfo();
        bool enable = true;
@@ -2528,11 +2530,20 @@ 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);
+               string arg = cmd.getArg(0);
+               bool varia = arg != "LongTableNoNumber";
+               if (cur.depth() > 0) {
+                       if (&cur[cur.depth() - 1].inset())
+                               varia = cur[cur.depth() - 1].inset().allowsCaptionVariation(arg);
+               }
+               // 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,
@@ -2766,6 +2777,20 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
                        break;
                }
 
+               // explicit text type?
+               if (arg == "html") {
+                       // Do not enable for PlainTextType, since some tidying in the
+                       // frontend is needed for HTML, which is too unsafe for plain text.
+                       enable = theClipboard().hasTextContents(Clipboard::HtmlTextType);
+                       break;
+               } else if (arg == "latex") {
+                       // LaTeX is usually not available on the clipboard with
+                       // the correct MIME type, but in plain text.
+                       enable = theClipboard().hasTextContents(Clipboard::PlainTextType) ||
+                                theClipboard().hasTextContents(Clipboard::LaTeXTextType);
+                       break;
+               }
+
                // explicit graphics type?
                Clipboard::GraphicsType type = Clipboard::AnyGraphicsType;
                if ((arg == "pdf" && (type = Clipboard::PdfGraphicsType))