X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Finsets%2FInsetNote.cpp;h=9b4ba5768d42407f9dd5da5d63be85b67b9bf13d;hb=9c4929ca406091267dafa40f5e083a27db046bf6;hp=c44d637a56ca55a1e2ba718ebca2233f71a52d80;hpb=77ed747114e72f378b2137c64fa843fda721a528;p=lyx.git diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp index c44d637a56..9b4ba5768d 100644 --- a/src/insets/InsetNote.cpp +++ b/src/insets/InsetNote.cpp @@ -5,7 +5,7 @@ * * \author Angus Leeming * \author Martin Vermeer - * \author Jürgen Spitzmüller + * \author Jürgen Spitzmüller * * Full author contact details are available in file CREDITS. */ @@ -24,10 +24,10 @@ #include "Exporter.h" #include "FuncRequest.h" #include "FuncStatus.h" -#include "support/gettext.h" +#include "InsetIterator.h" #include "LaTeXFeatures.h" #include "Lexer.h" -#include "MetricsInfo.h" +#include "LyXRC.h" #include "OutputParams.h" #include "ParIterator.h" #include "TextClass.h" @@ -35,6 +35,7 @@ #include "support/debug.h" #include "support/docstream.h" +#include "support/gettext.h" #include "support/Translator.h" #include "frontends/Application.h" @@ -49,7 +50,6 @@ namespace lyx { namespace { typedef Translator NoteTranslator; -typedef Translator NoteTranslatorLoc; NoteTranslator const init_notetranslator() { @@ -60,15 +60,6 @@ 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(); @@ -76,17 +67,9 @@ NoteTranslator const & notetranslator() } -NoteTranslatorLoc const & notetranslator_loc() -{ - static NoteTranslatorLoc translator = init_notetranslator_loc(); - return translator; -} - } // anon - - InsetNoteParams::InsetNoteParams() : type(Note) {} @@ -110,11 +93,11 @@ void InsetNoteParams::read(Lexer & lex) ///////////////////////////////////////////////////////////////////// // -// InsetNode +// InsetNote // ///////////////////////////////////////////////////////////////////// -InsetNote::InsetNote(Buffer const & buf, string const & label) +InsetNote::InsetNote(Buffer * buf, string const & label) : InsetCollapsable(buf) { params_.type = notetranslator().find(label); @@ -127,13 +110,7 @@ InsetNote::~InsetNote() } -docstring InsetNote::editMessage() const -{ - return _("Opened Note Inset"); -} - - -docstring InsetNote::name() const +docstring InsetNote::layoutName() const { return from_ascii("Note:" + notetranslator().find(params_.type)); } @@ -159,13 +136,6 @@ void InsetNote::read(Lexer & lex) } -void InsetNote::setButtonLabel() -{ - docstring const label = notetranslator_loc().find(params_.type); - setLabel(label); -} - - bool InsetNote::showInsetDialog(BufferView * bv) const { bv->showDialog("note", params2string(params()), @@ -176,12 +146,15 @@ bool InsetNote::showInsetDialog(BufferView * bv) const 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_); - // get a bp from cur: - setLayout(cur.buffer().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: @@ -198,7 +171,7 @@ void InsetNote::doDispatch(Cursor & cur, FuncRequest & cmd) 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 @@ -221,16 +194,18 @@ bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd, } -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(*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); } @@ -244,10 +219,10 @@ bool InsetNote::isMacroScope() const } -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) { @@ -256,8 +231,6 @@ int InsetNote::latex(odocstream & os, OutputParams const & runparams_in) const 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: @@ -269,14 +242,13 @@ int InsetNote::latex(odocstream & os, OutputParams const & runparams_in) const // 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')); } @@ -324,21 +296,44 @@ int InsetNote::docbook(odocstream & os, OutputParams const & runparams_in) const } +docstring InsetNote::xhtml(XHTMLStream & xs, OutputParams const & rp) const +{ + if (params_.type == InsetNoteParams::Note) + return docstring(); + + return InsetCollapsable::xhtml(xs, rp); +} + + void InsetNote::validate(LaTeXFeatures & features) const { - if (params_.type == InsetNoteParams::Comment) + switch (params_.type) { + case InsetNoteParams::Comment: features.require("verbatim"); - if (params_.type == InsetNoteParams::Greyedout) { + 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"); features.require("lyxgreyedout"); + InsetCollapsable::validate(features); + break; + case InsetNoteParams::Note: + break; } - InsetText::validate(features); } -docstring InsetNote::contextMenu(BufferView const &, int, int) const +string InsetNote::contextMenuName() const { - return from_ascii("context-note"); + return "context-note"; +} + +bool InsetNote::allowSpellCheck() const +{ + return (params_.type == InsetNoteParams::Greyedout || lyxrc.spellcheck_notes); } @@ -362,7 +357,13 @@ void InsetNote::string2params(string const & in, InsetNoteParams & params) Lexer lex; lex.setStream(data); lex.setContext("InsetNote::string2params"); - lex >> "note" >> "Note"; + lex >> "note"; + // There are cases, such as when we are called via getStatus() from + // Dialog::canApply(), where we are just called with "note" rather + // than a full "note Note TYPE". + if (!lex.isOK()) + return; + lex >> "Note"; params.read(lex); }