namespace {
typedef Translator<string, InsetNoteParams::Type> NoteTranslator;
-typedef Translator<docstring, InsetNoteParams::Type> NoteTranslatorLoc;
NoteTranslator const init_notetranslator()
{
}
-NoteTranslatorLoc const init_notetranslator_loc()
-{
- NoteTranslatorLoc translator(_("Note[[InsetNote]]"), InsetNoteParams::Note);
- translator.addPair(_("Comment"), InsetNoteParams::Comment);
- translator.addPair(_("Greyed out"), InsetNoteParams::Greyedout);
- return translator;
-}
-
-
NoteTranslator const & notetranslator()
{
static NoteTranslator translator = init_notetranslator();
}
-NoteTranslatorLoc const & notetranslator_loc()
-{
- static NoteTranslatorLoc translator = init_notetranslator_loc();
- return translator;
-}
-
} // anon
-
-
InsetNoteParams::InsetNoteParams()
: type(Note)
{}
}
-docstring InsetNote::name() const
+docstring InsetNote::layoutName() const
{
return from_ascii("Note:" + notetranslator().find(params_.type));
}
}
-void InsetNote::setButtonLabel()
-{
- docstring const label = notetranslator_loc().find(params_.type);
- setLabel(label);
-}
-
-
bool InsetNote::showInsetDialog(BufferView * bv) const
{
bv->showDialog("note", params2string(params()),
void InsetNote::doDispatch(Cursor & cur, FuncRequest & cmd)
{
- switch (cmd.action) {
+ switch (cmd.action()) {
case LFUN_INSET_MODIFY:
+ cur.recordUndoInset(ATOMIC_UNDO, this);
string2params(to_utf8(cmd.argument()), params_);
setButtonLabel();
+ // what we really want here is a TOC update, but that means
+ // a full buffer update
+ cur.forceBufferUpdate();
break;
case LFUN_INSET_DIALOG_UPDATE:
bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd,
FuncStatus & flag) const
{
- switch (cmd.action) {
+ switch (cmd.action()) {
case LFUN_INSET_MODIFY:
// disallow comment and greyed out in commands
}
-void InsetNote::addToToc(DocIterator const & cpit)
+void InsetNote::addToToc(DocIterator const & cpit) const
{
DocIterator pit = cpit;
- pit.push_back(CursorSlice(*this));
+ pit.push_back(CursorSlice(const_cast<InsetNote &>(*this)));
Toc & toc = buffer().tocBackend().toc("note");
- docstring str;
- str = notetranslator_loc().find(params_.type) + from_ascii(": ")
- + getNewLabel(str);
- toc.push_back(TocItem(pit, 0, str));
+ InsetLayout const & il = getLayout();
+ docstring str = translateIfPossible(il.labelstring()) + from_ascii(": ");
+ text().forToc(str, TOC_ENTRY_LENGTH);
+ toc.push_back(TocItem(pit, 0, str, toolTipText(docstring(), 3, 60)));
// Proceed with the rest of the inset.
InsetCollapsable::addToToc(cpit);
}
}
-int InsetNote::latex(odocstream & os, OutputParams const & runparams_in) const
+void InsetNote::latex(otexstream & os, OutputParams const & runparams_in) const
{
if (params_.type == InsetNoteParams::Note)
- return 0;
+ return;
OutputParams runparams(runparams_in);
if (params_.type == InsetNoteParams::Comment) {
runparams.exportdata.reset(new ExportData);
}
- odocstringstream ss;
- InsetCollapsable::latex(ss, runparams);
// the space after the comment in 'a[comment] b' will be eaten by the
// comment environment since the space before b is ignored with the
// following latex output:
// b
//
// Adding {} before ' b' fixes this.
- if (params_.type == InsetNoteParams::Comment)
- ss << "{}";
+ // The {} will be automatically added, but only if needed, for all
+ // insets whose InsetLayout Display tag is false. This is achieved
+ // by telling otexstream to protect an immediately following space
+ // and is done for both comment and greyedout insets.
+ InsetCollapsable::latex(os, runparams);
- docstring const str = ss.str();
- os << str;
runparams_in.encoding = runparams.encoding;
- // Return how many newlines we issued.
- return int(count(str.begin(), str.end(), '\n'));
}
switch (params_.type) {
case InsetNoteParams::Comment:
features.require("verbatim");
+ if (features.runparams().flavor == OutputParams::HTML)
+ // we do output this but set display to "none" by default,
+ // but people might want to use it.
+ InsetCollapsable::validate(features);
break;
case InsetNoteParams::Greyedout:
features.require("color");
}
-docstring InsetNote::contextMenu(BufferView const &, int, int) const
+string InsetNote::contextMenuName() const
{
- return from_ascii("context-note");
+ return "context-note";
}
bool InsetNote::allowSpellCheck() const