Regenerated with Donovan Prestons patch #702620.

45 files changed, 331 insertions, 117 deletions

diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
index 7bc5b19..7708f38 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
@@ -1,7 +1,7 @@
 """Suite CodeWarrior suite: Terms for scripting the CodeWarrior IDE
 Level 0, version 0
 
-Generated from /Volumes/Sap/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/CodeWarrior IDE 4.2.5
+Generated from /Volumes/Moes/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/CodeWarrior IDE 4.2.6
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py
index b8a60e2..4b0d29d 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py
@@ -1,7 +1,7 @@
 """Suite Metrowerks Shell Suite: Events supported by the Metrowerks Project Shell
 Level 1, version 1
 
-Generated from /Volumes/Sap/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/CodeWarrior IDE 4.2.5
+Generated from /Volumes/Moes/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/CodeWarrior IDE 4.2.6
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Required.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Required.py
index 779c7d3..a8b9a03 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Required.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Required.py
@@ -1,7 +1,7 @@
 """Suite Required: Terms that every application should support
 Level 1, version 1
 
-Generated from /Volumes/Sap/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/CodeWarrior IDE 4.2.5
+Generated from /Volumes/Moes/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/CodeWarrior IDE 4.2.6
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Standard_Suite.py
index 0213b98..c1b132d 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Standard_Suite.py
@@ -1,7 +1,7 @@
 """Suite Standard Suite: Common terms for most applications
 Level 1, version 1
 
-Generated from /Volumes/Sap/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/CodeWarrior IDE 4.2.5
+Generated from /Volumes/Moes/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/CodeWarrior IDE 4.2.6
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
index 4b27d96..fdf1592 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
@@ -1,5 +1,5 @@
 """
-Package generated from /Volumes/Sap/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/CodeWarrior IDE 4.2.5
+Package generated from /Volumes/Moes/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/CodeWarrior IDE 4.2.6
 Resource aete resid 0 AppleEvent Suites
 """
 import aetools
@@ -30,15 +30,18 @@ from Required import *
 from Standard_Suite import *
 from CodeWarrior_suite import *
 from Metrowerks_Shell_Suite import *
+
 def getbaseclasses(v):
-	if hasattr(v, '_superclassnames') and not hasattr(v, '_propdict'):
+	if not getattr(v, '_propdict', None):
 		v._propdict = {}
 		v._elemdict = {}
-		for superclass in v._superclassnames:
-			v._propdict.update(getattr(eval(superclass), '_privpropdict', {}))
-			v._elemdict.update(getattr(eval(superclass), '_privelemdict', {}))
-		v._propdict.update(v._privpropdict)
-		v._elemdict.update(v._privelemdict)
+		for superclassname in getattr(v, '_superclassnames', []):
+			superclass = eval(superclassname)
+			getbaseclasses(superclass)
+			v._propdict.update(getattr(superclass, '_propdict', {}))
+			v._elemdict.update(getattr(superclass, '_elemdict', {}))
+		v._propdict.update(getattr(v, '_privpropdict', {}))
+		v._elemdict.update(getattr(v, '_privelemdict', {}))
 
 import StdSuites
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py b/Lib/plat-mac/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py
index ac8013d..d775686 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py
@@ -1,7 +1,7 @@
 """Suite Microsoft Internet Explorer Suite: Events defined by Internet Explorer
 Level 1, version 1
 
-Generated from /Volumes/Sap/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
+Generated from /Volumes/Moes/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/Netscape_Suite.py b/Lib/plat-mac/lib-scriptpackages/Explorer/Netscape_Suite.py
index 5076ce4..1062cd1 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Netscape_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Netscape_Suite.py
@@ -1,7 +1,7 @@
 """Suite Netscape Suite: Events defined by Netscape
 Level 1, version 1
 
-Generated from /Volumes/Sap/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
+Generated from /Volumes/Moes/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/Required_Suite.py b/Lib/plat-mac/lib-scriptpackages/Explorer/Required_Suite.py
index 05cfa19..3abd880 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Required_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Required_Suite.py
@@ -1,7 +1,7 @@
 """Suite Required Suite: Events that every application should support
 Level 1, version 1
 
-Generated from /Volumes/Sap/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
+Generated from /Volumes/Moes/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/Explorer/Standard_Suite.py
index 101afe7..7c275d3 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Standard_Suite.py
@@ -1,7 +1,7 @@
 """Suite Standard Suite: Common terms for most applications
 Level 1, version 1
 
-Generated from /Volumes/Sap/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
+Generated from /Volumes/Moes/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/URL_Suite.py b/Lib/plat-mac/lib-scriptpackages/Explorer/URL_Suite.py
index a89913f..7635270 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/URL_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/URL_Suite.py
@@ -1,7 +1,7 @@
 """Suite URL Suite: Standard suite for Uniform Resource Locators
 Level 1, version 1
 
-Generated from /Volumes/Sap/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
+Generated from /Volumes/Moes/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/Web_Browser_Suite.py b/Lib/plat-mac/lib-scriptpackages/Explorer/Web_Browser_Suite.py
index 96f4ec0..e9cd4ff 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Web_Browser_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Web_Browser_Suite.py
@@ -1,7 +1,7 @@
 """Suite Web Browser Suite: Class of events supported by Web Browser applications
 Level 1, version 1
 
