anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-22 07:42:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't wrap empty labels.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31745 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2009-10-26 02:37:31 +00:00
parent cb138c6c24
commit 02bc0dc3bf
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/output_xhtml.cpp
View File

@ -136,7 +136,7 @@ bool openLabelTag(odocstream & os, Layout const & lay)
{
string const tag = lay.htmllabel().empty()
? "span" : lay.htmllabel();
string const attr = lay.htmlattr().empty()
string const attr = lay.htmllabelattr().empty()
? "class=\"" + to_utf8(lay.name()) + "label\"" : lay.htmllabelattr();
return html::openTag(os, tag, attr);
}
@ -312,10 +312,14 @@ ParagraphList::const_iterator makeEnvironmentHtml(Buffer const & buf,
// paragraph (as in a theorem).
item_tag_opened = openItemTag(os, style);
if (par == pbegin) {
bool const label_tag_opened = openLabelTag(os, style);
os << pbegin->expandLabel(style, buf.params(), false);
if (label_tag_opened)
closeLabelTag(os, style);
docstring const lbl =
pbegin->expandLabel(style, buf.params(), false);
if (!lbl.empty()) {
bool const label_tag_opened = openLabelTag(os, style);
os << lbl;
if (label_tag_opened)
closeLabelTag(os, style);
}
os << '\n';
}
} else { // some kind of list