namespace {
// an illegal tag for internal use
static html::StartTag const parsep_tag("&LyX_parsep_tag&");
-}
+} // namespace
bool XHTMLStream::closeFontTags()
#ifdef XHTML_DEBUG
dumpTagStack("End Close Font Tags");
#endif
-
+
if (*curtag == parsep_tag)
return true;
#ifdef XHTML_DEBUG
dumpTagStack("EndDivision");
#endif
-
+
return;
}
//
// 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
+ // only one item, and that item is "inline", i.e., not HTMLIsBlock (such
// 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.
//
// 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;
+ Inset const * specinset = par->size() == 1 ? par->getInset(0) : nullptr;
if (specinset && !specinset->getLayout().htmlisblock()) {
Layout const & style = par->layout();
FontInfo const first_font = style.labeltype == LABEL_MANUAL ?
|| (!open_par && runparams.html_in_par && par == pbegin && nextpar != pend);
if (open_par) {
- // We do not issue the paragraph id if we are doing
+ // We do not issue the paragraph id if we are doing
// this for the TOC (or some similar purpose)
openParTag(xs, lay, par->params(),
runparams.for_toc ? "" : par->magicLabel());
}
- docstring const deferred = par->simpleLyXHTMLOnePar(buf, xs,
+ docstring const deferred = par->simpleLyXHTMLOnePar(buf, xs,
runparams, text.outerFont(distance(begin, par)),
open_par, close_par);
xs << html::CR();
// we will on occasion need to remember a layout from before.
- Layout const * lastlay = 0;
+ Layout const * lastlay = nullptr;
while (par != pend) {
Layout const & style = par->layout();
// started---which we will be if the depth is the same.
if (par->params().depth() == origdepth) {
LATTEST(bstyle == style);
- if (lastlay != 0) {
+ if (lastlay != nullptr) {
closeItemTag(xs, *lastlay);
- lastlay = 0;
+ lastlay = nullptr;
}
// this will be positive, if we want to skip the
}
}
- if (lastlay != 0)
+ if (lastlay != nullptr)
closeItemTag(xs, *lastlay);
closeTag(xs, bstyle);
xs << html::CR();
documentClass().counters().step(style.counter, OutputUpdate);
bool const make_parid = !runparams.for_toc && runparams.html_make_pars;
-
- if (style.labeltype == LABEL_ABOVE)
- xs << html::StartTag("div")
- << pbegin->params().labelString()
- << html::EndTag("div");
- else if (style.labeltype == LABEL_CENTERED)
- xs << html::StartTag("div", "style = \"text-align: center;\"")
- << pbegin->params().labelString()
- << html::EndTag("div");
openParTag(xs, style, pbegin->params(),
make_parid ? pbegin->magicLabel() : "");
// Label around sectioning number:
// FIXME Probably need to account for LABEL_MANUAL
- if (style.labeltype != LABEL_NO_LABEL &&
- style.labeltype != LABEL_ABOVE &&
- style.labeltype != LABEL_CENTERED ) {
+ // FIXME Probably also need now to account for labels ABOVE and CENTERED.
+ if (style.labeltype != LABEL_NO_LABEL) {
openLabelTag(xs, style);
xs << pbegin->params().labelString();
closeLabelTag(xs, style);
OutputParams ourparams = runparams;
ParagraphList::const_iterator const pend =
(epit == (int) paragraphs.size()) ?
- paragraphs.end() : paragraphs.constIterator(epit);
+ paragraphs.end() : paragraphs.iterator_at(epit);
while (bpit < epit) {
- ParagraphList::const_iterator par = paragraphs.constIterator(bpit);
+ ParagraphList::const_iterator par = paragraphs.iterator_at(bpit);
if (par->params().startOfAppendix()) {
// We want to reset the counter corresponding to toplevel sectioning
Layout const & lay =