anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-07 02:28:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

XHTML: remove deferred text in InsetListings, fixing 12007.

Browse Source
This commit is contained in:
Thibaut Cuvelier 2023-07-27 03:12:56 +02:00 committed by Pavel Sanda
parent 98d1b04160
commit 9a163399fb
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/insets/InsetListings.cpp
View File

@ -440,48 +440,42 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
docstring InsetListings::xhtml(XMLStream & os, OutputParams const & rp) const
{
odocstringstream ods;
XMLStream out(ods);
bool const isInline = params().isInline();
if (isInline)
out << xml::CompTag("br");
os << xml::CompTag("br");
else {
out << xml::StartTag("div", "class='float-listings'");
os << xml::StartTag("div", "class='float-listings'");
docstring caption = getCaptionHTML(rp);
if (!caption.empty())
out << xml::StartTag("div", "class='listings-caption'")
<< XMLStream::ESCAPE_NONE
<< caption << xml::EndTag("div");
os << xml::StartTag("div", "class='listings-caption'")
<< XMLStream::ESCAPE_NONE
<< caption << xml::EndTag("div");
}
InsetLayout const & il = getLayout();
string const & tag = il.htmltag();
string attr = "class ='listings";
string const & tag = getLayout().htmltag();
string attr = "class='listings";
string const lang = params().getParamValue("language");
if (!lang.empty())
attr += " " + lang;
attr += "'";
out << xml::StartTag(tag, attr);
os << xml::StartTag(tag, attr);
OutputParams newrp = rp;
newrp.html_disable_captions = true;
// We don't want to convert dashes here. That's the only conversion we
// do for XHTML, so this is safe.
newrp.pass_thru = true;
docstring def = InsetText::insetAsXHTML(out, newrp, InsetText::JustText);
out << xml::EndTag(tag);
docstring def = InsetText::insetAsXHTML(os, newrp, InsetText::JustText);
os << xml::EndTag(tag);
if (isInline) {
out << xml::CompTag("br");
// escaping will already have been done
os << XMLStream::ESCAPE_NONE << ods.str();
os << xml::CompTag("br");
} else {
out << xml::EndTag("div");
// In this case, this needs to be deferred, but we'll put it
// before anything the text itself deferred.
def = ods.str() + '\n' + def;
if (!def.empty()) {
os << '\n' << def;
}
os << xml::EndTag("div");
}
return def;
return {};
}