#include "Lexer.h"
#include "LyXRC.h"
#include "output_docbook.h"
+#include "output_latex.h"
#include "support/debug.h"
#include "support/docstream.h"
void InsetNote::latex(otexstream & os, OutputParams const & runparams_in) const
{
if (params_.type != InsetNoteParams::Greyedout
- && runparams_in.for_searchAdv != OutputParams::NoSearch
- && (runparams_in.for_searchAdv & OutputParams::SearchNonOutput) == 0)
+ && runparams_in.find_effective()
+ && !runparams_in.find_with_non_output())
return;
if (params_.type == InsetNoteParams::Note) {
- if ((runparams_in.for_searchAdv & OutputParams::SearchNonOutput) != 0) {
+ if (runparams_in.find_with_non_output()) {
OutputParams runparams(runparams_in);
InsetCollapsible::latex(os, runparams);
runparams_in.encoding = runparams.encoding;
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);
int InsetNote::plaintext(odocstringstream & os,
OutputParams const & runparams_in, size_t max_length) const
{
- if (params_.type == InsetNoteParams::Note
- && (runparams_in.for_searchAdv & OutputParams::SearchNonOutput) == 0)
- 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);
}
- if ((runparams_in.for_searchAdv & OutputParams::SearchNonOutput) == 0)
+ if (!runparams_in.find_with_non_output())
os << '[' << buffer().B_("note") << ":\n";
InsetText::plaintext(os, runparams, max_length);
- if ((runparams_in.for_searchAdv & OutputParams::SearchNonOutput) == 0)
+ if (!runparams_in.find_with_non_output())
os << "\n]";
return PLAINTEXT_NEWLINE + 1; // one char on a separate line