From 6a3f8e96257bdddb53e8b91b6b7bc04b6f768561 Mon Sep 17 00:00:00 2001
From: Frederic Wang <fred.wang@free.fr>
Date: Fri, 16 Sep 2022 05:18:14 +0000
Subject: [PATCH] Bug 1790797 - updateOperatorDictionary.pl does not need to
 handle minsize, priority or linebreakstyle properties. r=emilio

This is not used at all in our code and are not present in MathML Core's
dictionary. Let's remove them from the Perl script that manage update
of the dictionary.

Differential Revision: https://phabricator.services.mozilla.com/D157318
---
 layout/mathml/nsMathMLOperators.cpp       |  5 -----
 layout/mathml/operatorDictionary.xsl      | 15 ---------------
 layout/mathml/updateOperatorDictionary.pl | 11 -----------
 3 files changed, 31 deletions(-)

diff --git a/layout/mathml/nsMathMLOperators.cpp b/layout/mathml/nsMathMLOperators.cpp
index 283a7fda19a1..5dd7e444490f 100644
--- a/layout/mathml/nsMathMLOperators.cpp
+++ b/layout/mathml/nsMathMLOperators.cpp
@@ -70,11 +70,6 @@ static void SetProperty(OperatorData* aOperatorData, nsString aName,
                         nsString aValue) {
   if (aName.IsEmpty() || aValue.IsEmpty()) return;
 
-  // XXX These ones are not kept in the dictionary
-  // Support for these requires nsString member variables
-  // maxsize (default: infinity)
-  // minsize (default: 1)
-
   if (aName.EqualsLiteral("direction")) {
     if (aValue.EqualsLiteral("vertical"))
       aOperatorData->mFlags |= NS_MATHML_OPERATOR_DIRECTION_VERTICAL;
diff --git a/layout/mathml/operatorDictionary.xsl b/layout/mathml/operatorDictionary.xsl
index a181fd872aac..257a063330e3 100644
--- a/layout/mathml/operatorDictionary.xsl
+++ b/layout/mathml/operatorDictionary.xsl
@@ -34,11 +34,6 @@
             <xsl:value-of select="@rspace"/>
             </xsl:attribute> 
           </xsl:if>
-          <xsl:if test="@minsize">
-            <xsl:attribute name="minsize">
-              <xsl:value-of select="@minsize"/>
-            </xsl:attribute> 
-          </xsl:if>
           <xsl:if test="@*[.='true']">
             <xsl:attribute name="properties">
               <!-- largeop, movablelimits, stretchy, separator, fence,
@@ -49,16 +44,6 @@
               </xsl:for-each>
             </xsl:attribute> 
           </xsl:if>
-          <xsl:if test="@priority">
-            <xsl:attribute name="priority">
-              <xsl:value-of select="@priority"/>
-            </xsl:attribute> 
-          </xsl:if>
-          <xsl:if test="@linebreakstyle">
-            <xsl:attribute name="linebreakstyle">
-              <xsl:value-of select="@linebreakstyle"/>
-            </xsl:attribute> 
-          </xsl:if>
           <!-- end operator-dictionary -->
 
           <xsl:attribute name="description">
diff --git a/layout/mathml/updateOperatorDictionary.pl b/layout/mathml/updateOperatorDictionary.pl
index 310467949a1c..f81a279b4887 100755
--- a/layout/mathml/updateOperatorDictionary.pl
+++ b/layout/mathml/updateOperatorDictionary.pl
@@ -76,7 +76,6 @@ if ($ARGV[0] eq "compare" && $#ARGV == 1) {
 #      0   | description
 #      1   | lspace
 #      2   | rspace
-#      3   | minsize
 #      4   | largeop
 #      5   | movablelimits
 #      6   | stretchy
@@ -84,8 +83,6 @@ if ($ARGV[0] eq "compare" && $#ARGV == 1) {
 #      8   | accent
 #      9   | fence
 #     10   | symmetric
-#     11   | priority
-#     12   | linebreakstyle
 #     13   | direction
 
 # 1) build %moz_hash from $MOZ_DICTIONARY
@@ -107,7 +104,6 @@ while (<$file>) {
     $value[0] = $3;
     if (m/^(.*)lspace:(\d)(.*)$/) { $value[1] = $2; } else { $value[1] = "5"; }
     if (m/^(.*)rspace:(\d)(.*)$/) { $value[2] = $2; } else { $value[2] = "5"; }
-    if (m/^(.*)minsize:(\d)(.*)$/) { $value[3] = $2; } else { $value[3] = "1"; }
     $value[4] = (m/^(.*)largeop(.*)$/);
     $value[5] = (m/^(.*)movablelimits(.*)$/);
     $value[6] = (m/^(.*)stretchy(.*)$/);
@@ -115,8 +111,6 @@ while (<$file>) {
     $value[8] = (m/^(.*)accent(.*)$/);
     $value[9] = (m/^(.*)fence(.*)$/);
     $value[10] = (m/^(.*)symmetric(.*)$/);
-    $value[11] = ""; # we don't store "priority" in our dictionary
-    $value[12] = ""; # we don't store "linebreakstyle" in our dictionary
     if (m/^(.*)direction:([a-z]*)(.*)$/) { $value[13] = $2; }
     else { $value[13] = ""; }
 
@@ -277,8 +271,6 @@ foreach my $entry ($doc->findnodes('/root/entry')) {
     if ($value[1] eq "") { $value[1] = "5"; }
     $value[2] = $entry->getAttribute("rspace");
     if ($value[2] eq "") { $value[2] = "5"; }
-    $value[3] = $entry->getAttribute("minsize");
-    if ($value[3] eq "") { $value[3] = "1"; }
 
     $_ = $entry->getAttribute("properties");
     $value[4] = (m/^(.*)largeop(.*)$/);
@@ -287,8 +279,6 @@ foreach my $entry ($doc->findnodes('/root/entry')) {
     $value[7] = (m/^(.*)separator(.*)$/);
     $value[9] = (m/^(.*)fence(.*)$/);
     $value[10] = (m/^(.*)symmetric(.*)$/);
-    $value[11] = $entry->getAttribute("priority");
-    $value[12] = $entry->getAttribute("linebreakstyle");
 
     # not stored in the WG dictionary
     $value[8] = ""; # accent
@@ -411,7 +401,6 @@ sub generateCommon {
     # helper function to generate the string of data shared by both dictionaries
     my(@v) = @_;
     $entry = "lspace:$v[1] rspace:$v[2]";
-    if ($v[3] ne "1") { $entry = "$entry minsize:$v[3]"; }
     if ($v[4]) { $entry = "$entry largeop"; }
     if ($v[5]) { $entry = "$entry movablelimits"; }
     if ($v[6]) { $entry = "$entry stretchy"; }