* In the process of fixing the math background color bug, this commit transfer backgr...

[lyx.git] / src / insets / insetspace.C

diff --git a/src/insets/insetspace.C b/src/insets/insetspace.C
index e439a7f33c5863adb10f8e98d5ad0ce5aca972df..343133c0fe9571309ad60e92c44d43b318996bd6 100644 (file)
--- a/src/insets/insetspace.C
+++ b/src/insets/insetspace.C
@@ -24,9 +24,8 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
-using lyx::odocstream;
 
-using lyx::odocstream;
+namespace lyx {
 
 using std::string;
 using std::max;
@@ -49,9 +48,9 @@ InsetSpace::Kind InsetSpace::kind() const
 }
 
 
-void InsetSpace::metrics(MetricsInfo & mi, Dimension & dim) const
+bool InsetSpace::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       lyx::frontend::FontMetrics const & fm =
+       frontend::FontMetrics const & fm =
                theFontMetrics(mi.base.font);
        dim.asc = fm.maxAscent();
        dim.des = fm.maxDescent();
@@ -59,11 +58,11 @@ void InsetSpace::metrics(MetricsInfo & mi, Dimension & dim) const
        switch (kind_) {
                case THIN:
                case NEGTHIN:
-                    dim.wid = fm.width(lyx::char_type('x')) / 3;
+                    dim.wid = fm.width(char_type('x')) / 3;
                        break;
                case PROTECTED:
                case NORMAL:
-                    dim.wid = fm.width(lyx::char_type('x'));
+                    dim.wid = fm.width(char_type('x'));
                        break;
                case QUAD:
                        dim.wid = 20;
@@ -76,7 +75,9 @@ void InsetSpace::metrics(MetricsInfo & mi, Dimension & dim) const
                        dim.wid = 10;
                        break;
        }
+       bool const changed = dim_ != dim;
        dim_ = dim;
+       return changed;
 }
 
 
@@ -166,7 +167,7 @@ void InsetSpace::read(Buffer const &, LyXLex & lex)
 
 
 int InsetSpace::latex(Buffer const &, odocstream & os,
-                     OutputParams const & runparams) const
+                      OutputParams const & runparams) const
 {
        switch (kind_) {
        case NORMAL:
@@ -199,26 +200,15 @@ int InsetSpace::latex(Buffer const &, odocstream & os,
 
 
 int InsetSpace::plaintext(Buffer const &, odocstream & os,
-                     OutputParams const &) const
+                          OutputParams const &) const
 {
-       switch (kind_) {
-       case NORMAL:
-       case PROTECTED:
-       case THIN:
-       case QUAD:
-       case QQUAD:
-       case ENSPACE:
-       case ENSKIP:
-       case NEGTHIN:
-               os << ' ';
-               break;
-       }
-       return 0;
+       os << ' ';
+       return 1;
 }
 
 
 int InsetSpace::docbook(Buffer const &, odocstream & os,
-                       OutputParams const &) const
+                        OutputParams const &) const
 {
        switch (kind_) {
        case NORMAL:
@@ -265,3 +255,6 @@ bool InsetSpace::isSpace() const
 {
        return true;
 }
+
+
+} // namespace lyx