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

Fix XHTML export of German Additional Features manual.

Browse Source 
There was an oddity in the manual that exposed a problem with the
test for the "special case" of an inset all by itself in a pargraph.
If a font change is applied to that inset, we still need to open the
paragraph.

(cherry picked from commit 3be23d18b6)
This commit is contained in:
Richard Heck 2016-08-04 22:43:17 -04:00
parent 928c7a3d68
commit 50162ebb1e
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/output_xhtml.cpp
View File

@ -842,12 +842,28 @@ ParagraphList::const_iterator makeParagraphs(Buffer const & buf,
// (i) the current layout permits multiple paragraphs
// (ii) we are either not already inside a paragraph (HTMLIsBlock) OR
// we are, but this is not the first paragraph
// But we do not want to open the paragraph tag if this paragraph contains
//
// But there is also a special case, and we first see whether we are in it.
// We do not want to open the paragraph tag if this paragraph contains
// only one item, and that item is "inline", i.e., not HTMLIsBlock (such
// as a branch). That is the "special case" we handle first.
// as a branch). On the other hand, if that single item has a font change
// applied to it, then we still do need to open the paragraph.
//
// Obviously, this is very fragile. The main reason we need to do this is
// because of branches, e.g., a branch that contains an entire new section.
// We do not really want to wrap that whole thing in a <div>...</div>.
bool special_case = false;
Inset const * specinset = par->size() == 1 ? par->getInset(0) : 0;
bool const special_case =
specinset && !specinset->getLayout().htmlisblock();
if (specinset && !specinset->getLayout().htmlisblock()) {
Layout const & style = par->layout();
FontInfo const first_font = style.labeltype == LABEL_MANUAL ?
style.labelfont : style.font;
FontInfo const our_font =
par->getFont(buf.masterBuffer()->params(), 0,
text.outerFont(distance(begin, par))).fontInfo();
if (first_font == our_font)
special_case = true;
}
bool const opened = runparams.html_make_pars
&& (!runparams.html_in_par || par != pbegin)

2
status.22x
View File

@ -109,6 +109,8 @@ What's new
- Fix display of cases and matrices (bugs 8753, 8755).
- Fixed output of logos to the TOC.
* TEX2LYX