* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
#include "insetcommand.h"
#include "debug.h"
#include "Painter.h"
+#include "lyxlex.h"
using std::ostream;
using std::endl;
-InsetCommand::InsetCommand()
-{
-}
+InsetCommandParams::InsetCommandParams()
+{}
-InsetCommand::InsetCommand(string const & cmd, string const & arg,
- string const & opt)
- : cmdname(cmd), options(opt), contents(arg)
-{
-}
+InsetCommandParams::InsetCommandParams(string const & n,
+ string const & c,
+ string const & o)
+ : cmdname(n), contents(c), options(o)
+{}
-int InsetCommand::ascent(Painter & pain, LyXFont const &) const
+string const InsetCommandParams::getAsString() 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;
+ return cmdname + "|++|" + contents + "|++|" + options;
}
-int InsetCommand::descent(Painter & pain, LyXFont const &) const
+void InsetCommandParams::setFromString(string const & b)
{
- 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;
-}
+ cmdname = b.substr(0, idx);
+ string tmp = b.substr(idx+4);
-int InsetCommand::width(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);
+ 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 + 4;
}
-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
- LyXFont font(LyXFont::ALL_SANE);
- font.setColor(LColor::command).decSize();
-
- int width;
- string s = getScreenLabel();
-
- if (Editable()) {
- pain.buttonText(int(x)+2, baseline, s, font, true, width);
- } else {
- pain.rectText(int(x)+2, baseline, s, font,
- LColor::commandbg, LColor::commandframe,
- true, width);
- }
-
- x += width + 4;
+ return cmdname == o.cmdname && contents == o.contents
+ && options == o.options;
}
-// 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 tcmdname, toptions, tcontents;
}
// Don't mess with this.
- if (!tcmdname.empty()) cmdname = tcmdname;
- if (!toptions.empty()) options = toptions;
+ if (!tcmdname.empty()) setCmdName(tcmdname);
+ if (!toptions.empty()) setOptions(toptions);
if (!tcontents.empty()) setContents(tcontents);
- // setContents is overloaded in InsetInclude
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)
{
- if (lex.EatLine()) {
- string 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(ostream & os, bool /*fragile*/, bool/*fs*/) const
+void InsetCommandParams::write(ostream & os) const
{
- os << getCommand();
- return 0;
+ os << "LatexCommand " << getCommand() << "\n";
}
-int InsetCommand::Ascii(ostream &) 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, bool)
+ : p_(p.getCmdName(), p.getContents(), p.getOptions())
+{}
+
+
+void InsetCommand::setParams(InsetCommandParams const & p)
{
- return 0;
+ p_.setCmdName(p.getCmdName());
+ p_.setContents(p.getContents());
+ p_.setOptions(p.getOptions());
}
-int InsetCommand::Linuxdoc(ostream &) const
+int InsetCommand::latex(Buffer const *, ostream & os,
+ bool /*fragile*/, bool/*fs*/) const
{
+ os << getCommand();
return 0;
}
-int InsetCommand::DocBook(ostream &) 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(cmdname, contents, options);
+ return 0;
}
-string InsetCommand::getCommand() const
-{
- string s;
- if (!cmdname.empty()) s += "\\"+cmdname;
- if (!options.empty()) s += "["+options+']';
- s += "{"+contents+'}';
- return s;
+int InsetCommand::docbook(Buffer const *, ostream &) const
+{
+ return 0;
}
projects / lyx.git / blobdiff