case FT_DBAR:
return "u";
case FT_SOUT:
+ case FT_XOUT:
return "del";
case FT_ITALIC:
return "i";
return "";
case FT_DBAR:
return "class='dline'";
+ case FT_XOUT:
case FT_SOUT:
return "class='strikeout'";
case FT_WAVE:
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.
//
|| (!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);
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);