#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"
}
-} // anon
+} // namespace
InsetNoteParams::InsetNoteParams()
/////////////////////////////////////////////////////////////////////
InsetNote::InsetNote(Buffer * buf, string const & label)
- : InsetCollapsable(buf)
+ : InsetCollapsible(buf)
{
params_.type = notetranslator().find(label);
}
}
-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);
}
break;
default:
- InsetCollapsable::doDispatch(cur, cmd);
+ InsetCollapsible::doDispatch(cur, cmd);
break;
}
}
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);
return true;
default:
- return InsetCollapsable::getStatus(cur, cmd, flag);
+ return InsetCollapsible::getStatus(cur, cmd, flag);
}
}
-void InsetNote::addToToc(DocIterator const & cpit, bool output_active,
- UpdateType utype) const
-{
- DocIterator pit = cpit;
- pit.push_back(CursorSlice(const_cast<InsetNote &>(*this)));
-
- InsetLayout const & il = getLayout();
- docstring str;
- text().forOutliner(str, TOC_ENTRY_LENGTH);
- str = translateIfPossible(il.labelstring()) + ": " + str;
-
- shared_ptr<Toc> toc = buffer().tocBackend().toc("note");
- toc->push_back(TocItem(pit, 0, str, output_active));
-
- // Proceed with the rest of the inset.
- bool doing_output = output_active && producesOutput();
- InsetCollapsable::addToToc(cpit, doing_output, utype);
-}
-
-
bool InsetNote::isMacroScope() const
{
// LyX note has no latex output
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);
- }
+ }
// 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
// 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;
}
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 << "<remark>\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);
+ InsetText::docbook(xs, runparams);
- if (params_.type == InsetNoteParams::Comment)
- os << "\n</remark>\n";
-
- // 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);
}
{
switch (params_.type) {
case InsetNoteParams::Comment:
- features.require("verbatim");
- 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:
- features.require("color");
- features.require("lyxgreyedout");
- InsetCollapsable::validate(features);
+ if (features.hasRTLLanguage())
+ features.require("environ");
+ InsetCollapsible::validate(features);
break;
case InsetNoteParams::Note:
break;
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;
}
projects / lyx.git / blobdiff