ctests: uninvert xhtml test thanks to fix

Thanks to the fix at 18657384, this test is fixed.

development/autotests/invertedTests

@@ -179,10 +179,6 @@ export/examples/ru/Presentations/Beamer_lyx(16|20)
 # that we want "&" rather than "and" (in APA context).
 # see: https://www.mail-archive.com/search?l=mid&q=ildx4xd4o7ybeqroh3blxgnxqnsqnte256utip2fbmcwi4zolz%40wsh7ez36kkhl
 export/templates/Articles/American_Psychological_Association_%28APA%29,_v._7_xhtml
-#
-# from Jürgen: ampersands in the bibliography (as in "Hartley & Marks" here)
-# need to be transferred to & in DocBook.
-export/examples/es/Handouts/Tufte_Handout_xhtml
 
 
 # ==============================================================

src/insets/InsetCitation.cpp

@@ -663,7 +663,9 @@ docstring InsetCitation::xhtml(XMLStream & xs, OutputParams const &) const
 		return docstring();
 
 	// have to output this raw, because generateLabel() will include tags
-	xs << XMLStream::ESCAPE_NONE << generateLabel(true);
+	// but we need to escape standalone ampersands
+	xs << XMLStream::ESCAPE_NONE
+	   << subst(generateLabel(true), from_ascii(" & "), from_ascii(" &amp; "));
 
 	return docstring();
 }

src/mathed/InsetMathHull.cpp

@@ -217,6 +217,12 @@ InsetMathHull & InsetMathHull::operator=(InsetMathHull const & other)
 }
 
 
+docstring InsetMathHull::layoutName() const
+{
+	return "Formula:" + hullName(type_);
+}
+
+
 void InsetMathHull::setBuffer(Buffer & buffer)
 {
 	InsetMathGrid::setBuffer(buffer);

src/mathed/InsetMathHull.h

@@ -47,6 +47,8 @@ public:
 	///
 	virtual ~InsetMathHull();
 	///
+	docstring layoutName() const override;
+	///
 	void setBuffer(Buffer &) override;
 	///
 	void updateBuffer(ParIterator const &, UpdateType, bool const deleted = false) override;