The speed patch: redraw only rows that have changed

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

diff --git a/src/insets/insetspace.C b/src/insets/insetspace.C
index eb333e649cec19e6353d3192973caaa65049ebb2..0ca675b1bb77a3b2fd9f1e2e373096c1c40d66fb 100644 (file)
--- a/src/insets/insetspace.C
+++ b/src/insets/insetspace.C
@@ -6,9 +6,9 @@
  * \author Asger Alstrup Nielsen
  * \author Jean-Marc Lasgouttes
  * \author Lars Gullik Bjønnes
- * \author Juergen Spitzmueller
+ * \author Jürgen Spitzmüller
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
@@ -16,19 +16,19 @@
 #include "insetspace.h"
 
 #include "debug.h"
-#include "dimension.h"
-#include "LaTeXFeatures.h"
-#include "latexrunparams.h"
-#include "BufferView.h"
-#include "frontends/Painter.h"
-#include "frontends/font_metrics.h"
+#include "LColor.h"
 #include "lyxlex.h"
-#include "lyxfont.h"
 #include "metricsinfo.h"
+#include "outputparams.h"
 
-using std::ostream;
+#include "frontends/font_metrics.h"
+#include "frontends/Painter.h"
+
+
+using std::string;
 using std::max;
 using std::auto_ptr;
+using std::ostream;
 
 
 InsetSpace::InsetSpace()
@@ -101,18 +101,18 @@ void InsetSpace::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-void InsetSpace::write(Buffer const *, ostream & os) const
+void InsetSpace::write(Buffer const &, ostream & os) const
 {
        string command;
        switch (kind_) {
        case NORMAL:
-               command = "\\space";
+               command = "\\space{}";
                break;
        case PROTECTED:
                command = "~";
                break;
        case THIN:
-               command = "\\,";
+               command = "\\thinspace{}";
                break;
        case QUAD:
                command = "\\quad{}";
@@ -134,17 +134,16 @@ void InsetSpace::write(Buffer const *, ostream & os) const
 }
 
 
-// This function will not be necessary when lyx3
-void InsetSpace::read(Buffer const *, LyXLex & lex)
+void InsetSpace::read(Buffer const &, LyXLex & lex)
 {
-       lex.nextToken();
+       lex.next();
        string const command = lex.getString();
 
-       if (command == "\\space")
+       if (command == "\\space{}")
                kind_ = NORMAL;
        else if (command == "~")
                kind_ = PROTECTED;
-       else if (command == "\\,")
+       else if (command == "\\thinspace{}")
                kind_ = THIN;
        else if (command == "\\quad{}")
                kind_ = QUAD;
@@ -161,8 +160,8 @@ void InsetSpace::read(Buffer const *, LyXLex & lex)
 }
 
 
-int InsetSpace::latex(Buffer const *, ostream & os,
-                     LatexRunParams const & runparams) const
+int InsetSpace::latex(Buffer const &, ostream & os,
+                     OutputParams const & runparams) const
 {
        switch (kind_) {
        case NORMAL:
@@ -194,7 +193,8 @@ int InsetSpace::latex(Buffer const *, ostream & os,
 }
 
 
-int InsetSpace::ascii(Buffer const *, ostream & os, int) const
+int InsetSpace::plaintext(Buffer const &, ostream & os,
+                     OutputParams const &) const
 {
        switch (kind_) {
        case NORMAL:
@@ -212,7 +212,8 @@ int InsetSpace::ascii(Buffer const *, ostream & os, int) const
 }
 
 
-int InsetSpace::linuxdoc(Buffer const *, ostream & os) const
+int InsetSpace::linuxdoc(Buffer const &, ostream & os,
+                        OutputParams const &) const
 {
        switch (kind_) {
        case NORMAL:
@@ -232,7 +233,8 @@ int InsetSpace::linuxdoc(Buffer const *, ostream & os) const
 }
 
 
-int InsetSpace::docbook(Buffer const *, ostream & os, bool) const
+int InsetSpace::docbook(Buffer const &, ostream & os,
+                       OutputParams const &) const
 {
        switch (kind_) {
        case NORMAL:
@@ -252,7 +254,14 @@ int InsetSpace::docbook(Buffer const *, ostream & os, bool) const
 }
 
 
-auto_ptr<InsetBase>  InsetSpace::clone() const
+int InsetSpace::textString(Buffer const & buf, ostream & os,
+                      OutputParams const & op) const
+{
+       return plaintext(buf, os, op);
+}
+
+
+auto_ptr<InsetBase> InsetSpace::doClone() const
 {
        return auto_ptr<InsetBase>(new InsetSpace(kind_));
 }
@@ -272,8 +281,3 @@ bool InsetSpace::isSpace() const
 {
        return true;
 }
-
-bool InsetSpace::isLineSeparator() const
-{
-       return false;
-}