X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetcommand.C;h=69322ae8905cc40caa50164553a0d2bf939f3760;hb=3c8aba3b556871fb1100a2f98cd93d5d4e3f70c9;hp=00a25a872b1bdfd249a9c5061240af4965e2b4a0;hpb=27de1486ca34aaad446adb798d71a77d6f6304da;p=lyx.git diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C index 00a25a872b..69322ae890 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-2000 The LyX Team. * - *======================================================*/ + * ====================================================== */ #include @@ -15,14 +15,11 @@ #endif #include "insetcommand.h" -#include "lyxdraw.h" -#include "error.h" +#include "debug.h" +#include "Painter.h" -// $Id: insetcommand.C,v 1.1 1999/09/27 18:44:38 larsbj Exp $ - -#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 */ +using std::ostream; +using std::endl; InsetCommand::InsetCommand() @@ -30,92 +27,105 @@ InsetCommand::InsetCommand() } -InsetCommand::InsetCommand(LString const & cmd, LString const & arg, - LString const & opt) +InsetCommand::InsetCommand(string const & cmd, string const & arg, + string const & opt) : command(cmd), options(opt), contents(arg) { } -InsetCommand::~InsetCommand() +int InsetCommand::ascent(Painter & pain, LyXFont const &) const { + LyXFont font(LyXFont::ALL_SANE); + font.decSize(); + + int width, ascent, descent; + string s = getScreenLabel(); + + if (Editable()) { + pain.buttonText(0, 0, s, font, + false, width, ascent, descent); + } else { + pain.rectText(0, 0, s, font, + LColor::commandbg, LColor::commandframe, + false, width, ascent, descent); + } + return ascent; } -int InsetCommand::Ascent(LyXFont const&font) const +int InsetCommand::descent(Painter & pain, LyXFont const &) const { - LyXFont f = font; - f.decSize(); - return f.maxAscent() + 3; + LyXFont font(LyXFont::ALL_SANE); + font.decSize(); + + int width, ascent, descent; + string s = getScreenLabel(); + + if (Editable()) { + pain.buttonText(0, 0, s, font, + false, width, ascent, descent); + } else { + pain.rectText(0, 0, s, font, + LColor::commandbg, LColor::commandframe, + false, width, ascent, descent); + } + return descent; } -int InsetCommand::Descent(LyXFont const&font) const +int InsetCommand::width(Painter & pain, LyXFont const &) const { - LyXFont f = font; - f.decSize(); - return f.maxDescent() + 3; + LyXFont font(LyXFont::ALL_SANE); + font.decSize(); + + int width, ascent, descent; + string s = getScreenLabel(); + + if (Editable()) { + pain.buttonText(0, 0, s, font, + false, width, ascent, descent); + } else { + pain.rectText(0, 0, s, font, + LColor::commandbg, LColor::commandframe, + false, width, ascent, descent); + } + return width + 4; } -int InsetCommand::Width(LyXFont const&font) const +void InsetCommand::draw(Painter & pain, LyXFont const &, + int baseline, float & x) const { - LyXFont f = font; - f.decSize(); - LString s = getScreenLabel(); - return 10 + f.stringWidth(s); -} + // Draw it as a box with the LaTeX text + LyXFont font(LyXFont::ALL_SANE); + font.setColor(LColor::command).decSize(); + int width; + string s = getScreenLabel(); -void InsetCommand::Draw(LyXFont font, LyXScreen &scr, - int baseline, float &x) -{ - // 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); + if (Editable()) { + pain.buttonText(int(x)+2, baseline, s, font, true, width); } 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); + pain.rectText(int(x)+2, baseline, s, font, + LColor::commandbg, LColor::commandframe, + true, width); } - 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; + + x += width + 4; } // In lyxf3 this will be just LaTeX -void InsetCommand::Write(FILE *file) +void InsetCommand::Write(ostream & os) const { - fprintf(file, "LatexCommand %s\n", getCommand().c_str()); + os << "LatexCommand " << getCommand() << "\n"; } -void InsetCommand::scanCommand(LString const &cmd) +void InsetCommand::scanCommand(string const & cmd) { - LString tcommand, toptions, tcontents; + string tcommand, toptions, tcontents; if (cmd.empty()) return; @@ -124,24 +134,24 @@ void InsetCommand::scanCommand(LString const &cmd) // 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 InsetCommand::Read(LyXLex & lex) { if (lex.EatLine()) { - LString t = lex.GetString(); + string t = lex.GetString(); scanCommand(t); } else lex.printError("InsetCommand: Parse error: `$$Token'"); } -int InsetCommand::Latex(FILE *file, signed char /*fragile*/) +int InsetCommand::Latex(ostream & os, bool /*fragile*/, bool/*fs*/) const { - fprintf(file, "%s", getCommand().c_str()); + os << getCommand(); return 0; } -int InsetCommand::Latex(LString &file, signed char /*fragile*/) +int InsetCommand::Ascii(ostream &) const { - file += getCommand(); return 0; } -int InsetCommand::Linuxdoc(LString &/*file*/) +int InsetCommand::Linuxdoc(ostream &) const { return 0; } -int InsetCommand::DocBook(LString &/*file*/) +int InsetCommand::DocBook(ostream &) const { return 0; } -Inset* InsetCommand::Clone() +Inset * InsetCommand::Clone() const { - InsetCommand *result = new InsetCommand(command, contents, options); - return result; + return new InsetCommand(command, contents, options); } -LString InsetCommand::getCommand() const +string InsetCommand::getCommand() const { - LString s; + string s; if (!command.empty()) s += "\\"+command; if (!options.empty()) s += "["+options+']'; s += "{"+contents+'}';