X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNote.cpp;h=ab90288c6beb5530ad33f553567693c5c5bbf29d;hb=2c357c1d23b7b83839a9beb8225d4f1ae4f793b4;hp=99cf71a4918649f5161e1193400973426068b4e5;hpb=77b575e562e6eae192467b8c0dd742afe3e86acb;p=lyx.git

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index 99cf71a491..ab90288c6b 100644
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -20,35 +20,33 @@
 #include "BufferParams.h"
 #include "Counters.h"
 #include "Cursor.h"
-#include "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 "ParIterator.h"
+#include "TextClass.h"
+#include "TocBackend.h"
 
+#include "support/debug.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 +54,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 +110,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 +124,9 @@ InsetNote::~InsetNote()
 }
 
 
-auto_ptr<Inset> InsetNote::doClone() const
+Inset * InsetNote::clone() const
 {
-	return auto_ptr<Inset>(new InsetNote(*this));
+	return new InsetNote(*this);
 }
 
 
@@ -148,19 +138,13 @@ docstring const InsetNote::editMessage() const
 
 docstring InsetNote::name() const 
 {
-	return from_ascii(string("Note") + string(":") + string(notetranslator().find(params_.type)));
+	return from_ascii("Note:" + notetranslator().find(params_.type));
 }
 
 
 Inset::DisplayType InsetNote::display() const
 {
-	switch (params_.type) {
-	case InsetNoteParams::Framed:
-	case InsetNoteParams::Shaded:
-		return AlignLeft;
-	default:
-		return Inline;
-	}
+	return Inline;
 }
 
 
@@ -175,8 +159,6 @@ void InsetNote::read(Buffer const & buf, Lexer & lex)
 {
 	params_.read(lex);
 	InsetCollapsable::read(buf, lex);
-	setLayout(buf.params());
-	setButtonLabel();
 }
 
 
@@ -202,7 +184,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:
@@ -239,6 +220,30 @@ void InsetNote::updateLabels(Buffer const & buf, ParIterator const & it)
 }
 
 
+void InsetNote::addToToc(Buffer const & buf,
+	ParConstIterator const & cpit) const
+{
+	ParConstIterator pit = cpit;
+	pit.push_back(*this);
+
+	Toc & toc = buf.tocBackend().toc("note");
+	docstring str;
+	str = notetranslator_loc().find(params_.type) + from_ascii(": ")
+		+ getNewLabel(str);
+	toc.push_back(TocItem(pit, 0, str));
+}
+
+
+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
 {
@@ -272,7 +277,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'));
 }
 
 
@@ -329,12 +334,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);
 }