X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNote.cpp;h=5431712447862e4eb43b5756321217729f5a89f8;hb=d6f1915684328c6e3fe61c6eef8846b5cabec334;hp=de060487deab26ab4e309d7b982d21a6474e47e9;hpb=a8cd9a4b8fd325b00c75f601c66c6d618ba276db;p=lyx.git diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp index de060487de..5431712447 100644 --- a/src/insets/InsetNote.cpp +++ b/src/insets/InsetNote.cpp @@ -20,35 +20,36 @@ #include "BufferParams.h" #include "Counters.h" #include "Cursor.h" -#include "debug.h" #include "DispatchResult.h" #include "Exporter.h" #include "FuncRequest.h" #include "FuncStatus.h" -#include "gettext.h" +#include "InsetIterator.h" #include "LaTeXFeatures.h" #include "Lexer.h" #include "MetricsInfo.h" #include "OutputParams.h" +#include "ParIterator.h" +#include "TextClass.h" +#include "TocBackend.h" +#include "support/debug.h" #include "support/docstream.h" +#include "support/gettext.h" #include "support/Translator.h" +#include "frontends/Application.h" + #include #include +using namespace std; namespace lyx { -using std::string; -using std::istringstream; -using std::ostream; -using std::ostringstream; - - namespace { -typedef Translator NoteTranslator; +typedef Translator NoteTranslator; typedef Translator NoteTranslatorLoc; NoteTranslator const init_notetranslator() @@ -56,19 +57,15 @@ NoteTranslator const init_notetranslator() NoteTranslator translator("Note", InsetNoteParams::Note); translator.addPair("Comment", InsetNoteParams::Comment); translator.addPair("Greyedout", InsetNoteParams::Greyedout); - translator.addPair("Framed", InsetNoteParams::Framed); - translator.addPair("Shaded", InsetNoteParams::Shaded); return translator; } NoteTranslatorLoc const init_notetranslator_loc() { - NoteTranslatorLoc translator(_("Note"), InsetNoteParams::Note); + NoteTranslatorLoc translator(_("Note[[InsetNote]]"), InsetNoteParams::Note); translator.addPair(_("Comment"), InsetNoteParams::Comment); translator.addPair(_("Greyed out"), InsetNoteParams::Greyedout); - translator.addPair(_("Framed"), InsetNoteParams::Framed); - translator.addPair(_("Shaded"), InsetNoteParams::Shaded); return translator; } @@ -112,35 +109,26 @@ void InsetNoteParams::read(Lexer & lex) } -InsetNote::InsetNote(BufferParams const & bp, string const & label) - : InsetCollapsable(bp) -{ - params_.type = notetranslator().find(label); - setLayout(bp); - setButtonLabel(); -} - +///////////////////////////////////////////////////////////////////// +// +// InsetNode +// +///////////////////////////////////////////////////////////////////// -InsetNote::InsetNote(InsetNote const & in) - : InsetCollapsable(in), params_(in.params_) +InsetNote::InsetNote(Buffer const & buf, string const & label) + : InsetCollapsable(buf) { - setButtonLabel(); + params_.type = notetranslator().find(label); } InsetNote::~InsetNote() { - InsetNoteMailer(*this).hideDialog(); + hideDialogs("note", this); } -Inset * InsetNote::clone() const -{ - return new InsetNote(*this); -} - - -docstring const InsetNote::editMessage() const +docstring InsetNote::editMessage() const { return _("Opened Note Inset"); } @@ -148,35 +136,27 @@ docstring const InsetNote::editMessage() const docstring InsetNote::name() const { - return from_ascii(string("Note") + string(":") + string(notetranslator().find(params_.type))); + return from_ascii("Note:" + notetranslator().find(params_.type)); } Inset::DisplayType InsetNote::display() const { - switch (params_.type) { - case InsetNoteParams::Framed: - case InsetNoteParams::Shaded: - return AlignLeft; - default: - return Inline; - } + return Inline; } -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); - setLayout(buf.params()); - setButtonLabel(); + InsetCollapsable::read(lex); } @@ -189,7 +169,8 @@ 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; } @@ -199,15 +180,15 @@ void InsetNote::doDispatch(Cursor & cur, FuncRequest & cmd) switch (cmd.action) { case LFUN_INSET_MODIFY: - InsetNoteMailer::string2params(to_utf8(cmd.argument()), params_); + string2params(to_utf8(cmd.argument()), params_); // get a bp from cur: setLayout(cur.buffer().params()); - setButtonLabel(); break; case LFUN_INSET_DIALOG_UPDATE: - InsetNoteMailer(*this).updateDialog(&cur.bv()); + cur.bv().updateDialog("note", params2string(params())); break; + default: InsetCollapsable::doDispatch(cur, cmd); break; @@ -221,8 +202,18 @@ bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd, 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: @@ -230,17 +221,33 @@ bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd, } } -void InsetNote::updateLabels(Buffer const & buf, ParIterator const & it) + +void InsetNote::addToToc(DocIterator const & cpit) +{ + DocIterator pit = cpit; + pit.push_back(CursorSlice(*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)); + // Proceed with the rest of the inset. + InsetCollapsable::addToToc(cpit); +} + + +bool InsetNote::isMacroScope() const { - TextClass const & tclass = buf.params().getTextClass(); - Counters savecnt = tclass.counters(); - InsetCollapsable::updateLabels(buf, it); - tclass.counters() = savecnt; + // LyX note has no latex output + if (params_.type == InsetNoteParams::Note) + return true; + + 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; @@ -253,7 +260,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: @@ -272,11 +279,11 @@ int InsetNote::latex(Buffer const & buf, odocstream & os, os << str; runparams_in.encoding = runparams.encoding; // Return how many newlines we issued. - return int(std::count(str.begin(), str.end(), '\n')); + return int(count(str.begin(), str.end(), '\n')); } -int InsetNote::plaintext(Buffer const & buf, odocstream & os, +int InsetNote::plaintext(odocstream & os, OutputParams const & runparams_in) const { if (params_.type == InsetNoteParams::Note) @@ -288,16 +295,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; @@ -310,7 +316,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"; @@ -329,41 +335,26 @@ void InsetNote::validate(LaTeXFeatures & features) const features.require("color"); features.require("lyxgreyedout"); } - if (params_.type == InsetNoteParams::Shaded) { - features.require("color"); - features.require("framed"); - } - if (params_.type == InsetNoteParams::Framed) - features.require("framed"); InsetText::validate(features); } - -string const InsetNoteMailer::name_("note"); - -InsetNoteMailer::InsetNoteMailer(InsetNote & inset) - : inset_(inset) -{} - - -string const InsetNoteMailer::inset2string(Buffer const &) const +docstring InsetNote::contextMenu(BufferView const &, int, int) const { - return params2string(inset_.params()); + return from_ascii("context-note"); } -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(); @@ -371,23 +362,45 @@ 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" >> "Note"; params.read(lex); } +bool mutateNotes(Cursor & cur, string const & source, string const &target) +{ + InsetNoteParams::Type typeSrc = notetranslator().find(source); + InsetNoteParams::Type typeTrt = notetranslator().find(target); + // syntax check of arguments + string sSrc = notetranslator().find(typeSrc); + string sTrt = notetranslator().find(typeTrt); + if ((sSrc != source) || (sTrt != target)) + return false; + + // did we found some conforming inset? + bool ret = false; + + cur.beginUndoGroup(); + Inset & inset = cur.buffer().inset(); + InsetIterator it = inset_iterator_begin(inset); + InsetIterator const end = inset_iterator_end(inset); + for (; it != end; ++it) { + if (it->lyxCode() == NOTE_CODE) { + InsetNote & ins = static_cast(*it); + if (ins.params().type == typeSrc) { + cur.buffer().undo().recordUndo(it); + FuncRequest fr(LFUN_INSET_MODIFY, "note Note " + target); + ins.dispatch(cur, fr); + ret = true; + } + } + } + cur.endUndoGroup(); + + return ret; +} } // namespace lyx