-Generated from /Volumes/Sap/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
+Generated from /Volumes/Moes/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py b/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py
index 15e8b21..018d368 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py
@@ -1,5 +1,5 @@
 """
-Package generated from /Volumes/Sap/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
+Package generated from /Volumes/Moes/Applications (Mac OS 9)/Internet Explorer 5/Internet Explorer
 Resource aete resid 0 
 """
 import aetools
@@ -38,15 +38,18 @@ from Web_Browser_Suite import *
 from URL_Suite import *
 from Microsoft_Internet_Explorer import *
 from Netscape_Suite import *
+
 def getbaseclasses(v):
-	if hasattr(v, '_superclassnames') and not hasattr(v, '_propdict'):
+	if not getattr(v, '_propdict', None):
 		v._propdict = {}
 		v._elemdict = {}
-		for superclass in v._superclassnames:
-			v._propdict.update(getattr(eval(superclass), '_privpropdict', {}))
-			v._elemdict.update(getattr(eval(superclass), '_privelemdict', {}))
-		v._propdict.update(v._privpropdict)
-		v._elemdict.update(v._privelemdict)
+		for superclassname in getattr(v, '_superclassnames', []):
+			superclass = eval(superclassname)
+			getbaseclasses(superclass)
+			v._propdict.update(getattr(superclass, '_propdict', {}))
+			v._elemdict.update(getattr(superclass, '_elemdict', {}))
+		v._propdict.update(getattr(v, '_privpropdict', {}))
+		v._elemdict.update(getattr(v, '_privelemdict', {}))
 
 import StdSuites
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Containers_and_folders.py b/Lib/plat-mac/lib-scriptpackages/Finder/Containers_and_folders.py
index c3aac16..a22ee10 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Containers_and_folders.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Containers_and_folders.py
@@ -1,7 +1,7 @@
 """Suite Containers and folders: Classes that can contain other file system items
 Level 1, version 1
 
-Generated from /Volumes/Sap/System Folder/Finder
+Generated from /Volumes/Moes/Systeemmap/Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Earlier_terms.py b/Lib/plat-mac/lib-scriptpackages/Finder/Earlier_terms.py
index 2f72d0f..7dbc705 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Earlier_terms.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Earlier_terms.py
@@ -1,7 +1,7 @@
 """Suite Earlier terms: Terms that have been renamed
 Level 1, version 1
 
-Generated from /Volumes/Sap/System Folder/Finder
+Generated from /Volumes/Moes/Systeemmap/Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Enumerations.py b/Lib/plat-mac/lib-scriptpackages/Finder/Enumerations.py
index 97cfbfb..dc608e2 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Enumerations.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Enumerations.py
@@ -1,7 +1,7 @@
 """Suite Enumerations: Enumerations for the Finder
 Level 1, version 1
 
-Generated from /Volumes/Sap/System Folder/Finder
+Generated from /Volumes/Moes/Systeemmap/Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Files_and_suitcases.py b/Lib/plat-mac/lib-scriptpackages/Finder/Files_and_suitcases.py
index 0e85539..92edd23 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Files_and_suitcases.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Files_and_suitcases.py
@@ -1,7 +1,7 @@
 """Suite Files and suitcases: Classes representing files and suitcases
 Level 1, version 1
 
-Generated from /Volumes/Sap/System Folder/Finder
+Generated from /Volumes/Moes/Systeemmap/Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Finder_Basics.py b/Lib/plat-mac/lib-scriptpackages/Finder/Finder_Basics.py
index 3589126..ea384d3 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Finder_Basics.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Finder_Basics.py
@@ -1,7 +1,7 @@
 """Suite Finder Basics: Commonly-used Finder commands and object classes
 Level 1, version 1
 
-Generated from /Volumes/Sap/System Folder/Finder
+Generated from /Volumes/Moes/Systeemmap/Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Finder_items.py b/Lib/plat-mac/lib-scriptpackages/Finder/Finder_items.py
index 1475fa6..1e3781f 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Finder_items.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Finder_items.py
@@ -1,7 +1,7 @@
 """Suite Finder items: Commands used with file system items, and basic item definition
 Level 1, version 1
 
-Generated from /Volumes/Sap/System Folder/Finder
+Generated from /Volumes/Moes/Systeemmap/Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Obsolete_terms.py b/Lib/plat-mac/lib-scriptpackages/Finder/Obsolete_terms.py
index 58db611..ddf1647 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Obsolete_terms.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Obsolete_terms.py
@@ -1,7 +1,7 @@
 """Suite Obsolete terms: Terms that have been deprecated
 Level 1, version 1
 
-Generated from /Volumes/Sap/System Folder/Finder
+Generated from /Volumes/Moes/Systeemmap/Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Process_classes.py b/Lib/plat-mac/lib-scriptpackages/Finder/Process_classes.py
index a54741c..01d2bed 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Process_classes.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Process_classes.py
@@ -1,7 +1,7 @@
 """Suite Process classes: Classes representing processes that are running
 Level 1, version 1
 
-Generated from /Volumes/Sap/System Folder/Finder
+Generated from /Volumes/Moes/Systeemmap/Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/Finder/Standard_Suite.py
index df23487..4a3372f 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Standard_Suite.py
@@ -1,7 +1,7 @@
 """Suite Standard Suite: Common terms that most applications should support
 Level 1, version 1
 
-Generated from /Volumes/Sap/System Folder/Finder
+Generated from /Volumes/Moes/Systeemmap/Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Type_Definitions.py b/Lib/plat-mac/lib-scriptpackages/Finder/Type_Definitions.py
index 0445c2c..16d233e 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Type_Definitions.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Type_Definitions.py
@@ -1,7 +1,7 @@
 """Suite Type Definitions: Definitions of records used in scripting the Finder
 Level 1, version 1
 
