The CSS for lists isn't quite right, but I'm not sure what to do.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29984
a592a061-630c-0410-9148-
cb99ea01b6c8
LabelFont
Series Bold
EndFont
LabelFont
Series Bold
EndFont
- HTMLTag ol
- HTMLItem li
- HTMLLabel span
- HTMLLabelAttr class='desc'
+ HTMLTag dl
+ HTMLAttr class='description'
+ HTMLItem dd
+ HTMLLabel dt
+ HTMLLabelFirst 1
+ HTMLStyle
+ dl.description dt { font-weight: bold; }
+ EndHTMLStyle
pass_thru = false;
toclevel = NOT_IN_TOC;
commanddepth = 0;
pass_thru = false;
toclevel = NOT_IN_TOC;
commanddepth = 0;
+ htmllabelfirst_ = false;
bool const opened = html::openTag(os, il.htmltag(), il.htmlattr());
if (!il.counter().empty()) {
// FIXME Master buffer?
bool const opened = html::openTag(os, il.htmltag(), il.htmlattr());
if (!il.counter().empty()) {
// FIXME Master buffer?
Counters & cntrs = buffer().params().documentClass().counters();
cntrs.step(il.counter());
if (!il.htmllabel().empty())
Counters & cntrs = buffer().params().documentClass().counters();
cntrs.step(il.counter());
if (!il.htmllabel().empty())
closeItemTag(os, *lastlay);
lastlay = 0;
}
closeItemTag(os, *lastlay);
lastlay = 0;
}
- bool const item_tag_opened = openItemTag(os, cstyle);
+ bool const labelfirst = cstyle.htmllabelfirst();
+ bool item_tag_opened;
+ if (!labelfirst)
+ item_tag_opened = openItemTag(os, cstyle);
if (cstyle.labeltype == LABEL_MANUAL) {
bool const label_tag_opened = openLabelTag(os, cstyle);
sep = par->firstWordLyXHTML(os, runparams);
if (cstyle.labeltype == LABEL_MANUAL) {
bool const label_tag_opened = openLabelTag(os, cstyle);
sep = par->firstWordLyXHTML(os, runparams);
closeLabelTag(os, cstyle);
os << '\n';
}
closeLabelTag(os, cstyle);
os << '\n';
}
+ if (labelfirst)
+ item_tag_opened = openItemTag(os, cstyle);
+ else
+ os << "<span class='item'>";
par->simpleLyXHTMLOnePar(buf, os, runparams,
outerFont(distance(paragraphs.begin(), par), paragraphs), sep);
par->simpleLyXHTMLOnePar(buf, os, runparams,
outerFont(distance(paragraphs.begin(), par), paragraphs), sep);
+ if (!labelfirst)
+ os << "</span>";
++par;
if (item_tag_opened) {
// We may not want to close the tag yet, in particular,
++par;
if (item_tag_opened) {
// We may not want to close the tag yet, in particular,
ParagraphList::const_iterator pend = paragraphs.end();
while (par != pend) {
ParagraphList::const_iterator pend = paragraphs.end();
while (par != pend) {
Layout const & style = par->layout();
ParagraphList::const_iterator lastpar = par;
ParagraphList::const_iterator send;
Layout const & style = par->layout();
ParagraphList::const_iterator lastpar = par;
ParagraphList::const_iterator send;