Cleanup CopyAs code -- I thought I had committed this early.

Author: NSoiffer

addon/globalPlugins/MathCAT/MathCAT.py

@@ -306,33 +306,33 @@ def script_navigate(self, gesture: KeyboardInputGesture):
     )
     def script_rawdataToClip(self, gesture: KeyboardInputGesture):
         try:
-            mathml = libmathcat.GetNavigationMathML()[0]
-            if not re.match(self._startsWithMath, mathml):
-                mathml = (
-                    "<math>\n" + mathml + "</math>"
-                )  # copy will fix up name spacing
-            elif self.init_mathml != "":
-                mathml = self.init_mathml
-            copy_as = "mathml"
+            copy_as = "mathml"      # value used even if "CopyAs" pref is invalid
+            text_to_copy = ""
             try:
                 copy_as = libmathcat.GetPreference("CopyAs").lower()
-                match copy_as:
-                    case "mathml" | "latex" | "asciimath":
-                        pass
-                    case _:
-                        copy_as = "mathml"
             except Exception as e:
                 log.error(f"Not able to get 'CopyAs' preference: {e}")
-
-            mathml = self._wrapMathMLForClipBoard(mathml)
-            if copy_as != "mathml":
+            if copy_as == "asciimath" or copy_as == "latex":
+                # save the old braille code, set the new one, get the braille, then reset the code
                 saved_braille_code: str = libmathcat.GetPreference("BrailleCode")
                 libmathcat.SetPreference("BrailleCode", "LaTeX" if copy_as == "latex" else "ASCIIMath")
-                mathml = libmathcat.GetNavigationBraille()
+                text_to_copy = libmathcat.GetNavigationBraille()
                 libmathcat.SetPreference("BrailleCode", saved_braille_code)
-            self._copyToClipAsMathML(mathml, copy_as == "mathml")
+                if copy_as == "asciimath":
+                    copy_as = "ASCIIMath"  # speaks better in at least some voices
+            else:
+                mathml = libmathcat.GetNavigationMathML()[0]
+                if not re.match(self._startsWithMath, mathml):
+                    mathml = (
+                        "<math>\n" + mathml + "</math>"
+                    )  # copy will fix up name spacing
+                elif self.init_mathml != "":
+                    mathml = self.init_mathml
+                text_to_copy = self._wrapMathMLForClipBoard(mathml)
+
+            self._copyToClipAsMathML(text_to_copy, copy_as == "mathml")
             # Translators: copy to clipboard
-            ui.message(_("copy"))
+            ui.message(_("copy as ") + copy_as)
         except Exception as e:
             log.error(e)
             # Translators: this message directs users to look in the log file