-Generated from /Volumes/Sap/System Folder/Finder
+Generated from /Volumes/Moes/Systeemmap/Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Window_classes.py b/Lib/plat-mac/lib-scriptpackages/Finder/Window_classes.py
index bbfc46e..4495f80 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Window_classes.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Window_classes.py
@@ -1,7 +1,7 @@
 """Suite Window classes: Classes representing windows
 Level 1, version 1
 
-Generated from /Volumes/Sap/System Folder/Finder
+Generated from /Volumes/Moes/Systeemmap/Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py b/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
index 8ea742f..86d81dd 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
@@ -1,5 +1,5 @@
 """
-Package generated from /Volumes/Sap/System Folder/Finder
+Package generated from /Volumes/Moes/Systeemmap/Finder
 Resource aete resid 0 
 """
 import aetools
@@ -58,15 +58,18 @@ from Process_classes import *
 from Type_Definitions import *
 from Enumerations import *
 from Obsolete_terms import *
+
 def getbaseclasses(v):
-	if hasattr(v, '_superclassnames') and not hasattr(v, '_propdict'):
+	if not getattr(v, '_propdict', None):
 		v._propdict = {}
 		v._elemdict = {}
-		for superclass in v._superclassnames:
-			v._propdict.update(getattr(eval(superclass), '_privpropdict', {}))
-			v._elemdict.update(getattr(eval(superclass), '_privelemdict', {}))
-		v._propdict.update(v._privpropdict)
-		v._elemdict.update(v._privelemdict)
+		for superclassname in getattr(v, '_superclassnames', []):
+			superclass = eval(superclassname)
+			getbaseclasses(superclass)
+			v._propdict.update(getattr(superclass, '_propdict', {}))
+			v._elemdict.update(getattr(superclass, '_elemdict', {}))
+		v._propdict.update(getattr(v, '_privpropdict', {}))
+		v._elemdict.update(getattr(v, '_privelemdict', {}))
 
 import StdSuites
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/Mozilla_suite.py b/Lib/plat-mac/lib-scriptpackages/Netscape/Mozilla_suite.py
index 45f8ffd..56408f3 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/Mozilla_suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/Mozilla_suite.py
@@ -1,7 +1,7 @@
 """Suite Mozilla suite: Experimental Mozilla suite
 Level 1, version 1
 
-Generated from /Volumes/Sap/Applications (Mac OS 9)/Netscape Communicator\xe2\x84\xa2 Folder/Netscape Communicator\xe2\x84\xa2
+Generated from /Volumes/Moes/Applications (Mac OS 9)/Netscape Communicator\xe2\x84\xa2 Folder/Netscape Communicator\xe2\x84\xa2
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/PowerPlant.py b/Lib/plat-mac/lib-scriptpackages/Netscape/PowerPlant.py
index e21242b..b1cc8ee 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/PowerPlant.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/PowerPlant.py
@@ -1,7 +1,7 @@
 """Suite PowerPlant: 
 Level 0, version 0
 
-Generated from /Volumes/Sap/Applications (Mac OS 9)/Netscape Communicator\xe2\x84\xa2 Folder/Netscape Communicator\xe2\x84\xa2
+Generated from /Volumes/Moes/Applications (Mac OS 9)/Netscape Communicator\xe2\x84\xa2 Folder/Netscape Communicator\xe2\x84\xa2
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/Required_suite.py b/Lib/plat-mac/lib-scriptpackages/Netscape/Required_suite.py
index 8da57b6..553b538 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/Required_suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/Required_suite.py
@@ -1,7 +1,7 @@
 """Suite Required suite: 
 Level 0, version 0
 
-Generated from /Volumes/Sap/Applications (Mac OS 9)/Netscape Communicator\xe2\x84\xa2 Folder/Netscape Communicator\xe2\x84\xa2
+Generated from /Volumes/Moes/Applications (Mac OS 9)/Netscape Communicator\xe2\x84\xa2 Folder/Netscape Communicator\xe2\x84\xa2
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_Suite.py
index 5bf2d18..aa1d087 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_Suite.py
@@ -1,7 +1,7 @@
 """Suite Standard Suite: Common terms for most applications
 Level 1, version 1
 
-Generated from /Volumes/Sap/Applications (Mac OS 9)/Netscape Communicator\xe2\x84\xa2 Folder/Netscape Communicator\xe2\x84\xa2
+Generated from /Volumes/Moes/Applications (Mac OS 9)/Netscape Communicator\xe2\x84\xa2 Folder/Netscape Communicator\xe2\x84\xa2
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_URL_suite.py b/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_URL_suite.py
index 66d359e..ab29665 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_URL_suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_URL_suite.py
@@ -3,7 +3,7 @@
 
 Level 1, version 1
 
-Generated from /Volumes/Sap/Applications (Mac OS 9)/Netscape Communicator\xe2\x84\xa2 Folder/Netscape Communicator\xe2\x84\xa2
+Generated from /Volumes/Moes/Applications (Mac OS 9)/Netscape Communicator\xe2\x84\xa2 Folder/Netscape Communicator\xe2\x84\xa2
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/Text.py b/Lib/plat-mac/lib-scriptpackages/Netscape/Text.py
index 1620c8c..5878f9b 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/Text.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/Text.py
@@ -1,7 +1,7 @@
 """Suite Text: 
 Level 0, version 0
 
