Fix HTMLLabelFirst handling in non-list environments. Simplify code,

while we're at it.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35380 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index 0a8222c8fb31cad5d0b96ffa946a73877ee44ecd..6ee977d6fc3949fe9d420b157f2482c9648648e8 100644 (file)
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -694,46 +694,52 @@ ParagraphList::const_iterator makeEnvironmentHtml(Buffer const & buf,
                                        closeItemTag(xs, *lastlay);
                                        lastlay = 0;
                                }
-                               if (isNormalEnv(style)) {
-                                       // in this case, we print the label only for the first 
-                                       // paragraph (as in a theorem).
+                               
+                               bool const labelfirst = style.htmllabelfirst();
+                               if (!labelfirst)
                                        openItemTag(xs, style);
-                                       if (par == pbegin && style.htmllabeltag() != "NONE") {
-                                               docstring const lbl = 
-                                                               pbegin->params().labelString();
-                                               if (!lbl.empty()) {
+                               
+                               // label output
+                               if (style.labeltype != LABEL_NO_LABEL && 
+                                   style.htmllabeltag() != "NONE") {
+                                       if (isNormalEnv(style)) {
+                                               // in this case, we print the label only for the first 
+                                               // paragraph (as in a theorem).
+                                               if (par == pbegin) {
+                                                       docstring const lbl = 
+                                                                       pbegin->params().labelString();
+                                                       if (!lbl.empty()) {
+                                                               openLabelTag(xs, style);
+                                                               xs << lbl;
+                                                               closeLabelTag(xs, style);
+                                                       }
+                                                       xs.cr();
+                                               }
+                                       }       else { // some kind of list
+                                               if (style.labeltype == LABEL_MANUAL) {
                                                        openLabelTag(xs, style);
-                                                       xs << lbl;
+                                                       sep = par->firstWordLyXHTML(xs, runparams);
                                                        closeLabelTag(xs, style);
+                                                       xs.cr();
+                                               }
+                                               else {
+                                                       openLabelTag(xs, style);
+                                                       xs << par->params().labelString();
+                                                       closeLabelTag(xs, style);
+                                                       xs.cr();
                                                }
-                                               xs.cr();
-                                       }
-                               }       else { // some kind of list
-                                       bool const labelfirst = style.htmllabelfirst();
-                                       if (!labelfirst)
-                                               openItemTag(xs, style);
-                                       if (style.labeltype == LABEL_MANUAL
-                                           && style.htmllabeltag() != "NONE") {
-                                               openLabelTag(xs, style);
-                                               sep = par->firstWordLyXHTML(xs, runparams);
-                                               closeLabelTag(xs, style);
-                                               xs.cr();
-                                       }
-                                       else if (style.labeltype != LABEL_NO_LABEL
-                                                && style.htmllabeltag() != "NONE") {
-                                               openLabelTag(xs, style);
-                                               xs << par->params().labelString();
-                                               closeLabelTag(xs, style);
-                                               xs.cr();
                                        }
-                                       if (labelfirst)
-                                               openItemTag(xs, style);
-                               }
+                               } // end label output
+
+                               if (labelfirst)
+                                       openItemTag(xs, style);
+
                                par->simpleLyXHTMLOnePar(buf, xs, runparams, 
                                        text.outerFont(distance(begin, par)), sep);
                                ++par;
-                               // We may not want to close the tag yet, in particular,
-                               // if we're not at the end...
+
+                               // We may not want to close the tag yet, in particular:
+                               // If we're not at the end...
                                if (par != pend 
                                        //  and are doing items...
                                         && !isNormalEnv(style)