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

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index bb2f0eeb1b..ab90288c6b 100644
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -20,7 +20,6 @@
 #include "BufferParams.h"
 #include "Counters.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "Exporter.h"
 #include "FuncRequest.h"
@@ -30,26 +29,24 @@
 #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::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()
@@ -57,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;
 }
 
@@ -145,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;
 }
 
 
@@ -233,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
 {
@@ -266,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'));
 }
 
 
@@ -323,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);
 }