X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNote.cpp;h=ab90288c6beb5530ad33f553567693c5c5bbf29d;hb=2c357c1d23b7b83839a9beb8225d4f1ae4f793b4;hp=70ae24158be747159034ca92c2ef0bd2a99e5ab9;hpb=138b23fac84930cdbfada0067c61480989041113;p=lyx.git diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp index 70ae24158b..ab90288c6b 100644 --- a/src/insets/InsetNote.cpp +++ b/src/insets/InsetNote.cpp @@ -14,39 +14,39 @@ #include "InsetNote.h" +#include "Buffer.h" +#include "BufferParams.h" #include "BufferView.h" -#include "LCursor.h" -#include "debug.h" +#include "BufferParams.h" +#include "Counters.h" +#include "Cursor.h" #include "DispatchResult.h" #include "Exporter.h" #include "FuncRequest.h" #include "FuncStatus.h" -#include "gettext.h" +#include "support/gettext.h" #include "LaTeXFeatures.h" -#include "LColor.h" -#include "LyXLex.h" +#include "Lexer.h" #include "MetricsInfo.h" #include "OutputParams.h" -#include "Paragraph.h" +#include "ParIterator.h" +#include "TextClass.h" +#include "TocBackend.h" -#include "support/lyxalgo.h" +#include "support/debug.h" +#include "support/docstream.h" #include "support/Translator.h" +#include #include +using namespace std; namespace lyx { -using std::string; -using std::auto_ptr; -using std::istringstream; -using std::ostream; -using std::ostringstream; - - namespace { -typedef Translator NoteTranslator; +typedef Translator NoteTranslator; typedef Translator NoteTranslatorLoc; NoteTranslator const init_notetranslator() @@ -54,19 +54,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; } @@ -101,7 +97,7 @@ void InsetNoteParams::write(ostream & os) const } -void InsetNoteParams::read(LyXLex & lex) +void InsetNoteParams::read(Lexer & lex) { string label; lex >> label; @@ -110,26 +106,16 @@ void InsetNoteParams::read(LyXLex & lex) } -void InsetNote::init() -{ - setInsetName(from_ascii("Note")); - setButtonLabel(); -} - - InsetNote::InsetNote(BufferParams const & bp, string const & label) : InsetCollapsable(bp) { params_.type = notetranslator().find(label); - init(); } InsetNote::InsetNote(InsetNote const & in) : InsetCollapsable(in), params_(in.params_) -{ - init(); -} +{} InsetNote::~InsetNote() @@ -138,9 +124,9 @@ InsetNote::~InsetNote() } -auto_ptr InsetNote::doClone() const +Inset * InsetNote::clone() const { - return auto_ptr(new InsetNote(*this)); + return new InsetNote(*this); } @@ -150,6 +136,18 @@ docstring const InsetNote::editMessage() const } +docstring InsetNote::name() const +{ + return from_ascii("Note:" + notetranslator().find(params_.type)); +} + + +Inset::DisplayType InsetNote::display() const +{ + return Inline; +} + + void InsetNote::write(Buffer const & buf, ostream & os) const { params_.write(os); @@ -157,11 +155,10 @@ void InsetNote::write(Buffer const & buf, ostream & os) const } -void InsetNote::read(Buffer const & buf, LyXLex & lex) +void InsetNote::read(Buffer const & buf, Lexer & lex) { params_.read(lex); InsetCollapsable::read(buf, lex); - setButtonLabel(); } @@ -169,34 +166,6 @@ void InsetNote::setButtonLabel() { docstring const label = notetranslator_loc().find(params_.type); setLabel(label); - - LyXFont font(LyXFont::ALL_SANE); - font.decSize(); - font.decSize(); - - switch (params_.type) { - case InsetNoteParams::Note: - font.setColor(LColor::note); - setBackgroundColor(LColor::notebg); - break; - case InsetNoteParams::Comment: - font.setColor(LColor::comment); - setBackgroundColor(LColor::commentbg); - break; - case InsetNoteParams::Greyedout: - font.setColor(LColor::greyedout); - setBackgroundColor(LColor::greyedoutbg); - break; - case InsetNoteParams::Framed: - font.setColor(LColor::greyedout); - setBackgroundColor(LColor::greyedoutbg); - break; - case InsetNoteParams::Shaded: - font.setColor(LColor::greyedout); - setBackgroundColor(LColor::shadedbg); - break; - } - setLabelFont(font); } @@ -207,26 +176,19 @@ bool InsetNote::showInsetDialog(BufferView * bv) const } -void InsetNote::doDispatch(LCursor & cur, FuncRequest & cmd) +void InsetNote::doDispatch(Cursor & cur, FuncRequest & cmd) { switch (cmd.action) { case LFUN_INSET_MODIFY: InsetNoteMailer::string2params(to_utf8(cmd.argument()), params_); - setButtonLabel(); + // get a bp from cur: + setLayout(cur.buffer().params()); break; case LFUN_INSET_DIALOG_UPDATE: InsetNoteMailer(*this).updateDialog(&cur.bv()); break; - - case LFUN_MOUSE_RELEASE: - if (cmd.button() == mouse_button::button3 && hitButton(cmd)) - InsetNoteMailer(*this).showDialog(&cur.bv()); - else - InsetCollapsable::doDispatch(cur, cmd); - break; - default: InsetCollapsable::doDispatch(cur, cmd); break; @@ -234,7 +196,7 @@ void InsetNote::doDispatch(LCursor & cur, FuncRequest & cmd) } -bool InsetNote::getStatus(LCursor & cur, FuncRequest const & cmd, +bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus & flag) const { switch (cmd.action) { @@ -249,6 +211,38 @@ bool InsetNote::getStatus(LCursor & 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 +{ + ParConstIterator pit = cpit; + pit.push_back(*this); + + Toc & toc = buf.tocBackend().toc("note"); + docstring str; + str = notetranslator_loc().find(params_.type) + from_ascii(": ") + + getNewLabel(str); + toc.push_back(TocItem(pit, 0, str)); +} + + +bool InsetNote::isMacroScope(Buffer const & buf) const +{ + // LyX note has no latex output + if (params_.type == InsetNoteParams::Note) + return true; + + return InsetCollapsable::isMacroScope(buf); +} + int InsetNote::latex(Buffer const & buf, odocstream & os, OutputParams const & runparams_in) const @@ -257,23 +251,14 @@ int InsetNote::latex(Buffer const & buf, odocstream & os, return 0; OutputParams runparams(runparams_in); - string type; if (params_.type == InsetNoteParams::Comment) { - type = "comment"; runparams.inComment = true; // Ignore files that are exported inside a comment runparams.exportdata.reset(new ExportData); - } else if (params_.type == InsetNoteParams::Greyedout) - type = "lyxgreyedout"; - else if (params_.type == InsetNoteParams::Framed) - type = "framed"; - else if (params_.type == InsetNoteParams::Shaded) - type = "shaded"; + } odocstringstream ss; - ss << "%\n\\begin{" << from_ascii(type) << "}\n"; - InsetText::latex(buf, ss, runparams); - ss << "\n\\end{" << from_ascii(type) << "}\n"; + InsetCollapsable::latex(buf, 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: @@ -292,12 +277,12 @@ int InsetNote::latex(Buffer const & buf, odocstream & os, os << str; runparams_in.encoding = runparams.encoding; // Return how many newlines we issued. - return int(lyx::count(str.begin(), str.end(), '\n')); + return int(count(str.begin(), str.end(), '\n')); } int InsetNote::plaintext(Buffer const & buf, odocstream & os, - OutputParams const & runparams_in) const + OutputParams const & runparams_in) const { if (params_.type == InsetNoteParams::Note) return 0; @@ -308,7 +293,7 @@ int InsetNote::plaintext(Buffer const & buf, odocstream & os, // Ignore files that are exported inside a comment runparams.exportdata.reset(new ExportData); } - os << '[' << _("note") << ":\n"; + os << '[' << buf.B_("note") << ":\n"; InsetText::plaintext(buf, os, runparams); os << "\n]"; @@ -317,7 +302,7 @@ int InsetNote::plaintext(Buffer const & buf, odocstream & os, int InsetNote::docbook(Buffer const & buf, odocstream & os, - OutputParams const & runparams_in) const + OutputParams const & runparams_in) const { if (params_.type == InsetNoteParams::Note) return 0; @@ -337,7 +322,7 @@ int InsetNote::docbook(Buffer const & buf, odocstream & os, // Return how many newlines we issued. //return int(count(str.begin(), str.end(), '\n')); - return n + 1 + 2; + return n + 1 + 2; } @@ -349,12 +334,6 @@ 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); } @@ -391,7 +370,7 @@ void InsetNoteMailer::string2params(string const & in, return; istringstream data(in); - LyXLex lex(0,0); + Lexer lex(0,0); lex.setStream(data); string name; @@ -400,7 +379,7 @@ void InsetNoteMailer::string2params(string const & in, return print_mailer_error("InsetNoteMailer", in, 1, name_); // This is part of the inset proper that is usually swallowed - // by LyXText::readInset + // by Text::readInset string id; lex >> id; if (!lex || id != "Note")