(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 444c1140dc8a65fc0c87969059fe5c3c52e49e09..a4138f980f1e58dc2e06103d09aa5885ad7b9070 100644 (file)
--- 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 334c23aa1a91ddbc0c3f0c3212f5fdc969f6d4ff..3ab249427fdcfa12109d9b6a0a3bea84f7970795 100644 (file)
--- 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;