Add more detailed testcases for Color, Pagecolor and Definecolor

* case 2: "colors"
* in MMLGenerationTexUtilTest.php
* Updated the keyfiles etc

Bug: T327391
Change-Id: Id3232f21dea9813ec5adcacca58e912cf116ab72

tests/phpunit/unit/TexVC/ExportedTexUtilKeys.json

@@ -15,13 +15,13 @@
     "\\mbox{a}": "tex",
     "\\text{a}": "tex",
     "\\vbox{ab}": "tex",
-    "\\color{red}{red}": "tex",
+    "a {b \\color{red} c} d": "tex",
-    "\\pagecolor{red}{red}": "tex",
+    "\\pagecolor{red} e^{i \\pi}": "tex",
     "{\\bf a }": "tex",
     "{\\cal a }": "tex",
     "{\\it a }": "tex",
     "{\\rm a }": "tex",
-    "\\definecolor{ultramarine}{RGB}{0,32,96}": "tex",
+    "\\definecolor{ultramarine}{RGB}{0,32,96} a {b \\color{ultramarine} c} d": "tex",
     "\\acute{a}": "tex",
     "\\bar{a}": "tex",
     "\\bcancel{a}": "tex",
@@ -136,7 +136,7 @@
     "\\ce{\\frac{a}{b}}": "chem",
     "\\ce{\\overset{a}{b}}": "chem",
     "\\ce{\\underset{a}{b}}": "chem",
-    "\\ce{\\color{red}{red}}": "chem",
+    "\\ce{a {b \\color{red} c} d}": "chem",
     "\\ce{\\underbrace{a}}": "chem",
     "\\ce{\\Alpha}": "chem",
     "\\ce{\\Beta}": "chem",

tests/phpunit/unit/TexVC/MMLGenerationTexUtilTest.php

@@ -140,9 +140,6 @@ class MMLGenerationTexUtilTest extends MediaWikiUnitTestCase {
 
 	private const SAMPLE_ARGS_RIGHT = [
 		"big_literals" => '(',
-		"color_function" => '{red}{red}',
-		"mhchem_macro_2pc" => '{red}{red}',
-		"definecolor_function" => '{ultramarine}{RGB}{0,32,96}',
 		"fun_ar2nb" => '{_1^2}{_3^4}\\sum',
 		"left_function" => '( \\right.',
 		"mhchem_bond" => '{-}',
@@ -158,6 +155,10 @@ class MMLGenerationTexUtilTest extends MediaWikiUnitTestCase {
 		"\\atop" => "{ a \\atop b }",
 		"\\choose" => "{ a \\choose b }",
 		"\\over" => "{a \\over b }",
+		"\\color" => "a {b \\color{red} c} d",
+		"\\ce{\\color}" => "\\ce{a {b \\color{red} c} d}",
+		"\\definecolor" => "\\definecolor{ultramarine}{RGB}{0,32,96} a {b \\color{ultramarine} c} d",
+		"\\pagecolor" => "\\pagecolor{red} e^{i \\pi}",
 		"\\hline" => "\n\\begin{array}{|c||c|} a & b  \\\\\n\\hline\n1&2 \n\\end{array}\n",
 		"\\nolimits" => " \mathop{\\rm cos}\\nolimits^2",
 	   // "\\limits" =>" \mathop{\\rm cos}\\limits^2",
@@ -220,7 +221,12 @@ class MMLGenerationTexUtilTest extends MediaWikiUnitTestCase {
 			$indexCtr = 0;
 			foreach ( $group as $case ) {
 				$title = "set#" . $overAllCtr . ": " . $category . $indexCtr;
-				$finalCase = $refAssociative[$case] ?? $case;
+				if ( $refAssociative[$case] ) {
+					$finalCase = $refAssociative[$case];
+				} else {
+					$type = str_starts_with( $case, "ce" ) ? "chem" : "tex";
+					$finalCase = (object)[ "tex" => $case , "type" => $type, "ctr" => null ];
+				}
 				$finalCase->ctr = $overAllCtr;
 
 				$finalCases[$title] = [ $title, $finalCase ];
@@ -250,8 +256,12 @@ class MMLGenerationTexUtilTest extends MediaWikiUnitTestCase {
 	private static function addArgs( $set, $entry ) {
 		if ( isset( self::ENTRY_ARGS[$entry] ) ) {
 			// Some entries have specific mappings for non-group related arguments
+			if ( str_starts_with( $set, "mhchem" ) ) {
+				return '\\ce{' . self::ENTRY_ARGS[$entry] . '}';
+			} else {
 				return ( self::ENTRY_ARGS[$entry] );
 			}
+		}
 		$count = !isset( self::ARG_CNTS[$set] ) ? 0 : self::ARG_CNTS[$set];
 		$argsR = '';
 		$argsL = '';