X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetcommand.C;h=a5d2f391c5d230700939757af3c76fd4282d4bdd;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=00a25a872b1bdfd249a9c5061240af4965e2b4a0;hpb=27de1486ca34aaad446adb798d71a77d6f6304da;p=lyx.git diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C index 00a25a872b..a5d2f391c5 100644 --- a/src/insets/insetcommand.C +++ b/src/insets/insetcommand.C @@ -3,10 +3,10 @@ * * LyX, The Document Processor * - * Copyright (C) 1995 Matthias Ettrich - * Copyright (C) 1995-1998 The LyX Team. + * Copyright 1995 Matthias Ettrich + * Copyright 1995-2001 The LyX Team. * - *======================================================*/ + * ====================================================== */ #include @@ -15,146 +15,110 @@ #endif #include "insetcommand.h" -#include "lyxdraw.h" -#include "error.h" +#include "debug.h" +#include "Painter.h" +#include "lyxlex.h" -// $Id: insetcommand.C,v 1.1 1999/09/27 18:44:38 larsbj Exp $ +using std::ostream; +using std::endl; -#if !defined(lint) && !defined(WITH_WARNINGS) -static char vcid[] = "$Id: insetcommand.C,v 1.1 1999/09/27 18:44:38 larsbj Exp $"; -#endif /* lint */ +InsetCommandParams::InsetCommandParams() +{} -InsetCommand::InsetCommand() -{ -} - - -InsetCommand::InsetCommand(LString const & cmd, LString const & arg, - LString const & opt) - : command(cmd), options(opt), contents(arg) -{ -} +InsetCommandParams::InsetCommandParams(string const & n, + string const & c, + string const & o) + : cmdname(n), contents(c), options(o) +{} -InsetCommand::~InsetCommand() -{ -} - -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(); - LString 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.drawFilledRectangle(int(x), baseline - Ascent(font) + 1, - // Width(font) - 2, Ascent(font) + Descent(font)-2, - // FL_GRAY80); - 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(int(x), baseline - Ascent(font)+1, - // Width(font)-2, Ascent(font)+Descent(font)-2, - // FL_BLACK); - scr.drawRectangle(gc_note_frame, - int(x), baseline - Ascent(font)+1, - Width(font)-6, - Ascent(font)+Descent(font)-2); - } - LString 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; + return cmdname == o.cmdname && contents == o.contents + && options == o.options; } -// 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(LString const &cmd) +void InsetCommandParams::scanCommand(string const & cmd) { - LString 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 (int i=0; i == <" + getCommand() - + "> == <" + getCmdName() - + '|' + getContents() - + '|' + getOptions() +'>'); + + if (lyxerr.debugging(Debug::PARSER)) + lyxerr << "Command <" << cmd + << "> == <" << getCommand() + << "> == <" << getCmdName() + << '|' << getContents() + << '|' << getOptions() << '>' << endl; } // This function will not be necessary when lyx3 -void InsetCommand::Read(LyXLex &lex) +void InsetCommandParams::read(LyXLex & lex) { - if (lex.EatLine()) { - LString t = lex.GetString(); - scanCommand(t); - } else + string token; + + if (lex.eatLine()) { + 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(LString &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()) +{} + + +void InsetCommand::setParams(InsetCommandParams const & p) { - file += getCommand(); - return 0; + p_.setCmdName(p.getCmdName()); + p_.setContents(p.getContents()); + p_.setOptions(p.getOptions()); } -int InsetCommand::Linuxdoc(LString &/*file*/) +int InsetCommand::latex(Buffer const *, ostream & os, + bool /*fragile*/, bool/*fs*/) const { + os << getCommand(); return 0; } -int InsetCommand::DocBook(LString &/*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; } -LString InsetCommand::getCommand() const -{ - LString s; - if (!command.empty()) s += "\\"+command; - if (!options.empty()) s += "["+options+']'; - s += "{"+contents+'}'; - return s; +int InsetCommand::docbook(Buffer const *, ostream &) const +{ + return 0; }