prevent crash when inserting minipage in table cell,

[lyx.git] / src / insets / insetnote.C

diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C
index b08dc9061225a5c90a4f52673423f9c78d4dcfde..92a79b09f7d93cdd122b9b8010ac4daa732e5626 100644 (file)
--- a/src/insets/insetnote.C
+++ b/src/insets/insetnote.C
@@ -132,8 +132,7 @@ dispatch_result InsetNote::localDispatch(FuncRequest const & cmd)
                InsetNoteMailer("note", *this).updateDialog(bv);
                return DISPATCHED;
        case LFUN_MOUSE_RELEASE:
-               if (cmd.button() == mouse_button::button3 && cmd.x < button_length
-                                       && cmd.y >= button_top_y && cmd.y <= button_bottom_y) {
+               if (cmd.button() == mouse_button::button3 && hitButton(cmd)) {
                        InsetNoteMailer("note", *this).showDialog(bv);
                        return DISPATCHED;
                }
@@ -151,9 +150,11 @@ int InsetNote::latex(Buffer const * buf, ostream & os,
 
        int i = 0;
        if (pt == "Comment")
-               os << "%\n\\begin{comment}\n"; // remember to validate
+                // verbatim
+               os << "%\n\\begin{comment}\n";
        else if (pt == "Greyedout")
-               os << "%\n\\textcolor[gray]{0.8}{";
+                // we roll our own macro
+               os << "%\n\\begin{lyxgreyedout}\n";
 
        if (pt != "Note")
                i = inset.latex(buf, os, runparams);
@@ -162,26 +163,47 @@ int InsetNote::latex(Buffer const * buf, ostream & os,
                os << "%\n\\end{comment}\n";
                i += 3;
        } else if (pt == "Greyedout") {
-               os << "\\normalcolor%\n}";
+               os << "%\n\\end{lyxgreyedout}\n";
                i += 2;
        }
        return i;
 }
 
 
-int InsetNote::linuxdoc(Buffer const *, std::ostream &) const
+int InsetNote::linuxdoc(Buffer const * buf, std::ostream & os) const
 {
-       return 0;
+       string const pt = params_.type;
+
+       int i = 0;
+       if (pt == "Comment")
+               os << "<comment>\n";
+
+       if (pt != "Note")
+               i = inset.linuxdoc(buf, os);
+
+       if (pt == "Comment") {
+               os << "\n</comment>\n";
+               i += 3;
+       }
+       return i;
 }
 
 
 int InsetNote::docbook(Buffer const * buf, std::ostream & os, bool mixcont) const
 {
-       int i = 0;
        string const pt = params_.type;
-       // incomplete, untested - MV
+
+       int i = 0;
+       if (pt == "Comment")
+               os << "<remark>\n";
+
        if (pt != "Note")
                i = inset.docbook(buf, os, mixcont);
+
+       if (pt == "Comment") {
+               os << "\n</remark>\n";
+               i += 3;
+       }
        return i;
 }
 
@@ -203,8 +225,10 @@ void InsetNote::validate(LaTeXFeatures & features) const
 {
        if (params_.type == "Comment")
                features.require("verbatim");
-       if (params_.type == "Greyedout")
+       if (params_.type == "Greyedout") {
                features.require("color");
+               features.require("lyxgreyedout");
+       }
        inset.validate(features);
 }