X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetcommand.C;h=a5d2f391c5d230700939757af3c76fd4282d4bdd;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=0530cc516e5bfa33d92ec795b996bc65fc2b70dc;hpb=45a03f4f67bb00f8142e465c615f348f0622eb32;p=lyx.git diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C index 0530cc516e..a5d2f391c5 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; @@ -26,28 +27,26 @@ InsetCommandParams::InsetCommandParams() {} -InsetCommandParams::InsetCommandParams( string const & n, +InsetCommandParams::InsetCommandParams(string const & n, string const & c, - string const & o ) + string const & o) : cmdname(n), contents(c), options(o) {} string const InsetCommandParams::getAsString() const { - string b(cmdname); - b += "|++|" + options + "|++|" + contents; - return b; + return cmdname + "|++|" + contents + "|++|" + options; } -void InsetCommandParams::setFromString( string const & b ) +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; } @@ -126,9 +126,9 @@ void InsetCommandParams::scanCommand(string const & cmd) } // Don't mess with this. - if (!tcmdname.empty()) setCmdName( tcmdname ); - if (!toptions.empty()) setOptions( toptions ); - if (!tcontents.empty()) setContents( tcontents ); + if (!tcmdname.empty()) setCmdName(tcmdname); + if (!toptions.empty()) setOptions(toptions); + if (!tcontents.empty()) setContents(tcontents); if (lyxerr.debugging(Debug::PARSER)) lyxerr << "Command <" << cmd @@ -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,20 +180,20 @@ string const InsetCommandParams::getCommand() const } -InsetCommand::InsetCommand( InsetCommandParams const & p ) - : p_( p.getCmdName(), p.getContents(), p.getOptions() ) +InsetCommand::InsetCommand(InsetCommandParams const & p, bool) + : p_(p.getCmdName(), p.getContents(), p.getOptions()) {} -void InsetCommand::setParams(InsetCommandParams const & p ) +void InsetCommand::setParams(InsetCommandParams const & p) { - p_.setCmdName( p.getCmdName() ); - p_.setContents( p.getContents() ); - p_.setOptions( p.getOptions() ); + p_.setCmdName(p.getCmdName()); + p_.setContents(p.getContents()); + p_.setOptions(p.getOptions()); } -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; }