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

Allow the suppression of LyX's own labels.

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

1
lib/layouts/stdlists.inc
View File

@ -27,6 +27,7 @@ Style Itemize
LabelString "*"
HTMLTag ul
HTMLItem li
HTMLLabel NONE
End

1
src/Layout.h
View File

@ -302,6 +302,7 @@ private:
/// descriptions, in which case it would be: dt. Another use is to
/// customize the display of, say, the auto-generated label for
/// sections. Defaults to "span".
/// If set to "NONE", this suppresses the printing of the label.
std::string htmllabel_;
/// Attributes for the label. Defaults to: class="layoutnamelabel".
std::string htmllabelattr_;

23
src/output_xhtml.cpp
View File

@ -307,11 +307,12 @@ ParagraphList::const_iterator makeEnvironmentHtml(Buffer const & buf,
}
bool item_tag_opened = false;
bool const labelfirst = style.htmllabelfirst();
bool madelabel = false;
if (isNormalEnv(style)) {
// in this case, we print the label only for the first
// paragraph (as in a theorem).
item_tag_opened = openItemTag(os, style);
if (par == pbegin) {
if (par == pbegin && style.htmllabel() != "NONE") {
docstring const lbl =
pbegin->expandLabel(style, buf.params(), false);
if (!lbl.empty()) {
@ -325,28 +326,30 @@ ParagraphList::const_iterator makeEnvironmentHtml(Buffer const & buf,
} else { // some kind of list
if (!labelfirst)
item_tag_opened = openItemTag(os, style);
if (style.labeltype == LABEL_MANUAL) {
bool const label_tag_opened = openLabelTag(os, style);
if (style.labeltype == LABEL_MANUAL
&& style.htmllabel() != "NONE") {
madelabel = openLabelTag(os, style);
sep = par->firstWordLyXHTML(os, runparams);
if (label_tag_opened)
if (madelabel)
closeLabelTag(os, style);
os << '\n';
}
else if (style.labeltype != LABEL_NO_LABEL) {
bool const label_tag_opened = openLabelTag(os, style);
else if (style.labeltype != LABEL_NO_LABEL
&& style.htmllabel() != "NONE") {
madelabel = openLabelTag(os, style);
os << par->expandLabel(style, buf.params(), false);
if (label_tag_opened)
if (madelabel)
closeLabelTag(os, style);
os << '\n';
}
if (labelfirst)
item_tag_opened = openItemTag(os, style);
else
os << "<span class='item'>";
else if (madelabel)
os << "<span class='" << style.name() << "inneritem'>";
}
par->simpleLyXHTMLOnePar(buf, os, runparams,
text.outerFont(distance(begin, par)), sep);
if (!isNormalEnv(style) && labelfirst)
if (!isNormalEnv(style) && !labelfirst && madelabel)
os << "</span>";
++par;
if (item_tag_opened) {