Some more changes for updating text-insets.

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

diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C
index 7d9e7964cb0e2e57b3a794a7c25532c8bc2e38a0..1595b884dc496e8fc94d2bf262887be9ffe5e2fe 100644 (file)
--- a/src/insets/insetcommand.C
+++ b/src/insets/insetcommand.C
@@ -29,95 +29,13 @@ InsetCommand::InsetCommand()
 
 InsetCommand::InsetCommand(string const & cmd, string const & arg, 
                           string const & opt)
-       : command(cmd), options(opt), contents(arg)
+       : cmdname(cmd), options(opt), contents(arg)
 {
 }
 
 
-int InsetCommand::ascent(Painter & pain, LyXFont const &) const
-{
-       LyXFont font(LyXFont::ALL_SANE);
-       font.decSize();
-       
-       int width, ascent, descent;
-        string s = getScreenLabel();
-       
-        if (Editable()) {
-               pain.buttonText(0, 0, s, font,
-                               false, width, ascent, descent);
-       } else {
-               pain.rectText(0, 0, s, font,
-                             LColor::commandbg, LColor::commandframe,
-                             false, width, ascent, descent);
-       }
-       return ascent;
-}
-
-
-int InsetCommand::descent(Painter & pain, LyXFont const &) const
-{
-       LyXFont font(LyXFont::ALL_SANE);
-       font.decSize();
-       
-       int width, ascent, descent;
-        string s = getScreenLabel();
-       
-        if (Editable()) {
-               pain.buttonText(0, 0, s, font,
-                               false, width, ascent, descent);
-       } else {
-               pain.rectText(0, 0, s, font,
-                             LColor::commandbg, LColor::commandframe,
-                             false, width, ascent, descent);
-       }
-       return descent;
-}
-
-
-int InsetCommand::width(Painter & pain, LyXFont const &) const
-{
-       LyXFont font(LyXFont::ALL_SANE);
-       font.decSize();
-       
-       int width, ascent, descent;
-        string s = getScreenLabel();
-       
-        if (Editable()) {
-               pain.buttonText(0, 0, s, font,
-                               false, width, ascent, descent);
-       } else {
-               pain.rectText(0, 0, s, font,
-                             LColor::commandbg, LColor::commandframe,
-                             false, width, ascent, descent);
-       }
-       return width + 4;
-}
-
-
-void InsetCommand::draw(Painter & pain, LyXFont const &,
-                       int baseline, float & x) const
-{
-       // Draw it as a box with the LaTeX text
-       LyXFont font(LyXFont::ALL_SANE);
-       font.setColor(LColor::command).decSize();
-
-       int width;
-       string s = getScreenLabel();
-
-       if (Editable()) {
-               pain.buttonText(int(x)+2, baseline, s, font, true, width);
-       } else {
-               pain.rectText(int(x)+2, baseline, s, font,
-                             LColor::commandbg, LColor::commandframe,
-                             true, width);
-       }
-
-       x += width + 4;
-}
-
-
 // In lyxf3 this will be just LaTeX
-void InsetCommand::Write(ostream & os) const
+void InsetCommand::Write(Buffer const *, ostream & os) const
 {
        os << "LatexCommand " << getCommand() << "\n";
 }
@@ -125,46 +43,46 @@ void InsetCommand::Write(ostream & os) const
 
 void InsetCommand::scanCommand(string const & cmd)
 {
-       string tcommand, toptions, tcontents;
+       string tcmdname, toptions, tcontents;
 
        if (cmd.empty()) return;
 
-       enum { WS, Command, Option, Content } state = WS;
+       enum { WS, CMDNAME, OPTION, CONTENT } state = WS;
        
        // Used to handle things like \command[foo[bar]]{foo{bar}}
        int nestdepth = 0;
 
        for (string::size_type i = 0; i < cmd.length(); ++i) {
                char c = cmd[i];
-               if ((state == Command && c == ' ') ||
-                   (state == Command && c == '[') ||
-                   (state == Command && c == '{')) {
+               if ((state == CMDNAME && c == ' ') ||
+                   (state == CMDNAME && c == '[') ||
+                   (state == CMDNAME && c == '{')) {
                        state = WS;
                }
-               if ((state == Option  && c == ']') ||
-                   (state == Content && c == '}')) {
+               if ((state == OPTION  && c == ']') ||
+                   (state == CONTENT && c == '}')) {
                        if (nestdepth == 0) {
                                state = WS;
                        } else {
                                --nestdepth;
                        }
                }
-               if ((state == Option  && c == '[') ||
-                   (state == Content && c == '{')) {
+               if ((state == OPTION  && c == '[') ||
+                   (state == CONTENT && c == '{')) {
                        ++nestdepth;
                }
                switch (state) {
-               case Command:   tcommand += c; break;
-               case Option:    toptions += c; break;
-               case Content:   tcontents += c; break;
+               case CMDNAME:   tcmdname += c; break;
+               case OPTION:    toptions += c; break;
+               case CONTENT:   tcontents += c; break;
                case WS:
                        if (c == '\\') {
-                               state = Command;
+                               state = CMDNAME;
                        } else if (c == '[') {
-                               state = Option;
+                               state = OPTION;
                                nestdepth = 0; // Just to be sure
                        } else if (c == '{') {
-                               state = Content;
+                               state = CONTENT;
                                nestdepth = 0; // Just to be sure
                        }
                        break;
@@ -172,7 +90,7 @@ void InsetCommand::scanCommand(string const & cmd)
        }
 
        // Don't mess with this.
-       if (!tcommand.empty()) command = tcommand;
+       if (!tcmdname.empty()) cmdname = tcmdname;
        if (!toptions.empty()) options = toptions;
        if (!tcontents.empty()) setContents(tcontents); 
                        // setContents is overloaded in InsetInclude
@@ -187,7 +105,7 @@ void InsetCommand::scanCommand(string const & cmd)
 
 
 // This function will not be necessary when lyx3
-void InsetCommand::Read(LyXLex & lex)
+void InsetCommand::Read(Buffer const *, LyXLex & lex)
 {    
        if (lex.EatLine()) {
                string t = lex.GetString();
@@ -197,20 +115,26 @@ void InsetCommand::Read(LyXLex & lex)
 }
 
 
-int InsetCommand::Latex(ostream & os, signed char /*fragile*/, bool/*fs*/) const
+int InsetCommand::Latex(Buffer const *, ostream & os, bool /*fragile*/, bool/*fs*/) const
 {
        os << getCommand();
        return 0;
 }
 
 
-int InsetCommand::Linuxdoc(ostream &) const
+int InsetCommand::Ascii(Buffer const *, ostream &) const
+{
+       return 0;
+}
+
+
+int InsetCommand::Linuxdoc(Buffer const *, ostream &) const
 {
        return 0;
 }
 
 
-int InsetCommand::DocBook(ostream &) const
+int InsetCommand::DocBook(Buffer const *, ostream &) const
 {
        return 0;
 }
@@ -218,14 +142,14 @@ int InsetCommand::DocBook(ostream &) const
 
 Inset * InsetCommand::Clone() const
 {
-       return new InsetCommand(command, contents, options);
+       return new InsetCommand(cmdname, contents, options);
 }
 
 
 string InsetCommand::getCommand() const
 {      
        string s;
-       if (!command.empty()) s += "\\"+command;
+       if (!cmdname.empty()) s += "\\"+cmdname;
        if (!options.empty()) s += "["+options+']';
        s += "{"+contents+'}';
        return s;