From 557c705cbbdac68451527ebb4edea41eef584d8a Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Tue, 19 Jan 2010 19:11:12 +0000 Subject: [PATCH] Fix listings XHTML output: No paragraphs in there. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33096 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/Paragraph.cpp | 2 +- src/insets/InsetListings.cpp | 2 +- src/insets/InsetText.cpp | 9 +++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index c357fcda2b..b568a93e0b 100644 --- a/src/Paragraph.cpp +++ b/src/Paragraph.cpp @@ -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); diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp index e20d3c76df..ba7de456e1 100644 --- a/src/insets/InsetListings.cpp +++ b/src/insets/InsetListings.cpp @@ -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) { diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp index 3c85bfd470..cb6734aa67 100644 --- a/src/insets/InsetText.cpp +++ b/src/insets/InsetText.cpp @@ -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) -- 2.39.2