X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetcommand.C;h=cb40f395ea2c273ce5f86dce0795a15219caf33b;hb=b922cdd796f9e4b9a46a79808cdee596e04903eb;hp=0530cc516e5bfa33d92ec795b996bc65fc2b70dc;hpb=45a03f4f67bb00f8142e465c615f348f0622eb32;p=lyx.git

diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C
index 0530cc516e..cb40f395ea 100644
--- 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,19 +36,17 @@ InsetCommandParams::InsetCommandParams( string const & n,
 
 string const InsetCommandParams::getAsString() const
 {
-	string b(cmdname);
-	b += "|++|" + options + "|++|" + contents;
-	return b;
+	return cmdname + "|++|" + contents + "|++|" + options;
 }
 
 
 void InsetCommandParams::setFromString( string const & b )
 {
 	string::size_type idx = b.find("|++|");
-	if( idx == string::npos ) {
-		cmdname = "";
-		options  = "";
+	if (idx == string::npos) {
+		cmdname = b;
 		contents = "";
+		options = "";
 		return;
 	}
 
@@ -55,19 +54,20 @@ void InsetCommandParams::setFromString( string const & b )
 	string tmp = b.substr(idx+4);
 
 	idx = tmp.find("|++|");
-	if( idx == string::npos ) {
-		options = tmp;
+	if (idx == string::npos) {
+		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 &) 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;
 }