-Generated from /Volumes/Sap/Applications (Mac OS 9)/Netscape Communicator\xe2\x84\xa2 Folder/Netscape Communicator\xe2\x84\xa2
+Generated from /Volumes/Moes/Applications (Mac OS 9)/Netscape Communicator\xe2\x84\xa2 Folder/Netscape Communicator\xe2\x84\xa2
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/WorldWideWeb_suite.py b/Lib/plat-mac/lib-scriptpackages/Netscape/WorldWideWeb_suite.py
index c9c4fde..a5e5cc6 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/WorldWideWeb_suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/WorldWideWeb_suite.py
@@ -1,7 +1,7 @@
 """Suite WorldWideWeb suite, as defined in Spyglass spec.: 
 Level 1, version 1
 
-Generated from /Volumes/Sap/Applications (Mac OS 9)/Netscape Communicator\xe2\x84\xa2 Folder/Netscape Communicator\xe2\x84\xa2
+Generated from /Volumes/Moes/Applications (Mac OS 9)/Netscape Communicator\xe2\x84\xa2 Folder/Netscape Communicator\xe2\x84\xa2
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py b/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py
index 40cca88..42902c6 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py
@@ -1,5 +1,5 @@
 """
-Package generated from /Volumes/Sap/Applications (Mac OS 9)/Netscape Communicator™ Folder/Netscape Communicator™
+Package generated from /Volumes/Moes/Applications (Mac OS 9)/Netscape Communicator™ Folder/Netscape Communicator™
 Resource aete resid 0 
 """
 import aetools
@@ -42,15 +42,18 @@ from WorldWideWeb_suite import *
 from Mozilla_suite import *
 from PowerPlant import *
 from Text import *
+
 def getbaseclasses(v):
-	if hasattr(v, '_superclassnames') and not hasattr(v, '_propdict'):
+	if not getattr(v, '_propdict', None):
 		v._propdict = {}
 		v._elemdict = {}
-		for superclass in v._superclassnames:
-			v._propdict.update(getattr(eval(superclass), '_privpropdict', {}))
-			v._elemdict.update(getattr(eval(superclass), '_privelemdict', {}))
-		v._propdict.update(v._privpropdict)
-		v._elemdict.update(v._privelemdict)
+		for superclassname in getattr(v, '_superclassnames', []):
+			superclass = eval(superclassname)
+			getbaseclasses(superclass)
+			v._propdict.update(getattr(superclass, '_propdict', {}))
+			v._elemdict.update(getattr(superclass, '_elemdict', {}))
+		v._propdict.update(getattr(v, '_privpropdict', {}))
+		v._elemdict.update(getattr(v, '_privelemdict', {}))
 
 import StdSuites
 
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py
index 51d4212..dbcbdfb 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py
@@ -1,7 +1,7 @@
 """Suite AppleScript Suite: Standard terms for AppleScript
 Level 1, version 1
 
-Generated from /Volumes/Sap/System Folder/Extensions/AppleScript
+Generated from /Volumes/Moes/Systeemmap/Extensies/AppleScript
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/Macintosh_Connectivity_Clas.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/Macintosh_Connectivity_Clas.py
index 8dbd6e0..7d84bd0 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Macintosh_Connectivity_Clas.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Macintosh_Connectivity_Clas.py
@@ -1,7 +1,7 @@
 """Suite Macintosh Connectivity Classes: Classes relating to Apple Macintosh personal computer connectivity
 Level 1, version 1
 
-Generated from /Volumes/Sap/System Folder/Extensions/AppleScript
+Generated from /Volumes/Moes/Systeemmap/Extensies/AppleScript
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suite.py
index 253cf0b..0eb2df9 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suite.py
@@ -1,7 +1,7 @@
 """Suite QuickDraw Graphics Suite: A set of basic classes for graphics
 Level 1, version 1
 
-Generated from /Volumes/Sap/System Folder/Extensions/AppleScript
+Generated from /Volumes/Moes/Systeemmap/Extensies/AppleScript
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suppleme.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suppleme.py
index b640cdc..eeba27f 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suppleme.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suppleme.py
@@ -1,7 +1,7 @@
 """Suite QuickDraw Graphics Supplemental Suite: Defines transformations of graphic objects
 Level 1, version 1
 
-Generated from /Volumes/Sap/System Folder/Extensions/AppleScript
+Generated from /Volumes/Moes/Systeemmap/Extensies/AppleScript
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/Required_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/Required_Suite.py
index be26c92..d0d5c36 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Required_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Required_Suite.py
@@ -1,7 +1,7 @@
 """Suite Required Suite: Every application supports open, print, run, and quit
 Level 1, version 1
 
-Generated from /Volumes/Sap/System Folder/Extensions/AppleScript
+Generated from /Volumes/Moes/Systeemmap/Extensies/AppleScript
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/Standard_Suite.py
index 444a0f0..05a5925 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Standard_Suite.py
@@ -1,7 +1,7 @@
 """Suite Standard Suite: Common terms for most applications
 Level 1, version 1
 
-Generated from /Volumes/Sap/System Folder/Extensions/AppleScript
+Generated from /Volumes/Moes/Systeemmap/Extensies/AppleScript
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -125,7 +125,7 @@ class Standard_Suite_Events(builtin_Suite_Events):
 		"""close: Close an object
 		Required argument: the object to close
 		Keyword argument saving: specifies whether changes should be saved before closing
