X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetcommand.C;h=0c893240880ad0a74a6b4fa045e6fa3de774e214;hb=7521b5d20f42102cf444e3fd8718a088a60d0098;hp=1457cad889d2655cf5bf71a6a3bd092d5a28708e;hpb=dfe1bc44b44903faf77ef454c98c4c3e56c1d5e3;p=lyx.git diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C index 1457cad889..0c89324088 100644 --- a/src/insets/insetcommand.C +++ b/src/insets/insetcommand.C @@ -4,9 +4,9 @@ * LyX, The Document Processor * * Copyright 1995 Matthias Ettrich - * Copyright 1995-1999 The LyX Team. + * Copyright 1995-2001 The LyX Team. * - * ======================================================*/ + * ====================================================== */ #include @@ -15,133 +15,110 @@ #endif #include "insetcommand.h" -#include "lyxdraw.h" #include "debug.h" +#include "Painter.h" +#include "lyxlex.h" -InsetCommand::InsetCommand() -{ -} +using std::ostream; +using std::endl; -InsetCommand::InsetCommand(string const & cmd, string const & arg, - string const & opt) - : command(cmd), options(opt), contents(arg) -{ -} +InsetCommandParams::InsetCommandParams() +{} -InsetCommand::~InsetCommand() -{ -} +InsetCommandParams::InsetCommandParams( string const & n, + string const & c, + string const & o ) + : cmdname(n), contents(c), options(o) +{} -int InsetCommand::Ascent(LyXFont const & font) const +string const InsetCommandParams::getAsString() const { - LyXFont f = font; - f.decSize(); - return f.maxAscent() + 3; + return cmdname + "|++|" + contents + "|++|" + options; } -int InsetCommand::Descent(LyXFont const & font) const +void InsetCommandParams::setFromString( string const & b ) { - LyXFont f = font; - f.decSize(); - return f.maxDescent() + 3; -} + string::size_type idx = b.find("|++|"); + if (idx == string::npos) { + cmdname = b; + contents = ""; + options = ""; + return; + } + cmdname = b.substr(0, idx); + string tmp = b.substr(idx+4); -int InsetCommand::Width(LyXFont const & font) const -{ - LyXFont f = font; - f.decSize(); - string s = getScreenLabel(); - return 10 + f.stringWidth(s); + idx = tmp.find("|++|"); + if (idx == string::npos) { + contents = tmp; + options = ""; + } else { + contents = tmp.substr(0, idx); + options = tmp.substr(idx+4); + } } -void InsetCommand::Draw(LyXFont font, LyXScreen & scr, - int baseline, float & x) +bool InsetCommandParams::operator==(InsetCommandParams const & o) const { - // Draw it as a box with the LaTeX text - x += 3; - - scr.fillRectangle(gc_lighted, - int(x), baseline - Ascent(font) + 1, - Width(font) - 6, - Ascent(font) + Descent(font)-2); - // Tell whether this slows down the drawing (ale) - // lets draw editable and non-editable insets differently - if (Editable()) { - int y = baseline - Ascent(font)+1, w = Width(font)-6, - h = (Ascent(font)+Descent(font)-2); - scr.drawFrame(FL_UP_FRAME, int(x), y, w, h, FL_BLACK, -1); - } else { - scr.drawRectangle(gc_note_frame, - int(x), baseline - Ascent(font)+1, - Width(font)-6, - Ascent(font)+Descent(font)-2); - } - string s = getScreenLabel(); - LyXFont f = font; - f.decSize(); - f.setColor(LyXFont::NONE); - f.setLatex(LyXFont::OFF); - scr.drawString(f, s, baseline, int(x+2)); - - x += Width(font) - 3; + if (cmdname == o.cmdname && contents == o.contents && options == o.options) return true; + return false; } -// In lyxf3 this will be just LaTeX -void InsetCommand::Write(FILE * file) +bool InsetCommandParams::operator!=(InsetCommandParams const & o) const { - fprintf(file, "LatexCommand %s\n", getCommand().c_str()); + return !(*this == o); } -void InsetCommand::scanCommand(string const & cmd) +void InsetCommandParams::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 (nestdepth==0) { + if ((state == OPTION && c == ']') || + (state == CONTENT && c == '}')) { + if (nestdepth == 0) { state = WS; } else { - nestdepth--; + --nestdepth; } } - if ((state==Option && c == '[') || - (state==Content && c == '{')) { - nestdepth++; + 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; @@ -149,10 +126,9 @@ void InsetCommand::scanCommand(string const & cmd) } // Don't mess with this. - if (!tcommand.empty()) command = tcommand; - if (!toptions.empty()) options = toptions; - if (!tcontents.empty()) setContents(tcontents); - // setContents is overloaded in InsetInclude + if (!tcmdname.empty()) setCmdName( tcmdname ); + if (!toptions.empty()) setOptions( toptions ); + if (!tcontents.empty()) setContents( tcontents ); if (lyxerr.debugging(Debug::PARSER)) lyxerr << "Command <" << cmd @@ -164,54 +140,79 @@ void InsetCommand::scanCommand(string const & cmd) // This function will not be necessary when lyx3 -void InsetCommand::Read(LyXLex & lex) +void InsetCommandParams::read(LyXLex & lex) { + string token; + if (lex.EatLine()) { - string t = lex.GetString(); - scanCommand(t); + token = lex.GetString(); + scanCommand(token); } else lex.printError("InsetCommand: Parse error: `$$Token'"); + while (lex.IsOK()) { + lex.nextToken(); + token = lex.GetString(); + if (token == "\\end_inset") + break; + } + if (token != "\\end_inset") { + lex.printError("Missing \\end_inset at this point. " + "Read: `$$Token'"); + } } -int InsetCommand::Latex(FILE * file, signed char /*fragile*/) +void InsetCommandParams::write(ostream & os) const { - fprintf(file, "%s", getCommand().c_str()); - return 0; + os << "LatexCommand " << getCommand() << "\n"; } -int InsetCommand::Latex(string & file, signed char /*fragile*/) +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, bool) + : p_( p.getCmdName(), p.getContents(), p.getOptions() ) { - file += getCommand(); - return 0; } -int InsetCommand::Linuxdoc(string &/*file*/) +void InsetCommand::setParams(InsetCommandParams const & p ) { + p_.setCmdName( p.getCmdName() ); + p_.setContents( p.getContents() ); + p_.setOptions( p.getOptions() ); +} + + +int InsetCommand::latex(Buffer const *, ostream & os, + bool /*fragile*/, bool/*fs*/) const +{ + os << getCommand(); return 0; } -int InsetCommand::DocBook(string &/*file*/) +int InsetCommand::ascii(Buffer const *, ostream &, int) const { return 0; } -Inset * InsetCommand::Clone() +int InsetCommand::linuxdoc(Buffer const *, ostream &) const { - InsetCommand * result = new InsetCommand(command, contents, options); - return result; + return 0; } -string InsetCommand::getCommand() const -{ - string s; - if (!command.empty()) s += "\\"+command; - if (!options.empty()) s += "["+options+']'; - s += "{"+contents+'}'; - return s; +int InsetCommand::docBook(Buffer const *, ostream &) const +{ + return 0; }