2001-12-28 Lars Gullik Bj�nnes <larsbj@birdstep.com>

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

diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C
index b3ff8cbba3d5aa5c2ef566cd104c52b50e846000..cb40f395ea2c273ce5f86dce0795a15219caf33b 100644 (file)
--- a/src/insets/insetcommand.C
+++ b/src/insets/insetcommand.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2000 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -17,6 +17,7 @@
 #include "insetcommand.h"
 #include "debug.h"
 #include "Painter.h"
+#include "lyxlex.h"
 
 using std::ostream;
 using std::endl;
@@ -35,9 +36,7 @@ InsetCommandParams::InsetCommandParams( string const & n,
 
 string const InsetCommandParams::getAsString() const
 {
-       string b(cmdname);
-       b += "|++|" + options + "|++|" + contents;
-       return b;
+       return cmdname + "|++|" + contents + "|++|" + options;
 }
 
 
@@ -45,9 +44,9 @@ void InsetCommandParams::setFromString( string const & b )
 {
        string::size_type idx = b.find("|++|");
        if (idx == string::npos) {
-               cmdname = "";
-               options  = "";
+               cmdname = b;
                contents = "";
+               options = "";
                return;
        }
 
@@ -56,18 +55,19 @@ void InsetCommandParams::setFromString( string const & b )
 
        idx = tmp.find("|++|");
        if (idx == string::npos) {
-               options = tmp;
+               contents = tmp;
+               options = "";
        } else {
-               options  = tmp.substr(0, idx);
-               contents = tmp.substr(idx+4);
+               contents  = tmp.substr(0, idx);
+               options = tmp.substr(idx+4);
        }
 }
 
 
 bool InsetCommandParams::operator==(InsetCommandParams const & o) const
 {
-       if (cmdname == o.cmdname && contents == o.contents && options == o.options) return true;
-       return false;
+       return cmdname == o.cmdname && contents == o.contents
+               && options == o.options;
 }
 
 
@@ -140,18 +140,20 @@ void InsetCommandParams::scanCommand(string const & cmd)
 
 
 // This function will not be necessary when lyx3
-void InsetCommandParams::Read(LyXLex & lex)
+void InsetCommandParams::read(LyXLex & lex)
 {    
        string token;
 
-       if (lex.EatLine()) {
-               token = lex.GetString();
+       if (lex.eatLine()) {
+               token = lex.getString();
                scanCommand(token);
-       } else
+       } else {
                lex.printError("InsetCommand: Parse error: `$$Token'");
-       while (lex.IsOK()) {
+       }
+       
+       while (lex.isOK()) {
                lex.nextToken();
-               token = lex.GetString();
+               token = lex.getString();
                if (token == "\\end_inset")
                        break;
        }
@@ -162,7 +164,7 @@ void InsetCommandParams::Read(LyXLex & lex)
 }
 
 
-void InsetCommandParams::Write(ostream & os) const
+void InsetCommandParams::write(ostream & os) const
 {
        os << "LatexCommand " << getCommand() << "\n";
 }
@@ -178,7 +180,7 @@ string const InsetCommandParams::getCommand() const
 }
 
 
-InsetCommand::InsetCommand( InsetCommandParams const & p )
+InsetCommand::InsetCommand(InsetCommandParams const & p, bool)
        : p_( p.getCmdName(), p.getContents(), p.getOptions() )
 {}
 
@@ -191,7 +193,7 @@ void InsetCommand::setParams(InsetCommandParams const & p )
 }
 
 
-int InsetCommand::Latex(Buffer const *, ostream & os,
+int InsetCommand::latex(Buffer const *, ostream & os,
                        bool /*fragile*/, bool/*fs*/) const
 {
        os << getCommand();
@@ -199,19 +201,19 @@ int InsetCommand::Latex(Buffer const *, ostream & os,
 }
 
 
-int InsetCommand::Ascii(Buffer const *, ostream &, int) const
+int InsetCommand::ascii(Buffer const *, ostream &, int) const
 {
        return 0;
 }
 
 
-int InsetCommand::Linuxdoc(Buffer const *, ostream &) const
+int InsetCommand::linuxdoc(Buffer const *, ostream &) const
 {
        return 0;
 }
 
 
-int InsetCommand::DocBook(Buffer const *, ostream &) const
+int InsetCommand::docbook(Buffer const *, ostream &) const
 {
        return 0;
 }