namespace {
typedef Translator<string, InsetNoteParams::Type> NoteTranslator;
-typedef Translator<docstring, InsetNoteParams::Type> NoteTranslatorLoc;
NoteTranslator const init_notetranslator()
{
}
-docstring InsetNote::name() const
+docstring InsetNote::layoutName() const
{
return from_ascii("Note:" + notetranslator().find(params_.type));
}
}
-int InsetNote::latex(otexstream & 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;
- otexstream ots(ss);
- ots.canBreakLine(os.canBreakLine());
- InsetCollapsable::latex(ots, runparams);
- docstring const str = ss.str();
- os << str;
-
// 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.
- // The {} will be automatically added, but only if needed, by
- // telling otexstream to protect an immediately following space.
- os.protectSpace(ots.protectSpace());
+ // 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);
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::contextMenuName() const
+string InsetNote::contextMenuName() const
{
- return from_ascii("context-note");
+ return "context-note";
}
bool InsetNote::allowSpellCheck() const