X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetnote.C;h=b840955032cdb0b16831769f57f38ed2e1158825;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=02c819a24786a29fef9fef1716b628f0ee0377f6;hpb=3b9338a3a8ba33fbbdf2c77cbffb3ff50d8fad86;p=lyx.git diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C index 02c819a247..b840955032 100644 --- a/src/insets/insetnote.C +++ b/src/insets/insetnote.C @@ -34,6 +34,9 @@ #include + +namespace lyx { + using std::string; using std::auto_ptr; using std::istringstream; @@ -44,31 +47,40 @@ using std::ostringstream; namespace { typedef Translator NoteTranslator; +typedef Translator NoteTranslatorLoc; -NoteTranslator const init_notetranslator() { +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; } -NoteTranslator const init_notetranslator_loc() { - NoteTranslator translator(_("Note"), InsetNoteParams::Note); +NoteTranslatorLoc const init_notetranslator_loc() +{ + NoteTranslatorLoc translator(_("Note"), 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; } -NoteTranslator const & notetranslator() { +NoteTranslator const & notetranslator() +{ static NoteTranslator translator = init_notetranslator(); return translator; } -NoteTranslator const & notetranslator_loc() { - static NoteTranslator translator = init_notetranslator_loc(); +NoteTranslatorLoc const & notetranslator_loc() +{ + static NoteTranslatorLoc translator = init_notetranslator_loc(); return translator; } @@ -100,7 +112,7 @@ void InsetNoteParams::read(LyXLex & lex) void InsetNote::init() { - setInsetName("Note"); + setInsetName(from_ascii("Note")); setButtonLabel(); } @@ -132,7 +144,7 @@ auto_ptr InsetNote::doClone() const } -string const InsetNote::editMessage() const +docstring const InsetNote::editMessage() const { return _("Opened Note Inset"); } @@ -155,7 +167,7 @@ void InsetNote::read(Buffer const & buf, LyXLex & lex) void InsetNote::setButtonLabel() { - string const label = notetranslator_loc().find(params_.type); + docstring const label = notetranslator_loc().find(params_.type); setLabel(label); LyXFont font(LyXFont::ALL_SANE); @@ -175,6 +187,14 @@ void InsetNote::setButtonLabel() 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); } @@ -192,7 +212,7 @@ void InsetNote::doDispatch(LCursor & cur, FuncRequest & cmd) switch (cmd.action) { case LFUN_INSET_MODIFY: - InsetNoteMailer::string2params(cmd.argument, params_); + InsetNoteMailer::string2params(to_utf8(cmd.argument()), params_); setButtonLabel(); break; @@ -230,7 +250,7 @@ bool InsetNote::getStatus(LCursor & cur, FuncRequest const & cmd, } -int InsetNote::latex(Buffer const & buf, ostream & os, +int InsetNote::latex(Buffer const & buf, odocstream & os, OutputParams const & runparams_in) const { if (params_.type == InsetNoteParams::Note) @@ -245,74 +265,62 @@ int InsetNote::latex(Buffer const & buf, ostream & os, 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"; - ostringstream ss; - ss << "%\n\\begin{" << type << "}\n"; + odocstringstream ss; + ss << "%\n\\begin{" << from_ascii(type) << "}\n"; InsetText::latex(buf, ss, runparams); - ss << "%\n\\end{" << type << "}\n"; - - string const str = ss.str(); - os << str; - // Return how many newlines we issued. - return int(lyx::count(str.begin(), str.end(),'\n')); -} - - -int InsetNote::linuxdoc(Buffer const & buf, std::ostream & os, - OutputParams const & runparams_in) const -{ - if (params_.type == InsetNoteParams::Note) - return 0; - - OutputParams runparams(runparams_in); - ostringstream ss; - if (params_.type == InsetNoteParams::Comment) { - ss << "\n"; - runparams.inComment = true; - // Ignore files that are exported inside a comment - runparams.exportdata.reset(new ExportData); - } - - InsetText::linuxdoc(buf, ss, runparams); - + ss << "\n\\end{" << from_ascii(type) << "}\n"; + // 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: + // + // a% + // \begin{comment} + // comment + // \end{comment} + // b + // + // Adding {} before ' b' fixes this. if (params_.type == InsetNoteParams::Comment) - ss << "\n\n"; + ss << "{}"; - string const str = ss.str(); + docstring const str = ss.str(); os << str; // Return how many newlines we issued. - return int(lyx::count(str.begin(), str.end(),'\n')); + return int(lyx::count(str.begin(), str.end(), '\n')); } -int InsetNote::docbook(Buffer const & buf, std::ostream & os, +int InsetNote::docbook(Buffer const & buf, odocstream & os, OutputParams const & runparams_in) const { if (params_.type == InsetNoteParams::Note) return 0; OutputParams runparams(runparams_in); - ostringstream ss; if (params_.type == InsetNoteParams::Comment) { - ss << "\n"; + os << "\n"; runparams.inComment = true; // Ignore files that are exported inside a comment runparams.exportdata.reset(new ExportData); } - InsetText::docbook(buf, ss, runparams); + int const n = InsetText::docbook(buf, os, runparams); if (params_.type == InsetNoteParams::Comment) - ss << "\n\n"; + os << "\n\n"; - string const str = ss.str(); - os << str; // Return how many newlines we issued. - return int(lyx::count(str.begin(), str.end(),'\n')); + //return int(count(str.begin(), str.end(), '\n')); + return n + 1 + 2; } -int InsetNote::plaintext(Buffer const & buf, std::ostream & os, +int InsetNote::plaintext(Buffer const & buf, odocstream & os, OutputParams const & runparams_in) const { if (params_.type == InsetNoteParams::Note) @@ -324,15 +332,12 @@ int InsetNote::plaintext(Buffer const & buf, std::ostream & os, // Ignore files that are exported inside a comment runparams.exportdata.reset(new ExportData); } - ostringstream ss; - ss << "["; - InsetText::plaintext(buf, ss, runparams); - ss << "]"; + os << "["; + int const nlines = InsetText::plaintext(buf, os, runparams); + os << "]"; - string const str = ss.str(); - os << str; // Return how many newlines we issued. - return int(lyx::count(str.begin(), str.end(),'\n')); + return nlines; } @@ -344,6 +349,12 @@ 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); } @@ -397,3 +408,6 @@ void InsetNoteMailer::string2params(string const & in, params.read(lex); } + + +} // namespace lyx