Implement a newenvironment in preamble for greyedout. Patch provided

by J�rgen Spitzm�ller.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index a27cb2fd894dfb26405e6ade3a41e0c68db8bd4d..571694f49433a9376ae20e35566c61f39b8cb2a0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-29  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * LaTeXFeatures.C:
+       * lay_sty.[Ch]:h: Implement a newenvironment in preamble for
+       greyedout. Patch provided by Jürgen Spitzmüller.
+
 2003-07-29  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * kbmap.C (read): fix error message when reading bind files

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 5380932443a7eb72ba229aa3c208eed49ee40e90..0652983faa0cf9786ad87c4205f779e059c518f6 100644 (file)
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -350,6 +350,10 @@ string const LaTeXFeatures::getMacros() const
        if (isRequired("NeedTabularnewline"))
                macros << tabularnewline_def;
 
+       // greyedout environment (note inset)
+       if (isRequired("lyxgreyedout"))
+               macros << lyxgreyedout_def;
+
        // floats
        getFloatDefinitions(macros);
 

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 4613ff14f0bd3dc2c9eac96e4fb41afff7114805..072e271c876f033ec368e142f64de8d86149f6b2 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-29     Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * insetnote.C: Implement a newenvironment in preamble for
+    greyedout. Patch provided by Jürgen Spitzmüller.
+
 2003-07-29  Angus Leeming  <leeming@lyx.org>
 
        * insetcommand.C (localDispatch): default to

diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C
index 6898b75d1eb1068e7fb596818007dbe73de74bb8..adc7c99629efcc71c475ff027d1a6b216efc7167 100644 (file)
--- a/src/insets/insetnote.C
+++ b/src/insets/insetnote.C
@@ -151,9 +151,11 @@ int InsetNote::latex(Buffer const * buf, ostream & os,
 
        int i = 0;
        if (pt == "Comment")
-               os << "%\n\\begin{comment}\n"; // remember to validate
+                // verbatim
+               os << "%\n\\begin{comment}\n";
        else if (pt == "Greyedout")
-               os << "%\n\\color[gray]{0.8}";
+                // we roll our own macro
+               os << "%\n\\begin{lyxgreyedout}\n";
 
        if (pt != "Note")
                i = inset.latex(buf, os, runparams);
@@ -162,7 +164,7 @@ int InsetNote::latex(Buffer const * buf, ostream & os,
                os << "%\n\\end{comment}\n";
                i += 3;
        } else if (pt == "Greyedout") {
-               os << "\\normalcolor%\n";
+               os << "%\n\\end{lyxgreyedout}\n";
                i += 2;
        }
        return i;
@@ -224,8 +226,10 @@ void InsetNote::validate(LaTeXFeatures & features) const
 {
        if (params_.type == "Comment")
                features.require("verbatim");
-       if (params_.type == "Greyedout")
+       if (params_.type == "Greyedout") {
                features.require("color");
+               features.require("lyxgreyedout");
+       }
        inset.validate(features);
 }
 

diff --git a/src/lyx_sty.C b/src/lyx_sty.C
index 9319529246f7d81ece810c7c964ec74bad5ffaea..cc6bf47e73a8e497e050b358a305ee140ad761de 100644 (file)
--- a/src/lyx_sty.C
+++ b/src/lyx_sty.C
@@ -122,3 +122,7 @@ string const mathcircumflex_def =
 string const tabularnewline_def =
        "%% Because html converters don't know tabularnewline\n"
        "\\providecommand{\\tabularnewline}{\\\\}\n";
+
+string const lyxgreyedout_def =
+       "%% The greyedout annotation environment\n"
+       "\\newenvironment{lyxgreyedout}{\\color[gray]{0.8}}{}\n";

diff --git a/src/lyx_sty.h b/src/lyx_sty.h
index b7461115bef0b26479990eedbb1c417b614d8fa5..4d22ea1b02be1f6a6719788405058edb7ab63d05 100644 (file)
--- a/src/lyx_sty.h
+++ b/src/lyx_sty.h
@@ -51,5 +51,7 @@ extern string const binom_def;
 extern string const mathcircumflex_def;
 ///
 extern string const tabularnewline_def;
+///
+extern string const lyxgreyedout_def;
 
 #endif // LYX_STY_H