X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Finsets%2FInsetNote.cpp;h=ef946db3388e3dcb326f4529bb1b8dba4caa50e6;hb=8b86f744cb7c88d13983ad6df31187f3bfa183ad;hp=da9dd3366974382eb3c655828bbce06e49d1d393;hpb=6056db3212555ce5b7c599a350e95e9a4b5d1853;p=lyx.git

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index da9dd33669..ef946db338 100644
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -18,6 +18,7 @@
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "BufferParams.h"
+#include "ColorSet.h"
 #include "Counters.h"
 #include "Cursor.h"
 #include "DispatchResult.h"
@@ -36,6 +37,7 @@
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
+#include "support/lstrings.h"
 #include "support/Translator.h"
 
 #include "frontends/Application.h"
@@ -62,12 +64,12 @@ NoteTranslator const init_notetranslator()
 
 NoteTranslator const & notetranslator()
 {
-	static NoteTranslator translator = init_notetranslator();
+	static NoteTranslator const translator = init_notetranslator();
 	return translator;
 }
 
 
-} // anon
+} // namespace
 
 
 InsetNoteParams::InsetNoteParams()
@@ -98,7 +100,7 @@ void InsetNoteParams::read(Lexer & lex)
 /////////////////////////////////////////////////////////////////////
 
 InsetNote::InsetNote(Buffer * buf, string const & label)
-	: InsetCollapsable(buf)
+	: InsetCollapsible(buf)
 {
 	params_.type = notetranslator().find(label);
 }
@@ -125,14 +127,14 @@ Inset::DisplayType InsetNote::display() const
 void InsetNote::write(ostream & os) const
 {
 	params_.write(os);
-	InsetCollapsable::write(os);
+	InsetCollapsible::write(os);
 }
 
 
 void InsetNote::read(Lexer & lex)
 {
 	params_.read(lex);
-	InsetCollapsable::read(lex);
+	InsetCollapsible::read(lex);
 }
 
 
@@ -148,21 +150,33 @@ void InsetNote::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
 	switch (cmd.action()) {
 
-	case LFUN_INSET_MODIFY:
-		cur.recordUndoInset(ATOMIC_UNDO, this);
+	case LFUN_INSET_MODIFY: {
+		// Do not do anything if converting to the same type of Note.
+		// A quick break here is done instead of disabling the LFUN
+		// because disabling the LFUN would lead to a greyed out
+		// entry, which might confuse users.
+		// In the future, we might want to have a radio button for
+		// switching between notes.
+		InsetNoteParams params;
+		string2params(to_utf8(cmd.argument()), params);
+		if (params_.type == params.type)
+		  break;
+
+		cur.recordUndoInset(this);
 		string2params(to_utf8(cmd.argument()), params_);
 		setButtonLabel();
 		// what we really want here is a TOC update, but that means
 		// a full buffer update
 		cur.forceBufferUpdate();
 		break;
+	}
 
 	case LFUN_INSET_DIALOG_UPDATE:
 		cur.bv().updateDialog("note", params2string(params()));
 		break;
 
 	default:
-		InsetCollapsable::doDispatch(cur, cmd);
+		InsetCollapsible::doDispatch(cur, cmd);
 		break;
 	}
 }
@@ -189,33 +203,18 @@ bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd,
 		return true;
 
 	default:
-		return InsetCollapsable::getStatus(cur, cmd, flag);
+		return InsetCollapsible::getStatus(cur, cmd, flag);
 	}
 }
 
 
-void InsetNote::addToToc(DocIterator const & cpit) const
-{
-	DocIterator pit = cpit;
-	pit.push_back(CursorSlice(const_cast<InsetNote &>(*this)));
-
-	Toc & toc = buffer().tocBackend().toc("note");
-	InsetLayout const & il = getLayout();
-	docstring str = translateIfPossible(il.labelstring()) + from_ascii(": ");
-	text().forToc(str, TOC_ENTRY_LENGTH);
-	toc.push_back(TocItem(pit, 0, str, toolTipText(docstring(), 3, 60)));
-	// Proceed with the rest of the inset.
-	InsetCollapsable::addToToc(cpit);
-}
-
-
 bool InsetNote::isMacroScope() const
 {
 	// LyX note has no latex output
 	if (params_.type == InsetNoteParams::Note)
 		return true;
 
-	return InsetCollapsable::isMacroScope();
+	return InsetCollapsible::isMacroScope();
 }
 
 
