X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNote.cpp;h=d3c1b1e2b49938e7bf4fc4dab8d526502e1e07a2;hb=5eb7add4092708a5a0dbabf303164be624aff72f;hp=ab90288c6beb5530ad33f553567693c5c5bbf29d;hpb=c3a8b3a566e9e90f9ade72acbc723232d721d0b1;p=lyx.git diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp index ab90288c6b..d3c1b1e2b4 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,8 +35,11 @@ #include "support/debug.h" #include "support/docstream.h" +#include "support/gettext.h" #include "support/Translator.h" +#include "frontends/Application.h" + #include #include @@ -106,33 +109,22 @@ void InsetNoteParams::read(Lexer & lex) } -InsetNote::InsetNote(BufferParams const & bp, string const & label) - : InsetCollapsable(bp) +///////////////////////////////////////////////////////////////////// +// +// InsetNote +// +///////////////////////////////////////////////////////////////////// + +InsetNote::InsetNote(Buffer * buf, string const & label) + : InsetCollapsable(buf) { params_.type = notetranslator().find(label); } -InsetNote::InsetNote(InsetNote const & in) - : InsetCollapsable(in), params_(in.params_) -{} - - InsetNote::~InsetNote() { - InsetNoteMailer(*this).hideDialog(); -} - - -Inset * InsetNote::clone() const -{ - return new InsetNote(*this); -} - - -docstring const InsetNote::editMessage() const -{ - return _("Opened Note Inset"); + hideDialogs("note", this); } @@ -148,17 +140,17 @@ Inset::DisplayType InsetNote::display() const } -void InsetNote::write(Buffer const & buf, ostream & os) const +void InsetNote::write(ostream & os) const { params_.write(os); - InsetCollapsable::write(buf, os); + InsetCollapsable::write(os); } -void InsetNote::read(Buffer const & buf, Lexer & lex) +void InsetNote::read(Lexer & lex) { params_.read(lex); - InsetCollapsable::read(buf, lex); + InsetCollapsable::read(lex); } @@ -171,24 +163,29 @@ void InsetNote::setButtonLabel() bool InsetNote::showInsetDialog(BufferView * bv) const { - InsetNoteMailer(const_cast(*this)).showDialog(bv); + bv->showDialog("note", params2string(params()), + const_cast(this)); return true; } void InsetNote::doDispatch(Cursor & cur, FuncRequest & cmd) { - switch (cmd.action) { + switch (cmd.action()) { case LFUN_INSET_MODIFY: - InsetNoteMailer::string2params(to_utf8(cmd.argument()), params_); - // get a bp from cur: - setLayout(cur.buffer().params()); + 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: - InsetNoteMailer(*this).updateDialog(&cur.bv()); + cur.bv().updateDialog("note", params2string(params())); break; + default: InsetCollapsable::doDispatch(cur, cmd); break; @@ -199,11 +196,21 @@ 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 + flag.setEnabled(!cur.paragraph().layout().isCommand() || + cmd.getArg(2) == "Note"); + if (cmd.getArg(0) == "note") { + InsetNoteParams params; + string2params(to_utf8(cmd.argument()), params); + flag.setOnOff(params_.type == params.type); + } + return true; + case LFUN_INSET_DIALOG_UPDATE: - flag.enabled(true); + flag.setEnabled(true); return true; default: @@ -211,41 +218,33 @@ bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd, } } -void InsetNote::updateLabels(Buffer const & buf, ParIterator const & it) -{ - TextClass const & tclass = buf.params().getTextClass(); - Counters savecnt = tclass.counters(); - InsetCollapsable::updateLabels(buf, it); - tclass.counters() = savecnt; -} - -void InsetNote::addToToc(Buffer const & buf, - ParConstIterator const & cpit) const +void InsetNote::addToToc(DocIterator const & cpit) { - ParConstIterator pit = cpit; - pit.push_back(*this); + DocIterator pit = cpit; + pit.push_back(CursorSlice(*this)); - Toc & toc = buf.tocBackend().toc("note"); + 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)); + + text().getPar(0).asString(); + toc.push_back(TocItem(pit, 0, str, toolTipText())); + // Proceed with the rest of the inset. + InsetCollapsable::addToToc(cpit); } -bool InsetNote::isMacroScope(Buffer const & buf) const +bool InsetNote::isMacroScope() const { // LyX note has no latex output if (params_.type == InsetNoteParams::Note) return true; - return InsetCollapsable::isMacroScope(buf); + return InsetCollapsable::isMacroScope(); } -int InsetNote::latex(Buffer const & buf, odocstream & os, - OutputParams const & runparams_in) const +int InsetNote::latex(odocstream & os, OutputParams const & runparams_in) const { if (params_.type == InsetNoteParams::Note) return 0; @@ -258,7 +257,7 @@ int InsetNote::latex(Buffer const & buf, odocstream & os, } odocstringstream ss; - InsetCollapsable::latex(buf, ss, runparams); + 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: @@ -281,7 +280,7 @@ int InsetNote::latex(Buffer const & buf, odocstream & os, } -int InsetNote::plaintext(Buffer const & buf, odocstream & os, +int InsetNote::plaintext(odocstream & os, OutputParams const & runparams_in) const { if (params_.type == InsetNoteParams::Note) @@ -293,16 +292,15 @@ int InsetNote::plaintext(Buffer const & buf, odocstream & os, // Ignore files that are exported inside a comment runparams.exportdata.reset(new ExportData); } - os << '[' << buf.B_("note") << ":\n"; - InsetText::plaintext(buf, os, runparams); + os << '[' << buffer().B_("note") << ":\n"; + InsetText::plaintext(os, runparams); os << "\n]"; return PLAINTEXT_NEWLINE + 1; // one char on a separate line } -int InsetNote::docbook(Buffer const & buf, odocstream & os, - OutputParams const & runparams_in) const +int InsetNote::docbook(odocstream & os, OutputParams const & runparams_in) const { if (params_.type == InsetNoteParams::Note) return 0; @@ -315,7 +313,7 @@ int InsetNote::docbook(Buffer const & buf, odocstream & os, runparams.exportdata.reset(new ExportData); } - int const n = InsetText::docbook(buf, os, runparams); + int const n = InsetText::docbook(os, runparams); if (params_.type == InsetNoteParams::Comment) os << "\n\n"; @@ -326,43 +324,53 @@ int InsetNote::docbook(Buffer const & buf, odocstream & os, } +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) { + 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 +{ + return from_ascii("context-note"); +} -string const InsetNoteMailer::name_("note"); - -InsetNoteMailer::InsetNoteMailer(InsetNote & inset) - : inset_(inset) -{} - - -string const InsetNoteMailer::inset2string(Buffer const &) const +bool InsetNote::allowSpellCheck() const { - return params2string(inset_.params()); + return (params_.type == InsetNoteParams::Greyedout || lyxrc.spellcheck_notes); } -string const InsetNoteMailer::params2string(InsetNoteParams const & params) +string InsetNote::params2string(InsetNoteParams const & params) { ostringstream data; - data << name_ << ' '; + data << "note" << ' '; params.write(data); return data.str(); } -void InsetNoteMailer::string2params(string const & in, - InsetNoteParams & params) +void InsetNote::string2params(string const & in, InsetNoteParams & params) { params = InsetNoteParams(); @@ -370,20 +378,16 @@ void InsetNoteMailer::string2params(string const & in, return; istringstream data(in); - Lexer lex(0,0); + Lexer lex; lex.setStream(data); - - string name; - lex >> name; - if (!lex || name != name_) - return print_mailer_error("InsetNoteMailer", in, 1, name_); - - // This is part of the inset proper that is usually swallowed - // by Text::readInset - string id; - lex >> id; - if (!lex || id != "Note") - return print_mailer_error("InsetBoxMailer", in, 2, "Note"); + lex.setContext("InsetNote::string2params"); + 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); }