-		Keyword argument saving_in: the file in which to save the object
+		Keyword argument saving_in: the file or alias in which to save the object
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
 		_code = 'core'
@@ -304,7 +304,7 @@ class Standard_Suite_Events(builtin_Suite_Events):
 	def save(self, _object, _attributes={}, **_arguments):
 		"""save: Save an object
 		Required argument: the object to save, usually a document or window
-		Keyword argument in_: the file in which to save the object
+		Keyword argument in_: the file or alias in which to save the object
 		Keyword argument as: the file type of the document in which to save the data
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
@@ -485,7 +485,7 @@ class modified(aetools.NProperty):
 documents = document
 
 class file(aetools.ComponentItem):
-	"""file - a file on a disk or server (or a file yet to be created) """
+	"""file - a file on a disk or server """
 	want = 'file'
 class stationery(aetools.NProperty):
 	"""stationery - Is the file a stationery file? """
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/Table_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/Table_Suite.py
index cfeee32..7984132 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Table_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Table_Suite.py
@@ -1,7 +1,7 @@
 """Suite Table Suite: Classes for manipulating tables
 Level 1, version 1
 
-Generated from /Volumes/Sap/System Folder/Extensions/AppleScript
+Generated from /Volumes/Moes/Systeemmap/Extensies/AppleScript
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/Text_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/Text_Suite.py
index 9b7f5d5..dd5b3f4 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Text_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Text_Suite.py
@@ -1,7 +1,7 @@
 """Suite Text Suite: A set of basic classes for text processing
 Level 1, version 1
 
-Generated from /Volumes/Sap/System Folder/Extensions/AppleScript
+Generated from /Volumes/Moes/Systeemmap/Extensies/AppleScript
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/Type_Names_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/Type_Names_Suite.py
index 939c6ee..82c272f 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Type_Names_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Type_Names_Suite.py
@@ -1,7 +1,7 @@
 """Suite Type Names Suite: Terminology for Registry data types
 Level 1, version 1
 
-Generated from /Volumes/Sap/System Folder/Extensions/AppleScript
+Generated from /Volumes/Moes/Systeemmap/Extensies/AppleScript
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
index 09667f8..b577698 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
@@ -1,5 +1,5 @@
 """
-Package generated from /Volumes/Sap/System Folder/Extensions/AppleScript
+Package generated from /Volumes/Moes/Systeemmap/Extensies/AppleScript
 Resource aeut resid 0 Standard Event Suites for English
 """
 import aetools
@@ -50,15 +50,18 @@ from QuickDraw_Graphics_Suppleme import *
 from Table_Suite import *
 from Macintosh_Connectivity_Clas import *
 from Type_Names_Suite import *
+
 def getbaseclasses(v):
-	if hasattr(v, '_superclassnames') and not hasattr(v, '_propdict'):
+	if not getattr(v, '_propdict', None):
 		v._propdict = {}
 		v._elemdict = {}
-		for superclass in v._superclassnames:
-			v._propdict.update(getattr(eval(superclass), '_privpropdict', {}))
-			v._elemdict.update(getattr(eval(superclass), '_privelemdict', {}))
-		v._propdict.update(v._privpropdict)
-		v._elemdict.update(v._privelemdict)
+		for superclassname in getattr(v, '_superclassnames', []):
+			superclass = eval(superclassname)
+			getbaseclasses(superclass)
+			v._propdict.update(getattr(superclass, '_propdict', {}))
+			v._elemdict.update(getattr(superclass, '_elemdict', {}))
+		v._propdict.update(getattr(v, '_privpropdict', {}))
+		v._elemdict.update(getattr(v, '_privelemdict', {}))
 
 import StdSuites
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/Invisible_Suite.py b/Lib/plat-mac/lib-scriptpackages/Terminal/Invisible_Suite.py
new file mode 100644
index 0000000..2a311c5
--- /dev/null
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/Invisible_Suite.py
@@ -0,0 +1,48 @@
+"""Suite Invisible Suite: Terms and Events for controlling the application
+Level 1, version 1
+
+Generated from /Applications/Utilities/Terminal.app/Contents/Resources/Terminal.rsrc
+AETE/AEUT resource version 1/0, language 0, script 0
+"""
+
+import aetools
+import MacOS
+
+_code = 'tpnm'
+
+from StdSuites.Type_Names_Suite import *
+class Invisible_Suite_Events(Type_Names_Suite_Events):
+
+	pass
+
+
+class application(aetools.ComponentItem):
+	"""application - The application """
+	want = 'capp'
+class properties(aetools.NProperty):
+	"""properties - every property of the application """
+	which = 'pALL'
+	want = 'reco'
+application._superclassnames = []
+application._privpropdict = {
+	'properties' : properties,
+}
+application._privelemdict = {
+}
+
+#
+# Indices of types declared in this module
+#
+_classdeclarations = {
+	'capp' : application,
+}
+
+_propdeclarations = {
+	'pALL' : properties,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+}
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py b/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py
index 17aaf47..0f62956 100644
--- a/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py
@@ -16,7 +16,7 @@ class Terminal_Suite_Events:
 		"""run: Run the Terminal application
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
-		_code = 'core'
+		_code = 'aevt'
 		_subcode = 'oapp'
 
 		if _arguments: raise TypeError, 'No optional args expected'
@@ -35,7 +35,7 @@ class Terminal_Suite_Events:
 		"""quit: Quit the Terminal application
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
-		_code = 'core'
+		_code = 'aevt'
 		_subcode = 'quit'
 
 		if _arguments: raise TypeError, 'No optional args expected'
