#include <config.h>
-#include "Lsstream.h"
-
#include "insetnote.h"
-#include "metricsinfo.h"
-#include "gettext.h"
-#include "lyxfont.h"
-#include "language.h"
-#include "buffer.h"
+
#include "BufferView.h"
-#include "lyxlex.h"
-#include "lyxtext.h"
-#include "insets/insettext.h"
-#include "support/LOstream.h"
-#include "support/lstrings.h"
+#include "cursor.h"
#include "debug.h"
+#include "dispatchresult.h"
+#include "funcrequest.h"
+#include "gettext.h"
+#include "LaTeXFeatures.h"
+#include "LColor.h"
+#include "lyxlex.h"
+#include "metricsinfo.h"
+#include "paragraph.h"
-using std::ostream;
+#include "support/lyxalgo.h"
+#include "support/translator.h"
+
+#include <sstream>
+
+using std::string;
using std::auto_ptr;
+using std::istringstream;
+using std::ostream;
+using std::ostringstream;
+
+
+namespace {
+
+typedef Translator<std::string, InsetNoteParams::Type> NoteTranslator;
+
+NoteTranslator const init_notetranslator() {
+ NoteTranslator translator("Note", InsetNoteParams::Note);
+ translator.addPair("Comment", InsetNoteParams::Comment);
+ translator.addPair("Greyedout", InsetNoteParams::Greyedout);
+ return translator;
+}
+
+
+NoteTranslator const init_notetranslator_loc() {
+ NoteTranslator translator(_("Note"), InsetNoteParams::Note);
+ translator.addPair(_("Comment"), InsetNoteParams::Comment);
+ translator.addPair(_("Greyed out"), InsetNoteParams::Greyedout);
+ return translator;
+}
+
+
+NoteTranslator const & notetranslator() {
+ static NoteTranslator translator = init_notetranslator();
+ return translator;
+}
+
+
+NoteTranslator const & notetranslator_loc() {
+ static NoteTranslator translator = init_notetranslator_loc();
+ return translator;
+}
+
+} // anon
+
+
+
+
+InsetNoteParams::InsetNoteParams()
+ : type(Note)
+{}
+
+
+void InsetNoteParams::write(ostream & os) const
+{
+ string const label = notetranslator().find(type);
+ os << "Note " << label << "\n";
+}
+
+
+void InsetNoteParams::read(LyXLex & lex)
+{
+ string label;
+ lex >> label;
+ if (lex)
+ type = notetranslator().find(label);
+}
void InsetNote::init()
InsetNote::InsetNote(BufferParams const & bp, string const & label)
: InsetCollapsable(bp)
{
- params_.type = label;
+ params_.type = notetranslator().find(label);
init();
- setButtonLabel();
}
}
-InsetNote::~InsetNote() // MV
+InsetNote::~InsetNote()
{
- InsetNoteMailer mailer("note", *this);
- mailer.hideDialog();
+ InsetNoteMailer(*this).hideDialog();
}
void InsetNote::read(Buffer const & buf, LyXLex & lex)
{
+ params_.read(lex);
InsetCollapsable::read(buf, lex);
setButtonLabel();
}
void InsetNote::setButtonLabel()
{
+ string const label = notetranslator_loc().find(params_.type);
+ setLabel(label);
+
LyXFont font(LyXFont::ALL_SANE);
font.decSize();
font.decSize();
- if (params_.type == "Note") {
- setLabel(_("LyX Note"));
+ switch (params_.type) {
+ case InsetNoteParams::Note:
font.setColor(LColor::note);
setBackgroundColor(LColor::notebg);
- } else if (params_.type == "Comment") {
- setLabel(_("Comment"));
+ break;
+ case InsetNoteParams::Comment:
font.setColor(LColor::comment);
setBackgroundColor(LColor::commentbg);
- } else {
- setLabel(_("Greyed Out"));
+ break;
+ case InsetNoteParams::Greyedout:
font.setColor(LColor::greyedout);
setBackgroundColor(LColor::greyedoutbg);
+ break;
}
setLabelFont(font);
}
-void InsetNote::metrics(MetricsInfo & mi, Dimension & dim) const
-{
- InsetCollapsable::metrics(mi, dim);
- // Contrary to Greyedout, these cannot be construed as part of the
- // running text: make them stand on their own
- if (params_.type == "Note" || params_.type == "Comment")
- if (!collapsed_)
- dim.wid = mi.base.textwidth;
- dim_ = dim;
-}
-
-
bool InsetNote::showInsetDialog(BufferView * bv) const
{
- InsetNoteMailer("note", const_cast<InsetNote &>(*this)).showDialog(bv);
+ InsetNoteMailer(const_cast<InsetNote &>(*this)).showDialog(bv);
return true;
}
-dispatch_result InsetNote::localDispatch(FuncRequest const & cmd)
+void InsetNote::priv_dispatch(LCursor & cur, FuncRequest & cmd)
{
- BufferView * bv = cmd.view();
-
switch (cmd.action) {
- case LFUN_INSET_MODIFY: {
- InsetNoteParams params;
- InsetNoteMailer::string2params(cmd.argument, params);
- params_.type = params.type;
+ case LFUN_INSET_MODIFY:
+ InsetNoteMailer::string2params(cmd.argument, params_);
setButtonLabel();
- bv->updateInset(this);
- return DISPATCHED;
- }
-
- case LFUN_INSET_EDIT:
- if (cmd.button() == mouse_button::button3)
- return UNDISPATCHED;
- return InsetCollapsable::localDispatch(cmd);
+ cur.bv().update();
+ break;
case LFUN_INSET_DIALOG_UPDATE:
- InsetNoteMailer("note", *this).updateDialog(bv);
- return DISPATCHED;
+ InsetNoteMailer(*this).updateDialog(&cur.bv());
+ break;
case LFUN_MOUSE_RELEASE:
- if (cmd.button() == mouse_button::button3 && hitButton(cmd)) {
- InsetNoteMailer("note", *this).showDialog(bv);
- return DISPATCHED;
- }
- // fallthrough:
+ if (cmd.button() == mouse_button::button3 && hitButton(cmd))
+ InsetNoteMailer(*this).showDialog(&cur.bv());
+ else
+ InsetCollapsable::priv_dispatch(cur, cmd);
+ break;
default:
- return InsetCollapsable::localDispatch(cmd);
+ InsetCollapsable::priv_dispatch(cur, cmd);
+ break;
}
}
int InsetNote::latex(Buffer const & buf, ostream & os,
- LatexRunParams const & runparams) const
+ OutputParams const & runparams) const
{
- string const pt = params_.type;
-
- int i = 0;
- if (pt == "Comment")
- // verbatim
- os << "%\n\\begin{comment}\n";
- else if (pt == "Greyedout")
- // we roll our own macro
- os << "%\n\\begin{lyxgreyedout}\n";
-
- if (pt != "Note")
- i = inset.latex(buf, os, runparams);
-
- if (pt == "Comment") {
- os << "%\n\\end{comment}\n";
- i += 4;
- } else if (pt == "Greyedout") {
- os << "%\n\\end{lyxgreyedout}\n";
- i += 4;
- }
- return i;
+ if (params_.type == InsetNoteParams::Note)
+ return 0;
+
+ string type;
+ if (params_.type == InsetNoteParams::Comment)
+ type = "comment";
+ else if (params_.type == InsetNoteParams::Greyedout)
+ type = "lyxgreyedout";
+
+ ostringstream ss;
+ ss << "%\n\\begin{" << type << "}\n";
+ InsetText::latex(buf, ss, runparams);
+ ss << "%\n\\end{" << type << "}\n";
+
+ string const str = ss.str();
+ os << str;
+ // Return how many newlines we issued.
+ return int(lyx::count(str.begin(), str.end(),'\n') + 1);
}
-int InsetNote::linuxdoc(Buffer const & buf, std::ostream & os) const
+int InsetNote::linuxdoc(Buffer const & buf, std::ostream & os,
+ OutputParams const & runparams) const
{
- string const pt = params_.type;
+ if (params_.type == InsetNoteParams::Note)
+ return 0;
- int i = 0;
- if (pt == "Comment")
- os << "<comment>\n";
+ ostringstream ss;
+ if (params_.type == InsetNoteParams::Comment)
+ ss << "<comment>\n";
- if (pt != "Note")
- i = inset.linuxdoc(buf, os);
+ InsetText::linuxdoc(buf, ss, runparams);
- if (pt == "Comment") {
- os << "\n</comment>\n";
- i += 3;
- }
- return i;
+ if (params_.type == InsetNoteParams::Comment)
+ ss << "\n</comment>\n";
+
+ string const str = ss.str();
+ os << str;
+ // Return how many newlines we issued.
+ return int(lyx::count(str.begin(), str.end(),'\n') + 1);
}
-int InsetNote::docbook(Buffer const & buf, std::ostream & os, bool mixcont) const
+int InsetNote::docbook(Buffer const & buf, std::ostream & os,
+ OutputParams const & runparams) const
{
- string const pt = params_.type;
+ if (params_.type == InsetNoteParams::Note)
+ return 0;
- int i = 0;
- if (pt == "Comment")
- os << "<remark>\n";
+ ostringstream ss;
+ if (params_.type == InsetNoteParams::Comment)
+ ss << "<remark>\n";
- if (pt != "Note")
- i = inset.docbook(buf, os, mixcont);
+ InsetText::docbook(buf, ss, runparams);
- if (pt == "Comment") {
- os << "\n</remark>\n";
- i += 3;
- }
- return i;
+ if (params_.type == InsetNoteParams::Comment)
+ ss << "\n</remark>\n";
+
+ string const str = ss.str();
+ os << str;
+ // Return how many newlines we issued.
+ return int(lyx::count(str.begin(), str.end(),'\n') + 1);
}
-int InsetNote::ascii(Buffer const & buf, std::ostream & os, int ll) const
+int InsetNote::plaintext(Buffer const & buf, std::ostream & os,
+ OutputParams const & runparams) const
{
- int i = 0;
- string const pt = params_.type;
- if (pt != "Note") {
- os << "[";
- i = inset.ascii(buf, os, ll);
- os << "]";
- }
- return i;
+ if (params_.type == InsetNoteParams::Note)
+ return 0;
+
+ ostringstream ss;
+ ss << "[";
+ InsetText::plaintext(buf, ss, runparams);
+ ss << "]";
+
+ string const str = ss.str();
+ os << str;
+ // Return how many newlines we issued.
+ return int(lyx::count(str.begin(), str.end(),'\n') + 1);
}
void InsetNote::validate(LaTeXFeatures & features) const
{
- if (params_.type == "Comment")
+ if (params_.type == InsetNoteParams::Comment)
features.require("verbatim");
- if (params_.type == "Greyedout") {
+ if (params_.type == InsetNoteParams::Greyedout) {
features.require("color");
features.require("lyxgreyedout");
}
- inset.validate(features);
+ InsetText::validate(features);
}
-InsetNoteMailer::InsetNoteMailer(string const & name,
- InsetNote & inset)
- : name_(name), inset_(inset)
-{
-}
+string const InsetNoteMailer::name_("note");
+
+InsetNoteMailer::InsetNoteMailer(InsetNote & inset)
+ : inset_(inset)
+{}
string const InsetNoteMailer::inset2string(Buffer const &) const
{
- return params2string(name_, inset_.params());
+ return params2string(inset_.params());
}
-string const InsetNoteMailer::params2string(string const & name,
- InsetNoteParams const & params)
+string const InsetNoteMailer::params2string(InsetNoteParams const & params)
{
ostringstream data;
- data << name << ' ';
+ data << name_ << ' ';
params.write(data);
- return STRCONV(data.str());
+ return data.str();
}
void InsetNoteMailer::string2params(string const & in,
- InsetNoteParams & params)
+ InsetNoteParams & params)
{
params = InsetNoteParams();
if (in.empty())
return;
- istringstream data(STRCONV(in));
+ istringstream data(in);
LyXLex lex(0,0);
lex.setStream(data);
- params.read(lex);
-}
+ string name;
+ lex >> name;
+ if (!lex || name != name_)
+ return print_mailer_error("InsetNoteMailer", in, 1, name_);
-void InsetNoteParams::write(ostream & os) const
-{
- os << type << "\n";
-}
-
-
-void InsetNoteParams::read(LyXLex & lex)
-{
- if (lex.isOK()) {
- lex.next();
- string token = lex.getString();
- }
+ // This is part of the inset proper that is usually swallowed
+ // by LyXText::readInset
+ string id;
+ lex >> id;
+ if (!lex || id != "Note")
+ return print_mailer_error("InsetBoxMailer", in, 2, "Note");
- if (lex.isOK()) {
- lex.next();
- type = lex.getString();
- }
+ params.read(lex);
}