Sorry, I didn't mean to commit all that. Let's try again.

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

diff --git a/lib/configure.py b/lib/configure.py
index 71b0dcce39f1278e6551a67a30d18b7fe217c747..359a59c1c5783215ce438f09e5c60b28bb17bdd3 100644 (file)
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -513,9 +513,9 @@ def checkFormatEntries(dtl_tools):
 \Format textparagraph txt "Plain Text, Join Lines" "" ""       "%%"    "document"''' ])
  #
     path, xhtmlview = checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'],
-        rc_entry = [r'\Format xhtml      xhtml   "LyX HTML"              X "%%" ""    "document"'])
+        rc_entry = [r'\Format xhtml      xhtml   "LyX HTML"              "" "%%" ""    "document"'])
     if xhtmlview == "":
-        addToRC(r'\Format xhtml      xhtml   "LyX HTML"              X "" ""  "document"')
+        addToRC(r'\Format xhtml      xhtml   "LyX HTML"              "" "" ""  "document"')
  #
     checkEditor('a BibTeX editor', ['sensible-editor', 'jabref', 'JabRef', \
         'pybliographic', 'bibdesk', 'gbib', 'kbib', \

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 064544296f9bbb0c07e21e18291ec591df69562e..9b4014a00b2f417bd480a6882bd391c46aa89898 100644 (file)
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -77,6 +77,7 @@ InsetLayout Marginal
        EndFont
        MultiPar              true
        NeedProtect           true
+       HTMLTag               div
        HTMLStyle
                div.marginal {
                        border: 2px solid black; 
@@ -106,6 +107,7 @@ InsetLayout Foot
          Size                Small
        EndFont
        MultiPar              true
+       HTMLTag               div
        HTMLLabel             \arabic{footnote}
        HTMLInnerTag          div
        HTMLStyle
@@ -151,6 +153,7 @@ InsetLayout Note:Note
          Size                Small
        EndFont
        MultiPar              true
+       HTMLTag               div
        HTMLIsBlock           false
 # FIXME HTML Need CSS
 End
@@ -173,6 +176,7 @@ InsetLayout Note:Greyedout
                        padding-right: 1ex;
                }
        EndHTMLStyle
+       HTMLTag               div
        HTMLIsBlock           false
 End
 
@@ -282,6 +286,7 @@ InsetLayout Float
          Size                Small
        EndFont
        MultiPar              true
+       HTMLTag               div
 End
 
 InsetLayout Wrap

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index f2b701dfb8057f81bb21b03d0242a519b9cc0ec4..41180c4a0cc356ad13baab91c8cbe4e70cdbba03 100644 (file)
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -354,7 +354,7 @@ InsetLayout::InsetLyXType translateLyXType(std::string const & str)
 string const & InsetLayout::htmltag() const
 {
        if (htmltag_.empty())
-               htmltag_ = multipar_ ? "div" : "span";
+               htmltag_ = "span";
        return htmltag_; 
 }
 

diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index 01d57218b2b3162c493b950a0be1edc555024547..2db915cd94568ee7c05c6f5e5260cc377798532d 100644 (file)
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -619,9 +619,15 @@ ParagraphList::const_iterator makeEnvironmentHtml(Buffer const & buf,
                                        }
                                        if (labelfirst)
                                                openItemTag(xs, style);
+                                       else
+                                               // FIXME This should probalby be put into the layout file rather 
+                                               // than hardcoded.
+                                               xs << StartTag("span", "class='" + to_utf8(style.name()) + "_inneritem'");
                                }
                                par->simpleLyXHTMLOnePar(buf, xs, runparams, 
                                        text.outerFont(distance(begin, par)), sep);
+                               if (!isNormalEnv(style) && !labelfirst)
+                                       xs << EndTag("span");
                                ++par;
                                // We may not want to close the tag yet, in particular,
                                // if we're not at the end...