* Lazy MathData to avoid unneeded interpretation of macro definitions

[features.git] / src / insets / InsetNote.cpp

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index 9285ea95f60776da76a3ab0807dc62e39b6d4f62..94463a64decc44880a0602962359b269fca6cb39 100644 (file)
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -20,35 +20,31 @@
 #include "BufferParams.h"
 #include "Counters.h"
 #include "Cursor.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "DispatchResult.h"
 #include "Exporter.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"
+#include "TextClass.h"
 
+#include "support/docstream.h"
 #include "support/Translator.h"
 
 #include <algorithm>
 #include <sstream>
 
+using namespace std;
 
 namespace lyx {
 
-using std::string;
-using std::auto_ptr;
-using std::istringstream;
-using std::ostream;
-using std::ostringstream;
-
-
 namespace {
 
-typedef Translator<std::string, InsetNoteParams::Type> NoteTranslator;
+typedef Translator<string, InsetNoteParams::Type> NoteTranslator;
 typedef Translator<docstring, InsetNoteParams::Type> NoteTranslatorLoc;
 
 NoteTranslator const init_notetranslator()
@@ -56,19 +52,15 @@ NoteTranslator const init_notetranslator()
        NoteTranslator translator("Note", InsetNoteParams::Note);
        translator.addPair("Comment", InsetNoteParams::Comment);
        translator.addPair("Greyedout", InsetNoteParams::Greyedout);
-       translator.addPair("Framed", InsetNoteParams::Framed);
-       translator.addPair("Shaded", InsetNoteParams::Shaded);
        return translator;
 }
 
 
 NoteTranslatorLoc const init_notetranslator_loc()
 {
-       NoteTranslatorLoc translator(_("Note"), InsetNoteParams::Note);
+       NoteTranslatorLoc translator(_("Note[[InsetNote]]"), InsetNoteParams::Note);
        translator.addPair(_("Comment"), InsetNoteParams::Comment);
        translator.addPair(_("Greyed out"), InsetNoteParams::Greyedout);
-       translator.addPair(_("Framed"), InsetNoteParams::Framed);
-       translator.addPair(_("Shaded"), InsetNoteParams::Shaded);
        return translator;
 }
 
@@ -116,16 +108,12 @@ InsetNote::InsetNote(BufferParams const & bp, string const & label)
        : InsetCollapsable(bp)
 {
        params_.type = notetranslator().find(label);
-       setLayout(bp);
-       setButtonLabel();
 }
 
 
 InsetNote::InsetNote(InsetNote const & in)
        : InsetCollapsable(in), params_(in.params_)
-{
-       setButtonLabel();
-}
+{}
 
 
 InsetNote::~InsetNote()
@@ -134,9 +122,9 @@ InsetNote::~InsetNote()
 }
 
 
-auto_ptr<Inset> InsetNote::doClone() const
+Inset * InsetNote::clone() const
 {
-       return auto_ptr<Inset>(new InsetNote(*this));
+       return new InsetNote(*this);
 }
 
 
@@ -154,13 +142,7 @@ docstring InsetNote::name() const
 
 Inset::DisplayType InsetNote::display() const
 {
-       switch (params_.type) {
-       case InsetNoteParams::Framed:
-       case InsetNoteParams::Shaded:
-               return AlignLeft;
-       default:
-               return Inline;
-       }
+       return Inline;
 }
 
 
@@ -175,8 +157,6 @@ void InsetNote::read(Buffer const & buf, Lexer & lex)
 {
        params_.read(lex);
        InsetCollapsable::read(buf, lex);
-       setLayout(buf.params());
-       setButtonLabel();
 }
 
 
@@ -187,30 +167,6 @@ void InsetNote::setButtonLabel()
 }
 
 
-Color_color InsetNote::backgroundColor() const
-{
-       Color_color c;
-       switch (params_.type) {
-       case InsetNoteParams::Note:
-               c = Color::notebg;
-               break;
-       case InsetNoteParams::Comment:
-               c = Color::commentbg;
-               break;
-       case InsetNoteParams::Greyedout:
-               c = Color::greyedoutbg;
-               break;
-       case InsetNoteParams::Framed:
-               c = Color::greyedoutbg;
-               break;
-       case InsetNoteParams::Shaded:
-               c = Color::shadedbg;
-               break;
-       }
-       return c;
-}
-
-
 bool InsetNote::showInsetDialog(BufferView * bv) const
 {
        InsetNoteMailer(const_cast<InsetNote &>(*this)).showDialog(bv);
@@ -226,7 +182,6 @@ void InsetNote::doDispatch(Cursor & cur, FuncRequest & cmd)
                InsetNoteMailer::string2params(to_utf8(cmd.argument()), params_);
                // get a bp from cur:
                setLayout(cur.buffer().params());
-               setButtonLabel();
                break;
 
        case LFUN_INSET_DIALOG_UPDATE:
@@ -263,6 +218,16 @@ void InsetNote::updateLabels(Buffer const & buf, ParIterator const & it)
 }
 
 
+bool InsetNote::isMacroScope(Buffer const & buf) const
+{
+       // LyX note has no latex output
+       if (params_.type == InsetNoteParams::Note)
+               return true;
+
+       return InsetCollapsable::isMacroScope(buf);
+}
+
+
 int InsetNote::latex(Buffer const & buf, odocstream & os,
                     OutputParams const & runparams_in) const
 {
@@ -296,7 +261,7 @@ int InsetNote::latex(Buffer const & buf, odocstream & os,
        os << str;
        runparams_in.encoding = runparams.encoding;
        // Return how many newlines we issued.
-       return int(std::count(str.begin(), str.end(), '\n'));
+       return int(count(str.begin(), str.end(), '\n'));
 }
 
 
@@ -353,12 +318,6 @@ void InsetNote::validate(LaTeXFeatures & features) const
                features.require("color");
                features.require("lyxgreyedout");
        }
-       if (params_.type == InsetNoteParams::Shaded) {
-               features.require("color");
-               features.require("framed");
-       }
-       if (params_.type == InsetNoteParams::Framed)
-               features.require("framed");
        InsetText::validate(features);
 }