X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNote.cpp;h=d5e7fb324c5fc720bf6ae681c0740b115fab8059;hb=e4c46abeb7385960c9dd42494e3c7c1f3e699b56;hp=988fab041146d421f7ffe3b467ea2c093dca4450;hpb=1f44b8a5c05be4fdb681fe3c26cd31b12298508a;p=lyx.git diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp index 988fab0411..d5e7fb324c 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" @@ -36,6 +37,7 @@ #include "support/debug.h" #include "support/docstream.h" #include "support/gettext.h" +#include "support/lstrings.h" #include "support/Translator.h" #include "frontends/Application.h" @@ -50,7 +52,6 @@ namespace lyx { namespace { typedef Translator NoteTranslator; -typedef Translator NoteTranslatorLoc; NoteTranslator const init_notetranslator() { @@ -63,7 +64,7 @@ NoteTranslator const init_notetranslator() NoteTranslator const & notetranslator() { - static NoteTranslator translator = init_notetranslator(); + static NoteTranslator const translator = init_notetranslator(); return translator; } @@ -111,7 +112,7 @@ InsetNote::~InsetNote() } -docstring InsetNote::name() const +docstring InsetNote::layoutName() const { return from_ascii("Note:" + notetranslator().find(params_.type)); } @@ -149,14 +150,26 @@ void InsetNote::doDispatch(Cursor & cur, FuncRequest & cmd) { switch (cmd.action()) { - case LFUN_INSET_MODIFY: - cur.recordUndoInset(ATOMIC_UNDO, this); + case LFUN_INSET_MODIFY: { + // Do not do anything if converting to the same type of Note. + // A quick break here is done instead of disabling the LFUN + // because disabling the LFUN would lead to a greyed out + // entry, which might confuse users. + // In the future, we might want to have a radio button for + // switching between notes. + InsetNoteParams params; + string2params(to_utf8(cmd.argument()), params); + if (params_.type == params.type) + break; + + cur.recordUndoInset(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: cur.bv().updateDialog("note", params2string(params())); @@ -195,18 +208,23 @@ bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd, } -void InsetNote::addToToc(DocIterator const & cpit) +void InsetNote::addToToc(DocIterator const & cpit, bool output_active, + UpdateType utype) const { DocIterator pit = cpit; - pit.push_back(CursorSlice(*this)); + pit.push_back(CursorSlice(const_cast(*this))); - Toc & toc = buffer().tocBackend().toc("note"); 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))); + docstring str; + text().forOutliner(str, TOC_ENTRY_LENGTH); + str = translateIfPossible(il.labelstring()) + ": " + str; + + shared_ptr toc = buffer().tocBackend().toc("note"); + toc->push_back(TocItem(pit, 0, str, output_active)); + // Proceed with the rest of the inset. - InsetCollapsable::addToToc(cpit); + bool doing_output = output_active && producesOutput(); + InsetCollapsable::addToToc(cpit, doing_output, utype); } @@ -220,10 +238,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) { @@ -232,8 +250,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: @@ -245,19 +261,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; @@ -269,7 +284,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 @@ -313,11 +328,15 @@ 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); + else + // Only do the requires + features.useInsetLayout(getLayout()); break; case InsetNoteParams::Greyedout: - features.require("color"); - features.require("lyxgreyedout"); InsetCollapsable::validate(features); break; case InsetNoteParams::Note: @@ -326,9 +345,9 @@ void InsetNote::validate(LaTeXFeatures & features) const } -docstring InsetNote::contextMenuName() const +string InsetNote::contextMenuName() const { - return from_ascii("context-note"); + return "context-note"; } bool InsetNote::allowSpellCheck() const @@ -336,6 +355,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) {