* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-1999 The LyX Team.
+ * Copyright 1995-2000 The LyX Team.
*
* ====================================================== */
#include "debug.h"
#include "Painter.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()
+{}
-int InsetCommand::ascent(Painter & pain, LyXFont const &) const
+InsetCommandParams::InsetCommandParams( string const & n,
+ string const & c,
+ string const & o )
+ : cmdname(n), contents(c), options(o)
+{}
+
+
+string const InsetCommandParams::getAsString() const
{
-#if 1
- 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;
-#else
- LyXFont f = font;
- f.decSize();
- return f.maxAscent() + 3;
-#endif
+ return cmdname + "|++|" + contents + "|++|" + options;
}
-int InsetCommand::descent(Painter & pain, LyXFont const &) const
+void InsetCommandParams::setFromString( string const & b )
{
-#if 1
- 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);
+ string::size_type idx = b.find("|++|");
+ if (idx == string::npos) {
+ cmdname = b;
+ contents = "";
+ options = "";
+ return;
}
- return descent;
-#else
- LyXFont f = font;
- f.decSize();
- return f.maxDescent() + 3;
-#endif
-}
+ cmdname = b.substr(0, idx);
+ string tmp = b.substr(idx+4);
-int InsetCommand::width(Painter & pain, LyXFont const &) const
-{
-#if 1
- 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);
+ idx = tmp.find("|++|");
+ if (idx == string::npos) {
+ contents = tmp;
+ options = "";
} else {
- pain.rectText(0, 0, s, font,
- LColor::commandbg, LColor::commandframe,
- false, width, ascent, descent);
+ contents = tmp.substr(0, idx);
+ options = tmp.substr(idx+4);
}
- return width;
-#else
- LyXFont f = font;
- f.decSize();
- string s = getScreenLabel();
- return 10 + f.stringWidth(s);
-#endif
}
-void InsetCommand::draw(Painter & pain, LyXFont const &,
- int baseline, float & x) const
+bool InsetCommandParams::operator==(InsetCommandParams const & o) const
{
- // Draw it as a box with the LaTeX text
-#if 1
- LyXFont font(LyXFont::ALL_SANE);
- font.setColor(LColor::command).decSize();
-
- int width;
- string s = getScreenLabel();
-
- if (Editable()) {
- pain.buttonText(int(x), baseline, s, font, true, width);
- } else {
- pain.rectText(int(x), baseline, s, font,
- LColor::commandbg, LColor::commandframe,
- true, width);
- }
-
- x += width;
-#else
-
- x += 3;
-
- pain.fillRectangle(int(x), baseline - ascent(pain, font) + 1,
- width(pain, font) - 6,
- ascent(pain, font) + descent(pain, font) - 2,
- LColor::insetbg);
- // Tell whether this slows down the drawing (ale)
- // lets draw editable and non-editable insets differently
- if (Editable()) {
- int y = baseline - ascent(pain, font) + 1;
- int w = width(pain, font) - 6;
- int h = ascent(pain, font) + descent(pain, font) - 2;
- pain.rectangle(int(x), y, w, h, LColor::insetframe);
- } else {
-
- pain.rectangle(int(x), baseline - ascent(pain, font) + 1,
- width(pain, font) - 6,
- ascent(pain, font) + descent(pain, font) - 2,
- LColor::insetframe);
- }
- string s = getScreenLabel();
- LyXFont f(font);
- f.decSize();
- f.setColor(LColor::none);
- f.setLatex(LyXFont::OFF);
- pain.text(int(x + 2), baseline, s, f);
-
- x += width(pain, font) - 3;
-#endif
+ if (cmdname == o.cmdname && contents == o.contents && options == o.options) return true;
+ return false;
}
-// In lyxf3 this will be just LaTeX
-void InsetCommand::Write(ostream & os) const
+bool InsetCommandParams::operator!=(InsetCommandParams const & o) const
{
- os << "LatexCommand " << getCommand() << "\n";
+ 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 ((state == OPTION && c == ']') ||
+ (state == CONTENT && c == '}')) {
if (nestdepth == 0) {
state = WS;
} else {
--nestdepth;
}
}
- if ((state == Option && c == '[') ||
- (state == Content && c == '{')) {
+ 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;
}
// 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
// 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(ostream & os, signed char /*fragile*/) const
+void InsetCommandParams::Write(ostream & os) const
{
- os << getCommand();
- return 0;
+ os << "LatexCommand " << getCommand() << "\n";
}
-#ifndef USE_OSTREAM_ONLY
-int InsetCommand::Latex(string & file, signed char /*fragile*/) const
+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 )
+ : 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() );
}
-#endif
-int InsetCommand::Linuxdoc(string &/*file*/) const
+int InsetCommand::Latex(Buffer const *, ostream & os,
+ bool /*fragile*/, bool/*fs*/) const
{
+ os << getCommand();
return 0;
}
-int InsetCommand::DocBook(string &/*file*/) const
+int InsetCommand::Ascii(Buffer const *, ostream &, int) const
{
return 0;
}
-Inset * InsetCommand::Clone() const
+int InsetCommand::Linuxdoc(Buffer const *, ostream &) const
{
- return new InsetCommand(command, contents, options);
+ 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;
}