Use InsetLayout to style the XHTML output.

Note that we have also changed the layout name to uppercase, but
this should be fine, since it was so far unused.

Conflicts:

	src/insets/InsetScript.cpp

lib/layouts/stdinsets.inc

@@ -445,3 +445,15 @@ InsetLayout Preview
 	Decoration            minimalistic
 	MultiPar              true
 End
+
+InsetLayout Script:superscript
+	MultiPar false
+	HTMLTag sup
+	HTMLIsBlock 0
+End
+
+InsetLayout Script:subscript
+	MultiPar false
+	HTMLTag sub
+	HTMLIsBlock 0
+End

src/insets/InsetScript.cpp

@@ -145,7 +145,7 @@ InsetScript::~InsetScript()
 
 docstring InsetScript::layoutName() const
 {
-	return from_ascii("script:" + scripttranslator().find(params_.type));
+	return from_ascii("Script:" + scripttranslator().find(params_.type));
 }
 
 
@@ -402,25 +402,6 @@ int InsetScript::docbook(odocstream & os, OutputParams const & runparams) const
 }
 
 
-docstring InsetScript::xhtml(XHTMLStream & xs, OutputParams const & runparams) const
-{
-	string cmdname;
-	switch (params_.type) {
-	case InsetScriptParams::Subscript:
-		cmdname = "sub";
-		break;
-	case InsetScriptParams::Superscript:
-		cmdname = "sup";
-		break;
-	}
-
-	xs << html::StartTag(cmdname);
-	docstring const ret = InsetText::xhtml(xs, runparams);
-	xs << html::EndTag(cmdname);
-	return ret;
-}
-
-
 docstring InsetScript::contextMenuName() const
 {
 	return from_ascii("context-script");

src/insets/InsetScript.h

@@ -94,8 +94,6 @@ public:
 	///
 	int docbook(odocstream &, OutputParams const &) const;
 	///
-	docstring xhtml(XHTMLStream &, OutputParams const &) const;
-	///
 	void edit(Cursor & cur, bool front,
 	          EntryDirection entry_from = ENTRY_DIRECTION_IGNORE);
 	///

status.20x

@@ -94,6 +94,8 @@ What's new
   flag by using the same latex backend used for previewing the document
   instead of always using the plain latex backend.
 
+- Fixed XHTML export of sub- and superscripts.
+
 
 * USER INTERFACE