fix: preserve comma and period in date TN output

- Delete trailing period from date tagger instead of consuming it,
  so sentence-ending periods are preserved
- Preserve comma in MDY date format (e.g. "August 8, 2024" ->
  "the eighth of august, twenty twenty four") instead of adding
  extra space before comma
- Use cdrewrite to remove space before comma in verbalizer
- Update test expectations accordingly

Author: pengzhendong

tn/english/rules/date.py

@@ -225,21 +225,21 @@ def build_tagger(self):
             cardinal_graph=cardinal_graph,
             single_digits_graph=cardinal.single_digits_graph,
         )
-        two_digit_year = pynutil.insert('year: "') + two_digit_year + pynini.union(",", ".").ques + pynutil.insert('"')
+        two_digit_year = pynutil.insert('year: "') + two_digit_year + pynutil.delete(",").ques + pynutil.insert('"')
 
         graph_year = (
             pynutil.insert(' year: "')
             + pynutil.delete(" ")
             + year_graph
-            + pynini.union(",", ".").ques
+            + pynutil.delete(",").ques
             + pynutil.insert('"')
         )
         graph_year |= (
             pynutil.insert(' year: "')
-            + pynini.accep(",")
-            + pynini.accep(" ").ques
+            + pynini.cross(",", ", ")
+            + pynutil.delete(" ").ques
             + year_graph
-            + pynini.union(",", ".").ques
+            + pynutil.delete(",").ques
             + pynutil.insert('"')
         )
         optional_graph_year = graph_year.ques
@@ -349,4 +349,5 @@ def build_verbalizer(self):
         )
 
         final_graph = (graph_dmy | year | graph_fy) + self.DELETE_SPACE
+        final_graph = final_graph @ self.build_rule(pynini.cross(" ,", ","))
         self.verbalizer = self.delete_tokens(final_graph)

tn/english/test/data/date.txt

@@ -4,7 +4,7 @@
 2024 B.C => twenty twenty four BC
 1H23 => the first half of twenty three
 3Q22 => the third quarter of twenty two
-jan. 5, 2012 => the fifth of january , twenty twelve
+jan. 5, 2012 => the fifth of january, twenty twelve
 jan. 5 => the fifth of january
 5 january 2012 => the fifth of january twenty twelve
 2012-01-05 => the fifth of january twenty twelve

tn/english/test/data/normalizer.txt

@@ -1,5 +1,5 @@
 this is 12th game, number 256, 2024-05-06, 2021-03-07 31.990 billion. ¾ people like chattts, let's eat at 03:43 p.m. run 10 km, give me $12.345 please, call 123-123-5678-1 Mt Hill "HAHAHA" billion 4 March => this is twelfth game, number two hundred and fifty six, the sixth of may twenty twenty four, the seventh of march twenty twenty one thirty one point nine nine oh billion. three quarters people like chattts, let's eat at three forty three PM run ten kilometers, give me twelve point three four five dollars please, call one two three, one two three, five six seven eight, one Mt Hill "HAHAHA" billion the fourth of march
-The National Map, accessed April 1, 2011" Site Description of Koppers Co. From the quartet's recording" Jefferson Friedman: Quartets,"" String Quartet no, Riots again broke out, Atassi resigned, and Syrian independence was deferred until after World War II. 1988 (1988) ( 1988) ( 1988). Starling, Arthur E.( 1988 ). this is 12th game, number 256, 2024-05-06, 2021-03-07 31.990 billion. 3/4 people like chattts Retrieved December 2011. Information on Album" Thepodule.com"" Biography by Amy Hanson". => The National Map, accessed the first of april , twenty eleven" Site Description of Koppers company From the quartet's recording" Jefferson Friedman: Quartets,"" String Quartet no, Riots again broke out, Atassi resigned, and Syrian independence was deferred until after World War two nineteen eighty eight (nineteen eighty eight) ( nineteen eighty eight) ( nineteen eighty eight). Starling, Arthur E.( nineteen eighty eight ). this is twelfth game, number two fifty six, the sixth of may twenty twenty four, the seventh of march twenty twenty one thirty one point nine nine oh billion. three quarters people like chattts Retrieved december twenty eleven. Information on Album" Thepodule dot com"" Biography by Amy Hanson".
+The National Map, accessed April 1, 2011" Site Description of Koppers Co. From the quartet's recording" Jefferson Friedman: Quartets,"" String Quartet no, Riots again broke out, Atassi resigned, and Syrian independence was deferred until after World War II. 1988 (1988) ( 1988) ( 1988). Starling, Arthur E.( 1988 ). this is 12th game, number 256, 2024-05-06, 2021-03-07 31.990 billion. 3/4 people like chattts Retrieved December 2011. Information on Album" Thepodule.com"" Biography by Amy Hanson". => The National Map, accessed the first of april, twenty eleven" Site Description of Koppers company From the quartet's recording" Jefferson Friedman: Quartets,"" String Quartet no, Riots again broke out, Atassi resigned, and Syrian independence was deferred until after World War two nineteen eighty eight (nineteen eighty eight) ( nineteen eighty eight) ( nineteen eighty eight). Starling, Arthur E.( nineteen eighty eight ). this is twelfth game, number two fifty six, the sixth of may twenty twenty four, the seventh of march twenty twenty one thirty one point nine nine oh billion. three quarters people like chattts Retrieved december twenty eleven. Information on Album" Thepodule dot com"" Biography by Amy Hanson".
 .345" and ".456" "9.456" or 6.7890" => point three four five" and ".four hundred and fifty six" "nine point four five six" or six point seven eight nine oh"
 The museum is open Mon.-Sun. children of 3-4 years 123 The plan will help you lose 3-4 pounds the first week, and 1-2 pounds the weeks thereafter. => The museum is open Monday to Sunday children of three to four years one hundred and twenty three The plan will help you lose three to four pounds the first week, and one to two pounds the weeks thereafter.
 Try searching for 'Toyota' or 'Investment' => Try searching for 'Toyota' or 'Investment'