From ed22deac3a8ebd85dac90c38444a52c2c9983344 Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@comcast.net>
Date: Thu, 19 Nov 2009 22:49:30 +0000
Subject: [PATCH] The default HTML tag for an InsetLayout should depend upon
 MultiPar.

This allows us to simplify stdinsets.inc again.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32106 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/layouts/stdinsets.inc  | 5 -----
 src/insets/InsetLayout.cpp | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 9b4014a00b..064544296f 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -77,7 +77,6 @@ InsetLayout Marginal
 	EndFont
 	MultiPar              true
 	NeedProtect           true
-	HTMLTag               div
 	HTMLStyle
 		div.marginal {
 			border: 2px solid black; 
@@ -107,7 +106,6 @@ InsetLayout Foot
 	  Size                Small
 	EndFont
 	MultiPar              true
-	HTMLTag               div
 	HTMLLabel             \arabic{footnote}
 	HTMLInnerTag          div
 	HTMLStyle
@@ -153,7 +151,6 @@ InsetLayout Note:Note
 	  Size                Small
 	EndFont
 	MultiPar              true
-	HTMLTag               div
 	HTMLIsBlock           false
 # FIXME HTML Need CSS
 End
@@ -176,7 +173,6 @@ InsetLayout Note:Greyedout
 			padding-right: 1ex;
 		}
 	EndHTMLStyle
-	HTMLTag               div
 	HTMLIsBlock           false
 End
 
@@ -286,7 +282,6 @@ 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 41180c4a0c..f2b701dfb8 100644
--- 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_ = "span";
+		htmltag_ = multipar_ ? "div" : "span";
 	return htmltag_; 
 }
 
-- 
2.39.2