prepare for 1.1.6pre2

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

diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C
index 4beaec279c5a8948413e279660cdd4a374b1748f..b3ff8cbba3d5aa5c2ef566cd104c52b50e846000 100644 (file)
--- a/src/insets/insetcommand.C
+++ b/src/insets/insetcommand.C
@@ -33,7 +33,7 @@ InsetCommandParams::InsetCommandParams( string const & n,
 {}
 
 
-string InsetCommandParams::getAsString() const
+string const InsetCommandParams::getAsString() const
 {
        string b(cmdname);
        b += "|++|" + options + "|++|" + contents;
@@ -44,13 +44,18 @@ string InsetCommandParams::getAsString() const
 void InsetCommandParams::setFromString( string const & b )
 {
        string::size_type idx = b.find("|++|");
-       if( idx == string::npos ) return;
+       if (idx == string::npos) {
+               cmdname = "";
+               options  = "";
+               contents = "";
+               return;
+       }
 
        cmdname = b.substr(0, idx);
        string tmp = b.substr(idx+4);
 
        idx = tmp.find("|++|");
-       if( idx == string::npos ) {
+       if (idx == string::npos) {
                options = tmp;
        } else {
                options  = tmp.substr(0, idx);
@@ -59,38 +64,20 @@ void InsetCommandParams::setFromString( string const & b )
 }
 
 
-InsetCommand::InsetCommand()
-{}
-
-
-InsetCommand::InsetCommand( string const & n,
-                           string const & c, 
-                           string const & o )
-       : p_(n, c, o)
-{}
-
-
-InsetCommand::InsetCommand( InsetCommandParams const & p )
-       : p_( p.getCmdName(), p.getContents(), p.getOptions() )
-{}
-
-
-void InsetCommand::setParams(InsetCommandParams const & p )
+bool InsetCommandParams::operator==(InsetCommandParams const & o) const
 {
-       p_.setCmdName( p.getCmdName() );
-       p_.setContents( p.getContents() );
-       p_.setOptions( p.getOptions() );
+       if (cmdname == o.cmdname && contents == o.contents && options == o.options) return true;
+       return false;
 }
 
 
-// In lyxf3 this will be just LaTeX
-void InsetCommand::Write(Buffer const *, ostream & os) const
+bool InsetCommandParams::operator!=(InsetCommandParams const & o) const
 {
-       os << "LatexCommand " << getCommand() << "\n";
+       return !(*this == o);
 }
 
 
-void InsetCommand::scanCommand(string const & cmd)
+void InsetCommandParams::scanCommand(string const & cmd)
 {
        string tcmdname, toptions, tcontents;
 
@@ -153,7 +140,7 @@ void InsetCommand::scanCommand(string const & cmd)
 
 
 // This function will not be necessary when lyx3
-void InsetCommand::Read(Buffer const *, LyXLex & lex)
+void InsetCommandParams::Read(LyXLex & lex)
 {    
        string token;
 
@@ -175,43 +162,56 @@ void InsetCommand::Read(Buffer const *, LyXLex & lex)
 }
 
 
-int InsetCommand::Latex(Buffer const *, ostream & os,
-                       bool /*fragile*/, bool/*fs*/) const
+void InsetCommandParams::Write(ostream & os) const
 {
-       os << getCommand();
-       return 0;
+       os << "LatexCommand " << getCommand() << "\n";
 }
 
 
-int InsetCommand::Ascii(Buffer const *, ostream &) const
+string const InsetCommandParams::getCommand() const
+{      
+       string s;
+       if (!getCmdName().empty()) s += "\\"+getCmdName();
+       if (!getOptions().empty()) s += "["+getOptions()+']';
+       s += "{"+getContents()+'}';
+       return s;
+}
+
+
+InsetCommand::InsetCommand( InsetCommandParams const & p )
+       : p_( p.getCmdName(), p.getContents(), p.getOptions() )
+{}
+
+
+void InsetCommand::setParams(InsetCommandParams const & p )
 {
-       return 0;
+       p_.setCmdName( p.getCmdName() );
+       p_.setContents( p.getContents() );
+       p_.setOptions( p.getOptions() );
 }
 
 
-int InsetCommand::Linuxdoc(Buffer const *, ostream &) const
+int InsetCommand::Latex(Buffer const *, ostream & os,
+                       bool /*fragile*/, bool/*fs*/) const
 {
+       os << getCommand();
        return 0;
 }
 
 
-int InsetCommand::DocBook(Buffer const *, ostream &) const
+int InsetCommand::Ascii(Buffer const *, ostream &, int) const
 {
        return 0;
 }
 
 
-Inset * InsetCommand::Clone() const
+int InsetCommand::Linuxdoc(Buffer const *, ostream &) const
 {
-       return new InsetCommand(getCmdName(), getContents(), getOptions());
+       return 0;
 }
 
 
-string InsetCommand::getCommand() const
-{      
-       string s;
-       if (!getCmdName().empty()) s += "\\"+getCmdName();
-       if (!getOptions().empty()) s += "["+getOptions()+']';
-       s += "{"+getContents()+'}';
-       return s;
+int InsetCommand::DocBook(Buffer const *, ostream &) const
+{
+       return 0;
 }