allow macros to be registered with a custom submenu name

Author: line0

README.md

@@ -490,23 +490,23 @@ The purpose of this construct is to allow circular references between modules. L
 
 Call this method as replacement for returning your module.
 
-__:registerMacro(*str* [name=@name], *str* [description=@description], *func* processing_function, *func* [validation_function], *func* is_active_function, *bool* [useSubmenu=false])__
+__:registerMacro(*str* [name=@name], *str* [description=@description], *func* processing_function, *func* [validation_function], *func* is_active_function, *bool|string* [submenu=false])__
 
 Alternative Signature:
 
-__:registerMacro(*func* processing_function, *func* [validation_function], *func* is_active_function, *bool* [useSubmenu=false])__
+__:registerMacro(*func* processing_function, *func* [validation_function], *func* is_active_function, *bool|string* [submenu=false])__
 
 Registers a single macro using script name and description by default.
-If __useSubmenu__ is set to true, the macro will be placed in a submenu using the script name.
+Use __submenu__ to specify a submenu name to use for this macro or set it to `true` to use the automation script name.
 
 If the script entry in the DependencyControl configuration file contains a __customMenu__ property, the macro will be placed in the specified menu. Do note that that this setting is for *user customization* and not to be changed without the user's consent.
 
 For the other arguments, please refer to the [aegisub.register_macro](http://docs.aegisub.org/latest/Automation/Lua/Registration/#aegisub.register_macro) API documentation.
 
-__:registerMacros(*tbl* macros, *bool* [useSubmenuDefault=true])__
+__:registerMacros(*tbl* macros, *bool|string* [submenuDefault=true])__
 
 Registers multiple macros, where __macros__ is a list of tables containing the arguments to a __:registerMacro()__ call for each automation menu entry.  a single macro using script name and description by default.
-If __useSubmenuDefault__ is set to true, the macros will be placed in a submenu using the script name unless overriden by per-macro settings.
+Use __submenuDefault__ to specify a submenu all macros will be placed in unless overriden on a per-macro basis. Defaults to `true` which causes the automation script name to be used as the submenu name.
 
 __:registerTests(unitTestArgs...)__
 

modules/DependencyControl.moon

@@ -462,15 +462,17 @@ class DependencyControl
         @registerTests selfRef, ...
         return selfRef
 
-    registerMacro: (name=@name, description=@description, process, validate, isActive, useSubmenu) =>
-        -- alternative signature
+    registerMacro: (name=@name, description=@description, process, validate, isActive, submenu) =>
+        -- alternative signature takes name and description from script
         if type(name)=="function"
-            process, validate, isActive, useSubmenu = name, description, process, validate
+            process, validate, isActive, submenu = name, description, process, validate
             name, description = @name, @description
 
-        menuName = {}
-        menuName[1] = @config.c.customMenu if @config.c.customMenu
-        menuName[#menuName+1] = @name if useSubmenu
+        -- use automation script name for submenu by default
+        submenu = @name if submenu == true
+
+        menuName = { @config.c.customMenu }
+        menuName[#menuName+1] = submenu if submenu
         menuName[#menuName+1] = name
 
         -- check for updates before running a macro
@@ -481,10 +483,11 @@ class DependencyControl
 
         aegisub.register_macro table.concat(menuName, "/"), description, processHooked, validate, isActive
 
-    registerMacros: (macros = {}, useSubmenuDefault = true) =>
+    registerMacros: (macros = {}, submenuDefault = true) =>
         for macro in *macros
-            useSubmenu = type(macro[1])=="function" and 4 or 6
-            macro[useSubmenu] = useSubmenuDefault if macro[useSubmenu]==nil
+            -- allow macro table to omit name and description
+            submenuIdx = type(macro[1])=="function" and 4 or 6
+            macro[submenuIdx] = submenuDefault if macro[submenuIdx] == nil
             @registerMacro unpack(macro, 1, 6)
 
     setVersion: (version) =>