X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNote.cpp;h=05ee4f0fbb752c03f19a056fd94e9402c92197da;hb=bfddee97e191a853f0576f4fab3f095c4e9ce0de;hp=acb9cb6b9141b479199ec7dc3a40badc8aed908a;hpb=1ef605f6254ef3f3b8cec5440a2e67e6f23a707b;p=lyx.git

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index acb9cb6b91..05ee4f0fbb 100644
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -111,7 +111,7 @@ InsetNote::~InsetNote()
 }
 
 
-docstring InsetNote::name() const 
+docstring InsetNote::layoutName() const
 {
 	return from_ascii("Note:" + notetranslator().find(params_.type));
 }
@@ -220,10 +220,10 @@ bool InsetNote::isMacroScope() const
 }
 
 
-int InsetNote::latex(otexstream & os, OutputParams const & runparams_in) const
+void InsetNote::latex(otexstream & os, OutputParams const & runparams_in) const
 {
 	if (params_.type == InsetNoteParams::Note)
-		return 0;
+		return;
 
 	OutputParams runparams(runparams_in);
 	if (params_.type == InsetNoteParams::Comment) {
@@ -232,13 +232,6 @@ int InsetNote::latex(otexstream & os, OutputParams const & runparams_in) const
 		runparams.exportdata.reset(new ExportData);
 	} 
 
-	odocstringstream ss;
-	otexstream ots(ss);
-	ots.canBreakLine(os.canBreakLine());
-	InsetCollapsable::latex(ots, runparams);
-	docstring const str = ss.str();
-	os << str;
-
 	// 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
 	// following latex output:
@@ -250,13 +243,13 @@ int InsetNote::latex(otexstream & os, OutputParams const & runparams_in) const
 	//  b
 	//
 	// Adding {} before ' b' fixes this.
-	// The {} will be automatically added, but only if needed, by
-	// telling otexstream to protect an immediately following space.
-	os.protectSpace(ots.protectSpace());
+	// The {} will be automatically added, but only if needed, for all
+	// 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);
 
 	runparams_in.encoding = runparams.encoding;
-	// Return how many newlines we issued.
-	return int(count(str.begin(), str.end(), '\n'));
 }