X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNote.cpp;h=a7a0dc16abf0fad7856075ad085271d6f600d724;hb=f24bb4a91980a17c00c12ec0bbb457e0f182215f;hp=87dfdf2f430934cead0d19435ba630f2d3c092b0;hpb=75bfed55079cab6b73fbea6ce4ae3f10d1af3b91;p=lyx.git diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp index 87dfdf2f43..a7a0dc16ab 100644 --- a/src/insets/InsetNote.cpp +++ b/src/insets/InsetNote.cpp @@ -17,22 +17,18 @@ #include "Buffer.h" #include "BufferParams.h" #include "BufferView.h" -#include "BufferParams.h" #include "ColorSet.h" -#include "Counters.h" #include "Cursor.h" -#include "DispatchResult.h" #include "Exporter.h" +#include "FontInfo.h" #include "FuncRequest.h" #include "FuncStatus.h" -#include "InsetIterator.h" +#include "InsetLayout.h" #include "LaTeXFeatures.h" #include "Lexer.h" #include "LyXRC.h" -#include "OutputParams.h" -#include "ParIterator.h" -#include "TextClass.h" -#include "TocBackend.h" +#include "output_docbook.h" +#include "output_latex.h" #include "support/debug.h" #include "support/docstream.h" @@ -69,7 +65,7 @@ NoteTranslator const & notetranslator() } -} // anon +} // namespace InsetNoteParams::InsetNoteParams() @@ -100,7 +96,7 @@ void InsetNoteParams::read(Lexer & lex) ///////////////////////////////////////////////////////////////////// InsetNote::InsetNote(Buffer * buf, string const & label) - : InsetCollapsable(buf) + : InsetCollapsible(buf) { params_.type = notetranslator().find(label); } @@ -118,23 +114,17 @@ docstring InsetNote::layoutName() const } -Inset::DisplayType InsetNote::display() const -{ - return Inline; -} - - void InsetNote::write(ostream & os) const { params_.write(os); - InsetCollapsable::write(os); + InsetCollapsible::write(os); } void InsetNote::read(Lexer & lex) { params_.read(lex); - InsetCollapsable::read(lex); + InsetCollapsible::read(lex); } @@ -176,7 +166,7 @@ void InsetNote::doDispatch(Cursor & cur, FuncRequest & cmd) break; default: - InsetCollapsable::doDispatch(cur, cmd); + InsetCollapsible::doDispatch(cur, cmd); break; } } @@ -188,9 +178,6 @@ 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); @@ -203,7 +190,7 @@ bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd, return true; default: - return InsetCollapsable::getStatus(cur, cmd, flag); + return InsetCollapsible::getStatus(cur, cmd, flag); } } @@ -214,17 +201,34 @@ bool InsetNote::isMacroScope() const if (params_.type == InsetNoteParams::Note) return true; - return InsetCollapsable::isMacroScope(); + return InsetCollapsible::isMacroScope(); } void InsetNote::latex(otexstream & os, OutputParams const & runparams_in) const { - if (params_.type == InsetNoteParams::Note) + if (params_.type != InsetNoteParams::Greyedout + && runparams_in.find_effective() + && !runparams_in.find_with_non_output()) return; + if (params_.type == InsetNoteParams::Note) { + if (runparams_in.find_with_non_output()) { + OutputParams runparams(runparams_in); + InsetCollapsible::latex(os, runparams); + runparams_in.encoding = runparams.encoding; + } + return; + } + OutputParams runparams(runparams_in); if (params_.type == InsetNoteParams::Comment) { + if (runparams_in.inComment) { + // Nested comments should just output the contents. + latexParagraphs(buffer(), text(), os, runparams); + return; + } + runparams.inComment = true; // Ignore files that are exported inside a comment runparams.exportdata.reset(new ExportData); @@ -245,7 +249,7 @@ void InsetNote::latex(otexstream & os, OutputParams const & runparams_in) const // 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); + InsetCollapsible::latex(os, runparams); runparams_in.encoding = runparams.encoding; } @@ -254,53 +258,61 @@ void InsetNote::latex(otexstream & 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; + if (!runparams_in.find_with_non_output()) { + if (params_.type == InsetNoteParams::Note) + return 0; + else if (params_.type == InsetNoteParams::Comment + && runparams_in.find_effective()) + return 0; + } OutputParams runparams(runparams_in); - if (params_.type == InsetNoteParams::Comment) { + if (params_.type != InsetNoteParams::Greyedout) { runparams.inComment = true; // Ignore files that are exported inside a comment runparams.exportdata.reset(new ExportData); } - os << '[' << buffer().B_("note") << ":\n"; + if (!runparams_in.find_with_non_output()) + os << '[' << buffer().B_("note") << ":\n"; InsetText::plaintext(os, runparams, max_length); - os << "\n]"; + if (!runparams_in.find_with_non_output()) + os << "\n]"; return PLAINTEXT_NEWLINE + 1; // one char on a separate line } -int InsetNote::docbook(odocstream & os, OutputParams const & runparams_in) const +void InsetNote::docbook(XMLStream & xs, OutputParams const & runparams_in) const { if (params_.type == InsetNoteParams::Note) - return 0; + return; OutputParams runparams(runparams_in); if (params_.type == InsetNoteParams::Comment) { - os << "\n"; + xs << xml::StartTag("remark"); + xs << xml::CR(); runparams.inComment = true; // Ignore files that are exported inside a comment runparams.exportdata.reset(new ExportData); } + // Greyed out text is output as such (no way to mark text as greyed out with DocBook). - int const n = InsetText::docbook(os, runparams); - - if (params_.type == InsetNoteParams::Comment) - os << "\n\n"; + InsetText::docbook(xs, runparams); - // Return how many newlines we issued. - //return int(count(str.begin(), str.end(), '\n')); - return n + 1 + 2; + if (params_.type == InsetNoteParams::Comment) { + xs << xml::CR(); + xs << xml::EndTag("remark"); + xs << xml::CR(); + } } -docstring InsetNote::xhtml(XHTMLStream & xs, OutputParams const & rp) const +docstring InsetNote::xhtml(XMLStream & xs, OutputParams const & rp) const { if (params_.type == InsetNoteParams::Note) return docstring(); - return InsetCollapsable::xhtml(xs, rp); + return InsetCollapsible::xhtml(xs, rp); } @@ -308,16 +320,18 @@ void InsetNote::validate(LaTeXFeatures & features) const { switch (params_.type) { case InsetNoteParams::Comment: - if (features.runparams().flavor == OutputParams::HTML) + if (features.runparams().flavor == Flavor::Html) // we do output this but set display to "none" by default, // but people might want to use it. - InsetCollapsable::validate(features); + InsetCollapsible::validate(features); else // Only do the requires features.useInsetLayout(getLayout()); break; case InsetNoteParams::Greyedout: - InsetCollapsable::validate(features); + if (features.hasRTLLanguage()) + features.require("environ"); + InsetCollapsible::validate(features); break; case InsetNoteParams::Note: break; @@ -338,12 +352,15 @@ bool InsetNote::allowSpellCheck() const 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")) { + && buffer().params().isnotefontcolor) { ColorCode c = lcolor.getFromLyXName("notefontcolor"); if (c != Color_none) font.setColor(c); + // This is the local color (not overridden by other documents) + ColorCode lc = lcolor.getFromLyXName("notefontcolor@" + buffer().fileName().absFileName()); + if (lc != Color_none) + font.setPaintColor(lc); } return font; }