anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 22:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Amend bcad19e504

Browse Source 
Allow searching in notes and comments if non-output-content is true
This commit is contained in:
Juergen Spitzmueller 2022-04-02 11:19:55 +02:00
parent 50374e38e1
commit d96135a9dc
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/insets/InsetNote.cpp
View File

@ -206,9 +206,19 @@ bool InsetNote::isMacroScope() const
void InsetNote::latex(otexstream & os, OutputParams const & runparams_in) const
{
if (params_.type == InsetNoteParams::Note)
if (params_.type != InsetNoteParams::Greyedout
&& (runparams_in.for_searchAdv & OutputParams::SearchNonOutput) == 0)
return;
if (params_.type == InsetNoteParams::Note) {
if ((runparams_in.for_searchAdv & OutputParams::SearchNonOutput) != 0) {
OutputParams runparams(runparams_in);
InsetCollapsible::latex(os, runparams);
runparams_in.encoding = runparams.encoding;
}
return;
}
OutputParams runparams(runparams_in);
if (params_.type == InsetNoteParams::Comment) {
runparams.inComment = true;

6
src/insets/InsetText.cpp
View File

@ -485,12 +485,6 @@ void InsetText::latex(otexstream & os, OutputParams const & runparams) const
// environment. Standard collapsible insets should not
// redefine this, non-standard ones may call this.
InsetLayout const & il = getLayout();
if (runparams.for_searchAdv != OutputParams::NoSearch &&
(runparams.for_searchAdv & OutputParams::SearchNonOutput) == 0 &&
!il.latexname().empty() &&
il.latextype() == InsetLaTeXType::ENVIRONMENT &&
il.latexname() == "comment")
return;
if (il.forceOwnlines())
os << breakln;