From: Richard Heck <rgheck@lyx.org>
Date: Tue, 17 Apr 2012 13:11:28 +0000 (-0400)
Subject: Use InsetLayout to style the XHTML output.
X-Git-Tag: 2.1.0beta1~1933^2~33
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1c33d95adf45e8fe3334727e2843d4862b3d9cf9;p=features.git

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.
---

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 2000172f23..1062b3485d 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -475,3 +475,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
diff --git a/src/insets/InsetScript.cpp b/src/insets/InsetScript.cpp
index 1328e3847a..3aa1b41ec4 100644
--- a/src/insets/InsetScript.cpp
+++ b/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;
-}
-
-
 string InsetScript::contextMenuName() const
 {
 	return "context-script";
diff --git a/src/insets/InsetScript.h b/src/insets/InsetScript.h
index eaec3c97c9..07e5af9ab0 100644
--- a/src/insets/InsetScript.h
+++ b/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);
 	///