X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetnote.C;h=da3c39bfd6449a9f938261ad331b4db4b86358aa;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=89ac827f58894c444184b46fff04918511356376;hpb=55bf6460f304a4632af2136a62c8a82fb86053f3;p=lyx.git

diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C
index 89ac827f58..da3c39bfd6 100644
--- a/src/insets/insetnote.C
+++ b/src/insets/insetnote.C
@@ -17,33 +17,51 @@
 #include "insetnote.h"
 #include "gettext.h"
 #include "lyxfont.h"
+#include "language.h"
 #include "buffer.h"
 #include "BufferView.h"
 #include "lyxtext.h"
 #include "insets/insettext.h"
 #include "support/LOstream.h"
+#include "support/lstrings.h"
 #include "debug.h"
 
 using std::ostream;
 
+
 void InsetNote::init()
 {
 	LyXFont font(LyXFont::ALL_SANE);
 	font.decSize();
 	font.setColor(LColor::note);
 	setLabelFont(font);
-	setAutoCollapse(false);
-
+	setBackgroundColor(LColor::notebg);
 	setLabel(_("note"));
 	setInsetName("Note");
 }
 
+
 InsetNote::InsetNote()
 	: InsetCollapsable()
 {
 	init();
 }
 
+
+InsetNote::InsetNote(InsetNote const & in, bool same_id)
+	: InsetCollapsable(in, same_id)
+{
+	init();
+}
+
+
+Inset * InsetNote::clone(Buffer const &, bool same_id) const
+{
+	return new InsetNote(*const_cast<InsetNote *>(this), same_id);
+}
+
+
+// This constructor is used for reading old InsetInfo
 InsetNote::InsetNote(Buffer const * buf, string const & contents, 
 		     bool collapsed)
 	: InsetCollapsable(collapsed)
@@ -51,19 +69,15 @@ InsetNote::InsetNote(Buffer const * buf, string const & contents,
 	init();
 
 	Paragraph * par = inset.paragraph();
-	Paragraph::size_type pos = 0;
-	buf->insertStringAsLines(par, pos, labelfont, contents);
-}
+	LyXFont font(LyXFont::ALL_INHERIT, buf->params.language);
 
-Inset * InsetNote::clone(Buffer const &, bool same_id) const
-{
-	InsetNote * result = new InsetNote;
-	result->inset.init(&inset, same_id);
+	// Since XForms doesn't support RTL, we can assume that old notes
+	// in RTL documents are written in English.
+	if (font.language()->RightToLeft())
+		font.setLanguage(default_language);
 
-	result->collapsed_ = collapsed_;
-	if (same_id)
-		result->id_ = id_;
-	return result;
+	lyx::pos_type pos = 0;
+	buf->insertStringAsLines(par, pos, font, strip(contents, '\n'));
 }