// we haven't had any content
return true;
+#ifdef XHTML_DEBUG
+ dumpTagStack("Beging Close Font Tags");
+#endif
+
// this may be a useless check, since we ought at least to have
// the parsep_tag. but it can't hurt too much to be careful.
if (tag_stack_.empty())
tag_stack_.pop_back();
// this shouldn't happen, since then the font tags
// weren't in any other tag.
- LBUFERR(!tag_stack_.empty());
+ LASSERT(!tag_stack_.empty(), return true);
curtag = tag_stack_.back();
}
+#ifdef XHTML_DEBUG
+ dumpTagStack("End Close Font Tags");
+#endif
+
if (*curtag == parsep_tag)
return true;
}
-void XHTMLStream::startParagraph(bool keep_empty)
+void XHTMLStream::startDivision(bool keep_empty)
{
pending_tags_.push_back(makeTagPtr(html::StartTag(parsep_tag)));
if (keep_empty)
clearTagDeque();
+#ifdef XHTML_DEBUG
+ dumpTagStack("StartDivision");
+#endif
}
-void XHTMLStream::endParagraph()
+void XHTMLStream::endDivision()
{
if (isTagPending(parsep_tag)) {
// this case is normal. it just means we didn't have content,
if (*cur_tag == parsep_tag)
break;
}
+
+#ifdef XHTML_DEBUG
+ dumpTagStack("EndDivision");
+#endif
+
return;
}
if (!isTagOpen(parsep_tag)) {
- writeError("No paragraph separation tag found in endParagraph().");
+ writeError("No division separation tag found in endDivision().");
return;
}
writeError("Tag `" + cur_tag->tag_ + "' still open at end of paragraph. Closing.");
os_ << cur_tag->writeEndTag();
}
+
+#ifdef XHTML_DEBUG
+ dumpTagStack("EndDivision");
+#endif
}
// (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
+ bool const open_par = runparams.html_make_pars
&& (!runparams.html_in_par || par != pbegin)
&& !special_case;
// but we are in the first par, and there is a next par.
ParagraphList::const_iterator nextpar = par;
++nextpar;
- bool const needclose =
- (opened && (!runparams.html_in_par || nextpar != pend))
- || (!opened && runparams.html_in_par && par == pbegin && nextpar != pend);
+ bool const close_par =
+ (open_par && (!runparams.html_in_par || nextpar != pend))
+ || (!open_par && runparams.html_in_par && par == pbegin && nextpar != pend);
- if (opened) {
+ if (open_par) {
// We do not issue the paragraph id if we are doing
// this for the TOC (or some similar purpose)
openParTag(xs, lay, par->params(),
docstring const deferred = par->simpleLyXHTMLOnePar(buf, xs,
runparams, text.outerFont(distance(begin, par)),
- opened, needclose);
+ open_par, close_par);
- if (!deferred.empty()) {
- xs << XHTMLStream::ESCAPE_NONE << deferred << html::CR();
- }
- if (needclose) {
+ if (close_par) {
closeTag(xs, lay);
xs << html::CR();
}
+
+ if (!deferred.empty()) {
+ xs << XHTMLStream::ESCAPE_NONE << deferred << html::CR();
+ }
}
return pend;
}
if (labelfirst)
openItemTag(xs, style, par->params());
- par->simpleLyXHTMLOnePar(buf, xs, runparams,
+ docstring deferred = par->simpleLyXHTMLOnePar(buf, xs, runparams,
text.outerFont(distance(begin, par)), true, true, sep);
+ xs << XHTMLStream::ESCAPE_NONE << deferred;
++par;
// We may not want to close the tag yet, in particular: