unimacro 4.1.7.dev4__tar.gz → 4.1.8.dev2__tar.gz

unimacro-4.1.8.dev2/LICENSE.txt

@@ -0,0 +1,67 @@
+NatLink
+	(c) Copyright 1997-1999 by Joel Gould.
+		Portions (c) Copyright 1997-1999 by Dragon Systems, Inc. All Rights Reserved.
+	Permission to use, copy, modify and distribute this software (except for the files noted below) 
+	and documentation for any purpose and without fee is hereby granted, provided that this copyright 
+	notice appear in all copies and that both the copyright notice and this permission notice appear 
+	in supporting documentation, and that the name Joel Gould not be used in advertising or publicity 
+	pertaining to distribution of the software without specific, written permission.
+	
+	The following files are NOT covered by the previous previous paragraph: NatlinkSource\speech.h and 
+	NatlinkSource\dspeech.h. These files may not be redistributed although they can be freely downloaded 
+	from http://www.synapseadaptive.com/joel/PythonMacroSystem.html and used on one machine.
+	
+	Joel Gould disclaim all warranties with regard to this software, including all implied warranties of 
+	merchantability and fitness, in no event shall Joel Gould be liable for any special, indirect or consequential 
+	damages or any damages whatsoever resulting from the loss of use, data or profits whether in an action of contract, 
+	negligence or tortious action, arising out of connection with the use or performance of this software.
+	Possession of this software does NOT grant the possessor any license to Dragon NaturallySpeaking or any 
+	other Dragon Systems product, except where license to Dragon NaturallySpeaking or any other Dragon Systems 
+	products is purchased or otherwise obtained separately.
+	This copyright only applies to NatLink, including source and object code and not to Dragon NaturallySpeaking 
+	or any other Dragon Systems product.
+	Software on this web site is not available from Dragon Systems, nor is Dragon Systems formally associated with this software in any way.
+
+-----------------------------------
+
+
+Configurenatlinkunimacrovocola:
+	Copyright (c) 2008 by Quintijn Hoogenboom. It may be redistributed in any way as long as this copyright notice remains.
+
+-----------------------------------
+
+Unimacro (c)  2002-2008 Quintijn Hoogenboom, Ben Staniford, Bart Jan van Os
+	
+		"unimacro" is free software; you can redistribute it and/or modify
+		it under the terms of the GNU General Public License, see:
+		http://www.gnu.org/licenses/gpl.txt
+
+		"unimacro" is distributed in the hope that it will be useful, but
+		WITHOUT ANY WARRANTY; See the GNU General Public License details.
+
+"unimacro" makes use of another SourceForge project "natlink",
+which has the copyright notice shown above.
+
+-----------------------------------
+
+windll.py/calldll.pyd
+Copyright 1996-2000 by Sam Rushing
+                        All Rights Reserved
+Permission to use, copy, modify, and distribute this software and
+its documentation for any purpose and without fee is hereby
+granted, provided that the above copyright notice appear in all
+copies and that both that copyright notice and this permission
+notice appear in supporting documentation, and that the name of Sam
+Rushing not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.
+
+SAM RUSHING DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+NO EVENT SHALL SAM RUSHING BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+	
+---------------------------------------

{unimacro-4.1.7.dev4 → unimacro-4.1.8.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: unimacro
-Version: 4.1.7.dev4
+Version: 4.1.8.dev2
 Summary: Unimacro __init__
 Author-email: "Quintijn Hoogenboom (maintainer)" <q.hoogenboom@antenna.nl>
 Requires-Python: >=3.10
@@ -17,11 +17,13 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Multimedia :: Sound/Audio :: Speech
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: dtactions ~= 1.6.4.dev3
+License-File: LICENSE.txt
+Requires-Dist: dtactions >= 1.6.5.dev1
 Requires-Dist: debugpy >= 1.2.0
 Requires-Dist: pywin32 >= 304
-Requires-Dist: natlinkcore ~= 5.4.2.dev1
+Requires-Dist: natlinkcore >= 5.4.2
 Requires-Dist: FreeSimpleGUI>=5.1.0
+Requires-Dist: icecream >= 2.1.3
 Requires-Dist: pyenvutils ; extra == "dev"
 Requires-Dist: entry-point-inspector ; extra == "dev"
 Requires-Dist: build ; extra == "dev"
@@ -35,7 +37,7 @@ Provides-Extra: test
 
 # Unimacro
 The Unimacro project aims to provide a rich set of command grammars, that can be configured by the users without programming knowledge. 
-Read more at [Natlink, including Unimacro and Vocolaa](https://qh.antenna.nl/unimacro/index.html)
+Read more at [Natlink, including Unimacro and Vocolaa](https://qh.antenna.nl/unimacro/grammars/index.html)
 
 # Installing
 
@@ -44,15 +46,17 @@ areas - probably nothing you can't live without.
 
 A limited number of grammars are by default available when you install unimacro:
 
-  _control.py
-  _general.py 
-  _folders.py
-  _lines.py
-  _brackets.py
-  _tags.py
-  _tasks.py
-  _clickbyvoice.py
-  _number simple.py
+  - _control.py
+  - _general.py
+  - _folders.py
+  - _lines.py
+  - _brackets.py
+  - _tags.py
+  - _tasks.py
+  - _clickbyvoice.py
+  - _number simple.py
+
+In the sub folder OtherUnimacroGrammars more grammars are available. See above link to the Unimacro  website above!
 
 ## Install unimacro
 
@@ -78,7 +82,7 @@ The Grammars listed above are installed with Unimacro in:
 the Lib\site-packages\unimacro\UnimacroGrammars sub-directory of your 
 Python installation.  
 
-More about [Unimacro Grammars](https://qh.antenna.nl/unimacro/grammars/globalgrammars/folders/index.html)
+More about [Unimacro Grammars](https://qh.antenna.nl/unimacro/index.html)
 
 # Developer instructions.
 

{unimacro-4.1.7.dev4 → unimacro-4.1.8.dev2}/README.md

@@ -1,6 +1,6 @@
 # Unimacro
 The Unimacro project aims to provide a rich set of command grammars, that can be configured by the users without programming knowledge. 
-Read more at [Natlink, including Unimacro and Vocolaa](https://qh.antenna.nl/unimacro/index.html)
+Read more at [Natlink, including Unimacro and Vocolaa](https://qh.antenna.nl/unimacro/grammars/index.html)
 
 # Installing
 
@@ -9,15 +9,17 @@ areas - probably nothing you can't live without.
 
 A limited number of grammars are by default available when you install unimacro:
 
-  _control.py
-  _general.py 
-  _folders.py
-  _lines.py
-  _brackets.py
-  _tags.py
-  _tasks.py
-  _clickbyvoice.py
-  _number simple.py
+  - _control.py
+  - _general.py
+  - _folders.py
+  - _lines.py
+  - _brackets.py
+  - _tags.py
+  - _tasks.py
+  - _clickbyvoice.py
+  - _number simple.py
+
+In the sub folder OtherUnimacroGrammars more grammars are available. See above link to the Unimacro  website above!
 
 ## Install unimacro
 
@@ -43,7 +45,7 @@ The Grammars listed above are installed with Unimacro in:
 the Lib\site-packages\unimacro\UnimacroGrammars sub-directory of your 
 Python installation.  
 
-More about [Unimacro Grammars](https://qh.antenna.nl/unimacro/grammars/globalgrammars/folders/index.html)
+More about [Unimacro Grammars](https://qh.antenna.nl/unimacro/index.html)
 
 # Developer instructions.
 

{unimacro-4.1.7.dev4 → unimacro-4.1.8.dev2}/pyproject.toml

@@ -1,12 +1,3 @@
-
-
-
-
-
-
-
-
-
 [build-system]
 requires = ["flit_core >=2,<4"]
 build-backend = "flit_core.buildapi"
@@ -15,7 +6,7 @@ build-backend = "flit_core.buildapi"
 name = "unimacro"
 authors = [{name = "Quintijn Hoogenboom (maintainer)", email = "q.hoogenboom@antenna.nl"}]
 dynamic = ["description"]
-version = "4.1.7.dev4"
+version = "4.1.8.dev2"
 requires-python = ">=3.10"
 readme = "README.md"
 
@@ -25,11 +16,12 @@ readme = "README.md"
 #note you have to put in .dev1 to take the earliest dev release.
 
 
-dependencies = ["dtactions ~= 1.6.4.dev3",
+dependencies = ["dtactions >= 1.6.5.dev1",
         "debugpy >= 1.2.0",
 		"pywin32 >= 304",
-		"natlinkcore ~= 5.4.2.dev1",
-        "FreeSimpleGUI>=5.1.0"]
+		"natlinkcore >= 5.4.2",
+        "FreeSimpleGUI>=5.1.0",
+		"icecream >= 2.1.3"]
 		  		
 classifiers=[	"Development Status :: 2 - Pre-Alpha",
 				"Topic :: Multimedia :: Sound/Audio :: Speech",
@@ -56,10 +48,7 @@ dev = [
 unimacro_builtins = "unimacro.UnimacroGrammars:locateme"
 
 [project.entry-points."dt.loggers"]
-	unimacro ="unimacro:logname"
-	control="unimacro:control_logger_name"
-	folders="unimacro:folders_logger_name"
-	clickbyvoice="unimacro:clickbyvoice_logger_name"
+
 
 [tool.pytest.ini_options]
 minversion = "7.1.2"

{unimacro-4.1.7.dev4 → unimacro-4.1.8.dev2}/src/unimacro/BrowseGrammar.py

@@ -2,29 +2,12 @@
 # (c) copyright 2003 Quintijn Hoogenboom (quintijn@users.sourceforge.net)
 #                    Ben Staniford (ben_staniford@users.sourceforge.net)
 #                    Bart Jan van Os (bjvo@users.sourceforge.net)
-#
-# This file is part of a SourceForge project called "unimacro" see
-# http://unimacro.SourceForge.net).
-#
-# "unimacro" is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License, see:
-# http://www.gnu.org/licenses/gpl.txt
-#
-# "unimacro" is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; See the GNU General Public License details.
-#
-# "unimacro" makes use of another SourceForge project "natlink",
-# which has the following copyright notice:
+# In github/dictation-toolbox by now (2026)
 #
 # Python Macro Language for Dragon NaturallySpeaking
 #   (c) Copyright 1999 by Joel Gould
 #   Portions (c) Copyright 1999 by Dragon Systems, Inc.
-# 
-# Python Macro Language for Dragon NaturallySpeaking
-#   (c) Copyright 1999 by Joel Gould
-#   Portions (c) Copyright 1999 by Dragon Systems, Inc.
 #
-
 # This file implements a base classes for a dialog/window to browse NatLink grammars
 # The browser is based upon a tree dialog, adapted from the hiertest demo
 # Author: Bart Jan van Os, Version: 1.0
@@ -41,12 +24,8 @@ NatLink grammars
 
 The browser is based upon a tree dialog, adapted from the hiertest demo
 """
-
-import os
+#pylint: disable = R0904, W0702, R0912, R0913, R0914
 import copy
-import re
-import types
-from natlinkcore import natlinkutils
 from natlinkcore import gramparser  # for splitApartLines
 
 ListCode = 0    # List
@@ -65,7 +44,7 @@ def IsText(value):
     return isinstance(value, str)
 
 def GrammarElementKey(item):
-    if type(item) == str:
+    if isinstance(item, str):
         return item.lower()
     return item.GetName().lower()
     
@@ -87,15 +66,13 @@ class GrammarElement:
     def Append(self,NewElement):
         self.Included.append(NewElement)
         self.ObjIncluded=self.ObjIncluded or not IsText(NewElement)
-        pass        
 
     def Insert(self,NewElement):
         self.Included.insert(0,NewElement)
         self.ObjIncluded=self.ObjIncluded or not IsText(NewElement)
-        pass
+
     def Sort(self):
         self.Included.sort(key=GrammarElementKey)
-        pass
     
     def SetToAllText(self,Text):
         AllText = [str(t) for t in Text]
@@ -105,7 +82,8 @@ class GrammarElement:
     def SetIsAllText(self):
         if self.ObjIncluded:
             for x in self.Included:
-                if not IsText(x): return
+                if not IsText(x):
+                    return
         self.ObjIncluded=0
 
     def GetName(self):
@@ -113,29 +91,28 @@ class GrammarElement:
             if self.GramType==RuleCode:
                 if self.IsRuleContainer():
                     return self.Name
-                else:
-                    return '<'+self.Name+'>'
-            elif self.GramType==ListCode:
+                return '<'+self.Name+'>'
+            if self.GramType==ListCode:
                 return '{'+self.Name+'}'                
-            else:
-                return self.Name
-        else:
-            return ''
+            return self.Name
+        return ''
 
 
     def AreAllWordsOrLists(self,contents=''):
         if contents=='':
             contents=self.GetAllIncluded(1,Unfold=0)
-        return (not '<' in contents)
+        return not '<' in contents
 
     def AreAllWords(self,contents=''): #might be combination of seq and alt
-        if not self.ObjIncluded: return 1
+        if not self.ObjIncluded:
+            return 1
         if contents=='':
             contents=self.GetAllIncluded(1,Unfold=0)
         return (not '<' in contents) and (not '{' in contents)
 
     def IsAllText(self):
-        if self.ObjIncluded: return False
+        if self.ObjIncluded:
+            return False
         if len(self.Included)>0:
             # print 'IsAllText: %s'% self.Included
             return True
@@ -146,7 +123,8 @@ class GrammarElement:
 
     def IsRuleContainer(self):
         for x in self.Included:
-            if (IsText(x)) or x.GramType!=RuleCode: return 0
+            if (IsText(x)) or x.GramType!=RuleCode:
+                return 0
         return 1
 
     def IsAltOrList(self):
@@ -154,11 +132,11 @@ class GrammarElement:
 
 
     def AreAlternatives(self):
-        return (self.GramType==AltCode) or (self.GramType==ListCode)
+        return self.GramType in (AltCode, ListCode)
 
     def SetIsLongAlternative(self):
         if self.GramType==AltCode:
-            self.IsLA=self.IsAllText() and (len(u' | '.join(self.Included))>MaxUnfoldLen)
+            self.IsLA=self.IsAllText() and (len(' | '.join(self.Included)) > MaxUnfoldLen)
             if not self.IsLA and (self.AlternativesDict!={}):
                 count=0
                 for x in self.Included:
@@ -219,8 +197,8 @@ class GrammarElement:
         RuleNames=[]
         for x in AllRules:
             if not (x in Rules or x.GetName() in RuleNames):
-                    Rules.append(x)
-                    RuleNames.append(x.GetName())
+                Rules.append(x)
+                RuleNames.append(x.GetName())
         return Rules
 
     def GetInnerRules(self,maxLevel):
@@ -235,8 +213,7 @@ class GrammarElement:
             x=self.Included[i]
             if IsText(x):
                 return x
-            else:
-                return x.GetContents(maxLevel-(x.GramType==RuleCode),Unfold)
+            return x.GetContents(maxLevel-(x.GramType==RuleCode),Unfold)
         except:
             return ''
 
@@ -248,7 +225,7 @@ class GrammarElement:
 
     def GetAllIncluded(self,maxLevel,Unfold):
         if len(self.Included)==0:
-            if (self.GramType==ListCode):
+            if self.GramType==ListCode:
                 contents='???'
             else:
                 contents=''
@@ -257,10 +234,10 @@ class GrammarElement:
             if (not Unfold) and self.IsLongAlternative():
                 contents=self.Name
             else:
-                if (self.GramType==AltCode) or (self.GramType==ListCode):
-                    contents=u' | '.join(self.Included)
+                if self.GramType in (AltCode, ListCode):
+                    contents=' | '.join(self.Included)
                 else:
-                    contents=u' '.join(self.Included)
+                    contents=' '.join(self.Included)
                 contents=self.ReduceLongAlternatives(contents)
         else:
             contents=self.GetIncluded(0,maxLevel,Unfold)
@@ -289,12 +266,13 @@ class GrammarElement:
                 if len(c)>3: # try to remove redundant parens
                     Remove=c[1]=='{' and (c[-2]=='}') and (not '{' in c[2:-2])
                     Remove=Remove or (c[1]=='[' and (c[-2]==']') and (not ']' in c[2:-2]))
-                    if Remove: contents=contents[1:-1]
+                    if Remove:
+                        contents=contents[1:-1]
                 contents=contents+'+'
         else:
             contents= '<'+self.Name
-            if (maxLevel<=0):
-                if (Unfold): #Try to go deeper one level at a time, until too long
+            if maxLevel<=0:
+                if Unfold: #Try to go deeper one level at a time, until too long
                     l=maxLevel
                     NiC=self.GetAllIncluded(l,0)
                     includedContents=''
@@ -344,13 +322,12 @@ class GrammarElement:
                     del newRules[Rules.index(r.Name)]
                     if len(newRules)==0:
                         return newPath,newobjPath
-                    else:
-                        n,o=r.FindLargestRulePath(newRules)
-                        newPath.extend(n)
-                        newobjPath.extend(o)
-                        if len(newPath)>len(largestPath):
-                            largestPath=newPath
-                            objPath=newobjPath
+                    n,o=r.FindLargestRulePath(newRules)
+                    newPath.extend(n)
+                    newobjPath.extend(o)
+                    if len(newPath)>len(largestPath):
+                        largestPath=newPath
+                        objPath=newobjPath
                 else:
                     newPath,o=r.FindLargestRulePath(Rules)
                     newobjPath.extend(o)
@@ -378,13 +355,14 @@ class GrammarElement:
 def RemoveDuplicatesOfSortedList(List):
     for i in range(len(List)-1,-1,-1):
         if i>0:
-            if List[i]==List[i-1]: del List[i]    
+            if List[i]==List[i-1]:
+                del List[i]    
 
 def InverseDict(SomeDict):
-    InverseDict={}
+    ID = {}
     for key in SomeDict.keys():
-        InverseDict[SomeDict[key]]=key
-    return InverseDict
+        ID[SomeDict[key]]=key
+    return ID
 
 def ParseRuleDefinitions(name,stack,Parser,ParserInfo,Lists,Dicts):
     KnownWords,KnownRules,KnownLists,ImportRules=ParserInfo
@@ -419,7 +397,7 @@ def ParseRuleDefinitions(name,stack,Parser,ParserInfo,Lists,Dicts):
         elif element[0]=='end':
             #Pack simple text sequences into parent list as multi word item in Included
             if CurElement.IsAllText() and (CurElement.GramType==SeqCode):
-                    stack[1].Included[-1]=u' '.join(CurElement.Included)
+                stack[1].Included[-1] = ' '.join(CurElement.Included)
             else: #make shure object is not turned into AllText
                 CurElement.SetIsAllText()
             del stack[0]
@@ -440,7 +418,8 @@ def ParseRuleDefinitions(name,stack,Parser,ParserInfo,Lists,Dicts):
 
 def ParseGrammarDefinitions(gramSpec,gramName,Lists,Dicts,activeRules,All=1, Exclusive=0,
                             exclusiveState=0):
-    if type(gramSpec)!=type([]): gramSpec=[gramSpec]    
+    if not isinstance(gramSpec, list):
+        gramSpec=[gramSpec]    
     gramparser.splitApartLines(gramSpec)
 ##    Parser = natlinkutils.GramParser(gramSpec)
 ##    Parser.doParse()
@@ -453,7 +432,7 @@ def ParseGrammarDefinitions(gramSpec,gramName,Lists,Dicts,activeRules,All=1, Exc
     ParserInfo=(InverseDict(Parser.knownWords),InverseDict(Parser.knownRules),
         InverseDict(Parser.knownLists),Parser.importRules)
     stack=[]        
-    for name in Parser.ruleDefines.keys():
+    for name in Parser.ruleDefines:
         ParseRuleDefinitions(name,stack,Parser,ParserInfo,Lists,Dicts)
     DefRules={}                
     for x in stack:
@@ -466,7 +445,7 @@ def ParseGrammarDefinitions(gramSpec,gramName,Lists,Dicts,activeRules,All=1, Exc
     Grammar.Init(RuleCode,gramName)
     if Exclusive:
         if not exclusiveState:
-            return
+            return None
         # if asking for exclusive, only show the activerules
         All = 0
             
@@ -478,11 +457,14 @@ def ParseGrammarDefinitions(gramSpec,gramName,Lists,Dicts,activeRules,All=1, Exc
                 Grammar.Insert(rule)
             elif not rule.Name in UsedRules:
                 Obsolete.Insert(rule)
-        if len(Obsolete.Included)!=0: Grammar.Append(Obsolete)
+        if len(Obsolete.Included)!=0:
+            Grammar.Append(Obsolete)
     elif activeRules:
         for rule in stack:
-            if (rule.Name in activeRules):
+            if rule.Name in activeRules:
                 Grammar.Insert(rule)
     else:
-        return   # nothing if no active rules QH
+        return None  # nothing if no active rules QH
     return Grammar
+
+

{unimacro-4.1.7.dev4 → unimacro-4.1.8.dev2}/src/unimacro/OtherUnimacroGrammars/_calculator.py

@@ -35,17 +35,17 @@ Also see the page "number grammar" on the Unimacro site and
 the grammars _number simple and _number extended.
 """
 import copy
-from dtactions.unimacroactions import doAction as action
+from dtactions.uniactions.uactions import doAction as action
 
 from natlinkcore import natlinkutils as natut
-from dtactions import unimacroutils
-from dtactions import unimacroutils
+from dtactions import uniutils
+from dtactions import uniutils
 import unimacro.natlinkutilsbj as natbj
 
 ancestor = natbj.IniGrammar
 class ThisGrammar(ancestor):
 
-    language = unimacroutils.getLanguage()
+    language = uniutils.getLanguage()
     normalRules = ['calcnormal', 'cancel']
     calcRules = ['calccalc', 'cancel'] # exclusive
     continueRules = ['calccontinue', 'cancel'] # exclusive
@@ -87,7 +87,7 @@ class ThisGrammar(ancestor):
         if self.checkForChanges:
             self.checkInifile()
         if self.prevModInfo != moduleInfo:
-            progInfo = unimacroutils.getProgInfo(modInfo=moduleInfo)
+            progInfo = uniutils.getProgInfo(modInfo=moduleInfo)
             self.prevModInfo = moduleInfo
             self.cancelMode()
             self.prog = progInfo.prog

{unimacro-4.1.7.dev4 → unimacro-4.1.8.dev2}/src/unimacro/OtherUnimacroGrammars/_keystrokes.py

@@ -21,15 +21,15 @@ others continuously.
 import sys
 import copy
 from dtactions import inivars
-from dtactions.unimacroactions import doKeystroke as keystroke
-from dtactions.unimacroactions import doAction as action
-from dtactions import unimacroutils
+from dtactions.uniactions.uactions import doKeystroke as keystroke
+from dtactions.uniactions.uactions import doAction as action
+from dtactions import uniutils
 from unimacro import natlinkutilsbj as natbj
 from natlinkcore import nsformat 
 from natlinkcore import loader
 import natlink
 natlinkmain = loader.NatlinkMain()
-language = unimacroutils.getLanguage()        
+language = uniutils.getLanguage()        
 
 ancestor = natbj.IniGrammar
 class ThisGrammar(ancestor):
@@ -58,7 +58,7 @@ class ThisGrammar(ancestor):
     gramSpec = "# placeholder of gramSpec"
 
     # def __init__(self, inifile_stem=None):
-    #     self.language = unimacroutils.getLanguage()
+    #     self.language = uniutils.getLanguage()
     #     # here the grammar is not loaded yet, but the ini file is present
     #     self.inifile_stem = inifile_stem
     #     self.startInifile()
@@ -124,11 +124,11 @@ class ThisGrammar(ancestor):
         if self.prevModule == moduleInfo:
             return
 
-        progInfo = unimacroutils.getProgInfo(moduleInfo)       
+        progInfo = uniutils.getProgInfo(moduleInfo)       
 
         self.isIgnored = 0
 
-        if self.ignore and unimacroutils.matchWindow(self.ignore, progInfo=progInfo):
+        if self.ignore and uniutils.matchWindow(self.ignore, progInfo=progInfo):
             self.isIgnored = 1
             return
 
@@ -205,8 +205,8 @@ class ThisGrammar(ancestor):
         #print '_keystrokes, do a "%s" mouse click'% button
         if not self.doWaitForMouseToStop():
             raise Exception("_keystrokes, mouse did not stop")
-        unimacroutils.buttonClick(button, nClick)
-        unimacroutils.visibleWait()
+        uniutils.buttonClick(button, nClick)
+        uniutils.visibleWait()
         self.hadClick = button             
 
     def subrule_contextmenu(self, words):
@@ -346,7 +346,7 @@ class ThisGrammar(ancestor):
             if not self.doMouseMoveStopClick():
                 print("you should move the mouse a bit at least!")
                 return
-        possibleButtons = unimacroutils.joelsButtons
+        possibleButtons = uniutils.joelsButtons
         possibleClicks = ['1', '2', '3']
         clickrules = self.getFromInifile(words[0], 'click')
         #print 'clickrules: %s'% clickrules
@@ -373,8 +373,8 @@ class ThisGrammar(ancestor):
     
         if self.nextRule == 'contextmenu' and nClick == 1:
             button = 'right'
-        unimacroutils.buttonClick(button, nClick, modifiers=self.mod)
-        unimacroutils.visibleWait()
+        uniutils.buttonClick(button, nClick, modifiers=self.mod)
+        uniutils.visibleWait()
         self.hadClick = button
 
 
@@ -414,7 +414,7 @@ class ThisGrammar(ancestor):
     def gotResults_lastkey(self, words,fullResults):
         self.flush()
         self.flushAll()  
-        unimacroutils.visibleWait()
+        uniutils.visibleWait()
 
     def gotResults(self, words,fullResults):
         self.flush()
@@ -429,12 +429,12 @@ class ThisGrammar(ancestor):
         self.hadClick = 0
 
         if self.cap:
-            self.key = unimacroutils.doCaps(self.key)
+            self.key = uniutils.doCaps(self.key)
 
         if self.mod:
-            self.key = unimacroutils.doModifier(self.key, self.mod)
+            self.key = uniutils.doModifier(self.key, self.mod)
         if self.count != 1:
-            self.key = unimacroutils.doCount(self.key, self.count)
+            self.key = uniutils.doCount(self.key, self.count)
        
         if isinstance(self.key, list):
             print(f'_keystrokes, flush: warning, self.key is list: {self.key}')
@@ -486,20 +486,20 @@ class ThisGrammar(ancestor):
             self.cap = 3
             
     def windowPolicy(self, modInfo=None, progInfo=None): 
-        progInfo = progInfo or unimacroutils.getProgInfo(modInfo)
+        progInfo = progInfo or uniutils.getProgInfo(modInfo)
         #print 'window policy------progInfo: %s'% repr(progInfo)
         #print 'deactivaterules: %s'% self.deactivateRules
         #print 'activaterules: %s'% self.activateRules
         modeSet = []
         for mode in self.modes:
-            if unimacroutils.matchWindow(self.modes[mode], progInfo=progInfo):
+            if uniutils.matchWindow(self.modes[mode], progInfo=progInfo):
                 modeSet.append(mode)
         self.modeSet = set(modeSet)
         if modeSet:
             return tuple(modeSet)
 
-        if unimacroutils.matchWindow(self.activateRules, progInfo=progInfo):
-            if unimacroutils.matchWindow(self.deactivateRules, progInfo=progInfo):
+        if uniutils.matchWindow(self.activateRules, progInfo=progInfo):
+            if uniutils.matchWindow(self.deactivateRules, progInfo=progInfo):
                 return 'inactive'
             return 'active'
         return 'inactive'