@@ -73,18 +73,21 @@ class Terminal_Suite_Events:
 
 	_argmap_do_script = {
 		'with_command' : 'cmnd',
+		'in_' : 'kfil',
 	}
 
-	def do_script(self, _no_object=None, _attributes={}, **_arguments):
+	def do_script(self, _object, _attributes={}, **_arguments):
 		"""do script: Run a UNIX shell script or command
-		Keyword argument with_command: data to be passed to the Terminal application as the command line
+		Required argument: data to be passed to the Terminal application as the command line
+		Keyword argument with_command: data to be passed to the Terminal application as the command line, deprecated, use direct parameter
+		Keyword argument in_: the window in which to execute the command
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
 		_code = 'core'
 		_subcode = 'dosc'
 
 		aetools.keysubst(_arguments, self._argmap_do_script)
-		if _no_object != None: raise TypeError, 'No direct arg expected'
+		_arguments['----'] = _object
 
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
@@ -122,10 +125,10 @@ class index(aetools.NProperty):
 	"""index - the number of the window """
 	which = 'pidx'
 	want = 'long'
-class visible(aetools.NProperty):
-	"""visible - Is the window visible? """
-	which = 'pvis'
-	want = 'bool'
+class bounds(aetools.NProperty):
+	"""bounds - the boundary rectangle for the window, relative to the upper left corner of the screen """
+	which = 'pbnd'
+	want = 'qdrt'
 class has_close_box(aetools.NProperty):
 	"""has close box - Does the window have a close box? """
 	which = 'hclb'
@@ -138,6 +141,14 @@ class floating(aetools.NProperty):
 	"""floating - Does the window float? """
 	which = 'isfl'
 	want = 'bool'
+class miniaturizable(aetools.NProperty):
+	"""miniaturizable - Is the window miniaturizable? """
+	which = 'ismn'
+	want = 'bool'
+class miniaturized(aetools.NProperty):
+	"""miniaturized - Is the window miniaturized? """
+	which = 'pmnd'
+	want = 'bool'
 class modal(aetools.NProperty):
 	"""modal - Is the window modal? """
 	which = 'pmod'
@@ -146,6 +157,10 @@ class resizable(aetools.NProperty):
 	"""resizable - Is the window resizable? """
 	which = 'prsz'
 	want = 'bool'
+class visible(aetools.NProperty):
+	"""visible - Is the window visible? """
+	which = 'pvis'
+	want = 'bool'
 class zoomable(aetools.NProperty):
 	"""zoomable - Is the window zoomable? """
 	which = 'iszm'
@@ -154,22 +169,22 @@ class zoomed(aetools.NProperty):
 	"""zoomed - Is the window zoomed? """
 	which = 'pzum'
 	want = 'bool'
-class miniaturizable(aetools.NProperty):
-	"""miniaturizable - Is the window miniaturizable? """
-	which = 'mini'
-	want = 'bool'
-class miniaturized(aetools.NProperty):
-	"""miniaturized - Is the window miniaturized? """
-	which = 'mina'
-	want = 'bool'
 class position(aetools.NProperty):
-	"""position - the upper left coordinates of window """
+	"""position - the upper left coordinates of the window, relative to the upper left corner of the screen """
 	which = 'ppos'
 	want = 'QDpt'
-class bounds(aetools.NProperty):
-	"""bounds - the boundary rectangle for the window """
-	which = 'pbnd'
-	want = 'qdrt'
+class origin(aetools.NProperty):
+	"""origin - the lower left coordinates of the window, relative to the lower left corner of the screen """
+	which = 'pori'
+	want = 'list'
+class size(aetools.NProperty):
+	"""size - the width and height of the window """
+	which = 'psiz'
+	want = 'list'
+class frame(aetools.NProperty):
+	"""frame - the origin and size of the window """
+	which = 'pfra'
+	want = 'list'
 class title_displays_device_name(aetools.NProperty):
 	"""title displays device name - Does the title for the window contain the device name? """
 	which = 'tddn'
@@ -226,31 +241,44 @@ class bold_text_color(aetools.NProperty):
 	"""bold text color - the bold text color for the window """
 	which = 'pbtc'
 	want = 'TEXT'
+class busy(aetools.NProperty):
+	"""busy - Is the window busy running a process? """
+	which = 'busy'
+	want = 'bool'
+class processes(aetools.NProperty):
+	"""processes - a list of the currently running processes """
+	which = 'prcs'
+	want = 'list'
 
 windows = window
-application._propdict = {
+application._superclassnames = []
+application._privpropdict = {
 	'name' : name,
 	'version' : version,
 	'frontmost' : frontmost,
 }
-application._elemdict = {
+application._privelemdict = {
 	'window' : window,
 }
-window._propdict = {
+window._superclassnames = []
+window._privpropdict = {
 	'name' : name,
 	'index' : index,
-	'visible' : visible,
+	'bounds' : bounds,
 	'has_close_box' : has_close_box,
 	'has_title_bar' : has_title_bar,
 	'floating' : floating,
+	'miniaturizable' : miniaturizable,
+	'miniaturized' : miniaturized,
 	'modal' : modal,
 	'resizable' : resizable,
+	'visible' : visible,
 	'zoomable' : zoomable,
 	'zoomed' : zoomed,
-	'miniaturizable' : miniaturizable,
-	'miniaturized' : miniaturized,
 	'position' : position,
-	'bounds' : bounds,
+	'origin' : origin,
+	'size' : size,
+	'frame' : frame,
 	'title_displays_device_name' : title_displays_device_name,
 	'title_displays_shell_path' : title_displays_shell_path,
 	'title_displays_window_size' : title_displays_window_size,
@@ -265,8 +293,11 @@ window._propdict = {
 	'background_color' : background_color,
 	'normal_text_color' : normal_text_color,
 	'bold_text_color' : bold_text_color,
+	'busy' : busy,
+	'processes' : processes,
+	'frontmost' : frontmost,
 }
-window._elemdict = {
+window._privelemdict = {
 }
 
 #
@@ -278,35 +309,40 @@ _classdeclarations = {
 }
 
 _propdeclarations = {
-	'tdfn' : title_displays_file_name,
-	'mini' : miniaturizable,
-	'vers' : version,
-	'pidx' : index,
+	'pori' : origin,
 	'prsz' : resizable,
+	'vers' : version,
+	'prcs' : processes,
+	'pbtc' : bold_text_color,
 	'pbnd' : bounds,
-	'mina' : miniaturized,
-	'pbcl' : background_color,
+	'crow' : number_of_rows,
+	'pcnt' : contents,
 	'tddn' : title_displays_device_name,
 	'iszm' : zoomable,
 	'hclb' : has_close_box,
 	'isfl' : floating,
-	'pcnt' : contents,
+	'busy' : busy,
+	'pfra' : frame,
 	'ppos' : position,
 	'ptxc' : normal_text_color,
+	'tdfn' : title_displays_file_name,
 	'pcuc' : cursor_color,
 	'tdsp' : title_displays_shell_path,
 	'pvis' : visible,
-	'tdct' : title_displays_custom_title,
+	'pidx' : index,
 	'pmod' : modal,
 	'titl' : custom_title,
 	'pisf' : frontmost,
+	'pmnd' : miniaturized,
+	'tdct' : title_displays_custom_title,
 	'hist' : history,
 	'pzum' : zoomed,
-	'crow' : number_of_rows,
+	'ismn' : miniaturizable,
+	'pbcl' : background_color,
 	'pnam' : name,
 	'ccol' : number_of_columns,
 	'tdws' : title_displays_window_size,
-	'pbtc' : bold_text_color,
+	'psiz' : size,
 	'ptit' : has_title_bar,
 }
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py b/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
index af92467..dbe0332 100644
--- a/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
@@ -2,27 +2,142 @@
 Package generated from /Applications/Utilities/Terminal.app/Contents/Resources/Terminal.rsrc
 Resource aete resid 0 Terminal Terminology
 """
