}
-inline void openItemTag(XMLStream & xs, Layout const & lay)
+inline void openItemTag(XMLStream & xs, Layout const & lay,
+ std::string const & parlabel)
{
- xs << xml::StartTag(lay.htmlitemtag(), lay.htmlitemattr(), true);
+ if (lay.htmlitemtag() != "NONE") {
+ string attrs = lay.htmlitemattr();
+ if (!parlabel.empty())
+ attrs += " id='" + parlabel + "'";
+ xs << xml::StartTag(lay.htmlitemtag(), attrs, true);
+ }
}
void openItemTag(XMLStream & xs, Layout const & lay,
- ParagraphParameters const & params)
+ ParagraphParameters const & params,
+ std::string const & parlabel)
{
- // FIXME Are there other things we should handle here?
- string const align = alignmentToCSS(params.align());
- if (align.empty()) {
- openItemTag(xs, lay);
- return;
+ if (lay.htmlitemtag() != "NONE") {
+ // FIXME Are there other things we should handle here?
+ string const align = alignmentToCSS(params.align());
+ if (align.empty()) {
+ openItemTag(xs, lay, parlabel);
+ return;
+ }
+ string attrs = lay.htmlGetAttrString() + " style='text-align: " + align + ";'";
+ if (!parlabel.empty())
+ attrs += " id='" + parlabel + "'";
+ xs << xml::StartTag(lay.htmlitemtag(), attrs);
}
- string attrs = lay.htmlGetAttrString() + " style='text-align: " + align + ";'";
- xs << xml::StartTag(lay.htmlitemtag(), attrs);
}
inline void closeItemTag(XMLStream & xs, Layout const & lay)
{
- xs << xml::EndTag(lay.htmlitemtag());
+ if (lay.htmlitemtag() != "NONE") {
+ xs << xml::EndTag(lay.htmlitemtag());
+ }
}
// end of convenience functions
ParagraphList::const_iterator const begin = text.paragraphs().begin();
ParagraphList::const_iterator par = pbegin;
Layout const & bstyle = par->layout();
- depth_type const origdepth = pbegin->params().depth();
+ depth_type const origdepth = par->params().depth();
+ string const parId = bstyle.htmlitemtag().empty() ? par->magicLabel() : "";
// open tag for this environment
- if (bstyle.labeltype == LABEL_ENUMERATE && bstyle.htmlclass().empty()) {
+ if ((bstyle.labeltype == LABEL_ENUMERATE || bstyle.labeltype == LABEL_ITEMIZE)
+ && bstyle.htmlclass().empty()) {
// In this case, we have to calculate the CSS class ourselves, each time
// through
- // FIXME We assume in these cases that the standard enumeration counter
- // is being used. (We also do not deal with 'resume' counters, though I'm
- // not sure that can be done at all.)
+ // FIXME We assume in these cases that the standard counters are being used.
+ // (We also do not deal with 'resume' counters, though I'm not sure that can
+ // be done at all in HTML.)
- // Code borrowed from Buffer::Impl::setLabel
+ // Code adapted from Buffer::Impl::setLabel
+ bool const isenum = bstyle.labeltype == LABEL_ENUMERATE;
docstring enumcounter = bstyle.counter.empty() ?
- from_ascii("enum") : bstyle.counter;
+ ( isenum ? from_ascii("enum") : from_ascii("lyxitem") ) :
+ bstyle.counter;
switch (par->itemdepth) {
case 2:
enumcounter += 'i';
// not a valid enumdepth...
break;
}
- openParTag(xs, bstyle, to_utf8(enumcounter), pbegin->magicLabel());
+ const string cssClass = string(isenum ? "lyxenum" : "lyxitem") + " "
+ + to_utf8(enumcounter);
+ openParTag(xs, bstyle, cssClass, parId);
}
else
- openParTag(xs, bstyle, pbegin->magicLabel());
+ openParTag(xs, bstyle, parId);
xs << xml::CR();
// we will on occasion need to remember a layout from before.
pos_type sep = 0;
bool const labelfirst = style.htmllabelfirst();
if (!labelfirst)
- openItemTag(xs, style, par->params());
+ openItemTag(xs, style, par->params(), par->magicLabel());
// label output
if (style.labeltype != LABEL_NO_LABEL &&
} // end label output
if (labelfirst)
- openItemTag(xs, style, par->params());
+ openItemTag(xs, style, par->params(), par->magicLabel());
docstring deferred = par->simpleLyXHTMLOnePar(buf, xs, runparams,
text.outerFont(distance(begin, par)), true, true, sep);
buf.masterBuffer()->params().
documentClass().counters().step(style.counter, OutputUpdate);
- bool const make_parid = !runparams.for_toc && runparams.html_make_pars;
-
+ bool const make_parid = !runparams.for_toc && runparams.html_make_pars && style.itemtag().empty();
openParTag(xs, style, pbegin->params(),
make_parid ? pbegin->magicLabel() : "");