From: Angus Leeming <leeming@lyx.org>
Date: Mon, 21 Jul 2003 08:08:04 +0000 (+0000)
Subject: (Martin Vermeer): fix greyout and layout foul-ups.
X-Git-Tag: 1.6.10~16498
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=26f64808a25ed35421d3546beee1b4a4ffa5eb34;p=features.git

(Martin Vermeer): fix greyout and layout foul-ups.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7326 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 444c1140dc..a4138f980f 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,6 @@
+2003-07-21  Martin Vermeer  <martin.vermeer@hut.fi>
+
+	* insetnote.C: fixed greyout and conditionals layout foul-ups.
 
 2003-07-18  André Pönitz  <poenitz@gmx.net>
 
diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C
index 334c23aa1a..3ab249427f 100644
--- a/src/insets/insetnote.C
+++ b/src/insets/insetnote.C
@@ -149,17 +149,19 @@ int InsetNote::latex(Buffer const * buf, ostream & os,
 	string const pt = params_.type;
 
 	int i = 0;
-	if (pt == "Comment") os << "%\n\\begin{comment}\n"; // remember to validate
-	if (pt == "Greyedout") os << "%\n\\textcolor[gray]{0.8}{";
-	if (pt != "Note") {
+	if (pt == "Comment")
+		os << "%\n\\begin{comment}\n"; // remember to validate
+	else if (pt == "Greyedout")
+		os << "%\n\\textcolor[gray]{0.8}{";
+
+	if (pt != "Note")
 		i = inset.latex(buf, os, runparams);
-	}
+
 	if (pt == "Comment") {
 		os << "%\n\\end{comment}\n";
  		i += 3;
-	}
-	if (pt == "Greyedout") { 
-		os << "%\n}";
+	} else if (pt == "Greyedout") { 
+		os << "\\normalcolor%\n}";
 		i += 2;
 	}
 	return i;