-# Note: hand-edited _signature to 'trmx'.
-
 import aetools
 Error = aetools.Error
 import Terminal_Suite
+import Invisible_Suite
 
 
 _code_to_module = {
 	'trmx' : Terminal_Suite,
+	'tpnm' : Invisible_Suite,
 }
 
 
 
 _code_to_fullname = {
 	'trmx' : ('Terminal.Terminal_Suite', 'Terminal_Suite'),
+	'tpnm' : ('Terminal.Invisible_Suite', 'Invisible_Suite'),
 }
 
 from Terminal_Suite import *
+from Invisible_Suite import *
+
+def getbaseclasses(v):
+	if not getattr(v, '_propdict', None):
+		v._propdict = {}
+		v._elemdict = {}
+		for superclassname in getattr(v, '_superclassnames', []):
+			superclass = eval(superclassname)
+			getbaseclasses(superclass)
+			v._propdict.update(getattr(superclass, '_propdict', {}))
+			v._elemdict.update(getattr(superclass, '_elemdict', {}))
+		v._propdict.update(getattr(v, '_privpropdict', {}))
+		v._elemdict.update(getattr(v, '_privelemdict', {}))
+
+import StdSuites
+
+#
+# Set property and element dictionaries now that all classes have been defined
+#
+getbaseclasses(window)
+getbaseclasses(application)
+getbaseclasses(application)
+getbaseclasses(StdSuites.Type_Names_Suite.small_integer)
+getbaseclasses(StdSuites.Type_Names_Suite.RGB16_color)
+getbaseclasses(StdSuites.Type_Names_Suite.system_dictionary)
+getbaseclasses(StdSuites.Type_Names_Suite.color_table)
+getbaseclasses(StdSuites.Type_Names_Suite.fixed_point)
+getbaseclasses(StdSuites.Type_Names_Suite.plain_text)
+getbaseclasses(StdSuites.Type_Names_Suite.type_element_info)
+getbaseclasses(StdSuites.Type_Names_Suite.location_reference)
+getbaseclasses(StdSuites.Type_Names_Suite.version)
+getbaseclasses(StdSuites.Type_Names_Suite.PostScript_picture)
+getbaseclasses(StdSuites.Type_Names_Suite.machine_location)
+getbaseclasses(StdSuites.Type_Names_Suite.menu_item)
+getbaseclasses(StdSuites.Type_Names_Suite.pixel_map_record)
+getbaseclasses(StdSuites.Type_Names_Suite.application_dictionary)
+getbaseclasses(StdSuites.Type_Names_Suite.unsigned_integer)
+getbaseclasses(StdSuites.Type_Names_Suite.menu)
+getbaseclasses(StdSuites.Type_Names_Suite.fixed_rectangle)
+getbaseclasses(StdSuites.Type_Names_Suite.long_fixed_rectangle)
+getbaseclasses(StdSuites.Type_Names_Suite.type_event_info)
+getbaseclasses(StdSuites.Type_Names_Suite.small_real)
+getbaseclasses(StdSuites.Type_Names_Suite.type_suite_info)
+getbaseclasses(StdSuites.Type_Names_Suite.rotation)
+getbaseclasses(StdSuites.Type_Names_Suite.fixed)
+getbaseclasses(StdSuites.Type_Names_Suite.scrap_styles)
+getbaseclasses(StdSuites.Type_Names_Suite.long_point)
+getbaseclasses(StdSuites.Type_Names_Suite.type_class_info)
+getbaseclasses(StdSuites.Type_Names_Suite.TIFF_picture)
+getbaseclasses(StdSuites.Type_Names_Suite.RGB96_color)
+getbaseclasses(StdSuites.Type_Names_Suite.dash_style)
+getbaseclasses(StdSuites.Type_Names_Suite.type_property_info)
+getbaseclasses(StdSuites.Type_Names_Suite.type_parameter_info)
+getbaseclasses(StdSuites.Type_Names_Suite.long_fixed_point)
+getbaseclasses(StdSuites.Type_Names_Suite.long_rectangle)
+getbaseclasses(StdSuites.Type_Names_Suite.extended_real)
+getbaseclasses(StdSuites.Type_Names_Suite.double_integer)
+getbaseclasses(StdSuites.Type_Names_Suite.long_fixed)
+getbaseclasses(StdSuites.Type_Names_Suite.null)
+getbaseclasses(StdSuites.Type_Names_Suite.target_id)
+getbaseclasses(StdSuites.Type_Names_Suite.point)
+getbaseclasses(StdSuites.Type_Names_Suite.bounding_rectangle)
+
+#
+# Indices of types declared in this module
+#
+_classdeclarations = {
+	'cwin' : window,
+	'capp' : application,
+	'capp' : application,
+	'shor' : StdSuites.Type_Names_Suite.small_integer,
+	'tr16' : StdSuites.Type_Names_Suite.RGB16_color,
+	'aeut' : StdSuites.Type_Names_Suite.system_dictionary,
+	'clrt' : StdSuites.Type_Names_Suite.color_table,
+	'fpnt' : StdSuites.Type_Names_Suite.fixed_point,
+	'TEXT' : StdSuites.Type_Names_Suite.plain_text,
+	'elin' : StdSuites.Type_Names_Suite.type_element_info,
+	'insl' : StdSuites.Type_Names_Suite.location_reference,
+	'vers' : StdSuites.Type_Names_Suite.version,
+	'EPS ' : StdSuites.Type_Names_Suite.PostScript_picture,
+	'mLoc' : StdSuites.Type_Names_Suite.machine_location,
+	'cmen' : StdSuites.Type_Names_Suite.menu_item,
+	'tpmm' : StdSuites.Type_Names_Suite.pixel_map_record,
+	'aete' : StdSuites.Type_Names_Suite.application_dictionary,
+	'magn' : StdSuites.Type_Names_Suite.unsigned_integer,
+	'cmnu' : StdSuites.Type_Names_Suite.menu,
+	'frct' : StdSuites.Type_Names_Suite.fixed_rectangle,
+	'lfrc' : StdSuites.Type_Names_Suite.long_fixed_rectangle,
+	'evin' : StdSuites.Type_Names_Suite.type_event_info,
+	'sing' : StdSuites.Type_Names_Suite.small_real,
+	'suin' : StdSuites.Type_Names_Suite.type_suite_info,
+	'trot' : StdSuites.Type_Names_Suite.rotation,
+	'fixd' : StdSuites.Type_Names_Suite.fixed,
+	'styl' : StdSuites.Type_Names_Suite.scrap_styles,
+	'lpnt' : StdSuites.Type_Names_Suite.long_point,
+	'gcli' : StdSuites.Type_Names_Suite.type_class_info,
+	'TIFF' : StdSuites.Type_Names_Suite.TIFF_picture,
+	'tr96' : StdSuites.Type_Names_Suite.RGB96_color,
+	'tdas' : StdSuites.Type_Names_Suite.dash_style,
+	'pinf' : StdSuites.Type_Names_Suite.type_property_info,
+	'pmin' : StdSuites.Type_Names_Suite.type_parameter_info,
+	'lfpt' : StdSuites.Type_Names_Suite.long_fixed_point,
+	'lrct' : StdSuites.Type_Names_Suite.long_rectangle,
+	'exte' : StdSuites.Type_Names_Suite.extended_real,
+	'comp' : StdSuites.Type_Names_Suite.double_integer,
+	'lfxd' : StdSuites.Type_Names_Suite.long_fixed,
+	'null' : StdSuites.Type_Names_Suite.null,
+	'targ' : StdSuites.Type_Names_Suite.target_id,
+	'QDpt' : StdSuites.Type_Names_Suite.point,
+	'qdrt' : StdSuites.Type_Names_Suite.bounding_rectangle,
+}
 
 
 class Terminal(Terminal_Suite_Events,
+		Invisible_Suite_Events,
 		aetools.TalkTo):
 	_signature = 'trmx'
 
+	_moduleName = 'Terminal'
+