anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix listings XHTML output: No paragraphs in there.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33096 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-01-19 19:11:12 +00:00
parent b9e7bd033c
commit 557c705cbb
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Paragraph.cpp
View File

@ -2406,7 +2406,7 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
Layout const & style = *d->layout_;
if (!runparams.for_toc) {
if (!runparams.for_toc && runparams.html_make_pars) {
// generate a magic label for this paragraph
string const attr = "id='" + magicLabel() + "'";
xs << CompTag("a", attr);

2
src/insets/InsetListings.cpp
View File

@ -287,7 +287,7 @@ docstring InsetListings::xhtml(XHTMLStream & os, OutputParams const & rp) const
out << StartTag("pre");
OutputParams newrp = rp;
newrp.html_disable_captions = true;
docstring def = InsetText::xhtml(out, newrp);
docstring def = InsetText::insetAsXHTML(out, newrp, InsetText::JustText);
out << EndTag("pre");
if (isInline) {

9
src/insets/InsetText.cpp
View File

@ -520,13 +520,10 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & runpara
if (opts & WriteInnerTag)
xs << StartTag(il.htmlinnertag(), il.htmlinnerattr());
if (il.isMultiPar())
xhtmlParagraphs(text_, buffer(), xs, runparams);
else {
OutputParams ours = runparams;
OutputParams ours = runparams;
if (!il.isMultiPar() || opts == JustText)
ours.html_make_pars = false;
xhtmlParagraphs(text_, buffer(), xs, ours);
}
xhtmlParagraphs(text_, buffer(), xs, ours);
if (opts & WriteInnerTag)
xs << EndTag(il.htmlinnertag());
if (opts & WriteOuterTag)