X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNote.cpp;h=19f6035e0738e54b7007954109597f49ec6c497e;hb=6b49b6b129af9417fea7ea907a44a46fbbd38340;hp=189c290791b9a2470f50045457fa97a23c323e05;hpb=acff67f259c1e2d9acfe3697b33843af4d3f94d7;p=lyx.git diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp index 189c290791..19f6035e07 100644 --- a/src/insets/InsetNote.cpp +++ b/src/insets/InsetNote.cpp @@ -18,6 +18,7 @@ #include "BufferParams.h" #include "BufferView.h" #include "BufferParams.h" +#include "ColorSet.h" #include "Counters.h" #include "Cursor.h" #include "DispatchResult.h" @@ -50,7 +51,6 @@ namespace lyx { namespace { typedef Translator NoteTranslator; -typedef Translator NoteTranslatorLoc; NoteTranslator const init_notetranslator() { @@ -61,15 +61,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(); @@ -77,17 +68,9 @@ NoteTranslator const & notetranslator() } -NoteTranslatorLoc const & notetranslator_loc() -{ - static NoteTranslatorLoc translator = init_notetranslator_loc(); - return translator; -} - } // anon - - InsetNoteParams::InsetNoteParams() : type(Note) {} @@ -128,7 +111,7 @@ InsetNote::~InsetNote() } -docstring InsetNote::name() const +docstring InsetNote::layoutName() const { return from_ascii("Note:" + notetranslator().find(params_.type)); } @@ -154,13 +137,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()), @@ -174,8 +150,12 @@ void InsetNote::doDispatch(Cursor & cur, FuncRequest & cmd) 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: @@ -215,18 +195,20 @@ bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd, } -void InsetNote::addToToc(DocIterator const & cpit) +void InsetNote::addToToc(DocIterator const & cpit, bool output_active) 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(": ") - + text().getPar(0).asString(); - 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, output_active, toolTipText(docstring(), 3, 60))); + // Proceed with the rest of the inset. - InsetCollapsable::addToToc(cpit); + bool doing_output = output_active && producesOutput(); + InsetCollapsable::addToToc(cpit, doing_output); } @@ -240,10 +222,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) { @@ -252,8 +234,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: @@ -265,19 +245,18 @@ 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')); } -int InsetNote::plaintext(odocstream & os, - OutputParams const & runparams_in) const +int InsetNote::plaintext(odocstringstream & os, + OutputParams const & runparams_in, size_t max_length) const { if (params_.type == InsetNoteParams::Note) return 0; @@ -289,7 +268,7 @@ int InsetNote::plaintext(odocstream & os, runparams.exportdata.reset(new ExportData); } os << '[' << buffer().B_("note") << ":\n"; - InsetText::plaintext(os, runparams); + InsetText::plaintext(os, runparams, max_length); os << "\n]"; return PLAINTEXT_NEWLINE + 1; // one char on a separate line @@ -334,6 +313,10 @@ void InsetNote::validate(LaTeXFeatures & features) const 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"); @@ -346,9 +329,9 @@ void InsetNote::validate(LaTeXFeatures & features) const } -docstring InsetNote::contextMenu(BufferView const &, int, int) const +string InsetNote::contextMenuName() const { - return from_ascii("context-note"); + return "context-note"; } bool InsetNote::allowSpellCheck() const @@ -356,6 +339,19 @@ bool InsetNote::allowSpellCheck() const return (params_.type == InsetNoteParams::Greyedout || lyxrc.spellcheck_notes); } +FontInfo InsetNote::getFont() const +{ + FontInfo font = getLayout().font(); + // FIXME: This hardcoded color is a hack! + if (params_.type == InsetNoteParams::Greyedout + && buffer().params().notefontcolor != lyx::rgbFromHexName("#cccccc")) { + ColorCode c = lcolor.getFromLyXName("notefontcolor"); + if (c != Color_none) + font.setColor(c); + } + return font; +} + string InsetNote::params2string(InsetNoteParams const & params) {