[LyX/master] MathML: refactor the XArrow mappings as maps.

Thibaut Cuvelier tcuvelier at lyx.org
Wed Dec 8 00:56:08 UTC 2021


commit e5eef14414c97908fc88f3cb4d03bb47499c1322
Author: Thibaut Cuvelier <tcuvelier at lyx.org>
Date:   Wed Dec 8 01:53:56 2021 +0100

    MathML: refactor the XArrow mappings as maps.
---
 src/mathed/InsetMathXArrow.cpp |  160 +++++++++++++++-------------------------
 1 files changed, 59 insertions(+), 101 deletions(-)

diff --git a/src/mathed/InsetMathXArrow.cpp b/src/mathed/InsetMathXArrow.cpp
index dceb794..cd97b7c 100644
--- a/src/mathed/InsetMathXArrow.cpp
+++ b/src/mathed/InsetMathXArrow.cpp
@@ -84,84 +84,68 @@ void InsetMathXArrow::normalize(NormalStream & os) const
 }
 
 
+static std::map<string, string> latex_to_html_entities = {
+		{"xleftarrow", "←"},
+		{"xrightarrow", "→"},
+		{"xhookleftarrow", "↩"},
+		{"xhookrightarrow", "↪"},
+		{"xLeftarrow", "⇐"},
+		{"xRightarrow", "⇒"},
+		{"xleftrightarrow", "↔"},
+		{"xLeftrightarrow", "⇔"},
+		{"xleftharpoondown", "↽"},
+		{"xleftharpoonup", "↼"},
+		{"xleftrightharpoons", "⇋"},
+		{"xrightharpoondown", "⇁"},
+		{"xrightharpoonup", "⇀"},
+		{"xrightleftharpoons", "⇌"},
+		{"xmapsto", "↦"},
+};
+
+
+static std::map<string, string> latex_to_xml_entities = {
+		{"xleftarrow", "&#x2190;"},
+		{"xrightarrow", "&#x2192;"},
+		{"xhookleftarrow", "&#x21a9;"},
+		{"xhookrightarrow", "&#x21aa;"},
+		{"xLeftarrow", "&#x21d0;"},
+		{"xRightarrow", "&#x21d2;"},
+		{"xleftrightarrow", "&#x2194;"},
+		{"xLeftrightarrow", "&#x21d4;"},
+		{"xleftharpoondown", "&#x21bd;"},
+		{"xleftharpoonup", "&#x21bc;"},
+		{"xleftrightharpoons", "&#x21cb;"},
+		{"xrightharpoondown", "&#x21c1;"},
+		{"xrightharpoonup", "&#x21c0;"},
+		{"xrightleftharpoons", "&#x21cc;"},
+		{"xmapsto", "&#x21a6;"},
+};
+
+
 void InsetMathXArrow::mathmlize(MathMLStream & ms) const
 {
-	char const * arrow;
+	std::string arrow;
 
 	if (!ms.xmlMode()) { // Use HTML entities.
-		if (name_ == "xleftarrow")
-			arrow = "←";
-		else if (name_ == "xrightarrow")
-			arrow = "→";
-		else if (name_ == "xhookleftarrow")
-			arrow = "↩";
-		else if (name_ == "xhookrightarrow")
-			arrow = "↪";
-		else if (name_ == "xLeftarrow")
-			arrow = "⇐";
-		else if (name_ == "xRightarrow")
-			arrow = "⇒";
-		else if (name_ == "xleftrightarrow")
-			arrow = "↔";
-		else if (name_ == "xLeftrightarrow")
-			arrow = "⇔";
-		else if (name_ == "xleftharpoondown")
-			arrow = "↽";
-		else if (name_ == "xleftharpoonup")
-			arrow = "↼";
-		else if (name_ == "xleftrightharpoons")
-			arrow = "⇋";
-		else if (name_ == "xrightharpoondown")
-			arrow = "⇁";
-		else if (name_ == "xrightharpoonup")
-			arrow = "⇀";
-		else if (name_ == "xrightleftharpoons")
-			arrow = "⇌";
-		else if (name_ == "xmapsto")
-			arrow = "↦";
-		else {
+		auto mapping = latex_to_html_entities.find(to_ascii(name_));
+		if (mapping != latex_to_html_entities.end()) {
+			arrow = mapping->second;
+		} else {
 			lyxerr << "mathmlize conversion for '" << name_ << "' not implemented" << endl;
-			LASSERT(false, arrow = "→");
+			LASSERT(false, arrow = latex_to_html_entities["xrightarrow"]);
 		}
 	} else { // Use XML entities.
-		if (name_ == "xleftarrow")
-			arrow = "&#x2190;";
-		else if (name_ == "xrightarrow")
-			arrow = "&#x2192;";
-		else if (name_ == "xhookleftarrow")
-			arrow = "&#x21a9;";
-		else if (name_ == "xhookrightarrow")
-			arrow = "&#x21aa;";
-		else if (name_ == "xLeftarrow")
-			arrow = "&#x21d0;";
-		else if (name_ == "xRightarrow")
-			arrow = "&#x21d2;";
-		else if (name_ == "xleftrightarrow")
-			arrow = "&#x2194;";
-		else if (name_ == "xLeftrightarrow")
-			arrow = "&#x21d4;";
-		else if (name_ == "xleftharpoondown")
-			arrow = "&#x21bd;";
-		else if (name_ == "xleftharpoonup")
-			arrow = "&#x21bc;";
-		else if (name_ == "xleftrightharpoons")
-			arrow = "&#x21cb;";
-		else if (name_ == "xrightharpoondown")
-			arrow = "&#x21c1;";
-		else if (name_ == "xrightharpoonup")
-			arrow = "&#x21c0;";
-		else if (name_ == "xrightleftharpoons")
-			arrow = "&#x21cc;";
-		else if (name_ == "xmapsto")
-			arrow = "&#x21a6;";
-		else {
+		auto mapping = latex_to_xml_entities.find(to_ascii(name_));
+		if (mapping != latex_to_xml_entities.end()) {
+			arrow = mapping->second;
+		} else {
 			lyxerr << "mathmlize XML conversion for '" << name_ << "' not implemented" << endl;
-			LASSERT(false, arrow = "&#x2192;");
+			LASSERT(false, arrow = latex_to_xml_entities["xrightarrow"]);
 		}
 	}
 
 	ms << "<" << from_ascii(ms.namespacedTag("munderover")) << " accent='false' accentunder='false'>"
-	   << MTagInline("mo") << arrow << ETagInline("mo")
+	   << MTagInline("mo") << from_ascii(arrow) << ETagInline("mo")
 	   << cell(1) << cell(0)
 	   << "</" << from_ascii(ms.namespacedTag("munderover"))<< ">";
 }
@@ -169,45 +153,19 @@ void InsetMathXArrow::mathmlize(MathMLStream & ms) const
 
 void InsetMathXArrow::htmlize(HtmlStream & os) const
 {
-	char const * arrow;
-
-	if (name_ == "xleftarrow")
-		arrow = "←";
-	else if (name_ == "xrightarrow")
-		arrow = "→";
-	else if (name_ == "xhookleftarrow")
-		arrow = "↩";
-	else if (name_ == "xhookrightarrow")
-		arrow = "↪";
-	else if (name_ == "xLeftarrow")
-		arrow = "⇐";
-	else if (name_ == "xRightarrow")
-		arrow = "⇒";
-	else if (name_ == "xleftrightarrow")
-		arrow = "↔";
-	else if (name_ == "xLeftrightarrow")
-		arrow = "⇔";
-	else if (name_ == "xleftharpoondown")
-		arrow = "↽";
-	else if (name_ == "xleftharpoonup")
-		arrow = "↼";
-	else if (name_ == "xleftrightharpoons")
-		arrow = "⇋";
-	else if (name_ == "xrightharpoondown")
-		arrow = "⇁";
-	else if (name_ == "xrightharpoonup")
-		arrow = "⇀";
-	else if (name_ == "xrightleftharpoons")
-		arrow = "⇌";
-	else if (name_ == "xmapsto")
-		arrow = "↦";
-	else {
+	string arrow;
+
+	auto mapping = latex_to_html_entities.find(to_ascii(name_));
+	if (mapping != latex_to_html_entities.end()) {
+		arrow = mapping->second;
+	} else {
 		lyxerr << "htmlize conversion for '" << name_ << "' not implemented" << endl;
-		LASSERT(false, arrow = "→");
+		LASSERT(false, arrow = latex_to_html_entities["xrightarrow"]);
 	}
+
 	os << MTag("span", "class='xarrow'")
 		 << MTag("span", "class='xatop'") << cell(0) << ETag("span")
-		 << MTag("span", "class='xabottom'") << arrow << ETag("span")
+		 << MTag("span", "class='xabottom'") << from_ascii(arrow) << ETag("span")
 		 << ETag("span");
 }
 


More information about the lyx-cvs mailing list