@@ -229,7 +228,7 @@ void InsetNote::latex(otexstream & os, OutputParams const & runparams_in) const
 		runparams.inComment = true;
 		// Ignore files that are exported inside a comment
 		runparams.exportdata.reset(new ExportData);
-	} 
+	}
 
 	// the space after the comment in 'a[comment] b' will be eaten by the
 	// comment environment since the space before b is ignored with the
@@ -246,14 +245,14 @@ void InsetNote::latex(otexstream & os, OutputParams const & runparams_in) const
 	// insets whose InsetLayout Display tag is false. This is achieved
 	// by telling otexstream to protect an immediately following space
 	// and is done for both comment and greyedout insets.
-	InsetCollapsable::latex(os, runparams);
+	InsetCollapsible::latex(os, runparams);
 
 	runparams_in.encoding = runparams.encoding;
 }
 
 
-int InsetNote::plaintext(odocstream & os,
-			 OutputParams const & runparams_in) const
+int InsetNote::plaintext(odocstringstream & os,
+			 OutputParams const & runparams_in, size_t max_length) const
 {
 	if (params_.type == InsetNoteParams::Note)
 		return 0;
@@ -265,7 +264,7 @@ int InsetNote::plaintext(odocstream & os,
 		runparams.exportdata.reset(new ExportData);
 	}
 	os << '[' << buffer().B_("note") << ":\n";
-	InsetText::plaintext(os, runparams);
+	InsetText::plaintext(os, runparams, max_length);
 	os << "\n]";
 
 	return PLAINTEXT_NEWLINE + 1; // one char on a separate line
@@ -301,7 +300,7 @@ docstring InsetNote::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 	if (params_.type == InsetNoteParams::Note)
 		return docstring();
 
-	return InsetCollapsable::xhtml(xs, rp);
+	return InsetCollapsible::xhtml(xs, rp);
 }
 
 
@@ -309,12 +308,16 @@ void InsetNote::validate(LaTeXFeatures & features) const
 {
 	switch (params_.type) {
 	case InsetNoteParams::Comment:
-		features.require("verbatim");
+		if (features.runparams().flavor == OutputParams::HTML)
+			// we do output this but set display to "none" by default,
+			// but people might want to use it.
+			InsetCollapsible::validate(features);
+		else
+			// Only do the requires
+			features.useInsetLayout(getLayout());
 		break;
 	case InsetNoteParams::Greyedout:
-		features.require("color");
-		features.require("lyxgreyedout");
-		InsetCollapsable::validate(features);
+		InsetCollapsible::validate(features);
 		break;
 	case InsetNoteParams::Note:
 		break;
@@ -322,9 +325,9 @@ void InsetNote::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetNote::contextMenuName() const
+string InsetNote::contextMenuName() const
 {
-	return from_ascii("context-note");
+	return "context-note";
 }
 
 bool InsetNote::allowSpellCheck() const
@@ -332,6 +335,19 @@ bool InsetNote::allowSpellCheck() const
 	return (params_.type == InsetNoteParams::Greyedout || lyxrc.spellcheck_notes);
 }
 
+FontInfo InsetNote::getFont() const
+{
+	FontInfo font = getLayout().font();
+	// FIXME: This hardcoded color is a hack!
+	if (params_.type == InsetNoteParams::Greyedout
+	    && buffer().params().notefontcolor != lyx::rgbFromHexName("#cccccc")) {
+		ColorCode c = lcolor.getFromLyXName("notefontcolor");
+		if (c != Color_none)
+			font.setColor(c);
+	}
+	return font;
+}
+
 
 string InsetNote::params2string(InsetNoteParams const & params)
 {