Context menu for InsetArgument

[lyx.git] / src / insets / InsetNewpage.cpp

diff --git a/src/insets/InsetNewpage.cpp b/src/insets/InsetNewpage.cpp
index 511fbfb6e7fe958c2081e15298f4272e8b898582..85e8d14dd394d02539d1963015f389613f141ddf 100644 (file)
--- a/src/insets/InsetNewpage.cpp
+++ b/src/insets/InsetNewpage.cpp
@@ -3,8 +3,8 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
- * \author Jürgen Spitzmüller
+ * \author André Pönitz
+ * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -13,11 +13,13 @@
 
 #include "InsetNewpage.h"
 
+#include "Cursor.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"
+#include "output_xhtml.h"
 #include "Text.h"
 #include "TextMetrics.h"
 
@@ -34,12 +36,12 @@ using namespace std;
 
 namespace lyx {
 
-InsetNewpage::InsetNewpage()
+       InsetNewpage::InsetNewpage() : Inset(0)
 {}
 
 
 InsetNewpage::InsetNewpage(InsetNewpageParams const & params)
-       : params_(params)
+       : Inset(0), params_(params)
 {}
 
 
@@ -79,8 +81,6 @@ void InsetNewpageParams::read(Lexer & lex)
                kind = InsetNewpageParams::CLEARDOUBLEPAGE;
        else
                lex.printError("Unknown kind");
-
-       lex >> "\\end_inset";
 }
 
 
@@ -94,6 +94,7 @@ void InsetNewpage::write(ostream & os) const
 void InsetNewpage::read(Lexer & lex)
 {
        params_.read(lex);
+       lex >> "\\end_inset";
 }
 
 
@@ -137,10 +138,11 @@ void InsetNewpage::draw(PainterInfo & pi, int x, int y) const
 
 void InsetNewpage::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-       switch (cmd.action) {
+       switch (cmd.action()) {
 
        case LFUN_INSET_MODIFY: {
                InsetNewpageParams params;
+               cur.recordUndo();
                string2params(to_utf8(cmd.argument()), params);
                params_.kind = params.kind;
                break;
@@ -156,7 +158,7 @@ void InsetNewpage::doDispatch(Cursor & cur, FuncRequest & cmd)
 bool InsetNewpage::getStatus(Cursor & cur, FuncRequest const & cmd,
        FuncStatus & status) const
 {
-       switch (cmd.action) {
+       switch (cmd.action()) {
        // we handle these
        case LFUN_INSET_MODIFY:
                if (cmd.getArg(0) == "newpage") {
@@ -197,26 +199,21 @@ docstring InsetNewpage::insetLabel() const
 ColorCode InsetNewpage::ColorName() const
 {
        switch (params_.kind) {
-               case InsetNewpageParams::NEWPAGE:
-                       return Color_newpage;
-                       break;
                case InsetNewpageParams::PAGEBREAK:
                        return Color_pagebreak;
                        break;
+               case InsetNewpageParams::NEWPAGE:
                case InsetNewpageParams::CLEARPAGE:
-                       return Color_newpage;
-                       break;
                case InsetNewpageParams::CLEARDOUBLEPAGE:
                        return Color_newpage;
                        break;
-               default:
-                       return Color_newpage;
-                       break;
        }
+       // not really useful, but to avoids gcc complaints
+       return Color_newpage;
 }
 
 
-int InsetNewpage::latex(odocstream & os, OutputParams const &) const
+void InsetNewpage::latex(otexstream & os, OutputParams const &) const
 {
        switch (params_.kind) {
                case InsetNewpageParams::NEWPAGE:
@@ -235,7 +232,6 @@ int InsetNewpage::latex(odocstream & os, OutputParams const &) const
                        os << "\\newpage{}";
                        break;
        }
-       return 0;
 }
 
 
@@ -253,9 +249,16 @@ int InsetNewpage::docbook(odocstream & os, OutputParams const &) const
 }
 
 
-docstring InsetNewpage::contextMenu(BufferView const &, int, int) const
+docstring InsetNewpage::xhtml(XHTMLStream & xs, OutputParams const &) const
+{
+       xs << html::CompTag("br");
+       return docstring();
+}
+
+
+string InsetNewpage::contextMenuName() const
 {
-       return from_ascii("context-newpage");
+       return "context-newpage";
 }