insetcharstyle drawing cosmetics

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

diff --git a/src/insets/insetspecialchar.C b/src/insets/insetspecialchar.C
index f6aa672987760ba41fd8a3accf4a3cabd86b90c1..c9ea76abe57ac075718fedc1e171cd0802afc1be 100644 (file)
--- a/src/insets/insetspecialchar.C
+++ b/src/insets/insetspecialchar.C
@@ -16,13 +16,15 @@
 
 #include "debug.h"
 #include "LaTeXFeatures.h"
+#include "LColor.h"
 #include "lyxlex.h"
 #include "metricsinfo.h"
 
 #include "frontends/font_metrics.h"
 #include "frontends/Painter.h"
 
-using std::max;
+
+using std::string;
 using std::auto_ptr;
 using std::ostream;
 
@@ -136,7 +138,7 @@ void InsetSpecialChar::write(Buffer const &, ostream & os) const
 // This function will not be necessary when lyx3
 void InsetSpecialChar::read(Buffer const &, LyXLex & lex)
 {
-       lex.nextToken();
+       lex.next();
        string const command = lex.getString();
 
        if (command == "\\-")
@@ -155,7 +157,7 @@ void InsetSpecialChar::read(Buffer const &, LyXLex & lex)
 
 
 int InsetSpecialChar::latex(Buffer const &, ostream & os,
-                           LatexRunParams const &) const
+                           OutputParams const &) const
 {
        switch (kind_) {
        case HYPHENATION:
@@ -178,7 +180,8 @@ int InsetSpecialChar::latex(Buffer const &, ostream & os,
 }
 
 
-int InsetSpecialChar::ascii(Buffer const &, ostream & os, int) const
+int InsetSpecialChar::plaintext(Buffer const &, ostream & os,
+                           OutputParams const &) const
 {
        switch (kind_) {
        case HYPHENATION:
@@ -198,7 +201,8 @@ int InsetSpecialChar::ascii(Buffer const &, ostream & os, int) const
 }
 
 
-int InsetSpecialChar::linuxdoc(Buffer const &, ostream & os) const
+int InsetSpecialChar::linuxdoc(Buffer const &, ostream & os,
+                              OutputParams const &) const
 {
        switch (kind_) {
        case HYPHENATION:
@@ -218,7 +222,8 @@ int InsetSpecialChar::linuxdoc(Buffer const &, ostream & os) const
 }
 
 
-int InsetSpecialChar::docbook(Buffer const &, ostream & os, bool) const
+int InsetSpecialChar::docbook(Buffer const &, ostream & os,
+                             OutputParams const &) const
 {
        switch (kind_) {
        case HYPHENATION:
@@ -264,12 +269,6 @@ bool InsetSpecialChar::isLetter() const
 }
 
 
-bool InsetSpecialChar::isSpace() const
-{
-       return false;
-}
-
-
 bool InsetSpecialChar::isLineSeparator() const
 {
 #if 0