Changed dialog SpeechStyle getter for when lang is 'Auto' -- rather than not setting the speech style, it uses the current language's speech style. That style might get to be invalid later on, but MathCAT will pick something in the changed language if it isn't valid.

A few more lint fixes

Author: NSoiffer

addon/globalPlugins/MathCAT/MathCAT.py

@@ -32,6 +32,7 @@
 
 from ctypes import windll                   # register clipboard formats
 from typing import Any, Optional
+from speech import getCurrentLanguage
 
 from . import libmathcat
 
@@ -71,7 +72,7 @@
 RE_MATH_LANG = re.compile(r'''<math .*(xml:)?lang=["']([^'"]+)["'].*>''')
 def getLanguageToUse(mathMl:str) -> str:
     """Get the language specified in a math tag if the language pref is Auto, else the language preference."""
-    mathCATLanguageSetting = "Auto"
+    mathCATLanguageSetting = 'Auto'
     try:
         # ignore regional differences if the MathCAT language setting doesn't have it.
         mathCATLanguageSetting = libmathcat.GetPreference("Language")
@@ -82,7 +83,7 @@ def getLanguageToUse(mathMl:str) -> str:
         return mathCATLanguageSetting
 
     languageMatch = RE_MATH_LANG.search(mathMl)
-    language = languageMatch.group(2) if languageMatch else speech.getCurrentLanguage() # seems to be current voice's language
+    language = languageMatch.group(2) if languageMatch else getCurrentLanguage()  # seems to be current voice's language
     language = language.lower().replace("_", "-")
     return language
 

addon/globalPlugins/MathCAT/MathCATPreferences.py

@@ -249,13 +249,13 @@ def GetLanguages(self):
         languages_dict = UserInterface.LanguagesDict()
         #clear the language names in the dialog
         self.m_choiceLanguage.Clear()
-        #populate the available language names in the dialog
         self.m_choiceLanguage.Append(_("Use Voice's Language") + " (Auto)")
+        #populate the available language names in the dialog
         for f in os.listdir(UserInterface.path_to_languages_folder()):
-            if os.path.isdir(UserInterface.path_to_languages_folder()+"\\"+f):
-                if languages_dict.get(f, 'missing') == 'missing':
-                    self.m_choiceLanguage.Append(f + " (" + f + ")")
-                else:
+             if os.path.isdir(UserInterface.path_to_languages_folder()+"\\"+f):
+                 if languages_dict.get(f, 'missing') == 'missing':
+                     self.m_choiceLanguage.Append(f + " (" + f + ")")
+                 else:
                     self.m_choiceLanguage.Append(languages_dict[f] + " (" + f + ")")
 
     def GetLanguageCode(self):
@@ -264,10 +264,18 @@ def GetLanguageCode(self):
         return lang_code
 
     def GetSpeechStyles(self, this_SpeechStyle: str):
+        from speech import getCurrentLanguage
         #clear the SpeechStyle choices
         self.m_choiceSpeechStyle.Clear()
         #get the currently selected language code
         this_language_code = UserInterface.GetLanguageCode(self)
+        log.info(f"\nthis lang={this_language_code}, getCurrentLanguage = {getCurrentLanguage()}")
+
+        if this_language_code == 'Auto':
+            # list the speech styles for the current voice rather than have none listed
+            this_language_code = getCurrentLanguage().lower().replace("_", "-")           
+            # FIX: when dialog is aware of regional dialects, remove this next line that removes the dialect part
+            this_language_code = this_language_code.split('-')[0]   # grab the first part
 
         this_path = os.path.expanduser('~')+"\\AppData\\Roaming\\nvda\\addons\\MathCAT\\globalPlugins\\MathCAT\\Rules\\Languages\\"+this_language_code+"\\*_Rules.yaml"
         #populate the m_choiceSpeechStyle choices