anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 21:05:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #7634. Make sure we clear the tag deque if we are keeping

Browse Source 
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:
Richard Heck 2011-06-20 16:10:21 +00:00
parent 5f172ec678
commit 66920e5b1a
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Paragraph.cpp
View File

@ -2734,7 +2734,7 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
Layout const & style = *d->layout_; Layout const & style = *d->layout_;
xs.startParagraph(); xs.startParagraph(allowEmpty());
if (!runparams.for_toc && runparams.html_make_pars) { if (!runparams.for_toc && runparams.html_make_pars) {
// generate a magic label for this paragraph // generate a magic label for this paragraph

4
src/output_xhtml.cpp
View File

@ -246,9 +246,11 @@ bool XHTMLStream::closeFontTags()
} }
void XHTMLStream::startParagraph() void XHTMLStream::startParagraph(bool keep_empty)
{ {
pending_tags_.push_back(html::StartTag(parsep_tag)); pending_tags_.push_back(html::StartTag(parsep_tag));
if (keep_empty)
clearTagDeque();
} }

2
src/output_xhtml.h
View File

@ -103,7 +103,7 @@ public:
bool closeFontTags(); bool closeFontTags();
/// call at start of paragraph. sets a mark so we know what tags /// call at start of paragraph. sets a mark so we know what tags
/// to close at the end. /// to close at the end.
void startParagraph(); void startParagraph(bool keep_empty);
/// call at end of paragraph to clear that mark. note that this /// call at end of paragraph to clear that mark. note that this
/// will also close any tags still open. /// will also close any tags still open.
void endParagraph(); void endParagraph();

2
status.20x
View File

@ -101,6 +101,8 @@ What's new
- Fixed XHTML output for tables that use multirow. - 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, - Fixed export to plaintext of, as well as searching within,
a document containing aligned and other multi-cell environments a document containing aligned and other multi-cell environments
(bug 7549). (bug 7549).