mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-12 22:14:35 +00:00
Fix bug #7634. Make sure we clear the tag deque if we are keeping
empty paragraphs. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39153 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
5f172ec678
commit
66920e5b1a
@ -2734,7 +2734,7 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
|
||||
|
||||
Layout const & style = *d->layout_;
|
||||
|
||||
xs.startParagraph();
|
||||
xs.startParagraph(allowEmpty());
|
||||
|
||||
if (!runparams.for_toc && runparams.html_make_pars) {
|
||||
// generate a magic label for this paragraph
|
||||
|
@ -227,7 +227,7 @@ bool XHTMLStream::closeFontTags()
|
||||
return true;
|
||||
curtag = tag_stack_.back();
|
||||
}
|
||||
|
||||
|
||||
if (curtag.tag_ == parsep_tag)
|
||||
return true;
|
||||
|
||||
@ -246,9 +246,11 @@ bool XHTMLStream::closeFontTags()
|
||||
}
|
||||
|
||||
|
||||
void XHTMLStream::startParagraph()
|
||||
void XHTMLStream::startParagraph(bool keep_empty)
|
||||
{
|
||||
pending_tags_.push_back(html::StartTag(parsep_tag));
|
||||
if (keep_empty)
|
||||
clearTagDeque();
|
||||
}
|
||||
|
||||
|
||||
|
@ -103,7 +103,7 @@ public:
|
||||
bool closeFontTags();
|
||||
/// call at start of paragraph. sets a mark so we know what tags
|
||||
/// to close at the end.
|
||||
void startParagraph();
|
||||
void startParagraph(bool keep_empty);
|
||||
/// call at end of paragraph to clear that mark. note that this
|
||||
/// will also close any tags still open.
|
||||
void endParagraph();
|
||||
|
@ -101,6 +101,8 @@ What's new
|
||||
|
||||
- Fixed XHTML output for tables that use multirow.
|
||||
|
||||
- Fix problem with XHTML output of blank paragraph (bug 7634).
|
||||
|
||||
- Fixed export to plaintext of, as well as searching within,
|
||||
a document containing aligned and other multi-cell environments
|
||||
(bug 7549).
|
||||
|
Loading…
Reference in New Issue
Block a user